Merge branch 'han' of uskycloud/usky-modules into server-165

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/job/alarmLinkageJob.java

@@ -19,14 +19,14 @@ public class AlarmLinkageJob {
     @Async("asyncServiceExecutor")
     public JSONObject addLinkage(String requestBody) {
         JSONObject eventVO = JSONObject.parseObject(requestBody);
-        
-        HashMap map = new HashMap();
-        map.put("productId", eventVO.get("productId").toString());
-        map.put("tcDeviceId", eventVO.get("tcDeviceId").toString());
-        map.put("deviceId", eventVO.get("deviceId").toString());
-        map.put("deviceType", eventVO.get("deviceType").toString());
-        String resultString = HttpClientUtils.doPost(eventVO.get("linkageAddress").toString(),map);
+//        HashMap map = new HashMap();
+//        map.put("productId", eventVO.get("productId").toString());
+//        map.put("tcDeviceId", eventVO.get("tcDeviceId").toString());
+//        map.put("deviceId", eventVO.get("deviceId").toString());
+//        map.put("deviceType", eventVO.get("deviceType").toString());
+        String resultString = HttpClientUtils.doPostJson(eventVO.get("linkageAddress").toString(),eventVO.toJSONString());
         JSONObject resultVO = JSONObject.parseObject(resultString);
+        System.out.println("--------------------");
         return resultVO;
     }
 }

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/mqtt/alarm/Alarm.java

@@ -68,7 +68,7 @@ public class Alarm implements MqttStrategy {
             baseAlarm.setAlarmContent(dp.get(0).get("property").toString()+","+dp.get(0).get("value").toString());
             baseAlarm.setAlarmGrade(2);
             baseAlarm.setAlarmAddress(alarams.get(0).get("deviceName").toString());
-        }else if (alarams.get(0).get("deviceType").equals("3")){
+        }else if (alarams.get(0).get("deviceType").equals("3")||alarams.get(0).get("deviceType").equals("137")){
             baseAlarm.setAlarmContent(dp.get(0).get("property").toString());
             baseAlarm.setAlarmGrade(2);
             baseAlarm.setAlarmAddress(alarams.get(0).get("deviceName").toString());
@@ -83,13 +83,16 @@ public class Alarm implements MqttStrategy {
                         .eq(DmpDevice::getDeleteFlag, 0);
                 List<DmpDevice> list6 = dmpDeviceService.list(queryWrapper6);
                 JsonObject jsonObject = new JsonObject();
+                int index = list6.get(0).getProductCode().indexOf("_");
+                String result = list6.get(0).getProductCode().substring(index+1,
+                        list6.get(0).getProductCode().toString().length());
                 if (CollectionUtils.isNotEmpty(list6)) {
-                    jsonObject.addProperty("productId", list6.get(0).getProductCode());
+                    jsonObject.addProperty("productId", result);
                     jsonObject.addProperty("tcDeviceId",list6.get(0).getDeviceUuid());
                     jsonObject.addProperty("deviceId",list6.get(0).getDeviceId());
                     jsonObject.addProperty("deviceType","JH");
                     jsonObject.addProperty("linkageAddress",list5.get(0).getLinkageAddress());
-                    alarmLinkageJob.addLinkage(jsonObject.toString());
+                    JSONObject resultVo = alarmLinkageJob.addLinkage(jsonObject.toString());
                 }
             }
         }else if (alarams.get(0).get("deviceType").equals("6")){