分类新增子分类返回数据，首页保险，软件数据返回

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

@@ -65,5 +65,9 @@ public interface CategoriesDao {
 
   int countChildById(Integer id);
 
-    List<Categories> getSubClassifyList(Integer id);
+  List<Categories> getSubClassifyList(Integer id);
+
+  List<Categories> listCategoryByInsurance();
+
+  List<Categories> listCategoryBySoftware();
 }

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/service/impl/CategoriesServiceImpl.java

@@ -358,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(

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/mapper/CategoriesDao.xml

@@ -235,6 +235,32 @@
         from categories
         where parent_id = #{id}
     </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`