Merge branch 'server-165' of http://47.111.81.118:3000/uskycloud/usky-modules into fu-dev

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/controller/web/BaseAlarmNoticeResultController.java

@@ -38,7 +38,6 @@ public class BaseAlarmNoticeResultController {
      * @param size     每页条数
      * @return
      */
-    @Log(title = "关联设备查看分页", businessType = BusinessType.OTHER)
     @GetMapping("/resultInfo")
     public ApiResult<CommonPage<BaseAlarmNoticeResult>> resultInfo(@RequestParam(value = "receiver", required = false) String receiver,
                                                                    @RequestParam(value = "alarmId") Integer alarmId,

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

@@ -15,7 +15,7 @@ public class alarmLinkageJob {
     @Async("asyncServiceExecutor")
     public JSONObject addLinkage(String requestBody) {
         JSONObject eventVO = JSONObject.parseObject(requestBody);
-        System.out.println("hanceshi====="+eventVO.get("linkageAddress"));
+        System.out.println("hanceshi====="+requestBody);
         String resultString = HttpClientUtils.doPostJson(eventVO.get("linkageAddress").toString(),eventVO.toJSONString());
         JSONObject resultVO = JSONObject.parseObject(resultString);
         return resultVO;

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

@@ -92,8 +92,6 @@ public class Alarm implements MqttStrategy {
                     jsonObject.addProperty("deviceId",list6.get(0).getDeviceId());
                     jsonObject.addProperty("deviceType","JH");
                     jsonObject.addProperty("linkageAddress",list5.get(0).getLinkageAddress());
-                    System.out.println("hanceshi+++++"+list5.get(0).getLinkageAddress());
-                    System.out.println("hanceshi-----"+jsonObject.get("linkageAddress"));
                     JSONObject resultVo = AlarmLinkageJob.addLinkage(jsonObject.toString());
                 }
             }

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/AlarmDetectorController.java

@@ -47,7 +47,7 @@ public class AlarmDetectorController {
     /**
      * 物联网数据查询-右上侧统计图
      *
-     * @param field      字段名称
+     * @param field     字段名称
      * @param deviceCode 单位编号
      * @return
      */