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

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

@@ -181,6 +181,9 @@ public class DeviceMessageHandler {
             // 子类型
             dcWarning.setWarningSubclass(warningSubclass);
             //桩号，方向
+//车道
+            Integer relatedLaneNo = data.getInteger("relatedLaneNo");
+
             String stakeMarkDescription = data.getString("stakeMarkDescription");
             String direction = "";
             String[] arr = stakeMarkDescription.split(" ");
@@ -188,18 +191,20 @@ public class DeviceMessageHandler {
             if (arr[2] != null) {
                 if (arr[2].equals("上行")) {
                     direction = arr[0] + " " + arr[1] + " 菏泽方向 ";
-                    Integer relatedLaneNo = data.getInteger("relatedLaneNo");
+                    if (warningSubclass.equals("4-7")) {
-                    if (relatedLaneNo==5){
+                        if (relatedLaneNo == 5) {
-                        relatedLaneNo=0;
+                            relatedLaneNo = 0;
+                        }
                     }
-                    dcWarning.setLane(String.valueOf(relatedLaneNo));
-
                 }
                 if (arr[2].equals("下行")) {
                     direction = arr[0] + " " + arr[1] + " 济南方向 ";
-                    dcWarning.setLane(String.valueOf(data.getInteger("relatedLaneNo")-1));
+                    if (warningSubclass.equals("4-7")) {
+                        relatedLaneNo = data.getInteger("relatedLaneNo") - 1;
                     }
                 }
+            }
+            dcWarning.setLane(String.valueOf(relatedLaneNo));
 
             String title = direction + WarningSubclassEnum.getDecorateInfo(warningSubclass);
             // 标题

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

@@ -28,7 +28,7 @@
         where warning.`id`=#{id}
     </select>
     <select id="selectPerceivedEventsList" resultType="com.zc.business.domain.DcWarning">
-        SELECT facility.facility_name,   warning.`id`,warning.`stake_mark`, warning.`direction`,facility.facility_name,
+        SELECT facility.facility_name,   warning.`id`,warning.`stake_mark`, warning.`direction`,
         mark.longitude,mark.latitude,warning.lane,duration,
         warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
         warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
@@ -36,7 +36,7 @@
         warning.`warning_type`,warning.`warning_subclass`,warning.`warning_title`,
         warning.`other_config` FROM dc_warning AS warning
         left JOIN dc_stake_mark AS mark ON mark.stake_mark=warning.stake_mark and mark.direction=warning.direction
-        left join dc_facility as facility on facility.stake_mark=warning.stake_mark
+        left join dc_facility as facility on facility.stake_mark=warning.stake_mark and facility.facility_type=1
         <where>
             <if test="warningSource == null  || warningSource == ''"> and warning.warning_source !=6</if>
             <if test="warningSource != null  and warningSource != ''"> and warning.warning_source = #{warningSource}</if>
@@ -60,7 +60,7 @@
        order by warning.warning_time desc
     </select>
     <select id="selectNonAutomaticWarningList" resultType="com.zc.business.domain.DcWarning">
-        SELECT facility.facility_name,   warning.`id`,warning.`stake_mark`, warning.`direction`,facility.facility_name,
+        SELECT facility.facility_name,   warning.`id`,warning.`stake_mark`, warning.`direction`,
         mark.longitude,mark.latitude,warning.lane,duration,
         warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
         warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
@@ -68,7 +68,7 @@
         warning.`warning_type`,warning.`warning_subclass`,warning.`warning_title`,
         warning.`other_config` FROM dc_warning AS warning
         left JOIN dc_stake_mark AS mark ON mark.stake_mark=warning.stake_mark and mark.direction=warning.direction
-        left join dc_facility as facility on facility.stake_mark=warning.stake_mark
+        left join dc_facility as facility on facility.stake_mark=warning.stake_mark and facility.facility_type=1
         <where>
             <if test="warningSource != null  and warningSource != ''"> and warning.warning_source = #{warningSource}</if>
             <if test="warningState != null  and warningState != ''"> and warning.warning_state = #{warningState}</if>