Merge remote-tracking branch 'origin/develop' into develop

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

@@ -55,8 +55,8 @@ public class DcWarningController extends BaseController
      */
     @ApiOperation("感知事件数据统计")
     @GetMapping("/countNumber")
-    public AjaxResult dcWarningCountNumber() {
+    public AjaxResult dcWarningCountNumber(@RequestParam(required = false) Integer warningSource) {
-        return AjaxResult.success(dcWarningService.dcWarningCountNumber());
+        return AjaxResult.success(dcWarningService.dcWarningCountNumber(warningSource));
     }
 
     /**

zc-business/src/main/java/com/zc/business/enums/ValueConverter.java

@@ -31,12 +31,12 @@ public  class ValueConverter {
 
         static {
             valueMappingSource.put(1,5);
-            valueMappingSource.put(4,7);
+            valueMappingSource.put(4,10);
-            valueMappingSource.put(7,7);
+            valueMappingSource.put(7,13);
-            valueMappingSource.put(2,7);
+            valueMappingSource.put(2,8);
-            valueMappingSource.put(3,7);
+            valueMappingSource.put(3,9);
-            valueMappingSource.put(5,7);
+            valueMappingSource.put(5,11);
-            valueMappingSource.put(6,7);
+            valueMappingSource.put(6,12);
             valueMappingHost.put(1, 4);
             valueMappingHost.put(2, 5);
             valueMappingHost.put(3, 5);
@@ -286,8 +286,8 @@ public  class ValueConverter {
     //测试
 //   @Test
 //    public void text(){
-//        String i="1-1";
+//        int i=5;
-//       String i1 = ValueConverter.convertValueSon(i);
+//       int i1 = ValueConverter.convertValueSource(i);
 //       System.out.println(i1+"--------------");
 //   }
 

zc-business/src/main/java/com/zc/business/mapper/DcWarningMapper.java

@@ -24,7 +24,7 @@ public interface DcWarningMapper
     /**
      * 感知事件统计
      */
-    int dcWarningCountNumber();
+    int dcWarningCountNumber(Integer warningSource);
 
     /**
      * 查询预警信息

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

@@ -591,6 +591,35 @@ public class DeviceMessageHandler {
         //方向
         meteorologicalDetectorData.setDirection(direction);
 
+        //todo  首页推送事件消息 3气象检测器
+        if (!meteorologicalDetectorData.getPrecipitationType().equals("0")) {//降水类型 0=无降；1=雨；2=雪；3=毛毛雨；4=雨夹雪；
+            WebSocketService.broadcast("3", meteorologicalDetectorData);
+            JSONObject object = new JSONObject();
+            object.put("meteorologicalDetectorData", meteorologicalDetectorData);
+            String string = object.toString();
+            DcWarning dcWarning = new DcWarning();
+            dcWarning.setStakeMark(meteorologicalDetectorData.getStakeMark());
+
+            dcWarning.setWarningSource(7);//气象检测器
+            dcWarning.setOtherConfig(string);
+            dcWarning.setWarningTitle("气象预警");
+            dcWarningService.insertDcWarning(dcWarning);
+        }
+        if (!meteorologicalDetectorData.getVisibilityType().equals("4")) {//  能见度类型，4 表示能见度良好3表示阴霾 2表示雾 1表示浓雾；
+            WebSocketService.broadcast("3", meteorologicalDetectorData);
+            JSONObject object = new JSONObject();
+            object.put("meteorologicalDetectorData", meteorologicalDetectorData);
+            String string = object.toString();
+            DcWarning dcWarning = new DcWarning();
+            dcWarning.setStakeMark(meteorologicalDetectorData.getStakeMark());
+            dcWarning.setWarningSource(7);//气象检测器
+            dcWarning.setOtherConfig(string);
+            dcWarning.setWarningTitle("气象预警");
+
+            dcWarningService.insertDcWarning(dcWarning);
+        }
+
+
         meteorologicalDetectorData.setIotDeviceId(msg.get("deviceId").toString());
         meteorologicalDetectorDataService.insertDcMeteorologicalDetectorData(meteorologicalDetectorData);
 
@@ -618,6 +647,7 @@ public class DeviceMessageHandler {
 
         mdDeviceData.setExpands(JSONObject.toJSONString(expands));
 
+
         middleDatabaseService.insertMiddleDatabaseDeviceData(mdDeviceData);
     }
 

zc-business/src/main/java/com/zc/business/service/IDcWarningService.java

@@ -22,7 +22,7 @@ public interface IDcWarningService
     /**
      * 感知事件数据统计
      */
-    int dcWarningCountNumber();
+    int dcWarningCountNumber(Integer warningSource);
 
     /**
      * 查询预警信息

zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java

@@ -1096,10 +1096,12 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
         if (dcEvent1 == null) {
             return 1;
         }
+/*
         //事件状态已被修改 返回成功
         if (dcEvent1.getEventState() == state) {
             return 1;
         }
+*/
 
         int i = dcEventMapper.updateDcEventState(id, state);
         if (i > 0) {
@@ -1229,11 +1231,11 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                     }
                 } else if ("direction".equals(result.getRightPath())) {
                     if ("1".equals(result.getRight())) {
-                        result.setRight("上行");
+                        result.setRight("菏泽方向");
                     } else if ("2".equals(result.getRight())) {
                         result.setRight("中");
                     } else if ("3".equals(result.getRight())) {
-                        result.setRight("下行");
+                        result.setRight("济南方向");
                     }
                 } else if ("eventSubclass".equals(result.getRightPath())) {
                     if ("1-1".equals(result.getRight())) {

zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java

@@ -70,8 +70,8 @@ public class DcWarningServiceImpl implements IDcWarningService
      * @return
      */
     @Override
-    public int dcWarningCountNumber() {
+    public int dcWarningCountNumber(Integer warningSource) {
-        return dcWarningMapper.dcWarningCountNumber();
+        return dcWarningMapper.dcWarningCountNumber(warningSource);
     }
 
     /**

zc-business/src/main/resources/mapper/business/DcEventMapper.xml

@@ -188,7 +188,7 @@
                    WHEN '1-1' THEN '追尾'
                    WHEN '1-2' THEN '侧翻'
                    WHEN '1-3' THEN '撞护栏'
-                   WHEN '1-4' THEN '自然'
+                   WHEN '1-4' THEN '自燃'
                    WHEN '1-5' THEN '其他事故'
                    WHEN '2-1' THEN '车辆故障'
                    WHEN '3-1' THEN '主线封闭和限行'
@@ -255,6 +255,12 @@
                    WHEN '4' THEN '视频巡查'
                    WHEN '5' THEN '视频AI'
                    WHEN '6' THEN '一键救援'
+                   WHEN '8' THEN '雷达识别'
+                   WHEN '9' THEN '锥桶'
+                   WHEN '10' THEN '护栏碰撞'
+                   WHEN '11' THEN '扫码报警'
+                   WHEN '12' THEN '非机预警'
+                   WHEN '13' THEN '气象检测器'
                    ELSE '其他'
                    END              AS stringEventSource,
                event_nature,
@@ -427,7 +433,7 @@
                    WHEN '1-1' THEN '追尾'
                    WHEN '1-2' THEN '侧翻'
                    WHEN '1-3' THEN '撞护栏'
-                   WHEN '1-4' THEN '自然'
+                   WHEN '1-4' THEN '自燃'
                    WHEN '1-5' THEN '其他事故'
                    WHEN '2-1' THEN '车辆故障'
                    WHEN '3-1' THEN '主线封闭和限行'
@@ -495,6 +501,12 @@
                    WHEN '4' THEN '视频巡查'
                    WHEN '5' THEN '视频AI'
                    WHEN '6' THEN '一键救援'
+                   WHEN '8' THEN '雷达识别'
+                   WHEN '9' THEN '锥桶'
+                   WHEN '10' THEN '护栏碰撞'
+                   WHEN '11' THEN '扫码报警'
+                   WHEN '12' THEN '非机预警'
+                   WHEN '13' THEN '气象检测器'
                    ELSE '其他'
                    END                  AS stringEventSource,
                dc_event.event_nature,

zc-business/src/main/resources/mapper/business/DcWarningMapper.xml

@@ -68,6 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="dcWarningCountNumber" resultType="int">
         select count(*) from dc_warning
+        <where>
+            <if test="warningSource != null">warning_source = #{warningSource}</if>
+        </where>
     </select>
 
     <select id="selectDcWarningById" parameterType="string" resultType="hashmap">