root/liaoNingShengHua2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

初版

Browse Source
This commit is contained in:
张江玮
2023-04-14 10:18:48 +08:00
parent 71c1dedd18
commit 18b3f9b31f
161 changed files with 6167 additions and 9030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java
View File

@@ -567,4 +567,17 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
ReadUtil.write(itemMap, server);
}
public void writeMap(Map<String, Object> map) {
HashMap<String, Object> writeMap = new HashMap<>();
for (Map.Entry<String, Object> e : map.entrySet()) {
String key = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+ "." + e.getKey();
writeMap.put(key, e.getValue());
}
String opcservcerid = this.getDevice().getOpc_server_id();
Server server = ReadUtil.getServer(opcservcerid);
ReadUtil.write(writeMap, server);
}
}

4
acs/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -6,10 +6,10 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:lnsh_acs2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lnsh_acs2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:yongyu_acs2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:Root.123456}
password: ${DB_PWD:zjw123}
# password: ${DB_PWD:Root.123456}
# 初始连接数
initial-size: 5

2
acs/nladmin-system/src/main/resources/config/application.yml
View File

@@ -2,7 +2,7 @@ spring:
freemarker:
check-template-location: false
profiles:
active: dev
active: prod
jackson:
time-zone: GMT+8
data: