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

@@ -5,12 +5,8 @@ import com.usky.alarm.service.util.HttpClientUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
-
-
 @Component
-public class AlarmLinkageJob {
-
+public class alarmLinkageJob {
     /**
      * 烟感联动
      * @return
@@ -19,14 +15,8 @@ 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.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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.alarm.service.enums.TopListener;
-import com.usky.alarm.service.job.AlarmLinkageJob;
+import com.usky.alarm.service.job.alarmLinkageJob;
 import com.usky.common.core.util.JsonUtils;
 import com.usky.alarm.domain.*;
 import com.usky.alarm.service.*;
@@ -37,7 +37,7 @@ public class Alarm implements MqttStrategy {
     private DmpDeviceLinkageService dmpDeviceLinkageService;
 
     @Autowired
-    private AlarmLinkageJob alarmLinkageJob;
+    private alarmLinkageJob AlarmLinkageJob;
 
     @Override
     public String disposeMessage(MqttBaseVO mqttBaseVO) {
@@ -92,7 +92,7 @@ public class Alarm implements MqttStrategy {
                     jsonObject.addProperty("deviceId",list6.get(0).getDeviceId());
                     jsonObject.addProperty("deviceType","JH");
                     jsonObject.addProperty("linkageAddress",list5.get(0).getLinkageAddress());
-                    JSONObject resultVo = alarmLinkageJob.addLinkage(jsonObject.toString());
+                    JSONObject resultVo = AlarmLinkageJob.addLinkage(jsonObject.toString());
                 }
             }
         }else if (alarams.get(0).get("deviceType").equals("6")){