事件流转拆分

事件日志上报.
事件部门协同

src/main/java/com/sooka/sponest/event/eventLog/domain/VO/EventLogVO.java

@@ -0,0 +1,15 @@
+package com.sooka.sponest.event.eventLog.domain.VO;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Setter
+@Getter
+public class EventLogVO {
+    private String eventId;
+    private String content;
+    private String operationSource;
+    private List<String> attachList;
+}

src/main/java/com/sooka/sponest/event/eventLog/service/EventLogService.java

@@ -1,11 +1,13 @@
 package com.sooka.sponest.event.eventLog.service;
 
 import com.sooka.sponest.event.eventLog.domain.EventLog;
+import com.sooka.sponest.event.eventLog.domain.VO.EventLogVO;
 
 import java.util.Date;
 
 public interface EventLogService {
 
-    public int insertEventLog(EventLog eventLog);
+    String insertEventLog(EventLogVO eventLog);
+
     String insertEventLog(String eventId, String content, String operationType, String operationSource, String createBy, Date createTIme);
 }

src/main/java/com/sooka/sponest/event/eventLog/service/impl/EventLogServiceImpl.java

@@ -1,16 +1,17 @@
 package com.sooka.sponest.event.eventLog.service.impl;
 
 import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.system.api.domain.SysUser;
 import com.sooka.sponest.event.eventLog.domain.EventLog;
+import com.sooka.sponest.event.eventLog.domain.VO.EventLogVO;
 import com.sooka.sponest.event.eventLog.mapper.EventLogMapper;
 import com.sooka.sponest.event.eventLog.service.EventLogService;
-import com.sooka.sponest.event.utils.AddAttachPrefix;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
+
+import static com.sooka.sponest.event.utils.eventConstants.EventConstants.*;
 
 @Service
 public class EventLogServiceImpl implements EventLogService {
@@ -19,8 +20,16 @@ public class EventLogServiceImpl implements EventLogService {
     private EventLogMapper eventLogMapper;
 
 
-    public int insertEventLog(EventLog eventLog){
-        return eventLogMapper.insertEventLog(eventLog);
+    public String insertEventLog(EventLogVO eventLog){
+        //                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+        SysUser sysUser = new SysUser();
+        sysUser.setUserId(1000L);
+        sysUser.setDeptId(365L);
+        sysUser.setDeptNames("四平市");
+        sysUser.setNickName("测试用户");
+
+        //构建日志对象
+        return insertEventLog(eventLog.getEventId(), sysUser.getDeptNames()+sysUser.getNickName()+eventLog.getContent(), EVENT_LOG_TYPE_100, null == eventLog.getOperationSource()? EVENT_LOG_SOURCE_2 : eventLog.getOperationSource(), String.valueOf(sysUser.getUserId()), new Date());
     }
 
     @Override

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

@@ -1,23 +1,27 @@
 package com.sooka.sponest.event.eventProcess.controller;
 
-import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.sooka.sponest.event.eventLog.domain.EventLog;
+import com.sooka.sponest.event.eventAttach.service.EventAttachService;
+import com.sooka.sponest.event.eventLog.domain.VO.EventLogVO;
 import com.sooka.sponest.event.eventLog.service.EventLogService;
 import com.sooka.sponest.event.eventProcess.domain.BO.EventInfoBO;
 import com.sooka.sponest.event.eventProcess.domain.EventInfo;
 import com.sooka.sponest.event.eventProcess.service.EventProcessService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.util.List;
 
+import static com.sooka.sponest.event.utils.eventConstants.EventConstants.*;
+
 /**
  * 事件处置Controller
+ *
  * @author limeng
- * @since  2025/07/03
+ * @since 2025/07/03
  */
 @RestController
 @RequestMapping("eventProcess")
@@ -27,13 +31,17 @@ public class EventProcessController extends BaseController {
     private EventProcessService eventProcessService;
 
     @Resource
+    private EventAttachService eventAttachService;
+
+    @Resource
     private EventLogService eventLogService;
     //******************************************待确认事件块**************************************************/
 
     /**
      * 待确认事件列表
+     *
      * @author limeng
-     * */
+     */
     @GetMapping("/selectUnConfirmedList")
     public TableDataInfo selectUnConfirmedList(EventInfo eventInfo) {
         startPage();
@@ -43,23 +51,26 @@ public class EventProcessController extends BaseController {
 
     /**
      * 查询待确认事件详情
-     * @param id  事件信息主键
+     *
+     * @param id 事件信息主键
      * @author limeng
-     * */
+     */
     @GetMapping("/getUnconfirmedEventDetailById/{id}")
     public AjaxResult getUnconfirmedEventDetailById(@PathVariable("id") String id) {
         EventInfo unconfirmedEventDetailById = eventProcessService.getUnconfirmedEventDetailById(id);
-        if (null == unconfirmedEventDetailById){
+        if (null == unconfirmedEventDetailById) {
             return AjaxResult.error("查询异常!");
         }
         return AjaxResult.success(unconfirmedEventDetailById);
     }
 
     //*******************************************确认事件块********************************************************************/
+
     /**
      * 已确认事件列表
+     *
      * @author limeng
-     * */
+     */
     @GetMapping("/selectEventProcessList")
     public TableDataInfo selectEventProcessList(EventInfo eventInfo) {
         startPage();
@@ -69,13 +80,14 @@ public class EventProcessController extends BaseController {
 
     /**
      * 查询已确认事件详情
-     * @param id  事件信息主键
+     *
+     * @param id 事件信息主键
      * @author limeng
-     * */
+     */
     @GetMapping("/getConfirmedEventDetailById/{id}")
     public AjaxResult getConfirmedEventDetailById(@PathVariable("id") String id) {
         EventInfo unconfirmedEventDetailById = eventProcessService.getConfirmedEventDetailById(id);
-        if (null == unconfirmedEventDetailById){
+        if (null == unconfirmedEventDetailById) {
             return AjaxResult.error("查询异常!");
         }
         return AjaxResult.success(unconfirmedEventDetailById);
@@ -86,8 +98,9 @@ public class EventProcessController extends BaseController {
 
     /**
      * 无异常事件列表
+     *
      * @author limeng
-     * */
+     */
     @GetMapping("/selectUsualList")
     public TableDataInfo selectUsualList(EventInfo eventInfo) {
         startPage();
@@ -97,28 +110,28 @@ public class EventProcessController extends BaseController {
 
     /**
      * 查询无异常事件详情
-     * @param id  事件信息主键
+     *
+     * @param id 事件信息主键
      * @author limeng
-     * */
+     */
     @GetMapping("/getUsualEventDetailById/{id}")
     public AjaxResult getUsualEventDetailById(@PathVariable("id") String id) {
         EventInfo unconfirmedEventDetailById = eventProcessService.getUsualEventDetailById(id);
-        if (null == unconfirmedEventDetailById){
+        if (null == unconfirmedEventDetailById) {
             return AjaxResult.error("查询异常!");
         }
         return AjaxResult.success(unconfirmedEventDetailById);
     }
 
 
-
-
     //******************************************事件流转块*****************************************************/
 
     /**
      * 确认
+     *
      * @param eventInfo => id  事件信息主键 eventType  事件类型
      * @author limeng
-     * */
+     */
     @PostMapping("/confirm")
     public AjaxResult confirm(@RequestBody EventInfo eventInfo) {
         return eventProcessService.confirm(eventInfo);
@@ -126,39 +139,85 @@ public class EventProcessController extends BaseController {
 
     /**
      * 无异常
+     *
      * @param eventInfo => id  事件信息主键
      * @author limeng
-     * */
+     */
     @PostMapping("/usual")
-    public AjaxResult usual(@RequestBody EventInfo eventInfo){
+    public AjaxResult usual(@RequestBody EventInfo eventInfo) {
         return eventProcessService.usual(eventInfo);
     }
 
+    /**
+     * 签收
+     * @param eventInfo  事件信息主键
+     * @author limeng
+     * */
+    @PostMapping("/signFor")
+    public AjaxResult signFor(@RequestBody EventInfo eventInfo){
+        return eventProcessService.signFor(eventInfo);
+    }
+
+    /**
+     * 办结
+     * @param eventInfo  事件信息主键
+     * @author limeng
+     * */
+    @PostMapping("/completed")
+    public AjaxResult completed(@RequestBody EventInfo eventInfo){
+        return eventProcessService.completed(eventInfo);
+    }
 
     /**
-     * 事件流转
-     * @param eventInfo --> id=事件信息主键; eventStatus=事件状态; deptIdList=部门id集合(仅签收时传递);
-     *                  eventStatus:{
-     *                     "event_status_3";// 签收
-                           "event_status_4";// 办结
-                           "event_status_5";// 归档
-                           "event_status_98"// 误报
-                           "event_status_99"// 重复
-     *                  }
-     * @return AjaxResult
+     * 审核
+     * @param eventInfo  事件信息主键
      */
-    @PostMapping("/eventFlow")
-    public AjaxResult eventFlow(@RequestBody EventInfo eventInfo){
-        return eventProcessService.eventFlow(eventInfo);
+    @PostMapping("/audit")
+    public AjaxResult audit(@RequestBody EventInfo eventInfo) {
+        return eventProcessService.audit(eventInfo);
+    }
+
+
+    /**
+     * 归档
+     * @param eventInfo  事件信息主键
+     * @author limeng
+     * */
+    @PostMapping("/archive")
+    public AjaxResult archive(@RequestBody EventInfo eventInfo){
+        return eventProcessService.archive(eventInfo);
     }
 
     /**
      * 签收以后, 联动部门
+     *
      * @param eventInfo --> id=事件信息主键; deptIdList=部门id集合(仅签收时传递);
      */
     @PostMapping("/gangedDeptList")
-    public AjaxResult gangedDeptList(@RequestBody EventInfo eventInfo){
+    public AjaxResult gangedDeptList(@RequestBody EventInfo eventInfo) {
         return eventProcessService.gangedDeptList(eventInfo);
     }
 
+    /**
+     * 事件日志
+     * 非事件流转, 新增事件日志
+     *
+     * @param eventLog
+     * @return AjaxResult
+     */
+    @PostMapping("/insertEventLog")
+    public AjaxResult insertEventLog(@RequestBody EventLogVO eventLog) {
+        if (StringUtils.isBlank(eventLog.getEventId())) {
+            return AjaxResult.error("事件id不能为空");
+        }
+        //写入日志
+        String logId = eventLogService.insertEventLog(eventLog);
+
+        if (!eventLog.getAttachList().isEmpty()) {
+            eventAttachService.batchInsertEventAttachProcess(logId, eventLog.getEventId(), eventLog.getAttachList(), null == eventLog.getOperationSource() ? EVENT_LOG_FILE_SOURCE_2 : EVENT_LOG_FILE_SOURCE_3, FILE_URL);
+        }
+
+        return AjaxResult.success("事件日志新增成功");
+    }
+
 }

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

@@ -43,7 +43,18 @@ public interface EventProcessService {
 
     AjaxResult usual(EventInfo eventInfo);
 
-    AjaxResult eventFlow(EventInfo eventInfo);
+//    AjaxResult eventFlow(EventInfo eventInfo);
+
+    AjaxResult signFor(EventInfo eventInfo);
+
+    AjaxResult completed(EventInfo eventInfo);
+
+    AjaxResult audit(EventInfo eventInfo);
+
+    AjaxResult archive(EventInfo eventInfo);
 
     AjaxResult gangedDeptList(EventInfo eventInfo);
+
+
+
 }

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

@@ -129,7 +129,7 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
                 eventAttachService.batchInsertEventAttachUnconfirmed(logId, daHuaOtherEventVO.getEventId(), pictureList, EVENT_LOG_FILE_SOURCE_1, DH_2);
 
                 //上报状态事件, 可视化响铃推送
-                SpringUtils.getBean(RedisService.class).convertAndSend(SOCKET_PUSH_TOPIC, eventUnconfirmed);
+//                SpringUtils.getBean(RedisService.class).convertAndSend(SOCKET_PUSH_TOPIC, eventUnconfirmed);
             }
         } catch (Exception e) {
             logger.error("事件新增失败！输入参数：{}", daHuaOtherEventVO, e);
@@ -180,7 +180,7 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
                 eventAttachService.batchInsertEventAttachUnconfirmed(logId, daHuaFireEventVO.getEventId(), Arrays.asList(messageInfo.getPicture().split(",")), EVENT_LOG_FILE_SOURCE_1, DH_1);
 
                 //上报状态事件, 可视化响铃推送
-                SpringUtils.getBean(RedisService.class).convertAndSend(SOCKET_PUSH_TOPIC, eventUnconfirmed);
+//                SpringUtils.getBean(RedisService.class).convertAndSend(SOCKET_PUSH_TOPIC, eventUnconfirmed);
             }
         } catch (Exception e) {
             logger.error("事件新增失败！输入参数：{}", daHuaFireEventVO, e);
@@ -235,6 +235,9 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
         return usualEventDetailById;
     }
 
+    /**
+     * 确认事件
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult confirm(EventInfo eventInfo) {
@@ -292,6 +295,9 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
         return AjaxResult.success();
     }
 
+    /**
+     * 无异常事件
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult usual(EventInfo eventInfo) {
@@ -349,79 +355,107 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
         return AjaxResult.success();
     }
 
+    /**
+     * 签收事件
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult eventFlow(EventInfo eventInfo) {
+    public AjaxResult signFor(EventInfo eventInfo) {
         if (lock.tryLock()) { //获取锁
             try {
                 //业务代码
-                //                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+//                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
                 SysUser sysUser = new SysUser();
                 sysUser.setUserId(1000L);
                 sysUser.setDeptId(365L);
                 sysUser.setDeptNames("四平市");
                 sysUser.setNickName("测试用户");
 
-                //日志消息体
-                StringBuilder logContent = new StringBuilder();
-                //日志状态
-                StringBuilder logType = new StringBuilder();
+                // 插入事件日志
+                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + "签收该事件", EVENT_LOG_TYPE_3, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), new Date());
 
-                // 确认事件判断是否设置为重复或者误报
-                if (EVENT_STATUS_98.equals(eventInfo.getEventStatus()) || EVENT_STATUS_99.equals(eventInfo.getEventStatus())) {
+                //签收时, 选择联动部门
+                gangedDeptList(eventInfo);
 
-                    // 判断是误报或者重复
-                    if (EVENT_STATUS_98.equals(eventInfo.getEventStatus())) {
-                        logContent.append("操作该事件误报");
-                        logType.append(EVENT_LOG_TYPE_98);
+                //更新主表状态
+                eventInfo.setEventStatus(EVENT_STATUS_3);
+                eventProcessMapper.updateEventProcess(eventInfo);
 
-                    } else {
-                        logContent.append("判断该事件为重复事件");
-                        logType.append(EVENT_LOG_TYPE_99);
-                    }
+            } catch (Exception e) {
+                logger.error("事件处置失败！输入参数：{}", eventInfo, e);
+                return AjaxResult.error();
+            } finally {
+                lock.unlock(); //释放锁
+            }
+        } else {
+            return AjaxResult.error(EventEnum.METHOD_LOCKED.getDescribe()); //已锁
+        }
+        return AjaxResult.success();
+    }
 
-                    EventInfoBO eventInfoBO = eventProcessMapper.selectEventProcessList(eventInfo).get(0);
+    /**
+     * 办结事件
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult completed(EventInfo eventInfo) {
+        if (lock.tryLock()) { //获取锁
+            try {
+                //业务代码
+//                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+                SysUser sysUser = new SysUser();
+                sysUser.setUserId(1000L);
+                sysUser.setDeptId(365L);
+                sysUser.setDeptNames("四平市");
+                sysUser.setNickName("测试用户");
 
-                    // 插入事件日志
-                    eventLogService.insertEventLog( eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + logContent, logType.toString(), EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), new Date());
+                // 插入事件日志
+                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + "办结该事件", EVENT_LOG_TYPE_4, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), new Date());
 
-                    //将事件主体移动到无异常表
-                    eventInfoBO.setEventStatus(eventInfo.getEventStatus());
-                    eventProcessMapper.insertEventUsual(eventInfoBO);
+                //更新主表状态
+                eventInfo.setEventStatus(EVENT_STATUS_4);
+                eventProcessMapper.updateEventProcess(eventInfo);
 
-                    //删除待确认表
-                    eventProcessMapper.deleteEventProcess(eventInfoBO);
+            } catch (Exception e) {
+                logger.error("事件处置失败！输入参数：{}", eventInfo, e);
+                return AjaxResult.error();
+            } finally {
+                lock.unlock(); //释放锁
+            }
+        } else {
+            return AjaxResult.error(EventEnum.METHOD_LOCKED.getDescribe()); //已锁
+        }
+        return AjaxResult.success();
+    }
 
-                } else {
-                    //正常流转事件
-
-                    //判断日志流转状态
-                    if (EVENT_STATUS_3.equals(eventInfo.getEventStatus())) {
-                        //签收
-                        logType.append(EVENT_LOG_TYPE_3);
-                        logContent.append("签收该事件");
-                        //签收时, 选择联动部门
-                        gangedDeptList(eventInfo);
-                    } else if (EVENT_STATUS_4.equals(eventInfo.getEventStatus())) {
-                        //办结
-                        logType.append(EVENT_LOG_TYPE_4);
-                        logContent.append("办结该事件");
-                    } else if (EVENT_STATUS_5.equals(eventInfo.getEventStatus())) {
-                        //归档
-                        logType.append(EVENT_LOG_TYPE_5);
-                        logContent.append("归档该事件");
-                    }
-
-                    // 插入事件日志
-                    eventLogService.insertEventLog( eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + logContent, logType.toString(), EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), new Date());
-
-                    //更新主表状态
-                    eventProcessMapper.updateEventProcess(eventInfo);
+    /**
+     * 审核办结事件
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult audit(EventInfo eventInfo) {
+        if (lock.tryLock()) { //获取锁
+            try {
+                //业务代码
+//                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+                SysUser sysUser = new SysUser();
+                sysUser.setUserId(1000L);
+                sysUser.setDeptId(365L);
+                sysUser.setDeptNames("四平市");
+                sysUser.setNickName("测试用户");
+
+                // 插入事件日志
+                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + "审核结果:" + eventInfo.getEventDescription(), EVENT_LOG_TYPE_5, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), new Date());
+
+                //更新主表状态
+                if(StringUtils.isBlank(eventInfo.getEventStatus())){
+                    eventInfo.setEventStatus(EVENT_STATUS_5);
                 }
+                eventProcessMapper.updateEventProcess(eventInfo);
 
             } catch (Exception e) {
-                logger.error("事件签收失败！输入参数：{}", eventInfo.getEventId(), e);
-                return AjaxResult.error("事件签收失败！");
+                logger.error("事件处置失败！输入参数：{}", eventInfo, e);
+                return AjaxResult.error();
             } finally {
                 lock.unlock(); //释放锁
             }
@@ -431,9 +465,56 @@ public class EventProcessServiceImpl extends BaseServiceImpl implements EventPro
         return AjaxResult.success();
     }
 
+    /**
+     * 归档事件
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult archive(EventInfo eventInfo) {
+        if (lock.tryLock()) { //获取锁
+            try {
+                //业务代码
+//                SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
+                SysUser sysUser = new SysUser();
+                sysUser.setUserId(1000L);
+                sysUser.setDeptId(365L);
+                sysUser.setDeptNames("四平市");
+                sysUser.setNickName("测试用户");
+
+                // 插入事件日志
+                eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + "归档该事件", EVENT_LOG_TYPE_6, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), new Date());
+
+                //更新主表状态
+                eventInfo.setEventStatus(EVENT_STATUS_6);
+                eventProcessMapper.updateEventProcess(eventInfo);
+
+            } catch (Exception e) {
+                logger.error("事件处置失败！输入参数：{}", eventInfo, e);
+                return AjaxResult.error();
+            } finally {
+                lock.unlock(); //释放锁
+            }
+        } else {
+            return AjaxResult.error(EventEnum.METHOD_LOCKED.getDescribe()); //已锁
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 协同处理事件部门
+     */
     @Override
     public AjaxResult gangedDeptList(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("测试用户");
+
+            eventLogService.insertEventLog(eventInfo.getEventId(), sysUser.getDeptNames() + sysUser.getNickName() + "添加协同部门", EVENT_LOG_TYPE_100, EVENT_LOG_SOURCE_99, String.valueOf(sysUser.getUserId()), new Date());
+
             List<CenterdataTAidevicedept> listDept = new ArrayList<>();
             eventInfo.getDeptIdList().forEach(deptId -> {
                 listDept.add(new CenterdataTAidevicedept(deptId, ""));

src/main/java/com/sooka/sponest/event/utils/eventConstants/EventConstants.java

@@ -13,7 +13,9 @@ public class EventConstants {
 
     public static final String EVENT_STATUS_4 = "event_status_4";// 办结
 
-    public static final String EVENT_STATUS_5 = "event_status_5";// 归档
+    public static final String EVENT_STATUS_5 = "event_status_5";// 审核通过
+
+    public static final String EVENT_STATUS_6 = "event_status_6";// 归档
 
     public static final String EVENT_STATUS_98 = "event_status_98";// 误报
 
@@ -45,12 +47,16 @@ public class EventConstants {
 
     public static final String EVENT_LOG_TYPE_4 = "event_log_type_4";// 办结
 
-    public static final String EVENT_LOG_TYPE_5 = "event_log_type_5";// 归档
+    public static final String EVENT_LOG_TYPE_5 = "event_log_type_5";// 审核
+
+    public static final String EVENT_LOG_TYPE_6 = "event_log_type_6";// 归档
 
     public static final String EVENT_LOG_TYPE_98 = "event_log_type_98";// 误报
 
     public static final String EVENT_LOG_TYPE_99 = "event_log_type_99";// 重复
 
+    public static final String EVENT_LOG_TYPE_100 = "event_log_type_100";// 业务日志
+
 
     /**
      * 事件日志操作来源

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

@@ -413,7 +413,20 @@
 
     <update id="updateEventProcess" parameterType="EventInfo">
         update event_process
-        set event_status = #{eventStatus}
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="eventType != null and eventType != ''">event_type = #{eventType},</if>
+            <if test="eventName != null and eventName != ''">event_name = #{eventName},</if>
+            <if test="reportSource != null and reportSource != ''">report_source = #{reportSource},</if>
+            <if test="longitude != null and longitude != ''">longitude = #{longitude},</if>
+            <if test="latitude != null and latitude != ''">latitude = #{latitude},</if>
+            <if test="reporter != null and reporter != ''">reporter = #{reporter},</if>
+            <if test="cameraCode != null and cameraCode != ''">camera_code = #{cameraCode},</if>
+            <if test="reportTime != null">report_time = #{reportTime},</if>
+            <if test="eventStatus != null and eventStatus != ''">event_status = #{eventStatus},</if>
+            <if test="address != null and address != ''">address = #{address},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
         where event_id = #{eventId}
     </update>