1 MES上传调整

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

@@ -49,6 +49,44 @@ public class MesDeviceDomain extends BaseEntity {
      * 实时状态 0-异常;1-正常
      */
     private String realTimeStatus;
+
+    /**
+     * 状态 0-预热；1-正常;3-传感器故障;4-报警；5-通讯故障
+     */
+    private String deviceStatus;
+    /**
+     * modbus 通信设置时间 年
+     */
+    private String recordYear;
+
+    /**
+     * modbus 通信设置时间 月
+     */
+    private String recordMonth;
+
+    /**
+     * modbus 通信设置时间 日
+     */
+    private String recordDate;
+
+    /**
+     * modbus 通信设置时间 时
+     */
+    private String recordHour;
+
+    /**
+     * modbus 通信设置时间 分
+     */
+    private String recordMinute;
+
+    /**
+     * 写时间状态 0-失败;1-成功
+     */
+    private String writeTimeStatus;
+    /**
+     * 运行时间状态 0-异常;1-正常
+     */
+    private String runTimeStatus;
     /**
      * 标定浓度值
      */
@@ -139,4 +177,68 @@ public class MesDeviceDomain extends BaseEntity {
     public void setCalibrationConcentrationStatus(String calibrationConcentrationStatus) {
         this.calibrationConcentrationStatus = calibrationConcentrationStatus;
     }
+
+    public String getDeviceStatus() {
+        return deviceStatus;
+    }
+
+    public void setDeviceStatus(String deviceStatus) {
+        this.deviceStatus = deviceStatus;
+    }
+
+    public String getRecordYear() {
+        return recordYear;
+    }
+
+    public void setRecordYear(String recordYear) {
+        this.recordYear = recordYear;
+    }
+
+    public String getRecordMonth() {
+        return recordMonth;
+    }
+
+    public void setRecordMonth(String recordMonth) {
+        this.recordMonth = recordMonth;
+    }
+
+    public String getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(String recordDate) {
+        this.recordDate = recordDate;
+    }
+
+    public String getRecordHour() {
+        return recordHour;
+    }
+
+    public void setRecordHour(String recordHour) {
+        this.recordHour = recordHour;
+    }
+
+    public String getRecordMinute() {
+        return recordMinute;
+    }
+
+    public void setRecordMinute(String recordMinute) {
+        this.recordMinute = recordMinute;
+    }
+
+    public String getWriteTimeStatus() {
+        return writeTimeStatus;
+    }
+
+    public void setWriteTimeStatus(String writeTimeStatus) {
+        this.writeTimeStatus = writeTimeStatus;
+    }
+
+    public String getRunTimeStatus() {
+        return runTimeStatus;
+    }
+
+    public void setRunTimeStatus(String runTimeStatus) {
+        this.runTimeStatus = runTimeStatus;
+    }
 }

zhmes-agecal-system/src/main/java/com/zehong/system/netty/event/CalibrationResultEventHandler.java

@@ -95,16 +95,29 @@ public class CalibrationResultEventHandler {
             MesDeviceDomain mesDeviceDomain = new MesDeviceDomain();
             // 主板码
             mesDeviceDomain.setMotherboardCode(palletDeviceBinding.getDeviceCode());
-            // 标定浓度值
-            mesDeviceDomain.setCalibrationConcentration(palletDeviceBinding.getCalibrationConcentration());
-            // 标定状态
-            mesDeviceDomain.setCalibrationConcentrationStatus(palletDeviceBinding.getCalibrationConcentrationStatus());
             // 浓度
             mesDeviceDomain.setConcentration(palletDeviceBinding.getConcentration());
+            // 设备状态
+            mesDeviceDomain.setDeviceStatus(palletDeviceBinding.getStatus());
             // 实时AD
             mesDeviceDomain.setRealTimeAd(palletDeviceBinding.getRealTimeAd());
             // 实时状态
             mesDeviceDomain.setRealTimeStatus(palletDeviceBinding.getRealTimeStatus());
+            // 写时间状态
+            mesDeviceDomain.setWriteTimeStatus(palletDeviceBinding.getWriteTimeStatus());
+            // 运行时间状态
+            mesDeviceDomain.setRunTimeStatus(palletDeviceBinding.getRunTimeStatus());
+            // 标定浓度值
+            mesDeviceDomain.setCalibrationConcentration(palletDeviceBinding.getCalibrationConcentration());
+            // 标定状态
+            mesDeviceDomain.setCalibrationConcentrationStatus(palletDeviceBinding.getCalibrationConcentrationStatus());
+
+            mesDeviceDomain.setRecordYear(palletDeviceBinding.getRecordYear());
+            mesDeviceDomain.setRecordMonth(palletDeviceBinding.getRecordMonth());
+            mesDeviceDomain.setRecordDate(palletDeviceBinding.getRecordDate());
+            mesDeviceDomain.setRecordHour(palletDeviceBinding.getRecordHour());
+            mesDeviceDomain.setRecordMinute(palletDeviceBinding.getRecordMinute());
+
             mesDeviceDomains.add(mesDeviceDomain);
         }
 

zhmes-agecal-system/src/main/java/com/zehong/system/service/impl/PalletDeviceUploadHistoryServiceImpl.java

@@ -165,18 +165,25 @@ public class PalletDeviceUploadHistoryServiceImpl implements IPalletDeviceUpload
             || StringUtils.isBlank(palletDeviceBinding.getRealTimeAdStatus())) {
                 throw new RuntimeException("数据不完整");
             }
+
             // 主板码
             mesDeviceDomain.setMotherboardCode(palletDeviceBinding.getDeviceCode());
-            // 标定浓度值
-            mesDeviceDomain.setCalibrationConcentration(palletDeviceBinding.getCalibrationConcentration());
-            // 标定浓度结果
-            mesDeviceDomain.setCalibrationConcentrationStatus(palletDeviceBinding.getCalibrationConcentrationStatus());
             // 浓度
             mesDeviceDomain.setConcentration(palletDeviceBinding.getConcentration());
+            // 设备状态
+            mesDeviceDomain.setDeviceStatus(palletDeviceBinding.getStatus());
             // 实时AD
             mesDeviceDomain.setRealTimeAd(palletDeviceBinding.getRealTimeAd());
             // 实时状态
             mesDeviceDomain.setRealTimeStatus(palletDeviceBinding.getRealTimeAdStatus());
+            // 写时间状态
+            mesDeviceDomain.setWriteTimeStatus(palletDeviceBinding.getWriteTimeStatus());
+            // 运行时间状态
+            mesDeviceDomain.setRunTimeStatus(palletDeviceBinding.getRunTimeStatus());
+            // 标定浓度值
+            mesDeviceDomain.setCalibrationConcentration(palletDeviceBinding.getCalibrationConcentration());
+            // 标定状态
+            mesDeviceDomain.setCalibrationConcentrationStatus(palletDeviceBinding.getCalibrationConcentrationStatus());
             mesDeviceDomains.add(mesDeviceDomain);
         }