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

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

@@ -1,5 +1,6 @@
 package com.zc.business.controller;
 
+import java.util.HashMap;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -132,5 +133,13 @@ public class DcPublishManageController extends BaseController
     {
         return AjaxResult.success(dcPublishManageService.releaseTrendsPublishManage());
     }
-
+    //统计服务,月发布渠道趋势分析
+    @PostMapping("/monthTrendsPublishManage")
+    public AjaxResult monthTrendsPublishManage(@RequestBody DcPublishManage dcPublishManage)
+    {
+        if (dcPublishManage==null||dcPublishManage.getPublishTime()==null){
+            return AjaxResult.error("参数错误");
+        }
+        return AjaxResult.success(dcPublishManageService.monthTrendsPublishManage(dcPublishManage));
+    }
 }

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

@@ -53,7 +53,8 @@ public interface DcPublishManageMapper
      * @return 结果
      */
     int deleteDcPublishManageById(Long id);
-
+    //删除事件发布记录 params 事件id
+    int deleteDcPublishManageEventId(String eventId);
     /**
      * 批量删除信息发布管理记录
      * 
@@ -73,4 +74,6 @@ public interface DcPublishManageMapper
     public List<HashMap<String,Object>> eventTypePublishManage();
     //统计今日发布趋势分析
     public List<HashMap<String,Object>> releaseTrendsPublishManage();
+    //统计月发布趋势分析
+    public List<HashMap<String,Object>> monthTrendsPublishManage(DcPublishManage dcPublishManage);
 }

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

@@ -66,4 +66,6 @@ public interface IDcPublishManageService
     public List<HashMap<String,Object>> eventTypePublishManage();
     //统计今日发布趋势分析
     public List<HashMap<String,Object>> releaseTrendsPublishManage();
+    //统计月发布趋势分析
+    public List<HashMap<String,Object>> monthTrendsPublishManage(DcPublishManage dcPublishManage);
 }

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

@@ -77,6 +77,9 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
     @Autowired
     private IDcEventProcessService dcEventProcessService;
 
+    @Autowired
+    private DcPublishManageMapper dcPublishManageMapper;
+
     private final String HAPPEN = "发生";
     private final String EVENT = "事件";
     private final String SUBEVENT = "0";
@@ -216,7 +219,7 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                 //交通管制
                 case 3:
                     if (dcEvent.getDcEventTrafficControl() != null) {
-                        //TODO 插入多个收费站
+                        // 插入多个收费站
                         if (dcEvent.getDcEventTrafficControl().getFacilityIds().length == 1) {//facilityIds==1 说明只选择了一个收费站
 
                             if (dcEventId != null && !dcEventId.equals("")) {//不等于空 事件处置页面 修改
@@ -745,6 +748,11 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
         int i7 = -1;
         for (String id : ids) {
             DcEvent dcEvent = dcEventMapper.selectDcEventMainById(id);
+            if (dcEvent==null){
+                continue;
+            }
+            // 删除信息发布记录
+            dcPublishManageMapper.deleteDcPublishManageEventId(id);
             int eventType = Math.toIntExact(dcEvent.getEventType());
             i7 = dcEventMapper.deleteDcEventById(id);
 
@@ -827,7 +835,7 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
      */
     @Override
     public DcEvent selectEventSubclassById(int eventType, String id) {
-        //todo
+        //
         DcEvent dcEvent = dcEventMapper.selectDcEventById(id);
         List<DcProcessConfig> processConfigList = dcProcessConfigMapper.selectDcProcessConfigByEventType(Math.toIntExact(dcEvent.getEventType()));
         dcEvent.setProcessConfigList(processConfigList);

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

@@ -125,4 +125,9 @@ public class DcPublishManageServiceImpl implements IDcPublishManageService
     public List<HashMap<String, Object>> releaseTrendsPublishManage() {
         return dcPublishManageMapper.releaseTrendsPublishManage();
     }
+    //统计月发布趋势分析
+    @Override
+    public List<HashMap<String, Object>> monthTrendsPublishManage(DcPublishManage dcPublishManage) {
+        return dcPublishManageMapper.monthTrendsPublishManage(dcPublishManage);
+    }
 }

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

@@ -185,13 +185,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteDcPublishManageById" parameterType="Long">
         delete from dc_publish_manage where id = #{id}
     </delete>
-
+    <delete id="deleteDcPublishManageEventId">
+        delete from dc_publish_manage where event_id = #{eventId}
+    </delete>
     <delete id="deleteDcPublishManageByIds" parameterType="String">
         delete from dc_publish_manage where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
+
     <select id="statisticsPublishManage" resultType="java.util.HashMap">
         SELECT
             p.publish_channels publishChannels,
@@ -248,4 +251,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) AS m ON h.hour = m.hour AND pc.publish_channels = m.publish_channels
         ORDER BY h.hour, pc.publish_channels;
     </select>
+    <select id="monthTrendsPublishManage" resultType="java.util.HashMap">
+        SELECT h.hour,  pc.publish_channels, COALESCE(m.number, 0) AS number
+        FROM (
+                 SELECT 0 AS hour UNION ALL  SELECT 1 UNION ALL  SELECT 2 UNION ALL
+                 SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL
+                 SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9 UNION ALL
+                 SELECT 10 UNION ALL SELECT 11 UNION ALL  SELECT 12 UNION ALL
+                 SELECT 13 UNION ALL SELECT 14 UNION ALL SELECT 15 UNION ALL
+                 SELECT 16 UNION ALL  SELECT 17 UNION ALL SELECT 18 UNION ALL
+                 SELECT 19 UNION ALL   SELECT 20 UNION ALL SELECT 21 UNION ALL
+                 SELECT 22 UNION ALL SELECT 23
+             ) AS h
+                 CROSS JOIN (
+            SELECT 1 AS publish_channels UNION ALL
+            SELECT 2 UNION ALL SELECT 3 UNION ALL  SELECT 4 UNION ALL
+            SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7
+        ) AS pc
+        LEFT JOIN (
+            SELECT HOUR(publish_time) AS hour, publish_channels, COUNT(*) AS number
+            FROM dc_publish_manage
+            WHERE YEAR(publish_time) = YEAR(CURDATE())
+            AND MONTH(publish_time) = MONTH(#{publishTime})
+            GROUP BY HOUR(publish_time), publish_channels
+        ) AS m ON h.hour = m.hour AND pc.publish_channels = m.publish_channels
+        ORDER BY h.hour, pc.publish_channels;
+    </select>
 </mapper>