瀏覽代碼

查询设备类别代码还原

linhuili 3 年之前
父節點
當前提交
c1e0077004

+ 2 - 5
src/main/java/com/persagy/proxy/adm/service/impl/AbstractAdmDictBaseServiceImpl.java

@@ -103,7 +103,8 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
         if(CollUtil.isNotEmpty(data)){
             admVOs = data.toJavaList(AdmObjectType.class);
         }
-        List<AdmObjectType> content = dictDefTypeTransfer(admVOs);
+        //参数格式转换
+        dictDefTypeTransfer(admVOs);
         // 设置返回值
         AdmResponse response = AdmResponse.success(admVOs);
         Long total = dmpResult.getCount() == null ? null : dmpResult.getCount().longValue();
@@ -282,10 +283,6 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
                 //平台级
                 datum.setType("common");
             }
-
-            //todo 页面不展示问题字段测试
-            datum.setCreateTime("2021-04-16 10:29:46");
-            datum.setLastUpdate("2021-04-16 10:29:46");
         }
 
         return data;

+ 2 - 3
src/main/java/com/persagy/proxy/adm/service/impl/AdmDictServiceImpl.java

@@ -118,7 +118,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
             //查询专业下的系统
             content = buildDictTree(allMajor,majorSystemMap,null);
         }
-        if(AdmDictCategoryEnum.SYSTEM_EQUIP.getValue().equals(type) || AdmDictCategoryEnum.EQUIPMENT.getValue().equals(type)){
+        if(AdmDictCategoryEnum.SYSTEM_EQUIP.getValue().equals(type)){
             //查询系统下的设备类
             content = buildDictTree(systems,systemEquipMap,null);
         }
@@ -194,7 +194,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
      */
     private List<String> getDictBaseCategory(){
         List<String> category = new ArrayList<>();
-        //category.add(AdmDictCategoryEnum.EQUIPMENT.getValue());
+        category.add(AdmDictCategoryEnum.EQUIPMENT.getValue());
         category.add(AdmDictCategoryEnum.COMPONENT.getValue());
         category.add(AdmDictCategoryEnum.SYSTEM.getValue());
         category.add(AdmDictCategoryEnum.SPACE.getValue());
@@ -213,7 +213,6 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
         category.add(AdmDictCategoryEnum.MAJOR_SYSTEM_EQUIP.getValue());
         category.add(AdmDictCategoryEnum.EQUIPMENT_COMPONENT.getValue());
         category.add(AdmDictCategoryEnum.SYSTEM_EQUIP.getValue());
-        category.add(AdmDictCategoryEnum.EQUIPMENT.getValue());
         return category;
     }