wyd 3 mesiacov pred
rodič
commit
bd55f4d0d4

+ 3 - 3
src/main/java/com/jg/config/ModBusSlaveServer.java

@@ -205,8 +205,8 @@ public class ModBusSlaveServer implements CommandLineRunner {
 
             @Override
             public void onWriteToMultipleHoldingRegisters(int address, int quantity, int[] values) {
-                System.out.print("onWriteToMultipleHoldingRegisters: address = " + address + ", quantity = " + quantity);
-                System.out.println(Arrays.toString(values));
+//                System.out.print("onWriteToMultipleHoldingRegisters: address = " + address + ", quantity = " + quantity);
+//                System.out.println(Arrays.toString(values));
                 // List<TagVo> tagVos = new ArrayList<>();
 //                Map<Integer, TagVo> result = new HashMap<>();
 
@@ -215,7 +215,7 @@ public class ModBusSlaveServer implements CommandLineRunner {
 //                    result.get(offset);
                     float resultBigEndian1 = convertRegistersToFloat(values[i], values[i+1], ByteOrder.BIG_ENDIAN,false);
                     showVoMap.get(offset).setValue(new BigDecimal(Float.toString(resultBigEndian1)));
-                    System.out.println(resultBigEndian1);
+//                    System.out.println(resultBigEndian1);
                 }
                 JSONArray array = new JSONArray();
                 for (ShowVo showVo : showVoMap.values()) {

+ 2 - 2
src/main/java/com/jg/service/impl/ModBusServiceImpl.java

@@ -116,7 +116,7 @@ public class ModBusServiceImpl implements ModBusService {
             }
         }
         batch.setContiguousRequests(false);
-        ModbusMaster modbusMaster = MASTER_MAP.get(1l);
+        ModbusMaster modbusMaster = MASTER_MAP.get(1L);
         try {
             if (!modbusMaster.isInitialized()) {
                 modbusMaster.init();
@@ -138,7 +138,7 @@ public class ModBusServiceImpl implements ModBusService {
             webSocketServer.sendInfo(array.toString(), "push");
             modbusMaster.destroy();
         } catch (Exception e) {
-            log.error("采集模块Id: {}, 读取失败: {}", 1l, e.getMessage());
+            log.error("采集模块Id: {}, 读取失败: {}", 1L, e.getMessage());
         }
     }