还原被覆盖代码

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/CommonserviceImpl.java

@@ -24,10 +24,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import java.io.UnsupportedEncodingException;
@@ -148,6 +145,14 @@ public class CommonserviceImpl {
         return model;
     }
 
+    @Async
+    public  void sendMessage(HashMap<String,String> smsParams, List<String> phones){
+        for (String phone : phones) {
+            smsParams.put("mobile",phone);
+            Systemctl.smsClient.sendCommonSms(smsParams);
+        }
+    }
+
     public void  deleteTaskModel(String id){
         List<TaskV2Model> result =Systemctl.taskV2Client.selectListByRelationId(id).getResult();
         TaskV2Model model = result.stream().sorted((r1, r2) -> r2.getCreateDate().compareTo(r1.getCreateDate())) // 按时间降序排序

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -395,10 +395,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         } else {
             if ("QTBF".equals(type)) {
                 type = "superviseBusiness";
-            } else {
-                type = EquipmentClassifityEnum.BDLS.getCode();
             }
-            mapList = resourceJson.get(type);
+            mapList = resourceJson.get(type)  == null ? resourceJson.get( EquipmentClassifityEnum.BDLS.getCode()):resourceJson.get(type) ;
         }
         for (Map map : mapList) {
             Map<String, Object> resultMap = new HashMap<>();

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/json/equipCategory.json

@@ -120,5 +120,172 @@
       "name": "电梯",
       "code": "3000"
     }
-  ]
+  ],
+  "supervise": [
+    {
+      "name": "锅炉",
+      "code": "1000",
+      "image": "upload/tzs/common/image/总览锅炉.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "boiler"
+    },
+    {
+      "name": "压力容器",
+      "code": "2000",
+      "image": "upload/tzs/common/image/总览压力容器.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "vessel"
+    },
+    {
+      "name": "电梯",
+      "code": "3000",
+      "image": "upload/tzs/common/image/总览电梯.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "elevator"
+    },
+    {
+      "name": "客运索道",
+      "code": "9000",
+      "image": "upload/tzs/common/image/总览索道.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "ropeway"
+    },
+    {
+      "name": "大型游乐设施",
+      "code": "6000",
+      "image": "upload/tzs/common/image/总览游乐设施.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "rides"
+    }
+  ],
+  "SCJY": [
+    {
+      "name": "起重机械",
+      "code": "4000",
+      "image": "upload/tzs/common/image/总览起重机械.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "lifting"
+    },
+    {
+      "name": "场内机动车辆",
+      "code": "5000",
+      "image": "upload/tzs/common/image/总览厂车.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "vehicle"
+    }
+  ],
+  "DQJY": [
+    {
+      "name": "电梯",
+      "code": "3000",
+      "image": "upload/tzs/common/image/总览电梯.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "elevator"
+    },
+    {
+      "name": "起重机械",
+      "code": "4000",
+      "image": "upload/tzs/common/image/总览起重机械.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "lifting"
+    },
+    {
+      "name": "场内机动车辆",
+      "code": "5000",
+      "image": "upload/tzs/common/image/总览厂车.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "vehicle"
+    },
+    {
+      "name": "锅炉",
+      "code": "1000",
+      "image": "upload/tzs/common/image/总览锅炉.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "boiler"
+    },
+    {
+      "name": "压力容器",
+      "code": "2000",
+      "image": "upload/tzs/common/image/总览压力容器.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "vessel"
+    },
+    {
+      "name": "压力管道",
+      "code": "8000",
+      "image": "upload/tzs/common/image/总览压力管道.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "pipeline"
+    },
+    {
+      "name": "大型游乐设施",
+      "code": "6000",
+      "image": "upload/tzs/common/image/总览游乐设施.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "rides"
+    },
+    {
+      "name": "客运索道",
+      "code": "9000",
+      "image": "upload/tzs/common/image/总览索道.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "ropeway"
+    }
+  ],"DTJC":[
+  {
+    "name": "电梯",
+    "code": "3000",
+    "image": "upload/tzs/common/image/总览电梯.png",
+    "waitClaim": "0",
+    "alreadyClaim": "0",
+    "refuseClaim": "0",
+    "sum": "0",
+    "type": "elevator"
+  }
+]
 }
\ No newline at end of file