From ec876854c3c2418742f0cee23e140fa94bfab92d Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Thu, 2 Jan 2025 09:40:11 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=B7=BB=E5=8A=A0=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hd/nladmin-system/pom.xml                     | 22 +++++++++++++++++++
 .../acs/agv/server/impl/AgvServiceImpl.java   |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/hd/nladmin-system/pom.xml b/hd/nladmin-system/pom.xml
index e13ce6e..3c8acb0 100644
--- a/hd/nladmin-system/pom.xml
+++ b/hd/nladmin-system/pom.xml
@@ -19,15 +19,37 @@
     </properties>
     <dependencies>
         <!--        ip地址解析-->
+        <dependency>
+            <groupId>net.sf.json-lib</groupId>
+            <artifactId>json-lib</artifactId>
+            <version>2.4</version>
+            <classifier>jdk15</classifier>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.jexcelapi</groupId>
+            <artifactId>jxl</artifactId>
+            <version>2.6.12</version>
+        </dependency>
         <dependency>
             <groupId>net.dreamlu</groupId>
             <artifactId>mica-ip2region</artifactId>
             <version>2.5.6</version>
         </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.70</version>
+        </dependency>
         <dependency>
             <groupId>org.openscada.utgard</groupId>
             <artifactId>org.openscada.opc.lib</artifactId>
             <version>1.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
index 7b5fe77..8fc4a18 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
@@ -570,7 +570,7 @@ public class AgvServiceImpl implements AgvService {
                     .execute();
             log.info("查询agv状态:{}", result.body());
             System.out.println("查询agv状态数据:" + result.body());
-            if (200 == 200) {
+            if (result.getStatus() == 200) {
                 com.alibaba.fastjson.JSONObject body = com.alibaba.fastjson.JSONObject.parseObject(result.body());
                 com.alibaba.fastjson.JSONArray ja = body.getJSONArray("report");
                 com.alibaba.fastjson.JSONObject alarms = body.getJSONObject("alarms");