Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop

zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java

@@ -247,7 +247,7 @@ public class DcDeviceController extends BaseController {
             JSONObject formatValue = JSON.parseObject(jsonObject.get("formatValue").toString());
             map.put("1", formatValue.get("1"));
             map.put("3", formatValue.get("3"));
-            map.put("timestamp", jsonObject.get("timestamp"));
+            map.put("timestamp", formatValue.get("equipmentReportingTime"));
             list.add(map);
         });
         return AjaxResult.success(list);
@@ -459,7 +459,7 @@ public class DcDeviceController extends BaseController {
                 JSONObject functionJSONObject = (JSONObject) JSON.toJSON(function);
                 //JSONObject functionJSONObject = (JSONObject) JSON.toJSON(function.toString()) ;
                 String functionId = functionJSONObject.getString("functionId");
-                JSONObject jsonObject = functionJSONObject.getJSONObject("params") == null?functionJSONObject.getJSONObject("params"):new JSONObject();
+                JSONObject jsonObject = functionJSONObject.getJSONObject("params") != null?functionJSONObject.getJSONObject("params"):new JSONObject();
                 resultArray.add(getResult(device, iotDeviceId, functionId, jsonObject));
             }
         }

zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java

@@ -37,6 +37,7 @@ public class DeviceMessageHandler {
     private final int EVENT_AI = 1;
     private final int EVENT_STATE = 1;
     private final int EVENTEND_STATE = 4;
+    private final int VISIBILITY_LEVEL = 8;
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Resource
@@ -168,8 +169,13 @@ public class DeviceMessageHandler {
             dcWarning.setWarningTime(new Date(captureTime));
             // 信息来源
             dcWarning.setWarningSource(WarningSourceEnum.VIDEO_AI.getCode());
+
             // 事件主类型
             dcWarning.setWarningType(data.getInteger("warningType"));
+            //异常天气等级
+            if (data.getInteger("warningType") == VISIBILITY_LEVEL) {
+                dcWarning.setWarningLevel(data.getInteger("visibilityLevel"));
+            }
 
             String warningSubclass = data.getString("warningSubclass");
             // 子类型