优化

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/sensor/SensorEventVo.java

@@ -34,4 +34,6 @@ public class SensorEventVo {
     private String address;// 地址
 
     private String picture;// 图片
+
+    private String deptType;
 }

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

@@ -411,7 +411,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         // 验证是否配置市级住建局
         SysDept sysDept = new SysDept();
         sysDept.setDeptId(Long.valueOf(SI_PING));
-        sysDept.setDeptType("sys_dept_type_31");
+        sysDept.setDeptType(sensorEventVo.getDeptType());// 住建：sys_dept_type_31，执法：
         List<SysDept> listDept = SpringUtils.getBean(RemoteDeptService.class).getDeptsByDeptType(sysDept).getData();
         if (StringUtils.isEmpty(listDept)) {
             logger.info("无法匹配相关部门！");
@@ -427,8 +427,13 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         centereventTEventcatalogue.setIsUrged(SYS_ISURGE_2);//sys_isurge_2
         centereventTEventcatalogue.setEventStatus("归档");
         centereventTEventcatalogue.setEventStatusValue(FOREST_EVENT_STATUS_6);//forest_event_status_6
-        centereventTEventcatalogue.setDeptId(Long.parseLong(sensorEventVo.getSensorId()));
-        centereventTEventcatalogue.setDeptName(sensorEventVo.getReportor());
+        if ("sys_dept_type_31".equals(sensorEventVo.getDeptType())) {
+            centereventTEventcatalogue.setDeptId(Long.parseLong(sensorEventVo.getSensorId()));
+            centereventTEventcatalogue.setDeptName(sensorEventVo.getReportor());
+        } else {
+            centereventTEventcatalogue.setDeptId(listDept.get(0).getDeptId());
+            centereventTEventcatalogue.setDeptName(listDept.get(0).getDeptName());
+        }
         centereventTEventcatalogue.setCreateBy(sensorEventVo.getSensorId());
         centereventTEventcatalogue.setCreateName(sensorEventVo.getReportor());
         centereventTEventcatalogue.setCreateTime(DateUtils.getNowDate());