[update] 事件添加优化状态

wj-datacenter-service/src/main/java/net/wanji/datacenter/pojo/po/EventInfoPO.java

@@ -154,4 +154,6 @@ public class EventInfoPO {
     private String dir;
     @ApiModelProperty(name = "告警状态  0其他 1分析中 2优化中 3优化完", notes = "")
     private Integer alarmStatus;
+    @ApiModelProperty(name = "优化状态 0-未优化 1-优化过", notes = "")
+    private Integer optStatus;
 }

wj-datacenter-service/src/main/java/net/wanji/datacenter/service/EventDataServiceImpl.java

@@ -44,7 +44,11 @@ public class EventDataServiceImpl implements EventDataService {
                 if (Objects.nonNull(eventInfoPO4DB)) {
                     eventInfoPO4DB.setModifyTime(new Date());
                     eventInfoPO4DB.setEndTime(eventDataDTO.getEventEndTime());
-                    eventInfoPO4DB.setAlarmStatus(eventDataDTO.getEventStatus());
+                    Integer eventStatus = eventDataDTO.getEventStatus();
+                    eventInfoPO4DB.setAlarmStatus(eventStatus);
+                    if (Objects.equals(2, eventStatus) || Objects.equals(3, eventStatus)) {
+                        eventInfoPO4DB.setOptStatus(1);
+                    }
                     setGreenId(crossIdGreenIdMap, eventInfoPO4DB, eventInfoPO4DB.getCrossId());
                     eventInfoMapper.updateOne(eventInfoPO4DB);
                 } else {
@@ -81,6 +85,8 @@ public class EventDataServiceImpl implements EventDataService {
         eventInfoPO.setDir(eventDataDTO.getDirection());
         eventInfoPO.setRuksj(new Date());
         eventInfoPO.setAlarmStatus(eventDataDTO.getEventStatus());
+        // 默认未优化
+        eventInfoPO.setOptStatus(0);
         setGreenId(crossIdGreenIdMap, eventInfoPO, crossId);
         return eventInfoPO;
     }

wj-datacenter-service/src/main/resources/mapper/EventInfoMapper.xml

@@ -39,13 +39,14 @@
         <result column="green_id" property="greenId"/>
         <result column="dir" property="dir"/>
         <result column="alarm_status" property="alarmStatus"/>
+        <result column="opt_status" property="optStatus"/>
         <result column="modify_time" property="modifyTime"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         oid,plate_no,object_type,confidence,detect_time,grade,place_desc,lng,lat,category,type,start_time,end_time,
         duration,source,ruksj,lane_id,rid,segment_id,cross_id,camera_oid,event_serial_number,data_status,global_id,
-        station_id,event_id,dt,green_id,dir
+        station_id,event_id,dt,green_id,dir,opt_status
     </sql>
 
     <select id="selectHistEvent" resultType="net.wanji.datacenter.pojo.po.EventInfoPO">
@@ -58,6 +59,7 @@
         update t_event_info
             set end_time     = #{endTime},
                 alarm_status = #{alarmStatus},
+                opt_status = #{optStatus},
                 modify_time  = #{modifyTime}
         where event_serial_number = #{eventSerialNumber}
     </update>
@@ -95,7 +97,8 @@
         , event_serial_number
         , green_id
         , dir
-        , alarm_status)
+        , alarm_status
+        , opt_status)
         VALUES (
           #{oid}
         , #{plateNo}
@@ -122,6 +125,7 @@
         , #{greenId}
         , #{dir}
         , #{alarmStatus}
+        , #{optStatus}
         )
         ON DUPLICATE KEY UPDATE
         end_time = values(end_time)