update

src/main/java/com/mmc/pms/controller/MiniProgramDeviceController.java

@@ -2,8 +2,7 @@ package com.mmc.pms.controller;
 
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.common.ResultEnum;
-import com.mmc.pms.model.dto.WareInfoDTO;
-import com.mmc.pms.model.dto.WareInfoItemDTO;
+import com.mmc.pms.model.dto.*;
 import com.mmc.pms.model.qo.WareInfoQO;
 import com.mmc.pms.model.vo.LeaseVo;
 import com.mmc.pms.page.Page;
@@ -34,33 +33,35 @@ public class MiniProgramDeviceController {
 
   @ApiOperation("设备类目")
   @GetMapping("/category")
-  public ResultBody category() {
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DeviceCategoryDTO.class)})
+  public ResultBody<DeviceCategoryDTO> category() {
     return webDeviceService.category();
   }
 
   @ApiOperation("品牌")
   @GetMapping("/brand")
-  public ResultBody brand() {
+  public ResultBody<BrandDTO> brand() {
     return webDeviceService.brand();
   }
 
   @ApiOperation("型号")
   @GetMapping("/model")
-  public ResultBody model() {
+  public ResultBody<ModelDTO> model() {
     return webDeviceService.model();
   }
 
   @ApiOperation(value = "设备列表筛选")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = WareInfoItemDTO.class)})
   @PostMapping("/deviceList")
-  public ResultBody listWareInfoPage(@RequestBody @Validated(Page.class) WareInfoQO param) {
+  public ResultBody<WareInfoItemDTO> listWareInfoPage(
+      @RequestBody @Validated(Page.class) WareInfoQO param) {
     return webDeviceService.listWareInfoPage(param);
   }
 
   @ApiOperation(value = "设备详情")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
   @GetMapping("/detail")
-  public ResultBody detail(@RequestParam(value = "id", required = true) Integer id) {
+  public ResultBody<WareInfoDTO> detail(@RequestParam(value = "id", required = true) Integer id) {
     WareInfoDTO wareInfoDTO = webDeviceService.getWareInfoById(id);
     return wareInfoDTO == null
         ? ResultBody.error(ResultEnum.NOT_FOUND)

src/main/java/com/mmc/pms/controller/MiniProgramProductMallController.java

@@ -25,14 +25,15 @@ public class MiniProgramProductMallController {
   @ApiOperation(value = "小程序-商品信息-分页")
   @PostMapping("listPageGoodsInfo")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = GoodsInfoListDTO.class)})
-  public ResultBody listPageGoodsInfo(@ApiParam("商品查询条件QO") @RequestBody GoodsInfoQO param) {
+  public ResultBody<GoodsInfoListDTO> listPageGoodsInfo(
+      @ApiParam("商品查询条件QO") @RequestBody GoodsInfoQO param) {
     return ResultBody.success(webProductMallService.listPageGoodsInfo(param));
   }
 
   @ApiOperation(value = "小程序端-获取商品详细信息--共多少种选择")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppGoodsInfoDetailDTO.class)})
   @GetMapping("getAppGoodsInfoDetail")
-  public ResultBody getAppGoodsInfoDetail(@RequestParam Integer id) {
+  public ResultBody<AppGoodsInfoDetailDTO> getAppGoodsInfoDetail(@RequestParam Integer id) {
     return miniProgramProductMallService.getAppGoodsInfoDetail(id);
   }
 }

src/main/java/com/mmc/pms/controller/WebDeviceController.java

@@ -2,18 +2,14 @@ package com.mmc.pms.controller;
 
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.common.ResultEnum;
-import com.mmc.pms.model.dto.WareInfoDTO;
-import com.mmc.pms.model.dto.WareInfoItemDTO;
-import com.mmc.pms.model.qo.WareInfoQO;
+import com.mmc.pms.model.dto.*;
 import com.mmc.pms.model.vo.LeaseVo;
-import com.mmc.pms.page.Page;
 import com.mmc.pms.service.WebDeviceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -29,39 +25,32 @@ public class WebDeviceController {
   @ApiOperation(value = "地域")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
   @GetMapping("/getSecondDistrictInfo")
-  public ResultBody getSecondDistrictInfo() {
+  public ResultBody<DistrictInfoDTO> getSecondDistrictInfo() {
     return webDeviceService.listSecondDistrict();
   }
 
   @ApiOperation("设备类目")
   @GetMapping("/category")
-  public ResultBody category() {
+  public ResultBody<DeviceCategoryDTO> category() {
     return webDeviceService.category();
   }
 
   @ApiOperation("品牌")
   @GetMapping("/brand")
-  public ResultBody brand() {
+  public ResultBody<BrandDTO> brand() {
     return webDeviceService.brand();
   }
 
   @ApiOperation("型号")
   @GetMapping("/model")
-  public ResultBody model() {
+  public ResultBody<ModelDTO> model() {
     return webDeviceService.model();
   }
 
-  @ApiOperation(value = "设备列表筛选")
-  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = WareInfoItemDTO.class)})
-  @PostMapping("/deviceList")
-  public ResultBody listWareInfoPage(@RequestBody @Validated(Page.class) WareInfoQO param) {
-    return webDeviceService.listWareInfoPage(param);
-  }
-
   @ApiOperation(value = "设备详情")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
   @GetMapping("/detail")
-  public ResultBody detail(@RequestParam(value = "id", required = true) Integer id) {
+  public ResultBody<WareInfoDTO> detail(@RequestParam(value = "id", required = true) Integer id) {
     WareInfoDTO wareInfoDTO = webDeviceService.getWareInfoById(id);
     return wareInfoDTO == null
         ? ResultBody.error(ResultEnum.NOT_FOUND)

src/main/java/com/mmc/pms/controller/WebProductMallController.java

@@ -3,6 +3,7 @@ package com.mmc.pms.controller;
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.model.dto.AppGoodsInfoDetailDTO;
 import com.mmc.pms.model.dto.GoodsInfoListDTO;
+import com.mmc.pms.model.dto.ProductCategoryDTO;
 import com.mmc.pms.model.qo.GoodsInfoQO;
 import com.mmc.pms.service.MiniProgramProductMallService;
 import com.mmc.pms.service.WebProductMallService;
@@ -23,33 +24,34 @@ public class WebProductMallController {
 
   @ApiOperation("产品类目")
   @GetMapping("/category")
-  public ResultBody productCategory() {
+  public ResultBody<ProductCategoryDTO> productCategory() {
     return webProductMallService.productCategory();
   }
 
   @ApiOperation("产品部件")
   @GetMapping("/parts")
-  public ResultBody productParts() {
+  public ResultBody<ProductCategoryDTO> productParts() {
     return webProductMallService.productParts();
   }
 
   @ApiOperation("产品成色")
   @GetMapping("/quality")
-  public ResultBody productQuality() {
+  public ResultBody<ProductCategoryDTO> productQuality() {
     return webProductMallService.productQuality();
   }
 
-  @ApiOperation(value = "Web端-商品信息-分页")
+  @ApiOperation(value = "小程序-商品信息-分页")
   @PostMapping("listPageGoodsInfo")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = GoodsInfoListDTO.class)})
-  public ResultBody listPageGoodsInfo(@ApiParam("商品查询条件QO") @RequestBody GoodsInfoQO param) {
+  public ResultBody<GoodsInfoListDTO> listPageGoodsInfo(
+      @ApiParam("商品查询条件QO") @RequestBody GoodsInfoQO param) {
     return ResultBody.success(webProductMallService.listPageGoodsInfo(param));
   }
 
-  @ApiOperation(value = "Web端-获取商品详细信息--共多少种选择")
+  @ApiOperation(value = "小程序端-获取商品详细信息--共多少种选择")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppGoodsInfoDetailDTO.class)})
   @GetMapping("getAppGoodsInfoDetail")
-  public ResultBody getAppGoodsInfoDetail(@RequestParam Integer id) {
+  public ResultBody<AppGoodsInfoDetailDTO> getAppGoodsInfoDetail(@RequestParam Integer id) {
     return miniProgramProductMallService.getAppGoodsInfoDetail(id);
   }
 }

src/main/java/com/mmc/pms/model/dto/WareInfoDTO.java

 package com.mmc.pms.model.dto;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -18,7 +17,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.dto.WareInfoDTO", description = "商品视频DTO")
+// @ApiModel(value = "com.mmc.csf.model.dto.WareInfoDTO", description = "商品视频DTO")
 public class WareInfoDTO implements Serializable {
   private static final long serialVersionUID = -4916469576205012865L;
 

src/main/java/com/mmc/pms/model/vo/LeaseVo.java

 package com.mmc.pms.model.vo;
 
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -14,7 +13,7 @@ import javax.validation.constraints.NotBlank;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.pms.model.vo.LeaseVo", description = "立即租赁")
+// @ApiModel(value = "com.mmc.pms.model.vo.LeaseVo", description = "立即租赁")
 public class LeaseVo {
   private static final long serialVersionUID = -8917940296555539559L;