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

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

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: 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:
   datasource: