rev：修改

acs2/nladmin-system/pom.xml

@@ -51,11 +51,23 @@
             <groupId>org.openscada.jinterop</groupId>
             <artifactId>org.openscada.jinterop.core</artifactId>
             <version>2.1.8</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.openscada.jinterop</groupId>
             <artifactId>org.openscada.jinterop.deps</artifactId>
             <version>1.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.openscada.utgard</groupId>
@@ -420,11 +432,6 @@
             <artifactId>lucene-analyzers-smartcn</artifactId>
             <version>${lucene.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.68</version> <!-- 更新到最新版本 -->
-        </dependency>
         <!-- Lucene查询解析包 -->
         <dependency>
             <groupId>org.apache.lucene</groupId>

acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java

@@ -161,14 +161,14 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
                 driver.setCar_no(reqParam.getString("robot_name"));
 
                 result.put("code", HttpStatus.HTTP_OK);
-                result.put("message", "ok");
+                result.put("message", "申请进入设备："+device.getDevice_code()+"成功");
             } else {
                 result.put("code", HttpStatus.HTTP_BAD_REQUEST);
-                result.put("message", "ok");
+                result.put("message", "当前action值为："+driver.getAction()+"不允许进入");
             }
         } else {
             result.put("code", HttpStatus.HTTP_BAD_REQUEST);
-            result.put("message", "ok");
+            result.put("message", "当前设备不属于三色灯！");
         }
         log.info("getBlockGroup反馈AGV输出参数:{}", result.toString());
         return result;
@@ -195,7 +195,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
             driver.writing(Arrays.asList(key),Arrays.asList(value));
 
             // 判断是否允许离开 1-允许，0-不允许
-            if (driver.getAction() == XgAgvEnum.GS_ACTION_YES.getCode()) {
+            if (driver.getAction() == XgAgvEnum.GS_ACTION_NOT.getCode()) {
                 // 判断是否清楚车号
                 if (device.getExtraValue().get("is_clean").toString().equals("1")) {
                     // 清除第当前设备车号（第二次）
@@ -207,14 +207,14 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
                     driver2.setCar_no("");
                 }
                 result.put("code", HttpStatus.HTTP_OK);
-                result.put("message", "ok");
+                result.put("message", "申请离开设备："+device.getDevice_code()+"成功");
             } else {
                 result.put("code", HttpStatus.HTTP_BAD_REQUEST);
-                result.put("message", "ok");
+                result.put("message", "当前action值为："+driver.getAction()+"不允许离开");
             }
         } else {
             result.put("code", HttpStatus.HTTP_BAD_REQUEST);
-            result.put("message", "ok");
+            result.put("message", "当前设备不属于三色灯！");
         }
         log.info("releaseBlockGroup反馈AGV输出参数:{}", result.toString());
         return result;

acs2/nladmin-system/src/main/java/org/nl/acs/ext/xg/XgHttpUtil.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
 /**

acs2/nladmin-system/src/main/java/org/nl/modules/common/utils/enums/RegionEnum.java

@@ -50,6 +50,9 @@ public enum RegionEnum {
     // D生产区-->地面货架
     D_DMHJ("D", "DMHJ","PS20","Group-001"),
 
+    // 地面货架--> D生产区
+    DMHJ_D("DMHJ", "D","PS20","Group-001"),
+
     // 地面货架-->拆盘机
     DMHJ_CPJ("DMHJ", "CPJ","PS20","Group-001"),