中医药小程序代码提交

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

 package com.tcm.common.dao;
 
+import com.tcm.util.area.req.FloorAreaLoadPageReqVo;
 import com.tcm.util.area.req.FloorAreaReqVo;
 import com.tcm.util.area.res.FloorAreaResVo;
 import com.yanzuoguang.dao.BaseDao;
+import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;
 
@@ -20,4 +22,11 @@ public interface FloorAreaDao extends BaseDao {
      * @return
      */
     FloorAreaResVo loadInfo(FloorAreaReqVo areaVo);
+
+    /**
+     * 分页加载区域
+     * @param req
+     * @return
+     */
+    PageSizeData<FloorAreaResVo> loadByPage(FloorAreaLoadPageReqVo req);
 }

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

@@ -2,9 +2,11 @@ package com.tcm.common.dao.impl;
 
 import com.tcm.common.dao.FloorAreaDao;
 import com.tcm.util.area.FloorAreaVo;
+import com.tcm.util.area.req.FloorAreaLoadPageReqVo;
 import com.tcm.util.area.req.FloorAreaReqVo;
 import com.tcm.util.area.res.FloorAreaResVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -38,4 +40,9 @@ public class FloorAreaDaoImpl extends BaseDaoImpl implements FloorAreaDao {
     public FloorAreaResVo loadInfo(FloorAreaReqVo req) {
         return this.queryFirst(FloorAreaResVo.class, SQL_LOAD_BY_SORT, req);
     }
+
+    @Override
+    public PageSizeData<FloorAreaResVo> loadByPage(FloorAreaLoadPageReqVo req) {
+        return this.queryPage(FloorAreaResVo.class, req, SQL_LOAD_BY_SORT, req);
+    }
 }

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

 package com.tcm.common.service;
 
+import com.tcm.util.area.req.FloorAreaLoadPageReqVo;
 import com.tcm.util.area.req.FloorAreaReqVo;
 import com.tcm.util.area.req.FloorLoadPageReqVo;
 import com.tcm.util.area.req.FloorReqVo;
@@ -31,7 +32,7 @@ public interface AreaService {
      * @param req
      * @return
      */
-    PageSizeData<FloorResVo> loadPage(FloorLoadPageReqVo req);
+    PageSizeData<FloorResVo> floorLoadPage(FloorLoadPageReqVo req);
 
     /**
      * 楼层删除
@@ -72,4 +73,11 @@ public interface AreaService {
      * @return
      */
     FloorHomeLoadResVo loadCenter(FloorReqVo req);
+
+    /**
+     * 区域分页
+     * @param req
+     * @return
+     */
+    PageSizeData<FloorAreaResVo> areaLoadPage(FloorAreaLoadPageReqVo req);
 }

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

@@ -35,4 +35,11 @@ public interface CarouselService {
      * @return
      */
     String remove(CarouselReqVo req);
+
+    /**
+     * 上下架
+     * @param req
+     * @return
+     */
+    String changeStatus(CarouselReqVo req);
 }

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

@@ -12,6 +12,7 @@ import com.tcm.util.area.FloorAreaExtendVo;
 import com.tcm.util.area.FloorAreaVo;
 import com.tcm.util.area.FloorExtendVo;
 import com.tcm.util.area.FloorVo;
+import com.tcm.util.area.req.FloorAreaLoadPageReqVo;
 import com.tcm.util.area.req.FloorAreaReqVo;
 import com.tcm.util.area.req.FloorLoadPageReqVo;
 import com.tcm.util.area.req.FloorReqVo;
@@ -71,6 +72,11 @@ public class AreaServiceImpl implements AreaService {
             floorExtendVo.setFloorExtendId(StringHelper.getNewID());
             floorExtendDao.create(floorExtendVo);
 
+            ImageReqVo imageReqVo = new ImageReqVo();
+            imageReqVo.setRelationId(floorId);
+            imageReqVo.setImageList(req.getImageList());
+            imageService.saveList(imageReqVo);
+
             return floorId;
         } else {
             FloorVo floor = new FloorVo();
@@ -90,6 +96,13 @@ public class AreaServiceImpl implements AreaService {
                 ObjectHelper.writeWithFrom(loadExtend, req.getFloorExtendVo());
                 floorExtendDao.update(floorExtendVo);
             }
+            //删除老图片
+            ImageReqVo imageReqVo = new ImageReqVo();
+            imageReqVo.setRelationId(req.getFloorId());
+            imageService.remove(imageReqVo);
+
+            imageReqVo.setImageList(req.getImageList());
+            imageService.saveList(imageReqVo);
 
             return req.getFloorId();
         }
@@ -101,6 +114,9 @@ public class AreaServiceImpl implements AreaService {
         floor.setFloorId(req.getFloorId());
         floor.setLanguageType(req.getLanguageType() == null ? CommonConstant.LANGUAGE_TYPE_CHINESE : req.getLanguageType());
         FloorResVo load = floorDao.loadInfo(floor);
+        FloorExtendVo floorExtendVo = new FloorExtendVo();
+        floorExtendVo.setFloorId(req.getFloorId());
+        load.setFloorExtendVo(floorExtendDao.load(floorExtendVo, FloorExtendVo.class));
 
         ImageReqVo imageReqVo = new ImageReqVo();
         imageReqVo.setRelationId(load.getFloorId());
@@ -110,7 +126,11 @@ public class AreaServiceImpl implements AreaService {
         areaReqVo.setFloorId(req.getFloorId());
         areaReqVo.setLanguageType(req.getLanguageType() == null ? CommonConstant.LANGUAGE_TYPE_CHINESE : req.getLanguageType());
         List<FloorAreaResVo> floorAreaResVoList = floorAreaDao.loadBySort(areaReqVo);
+        FloorAreaExtendVo areaExtendVo = new FloorAreaExtendVo();
         for (FloorAreaResVo floorAreaResVo : floorAreaResVoList) {
+            areaExtendVo.setAreaId(floorAreaResVo.getAreaId());
+            floorAreaResVo.setAreaExtendVo(floorAreaExtendDao.load(areaExtendVo, FloorAreaExtendVo.class));
+
             imageReqVo.setRelationId(floorAreaResVo.getAreaId());
             floorAreaResVo.setImageList(imageService.loadList(imageReqVo));
         }
@@ -120,7 +140,7 @@ public class AreaServiceImpl implements AreaService {
     }
 
     @Override
-    public PageSizeData<FloorResVo> loadPage(FloorLoadPageReqVo req) {
+    public PageSizeData<FloorResVo> floorLoadPage(FloorLoadPageReqVo req) {
         PageSizeData<FloorResVo> page = floorDao.loadByPage(req);
         return page;
     }
@@ -167,6 +187,9 @@ public class AreaServiceImpl implements AreaService {
         areaVo.setAreaId(req.getAreaId());
         areaVo.setLanguageType(req.getLanguageType() == null ? CommonConstant.LANGUAGE_TYPE_CHINESE : req.getLanguageType());
         FloorAreaResVo load = floorAreaDao.loadInfo(areaVo);
+        FloorAreaExtendVo areaExtendVo = new FloorAreaExtendVo();
+        areaExtendVo.setAreaId(req.getAreaId());
+        load.setAreaExtendVo(floorAreaExtendDao.load(areaExtendVo, FloorAreaExtendVo.class));
 
         ImageReqVo imageReq = new ImageReqVo();
         imageReq.setRelationId(load.getAreaId());
@@ -183,7 +206,7 @@ public class AreaServiceImpl implements AreaService {
             areaVo.setFloorId(areaId);
             ObjectHelper.writeWithFrom(areaVo, req);
             areaVo.setCreateTime(DateHelper.getNow());
-            floorAreaDao.save(areaVo);
+            floorAreaDao.create(areaVo);
 
             FloorAreaExtendVo areaExtendVo = new FloorAreaExtendVo();
             areaExtendVo.setAreaId(areaId);
@@ -191,6 +214,11 @@ public class AreaServiceImpl implements AreaService {
             ObjectHelper.writeWithFrom(areaExtendVo, req.getFloorAreaExtendVo());
             floorAreaExtendDao.create(areaExtendVo);
 
+            ImageReqVo imageReqVo = new ImageReqVo();
+            imageReqVo.setRelationId(areaId);
+            imageReqVo.setImageList(req.getImageVoList());
+            imageService.saveList(imageReqVo);
+
             return areaId;
         } else {
             FloorAreaVo areaVo = new FloorAreaVo();
@@ -212,6 +240,12 @@ public class AreaServiceImpl implements AreaService {
                 ObjectHelper.writeWithFrom(loadExtend, req.getFloorAreaExtendVo());
                 floorAreaExtendDao.update(loadExtend);
             }
+            ImageReqVo imageReqVo = new ImageReqVo();
+            imageReqVo.setRelationId(req.getAreaId());
+            imageService.remove(imageReqVo);
+
+            imageReqVo.setImageList(req.getImageVoList());
+            imageService.saveList(imageReqVo);
             return req.getFloorId();
         }
     }
@@ -255,4 +289,10 @@ public class AreaServiceImpl implements AreaService {
         floorHomeLoadResVo.setFloorAreaList(floorAreaList);
         return floorHomeLoadResVo;
     }
+
+    @Override
+    public PageSizeData<FloorAreaResVo> areaLoadPage(FloorAreaLoadPageReqVo req) {
+        PageSizeData<FloorAreaResVo> page = floorAreaDao.loadByPage(req);
+        return page;
+    }
 }

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

@@ -59,6 +59,11 @@ public class CarouselServiceImpl implements CarouselService {
             ObjectHelper.writeWithFrom(carouselExtend, req.getCarouselExtendVo());
             carouselExtendDao.create(carouselExtend);
 
+            ImageReqVo imageReqVo = new ImageReqVo();
+            imageReqVo.setRelationId(carouselId);
+            imageReqVo.setImageList(req.getImageList());
+            imageService.saveList(imageReqVo);
+
             return carouselId;
         } else {
             CarouselVo carousel = new CarouselVo();
@@ -81,6 +86,15 @@ public class CarouselServiceImpl implements CarouselService {
                 ObjectHelper.writeWithFrom(loadExtend, req.getCarouselExtendVo());
                 carouselExtendDao.update(carouselExtend);
             }
+            //删除老数据
+            ImageReqVo imageReqVo = new ImageReqVo();
+            imageReqVo.setRelationId(req.getCarouselId());
+            imageService.remove(imageReqVo);
+
+            //保存图片
+            imageReqVo.setImageList(req.getImageList());
+            imageService.saveList(imageReqVo);
+
             return req.getCarouselId();
         }
     }
@@ -88,6 +102,12 @@ public class CarouselServiceImpl implements CarouselService {
     @Override
     public PageSizeData<CarouselResVo> loadPage(CarouselLoadPageReqVo req) {
         PageSizeData<CarouselResVo> page = carouselDao.loadByPage(req);
+        CarouselExtendVo carouselExtend = new CarouselExtendVo();
+        for (CarouselResVo carouselResVo : page.getList()) {
+            carouselExtend.setCarouselId(carouselResVo.getCarouselId());
+            carouselExtend.setLanguageType(req.getLanguageType());
+            carouselResVo.setCarouselExtendVo(carouselExtendDao.load(carouselExtend, CarouselExtendVo.class));
+        }
         return page;
     }
 
@@ -106,4 +126,15 @@ public class CarouselServiceImpl implements CarouselService {
         imageService.remove(imageReqVo);
         return req.getCarouselId();
     }
+
+
+    @Override
+    public String changeStatus(CarouselReqVo req) {
+        CarouselVo carousel = new CarouselVo();
+        carousel.setCarouselId(req.getCarouselId());
+        CarouselVo load = carouselDao.load(carousel, CarouselVo.class);
+        load.setCarouselStatus(req.getCarouselStatus());
+        carouselDao.update(load);
+        return req.getCarouselId();
+    }
 }

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.req.*;
 import com.tcm.util.area.res.CenterDisplayHomeLoadResVo;
 import com.tcm.util.area.res.FloorAreaResVo;
 import com.tcm.util.area.res.FloorHomeLoadResVo;
@@ -44,11 +41,11 @@ public class AreaController {
     }
 
     /**
-     * 区域分页查询
+     * 楼层分页查询
      */
-    @RequestMapping("/loadPage")
-    public ResponseResult<PageSizeData<FloorResVo>> loadPage(@RequestBody FloorLoadPageReqVo req) {
-        return ResponseResult.result(areaService.loadPage(req));
+    @RequestMapping("/floorLoadPage")
+    public ResponseResult<PageSizeData<FloorResVo>> floorLoadPage(@RequestBody FloorLoadPageReqVo req) {
+        return ResponseResult.result(areaService.floorLoadPage(req));
 
     }
 
@@ -96,4 +93,13 @@ public class AreaController {
         return ResponseResult.result(areaService.loadCenter(req));
 
     }
+
+    /**
+     * 区域分页查询
+     */
+    @RequestMapping("/areaLoadPage")
+    public ResponseResult<PageSizeData<FloorAreaResVo>> areaLoadPage(@RequestBody FloorAreaLoadPageReqVo req) {
+        return ResponseResult.result(areaService.areaLoadPage(req));
+
+    }
 }

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

@@ -21,7 +21,7 @@ public class CarouselController {
     }
 
     /**
-     * 区域新增
+     * 内容新增
      */
     @RequestMapping("/save")
     public ResponseResult<String> save(@RequestBody CarouselReqVo req) {
@@ -29,7 +29,7 @@ public class CarouselController {
 
     }
     /**
-     * 展示区加载
+     * 内容加载
      */
     @RequestMapping("/load")
     public ResponseResult<CarouselResVo> load(@RequestBody CarouselReqVo req) {
@@ -37,7 +37,7 @@ public class CarouselController {
 
     }
     /**
-     * 展示区列表
+     * 内容列表
      */
     @RequestMapping("/loadPage")
     public ResponseResult<PageSizeData<CarouselResVo>> loadPage(@RequestBody CarouselLoadPageReqVo req) {
@@ -45,8 +45,18 @@ public class CarouselController {
 
     }
 
+
+    /**
+     * 上下架
+     */
+    @RequestMapping("/changeStatus")
+    public ResponseResult<String> changeStatus(@RequestBody CarouselReqVo req) {
+        return ResponseResult.result(carouselService.changeStatus(req));
+
+    }
+
     /**
-     * 展示区删除
+     * 内容删除
      */
     @RequestMapping("/remove")
     public ResponseResult<String> remove(@RequestBody CarouselReqVo req) {

src/main/java/com/tcm/product/dao/ProductDao.java

 package com.tcm.product.dao;
 
+import com.tcm.util.product.req.ProductLoadPageReqVo;
 import com.tcm.util.product.req.ProductReqVo;
 import com.tcm.util.product.res.ProductResVo;
 import com.yanzuoguang.dao.BaseDao;
+import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;
 
@@ -13,4 +15,11 @@ public interface ProductDao extends BaseDao {
      * @return
      */
     List<ProductResVo> loadInfoList(ProductReqVo productVo);
+
+    /**
+     * 分页加载
+     * @param req
+     * @return
+     */
+    PageSizeData<ProductResVo> loadByPage(ProductLoadPageReqVo req);
 }

src/main/java/com/tcm/product/dao/impl/ProductDaoImpl.java

@@ -2,9 +2,11 @@ package com.tcm.product.dao.impl;
 
 import com.tcm.product.dao.ProductDao;
 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.ProductResVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
+import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -13,6 +15,7 @@ import java.util.List;
 public class ProductDaoImpl extends BaseDaoImpl implements ProductDao {
 
     private static final String SQL_PRODUCT_LOAD_INFO = "product_load_info";
+    private static final String SQL_PRODUCT_LOAD_BY_PAGE = "product_load_by_page";
 
     @Override
     protected void init() {
@@ -20,12 +23,25 @@ public class ProductDaoImpl extends BaseDaoImpl implements ProductDao {
         table.add(SQL_PRODUCT_LOAD_INFO, "select p.* from tcm_product as p where 1=1 {WHERE} order by p.sort")
                 .add("productId", " AND p.product_id = ?")
                 .add("categoryId", " AND p.category_id =?")
-
         ;
+        table.add(SQL_PRODUCT_LOAD_BY_PAGE, "select p.* from tcm_product as p" +
+                " left join tcm_product_extend as pe on p.product_id = pe.product_id where 1=1 {WHERE} order by p.sort")
+                .add("productId", " AND p.product_id = ?")
+                .add("categoryId", " AND p.category_id =?")
+                .add("productName", " AND pe.product_name like concat('%',?,'%')")
+                .add("productType", " AND p.product_type =?")
+                .add("status", " AND p.status =?")
+                .add("position", " AND pe.position =?")
+                .add("categoryType", " AND p.category_type =?");
     }
 
     @Override
     public List<ProductResVo> loadInfoList(ProductReqVo req) {
         return query(ProductResVo.class, SQL_PRODUCT_LOAD_INFO, req);
     }
+
+    @Override
+    public PageSizeData<ProductResVo> loadByPage(ProductLoadPageReqVo req) {
+        return this.queryPage(ProductResVo.class, req, SQL_PRODUCT_LOAD_BY_PAGE, req);
+    }
 }

src/main/java/com/tcm/product/service/ProductService.java

@@ -44,4 +44,11 @@ public interface ProductService {
      * @return
      */
     PageSizeData<ProductResVo> displayList(ProductLoadPageReqVo req);
+
+    /**
+     * 上下架
+     * @param req
+     * @return
+     */
+    String changeStatus(ProductReqVo req);
 }

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

@@ -125,7 +125,7 @@ public class ProductServiceImpl implements ProductService {
 
         ProductExtendVo productExtendVo = new ProductExtendVo();
         productExtendVo.setProductId(req.getProductId());
-        productExtendVo.setLanguageType(req.getProductExtendVo().getLanguageType());
+        productExtendVo.setLanguageType(req.getLanguageType());
         ProductExtendVo loadExtend = productExtendDao.load(productExtendVo, ProductExtendVo.class);
         loadRes.setProductExtendVo(loadExtend);
 
@@ -138,7 +138,7 @@ public class ProductServiceImpl implements ProductService {
 
     @Override
     public PageSizeData<ProductResVo> loadPage(ProductLoadPageReqVo req) {
-        PageSizeData<ProductResVo> page = productDao.loadPage(req, ProductResVo.class);
+        PageSizeData<ProductResVo> page = productDao.loadByPage(req);
         ProductExtendVo productExtendVo = new ProductExtendVo();
         ImageReqVo imageReqVo = new ImageReqVo();
         for (ProductResVo res : page.getList()) {
@@ -183,4 +183,14 @@ public class ProductServiceImpl implements ProductService {
         });
         return page;
     }
+
+    @Override
+    public String changeStatus(ProductReqVo req) {
+        ProductVo productVo = new ProductVo();
+        productVo.setProductId(req.getProductId());
+        ProductVo load = productDao.load(productVo, ProductVo.class);
+        load.setStatus(req.getStatus());
+        productDao.update(load);
+        return req.getProductId();
+    }
 }

src/main/java/com/tcm/product/web/ProductController.java

@@ -48,6 +48,15 @@ public class ProductController {
 
     }
 
+    /**
+     * 产品上下架
+     */
+    @RequestMapping("/changeStatus")
+    public ResponseResult<String> changeStatus(@RequestBody ProductReqVo req) {
+        return ResponseResult.result(productService.changeStatus(req));
+
+    }
+
     /**
      * 产品删除
      */

src/main/java/com/tcm/util/area/req/FloorAreaLoadPageReqVo.java

+package com.tcm.util.area.req;
+
+import com.yanzuoguang.util.vo.PageSizeReqVo;
+
+public class FloorAreaLoadPageReqVo extends PageSizeReqVo {
+
+    private String floorId;
+
+    private String areaId;
+
+    private Integer languageType;
+
+    private String areaName;
+
+    private Integer areaStatus;
+
+    public String getFloorId() {
+        return floorId;
+    }
+
+    public void setFloorId(String floorId) {
+        this.floorId = floorId;
+    }
+
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
+    public Integer getLanguageType() {
+        return languageType;
+    }
+
+    public void setLanguageType(Integer languageType) {
+        this.languageType = languageType;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
+    public Integer getAreaStatus() {
+        return areaStatus;
+    }
+
+    public void setAreaStatus(Integer areaStatus) {
+        this.areaStatus = areaStatus;
+    }
+}

src/main/java/com/tcm/util/area/req/FloorAreaReqVo.java

@@ -2,6 +2,9 @@ package com.tcm.util.area.req;
 
 import com.tcm.util.area.FloorAreaExtendVo;
 import com.tcm.util.area.FloorAreaVo;
+import com.tcm.util.common.ImageVo;
+
+import java.util.List;
 
 public class FloorAreaReqVo extends FloorAreaVo {
 
@@ -9,6 +12,16 @@ public class FloorAreaReqVo extends FloorAreaVo {
 
     private FloorAreaExtendVo floorAreaExtendVo;
 
+    private List<ImageVo> imageVoList;
+
+    public List<ImageVo> getImageVoList() {
+        return imageVoList;
+    }
+
+    public void setImageVoList(List<ImageVo> imageVoList) {
+        this.imageVoList = imageVoList;
+    }
+
     public FloorAreaExtendVo getFloorAreaExtendVo() {
         return floorAreaExtendVo;
     }

src/main/java/com/tcm/util/area/req/FloorReqVo.java

@@ -2,6 +2,10 @@ package com.tcm.util.area.req;
 
 import com.tcm.util.area.FloorExtendVo;
 import com.tcm.util.area.FloorVo;
+import com.tcm.util.common.ImageVo;
+import com.tcm.util.common.res.ImageResVo;
+
+import java.util.List;
 
 public class FloorReqVo extends FloorVo {
 
@@ -10,6 +14,7 @@ public class FloorReqVo extends FloorVo {
     private Integer languageType;
 
     private FloorExtendVo floorExtendVo;
+    private List<ImageVo> imageList;
 
     public FloorExtendVo getFloorExtendVo() {
         return floorExtendVo;
@@ -42,4 +47,12 @@ public class FloorReqVo extends FloorVo {
     public void setAreaStatus(Integer areaStatus) {
         this.areaStatus = areaStatus;
     }
+
+    public List<ImageVo> getImageList() {
+        return imageList;
+    }
+
+    public void setImageList(List<ImageVo> imageList) {
+        this.imageList = imageList;
+    }
 }

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

 package com.tcm.util.area.res;
 
+import com.tcm.util.area.FloorAreaExtendVo;
 import com.tcm.util.area.FloorAreaVo;
+import com.tcm.util.area.FloorExtendVo;
 import com.tcm.util.common.res.ImageResVo;
 import com.yanzuoguang.dao.TableAnnotation;
 import io.swagger.annotations.ApiModelProperty;
@@ -28,6 +30,8 @@ public class FloorAreaResVo extends FloorAreaVo {
     @ApiModelProperty(notes = "区域具体位置介绍")
     private String position;
 
+    private FloorAreaExtendVo areaExtendVo;
+
 
     public String getAreaName() {
         return areaName;
@@ -62,4 +66,12 @@ public class FloorAreaResVo extends FloorAreaVo {
     public void setImageList(List<ImageResVo> imageList) {
         this.imageList = imageList;
     }
+
+    public FloorAreaExtendVo getAreaExtendVo() {
+        return areaExtendVo;
+    }
+
+    public void setAreaExtendVo(FloorAreaExtendVo areaExtendVo) {
+        this.areaExtendVo = areaExtendVo;
+    }
 }

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

 package com.tcm.util.area.res;
 
+import com.tcm.util.area.FloorExtendVo;
 import com.tcm.util.area.FloorVo;
 import com.tcm.util.common.res.ImageResVo;
 
@@ -11,6 +12,8 @@ public class FloorResVo extends FloorVo {
     private String floorName;
     private String floorDesc;
 
+    private FloorExtendVo floorExtendVo;
+
     private List<FloorAreaResVo> floorAreaVoList = new ArrayList<>();
 
     private List<ImageResVo> imageResVoList = new ArrayList<>();
@@ -46,4 +49,12 @@ public class FloorResVo extends FloorVo {
     public void setFloorDesc(String floorDesc) {
         this.floorDesc = floorDesc;
     }
+
+    public FloorExtendVo getFloorExtendVo() {
+        return floorExtendVo;
+    }
+
+    public void setFloorExtendVo(FloorExtendVo floorExtendVo) {
+        this.floorExtendVo = floorExtendVo;
+    }
 }

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

@@ -20,6 +20,14 @@ public class CarouselVo {
     @TableAnnotation("carousel_type")
     @ApiModelProperty(notes = "内容类型")
     private Integer carouselType;
+
+    /**
+     * 打开类型0当前页1新页面
+     */
+    @TableAnnotation("open_type")
+    @ApiModelProperty(notes = "内容类型")
+    private Integer openType;
+
     /**
      * 资源url
      */
@@ -33,7 +41,7 @@ public class CarouselVo {
     @ApiModelProperty(notes = "关联内容url")
     private String linkUrl;
     /**
-     * 展示位置
+     * 展示位置0首页
      */
     @TableAnnotation("display_position")
     @ApiModelProperty(notes = "展示位置")
@@ -167,4 +175,12 @@ public class CarouselVo {
     public void setUpdateTime(String updateTime) {
         this.updateTime = updateTime;
     }
+
+    public Integer getOpenType() {
+        return openType;
+    }
+
+    public void setOpenType(Integer openType) {
+        this.openType = openType;
+    }
 }

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

@@ -3,6 +3,7 @@ package com.tcm.util.common.req;
 import com.tcm.util.common.CarouselExtendVo;
 import com.tcm.util.common.CarouselVo;
 import com.tcm.util.common.ImageVo;
+import com.tcm.util.common.res.ImageResVo;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,13 +14,6 @@ public class CarouselReqVo extends CarouselVo {
 
     private CarouselExtendVo carouselExtendVo;
 
-    public CarouselExtendVo getCarouselExtendVo() {
-        return carouselExtendVo;
-    }
-
-    public void setCarouselExtendVo(CarouselExtendVo carouselExtendVo) {
-        this.carouselExtendVo = carouselExtendVo;
-    }
 
     private List<ImageVo> imageList = new ArrayList<>();
 
@@ -38,4 +32,12 @@ public class CarouselReqVo extends CarouselVo {
     public void setLanguageType(Integer languageType) {
         this.languageType = languageType;
     }
+
+    public CarouselExtendVo getCarouselExtendVo() {
+        return carouselExtendVo;
+    }
+
+    public void setCarouselExtendVo(CarouselExtendVo carouselExtendVo) {
+        this.carouselExtendVo = carouselExtendVo;
+    }
 }

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

 package com.tcm.util.common.res;
 
+import com.tcm.util.common.CarouselExtendVo;
 import com.tcm.util.common.CarouselVo;
 import com.yanzuoguang.dao.TableAnnotation;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,6 +20,15 @@ public class CarouselResVo extends CarouselVo {
     @ApiModelProperty(notes = "文字介绍")
     private String carouselInfo;
 
+    private CarouselExtendVo carouselExtendVo;
+
+    public CarouselExtendVo getCarouselExtendVo() {
+        return carouselExtendVo;
+    }
+
+    public void setCarouselExtendVo(CarouselExtendVo carouselExtendVo) {
+        this.carouselExtendVo = carouselExtendVo;
+    }
 
     public String getTitle() {
         return title;

src/main/java/com/tcm/util/product/ProductVo.java

@@ -28,9 +28,24 @@ public class ProductVo {
     /**
      * 产品类型1 - 大健康产品，2 - 预约产品
      */
-    @TableAnnotation("product_type")
+    @TableAnnotation("category_type")
     @ApiModelProperty(notes = "产品类型1 - 大健康产品，2 - 预约产品")
+    private Integer categoryType;
+
+    /**
+     * 产品分类0茶饮类1理疗类2器械类3针灸4推拿5拔罐6熏蒸7养生
+     */
+    @TableAnnotation("product_type")
+    @ApiModelProperty(notes = "产品分类0茶饮类1理疗类2器械类3针灸4推拿5拔罐6熏蒸7养生")
     private Integer productType;
+    /**
+     * 是否推荐0推荐1不推荐
+     */
+    @TableAnnotation("is_recommend")
+    @ApiModelProperty(notes = "产品类型1 - 大健康产品，2 - 预约产品")
+    private Integer isRecommend;
+
+
     /**
      * 可约人数 / 天（仅预约产品）
      */
@@ -192,4 +207,20 @@ public class ProductVo {
     public void setUpdateTime(String updateTime) {
         this.updateTime = updateTime;
     }
+
+    public Integer getCategoryType() {
+        return categoryType;
+    }
+
+    public void setCategoryType(Integer categoryType) {
+        this.categoryType = categoryType;
+    }
+
+    public Integer getIsRecommend() {
+        return isRecommend;
+    }
+
+    public void setIsRecommend(Integer isRecommend) {
+        this.isRecommend = isRecommend;
+    }
 }

src/main/java/com/tcm/util/product/req/ProductLoadPageReqVo.java

@@ -7,6 +7,7 @@ public class ProductLoadPageReqVo extends PageSizeReqVo {
     private String productName;
     private String productCategoryId;
     private String productStatus;
+    private Integer productType;
     private Integer languageType;
 
     public String getProductId() {
@@ -48,4 +49,12 @@ public class ProductLoadPageReqVo extends PageSizeReqVo {
     public void setLanguageType(Integer languageType) {
         this.languageType = languageType;
     }
+
+    public Integer getProductType() {
+        return productType;
+    }
+
+    public void setProductType(Integer productType) {
+        this.productType = productType;
+    }
 }

src/main/java/com/tcm/util/product/req/ProductReqVo.java

@@ -11,6 +11,16 @@ public class ProductReqVo extends ProductVo {
 
     private ProductExtendVo productExtendVo;
 
+    private Integer languageType;
+
+    public Integer getLanguageType() {
+        return languageType;
+    }
+
+    public void setLanguageType(Integer languageType) {
+        this.languageType = languageType;
+    }
+
     private List<ImageVo> imageList = new ArrayList<>();
 
     public List<ImageVo> getImageList() {