代码迁移

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

@@ -142,30 +142,7 @@ public class AlarmEventController {
         return R.ok();
     }
 
-    @ApiOperation("传感器事件上报")
-    @PostMapping("/insertSensorEvent")
-    public R insertSensorEvent(@RequestBody SensorEventVo sensorEventVo) {
-        String eventCode = null;
-        try {
-            eventCode = alarmEventService.insertSensorEvent(sensorEventVo);
-        } catch (Exception e) {
-            logger.error(e.getMessage());
-        }
-        if (StringUtils.isBlank(eventCode)) {
-            eventCode = String.valueOf(System.currentTimeMillis()) + "_";
-        }
-        try {
-            String[] array = eventCode.split("_");
-            CentereventTReportmessage tReportMessage = new CentereventTReportmessage();
-            tReportMessage.setId(array[0]);
-            tReportMessage.setSource("传感器-" + array[1]);
-            tReportMessage.setContext(JSON.toJSONString(sensorEventVo));
-            centereventTReportmessageService.insertCentereventTReportmessage(tReportMessage);
-        } catch (Exception e) {
-            logger.error(e.getMessage());
-        }
-        return R.ok();
-    }
+
 
 //    /**
 //     * 签收后图片异常补救接口
@@ -228,29 +205,4 @@ public class AlarmEventController {
         }
         return R.ok(i);// 3951
     }
-
-    /**
-     * 事件回查图片
-     *
-     * @param eventBO
-     * @return
-     * @throws ClientException
-     */
-    @PostMapping("/updateFireEventImage")
-    public AjaxResult updateFireEventImage(@RequestBody DaHuaEventBO eventBO) throws ClientException {
-        CentereventTReportmessage centereventTReportmessage = null;
-        if (StringUtils.isNotBlank(eventBO.getEventCode()) && StringUtils.isNotBlank(eventBO.getLogId())) {
-            // 通过eventCode获取报文信息
-            centereventTReportmessage = centereventTReportmessageService.selectCentereventTReportmessageById(eventBO.getEventCode());
-        }
-        if (StringUtils.isNull(centereventTReportmessage)) {
-            return AjaxResult.success("参数异常");
-        }
-        // 解析报文
-        JSONObject context = JSONObject.parseObject(centereventTReportmessage.getContext()).getJSONObject("info");
-        eventBO.setAlarmCode(context.getString("alarmCode"));
-        eventBO.setAlarmDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(context.getLong("alarmDate"))));
-        eventBO.setDbType("0");
-        return AjaxResult.success(alarmEventService.updateFireEventImage(eventBO));
-    }
 }

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

@@ -0,0 +1,92 @@
+package com.sooka.sponest.event.centereventteventcatalogue.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.dahuatech.icc.exception.ClientException;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.event.centereventteventcatalogue.domain.DaHuaEventBO;
+import com.sooka.sponest.event.centereventteventcatalogue.domain.sensor.SensorEventVo;
+import com.sooka.sponest.event.centereventteventcatalogue.service.AlarmEventService;
+import com.sooka.sponest.event.centereventtreportmessage.domain.CentereventTReportmessage;
+import com.sooka.sponest.event.centereventtreportmessage.service.ICentereventTReportmessageService;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@RestController
+@RequestMapping("/fireIncident")
+public class FireIncidentController {
+
+    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    private AlarmEventService alarmEventService;
+
+    @Autowired
+    private ICentereventTReportmessageService centereventTReportmessageService;
+
+    /**
+     * 传感器事件上报
+     * @param sensorEventVo
+     * @return R
+     */
+    @PostMapping("/insertSensorEvent")
+    public R insertSensorEvent(@RequestBody SensorEventVo sensorEventVo) {
+        String eventCode = null;
+        try {
+            eventCode = alarmEventService.insertSensorEvent(sensorEventVo);
+        } catch (Exception e) {
+            logger.error(e.getMessage());
+        }
+        if (StringUtils.isBlank(eventCode)) {
+            eventCode = String.valueOf(System.currentTimeMillis()) + "_";
+        }
+        try {
+            String[] array = eventCode.split("_");
+            CentereventTReportmessage tReportMessage = new CentereventTReportmessage();
+            tReportMessage.setId(array[0]);
+            tReportMessage.setSource("传感器-" + array[1]);
+            tReportMessage.setContext(JSON.toJSONString(sensorEventVo));
+            centereventTReportmessageService.insertCentereventTReportmessage(tReportMessage);
+        } catch (Exception e) {
+            logger.error(e.getMessage());
+        }
+        return R.ok();
+    }
+
+    /**
+     * 事件回查图片
+     * @param eventBO
+     *  eventCode 事件编号
+     *  logId  事件日志id
+     * @return AjaxResult
+     * @throws ClientException 异常类
+     */
+    @PostMapping("/updateFireEventImage")
+    public AjaxResult  updateFireEventImage(@RequestBody DaHuaEventBO eventBO) throws ClientException {
+        CentereventTReportmessage centereventTReportmessage = null;
+        if (StringUtils.isNotBlank(eventBO.getEventCode()) && StringUtils.isNotBlank(eventBO.getLogId())) {
+            // 通过eventCode获取报文信息
+            centereventTReportmessage = centereventTReportmessageService.selectCentereventTReportmessageById(eventBO.getEventCode());
+        }
+        if (StringUtils.isNull(centereventTReportmessage)) {
+            return AjaxResult.success("参数异常");
+        }
+        // 解析报文
+        JSONObject context = JSONObject.parseObject(centereventTReportmessage.getContext()).getJSONObject("info");
+        eventBO.setAlarmCode(context.getString("alarmCode"));
+        eventBO.setAlarmDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(context.getLong("alarmDate"))));
+        eventBO.setDbType("0");
+        return AjaxResult.success(alarmEventService.updateFireEventImage(eventBO));
+    }
+}

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

@@ -5,13 +5,28 @@ import lombok.Data;
 @Data
 public class DaHuaEventBO {
 
+    /**
+     * 事件编码
+     */
     private String eventCode;
 
+    /**
+     * 事件日志id
+     */
     private String logId;
 
+    /**
+     * 报文编码
+     */
     private String alarmCode;
 
+    /**
+     * 报文内数据时间
+     */
     private String alarmDate;
 
+    /**
+     * 请求类型
+     */
     private String dbType;
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/dahua/DaHuaFireEventVO.java

@@ -7,23 +7,38 @@ import java.util.Date;
 @Data
 public class DaHuaFireEventVO {
 
-    // 序号
+    /**
+     * 序号
+     */
     private Long id;
 
-    // 事件大类
+    /**
+     * 事件大类
+     */
     private String category;
 
-    // 方法名
+    /**
+     * 方法名
+     */
     private String method;
 
+    /**
+     * 报文内容
+     */
     private InfoVO info;
 
-    // 子系统名称
+    /**
+     * 子系统名称
+     */
     private String subsystem;
 
-    // 域ID-级联消息下级发给mac时需要带上
+    /**
+     * 域ID-级联消息下级发给mac时需要带上
+     */
     private String domainId;
 
-    // 创建时间
+    /**
+     * 创建时间
+     */
     private Date createTime;
 }

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

@@ -174,15 +174,17 @@ public class AlarmEventServiceImpl implements AlarmEventService {
 
     // 事件目录
     private CentereventTEventcatalogue insertEventCatalogue(CentereventTEventcatalogue centereventTEventcatalogue, CenterdataTCamera centerdataTCamera, Date createTime) {
+        //生成uuid
         String eventCode = IdUtils.simpleUUID();
         centereventTEventcatalogue.setId(eventCode);
         centereventTEventcatalogue.setEventCode(eventCode);
+
         if (null == centereventTEventcatalogue.getReportSource()) {
-            centereventTEventcatalogue.setReportSource(REPORTING_SOURCE_1);
+            centereventTEventcatalogue.setReportSource(REPORTING_SOURCE_1);//reporting_source_1
         }
-        centereventTEventcatalogue.setIsUrged(SYS_ISURGE_2);
+        centereventTEventcatalogue.setIsUrged(SYS_ISURGE_2);//sys_isurge_2
         centereventTEventcatalogue.setEventStatus("上报");
-        centereventTEventcatalogue.setEventStatusValue(FOREST_EVENT_STATUS_1);
+        centereventTEventcatalogue.setEventStatusValue(FOREST_EVENT_STATUS_1);//forest_event_status_1
         centereventTEventcatalogue.setCreateBy(centerdataTCamera.getId());
         centereventTEventcatalogue.setCreateName(centerdataTCamera.getCameraName());
         centereventTEventcatalogue.setCreateTime(null == createTime ? DateUtils.getNowDate() : createTime);