老化层记录老化开始时间，老化柜、托盘、报警信息初始页面

zhmes-agecal-admin/src/main/java/com/zehong/web/controller/equipment/EquipmentDataCollection.java

@@ -55,7 +55,7 @@ public class EquipmentDataCollection {
                 receiveMsg1 = agingCabinetCommunication(info, sendMsg1);
                 if (receiveMsg1 == null || receiveMsg1.length() != 58) {
                     // 记录异常数据
-                    alarmData.setfAlarmType("01"); // 01.老化柜 02.标定柜 03.机械臂 04.老化层 05.点位
+                    alarmData.setfAlarmType("01"); //01.老化柜 02.机械臂 03.老化层 04.点位
                     alarmData.setfEquipmentCode(info.getfEquipmentCode());
                     alarmData.setfAlarmData("老化柜通讯失败");
                     tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
@@ -89,7 +89,7 @@ public class EquipmentDataCollection {
                             storeyInfo = tStoreyInfoService.selectTStoreyInfoByCode(storeyCode);
                             if (storeyInfo == null) {
                                 // 记录异常数据
-                                alarmData.setfAlarmType("01"); // 01.老化柜 02.标定柜 03.机械臂 04.老化层 05.点位
+                                alarmData.setfAlarmType("01"); //01.老化柜 02.机械臂 03.老化层 04.点位
                                 alarmData.setfEquipmentCode(info.getfEquipmentCode());
                                 alarmData.setfAlarmData("下属" + storeyCode + "号老化层不存在");
                                 tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
@@ -107,7 +107,7 @@ public class EquipmentDataCollection {
                                     tStoreyInfoService.updateTStoreyInfo(storeyInfo);
                                 } else {
                                     // 记录异常数据
-                                    alarmData.setfAlarmType("04"); //01.老化柜 02.标定柜 03.机械臂 04.老化层 05.点位
+                                    alarmData.setfAlarmType("03"); //01.老化柜 02.机械臂 03.老化层 04.点位
                                     alarmData.setfEquipmentCode(storeyInfo.getfStoreyCode());
                                     alarmData.setfAlarmData("断电失败");
                                     tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
@@ -155,7 +155,7 @@ public class EquipmentDataCollection {
         String receiveMsg1 = agingCabinetCommunication(equipmentInfo, sendMsg1);
         if (receiveMsg1 == null || receiveMsg1.length() != 58) {
             // 记录异常数据
-            alarmData.setfAlarmType("01"); //01.老化柜 02.标定柜 03.机械臂 04.老化层
+            alarmData.setfAlarmType("01"); //01.老化柜 02.机械臂 03.老化层 04.点位
             alarmData.setfEquipmentCode(equipmentInfo.getfEquipmentCode());
             alarmData.setfAlarmData("老化柜通讯失败");
             tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
@@ -179,7 +179,7 @@ public class EquipmentDataCollection {
                 String receiveMsg2 = storeyCommunication(storeyInfo, sendMsg2);
                 if (!sendMsg2.equals(receiveMsg2) || receiveMsg2 == null) {
                     // 记录异常数据
-                    alarmData.setfAlarmType("04"); //01.老化柜 02.标定柜 03.机械臂 04.老化层 05.点位
+                    alarmData.setfAlarmType("03"); //01.老化柜 02.机械臂 03.老化层 04.点位
                     alarmData.setfEquipmentCode(storeyInfo.getfStoreyCode());
                     alarmData.setfAlarmData("上电失败");
                     tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
@@ -187,6 +187,7 @@ public class EquipmentDataCollection {
                 }
                 // 老化层更新状态
                 storeyInfo.setfStatus("1"); //运行
+                storeyInfo.setfAgingStartTime(new Date()); // 记录老化开始时间
                 tStoreyInfoService.updateTStoreyInfo(storeyInfo);
 
                 /* 4.老化层通讯，72个点位，1-27一个端口号、28-54一个端口号、55-72一个端口号，IP不变 */
@@ -195,7 +196,7 @@ public class EquipmentDataCollection {
                 String receiveMsg3 = storeyCommunication(storeyInfo, sendMsg3);
                 if (receiveMsg3 == null) {
                     // 记录异常数据
-                    alarmData.setfAlarmType("04"); //01.老化柜 02.标定柜 03.机械臂 04.老化层 05.点位
+                    alarmData.setfAlarmType("03"); //01.老化柜 02.机械臂 03.老化层 04.点位
                     alarmData.setfEquipmentCode(storeyInfo.getfStoreyCode());
                     alarmData.setfAlarmData("老化层通讯失败，无响应");
                     tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);
@@ -228,7 +229,7 @@ public class EquipmentDataCollection {
                     String receiveMsgYear = storeyCommunication(storeyInfo, sendMsgYear);
                     if (!sendMsgYear.equals(receiveMsgYear) || receiveMsgYear == null) {
                         // 记录异常数据
-                        alarmData.setfAlarmType("05"); //01.老化柜 02.标定柜 03.机械臂 04.老化层 05.点位
+                        alarmData.setfAlarmType("04"); //01.老化柜 02.机械臂 03.老化层 04.点位
                         alarmData.setfEquipmentCode(storeyInfo.getfStoreyCode());
                         alarmData.setfAlarmData("写入时间失败-年");
                         tEquipmentAlarmDataService.insertTEquipmentAlarmData(alarmData);

zhmes-agecal-system/src/main/java/com/zehong/system/domain/TStoreyInfo.java

@@ -40,6 +40,11 @@ public class TStoreyInfo extends BaseEntity
     @Excel(name = "状态：0空闲，1运行，2故障，3断电")
     private String fStatus;
 
+    /** 老化开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date fAgingStartTime;
+
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -110,7 +115,16 @@ public class TStoreyInfo extends BaseEntity
     {
         return fPort;
     }
-    public void setfUpdateTime(Date fUpdateTime) 
+
+    public Date getfAgingStartTime() {
+        return fAgingStartTime;
+    }
+
+    public void setfAgingStartTime(Date fAgingStartTime) {
+        this.fAgingStartTime = fAgingStartTime;
+    }
+
+    public void setfUpdateTime(Date fUpdateTime)
     {
         this.fUpdateTime = fUpdateTime;
     }
@@ -147,6 +161,7 @@ public class TStoreyInfo extends BaseEntity
             .append("fIp", getfIp())
             .append("fStatus", getfStatus())
             .append("fPort", getfPort())
+            .append("fAgingStartTime", getfUpdateTime())
             .append("fUpdateTime", getfUpdateTime())
             .append("fCreateTime", getfCreateTime())
             .append("fAlarmTime", getfAlarmTime())

zhmes-agecal-system/src/main/resources/mapper/system/TStoreyInfoMapper.xml

@@ -11,13 +11,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fIp"    column="f_ip"    />
         <result property="fStatus"    column="f_status"    />
         <result property="fPort"    column="f_port"    />
+        <result property="fAgingStartTime"    column="f_aging_start_time"    />
         <result property="fUpdateTime"    column="f_update_time"    />
         <result property="fCreateTime"    column="f_create_time"    />
         <result property="fAlarmTime"    column="f_alarm_time"    />
     </resultMap>
 
     <sql id="selectTStoreyInfoVo">
-        select f_storey_id, f_equipment_id, f_storey_code, f_tray_code, f_ip, f_status, f_port, f_update_time, f_create_time, f_alarm_time from t_storey_info
+        select f_storey_id, f_equipment_id, f_storey_code, f_tray_code, f_ip, f_status, f_port, f_aging_start_time, f_update_time, f_create_time, f_alarm_time from t_storey_info
     </sql>
 
     <select id="selectTStoreyInfoList" parameterType="TStoreyInfo" resultMap="TStoreyInfoResult">
@@ -56,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fUpdateTime != null">f_update_time,</if>
             <if test="fCreateTime != null">f_create_time,</if>
             <if test="fAlarmTime != null">f_alarm_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fStoreyId != null">#{fStoreyId},</if>
             <if test="fEquipmentId != null">#{fEquipmentId},</if>
@@ -78,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fIp != null">f_ip = #{fIp},</if>
             <if test="fStatus != null">f_status = #{fStatus},</if>
             <if test="fPort != null">f_port = #{fPort},</if>
+            <if test="fAgingStartTime != null">f_aging_start_time = #{fAgingStartTime},</if>
             <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
             <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
             <if test="fAlarmTime != null">f_alarm_time = #{fAlarmTime},</if>