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

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

@@ -148,5 +148,12 @@ public class DcEventController extends BaseController
     {
         return toAjax(dcEventService.deleteDcEventByIds(eventType,ids));
     }
-
+    @ApiOperation("事件数量统计")
+    // @PreAuthorize("@ss.hasPermi('system:event:list')")
+    @GetMapping("/count")
+    public Map<String, Object> count()
+    {
+        Map<String,Object> map = dcEventService.selectCount();
+        return map;
+    }
 }

zc-business/src/main/java/com/zc/business/domain/DcEvent.java

@@ -2,6 +2,7 @@ package com.zc.business.domain;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -31,21 +32,21 @@ public class DcEvent extends BaseEntity {
     /**
      * 事件编号
      */
+    @Excel(name = "事件编号")
     @ApiModelProperty("事件编号")
     private String id;
     /**
      * 所属部门
      */
     @ApiModelProperty("所属部门")
-
     @Excel(name = "所属部门")
     private Long deptId;
     /**
      * 所在桩号
      */
+    @Excel(name = "所在桩号")
     @ApiModelProperty(" 所在桩号 and 条件搜索 开始桩号")
     private String stakeMark;
-
     @ApiModelProperty("条件搜索 结束桩号")
     @TableField(exist = false)
     private String endStakeMark;
@@ -57,34 +58,40 @@ public class DcEvent extends BaseEntity {
      * 2-中
      * 3-下
      */
+    @Excel(name = "方向")
     @ApiModelProperty("方向")
     private String direction;
     /**
      * 处理人员
      */
+
     @ApiModelProperty("处理人员")
     private Long userId;
     /**
      * 开始时间
      */
+    @Excel(name = "开始时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("开始时间")
     private Date startTime;
     /**
      * 结束时间
      */
+    @Excel(name = "结束时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("结束时间")
     private Date endTime;
     /**
      * 预计解除时间
      */
+    @Excel(name = "预计解除时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("预计解除时间")
     private Date estimatedEndTime;
     /**
      * 事件等级
      */
+    @Excel(name = "事件等级")
     @ApiModelProperty("事件等级")
     private Long eventLevel;
     /**
@@ -101,10 +108,12 @@ public class DcEvent extends BaseEntity {
      * 10-异常天气
      * 11-其他事件
      */
+
     @ApiModelProperty("事件主类：1-交通事故 2-车辆故障 3-交通管制 4-交通拥堵  5-非法上路 6-路障清除 7-施工建设 8-服务区异常9-设施设备隐患 10-异常天气11-其他事件")
 
     private Long eventType;
     @ApiModelProperty("事件主类")
+    @Excel(name = "事件主类")
     @TableField(exist = false)
     private String stringEventType;
     /**
@@ -122,6 +131,7 @@ public class DcEvent extends BaseEntity {
      * 3-3 立交封闭和限行
      * 3-4 服务区封闭和限行
      */
+    @Excel(name = "设备编号")
     @ApiModelProperty("事件子类 例：事件子类：* 1-1 追尾* 1-2 侧翻* 1-3 撞护栏* 1-4 自然* 1-5 其他事故* 2-1 车辆故障")
 
     private String eventSubclass;
@@ -149,7 +159,6 @@ public class DcEvent extends BaseEntity {
      4-已撤销
      */
     @ApiModelProperty("事件状态 事件状态：*      0-未解决1-已解决2-已关闭")
-
     private Long eventState;
     /**
      * 事件来源：
@@ -164,6 +173,7 @@ public class DcEvent extends BaseEntity {
     @ApiModelProperty("事件来源   * 1-96659* 2-交警转接* 3-道路巡查* 4-视频巡查* 5-视频AI* 6-一键救援* 7-其他")
 
     private Long eventSource;
+    @Excel(name = "事件来源")
     @TableField(exist = false)
     @ApiModelProperty("事件来源")
     private String stringEventSource;
@@ -173,30 +183,36 @@ public class DcEvent extends BaseEntity {
      * 2-关联事件
      */
     @ApiModelProperty("事件性质      * 1-首发事件* 2-关联事件")
-
+    @Excel(name = "事件性质")
     private Long eventNature;
 
     /**
      * 事件来源补充说明
      */
+    @Excel(name = "事件来源补充说明")
     @ApiModelProperty("事件来源补充说明")
     private String eventSourceTips;
     /**
      * 是否处在隧道
      */
+    @Excel(name = "是否处在隧道")
     @ApiModelProperty("是否处在隧道  0 表示 false，1 表示 true")
     private Integer inTunnel;
+    @Excel(name = "高速")
     @ApiModelProperty("高速公路")
     private Long roadId;
 
     /**
      * 2024-1-24新增
      */
+    @Excel(name = "发生时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("发生时间")
     private Date occurrenceTime;
+    @Excel(name = "是否是感知事件")
     @ApiModelProperty("是否是感知事件  0 表示 false，1 表示 true")
     private Integer isPerceived;
+    @Excel(name = "影响车道")
  @ApiModelProperty("影响车道")
     private Long lang;
     @ApiModelProperty("高速名")
@@ -238,6 +254,14 @@ public class DcEvent extends BaseEntity {
     @ApiModelProperty("交通管制事件实体")
     @TableField(exist = false)
     private DcEventTrafficControl dcEventTrafficControl;
+    @Excel(name = "处理人员")
+    @ApiModelProperty("处理人员")
+    @TableField(exist = false)
+    private String nickName;
+    @Excel(name = "事件状态")
+    @ApiModelProperty("string事件状态")
+    @TableField(exist = false)
+    private String stringEventState;
 
 
     @ApiModelProperty("常用语")

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

@@ -4,6 +4,7 @@ package com.zc.business.mapper;
 import com.zc.business.domain.DcEvent;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -66,6 +67,9 @@ public interface DcEventMapper
      *
      */
     List<DcEvent> selectDispatchEventList(DcEvent dcEvent);
+
+    List<Map<String,String>>selectCount();
+
 }
 
 

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

@@ -60,4 +60,5 @@ public interface DcWarningMapper
      * @return 结果
      */
     int deleteDcWarningByIds(Integer[] ids);
+    int selectCount();
 }

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

@@ -4,6 +4,7 @@ package com.zc.business.service;
 import com.zc.business.domain.DcEvent;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 事件信息Service接口
@@ -68,9 +69,11 @@ public interface IDcEventService
 
     /**
      * 获取事件以及子类详细信息
-     * @param evenyType
+     * @param
      * @param id
      * @return
      */
     DcEvent selectEventSubclassById(int eventType, String id);
+
+    Map<String,Object> selectCount();
 }

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

@@ -1,6 +1,9 @@
 package com.zc.business.service.impl;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
@@ -48,6 +51,8 @@ private DcEventAbnormalWeatherMapper dcEventAbnormalWeatherMapper;
 
     @Autowired
     private DcProcessConfigMapper dcProcessConfigMapper;
+    @Autowired
+    private DcWarningMapper dcWarningMapper;
 
 
 
@@ -380,4 +385,19 @@ dcEvent.setDeptId(SecurityUtils.getDeptId());
             return dcEvent;
 
     }
+
+    @Override
+    public  Map<String,Object> selectCount() {
+Map<String,Object> map = new HashMap<>();
+        int i = dcWarningMapper.selectCount();
+        System.out.println("***********************************"+i);
+        List<Map<String,String>> strings = dcEventMapper.selectCount();
+        for (int i1 = 0; i1 < strings.size(); i1++) {
+            strings.get(i1).get("status");
+            strings.get(i1).get("count");
+            map.put(strings.get(i1).get("status"),strings.get(i1).get("count"));
+        }
+             map.put("warningCount",i);
+        return map;
+    }
 }

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

@@ -26,11 +26,19 @@
             <result property="eventSourceTips"    column="event_source_tips"    />
             <result property="stringEventType"    column="stringEventType"    />
             <result property="stringEventSource"    column="stringEventSource"    />
+            <result property="stringEventState"    column="stringEventState"    />
+            <result property="nickName"    column="nickName"    />
             <result property="roadId"    column="road_id"    />
             <result property="lang"    column="lang"    />
             <result property="eventTitle"    column="event_title"    />
             <result property="occurrenceTime"    column="occurrence_time"    />
         </resultMap>
+
+    <resultMap type="map" id="countMap">
+            <result property="status"    column="status"    />
+            <result property="count"    column="count"    />
+        </resultMap>
+
     <resultMap type="com.zc.business.domain.DcEvent" id="DcEventResultById">
             <result property="id"    column="id"    />
             <result property="deptId"    column="dept_id"    />
@@ -61,6 +69,8 @@
             <result property="commonPhrases"    column="common_phrases"    />
         <result property="stringEventType"    column="stringEventType"    />
         <result property="stringEventSource"    column="stringEventSource"    />
+        <result property="stringEventState"    column="stringEventState"    />
+        <result property="nickName"    column="nickName"    />
         <result property="lang"    column="lang"    />
         <result property="roadName"    column="road_name"    />
         <result property="organizationName"    column="organization_name"    />
@@ -131,10 +141,11 @@
     <sql id="selectDcEventVo">
         SELECT
             id,
-            dept_id,
+            dc_event.dept_id as dept_id,
             stake_mark,
             direction,
-            user_id,
+            dc_event.user_id as user_id,
+            sys_user.nick_name as nickName,
             start_time,
             end_time,
             estimated_end_time,
@@ -211,7 +222,13 @@
                 END AS event_subclass,
             event_cause,
             description,
-            event_state,
+            dc_event.event_state,
+            CASE  dc_event.event_state
+                WHEN '0' THEN '待确认'
+                WHEN '1' THEN '处理中'
+                WHEN '2' THEN '已完成'
+                WHEN '3' THEN '已撤销'
+                END AS stringEventState,
             event_source,
             CASE event_source
                 WHEN '1' THEN '96659'
@@ -223,15 +240,18 @@
                 ELSE '其他'
                 END AS stringEventSource,
             event_nature,
-            remark,
+            dc_event.remark as remark,
-            create_time,
+            dc_event.create_time as create_time,
-            update_time,
+            dc_event.update_time as update_time,
             event_source_tips,
             occurrence_time,
             in_tunnel,
             road_id
         FROM
-            dc_event   </sql>
+            dc_event
+                LEFT JOIN sys_user on dc_event.user_id = sys_user.user_id
+            </sql>
+
     <sql id="selectDcEventVoListAll"> select 	dc_event.id AS id,
 	dc_event.stake_mark,
 	dc_event.direction,
@@ -305,6 +325,7 @@
                 <if test="eventSourceTips != null  and eventSourceTips != ''"> and event_source_tips = #{eventSourceTips}</if>
                 <if test="inTunnel != null "> and in_tunnel = #{inTunnel}</if>
             </where>
+
         </select>
 
 <!--    关联调度信息记录表  查询详情  -->
@@ -328,12 +349,13 @@
 
 <!--    事件详情 包含事件类型 节点-->
     <select id="selectDcEventById" parameterType="String" resultMap="DcEventResultById">
-
         /*详情可以调用事件处理流程*/
         SELECT 	dc_event.id AS id,
                   dc_event.stake_mark,
                   dc_event.direction,
                   dc_event.user_id,
+                  dc_event.user_id as user_id,
+                  sys_user.nick_name as nickName,
                   dc_event.start_time,
                   dc_event.end_time,
                   dc_event.estimated_end_time,
@@ -410,10 +432,15 @@
                       WHEN '11-1' THEN'其他事件'
                       END AS event_subclass,
 
-
                   dc_event.event_cause,
                   dc_event.description,
                   dc_event.event_state,
+                  CASE  dc_event.event_state
+                      WHEN '0' THEN '待确认'
+                      WHEN '1' THEN '处理中'
+                      WHEN '2' THEN '-已完成'
+                      WHEN '3' THEN '-已撤销'
+                      END AS stringEventState,
                   CASE  dc_event.event_source
                       WHEN '1' THEN '96659'
                       WHEN '2' THEN '交警转接'
@@ -437,6 +464,7 @@
                  LEFT JOIN dc_event_type ON dc_event_type.event_type = dc_event.event_type
                  LEFT JOIN sys_dept ON dc_event.dept_id = sys_dept.dept_id
                  LEFT JOIN dc_road ON dc_event.road_id = dc_road.id
+                 LEFT JOIN sys_user on dc_event.user_id = sys_user.user_id
         where dc_event.id = #{id}
 
     </select>
@@ -553,6 +581,23 @@
         <if test="eventState != null "> and event_state = #{eventState}</if>
         <if test="startTime != null "> and start_time BETWEEN #{startTime} and #{endTime}  </if>
     </where>
+
 </select>
 
+    <select id="selectCount"  resultMap="countMap" resultType="map">
+        SELECT
+            s.status,
+            COALESCE(t.count, 0) AS count
+        FROM (
+            SELECT 0 AS event_state, 'state0Count' AS status UNION ALL
+            SELECT 1 AS event_state, 'state1Count' AS status UNION ALL
+            SELECT 2 AS event_state, 'state2Count' AS status UNION ALL
+            SELECT 3 AS event_state, 'state3Count' AS status
+            ) s
+            LEFT JOIN (
+            SELECT event_state, COUNT(*) AS count
+            FROM dc_event
+            GROUP BY event_state
+            ) t ON s.event_state = t.event_state;
+    </select>
 </mapper>

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

@@ -142,4 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <select id="selectCount"   resultType="int">
+        SELECT COUNT(*)AS count  FROM dc_warning
+    </select>
 </mapper>