Merge branch 'develop'

.github/workflows/develop.yml

@@ -106,8 +106,21 @@ jobs:
           git commit -am "Update Image Tag"
           git push origin develop
 
-      #- name: Commit files
-      #  run: |
-      #    git config --local user.email "Chuck@users.noreply.github.com"
-      #    git config --local user.name "Chuck"
-      #    git commit -am "Image Update"
+      - name: Tag and Push
+        run: |
+          git tag -a $TAG -m "日常迭代"
+          git push origin develop --tags
+
+      - name: Send Error Notification by WeChat
+        if: ${{ failure() }}
+        run: |
+          curl 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=9be1b073-1760-442d-8e3d-faa0fd32ea16' -H 'Content-Type: application/json' -d '
+          {
+            "msgtype": "markdown",
+            "markdown": {
+              "content": "### `GitHub构建并推送镜像失败` \n
+                          > - 提交人: ${{github.actor}} \n
+                          > - 提交信息: ${{github.event.head_commit.message}} \n
+                          > - 提交到仓库: ${{github.repository}} \n
+                          > - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交..."
+          }'

.github/workflows/master.yml

@@ -111,8 +111,21 @@ jobs:
           git commit -am "Update Image Tag"
           git push origin master
 
-      #- name: Commit files
-      #  run: |
-      #    git config --local user.email "Chuck@users.noreply.github.com"
-      #    git config --local user.name "Chuck"
-      #    git commit -am "Image Update"
+      - name: Tag and Push
+        run: |
+          git tag -a $TAG -m "日常迭代"
+          git push origin master --tags
+
+      - name: Send Error Notification by WeChat
+        if: ${{ failure() }}
+        run: |
+          curl 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=9be1b073-1760-442d-8e3d-faa0fd32ea16' -H 'Content-Type: application/json' -d '
+          {
+            "msgtype": "markdown",
+            "markdown": {
+              "content": "### `GitHub构建并推送镜像失败` \n
+                          > - 提交人: ${{github.actor}} \n
+                          > - 提交信息: ${{github.event.head_commit.message}} \n
+                          > - 提交到仓库: ${{github.repository}} \n
+                          > - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交..."
+          }'

kustomization/base/deployment.yaml

@@ -53,6 +53,31 @@ spec:
                 configMapKeyRef:
                   name: pms-map
                   key: SW_AGENT_NAME
+            - name: MYSQL_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: iuav-secret
+                  key: MYSQL_PASSWORD
+            - name: REDIS_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: iuav-secret
+                  key: REDIS_PASSWORD
+            - name: OSS_ACCESS_KEY_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: iuav-secret
+                  key: OSS_ACCESS_KEY_SECRET
+            - name: WECHAT_SUB_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: iuav-secret
+                  key: WECHAT_SUB_SECRET
+            - name: WECHAT_APPLET_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: iuav-secret
+                  key: WECHAT_APPLET_SECRET
       volumes:
         - name: log-of-app
           hostPath:

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 757f0a2dc9e893e41007e7f05972b846146bb4f9
+  newTag: 52d8be6d96c5022b3a7060b7064e3f4e85a6eb6c

src/main/java/com/mmc/pms/common/ResultBody.java

 package com.mmc.pms.common;
 
 import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -15,8 +16,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel("统一返回对象")
-// @ApiModel(value = "com.mmc.result.ResultBody", description = "请求响应体")
+@ApiModel(description = "请求响应体")
 public class ResultBody<T> implements Serializable {
   private static final long serialVersionUID = 6341937455634693363L;
 

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

@@ -95,6 +95,15 @@ public class BackstageCategoriesController {
     return categoriesService.getClassifyDetails(id);
   }
 
+  @ApiOperation(value = "获取二级分类")
+  @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ClassifyDetailsDTO.class)})
+  @GetMapping("getSubClassifyList")
+  public ResultBody<List<ClassifyDetailsDTO>> getSubClassifyList(
+          @ApiParam(value = "父分类id", required = true) @RequestParam(value = "id") Integer id) {
+    return categoriesService.getSubClassifyList(id);
+  }
+
+
   @ApiOperation(value = "分类详情下关联业务列表")
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = RelevantBusinessVO.class)})
   @GetMapping("queryRelevantBusiness")

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

@@ -61,7 +61,7 @@ public class ProductMallController extends BaseController {
   @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CategoryTypeDTO.class)})
   @GetMapping("/getPageHomeCategories")
   public ResultBody<CategoryTypeDTO> getPageHomeCategories(
-      @ApiParam(value = "类型:1：作业服务 2：设备 3：培训 4：产品商城") @RequestParam(value = "type") Integer type) {
+      @ApiParam(value = "类型:1：作业服务 2：设备 3：培训 4：产品商城 5:无人机保险 6：无人机工具软件") @RequestParam(value = "type") Integer type) {
     return webDeviceService.getPageHomeCategories(type);
   }
 

src/main/java/com/mmc/pms/dao/CategoriesDao.java

@@ -64,4 +64,10 @@ public interface CategoriesDao {
   List<Categories> getCategoriesListByDirectoryIds(List<Integer> directoryIds);
 
   int countChildById(Integer id);
+
+  List<Categories> getSubClassifyList(Integer id);
+
+  List<Categories> listCategoryByInsurance();
+
+  List<Categories> listCategoryBySoftware();
 }

src/main/java/com/mmc/pms/entity/GoodsInfo.java

@@ -60,6 +60,8 @@ public class GoodsInfo implements Serializable {
 
   private String directoryName;
 
+  private String goodsDesc;
+
   private static final long serialVersionUID = 1L;
 
   public GoodsInfo(GoodsAddVO goodsAddVO) {
@@ -87,7 +89,7 @@ public class GoodsInfo implements Serializable {
   }
 
   public LeaseGoodsInfoDTO buildLeaseGoodsInfoDTO() {
-    return LeaseGoodsInfoDTO.builder().id(id).goodsName(goodsName).images(mainImg).build();
+    return LeaseGoodsInfoDTO.builder().id(id).goodsName(goodsName).description(goodsDesc).images(mainImg).build();
   }
 
   public GoodsInfoListDTO buildGoodsInfoListDTO() {

src/main/java/com/mmc/pms/model/categories/dto/CategoriesInfoListDTO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * Auto-generated: 2023-06-08 16:2:43
@@ -21,7 +22,9 @@ import java.io.Serializable;
 public class CategoriesInfoListDTO implements Serializable {
   private static final long serialVersionUID = -8381856228953745772L;
   private Integer id;
+  private Integer pid;
   private Integer directoryId;
   private String name;
   private String icon;
+  private List<CategoriesInfoListDTO> children;
 }

src/main/java/com/mmc/pms/model/lease/dto/LeaseGoodsInfoDTO.java

@@ -24,6 +24,8 @@ public class LeaseGoodsInfoDTO implements Serializable {
     private String goodsName;
     @ApiModelProperty(value = "商品图片")
     private String images;
+    @ApiModelProperty(value = "描述")
+    private String description;
     @ApiModelProperty(value = "价格")
     private BigDecimal price;
 }

src/main/java/com/mmc/pms/model/lease/dto/WareDetailDTO.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.dto.WareDetailDTO", description = "商品详情信息DTO")
+@ApiModel(description = "商品详情信息DTO")
 public class WareDetailDTO implements Serializable {
   private static final long serialVersionUID = -5359420720425156463L;
 

src/main/java/com/mmc/pms/model/lease/dto/WareImgDTO.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.pms.model.lease.dto.WareImgDTO", description = "设备图片DTO")
+@ApiModel(description = "设备图片DTO")
 public class WareImgDTO implements Serializable {
   private static final long serialVersionUID = 1195966760401573468L;
 

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

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

src/main/java/com/mmc/pms/model/lease/dto/WareInfoItemDTO.java

 package com.mmc.pms.model.lease.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -18,7 +19,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-//@ApiModel(value = "com.mmc.pms.model.lease.dto.WareInfoItemDTO", description = "设备列表ItemDTO")
+@ApiModel(description = "设备列表ItemDTO")
 public class WareInfoItemDTO implements Serializable {
   private static final long serialVersionUID = -4354269497656808831L;
 

src/main/java/com/mmc/pms/model/lease/dto/WarePropDTO.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.dto.WarePropDTO", description = "商品活动海报信息DTO")
+@ApiModel(description = "商品活动海报信息DTO")
 public class WarePropDTO implements Serializable {
   private static final long serialVersionUID = 7641929218904130060L;
 

src/main/java/com/mmc/pms/model/lease/dto/WareVideoDTO.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.dto.WareVideoDTO", description = "商品视频DTO")
+@ApiModel(description = "商品视频DTO")
 public class WareVideoDTO implements Serializable {
   private static final long serialVersionUID = 8707716829904299103L;
 

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

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

src/main/java/com/mmc/pms/model/lease/vo/WareImgVO.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.vo.WareImgVO", description = "新增/修改参数类")
+@ApiModel(description = "新增/修改参数类")
 public class WareImgVO implements Serializable {
     private static final long serialVersionUID = 7742617679026160607L;
 

src/main/java/com/mmc/pms/model/lease/vo/WareInfoVO.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.vo.WareInfoVO", description = "新增/修改参数类")
+@ApiModel(description = "新增/修改参数类")
 public class WareInfoVO implements Serializable {
     private static final long serialVersionUID = -4503117649945902464L;
 

src/main/java/com/mmc/pms/model/lease/vo/WareSkuInfoVO.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.vo.WareSkuInfoVO", description = "新增/修改参数类")
+@ApiModel(description = "新增/修改参数类")
 public class WareSkuInfoVO implements Serializable {
     private static final long serialVersionUID = 7401232386069965527L;
 

src/main/java/com/mmc/pms/model/lease/vo/WareSkuPriceVO.java

@@ -20,7 +20,7 @@ import java.math.BigDecimal;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.vo.WareSkuInfoVO", description = "新增/修改参数类")
+@ApiModel(description = "新增/修改参数类")
 public class WareSkuPriceVO implements Serializable {
     private static final long serialVersionUID = -3033801564005806565L;
 

src/main/java/com/mmc/pms/model/order/dto/OrderGoodsIndstDTO.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.mall.dto.OrderGoodsIndstDTO", description = "行业订单DTO")
+@ApiModel(description = "行业订单DTO")
 public class OrderGoodsIndstDTO implements Serializable {
     private static final long serialVersionUID = -1809741999941834440L;
     @ApiModelProperty(value = "id")

src/main/java/com/mmc/pms/model/order/dto/OrderGoodsIndstDetailDTO.java

@@ -21,7 +21,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.mall.dto.OrderGoodsIndstDetailDTO", description = "行业订单规格DTO")
+@ApiModel(description = "行业订单规格DTO")
 public class OrderGoodsIndstDetailDTO implements Serializable {
     private static final long serialVersionUID = 3716298704318911013L;
     @ApiModelProperty(value = "行业订单规格id")

src/main/java/com/mmc/pms/model/order/dto/OrderGoodsProdDTO.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.mall.dto.OrderGoodsProdDTO", description = "订单商品sku信息DTO")
+@ApiModel(description = "订单商品sku信息DTO")
 public class OrderGoodsProdDTO implements Serializable {
     private static final long serialVersionUID = 2066849435828937057L;
     @ApiModelProperty(value = "orderGoodsProdId")

src/main/java/com/mmc/pms/model/order/dto/OrderGoodsProdDetailDTO.java

@@ -20,7 +20,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.mall.dto.OrderGoodsProdDetailDTO", description = "订单最小sku信息")
+@ApiModel(description = "订单最小sku信息")
 public class OrderGoodsProdDetailDTO implements Serializable {
     private static final long serialVersionUID = 2079521148328016486L;
     @ApiModelProperty(value = "id")

src/main/java/com/mmc/pms/model/order/dto/OrderInfoDTO.java

@@ -2,6 +2,7 @@ package com.mmc.pms.model.order.dto;
 
 import com.mmc.pms.entity.RepoCashDO;
 import com.mmc.pms.model.other.dto.KdnExpDTO;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -20,7 +21,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.OrderInfoDTO", description = "云仓订单DTO")
+@ApiModel(description = "云仓订单DTO")
 public class OrderInfoDTO implements Serializable {
     private static final long serialVersionUID = 1572467108563651846L;
 

src/main/java/com/mmc/pms/model/order/dto/OrderReceiptDTO.java

 package com.mmc.pms.model.order.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -15,7 +16,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.OrderReceiptDTO", description = "订单收货信息DTO")
+@ApiModel( description = "订单收货信息DTO")
 public class OrderReceiptDTO implements Serializable {
     private static final long serialVersionUID = -6212026509857770276L;
 

src/main/java/com/mmc/pms/model/order/dto/OrderRefundDTO.java

@@ -2,6 +2,7 @@ package com.mmc.pms.model.order.dto;
 
 import com.mmc.pms.model.other.dto.RefundLogDTO;
 import com.mmc.pms.model.other.dto.RepoCashDTO;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -20,7 +21,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.OrderRefundDTO", description = "退款单DTO")
+@ApiModel(description = "退款单DTO")
 public class OrderRefundDTO implements Serializable {
     private static final long serialVersionUID = -6124933008580173589L;
 

src/main/java/com/mmc/pms/model/order/dto/OrderTaskSonDTO.java

 package com.mmc.pms.model.order.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,7 +14,7 @@ import java.time.LocalDateTime;
  * @Author small @Date 2023/5/25 10:13 @Version 1.0
  */
 @Data
-// @ApiModel(value = "OrderTaskSonDTO", description = "云享飞订单-子任务表")
+@ApiModel(description = "云享飞订单-子任务表")
 @AllArgsConstructor
 @NoArgsConstructor
 public class OrderTaskSonDTO implements Serializable {

src/main/java/com/mmc/pms/model/order/dto/OrderVcuDTO.java

 package com.mmc.pms.model.order.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -16,7 +17,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.OrderVcuDTO", description = "订单凭证DTO")
+@ApiModel(description = "订单凭证DTO")
 public class OrderVcuDTO implements Serializable {
     private static final long serialVersionUID = -7101242524092899210L;
 

src/main/java/com/mmc/pms/model/order/vo/OrderReceiptVO.java

@@ -3,6 +3,7 @@ package com.mmc.pms.model.order.vo;
 import com.mmc.pms.entity.OrderReceiptDO;
 import com.mmc.pms.model.other.dto.RepoAddressDTO;
 import com.mmc.pms.model.other.dto.RepoInfoDTO;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -18,7 +19,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.vo.OrderReceiptVO", description = "收货地址类")
+@ApiModel(description = "收货地址类")
 public class OrderReceiptVO implements Serializable {
     private static final long serialVersionUID = -3695743775258866831L;
 

src/main/java/com/mmc/pms/model/other/dto/ExpStationsDTO.java

 package com.mmc.pms.model.other.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,7 +14,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.ExpStationsDTO", description = "物流信息DTO")
+@ApiModel(description = "物流信息DTO")
 public class ExpStationsDTO implements Serializable {
   private static final long serialVersionUID = 8737447241343561076L;
 

src/main/java/com/mmc/pms/model/other/dto/KdnExpDTO.java

 package com.mmc.pms.model.other.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -16,7 +17,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.KdnExpDTO", description = "物流信息DTO")
+@ApiModel(description = "物流信息DTO")
 public class KdnExpDTO implements Serializable {
   private static final long serialVersionUID = 4129710329541565557L;
 

src/main/java/com/mmc/pms/model/other/dto/RefundLogDTO.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.dto.RefundLogDTO", description = "退款logDTO")
+@ApiModel(description = "退款logDTO")
 public class RefundLogDTO implements Serializable {
   private static final long serialVersionUID = 6524395508534109389L;
 

src/main/java/com/mmc/pms/model/other/dto/RepoAddressDTO.java

 package com.mmc.pms.model.other.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -16,7 +17,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.RepoAddressDTO", description = "云仓地址信息DTO")
+@ApiModel(description = "云仓地址信息DTO")
 public class RepoAddressDTO implements Serializable {
   private static final long serialVersionUID = 610413683850745833L;
 

src/main/java/com/mmc/pms/model/other/dto/RepoCashDTO.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.dto.RepoBannerDTO", description = "现金流水DTO")
+@ApiModel(description = "现金流水DTO")
 public class RepoCashDTO implements Serializable {
   private static final long serialVersionUID = 4569221850373256579L;
 

src/main/java/com/mmc/pms/model/other/dto/RepoInfoDTO.java

 package com.mmc.pms.model.other.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -17,7 +18,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.RepoInfoDTO", description = "仓库/门店DTO")
+@ApiModel(description = "仓库/门店DTO")
 public class RepoInfoDTO implements Serializable {
   private static final long serialVersionUID = 8002261035352227237L;
 

src/main/java/com/mmc/pms/model/other/dto/RoleInfoDTO.java

 package com.mmc.pms.model.other.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -15,7 +16,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.model.dto.RoleInfoDTO", description = "角色信息DTO")
+@ApiModel(description = "角色信息DTO")
 public class RoleInfoDTO implements Serializable {
   private static final long serialVersionUID = -4791023169682602298L;
 

src/main/java/com/mmc/pms/model/qo/GoodsInfoQO.java

@@ -2,6 +2,7 @@ package com.mmc.pms.model.qo;
 
 import com.mmc.pms.common.Page;
 import com.mmc.pms.model.group.Freeze;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -18,7 +19,7 @@ import javax.validation.constraints.NotNull;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.mall.vo.GoodsInfoQO", description = "商品列表查询QO")
+@ApiModel(description = "商品列表查询QO")
 public class GoodsInfoQO {
   /*@ApiModelProperty(value = "商品名称")
   private String goodsName;

src/main/java/com/mmc/pms/model/qo/ProductSpecPriceQO.java

@@ -17,7 +17,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-//@ApiModel(value = "com.mmc.csf.model.qo.ProductSpecPriceQO", description = "无人机城产品规格价格QO")
+@ApiModel(description = "无人机城产品规格价格QO")
 public class ProductSpecPriceQO implements Serializable {
     private static final long serialVersionUID = 8086345532713123505L;
     @ApiModelProperty("用户id")

src/main/java/com/mmc/pms/model/sale/dto/AppGoodsInfoDTO.java

 package com.mmc.pms.model.sale.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -15,7 +16,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.mall.dto.AppGoodsInfoDTO", description = "小程序商品信息DTO")
+@ApiModel(description = "小程序商品信息DTO")
 public class AppGoodsInfoDTO implements Serializable {
 
     private static final long serialVersionUID = 6104334488561632747L;

src/main/java/com/mmc/pms/model/sale/dto/GoodsDetailInfoDTO.java

 package com.mmc.pms.model.sale.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -15,7 +16,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.mall.dto.GoodsDetailInfoDTO", description = "商品详细信息DTO")
+@ApiModel(description = "商品详细信息DTO")
 public class GoodsDetailInfoDTO implements Serializable {
     @ApiModelProperty(value = "id")
     private Integer id;

src/main/java/com/mmc/pms/model/sale/dto/GoodsImgDTO.java

 package com.mmc.pms.model.sale.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -15,7 +16,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.mall.dto.GoodsImgDTO", description = "商品图片信息DTO")
+@ApiModel(description = "商品图片信息DTO")
 public class GoodsImgDTO implements Serializable {
     @ApiModelProperty(value = "图片id")
     private Integer id;

src/main/java/com/mmc/pms/model/sale/dto/GoodsInfoListDTO.java

 package com.mmc.pms.model.sale.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -16,7 +17,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.mall.dto.GoodsInfoListDTO", description = "商品列表信息DTO")
+@ApiModel(description = "商品列表信息DTO")
 public class GoodsInfoListDTO implements Serializable {
     @ApiModelProperty(value = "id")
     private Integer id;

src/main/java/com/mmc/pms/model/sale/dto/GoodsOtherServiceDTO.java

 package com.mmc.pms.model.sale.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -15,7 +16,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.mall.dto.GoodsOtherServiceDTO", description = "其他服务信息DTO")
+@ApiModel(description = "其他服务信息DTO")
 public class GoodsOtherServiceDTO implements Serializable {
     @ApiModelProperty(value = "id")
     private Integer id;

src/main/java/com/mmc/pms/model/sale/dto/GoodsServiceDTO.java

 package com.mmc.pms.model.sale.dto;
 
+import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -14,7 +15,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.mall.dto.GoodsServiceDTO", description = "商品服务DTO")
+@ApiModel(description = "商品服务DTO")
 public class GoodsServiceDTO implements Serializable {
     private static final long serialVersionUID = -3178549723714411915L;
     private Integer id;

src/main/java/com/mmc/pms/model/sale/dto/GoodsTypeDetailDTO.java

 package com.mmc.pms.model.sale.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -16,7 +17,7 @@ import java.util.List;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-// @ApiModel(value = "com.mmc.csf.mall.dto.GoodsTypeDetailDTO", description = "分类详情DTO")
+@ApiModel(description = "分类详情DTO")
 public class GoodsTypeDetailDTO implements Serializable {
     private static final long serialVersionUID = 4405239380837705419L;
 

src/main/java/com/mmc/pms/model/sale/dto/MallGoodsShopCarDTO.java

@@ -21,7 +21,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-//@ApiModel(value = "com.mmc.csf.mall.dto.MallGoodsShopCarDTO", description = "小程序购物车列表DTO")
+@ApiModel(description = "小程序购物车列表DTO")
 public class MallGoodsShopCarDTO implements Serializable {
     private static final long serialVersionUID = 766856809957374985L;
     @ApiModelProperty("id")

src/main/java/com/mmc/pms/model/sale/dto/MallProductSpecPriceDTO.java

@@ -19,7 +19,7 @@ import java.math.BigDecimal;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.mall.dto.MallProductSpecPriceDTO", description = "产品对应价格")
+@ApiModel(description = "产品对应价格")
 public class MallProductSpecPriceDTO implements Serializable {
     private static final long serialVersionUID = 4717398210156973205L;
     @ApiModelProperty(value = "产品规格id")

src/main/java/com/mmc/pms/model/sale/dto/MallSkuInfoSpecDTO.java

@@ -19,7 +19,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-//@ApiModel(value = "com.mmc.csf.mall.dto.MallSkuInfoSpecDTO", description = "商品规格DTO")
+@ApiModel(description = "商品规格DTO")
 public class MallSkuInfoSpecDTO implements Serializable {
     private static final long serialVersionUID = 4214771967767248990L;
     @ApiModelProperty("id")

src/main/java/com/mmc/pms/model/sale/dto/MallUserDTO.java

 package com.mmc.pms.model.sale.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -16,7 +17,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-// @ApiModel(value = "com.mmc.csf.mall.dto.MallUserDTO", description = "用户信息DTO")
+@ApiModel(description = "用户信息DTO")
 public class MallUserDTO implements Serializable {
     private static final long serialVersionUID = -2968237190830435082L;
 

src/main/java/com/mmc/pms/model/sale/dto/SaleServiceDTO.java

@@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.mall.dto.SaleServiceDTO", description = "其他服务信息DTO")
+@ApiModel(description = "其他服务信息DTO")
 public class SaleServiceDTO {
     @ApiModelProperty(value = "id")
     private Integer id;

src/main/java/com/mmc/pms/model/sale/dto/SkuInfoDTO.java

 package com.mmc.pms.model.sale.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -20,7 +21,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-//@ApiModel(value = "com.mmc.csf.model.dto.SkuInfoDTO", description = "sku信息DTO")
+@ApiModel(description = "sku信息DTO")
 public class SkuInfoDTO implements Serializable {
     private static final long serialVersionUID = -4321518089785860606L;
     @ApiModelProperty(value = "sku表id")

src/main/java/com/mmc/pms/model/sale/dto/SkuPriceDTO.java

@@ -20,7 +20,7 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-//@ApiModel(value = "com.mmc.csf.model.dto.SkuPriceDTO", description = "sku价格信息DTO")
+@ApiModel(description = "sku价格信息DTO")
 public class SkuPriceDTO implements Serializable {
     private static final long serialVersionUID = 7304698187458849560L;
     @ApiModelProperty(value = "sku价格表id")

src/main/java/com/mmc/pms/model/sale/dto/TypeGoodsInfoDTO.java

 package com.mmc.pms.model.sale.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -15,7 +16,7 @@ import java.io.Serializable;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-// @ApiModel(value = "com.mmc.csf.mall.dto.TypeGoodsInfoDTO", description = "分类下关联的商品")
+@ApiModel(description = "分类下关联的商品")
 public class TypeGoodsInfoDTO implements Serializable {
   private static final long serialVersionUID = 7151146563536604554L;
 

src/main/java/com/mmc/pms/model/sale/vo/BatchShelfVO.java

@@ -17,7 +17,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.vo.BatchShelfVO", description = "商品上下架参数")
+@ApiModel(description = "商品上下架参数")
 public class BatchShelfVO implements Serializable {
   @ApiModelProperty(value = "商品id")
   private List<Integer> goodsIds;

src/main/java/com/mmc/pms/model/sale/vo/GoodsImgVO.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "com.mmc.csf.model.vo.GoodsImgVO", description = "新增/修改参数类")
+@ApiModel(description = "新增/修改参数类")
 public class GoodsImgVO implements Serializable {
   private static final long serialVersionUID = 7742617679026160607L;
 

src/main/java/com/mmc/pms/service/CategoriesService.java

@@ -3,6 +3,7 @@ package com.mmc.pms.service;
 import com.mmc.pms.common.ResultBody;
 import com.mmc.pms.entity.Categories;
 import com.mmc.pms.model.categories.dto.AllCategoryDTO;
+import com.mmc.pms.model.categories.dto.ClassifyDetailsDTO;
 import com.mmc.pms.model.categories.vo.ClassifyInfoVO;
 import com.mmc.pms.model.categories.vo.DirectoryInfoVO;
 import com.mmc.pms.model.sale.vo.QueryClassifyVO;
@@ -49,4 +50,6 @@ public interface CategoriesService {
     List<Categories> getCategoriesListByIds(Set<Integer> ids);
 
     List<AllCategoryDTO> feigQqueryCategoryInfoByType(Integer type);
+
+    ResultBody<List<ClassifyDetailsDTO>> getSubClassifyList(Integer id);
 }

src/main/java/com/mmc/pms/service/impl/CategoriesServiceImpl.java

@@ -12,10 +12,7 @@ import com.mmc.pms.entity.DirectoryDO;
 import com.mmc.pms.entity.GoodsInfo;
 import com.mmc.pms.entity.ServiceDO;
 import com.mmc.pms.feign.ImsAppApi;
-import com.mmc.pms.model.categories.dto.AllCategoryDTO;
-import com.mmc.pms.model.categories.dto.CategoriesDTO;
-import com.mmc.pms.model.categories.dto.CategoriesInfoListDTO;
-import com.mmc.pms.model.categories.dto.ClassifyInfoDTO;
+import com.mmc.pms.model.categories.dto.*;
 import com.mmc.pms.model.categories.vo.ClassifyInfoVO;
 import com.mmc.pms.model.categories.vo.CurriculumInfoVO;
 import com.mmc.pms.model.categories.vo.DirectoryInfoVO;
@@ -361,9 +358,26 @@ public class CategoriesServiceImpl implements CategoriesService {
             .map(AllCategoryDTO::getDirectoryId)
             .collect(Collectors.toList());
     List<Categories> categoriesList = categoriesDao.selectCategoryByDirectoryId(directoryIdIds);
-    return categoriesList.stream()
-        .map(Categories::buildCategoriesInfoListDTO)
-        .collect(Collectors.groupingBy(CategoriesInfoListDTO::getDirectoryId));
+    List<CategoriesInfoListDTO> list = categoriesList.stream()
+            .map(Categories::buildCategoriesInfoListDTO)
+            .collect(Collectors.toList());
+    List<Integer> categoryId = list.stream().map(CategoriesInfoListDTO::getId).collect(Collectors.toList());
+    for (Integer id : categoryId) {
+      List<Categories> subClassifyList = categoriesDao.getSubClassifyList(id);
+      if (CollectionUtils.isNotEmpty(subClassifyList)){
+        List<CategoriesInfoListDTO> childList =
+            subClassifyList.stream()
+                .map(Categories::buildCategoriesInfoListDTO)
+                .collect(Collectors.toList());
+        for (CategoriesInfoListDTO categories : list) {
+          if (id.equals(categories.getId())){
+            categories.setChildren(childList);
+            break;
+          }
+        }
+      }
+    }
+    return list.stream().collect(Collectors.groupingBy(CategoriesInfoListDTO::getDirectoryId));
   }
 
   private void addSubCategories(
@@ -374,4 +388,14 @@ public class CategoriesServiceImpl implements CategoriesService {
           .ifPresent(allCategoryDTO::setCategoriesInfoListDTO);
     }
   }
+
+  @Override
+  public ResultBody<List<ClassifyDetailsDTO>> getSubClassifyList(Integer id) {
+    List<Categories> categoriesList = categoriesDao.getSubClassifyList(id);
+    if (CollectionUtils.isNotEmpty(categoriesList)){
+      List<ClassifyDetailsDTO> list = categoriesList.stream().map(Categories::buildClassifyDetailsDTO).collect(Collectors.toList());
+      return ResultBody.success(list);
+    }
+    return ResultBody.success();
+  }
 }

src/main/java/com/mmc/pms/service/impl/WebDeviceServiceImpl.java

@@ -179,14 +179,17 @@ public class WebDeviceServiceImpl implements WebDeviceService {
         userIds = Collections.singletonList(-1);
       }
     }
-    int count = webDeviceDao.countListWareInfoPage(param.getCategoryId(), userIds, param.getType(),param.getGoodsName());
+    int count =
+        webDeviceDao.countListWareInfoPage(
+            param.getCategoryId(), userIds, param.getType(), param.getGoodsName());
     if (count == 0) {
       return ResultBody.success(
           PageResult.buildPage(param.getPageNo(), param.getPageSize(), count));
     }
     int pageNo = param.getPageNo();
     param.buildCurrentPage();
-    List<GoodsInfo> list = webDeviceDao.listWareInfoPage(param, userIds, param.getType(),param.getGoodsName());
+    List<GoodsInfo> list =
+        webDeviceDao.listWareInfoPage(param, userIds, param.getType(), param.getGoodsName());
     List<LeaseGoodsInfoDTO> pageList =
         list.stream().map(GoodsInfo::buildLeaseGoodsInfoDTO).collect(Collectors.toList());
     if (StringUtils.isBlank(request.getHeader(TokenConstant.TOKEN))) {
@@ -243,11 +246,26 @@ public class WebDeviceServiceImpl implements WebDeviceService {
 
   @Override
   public ResultBody getPageHomeCategories(Integer type) {
-    List<DirectoryDO> directoryList = categoriesDao.getDirectoryList(type);
-    if (CollectionUtils.isNotEmpty(directoryList)) {
-      List<Integer> directoryIds =
-          directoryList.stream().map(DirectoryDO::getId).collect(Collectors.toList());
-      List<Categories> categoriesList = categoriesDao.getCategoriesListByDirectoryIds(directoryIds);
+    if (!type.equals(5) && !type.equals(6)) {
+      List<DirectoryDO> directoryList = categoriesDao.getDirectoryList(type);
+      if (CollectionUtils.isNotEmpty(directoryList)) {
+        List<Integer> directoryIds =
+            directoryList.stream().map(DirectoryDO::getId).collect(Collectors.toList());
+        List<Categories> categoriesList =
+            categoriesDao.getCategoriesListByDirectoryIds(directoryIds);
+        return ResultBody.success(
+            categoriesList.stream()
+                .map(Categories::buildCategoryTypeDTO)
+                .collect(Collectors.toList()));
+      }
+    } else if (type.equals(5)) {
+      List<Categories> categoriesList = categoriesDao.listCategoryByInsurance();
+      return ResultBody.success(
+          categoriesList.stream()
+              .map(Categories::buildCategoryTypeDTO)
+              .collect(Collectors.toList()));
+    } else if (type.equals(6)) {
+      List<Categories> categoriesList = categoriesDao.listCategoryBySoftware();
       return ResultBody.success(
           categoriesList.stream()
               .map(Categories::buildCategoryTypeDTO)

src/main/resources/application-dev.yml

@@ -3,13 +3,13 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://mysql.default:3306/iuav_pms_dev?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: tmj
-    password: MMC@2022&MYSQL
+    username: iuav_dev
+    password: ${MYSQL_PASSWORD}
   redis:
     database: 1
     host: redis.default
     port: 6379
-    password: MMC@2022&REDIS
+    password: ${REDIS_PASSWORD}
     jedis:
       pool:
         max-active: 2
@@ -28,7 +28,7 @@ aliyun:
   oss:
     endpoint: oss-cn-shenzhen.aliyuncs.com
     access-key-id: LTAI4FzCpyrA33PegnxWS6XV
-    access-key-secret: ILuNh3zJfRjg3iARSipMWBKCjglz3u
+    access-key-secret: ${OSS_ACCESS_KEY_SECRET}
     bucket: pad-video-x
 
 mmcflying:

src/main/resources/application-local.yml

@@ -3,8 +3,8 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://rm-wz9dd796t4j1giz6t2o.mysql.rds.aliyuncs.com:3306/iuav_pms_dev?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: tmj
-    password: MMC@2022&MYSQL
+    username: iuav_dev
+    password: IUAV_DEV@2023&MYSQL
   redis:
     database: 1
     host: 127.0.0.1

src/main/resources/application-prod.yml

@@ -3,13 +3,13 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://mysql.default:3306/iuav_pms?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: tmj
-    password: MMC@2022&MYSQL
+    username: iuav
+    password: ${MYSQL_PASSWORD}
   redis:
     database: 5
     host: redis.default
     port: 6379
-    password: MMC@2022&REDIS
+    password: ${REDIS_PASSWORD}
     jedis:
       pool:
         max-active: 2
@@ -28,7 +28,7 @@ aliyun:
   oss:
     endpoint: oss-cn-shenzhen.aliyuncs.com
     access-key-id: LTAI4FzCpyrA33PegnxWS6XV
-    access-key-secret: ILuNh3zJfRjg3iARSipMWBKCjglz3u
+    access-key-secret: ${OSS_ACCESS_KEY_SECRET}
     bucket: pad-video-x
 
 mmcflying:

src/main/resources/mapper/CategoriesDao.xml

@@ -223,6 +223,47 @@
             AND c2.is_deleted = 0
         WHERE c1.id = #{id}
     </select>
+    <select id="getSubClassifyList" resultType="com.mmc.pms.entity.Categories">
+        select id,
+               parent_id,
+               directory_id,
+               `name`,
+               icon,
+               description,
+               remark,
+               create_time
+        from categories
+        where parent_id = #{id}
+          and is_deleted = 0
+    </select>
+    <select id="listCategoryByInsurance" resultType="com.mmc.pms.entity.Categories">
+        SELECT id,
+               parent_id,
+               directory_id,
+               `name`,
+               icon,
+               description,
+               remark,
+               create_time
+        FROM categories
+        WHERE (id = 56
+            OR parent_id = 56)
+          and is_deleted = 0
+    </select>
+    <select id="listCategoryBySoftware" resultType="com.mmc.pms.entity.Categories">
+        SELECT id,
+               parent_id,
+               directory_id,
+               `name`,
+               icon,
+               description,
+               remark,
+               create_time
+        FROM categories
+        WHERE (id = 55
+            OR parent_id = 55)
+          and is_deleted = 0
+    </select>
 
     <update id="deleteById">
         UPDATE `categories`

src/main/resources/mapper/WebDeviceDao.xml

@@ -158,7 +158,14 @@
         <where>
             gi.is_deleted = 0 and gi.shelf_status = 1 and gi.goods_type = #{type}
             <if test="categoryIds != null and categoryIds.size != 0">
-                <foreach collection="categoryIds" item="item" index="index" open="and gi.category_by_one IN (" close=")"
+                <foreach collection="categoryIds" item="item" index="index" open="and (gi.category_by_one IN ("
+                         close=")"
+                         separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="categoryIds != null and categoryIds.size != 0">
+                <foreach collection="categoryIds" item="item" index="index" open="or gi.category_by_two IN (" close="))"
                          separator=",">
                     #{item}
                 </foreach>
@@ -177,19 +184,27 @@
 
     <select id="listWareInfoPage" resultType="com.mmc.pms.entity.GoodsInfo">
         SELECT
-        gi.id,gi.goods_name,img.img_url mainImg
+        gi.id,gi.goods_name,img.img_url mainImg,gd.goods_desc
         FROM
         goods_info gi
         INNER JOIN goods_img img ON gi.id = img.goods_info_id and img.img_type = 0 AND img.is_deleted = 0
+        INNER JOIN goods_detail gd ON gd.goods_info_id = gi.id
         <where>
             gi.is_deleted = 0 and gi.shelf_status = 1 and gi.goods_type = #{type}
             <if test="param.categoryId != null">
-                <foreach collection="param.categoryId" item="item" index="index" open="and gi.category_by_one IN ("
+                <foreach collection="param.categoryId" item="item" index="index" open="and (gi.category_by_one IN ("
                          close=")"
                          separator=",">
                     #{item}
                 </foreach>
             </if>
+            <if test="param.categoryId != null">
+                <foreach collection="param.categoryId" item="item" index="index" open="or gi.category_by_two IN ("
+                         close="))"
+                         separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="userIds != null">
                 <foreach collection="userIds" item="user" index="index" open="and gi.add_goods_user_id IN (" close=")"
                          separator=",">