[update] 添加事件状态

wj-datacenter-service/src/main/java/net/wanji/datacenter/pojo/dto/EventDataDTO.java

@@ -25,4 +25,5 @@ public class EventDataDTO {
     private Date eventEndTime;
     private String eventLevel;
     private Integer greenId;
+    private Integer eventStatus;
 }

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

@@ -41,12 +41,13 @@ public class EventDataServiceImpl implements EventDataService {
                 if (Objects.nonNull(eventInfoPO4DB)) {
                     eventInfoPO4DB.setModifyTime(new Date());
                     eventInfoPO4DB.setEndTime(eventDataDTO.getEventEndTime());
-                    eventInfoPO4DB.setAlarmStatus(1);
+                    eventInfoPO4DB.setAlarmStatus(eventDataDTO.getEventStatus());
                     eventInfoMapper.updateOne(eventInfoPO4DB);
                 }
+            } else {
+                EventInfoPO eventInfoPO = getEventInfoPO(eventDataDTO);
+                eventInfoMapper.insertOne(eventInfoPO);
             }
-            EventInfoPO eventInfoPO = getEventInfoPO(eventDataDTO);
-            eventInfoMapper.insertOne(eventInfoPO);
         } catch (Exception e) {
             log.error("事件保存异常：", e);
             throw new RuntimeException(e);

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

@@ -56,14 +56,13 @@
 
     <update id="updateOne" parameterType="net.wanji.datacenter.pojo.po.EventInfoPO">
         update t_event_info
-            set alarm_status = #{entity.alarmStatus}
-            set end_time     = #{entity.endTime}
-            set alarm_status = #{entity.alarmStatus}
-            set modify_time  = #{entity.modifyTime}
-        where event_serial_number = #{entity.eventSerialNumber}
+            set end_time     = #{endTime},
+                alarm_status = #{alarmStatus},
+                modify_time  = #{modifyTime}
+        where event_serial_number = #{eventSerialNumber}
     </update>
 
-    <select id="selectHistEvent" parameterType="java.lang.String">
+    <select id="selectByEventSerialNumber" parameterType="java.lang.String" resultType="net.wanji.datacenter.pojo.po.EventInfoPO">
         SELECT <include refid="Base_Column_List"/>
         FROM t_event_info
         WHERE event_serial_number = #{eventSerialNumber}