钟来 / Luhui · 提交

转到一个项目

作者 钟来
提交 035eced46c5b965e5d99f97e6b8e59861e45673a 1 个父辈 db6a8f06

添加中转泵

内嵌 并排对比
正在显示 2 个修改的文件 包含 2 行增加 和 1 行删除
@@ -19,7 +19,7 @@ public class Main { @@ -19,7 +19,7 @@ public class Main {
19 private static Logger log = LoggerFactory.getLogger(Main.class); 19 private static Logger log = LoggerFactory.getLogger(Main.class);
20 public static void main(String[] args) { 20 public static void main(String[] args) {
21 log.info("启动服务"); 21 log.info("启动服务");
22 -// System.setProperty("dbPath","E:/work/idea/Luhui/lh-modules/lh-lsy-plc-service/src/main/resources/"); 22 +// System.setProperty("dbPath",Main.class.getClassLoader().getResource("").getPath());
23 DeviceProductProtocol.init(); 23 DeviceProductProtocol.init();
24 SpringApplicationBuilder builder = new SpringApplicationBuilder(Main.class); 24 SpringApplicationBuilder builder = new SpringApplicationBuilder(Main.class);
25 builder.run( args); 25 builder.run( args);
@@ -54,6 +54,7 @@ public class DeviceProductProtocol { @@ -54,6 +54,7 @@ public class DeviceProductProtocol {
54 deviceDataConfigList.add(new DeviceDataConfig(18,"SYS_AUTO",null,PLCDataType.控制柜状态,"00","系统自动允许")); 54 deviceDataConfigList.add(new DeviceDataConfig(18,"SYS_AUTO",null,PLCDataType.控制柜状态,"00","系统自动允许"));
55 deviceDataConfigList.add(new DeviceDataConfig(26,"TX_RUN",null,PLCDataType.故障代码,"00","远程通讯正常","01","00")); 55 deviceDataConfigList.add(new DeviceDataConfig(26,"TX_RUN",null,PLCDataType.故障代码,"00","远程通讯正常","01","00"));
56 deviceDataConfigList.add(new DeviceDataConfig(41,"SYS_ALARM",null,PLCDataType.故障代码,"00","设备故障报警","01","01")); 56 deviceDataConfigList.add(new DeviceDataConfig(41,"SYS_ALARM",null,PLCDataType.故障代码,"00","设备故障报警","01","01"));
  57 + deviceDataConfigList.add(new DeviceDataConfig(73,"YC_AUTO_P002",PLCType.中转泵,PLCDataType.控制器模式,"40","远程自动按钮",null,"1"));
57 58
58 deviceDataWriteConfigList.add(new DeviceDataConfig(27,"YC_ST_C001A",PLCType.推水机,PLCDataType.控制器状态码,"01","远程启动按钮",null,"01")); 59 deviceDataWriteConfigList.add(new DeviceDataConfig(27,"YC_ST_C001A",PLCType.推水机,PLCDataType.控制器状态码,"01","远程启动按钮",null,"01"));
59 deviceDataWriteConfigList.add(new DeviceDataConfig(28,"YC_STP_C001A",PLCType.推水机,PLCDataType.控制器状态码,"01","远程停止按钮",null,"00")); 60 deviceDataWriteConfigList.add(new DeviceDataConfig(28,"YC_STP_C001A",PLCType.推水机,PLCDataType.控制器状态码,"01","远程停止按钮",null,"00"));