优化119平台事件上报接口

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/FireIncidentController.java

@@ -125,7 +125,7 @@ public class FireIncidentController {
             if (StringUtils.isNull(eventtype)) {
                 return AjaxResult.error(20002, "参数错误");
             }
-            remoteFireVO.setEventSubType(eventtype.getParentId());
+            remoteFireVO.setEventSupType(eventtype.getParentId());
             //处理上报逻辑
             eventCode.append(fireIncidentService.insertFireIncident(remoteFireVO, loginUser));
         } catch (Exception e) {

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/RemoteFireVO.java

@@ -31,7 +31,7 @@ public class RemoteFireVO {
     /**
      * 事件分类
      */
-    private String eventSubType;
+    private String eventSupType;
 
     /**
      * 事件描述

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/AlarmEventServiceImpl.java

@@ -211,8 +211,10 @@ public class AlarmEventServiceImpl implements AlarmEventService {
             deptEvent.setEventStatus(eventcatalogue.getEventStatus());
             deptEvent.setEventStatusValue(eventcatalogue.getEventStatusValue());
             deptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_2);
-            LoginUser loginUser = SecurityUtils.getLoginUser();
-            deptEvent.setCreateBy(null == loginUser ? null : loginUser.getSysUser().getUserId().toString());
+            if(REPORTING_SOURCE_5.equals(eventcatalogue.getReportSource())){
+                deptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_1);
+                deptEvent.setCreateBy(eventcatalogue.getCreateBy());
+            }
             deptEvent.setCreateName(eventcatalogue.getCreateName());
             deptEvent.setCreateTime(eventcatalogue.getCreateTime());
             centereventTDeptEventService.insertCentereventTDeptEvent(deptEvent);
@@ -228,6 +230,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         fireLog.setOperation(BUS_OPER_TYPE_2);
         if (REPORTING_SOURCE_5.equals(eventcatalogue.getReportSource())) {
             fireLog.setOperationType(LOG_OPER_TYPE_4);
+            fireLog.setCreateBy(eventcatalogue.getCreateBy());
         } else {
             fireLog.setOperationType(LOG_OPER_TYPE_3);
         }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/FireInsidentServiceImpl.java

@@ -51,7 +51,7 @@ public class FireInsidentServiceImpl implements IFireIncidentService {
         String nickName = new StringBuilder().append(loginUser.getSysUser().getNickName()).toString();
         // 事件目录
         CentereventTEventcatalogue eventcatalogue = new CentereventTEventcatalogue(
-                remoteFireVO.getEventSubType(),
+                remoteFireVO.getEventSupType(),
                 remoteFireVO.getEventType(),
                 null == remoteFireVO.getEventName() || "".equals(remoteFireVO.getEventName()) ? remoteFireVO.getEventLocation() + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(remoteFireVO.getEventReportTime()) + remoteFireVO.getEventType() : remoteFireVO.getEventName(),
                 remoteFireVO.getEventDescription(),
@@ -61,6 +61,9 @@ public class FireInsidentServiceImpl implements IFireIncidentService {
                 remoteFireVO.getEventReportTime(),
                 remoteFireVO.getEventLocation(),
                 REPORTING_SOURCE_5, "签收", FOREST_EVENT_STATUS_2, userId, nickName, DateUtils.getNowDate());
+        eventcatalogue.setDeptId(loginUser.getSysUser().getDeptId());
+        eventcatalogue.setDeptName(loginUser.getSysUser().getDeptNames());
+    // 事件信息
         //后续应该修改为调用接口获取部门信息
         List<CenterdataTAidevicedept> listDept = new ArrayList<>();
         listDept.add(new CenterdataTAidevicedept(loginUser.getSysUser().getDeptId(), loginUser.getSysUser().getDeptNames()));

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

@@ -24,6 +24,7 @@ public class EventConstants {
     public static final String SYS_ISURGE_2 = "sys_isurge_2";// 否
 
     // 部门类型
+    public static final String DEPT_HANDLE_TYPE_1 = "dept_handleType_1";// 责任单位
     public static final String DEPT_HANDLE_TYPE_2 = "dept_handleType_2";// 配合单位
     public static final String DEPT_HANDLE_TYPE_3 = "dept_handleType_3";// 行管局