基础设置平台模块管理增加模块类型字段

base-manager/src/main/java/com/mortals/xhx/module/model/web/ModelController.java

@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 模块
@@ -135,18 +134,7 @@ public class ModelController extends BaseCRUDJsonBodyMappingController<ModelServ
         int code=1;
         try {
             List<ModelEntity> result = this.getService().getListBySiteId(query.getSiteId(),query.getIsAdmin());
-            Map<Integer,List<ModelEntity>> groupMap = result.stream().collect(Collectors.groupingBy(t -> t.getType()));
-            List<Map<String,List<ModelEntity>>> mapList = new ArrayList<>();
-            Map<String,List<ModelEntity>> jcMap = new HashMap<>();
-            jcMap.put(ModelTypeEnum.JC.getDesc(),groupMap.get(ModelTypeEnum.JC.getValue()));
-            mapList.add(jcMap);
-            Map<String,List<ModelEntity>> g2gMap = new HashMap<>();
-            g2gMap.put(ModelTypeEnum.G2G.getDesc(),groupMap.get(ModelTypeEnum.G2G.getValue()));
-            mapList.add(g2gMap);
-            Map<String,List<ModelEntity>> g2cMap = new HashMap<>();
-            g2cMap.put(ModelTypeEnum.G2C.getDesc(),groupMap.get(ModelTypeEnum.G2C.getValue()));
-            mapList.add(g2cMap);
-            model.put("data", mapList);
+            model.put("data", result);
             model.put("message_info", busiDesc + "成功");
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception var9) {

common-lib/src/main/java/com/mortals/xhx/feign/model/vo/ModelFeignVO.java

@@ -38,6 +38,11 @@ public class ModelFeignVO implements Serializable {
     @JSONField(serialize = false)
     private Integer sort;
 
+    /**
+     * 模块分类
+     */
+    private Integer type;
+
     /** 模块下包含的数据统计 */
     private List<ModelCensusFeignVO> censusList;
 }