From 610732f74f40132de50b86b63931161460d25e57 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 08 七月 2025 18:21:43 +0800 Subject: [PATCH] ss --- server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java index fa35f50..bc78a4b 100644 --- a/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java +++ b/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java @@ -1,7 +1,6 @@ package com.doumee.service.business.impl; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.constants.Constants; import com.doumee.core.constants.ResponseStatus; @@ -72,7 +71,7 @@ @Override public void deleteById(Integer id) { - carouselMapper.update(new UpdateWrapper<Carousel>().lambda().set(Carousel::getIsdeleted,Constants.ZERO).eq(Carousel::getId,id)); + carouselMapper.update(new UpdateWrapper<Carousel>().lambda().set(Carousel::getIsdeleted,Constants.ONE).eq(Carousel::getId,id)); } @Override @@ -86,7 +85,9 @@ if (CollectionUtils.isEmpty(ids)) { return; } - carouselMapper.deleteBatchIds(ids); + for(Integer id :ids){ + this.deleteById(id); + } } @Override @@ -196,8 +197,8 @@ .eq(pageWrap.getModel().getId() != null, Carousel::getId, pageWrap.getModel().getId()) .eq(pageWrap.getModel().getRemark() != null, Carousel::getRemark, pageWrap.getModel().getRemark()) .like(pageWrap.getModel().getTitle() != null, Carousel::getTitle, pageWrap.getModel().getTitle()) - .like(pageWrap.getModel().getDetail() != null, Carousel::getDetail, pageWrap.getModel().getDetail()) .eq(pageWrap.getModel().getType() != null, Carousel::getType, pageWrap.getModel().getType()) + .like(pageWrap.getModel().getDetail() != null, Carousel::getDetail, pageWrap.getModel().getDetail()) .eq(pageWrap.getModel().getJumpType() != null, Carousel::getJumpType, pageWrap.getModel().getJumpType()) .like(pageWrap.getModel().getContent() != null, Carousel::getContent, pageWrap.getModel().getContent()) .eq(pageWrap.getModel().getSortnum() != null, Carousel::getSortnum, pageWrap.getModel().getSortnum()) @@ -231,10 +232,14 @@ @Override public FootDataVO getFoodDataVO(){ FootDataVO footDataVO = new FootDataVO(); + String path =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode(); footDataVO.setFootWords(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FOOT_WORDS).getCode()); footDataVO.setFootImgUrl(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FOOT_IMGURL).getCode()); - footDataVO.setFootFullImgUrl(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode() + - systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FOOT_IMGURL).getCode()); + footDataVO.setFootFullImgUrl(path+ + footDataVO.getFootImgUrl()); + footDataVO.setFootImgUrl2(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FOOT_IMGURL2).getCode()); + footDataVO.setFootFullImgUrl2(path + + footDataVO.getFootImgUrl2()); footDataVO.setAddress(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ADDRESS).getCode()); footDataVO.setLinkPhone(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.LINK_PHONE).getCode()); footDataVO.setLinkMobile(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.LINK_MOBILE).getCode()); @@ -245,6 +250,10 @@ SystemDictData wisdomSystem = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.WISDOM_SYSTEM); if(Objects.nonNull(wisdomSystem) & org.apache.commons.lang3.StringUtils.isNotBlank(wisdomSystem.getCode())){ footDataVO.setWisdomSystem(JSONArray.parseArray(wisdomSystem.getCode())); + } + SystemDictData honors = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.HONORS); + if(Objects.nonNull(wisdomSystem) & org.apache.commons.lang3.StringUtils.isNotBlank(honors.getCode())){ + footDataVO.setHonors(JSONArray.parseArray(honors.getCode())); } footDataVO.setServerTime(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_TIME).getCode()); return footDataVO; @@ -303,6 +312,11 @@ wisdomSystem.setCode(footDataDTO.getWisdomSystem().toString()); systemDictDataBiz.updateById(wisdomSystem); } + SystemDictData honors = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.HONORS); + if (Objects.nonNull(wisdomSystem)&&Objects.nonNull(footDataDTO.getHonors())) { + wisdomSystem.setCode(footDataDTO.getHonors().toString()); + systemDictDataBiz.updateById(wisdomSystem); + } } -- Gitblit v1.9.3