From 9e6ebe86137b533ef08671137ded5207f3955e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Mon, 14 Aug 2023 08:41:35 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=8E=BB=E9=99=A4=E5=8F=8C=E5=90=91?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=20add=20agv=E8=AE=BE=E5=A4=87=E7=9B=91?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/ndcone/AgvNdcOneDeviceDriver.java | 13 ++++++++++++- .../src/main/resources/config/application-dev.yml | 10 +++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index bcc8e8c..b6e63cb 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -1026,7 +1026,18 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic @Override 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 diff --git a/acs/nladmin-system/src/main/resources/config/application-dev.yml b/acs/nladmin-system/src/main/resources/config/application-dev.yml index d74c8c2..a8e0fb7 100644 --- a/acs/nladmin-system/src/main/resources/config/application-dev.yml +++ b/acs/nladmin-system/src/main/resources/config/application-dev.yml @@ -11,11 +11,11 @@ server: key-store-password: 123456 key-store-type: PKCS12 key-alias: server - trust-store: classpath:server.p12 - trust-store-password: 123456 - trust-store-type: JKS - trust-store-provider: SUN - client-auth: need +# trust-store: classpath:server.p12 +# trust-store-password: 123456 +# trust-store-type: JKS +# trust-store-provider: SUN +# client-auth: need #配置数据源 spring: datasource: