中医药小程序代码提交

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

 package com.tcm.common.service;
 
+import com.tcm.util.area.req.CenterDisplayReqVo;
+import com.tcm.util.common.req.CarouselLoadPageReqVo;
 import com.tcm.util.common.req.CarouselReqVo;
 import com.tcm.util.common.res.CarouselResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
 
 public interface CarouselService {
     /**
@@ -11,4 +14,25 @@ public interface CarouselService {
      * @return
      */
     CarouselResVo load(CarouselReqVo carouselReqVo);
+
+    /**
+     * 内容保存
+     * @param req
+     * @return
+     */
+    String save(CarouselReqVo req);
+
+    /**
+     * 内容分页查询
+     * @param req
+     * @return
+     */
+    PageSizeData<CarouselResVo> loadPage(CarouselLoadPageReqVo req);
+
+    /**
+     * 内容删除
+     * @param req
+     * @return
+     */
+    String remove(CarouselReqVo req);
 }

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

@@ -26,5 +26,5 @@ public interface CenterDisplayService {
     /**
      * 展示区新增
      */
-    String remove(TcmEnumReqVo req);
+    String remove(CenterDisplayReqVo req);
 }

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

@@ -82,9 +82,26 @@ public class AreaServiceImpl implements AreaService {
 
     @Override
     public String floorRemove(FloorReqVo req) {
+        //楼层删除
         FloorVo floor = new FloorVo();
         floor.setFloorId(req.getFloorId());
         floorDao.remove(floor);
+        //楼层图片删除
+        ImageReqVo imageReqVo = new ImageReqVo();
+        imageReqVo.setRelationId(req.getFloorId());
+        imageService.remove(imageReqVo);
+
+        //区域删除
+        FloorAreaVo areaVo = new FloorAreaVo();
+        areaVo.setFloorId(req.getFloorId());
+        List<FloorAreaVo> areaList = floorAreaDao.loadList(areaVo, FloorAreaVo.class);
+        floorAreaDao.remove(areaVo);
+        //区域图片删除
+        for (FloorAreaVo floorAreaVo : areaList) {
+            ImageReqVo areaImageReqVo = new ImageReqVo();
+            areaImageReqVo.setRelationId(floorAreaVo.getAreaId());
+            imageService.remove(imageReqVo);
+        }
         return req.getFloorId();
     }
 
@@ -125,6 +142,9 @@ public class AreaServiceImpl implements AreaService {
         FloorAreaVo areaVo = new FloorAreaVo();
         areaVo.setAreaId(req.getAreaId());
         floorAreaDao.remove(areaVo);
+        ImageReqVo imageReqVo = new ImageReqVo();
+        imageReqVo.setRelationId(req.getAreaId());
+        imageService.remove(imageReqVo);
         return req.getAreaId();
     }
 

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

@@ -3,9 +3,16 @@ 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.area.req.CenterDisplayReqVo;
+import com.tcm.util.common.CarouselVo;
+import com.tcm.util.common.req.CarouselLoadPageReqVo;
 import com.tcm.util.common.req.CarouselReqVo;
 import com.tcm.util.common.req.ImageReqVo;
 import com.tcm.util.common.res.CarouselResVo;
+import com.yanzuoguang.util.base.ObjectHelper;
+import com.yanzuoguang.util.helper.DateHelper;
+import com.yanzuoguang.util.helper.StringHelper;
+import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -29,4 +36,42 @@ public class CarouselServiceImpl implements CarouselService {
         }
         return load;
     }
+
+    @Override
+    public String save(CarouselReqVo req) {
+        if (StringHelper.isEmpty(req.getCarouselId())) {
+            CarouselVo carousel = new CarouselVo();
+            String carouselId = StringHelper.getNewID();
+            ObjectHelper.writeWithFrom(carousel, req);
+            carousel.setCarouselId(carouselId);
+            carousel.setCreateTime(DateHelper.getNow());
+            carouselDao.save(req);
+            return carouselId;
+        } else {
+            CarouselVo carousel = new CarouselVo();
+            carousel.setCarouselId(req.getCarouselId());
+            CarouselVo load = carouselDao.load(carousel, CarouselVo.class);
+            ObjectHelper.writeWithFrom(load, req);
+            load.setUpdateTime(DateHelper.getNow());
+            carouselDao.update(carousel);
+            return req.getCarouselId();
+        }
+    }
+
+    @Override
+    public PageSizeData<CarouselResVo> loadPage(CarouselLoadPageReqVo req) {
+        PageSizeData<CarouselResVo> page = carouselDao.loadPage(req, CarouselResVo.class);
+        return page;
+    }
+
+    @Override
+    public String remove(CarouselReqVo req) {
+        CarouselVo carousel = new CarouselVo();
+        carousel.setCarouselId(req.getCarouselId());
+        carouselDao.remove(carousel);
+        ImageReqVo imageReqVo = new ImageReqVo();
+        imageReqVo.setRelationId(req.getCarouselId());
+        imageService.remove(imageReqVo);
+        return req.getCarouselId();
+    }
 }

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

@@ -3,34 +3,28 @@ package com.tcm.common.service.impl;
 import com.tcm.common.dao.CenterDisplayDao;
 import com.tcm.common.dao.ImageDao;
 import com.tcm.common.service.CenterDisplayService;
-import com.tcm.common.util.CommonConstant;
+import com.tcm.common.service.ImageService;
 import com.tcm.util.area.CenterDisplayVo;
 import com.tcm.util.area.req.CenterDisplayReqVo;
-import com.tcm.util.area.res.CenterDisplayHomeLoadResVo;
-import com.tcm.util.area.res.CenterDisplayLoadResVo;
 import com.tcm.util.area.res.CenterDisplayResVo;
-import com.tcm.util.area.res.FloorAreaResVo;
-import com.tcm.util.common.ImageVo;
 import com.tcm.util.common.req.ImageReqVo;
-import com.tcm.util.common.req.TcmEnumReqVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.helper.DateHelper;
 import com.yanzuoguang.util.helper.StringHelper;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class CenterDisplayServiceImpl implements CenterDisplayService {
 
     private final CenterDisplayDao centerDisplayDao;
-    private final ImageDao imageDao;
+    private final ImageService imageService;
 
     public CenterDisplayServiceImpl(CenterDisplayDao centerDisplayDao,
-                                    ImageDao imageDao) {
+                                     ImageService imageService) {
         this.centerDisplayDao = centerDisplayDao;
-        this.imageDao = imageDao;
+        this.imageService = imageService;
     }
 
     @Override
@@ -70,11 +64,15 @@ public class CenterDisplayServiceImpl implements CenterDisplayService {
     }
 
     @Override
-    public String remove(TcmEnumReqVo req) {
+    public String remove(CenterDisplayReqVo req) {
         CenterDisplayVo centerDisplay = new CenterDisplayVo();
-        centerDisplay.setDisplayId(req.getEnumId());
+        centerDisplay.setDisplayId(req.getDisplayId());
         centerDisplayDao.remove(centerDisplay);
-        return req.getEnumId();
+
+        ImageReqVo imageReqVo = new ImageReqVo();
+        imageReqVo.setRelationId(req.getDisplayId());
+        imageService.remove(imageReqVo);
+        return req.getDisplayId();
     }
 
 }

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

+package com.tcm.common.web;
+
+import com.tcm.common.service.CarouselService;
+import com.tcm.util.area.req.CenterDisplayReqVo;
+import com.tcm.util.area.req.FloorReqVo;
+import com.tcm.util.area.res.CenterDisplayResVo;
+import com.tcm.util.common.req.CarouselLoadPageReqVo;
+import com.tcm.util.common.req.CarouselReqVo;
+import com.tcm.util.common.req.TcmEnumReqVo;
+import com.tcm.util.common.res.CarouselResVo;
+import com.yanzuoguang.util.vo.PageSizeData;
+import com.yanzuoguang.util.vo.ResponseResult;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/carousel")
+public class CarouselController {
+
+    private final CarouselService carouselService;
+
+    public CarouselController(CarouselService carouselService) {
+        this.carouselService = carouselService;
+    }
+
+    /**
+     * 区域新增
+     */
+    @RequestMapping("/save")
+    public ResponseResult<String> save(@RequestBody CarouselReqVo req) {
+        return ResponseResult.result(carouselService.save(req));
+
+    }
+    /**
+     * 展示区加载
+     */
+    @RequestMapping("/load")
+    public ResponseResult<CarouselResVo> load(@RequestBody CarouselReqVo req) {
+        return ResponseResult.result(carouselService.load(req));
+
+    }
+    /**
+     * 展示区列表
+     */
+    @RequestMapping("/loadPage")
+    public ResponseResult<PageSizeData<CarouselResVo>> loadPage(@RequestBody CarouselLoadPageReqVo req) {
+        return ResponseResult.result(carouselService.loadPage(req));
+
+    }
+
+    /**
+     * 展示区删除
+     */
+    @RequestMapping("/remove")
+    public ResponseResult<String> remove(@RequestBody CarouselReqVo req) {
+        return ResponseResult.result(carouselService.remove(req));
+
+    }
+}

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

@@ -55,7 +55,7 @@ public class CenterDisplayController {
      * 展示区删除
      */
     @RequestMapping("/remove")
-    public ResponseResult<String> remove(@RequestBody TcmEnumReqVo req) {
+    public ResponseResult<String> remove(@RequestBody CenterDisplayReqVo req) {
         return ResponseResult.result(centerDisplayService.remove(req));
 
     }

src/main/java/com/tcm/product/service/impl/ProductCategoryServiceImpl.java

 package com.tcm.product.service.impl;
 
+import com.tcm.common.service.ImageService;
 import com.tcm.product.dao.ProductCategoryDao;
 import com.tcm.product.dao.ProductDao;
 import com.tcm.product.dao.ProductExtendDao;
 import com.tcm.product.service.ProductCategoryService;
+import com.tcm.util.common.req.ImageReqVo;
 import com.tcm.util.product.ProductCategoryVo;
 import com.tcm.util.product.ProductExtendVo;
 import com.tcm.util.product.req.ProductCategoryLoadPageReqVo;
@@ -27,13 +29,15 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
     private final ProductCategoryDao productCategoryDao;
     private final ProductDao productDao;
     private final ProductExtendDao productExtendDao;
+    private final ImageService imageService;
 
     public ProductCategoryServiceImpl(ProductCategoryDao productCategoryDao,
                                       ProductDao productDao,
-                                      ProductExtendDao productExtendDao) {
+                                      ProductExtendDao productExtendDao, ImageService imageService) {
         this.productCategoryDao = productCategoryDao;
         this.productDao = productDao;
         this.productExtendDao = productExtendDao;
+        this.imageService = imageService;
     }
 
     @Override
@@ -78,6 +82,10 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
         productCategoryVo.setCategoryId(req.getCategoryId());
         productCategoryDao.remove(productCategoryVo);
         productDao.remove(productCategoryVo);
+
+        ImageReqVo imageReqVo = new ImageReqVo();
+        imageReqVo.setRelationId(req.getCategoryId());
+        imageService.remove(imageReqVo);
         return req.getCategoryId();
     }
 

src/main/java/com/tcm/product/service/impl/ProductServiceImpl.java

 package com.tcm.product.service.impl;
 
+import com.tcm.common.service.ImageService;
 import com.tcm.product.dao.ProductCategoryDao;
 import com.tcm.product.dao.ProductDao;
 import com.tcm.product.dao.ProductExtendDao;
 import com.tcm.product.service.ProductService;
+import com.tcm.util.common.req.ImageReqVo;
 import com.tcm.util.product.ProductExtendVo;
 import com.tcm.util.product.ProductVo;
 import com.tcm.util.product.req.ProductLoadPageReqVo;
 import com.tcm.util.product.req.ProductReqVo;
-import com.tcm.util.product.res.ProductCategoryResVo;
 import com.tcm.util.product.res.ProductResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.helper.DateHelper;
@@ -26,13 +27,16 @@ public class ProductServiceImpl implements ProductService {
     private final ProductDao productDao;
     private final ProductExtendDao productExtendDao;
     private final ProductCategoryDao productCategoryDao;
+    private final ImageService imageService;
 
     public ProductServiceImpl(ProductDao productDao,
                               ProductExtendDao productExtendDao,
-                              ProductCategoryDao productCategoryDao) {
+                              ProductCategoryDao productCategoryDao,
+                              ImageService imageService) {
         this.productDao = productDao;
         this.productExtendDao = productExtendDao;
         this.productCategoryDao = productCategoryDao;
+        this.imageService = imageService;
     }
 
 
@@ -104,6 +108,11 @@ public class ProductServiceImpl implements ProductService {
         ProductExtendVo productExtendVo = new ProductExtendVo();
         productExtendVo.setProductId(req.getProductId());
         productExtendDao.remove(productExtendVo);
+
+
+        ImageReqVo imageReqVo = new ImageReqVo();
+        imageReqVo.setRelationId(req.getProductId());
+        imageService.remove(imageReqVo);
         return req.getProductId();
     }
 
@@ -113,8 +122,11 @@ public class ProductServiceImpl implements ProductService {
         List<ProductExtendVo> productExtendList = productExtendDao.loadList(req, ProductExtendVo.class);
         Map<String, ProductExtendVo> productExtendVoMap = MapHelper.getMap(productExtendList, ProductExtendVo::getProductId);
         page.getList().forEach(item -> {
+            ImageReqVo imageReqVo = new ImageReqVo();
+            imageReqVo.setRelationId(item.getProductId());
+            item.setImageList(imageService.loadList(imageReqVo));
             item.setProductExtendVo(productExtendVoMap.get(item.getProductId()));
         });
-        return null;
+        return page;
     }
 }

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

+package com.tcm.util.common.req;
+
+import com.yanzuoguang.util.vo.PageSizeReqVo;
+
+public class CarouselLoadPageReqVo extends PageSizeReqVo {
+    /**
+     * 标题
+     */
+    private String title;
+    /**
+     * 内容类型
+     */
+    private Integer carouselType;
+    /**
+     * 内容状态0上架1下架
+     */
+    private Integer carouselStatus;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Integer getCarouselType() {
+        return carouselType;
+    }
+
+    public void setCarouselType(Integer carouselType) {
+        this.carouselType = carouselType;
+    }
+
+    public Integer getCarouselStatus() {
+        return carouselStatus;
+    }
+
+    public void setCarouselStatus(Integer carouselStatus) {
+        this.carouselStatus = carouselStatus;
+    }
+}

src/main/java/com/tcm/util/product/res/ProductResVo.java

 package com.tcm.util.product.res;
 
+import com.tcm.util.common.res.ImageResVo;
 import com.tcm.util.product.ProductExtendVo;
 import com.tcm.util.product.ProductVo;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ProductResVo extends ProductVo {
 
     private ProductExtendVo productExtendVo;
 
-    private String imageUrl;
+    private List<ImageResVo> imageList = new ArrayList<>();
 
 
-    public String getImageUrl() {
-        return imageUrl;
+    public List<ImageResVo> getImageList() {
+        return imageList;
     }
 
-    public void setImageUrl(String imageUrl) {
-        this.imageUrl = imageUrl;
+    public void setImageList(List<ImageResVo> imageList) {
+        this.imageList = imageList;
     }
 
     public ProductExtendVo getProductExtendVo() {