From 402cd6a9684a8e41517d4e6e9fd401b1aaeb632a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Fri, 21 Jun 2024 14:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E6=A3=80=E6=B5=8B=E5=99=A8?=
 =?UTF-8?q?=20=E6=8E=A8=E9=80=81=20=E6=A1=A9=E5=8F=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DcTollStationStatisticsDataMap.java       | 19 +++++++
 .../device/handler/DeviceMessageHandler.java  |  5 +-
 .../DcTollStationStatisticsDataMapper.xml     | 55 ++++++++++---------
 3 files changed, 50 insertions(+), 29 deletions(-)
 create mode 100644 zc-business/src/main/java/com/zc/business/domain/DcTollStationStatisticsDataMap.java

diff --git a/zc-business/src/main/java/com/zc/business/domain/DcTollStationStatisticsDataMap.java b/zc-business/src/main/java/com/zc/business/domain/DcTollStationStatisticsDataMap.java
new file mode 100644
index 00000000..efb16b76
--- /dev/null
+++ b/zc-business/src/main/java/com/zc/business/domain/DcTollStationStatisticsDataMap.java
@@ -0,0 +1,19 @@
+package com.zc.business.domain;
+
+import lombok.Data;
+
+/**
+ *
+ */
+@Data
+public class DcTollStationStatisticsDataMap {
+    private String tollStationCode;
+    private String stakMark;
+    private String statisticalDate;
+    private String facilityName;
+    private String id;
+    private Integer trafficVolume;
+    private Integer accessType;
+    private Integer periodType;
+
+}
diff --git a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java b/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java
index c8a93042..50ce257c 100644
--- a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java
+++ b/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java
@@ -619,7 +619,7 @@ if (meteorologicalDetectorData.getPrecipitationType().equals("1")){
             String string = object.toString();
 
             DcWarning dcWarning = new DcWarning();
-            dcWarning.setStakeMark(meteorologicalDetectorData.getStakeMark());
+            dcWarning.setStakeMark(stakeMark);
 
             dcWarning.setWarningSource(7);//气象检测器
             dcWarning.setOtherConfig(string);
@@ -630,6 +630,7 @@ if (meteorologicalDetectorData.getPrecipitationType().equals("1")){
             if (direction.equals("济南方向")){
                 dcWarning.setDirection("3");
             }
+
             dcWarningService.insertDcWarning(dcWarning);
 
             //待确认数量
@@ -654,7 +655,7 @@ if (meteorologicalDetectorData.getPrecipitationType().equals("1")){
             object.put("meteorologicalDetectorData", meteorologicalDetectorData);
             String string = object.toString();
             DcWarning dcWarning = new DcWarning();
-            dcWarning.setStakeMark(meteorologicalDetectorData.getStakeMark());
+            dcWarning.setStakeMark(stakeMark);
             dcWarning.setWarningSource(7);//气象检测器
             dcWarning.setOtherConfig(string);
             dcWarning.setWarningTitle("气象预警");
diff --git a/zc-business/src/main/resources/mapper/business/DcTollStationStatisticsDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcTollStationStatisticsDataMapper.xml
index 01270cc0..b6c8fe35 100644
--- a/zc-business/src/main/resources/mapper/business/DcTollStationStatisticsDataMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcTollStationStatisticsDataMapper.xml
@@ -3,14 +3,15 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zc.business.mapper.DcTollStationStatisticsDataMapper">
-    <resultMap type="map" id="countMap">
+    <resultMap type="com.zc.business.domain.DcTollStationStatisticsDataMap" id="DcTollStationStatisticsDataMap">
         <result property="id" column="id"/>
         <result property="facilityName" column="facility_name"/>
-        <result property="toll_station_code" column="toll_station_code"/>
-        <result property="traffic_volume" column="traffic_volume"/>
-        <result property="period_type" column="period_type"/>
-        <result property="access_type" column="access_type"/>
-        <result property="statisticalDate" column="statisticalDate"/>
+        <result property="tollStationCode" column="toll_station_code"/>
+        <result property="trafficVolume" column="traffic_volume"/>
+        <result property="periodType" column="period_type"/>
+        <result property="accessType" column="access_type"/>
+        <result property="statisticalDate" column="statistical_date"/>
+        <result property="stakMark" column="stake_mark"/>
     </resultMap>
     <!-- 插入或更新交通路段数据 -->
     <insert id="insertOrUpdate" parameterType="com.zc.business.domain.DcTollStationStatisticsData">
@@ -100,26 +101,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="TollBoothStatistics" resultMap="countMap" resultType="map" >
-        SELECT
-            fa.facility_name,
-            fa.stake_mark,
-            dt.id,
-            dt.access_type,
-            dt.period_type,
-            dt.traffic_volume,
-            dt.toll_station_code,
-            dt.statistical_date
-        FROM
-            dc_facility AS fa
-                LEFT JOIN
-            dc_toll_station_statistics_data AS dt
-            ON
-                fa.facility_code = dt.toll_station_code
-                    AND DATE(dt.statistical_date) = DATE(#{startDate})
-            AND dt.period_type = #{periodType}
-            AND dt.access_type = #{accessType}
-        WHERE fa.facility_type = 1
-    </select>
+        <select id="TollBoothStatistics" parameterType="string" resultType="DcTollStationStatisticsDataMap" >
+            SELECT
+                fa.facility_name,
+                fa.stake_mark,
+                dt.id,
+                dt.access_type,
+                dt.period_type,
+                dt.traffic_volume,
+                dt.toll_station_code,
+                dt.statistical_date
+            FROM
+                dc_facility AS fa
+                    LEFT JOIN
+                dc_toll_station_statistics_data AS dt
+                ON
+                    fa.facility_code = dt.toll_station_code
+                        AND DATE(dt.statistical_date) = DATE(#{startDate})
+                AND dt.period_type = #{periodType}
+                AND dt.access_type = #{accessType}
+            WHERE fa.facility_type = 1
+        </select>
 
 </mapper>