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

fix 去除双向认证 add agv设备监控

Browse Source
This commit is contained in:
张江玮
2023-08-14 08:41:35 +08:00
parent ed84907a44
commit 9e6ebe8613
2 changed files with 17 additions and 6 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/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -1026,7 +1026,18 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
@Override @Override
public JSONObject getDeviceStatusName() throws Exception { public JSONObject getDeviceStatusName() throws Exception {
return null; JSONObject jo = new JSONObject();
jo.put("device_name", this.getDevice().getDevice_name());
jo.put("x", this.x);
jo.put("y", this.y);
jo.put("angle", this.angle);
jo.put("electric_qty", this.electric_qty);
jo.put("status", this.status);
jo.put("error", this.error);
jo.put("error_message", this.error_message);
jo.put("device_status", this.device_status);
jo.put("message", this.message);
return jo;
} }
@Override @Override

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

@@ -11,11 +11,11 @@ server:
key-store-password: 123456 key-store-password: 123456
key-store-type: PKCS12 key-store-type: PKCS12
key-alias: server key-alias: server
trust-store: classpath:server.p12 # trust-store: classpath:server.p12
trust-store-password: 123456 # trust-store-password: 123456
trust-store-type: JKS # trust-store-type: JKS
trust-store-provider: SUN # trust-store-provider: SUN
client-auth: need # client-auth: need
#配置数据源 #配置数据源
spring: spring:
datasource: datasource: