From f7b760a680397fd0a3de2d8de36a2601de98530d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 02 七月 2025 10:36:06 +0800
Subject: [PATCH] ss

---
 server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 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 e8d5199..d47455c 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
@@ -72,7 +72,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
@@ -176,7 +176,15 @@
         wrapper.lambda().eq(Carousel::getIsdeleted,Constants.ZERO)
                 .eq(Carousel::getStatus,Constants.ZERO)
                 .orderByDesc(Carousel::getSortnum);
-        return carouselMapper.selectList(wrapper);
+        List<Carousel> carouselList =
+         carouselMapper.selectList(wrapper);
+        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carouselList)){
+            String fileDir = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode();
+            for (Carousel carousel:carouselList) {
+                this.imgFullPath(fileDir,carousel);
+            }
+        }
+        return carouselList;
     }
   
     @Override
@@ -188,8 +196,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())
@@ -223,10 +231,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());
@@ -237,6 +249,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;
@@ -295,6 +311,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