中医药小程序代码提交

src/main/java/com/tcm/common/dao/CenterDisplayDao.java

@@ -17,17 +17,5 @@ public interface CenterDisplayDao extends BaseDao {
      */
     List<CenterDisplayResVo> loadByList(CenterDisplayVo centerDisplay);
 
-    /**
-     * 标题分类加载
-     * @param req
-     * @return
-     */
-    List<CenterDisplayLoadResVo> loadByType(CenterDisplayReqVo req);
 
-    /**
-     * 展区加载区域
-     * @param reqVo
-     * @return
-     */
-    List<FloorAreaResVo> loadFloorAreaList(CenterDisplayReqVo reqVo);
 }

src/main/java/com/tcm/common/dao/impl/CarouselDaoImpl.java

@@ -3,7 +3,9 @@ package com.tcm.common.dao.impl;
 import com.tcm.common.dao.CarouselDao;
 import com.tcm.util.common.CarouselVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import org.springframework.stereotype.Component;
 
+@Component
 public class CarouselDaoImpl extends BaseDaoImpl implements CarouselDao {
     @Override
     protected void init() {

src/main/java/com/tcm/common/dao/impl/CenterDisplayDaoImpl.java

@@ -2,10 +2,7 @@ package com.tcm.common.dao.impl;
 
 import com.tcm.common.dao.CenterDisplayDao;
 import com.tcm.util.area.CenterDisplayVo;
-import com.tcm.util.area.req.CenterDisplayReqVo;
-import com.tcm.util.area.res.CenterDisplayLoadResVo;
 import com.tcm.util.area.res.CenterDisplayResVo;
-import com.tcm.util.area.res.FloorAreaResVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 
@@ -15,8 +12,6 @@ import java.util.List;
 public class CenterDisplayDaoImpl extends BaseDaoImpl implements CenterDisplayDao {
 
     private static final String SQL_LOAD_BY_LIST = "LOAD_BY_LIST";
-    private static final String SQL_LOAD_BY_TYPE = "LOAD_BY_TYPE";
-    private static final String SQL_LOAD_FLOOR_AREA_LIST = "LOAD_FLOOR_AREA_LIST";
 
     @Override
     protected void init() {
@@ -26,27 +21,10 @@ public class CenterDisplayDaoImpl extends BaseDaoImpl implements CenterDisplayDa
                 .add("displayId", "p.display_id = ?")
                 .add("title", "p.title = ?")
         ;
-        table.add(SQL_LOAD_BY_TYPE, "select p.* from tcm_center_display as p where 1=1 {WHERE} group by p.content_type");
-        table.add(SQL_LOAD_FLOOR_AREA_LIST, "select fa.*,p.content_type as contentType from tcm_center_display as p " +
-                "left join tcm_floor_area as fa on p.area_id on fa.area_id  where 1=1 {WHERE} order by p.sort")
-                .add("areaId", "p.area_id = ?")
-                .add("title", "p.title = ?")
-                .add("contentType", "p.content_type = ?")
-        ;
     }
 
     @Override
     public List<CenterDisplayResVo> loadByList(CenterDisplayVo req) {
         return this.query(CenterDisplayResVo.class, SQL_LOAD_BY_LIST, req);
     }
-
-    @Override
-    public List<CenterDisplayLoadResVo> loadByType(CenterDisplayReqVo req) {
-        return this.query(CenterDisplayLoadResVo.class, SQL_LOAD_BY_TYPE, req);
-    }
-
-    @Override
-    public List<FloorAreaResVo> loadFloorAreaList(CenterDisplayReqVo req) {
-        return this.query(FloorAreaResVo.class, SQL_LOAD_FLOOR_AREA_LIST, req);
-    }
 }

src/main/java/com/tcm/common/service/AreaService.java

@@ -4,50 +4,72 @@ import com.tcm.util.area.req.FloorAreaReqVo;
 import com.tcm.util.area.req.FloorLoadPageReqVo;
 import com.tcm.util.area.req.FloorReqVo;
 import com.tcm.util.area.res.FloorAreaResVo;
+import com.tcm.util.area.res.FloorHomeLoadResVo;
 import com.tcm.util.area.res.FloorResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 
 public interface AreaService {
     /**
      * 楼层保存
+     *
      * @param req
      * @return
      */
     String floorSave(FloorReqVo req);
+
     /**
      * 楼层加载
+     *
      * @param req
      * @return
      */
     FloorResVo floorLoad(FloorReqVo req);
+
     /**
      * 楼层分页查询
+     *
      * @param req
      * @return
      */
     PageSizeData<FloorResVo> loadPage(FloorLoadPageReqVo req);
+
     /**
      * 楼层删除
+     *
      * @param req
      * @return
      */
     String floorRemove(FloorReqVo req);
+
     /**
      * 区域加载
+     *
      * @param req
      * @return
      */
     FloorAreaResVo areaLoad(FloorAreaReqVo req);
+
     /**
      * 区域保存
+     *
      * @param req
      * @return
      */
     String areaSave(FloorAreaReqVo req);
+
     /**
      * 区域删除
+     *
      * @param req
      * @return
      */
     String areaRemove(FloorAreaReqVo req);
+
+    /**
+     * 中心展示区
+     *
+     * @param req
+     * @return
+     */
+    FloorHomeLoadResVo loadCenter(FloorReqVo req);
 }

src/main/java/com/tcm/common/service/CarouselService.java

+package com.tcm.common.service;
+
+import com.tcm.util.common.req.CarouselReqVo;
+import com.tcm.util.common.res.CarouselResVo;
+
+public interface CarouselService {
+    /**
+     * 内容加载
+     *
+     * @param carouselReqVo
+     * @return
+     */
+    CarouselResVo load(CarouselReqVo carouselReqVo);
+}

src/main/java/com/tcm/common/service/CenterDisplayService.java

@@ -27,11 +27,4 @@ public interface CenterDisplayService {
      * 展示区新增
      */
     String remove(TcmEnumReqVo req);
-
-    /**
-     * 中心展示区加载
-     * @param req
-     * @return
-     */
-    CenterDisplayHomeLoadResVo loadCenter(CenterDisplayReqVo req);
 }

src/main/java/com/tcm/common/service/ImageService.java

@@ -8,18 +8,23 @@ import java.util.List;
 public interface ImageService {
     /**
      * 图片保存
+     *
      * @param req
      * @return
      */
     String save(ImageReqVo req);
+
     /**
      * 图片加载
+     *
      * @param req
      * @return
      */
     ImageResVo load(ImageReqVo req);
+
     /**
      * 图片删除
+     *
      * @param req
      * @return
      */
@@ -27,6 +32,7 @@ public interface ImageService {
 
     /**
      * 首页图片加载
+     *
      * @param req
      * @return
      */

src/main/java/com/tcm/common/service/TcmEnumService.java

@@ -8,24 +8,31 @@ import com.yanzuoguang.util.vo.PageSizeData;
 public interface TcmEnumService {
     /**
      * 枚举保存
+     *
      * @param req
      * @return
      */
     String save(TcmEnumReqVo req);
+
     /**
      * 枚举加载
+     *
      * @param req
      * @return
      */
     TcmEnumResVo load(TcmEnumReqVo req);
+
     /**
      * 枚举分页
+     *
      * @param req
      * @return
      */
     PageSizeData<TcmEnumResVo> loadPage(TcmEnumLoadPageReqVo req);
+
     /**
      * 枚举删除
+     *
      * @param req
      * @return
      */

src/main/java/com/tcm/common/service/impl/AreaServiceImpl.java

@@ -3,16 +3,21 @@ package com.tcm.common.service.impl;
 import com.tcm.common.dao.FloorAreaDao;
 import com.tcm.common.dao.FloorDao;
 import com.tcm.common.service.AreaService;
+import com.tcm.common.service.CarouselService;
 import com.tcm.common.service.ImageService;
+import com.tcm.common.util.CommonConstant;
 import com.tcm.util.area.FloorAreaVo;
 import com.tcm.util.area.FloorVo;
 import com.tcm.util.area.req.FloorAreaReqVo;
 import com.tcm.util.area.req.FloorLoadPageReqVo;
 import com.tcm.util.area.req.FloorReqVo;
 import com.tcm.util.area.res.FloorAreaResVo;
+import com.tcm.util.area.res.FloorHomeLoadResVo;
 import com.tcm.util.area.res.FloorResVo;
-import com.tcm.util.common.ImageVo;
+import com.tcm.util.common.CarouselVo;
+import com.tcm.util.common.req.CarouselReqVo;
 import com.tcm.util.common.req.ImageReqVo;
+import com.tcm.util.common.res.CarouselResVo;
 import com.tcm.util.common.res.ImageResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.helper.DateHelper;
@@ -20,6 +25,7 @@ import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -28,13 +34,16 @@ public class AreaServiceImpl implements AreaService {
     private final FloorDao floorDao;
     private final FloorAreaDao floorAreaDao;
     private final ImageService imageService;
+    private final CarouselService carouselService;
 
     public AreaServiceImpl(FloorDao floorDao,
                            FloorAreaDao floorAreaDao,
-                           ImageService imageService) {
+                           ImageService imageService,
+                           CarouselService carouselService) {
         this.floorDao = floorDao;
         this.floorAreaDao = floorAreaDao;
         this.imageService = imageService;
+        this.carouselService = carouselService;
     }
 
     @Override
@@ -118,4 +127,21 @@ public class AreaServiceImpl implements AreaService {
         floorAreaDao.remove(areaVo);
         return req.getAreaId();
     }
+
+    @Override
+    public FloorHomeLoadResVo loadCenter(FloorReqVo req) {
+        FloorHomeLoadResVo floorHomeLoadResVo = new FloorHomeLoadResVo();
+        //内容加载
+        CarouselReqVo carouselReqVo = new CarouselReqVo();
+        carouselReqVo.setCarouselType(CommonConstant.CAROUSEL_TYPE_CENTER_DISPLAY);
+        CarouselResVo carouselVo = carouselService.load(carouselReqVo);
+        floorHomeLoadResVo.setCarouselVo(carouselVo);
+        //楼层加载
+        List<FloorResVo> floorList = floorDao.loadList(req, FloorResVo.class);
+        //特殊区加载
+        List<FloorAreaResVo> floorAreaList = new ArrayList<>();
+        floorHomeLoadResVo.setFloorList(floorList);
+        floorHomeLoadResVo.setFloorAreaList(floorAreaList);
+        return floorHomeLoadResVo;
+    }
 }

src/main/java/com/tcm/common/service/impl/CarouselServiceImpl.java

+package com.tcm.common.service.impl;
+
+import com.tcm.common.dao.CarouselDao;
+import com.tcm.common.service.CarouselService;
+import com.tcm.common.service.ImageService;
+import com.tcm.util.common.req.CarouselReqVo;
+import com.tcm.util.common.req.ImageReqVo;
+import com.tcm.util.common.res.CarouselResVo;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CarouselServiceImpl implements CarouselService {
+
+    private final CarouselDao carouselDao;
+    private final ImageService imageService;
+
+    public CarouselServiceImpl(CarouselDao carouselDao, ImageService imageService) {
+        this.carouselDao = carouselDao;
+        this.imageService = imageService;
+    }
+
+    @Override
+    public CarouselResVo load(CarouselReqVo carouselReqVo) {
+        CarouselResVo load = carouselDao.load(carouselReqVo, CarouselResVo.class);
+        if (load != null) {
+            ImageReqVo imageReqVo = new ImageReqVo();
+            imageReqVo.setRelationId(load.getCarouselId());
+            load.setImageList(imageService.loadList(imageReqVo));
+        }
+        return load;
+    }
+}

src/main/java/com/tcm/common/service/impl/CenterDisplayServiceImpl.java

@@ -77,24 +77,4 @@ public class CenterDisplayServiceImpl implements CenterDisplayService {
         return req.getEnumId();
     }
 
-    @Override
-    public CenterDisplayHomeLoadResVo loadCenter(CenterDisplayReqVo req) {
-        CenterDisplayHomeLoadResVo loadRes = new CenterDisplayHomeLoadResVo();
-        //展示图加载
-        ImageReqVo imageVo = new ImageReqVo();
-        imageVo.setImageType(CommonConstant.IMAGE_TYPE_CENTER_DISPLAY);
-        imageVo.setImageStatus(CommonConstant.IMAGE_STATUS_ENABLE);
-        loadRes.setImageList(imageDao.loadList(imageVo, ImageVo.class));
-        //标题加载
-        List<CenterDisplayLoadResVo> loadTypeList = centerDisplayDao.loadByType(req);
-        loadRes.setContent(loadTypeList.get(0).getContent());
-        for (CenterDisplayLoadResVo centerDisplayLoadResVo : loadTypeList) {
-            CenterDisplayReqVo reqVo = new CenterDisplayReqVo();
-            reqVo.setContentType(centerDisplayLoadResVo.getContentType());
-            List<FloorAreaResVo> list = centerDisplayDao.loadFloorAreaList(reqVo);
-            centerDisplayLoadResVo.setList(list);
-        }
-        loadRes.setLoadTypeList(loadTypeList);
-        return loadRes;
-    }
 }

src/main/java/com/tcm/common/util/CommonConstant.java

@@ -18,8 +18,8 @@ public class CommonConstant {
     public static final Integer IMAGE_STATUS_DISABLE = 1;
 
     /**
-     * 楼层展览类型0-楼层 1-功能区
+     * 内容类型0：首页1：展示区
      */
-    public static final Integer CENTER_DISPLAY_TYPE_FLOOR = 0;
-    public static final Integer CENTER_DISPLAY_TYPE_DOMAIN = 1;
+    public static final Integer CAROUSEL_TYPE_HOME = 0;
+    public static final Integer CAROUSEL_TYPE_CENTER_DISPLAY = 1;
 }

src/main/java/com/tcm/common/web/AreaController.java

 package com.tcm.common.web;
 
 import com.tcm.common.service.AreaService;
+import com.tcm.util.area.req.CenterDisplayReqVo;
 import com.tcm.util.area.req.FloorAreaReqVo;
 import com.tcm.util.area.req.FloorLoadPageReqVo;
 import com.tcm.util.area.req.FloorReqVo;
+import com.tcm.util.area.res.CenterDisplayHomeLoadResVo;
 import com.tcm.util.area.res.FloorAreaResVo;
+import com.tcm.util.area.res.FloorHomeLoadResVo;
 import com.tcm.util.area.res.FloorResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -84,4 +87,13 @@ public class AreaController {
         return ResponseResult.result(areaService.areaRemove(req));
 
     }
+
+    /**
+     * 中心展区加载
+     */
+    @RequestMapping("/loadCenter")
+    public ResponseResult<FloorHomeLoadResVo> loadCenter(@RequestBody FloorReqVo req) {
+        return ResponseResult.result(areaService.loadCenter(req));
+
+    }
 }

src/main/java/com/tcm/common/web/CenterDisplayController.java

@@ -60,15 +60,6 @@ public class CenterDisplayController {
 
     }
 
-    /**
-     * 中心展区加载
-     */
-    @RequestMapping("/loadCenter")
-    public ResponseResult<CenterDisplayHomeLoadResVo> loadCenter(@RequestBody CenterDisplayReqVo req) {
-        return ResponseResult.result(centerDisplayService.loadCenter(req));
-
-    }
-
 }
 
 

src/main/java/com/tcm/common/web/ImageController.java

@@ -45,6 +45,7 @@ public class ImageController {
     public ResponseResult<String> remove(@RequestBody ImageReqVo req) {
         return ResponseResult.result(imageService.remove(req));
     }
+
     /**
      * 首页图片加载
      */

src/main/java/com/tcm/util/area/res/FloorHomeLoadResVo.java

+package com.tcm.util.area.res;
+
+import com.tcm.util.common.CarouselVo;
+import com.tcm.util.common.res.CarouselResVo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FloorHomeLoadResVo {
+
+    private CarouselResVo carouselVo;
+
+    private List<FloorResVo> floorList = new ArrayList<>();
+
+    private List<FloorAreaResVo> floorAreaList = new ArrayList<>();
+
+    public List<FloorResVo> getFloorList() {
+        return floorList;
+    }
+
+    public void setFloorList(List<FloorResVo> floorList) {
+        this.floorList = floorList;
+    }
+
+    public List<FloorAreaResVo> getFloorAreaList() {
+        return floorAreaList;
+    }
+
+    public void setFloorAreaList(List<FloorAreaResVo> floorAreaList) {
+        this.floorAreaList = floorAreaList;
+    }
+
+    public CarouselResVo getCarouselVo() {
+        return carouselVo;
+    }
+
+    public void setCarouselVo(CarouselResVo carouselVo) {
+        this.carouselVo = carouselVo;
+    }
+}

src/main/java/com/tcm/util/common/req/CarouselReqVo.java

@@ -3,4 +3,5 @@ package com.tcm.util.common.req;
 import com.tcm.util.common.CarouselVo;
 
 public class CarouselReqVo extends CarouselVo {
+
 }

src/main/java/com/tcm/util/common/res/CarouselResVo.java

@@ -2,5 +2,18 @@ package com.tcm.util.common.res;
 
 import com.tcm.util.common.CarouselVo;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class CarouselResVo extends CarouselVo {
+
+    private List<ImageResVo> imageList = new ArrayList<>();
+
+    public List<ImageResVo> getImageList() {
+        return imageList;
+    }
+
+    public void setImageList(List<ImageResVo> imageList) {
+        this.imageList = imageList;
+    }
 }