1 老化过程中 获取卡号，获取IOT状态调整中

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

@@ -727,6 +727,7 @@ public class TStoreyInfoServiceImpl implements ITStoreyInfoService
                             map.put("concentration", result.getModbusResult()[0]);
                             map.put("status", result.getModbusResult()[1]);
                             map.put("modbusResult", result.getModbusResult());
+                            map.put("simCard", result.getSimCard());
                         }
                         map.put("message", result.getMessage());
                         return map;

zhmes-agecal-system/src/main/java/com/zehong/system/task/RealTimeReadAgingDataFunction.java

@@ -378,7 +378,16 @@ public class RealTimeReadAgingDataFunction {
         result.setSerpentineNumber(serpentineNumber); // 一条龙排列中的编号
         result.setRow(row);
         result.setCol(col);
+        if(modbusResult != null){
             result.setModbusResult(modbusResult);
+            // 设置卡号
+            StringBuilder simCardNoBuilder = new StringBuilder();
+            for (int i = 17; i <= 36; i++) {
+                simCardNoBuilder.append(modbusResult[i]);
+            }
+            String simCardNo = simCardNoBuilder.toString();
+            result.setSimCard(simCardNo);
+        }
         result.setSuccess(success);
         result.setMessage(message);
 
@@ -396,10 +405,13 @@ public class RealTimeReadAgingDataFunction {
         private boolean success;           // 处理是否成功
         private String message;            // 处理消息
 
+        private String simCard;
+
         public DeviceResult() {
         }
 
-        public DeviceResult(String convertedDeviceId, Integer serpentineNumber, int row, int col, int[] modbusResult, boolean success, String message) {
+        public DeviceResult(String convertedDeviceId, Integer serpentineNumber, int row, int col, int[] modbusResult,
+                            boolean success, String message, String simCard) {
             this.convertedDeviceId = convertedDeviceId;
             this.serpentineNumber = serpentineNumber;
             this.row = row;
@@ -407,6 +419,7 @@ public class RealTimeReadAgingDataFunction {
             this.modbusResult = modbusResult;
             this.success = success;
             this.message = message;
+            this.simCard = simCard;
         }
 
         public String getConvertedDeviceId() {
@@ -465,6 +478,14 @@ public class RealTimeReadAgingDataFunction {
             this.col = col;
         }
 
+        public String getSimCard() {
+            return simCard;
+        }
+
+        public void setSimCard(String simCard) {
+            this.simCard = simCard;
+        }
+
         @Override
         public String toString() {
             return "DeviceResult{" +