From df318c8e458f22c97caca37e3ffc8ba68f2bbb72 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Thu, 27 Jun 2024 18:47:46 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=B7=BB=E5=8A=A0=E8=A1=8C=E6=9E=B6-agv?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=BD=8D=E5=8F=96=E8=B4=A7=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88LMS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agv/ndctwo/AgvNdcTwoDeviceDriver.java     | 14 +++++++++
 .../acs/ext/wms/service/AcsToWmsService.java  |  6 ++++
 .../wms/service/impl/AcsToWmsServiceImpl.java | 29 +++++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
index 5cfcc9823..6a99fb316 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
@@ -44,12 +44,14 @@ import org.nl.config.language.LangProcess;
 import org.nl.config.lucene.enums.LogTypeEnum;
 import org.nl.config.lucene.service.LuceneExecuteLogService;
 import org.nl.config.lucene.service.dto.LuceneLogDto;
+import org.nl.config.thread.ThreadPoolExecutorUtil;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.config.SpringContextHolder;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.concurrent.ThreadPoolExecutor;
 
 
 /**
@@ -70,6 +72,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
     DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class);
     DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class);
     LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean(LuceneExecuteLogService.class);
+    final ThreadPoolExecutor EXECUTOR = ThreadPoolExecutorUtil.getPoll();
     TwoAgvPhase twoAgvPhase = new TwoAgvPhase();
 
     String error_code = "0";
@@ -583,6 +586,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
                         .build();
                 logDto.setLog_level(4);
                 luceneExecuteLogService.deviceExecuteLog(logDto);
+                String task_code = inst.getTask_code();
+                EXECUTOR.submit(() -> {
+                    boolean feedbackToLms = (boolean)manipulatorAgvStationDeviceDriver.getDevice().getExtraValue().get("feedbackToLms");
+                    if(feedbackToLms){
+                        JSONObject jsonObject = new JSONObject();
+                        jsonObject.put("task_code", task_code);
+                        acsToWmsService.actionFinishRequest2(jsonObject);
+                    }
+                });
+
+
             } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
                 hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
                 try {
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
index db2a23625..faea6ca16 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
@@ -201,4 +201,10 @@ public interface AcsToWmsService {
     HttpResponse feedbackDies(JSONObject param);
 
     String secondaryAllocationPoint(JSONObject param);
+
+    /**
+     * 行架-agv对接位取货完成反馈
+     * @param jsonObject
+     */
+    void actionFinishRequest2(JSONObject jsonObject);
 }
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
index 772d5ca7d..9dd4ef120 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
@@ -677,6 +677,35 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         }
     }
 
+    @Override
+    public void actionFinishRequest2(JSONObject jsonObject) {
+        HttpResponse execute = null;
+        try {
+            String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue();
+            AddressDto addressDto = addressService.findByCode("actionFinishRequest2");
+            String url = wmsurl + addressDto.getMethods_url();
+            log.info("feedbackDie - 反馈管芯请求路径{}", jsonObject);
+            LuceneLogDto luceneLogDto = new LuceneLogDto(4,"actionFinishRequest2", "",
+                    String.valueOf(jsonObject),
+                    "", jsonObject.getString("task_code") + "任务取货完成反馈");
+            luceneLogService.interfaceExecuteLog(luceneLogDto);
+            try {
+                execute = HttpRequest.post(url)
+                        .body(String.valueOf(jsonObject))
+                        .execute();
+            } catch (Exception e) {
+                String msg = e.getMessage();
+                log.info("feedbackDie-----输出参数{}", msg);
+                //网络不通
+            }
+        } catch (Exception e) {
+            LuceneLogDto luceneLogDto = new LuceneLogDto(4,"actionFinishRequest2", String.valueOf(execute.getStatus()),
+                    JSON.toJSONString(execute.body()),
+                    String.valueOf(execute.body()), jsonObject.getString("task_code") + "任务取货完成反馈失败");
+            luceneLogService.interfaceExecuteLog(luceneLogDto);
+        }
+    }
+
     @Override
     public HttpResponse feedbackDies(JSONObject param) {
         HttpResponse result2 = null;