优化

src/main/java/com/sooka/sponest/event/eventProcess/controller/EventProcessController.java

@@ -96,9 +96,9 @@ public class EventProcessController extends BaseController {
      * @param id 事件信息主键
      * @author limeng
      */
-    @GetMapping("/getConfirmedEventDetailById/{id}")
-    public AjaxResult getConfirmedEventDetailById(@PathVariable("id") String id) {
-        EventInfo unconfirmedEventDetailById = eventProcessService.getConfirmedEventDetailById(id);
+    @GetMapping("/getProcessEventDetailById/{id}")
+    public AjaxResult getProcessEventDetailById(@PathVariable("id") String id) {
+        EventInfo unconfirmedEventDetailById = eventProcessService.getProcessEventDetailById(id);
         if (null == unconfirmedEventDetailById) {
             return AjaxResult.error("查询异常!");
         }

src/main/java/com/sooka/sponest/event/eventProcess/mapper/EventProcessMapper.java

@@ -15,15 +15,15 @@ public interface EventProcessMapper {
 
     List<EventInfoBO> selectUnConfirmedList(EventInfo eventInfo);
 
-    EventInfo getUnconfirmedEventDetailById(String eventId);
+    EventInfo getUnconfirmedEventDetailById(EventInfo eventInfo);
 
     List<EventInfoBO> selectEventProcessList(EventInfo eventInfo);
 
-    EventInfo getConfirmedEventDetailById(String eventId);
+    EventInfo getProcessEventDetailById(EventInfo eventInfo);
 
     List<EventInfoBO> selectUsualList(EventInfo eventInfo);
 
-    EventInfo getUsualEventDetailById(String eventId);
+    EventInfo getUsualEventDetailById(EventInfo eventInfo);
 
     void insertEventProcess(EventInfo eventInfo);
 
@@ -31,8 +31,6 @@ public interface EventProcessMapper {
 
     void deleteEventUnconfirmed(EventInfo eventInfo);
 
-    EventInfoBO getProcessEventById(String eventId);
-
     void updateEventProcess(EventInfo eventInfo);
 
     void deleteEventProcess(EventInfo eventInfo);

src/main/java/com/sooka/sponest/event/eventProcess/service/EventProcessService.java

@@ -1,7 +1,6 @@
 package com.sooka.sponest.event.eventProcess.service;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.sooka.sponest.event.eventLog.domain.EventLog;
 import com.sooka.sponest.event.eventMessage.domain.DaHuaFireEventVO;
 import com.sooka.sponest.event.eventMessage.domain.DaHuaOtherEventVO;
 import com.sooka.sponest.event.eventMessage.domain.SensorEventVo;
@@ -40,7 +39,7 @@ public interface EventProcessService {
 
     List<EventInfoBO> selectEventProcessList(EventInfo eventInfo);
 
-    EventInfo getConfirmedEventDetailById(String id);
+    EventInfo getProcessEventDetailById(String id);
 
     List<EventInfoBO> selectUsualList(EventInfo eventInfo);
 

src/main/java/com/sooka/sponest/event/eventProcess/service/impl/EventProcessServiceImpl.java

@@ -35,7 +35,6 @@ import com.sooka.sponest.event.utils.eventEnum.EventEnum;
 import com.sooka.sponest.monitor.api.RemoteMonitorService;
 import com.sooka.sponest.monitor.api.domain.CenterdataTAidevicedept;
 import com.sooka.sponest.monitor.api.domain.CenterdataTCamera;
-import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -274,7 +273,7 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
 
     @Override
     public EventInfo getUnconfirmedEventDetailById(String id) {
-        EventInfo unconfirmedEventDetailById = eventProcessMapper.getUnconfirmedEventDetailById(id);
+        EventInfo unconfirmedEventDetailById = eventProcessMapper.getUnconfirmedEventDetailById(new EventInfo(id));
         detailSetPath(unconfirmedEventDetailById.getEventLogList());
         return unconfirmedEventDetailById;
     }
@@ -289,8 +288,8 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
     }
 
     @Override
-    public EventInfo getConfirmedEventDetailById(String id) {
-        EventInfo confirmedEventDetailById = eventProcessMapper.getConfirmedEventDetailById(id);
+    public EventInfo getProcessEventDetailById(String id) {
+        EventInfo confirmedEventDetailById = eventProcessMapper.getProcessEventDetailById(new EventInfo(id));
         detailSetPath(confirmedEventDetailById.getEventLogList());
         return confirmedEventDetailById;
     }
@@ -306,7 +305,7 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
 
     @Override
     public EventInfo getUsualEventDetailById(String id) {
-        EventInfo usualEventDetailById = eventProcessMapper.getUsualEventDetailById(id);
+        EventInfo usualEventDetailById = eventProcessMapper.getUsualEventDetailById(new EventInfo(id));
         detailSetPath(usualEventDetailById.getEventLogList());
         return usualEventDetailById;
     }
@@ -320,43 +319,42 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
         if (lock.tryLock()) { //获取锁
             try {
                 //业务代码
-//                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
-                SysUser sysUser = new SysUser();
-                sysUser.setUserId(1000L);
-                sysUser.setDeptId(365L);
-                sysUser.setDeptNames("四平市");
-                sysUser.setNickName("测试用户");
+                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+                if (null == sysUser) {
+                    return AjaxResult.error(EventEnum.USER_NOT_FOUND.getDescribe());
+                }
 
                 //查询事件
                 List<EventInfoBO> unconfirmedEventList = eventProcessMapper.selectUnConfirmedList(eventInfo);
                 if (unconfirmedEventList.isEmpty()) {
-                    return AjaxResult.error("获取事件不存在!");
+                    return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
                 }
 
                 //获取事件详情
                 EventInfoBO unconfirmedEventDetail = unconfirmedEventList.get(0);
                 if (!EVENT_STATUS_1.equals(unconfirmedEventDetail.getEventStatus())) {
-                    return AjaxResult.error("事件已被流转, 当前状态: " + MapUtils.getString(getEventStatusMap(), unconfirmedEventDetail.getEventStatus()));
+                    return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
                 }
 
                 // 验证是否配置摄像头通道
                 CenterdataTCamera centerdataTCamera = SpringUtils.getBean(RemoteMonitorService.class).getInfoByChannelCode(unconfirmedEventDetail.getCameraCode()).getData();
                 if (StringUtils.isNull(centerdataTCamera)) {
                     logger.error("无法匹配相关设备！ChannelSn：{}", unconfirmedEventDetail.getCameraCode());
-                    return AjaxResult.error("无法匹配相关设备！");
+                    return AjaxResult.error(EventEnum.CAMERA_NOT_FOUND.getDescribe());
                 }
 
                 // 验证是否配置指挥中心
                 List<CenterdataTAidevicedept> listDept = SpringUtils.getBean(RemoteMonitorService.class).listForCommandCenter(unconfirmedEventDetail.getCameraCode(), "1", "0").getData();
                 if (StringUtils.isEmpty(listDept)) {
                     logger.info("无法匹配相关部门！摄像头编号为：{}", centerdataTCamera.getCameraCode());
+                    return AjaxResult.error(EventEnum.DEPT_NOT_FOUND.getDescribe());
                 }
 
                 //插入行管局部门
                 eventDeptService.insertEventDept(eventInfo.getEventId(), listDept);
 
                 // 插入事件日志
-                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + "确认该事件", EVENT_LOG_TYPE_2, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), DateUtils.getNowDate());
+                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + EventEnum.EVENT_CONFIRM.getDescribe(), EVENT_LOG_TYPE_2, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), DateUtils.getNowDate());
 
                 //下载附件到本地
                 moveAttach(unconfirmedEventDetail.getAttachList(), eventInfo.getEventId());
@@ -389,62 +387,52 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
         if (lock.tryLock()) { //获取锁
             try {
                 //业务代码
-//                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
-                SysUser sysUser = new SysUser();
-                sysUser.setUserId(1000L);
-                sysUser.setDeptId(365L);
-                sysUser.setDeptNames("四平市");
-                sysUser.setNickName("测试用户");
-
+                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+                if (null == sysUser) {
+                    return AjaxResult.error(EventEnum.USER_NOT_FOUND.getDescribe());
+                }
 
+                //设置标识, 判断待确认或已确认
+                boolean flag = true;
                 // 根据事件 ID 查询事件未确认列表
                 List<EventInfoBO> eventInfoBOS = eventProcessMapper.selectUnConfirmedList(new EventInfo(eventInfo.getEventId()));
 
                 // 如果事件未确认列表为空，则查询事件确认列表
                 if (eventInfoBOS.isEmpty()) {
                     eventInfoBOS = eventProcessMapper.selectEventProcessList(new EventInfo(eventInfo.getEventId()));
+
+                    //设置标识为false, 证明时确认表中的事件. 则不需要移动附件
+                    flag = false;
                 }
 
                 // 如果最终的事件列表仍然为空，说明事件不存在，直接返回错误结果
                 if (eventInfoBOS.isEmpty()) {
-                    return AjaxResult.error("获取事件不存在!");
+                    return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
                 }
 
                 //获取事件详情
                 EventInfoBO eventInfoBO = eventInfoBOS.get(0);
                 if (!EVENT_STATUS_1.equals(eventInfoBO.getEventStatus()) && !EVENT_STATUS_2.equals(eventInfoBO.getEventStatus())) {
-                    return AjaxResult.error("事件已被流转, 当前状态: " + MapUtils.getString(getEventStatusMap(), eventInfoBO.getEventStatus()));
+                    return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
                 }
 
-
-                //日志消息体
-                StringBuilder content = new StringBuilder();
-                //日志状态
-                StringBuilder logType = new StringBuilder();
-
-                //判断是误报或者重复
-                if (EVENT_STATUS_98.equals(eventInfo.getEventStatus())) {
-                    content.append("操作该事件误报");
-                    logType.append(EVENT_LOG_TYPE_98);
-                } else if (EVENT_STATUS_99.equals(eventInfo.getEventStatus())) {
-                    content.append("判断该事件为重复事件");
-                    logType.append(EVENT_LOG_TYPE_99);
-                } else {
-                    content.append("操作错误");
-                }
-
-                //下载附件到本地
-                moveAttach(eventInfoBO.getAttachList(), eventInfo.getEventId());
-
                 // 插入事件日志
-                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + content, logType.toString(), EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), DateUtils.getNowDate());
+                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + EventEnum.EVENT_USUAL.getDescribe(),
+                        EVENT_STATUS_98.equals(eventInfo.getEventStatus()) ? EVENT_LOG_TYPE_98 : EVENT_LOG_TYPE_99, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), DateUtils.getNowDate());
 
                 //将事件主体移动到无异常表
                 eventInfoBO.setEventStatus(eventInfo.getEventStatus());
                 eventProcessMapper.insertEventUsual(eventInfoBO);
+                //下载附件到本地
+                if (flag) {
+                    moveAttach(eventInfoBO.getAttachList(), eventInfo.getEventId());
 
-                //删除待确认表
-                eventProcessMapper.deleteEventUnconfirmed(eventInfoBO);
+                    //删除待确认表
+                    eventProcessMapper.deleteEventUnconfirmed(eventInfoBO);
+                } else {
+                    //删除确认表
+                    eventProcessMapper.deleteEventProcess(eventInfo);
+                }
 
             } catch (Exception e) {
                 logger.error("事件处置失败！输入参数：{}", eventInfo, e);
@@ -468,26 +456,18 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
             try {
                 //业务代码
                 SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
-//                SysUser sysUser = new SysUser();
-//                sysUser.setUserId(1000L);
-//                sysUser.setDeptId(365L);
-//                sysUser.setDeptNames("四平市");
-//                sysUser.setNickName("测试用户");
-
-                List<EventInfoBO> eventInfoBOList = eventProcessMapper.selectEventProcessList(new EventInfo(eventInfo.getEventId()));
-                if (eventInfoBOList.isEmpty()) {
-                    return AjaxResult.error("获取事件不存在!");
+                if (null == sysUser) {
+                    return AjaxResult.error(EventEnum.USER_NOT_FOUND.getDescribe());
                 }
 
-                //获取事件详情
-                EventInfoBO eventInfoBO = eventInfoBOList.get(0);
-                //判断状态, 非确认状态事件, 不可签收
-                if (!EVENT_STATUS_2.equals(eventInfoBO.getEventStatus())) {
-                    return AjaxResult.error("事件已被流转, 当前状态: " + MapUtils.getString(getEventStatusMap(), eventInfoBO.getEventStatus()));
+                eventInfo.setEventStatus(EVENT_STATUS_2);
+                EventInfo processEventDetailById = eventProcessMapper.getProcessEventDetailById(eventInfo);
+                if (null == processEventDetailById) {
+                    return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
                 }
 
                 // 插入事件日志
-                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + "签收该事件", EVENT_LOG_TYPE_3, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), DateUtils.getNowDate());
+                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + EventEnum.EVENT_SIGN_FOR.getDescribe(), EVENT_LOG_TYPE_3, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), DateUtils.getNowDate());
 
                 //签收时, 选择联动部门
                 cooperateDeptList(eventInfo);
@@ -517,26 +497,19 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
         if (lock.tryLock()) { //获取锁
             try {
                 //业务代码
-//                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
-                SysUser sysUser = new SysUser();
-                sysUser.setUserId(1000L);
-                sysUser.setDeptId(365L);
-                sysUser.setDeptNames("四平市");
-                sysUser.setNickName("测试用户");
-
-                List<EventInfoBO> eventInfoBOList = eventProcessMapper.selectEventProcessList(new EventInfo(eventInfo.getEventId()));
-                if (eventInfoBOList.isEmpty()) {
-                    return AjaxResult.error("获取事件不存在!");
+                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+                if (null == sysUser) {
+                    return AjaxResult.error(EventEnum.USER_NOT_FOUND.getDescribe());
                 }
 
-                EventInfoBO eventInfoBO = eventInfoBOList.get(0);
-                //非签收状态, 不可办结
-                if (!EVENT_STATUS_3.equals(eventInfoBO.getEventStatus())) {
-                    return AjaxResult.error("事件已被流转, 当前状态: " + MapUtils.getString(getEventStatusMap(), eventInfoBO.getEventStatus()));
+                eventInfo.setEventStatus(EVENT_STATUS_3);
+                EventInfo processEventDetailById = eventProcessMapper.getProcessEventDetailById(eventInfo);
+                if (null == processEventDetailById) {
+                    return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
                 }
 
                 // 插入事件日志
-                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + "办结该事件", EVENT_LOG_TYPE_4, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), DateUtils.getNowDate());
+                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + EventEnum.EVENT_COMPLETED.getDescribe(), EVENT_LOG_TYPE_4, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), DateUtils.getNowDate());
 
                 //更新主表状态
                 eventInfo.setEventStatus(EVENT_STATUS_4);
@@ -563,22 +536,15 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
         if (lock.tryLock()) { //获取锁
             try {
                 //业务代码
-//                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
-                SysUser sysUser = new SysUser();
-                sysUser.setUserId(1000L);
-                sysUser.setDeptId(365L);
-                sysUser.setDeptNames("四平市");
-                sysUser.setNickName("测试用户");
-
-                List<EventInfoBO> eventInfoBOList = eventProcessMapper.selectEventProcessList(new EventInfo(eventInfo.getEventId()));
-                if (eventInfoBOList.isEmpty()) {
-                    return AjaxResult.error("获取事件不存在!");
+                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+                if (null == sysUser) {
+                    return AjaxResult.error(EventEnum.USER_NOT_FOUND.getDescribe());
                 }
 
-                EventInfoBO eventInfoBO = eventInfoBOList.get(0);
-                //非办结状态不可审核
-                if (!EVENT_STATUS_4.equals(eventInfoBO.getEventStatus())) {
-                    return AjaxResult.error("事件已被流转, 当前状态: " + MapUtils.getString(getEventStatusMap(), eventInfoBO.getEventStatus()));
+                eventInfo.setEventStatus(EVENT_STATUS_4);
+                EventInfo processEventDetailById = eventProcessMapper.getProcessEventDetailById(eventInfo);
+                if (null == processEventDetailById) {
+                    return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
                 }
 
                 // 插入事件日志
@@ -611,26 +577,19 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
         if (lock.tryLock()) { //获取锁
             try {
                 //业务代码
-//                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
-                SysUser sysUser = new SysUser();
-                sysUser.setUserId(1000L);
-                sysUser.setDeptId(365L);
-                sysUser.setDeptNames("四平市");
-                sysUser.setNickName("测试用户");
-
-                List<EventInfoBO> eventInfoBOList = eventProcessMapper.selectEventProcessList(new EventInfo(eventInfo.getEventId()));
-                if (eventInfoBOList.isEmpty()) {
-                    return AjaxResult.error("获取事件不存在!");
+                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+                if (null == sysUser) {
+                    return AjaxResult.error(EventEnum.USER_NOT_FOUND.getDescribe());
                 }
 
-                EventInfoBO eventInfoBO = eventInfoBOList.get(0);
-                //非审核通过状态不可归档
-                if (!EVENT_STATUS_5.equals(eventInfoBO.getEventStatus())) {
-                    return AjaxResult.error("事件已被流转, 当前状态: " + MapUtils.getString(getEventStatusMap(), eventInfoBO.getEventStatus()));
+                eventInfo.setEventStatus(EVENT_STATUS_5);
+                EventInfo processEventDetailById = eventProcessMapper.getProcessEventDetailById(eventInfo);
+                if (null == processEventDetailById) {
+                    return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
                 }
 
                 // 插入事件日志
-                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + "归档该事件", EVENT_LOG_TYPE_6, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), DateUtils.getNowDate());
+                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + EventEnum.EVENT_ARCHIVE.getDescribe(), EVENT_LOG_TYPE_6, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), DateUtils.getNowDate());
 
                 //更新主表状态
                 eventInfo.setEventStatus(EVENT_STATUS_6);
@@ -654,24 +613,18 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
     @Override
     public AjaxResult cooperateDeptList(EventInfo eventInfo) {
         if (!eventInfo.getDeptIdList().isEmpty()) {
-            //                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
-            SysUser sysUser = new SysUser();
-            sysUser.setUserId(1000L);
-            sysUser.setDeptId(365L);
-            sysUser.setDeptNames("四平市");
-            sysUser.setNickName("测试用户");
-
-            List<EventInfoBO> eventInfoBOList = eventProcessMapper.selectEventProcessList(new EventInfo(eventInfo.getEventId()));
-            if (eventInfoBOList.isEmpty()) {
-                return AjaxResult.error("获取事件不存在!");
+            SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+            if (null == sysUser) {
+                return AjaxResult.error(EventEnum.USER_NOT_FOUND.getDescribe());
             }
 
-            EventInfoBO eventInfoBO = eventInfoBOList.get(0);
-            if(!EVENT_STATUS_3.equals(eventInfoBO.getEventStatus())){
-                return AjaxResult.error("事件当前状态: " + MapUtils.getString(getEventStatusMap(), eventInfoBO.getEventStatus())+"不可设置协同部门");
+
+            EventInfo processEventDetail = eventProcessMapper.getProcessEventDetailById(eventInfo);
+            if (null == processEventDetail || (!EVENT_STATUS_2.equals(processEventDetail.getEventStatus()) && !EVENT_STATUS_3.equals(processEventDetail.getEventStatus()))) {
+                return AjaxResult.error(EventEnum.EVENT_NOT_FOUND.getDescribe());
             }
 
-            eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + "添加协同部门", EVENT_LOG_TYPE_100, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), DateUtils.getNowDate());
+            eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + EventEnum.COOPERATE_DEPT.getDescribe(), EVENT_LOG_TYPE_100, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), DateUtils.getNowDate());
 
             List<CenterdataTAidevicedept> listDept = new ArrayList<>();
             eventInfo.getDeptIdList().forEach(deptId -> {

src/main/java/com/sooka/sponest/event/utils/eventEnum/EventEnum.java

@@ -18,10 +18,14 @@ public enum EventEnum {
 
     EVENT_ARCHIVE("归档该事件！"), // 归档该事件！
 
+    COOPERATE_DEPT("添加协同部门！"), // 归档该事件！
+
     USER_NOT_FOUND("未找到登录用户信息！"), // 未找到登录用户信息！
 
     DEPT_NOT_FOUND("未查询到责任单位！"), // 未查询到责任单位！
 
+    CAMERA_NOT_FOUND("未查询到相关设备！"), // 未查询到责任单位！
+
     METHOD_LOCKED("系统繁忙，请稍后重试！"); // 系统繁忙，请稍后重试！
 
 

src/main/resources/mapper/event/eventProcess/EventProcessMapper.xml

@@ -38,7 +38,8 @@
     <select id="selectEventAttachListByEventIdToUnconfirmed" resultType="EventAttach">
         SELECT id, log_id logId, event_id eventId, path, source, source_type sourceType, sort
         FROM event_attach_unconfirmed
-        WHERE event_id = #{eventId} and source = 'event_log_file_source_1'
+        WHERE event_id = #{eventId}
+          and source = 'event_log_file_source_1'
         order by sort
     </select>
 
@@ -87,15 +88,20 @@
 
     <!--  待确认事件详情日志  -->
     <select id="selectEventLogList" resultMap="EventAttachResult">
-        SELECT * FROM event_log
+        SELECT *
+        FROM event_log
         WHERE event_id = #{eventId}
         order by create_time
     </select>
 
     <!--  待确认事件日志关联附件  -->
     <select id="selectEventAttachListByLogId" resultType="EventAttach">
-        SELECT
-            log_id logId, event_id eventId, path, source, source_type sourceType, sort
+        SELECT log_id      logId,
+               event_id    eventId,
+               path,
+               source,
+               source_type sourceType,
+               sort
         FROM event_attach_unconfirmed
         WHERE log_id = #{id}
         order by sort
@@ -133,7 +139,8 @@
     <select id="selectEventAttachListByEventIdToProcess" resultType="EventAttach">
         SELECT id, log_id logId, event_id eventId, path, source, source_type sourceType, sort
         FROM event_attach_process
-        WHERE event_id = #{eventId} and source = 'event_log_file_source_99'
+        WHERE event_id = #{eventId}
+          and source = 'event_log_file_source_99'
         order by sort
     </select>
 
@@ -182,15 +189,20 @@
 
     <!--  确认事件详情日志  -->
     <select id="selectEventLogListToProcess" resultMap="EventAttachProcessResult">
-        SELECT * FROM event_log
+        SELECT *
+        FROM event_log
         WHERE event_id = #{eventId}
         order by create_time
     </select>
 
     <!--  确认事件日志关联附件  -->
     <select id="selectEventAttachListByLogIdToProcess" resultType="EventAttach">
-        SELECT
-            log_id logId, event_id eventId, path, source, source_type sourceType, sort
+        SELECT log_id      logId,
+               event_id    eventId,
+               path,
+               source,
+               source_type sourceType,
+               sort
         FROM event_attach_process
         WHERE log_id = #{id}
         order by sort
@@ -200,27 +212,75 @@
 
     <!--  *************************************** sql块 开始***********************************************  -->
     <sql id="selectUnconfirmedEventInfoVo">
-        SELECT DISTINCT a.event_id, a.event_type, b.event_type_name, a.event_name, a.event_description, a.report_source, a.longitude, a.latitude,
-               a.reporter, a.camera_code, a.report_time, a.event_status, a.address, a.is_urged, a.urge_count,
-               a.create_by, a.create_time, a.update_by, a.update_time
+        SELECT DISTINCT a.event_id,
+                        a.event_type,
+                        b.event_type_name,
+                        a.event_name,
+                        a.event_description,
+                        a.report_source,
+                        a.longitude,
+                        a.latitude,
+                        a.reporter,
+                        a.camera_code,
+                        a.report_time,
+                        a.event_status,
+                        a.address,
+                        a.is_urged,
+                        a.urge_count,
+                        a.create_by,
+                        a.create_time,
+                        a.update_by,
+                        a.update_time
         FROM event_unconfirmed a
-        LEFT JOIN event_type b ON a.event_type = b.id
+                 LEFT JOIN event_type b ON a.event_type = b.id
     </sql>
 
     <sql id="selectEventProcessInfoVo">
-        SELECT DISTINCT a.event_id, a.event_type, b.event_type_name, a.event_name, a.event_description, a.report_source, a.longitude, a.latitude,
-               a.reporter, a.camera_code, a.report_time, a.event_status, a.address, a.is_urged, a.urge_count,
-               a.create_by, a.create_time, a.update_by, a.update_time
+        SELECT DISTINCT a.event_id,
+                        a.event_type,
+                        b.event_type_name,
+                        a.event_name,
+                        a.event_description,
+                        a.report_source,
+                        a.longitude,
+                        a.latitude,
+                        a.reporter,
+                        a.camera_code,
+                        a.report_time,
+                        a.event_status,
+                        a.address,
+                        a.is_urged,
+                        a.urge_count,
+                        a.create_by,
+                        a.create_time,
+                        a.update_by,
+                        a.update_time
         FROM event_process a
-        LEFT JOIN event_type b ON a.event_type = b.id
+                 LEFT JOIN event_type b ON a.event_type = b.id
     </sql>
 
     <sql id="selectUsualEventInfoVo">
-        SELECT DISTINCT a.event_id, a.event_type, b.event_type_name, a.event_name, a.event_description, a.report_source, a.longitude, a.latitude,
-               a.reporter, a.camera_code, a.report_time, a.event_status, a.address, a.is_urged, a.urge_count,
-               a.create_by, a.create_time, a.update_by, a.update_time
+        SELECT DISTINCT a.event_id,
+                        a.event_type,
+                        b.event_type_name,
+                        a.event_name,
+                        a.event_description,
+                        a.report_source,
+                        a.longitude,
+                        a.latitude,
+                        a.reporter,
+                        a.camera_code,
+                        a.report_time,
+                        a.event_status,
+                        a.address,
+                        a.is_urged,
+                        a.urge_count,
+                        a.create_by,
+                        a.create_time,
+                        a.update_by,
+                        a.update_time
         FROM event_usual a
-        LEFT JOIN event_type b ON a.event_type = b.id
+                 LEFT JOIN event_type b ON a.event_type = b.id
     </sql>
 
     <sql id="selectEventListWhere">
@@ -303,7 +363,8 @@
     </select>
 
     <select id="getUnconfirmedEventDetailById" parameterType="string" resultMap="EventDetailResult">
-        SELECT * FROM event_unconfirmed
+        SELECT *
+        FROM event_unconfirmed
         WHERE event_id = #{eventId}
     </select>
 
@@ -318,9 +379,11 @@
         order by a.create_time desc
     </select>
 
-    <select id="getConfirmedEventDetailById" resultMap="EventDetailProcessResult">
+    <select id="getProcessEventDetailById" resultMap="EventDetailProcessResult">
         SELECT * FROM event_process
-        WHERE event_id = #{eventId}
+        <where>
+            <include refid="selectEventListWhere"/>
+        </where>
     </select>
 
     <select id="selectUsualList" parameterType="EventInfo" resultMap="EventInfoProcessResult">
@@ -335,7 +398,8 @@
     </select>
 
     <select id="getUsualEventDetailById" resultMap="EventDetailProcessResult">
-        SELECT * FROM event_usual
+        SELECT *
+        FROM event_usual
         WHERE event_id = #{eventId}
     </select>
 
@@ -425,17 +489,11 @@
     </insert>
 
     <delete id="deleteEventUnconfirmed" parameterType="EventInfo">
-        DELETE FROM
-            event_unconfirmed
-        WHERE
-            event_id = #{eventId}
+        DELETE
+        FROM event_unconfirmed
+        WHERE event_id = #{eventId}
     </delete>
 
-    <select id="getProcessEventById" parameterType="string" resultMap="EventInfoProcessResult">
-        select * from event_process
-        where event_id = #{eventId}
-    </select>
-
     <update id="updateEventProcess" parameterType="EventInfo">
         update event_process
         <trim prefix="SET" suffixOverrides=",">
@@ -456,59 +514,16 @@
     </update>
 
     <delete id="deleteEventProcess" parameterType="EventInfo">
-    DELETE FROM
-        event_process
-    WHERE
-        event_id = #{eventId}
-</delete>
-
+        DELETE FROM event_process
+        WHERE event_id = #{eventId}
+    </delete>
     <!-- **************************************** 业务块 结束 *********************************************** -->
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     <!--<select id="getEventUnconfirmedById" parameterType="Integer" resultMap="EventInfoResult">
         <include refid="selectUnconfirmedEventInfoVo"/>
         where id = #{id}
     </select>-->
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 </mapper>