From b2945d20c779be80afa1375870f35ca859d2ae5e Mon Sep 17 00:00:00 2001
From: zhao-meiyu <2970484253@qq.com>
Date: Thu, 25 Jan 2024 11:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=9F=E7=9F=A5=E7=BB=9F=E8=AE=A1=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DcPerceivedEventsWarningServiceImpl.java  |  4 +-
 .../DcPerceivedEventsWarningMapper.xml        | 60 +++++++++++++------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java
index 963597c8..93e86423 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java
@@ -146,8 +146,8 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa
         List<HashMap<String, Object>> mapList = perceivedEventsWarningMapper.selectSectionMark(dcWarning);
         for (HashMap<String,Object> list:mapList){
             HashMap<String, Object> mapNum = new HashMap<>();
-            String markId = (String) list.get("id");
-            dcWarning.setStakeMarkId(markId);
+            String markId = (String) list.get("stakeMark");
+            dcWarning.setStakeMark(markId);
             String sectionNumber="";
             switch (type) {
                 case "day":
diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
index 3302b343..7e745565 100644
--- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml
@@ -15,14 +15,14 @@
     </select>
 
     <select id="selectPerceivedEventsList" resultType="com.zc.business.domain.DcWarning">
-        SELECT warning.`id`,warning.`stake_mark`, warning.`direction`,
+        SELECT warning.`id`,warning.`stake_mark_id`, warning.`direction`,
         mark.longitude,mark.latitude,warning.lane,
         warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
         warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
         warning.`remark`, warning.`create_time`,warning.`update_time`,
         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.id=warning.stake_mark
+        LEFT JOIN dc_stake_mark AS mark ON mark.stake_mark=warning.stake_mark_id
         <where>
             <if test="warningType != null  and warningType != ''"> and warning_type = #{warningType}</if>
             <if test="warningSubclass != null  and warningSubclass != ''"> and warning_subclass = #{warningSubclass}</if>
@@ -30,7 +30,7 @@
     </select>
     <select id="selectSectionPerceivedEventsList" resultType="hashmap">
         SELECT COUNT(1) as number,section.section_name sectionName  FROM dc_warning AS warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.stake_mark
         LEFT JOIN dc_road_section AS  section ON mark.section_id=section.id
         where DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
         group by section.section_name
@@ -38,7 +38,7 @@
     </select>
     <select id="selectSectionPerceivedNumber" resultType="java.util.HashMap">
         SELECT COUNT(1) as number,section.section_name sectionName  FROM dc_warning AS warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.stake_mark
         LEFT JOIN dc_road_section AS  section ON mark.section_id=section.id
         where DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
         group by section.section_name
@@ -76,7 +76,7 @@
     <select id="selectWarningTrendDay" resultType="java.util.HashMap">
         SELECT DATE_FORMAT(warning.create_time, '%Y-%m-%d %H') AS time, COUNT(*) AS number
         FROM dc_warning AS warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.stake_mark
         WHERE  DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
           AND warning.direction=#{direction}
           AND mark.`section_id`=#{sectionId}
@@ -85,7 +85,7 @@
     <select id="selectWarningTrendMonth" resultType="java.util.HashMap">
         SELECT DATE(warning.create_time) AS DAY, COUNT(*) AS number
         FROM dc_warning as warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.stake_mark
         WHERE DATE_FORMAT(warning.create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m')
           AND warning.direction=#{direction}
           and mark.`section_id`=#{sectionId}
@@ -103,7 +103,7 @@
             MONTH(warning.create_time) AS MONTH,
             COUNT(*) AS number
         FROM dc_warning as warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.stake_mark
         WHERE YEAR(warning.create_time) =DATE_FORMAT(#{createTime},'%Y')
           AND warning.direction=#{direction}
           and mark.`section_id`=#{sectionId}
@@ -114,14 +114,14 @@
     <select id="selectWarningTrendYear" resultType="java.util.HashMap">
         SELECT YEAR(warning.create_time) AS YEAR, COUNT(*) AS number
         FROM dc_warning as warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.stake_mark
         where  mark.`section_id`=#{sectionId}   AND warning.direction=#{direction}
         GROUP BY YEAR
     </select>
     <select id="selectWarningSectionTypeDay" resultType="java.util.HashMap">
         SELECT warning.warning_type warningType,COUNT(*) AS number
         FROM dc_warning as warning
-        LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.id
+        LEFT JOIN dc_stake_mark as mark on warning.stake_mark_id=mark.stake_mark
         where DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
           AND warning.direction=#{direction}
            and   mark.`section_id`=#{sectionId}
@@ -131,7 +131,7 @@
     <select id="selectWarningSectionTypeMonth" resultType="java.util.HashMap">
         SELECT warning.warning_type warningType,COUNT(*) AS number
         FROM dc_warning as warning
-        LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.id
+        LEFT JOIN dc_stake_mark as mark on warning.stake_mark_id=mark.stake_mark
         where DATE_FORMAT(warning.create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m')
           AND warning.direction=#{direction}
           and   mark.`section_id`=#{sectionId}
@@ -149,7 +149,7 @@
             warning.warning_type warningType,
             COUNT(*) AS number
         FROM dc_warning as warning
-                 LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
+                 LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.stake_mark
         WHERE YEAR(warning.create_time) =DATE_FORMAT(#{createTime},'%Y')
           AND warning.direction=#{direction}
           and mark.`section_id`=#{sectionId}
@@ -160,23 +160,23 @@
         SELECT warning.warning_type warningType, COUNT(*) AS number,
                DATE_FORMAT(warning.create_time, '%Y') as createTime
         FROM dc_warning as warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.id
+        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark_id=mark.stake_mark
         where  mark.`section_id`=#{sectionId}   AND warning.direction=#{direction}
         GROUP BY warningType
     </select>
 
     <select id="selectSectionMark" resultType="java.util.HashMap">
-        SELECT id FROM dc_stake_mark AS mark   WHERE mark.section_id=#{sectionId}
+        SELECT stake_mark stakeMark FROM dc_stake_mark AS mark   WHERE mark.section_id=#{sectionId}
     </select>
     <select id="selectSectionNumber" resultType="java.lang.String">
-        select count(1) from dc_warning where stake_mark=#{stakeMark}  AND warning.direction=#{direction}
+        select count(1) from dc_warning where stake_mark_id=#{stakeMarkId}  AND warning.direction=#{direction}
     </select>
     <select id="selectWarningEscalation" resultType="java.util.HashMap">
         select org.organization_name,warning.warning_type,warning.warning_subclass,
         warning_title,warning.warning_state,warning.
         warning_source,DATE_FORMAT(warning.create_time,'%Y-%m-%d %H:%m:%s') createTime from dc_warning as warning
-        LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.id
-        LEFT JOIN dc_organization as org on mark.id=org.stake_mark AND mark.direction=org.direction
+        LEFT JOIN dc_stake_mark as mark on warning.stake_mark_id=mark.stake_mark
+        LEFT JOIN dc_organization as org on mark.stake_mark=org.stake_mark_id AND mark.direction=org.direction
         <where>
             <if test="warningState != null  and warningState != ''"> and warning.warning_state = #{warningState}</if>
         </where>
@@ -185,7 +185,7 @@
     <update id="updateWarning">
         update dc_warning
         <trim prefix="SET" suffixOverrides=",">
-            <if test="stakeMark != null and stakeMark != ''">stake_mark = #{stakeMark},</if>
+            <if test="stakeMarkId != null and stakeMarkId != ''">stake_mark_id = #{stakeMarkId},</if>
             <if test="direction != null">direction = #{direction},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="warningState != null">warning_state = #{warningState},</if>
@@ -203,5 +203,29 @@
         </trim>
         where id = #{id}
     </update>
-
+    <select id="selectWarningMarkDay" resultType="java.lang.String">
+        select count(1) from dc_warning where stake_mark_id=#{stakeMark}
+         AND direction=#{direction} and DATE(create_time)=DATE_FORMAT(#{createTime},'%Y-%m-%d')
+    </select>
+    <select id="selectWarningMarkMonth" resultType="java.lang.String">
+        select count(1) from dc_warning where stake_mark_id=#{stakeMark}
+          AND direction=#{direction} and  DATE_FORMAT(create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m')
+    </select>
+    <select id="selectWarningMarkYear" resultType="java.lang.String">
+        select count(1) from dc_warning where stake_mark_id=#{stakeMark}
+        AND direction=#{direction} and  YEAR(create_time) =DATE_FORMAT(#{createTime},'%Y')
+    </select>
+    <select id="selectWarningMarkQuarter" resultType="hashmap">
+        select count(1) number,stake_mark_id stakeMarkId,
+               CASE
+                   WHEN MONTH(create_time) BETWEEN 1 AND 3 THEN '第一季度'
+                   WHEN MONTH(create_time) BETWEEN 4 AND 6 THEN '第二季度'
+                   WHEN MONTH(create_time) BETWEEN 7 AND 9 THEN '第三季度'
+                   ELSE '第四季度'
+                   END AS QUARTER
+        from dc_warning where stake_mark_id=#{stakeMark}
+                          AND direction=#{direction}
+        GROUP BY QUARTER
+        ORDER BY QUARTER;
+    </select>
 </mapper>
\ No newline at end of file