opt:增加任务类型

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

@@ -12,16 +12,10 @@ import org.nl.acs.AcsConfig;
 import org.nl.acs.agv.AgvUtil;
 import org.nl.acs.agv.server.ZheDaAgvService;
 import org.nl.acs.agv.server.dto.AgvDto;
-import org.nl.acs.device_driver.basedriver.cargo_lift_conveyor.CargoLiftConveyorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.empty_vehicle_stacking_position.EmptyVehicleStackingPositionDeviceDriver;
-import org.nl.acs.device_driver.basedriver.hailiang_smart_plc_test.HailiangSmartplcTestDeviceDriver;
-import org.nl.acs.device_driver.basedriver.hongxiang_device.HongXiangConveyorDeviceDriver;
 import org.nl.acs.device_driver.basedriver.lubei_conveyor.LubeiConveyorDeviceDriver;
-import org.nl.acs.device_driver.basedriver.paint_conveyor.PaintConveyorDeviceDriver;
 import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
 import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver;
-import org.nl.acs.ext.wms.service.AcsToWmsService;
+import org.nl.acs.ext.wms.service.AcsToMesService;
-import org.nl.acs.ext.wms.service.AcsToWmsZDService;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.dto.Instruction;
 import org.nl.acs.log.LokiLog;
@@ -164,7 +158,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
             InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
             TaskService taskService = SpringContextHolder.getBean("taskServiceImpl");
 //            AcsToWmsService acsToWmsService=SpringContextHolder.getBean("acsToWmsServiceImpl");
-             AcsToWmsZDService acsToWmsZDService = SpringContextHolder.getBean("acsToWmsZDServiceImpl");
+             AcsToMesService acsToWmsZDService = SpringContextHolder.getBean("acsToWmsZDServiceImpl");
 
             Instruction inst = instructionService.findByCodeFromCache(jobno);
             TaskDto task = taskService.findByCode(inst.getTask_code());

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/lubei_conveyor/LubeiConveyorDeviceDriver.java

@@ -7,19 +7,14 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.acs.agv.server.AgvService;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
-import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
-import org.nl.acs.ext.wms.service.AcsToWmsService;
+import org.nl.acs.ext.wms.service.AcsToMesService;
-import org.nl.acs.ext.wms.service.AcsToWmsZDService;
-import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.dto.Instruction;
-import org.nl.acs.log.service.DeviceExecuteLogService;
 import org.nl.acs.monitor.DeviceStageMonitor;
 import org.nl.acs.opc.Device;
 import org.nl.acs.opc.DeviceAppService;
@@ -29,7 +24,6 @@ import org.nl.acs.route.service.RouteLineService;
 import org.nl.acs.route.service.dto.RouteLineDto;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
-import org.nl.modules.system.service.ParamService;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
@@ -56,7 +50,7 @@ public class LubeiConveyorDeviceDriver extends AbstractOpcDeviceDriver implement
     @Autowired
     TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl");
     @Autowired
-    AcsToWmsZDService acsToWmsZDService=SpringContextHolder.getBean(AcsToWmsZDService.class);
+    AcsToMesService acsToWmsZDService=SpringContextHolder.getBean(AcsToMesService.class);
     String container;
     String container_type_desc;
     String last_container_type_desc;

acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsZDController.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.acs.ext.wms.service.AcsToWmsZDService;
+import org.nl.acs.ext.wms.service.AcsToMesService;
 import org.nl.modules.logging.annotation.Log;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
@@ -16,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
-
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "wms接口")
@@ -26,7 +24,7 @@ import java.util.Map;
 @Lazy
 @SaIgnore
 public class AcsToWmsZDController {
-    private final AcsToWmsZDService acsToWmsZDService;
+    private final AcsToMesService acsToWmsZDService;
 
     @PostMapping("/feedbackTask")
     @Log("任务反馈")

acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToHJXService.java

@@ -3,10 +3,20 @@ package org.nl.acs.ext.wms.service;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
 
-import java.util.Map;
+import java.io.IOException;
 
-public interface AcsToWmsZDService {
+public interface AcsToHJXService {
 
+    /**
+     * 动作请求反馈
+     * @param jsonObject
+     */
+    HttpResponse actionRequest(JSONObject jsonObject) throws IOException;
+    /**
+     * 动作完成反馈
+     * @param jsonObject
+     */
+    HttpResponse actionFinish(JSONObject jsonObject) throws IOException;
 
     /**
      * 任务反馈
@@ -23,12 +33,4 @@ public interface AcsToWmsZDService {
      *
      */
     HttpResponse taskDeprecate(JSONObject whereJson);
-
-    /**
-     * 设备状态上传
-     *
-     *
-     * @return Map<String, Object>
-     */
-    HttpResponse deviceStatusUpdate(JSONObject whereJson);
 }

acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToMesService.java

@@ -3,20 +3,8 @@ package org.nl.acs.ext.wms.service;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
 
-import java.io.IOException;
-
 public interface AcsToMesService {
 
-    /**
-     * 动作请求反馈
-     * @param jsonObject
-     */
-    HttpResponse actionRequest(JSONObject jsonObject) throws IOException;
-    /**
-     * 动作完成反馈
-     * @param jsonObject
-     */
-    HttpResponse actionFinish(JSONObject jsonObject) throws IOException;
 
     /**
      * 任务反馈
@@ -33,4 +21,12 @@ public interface AcsToMesService {
      *
      */
     HttpResponse taskDeprecate(JSONObject whereJson);
+
+    /**
+     * 设备状态上传
+     *
+     *
+     * @return Map<String, Object>
+     */
+    HttpResponse deviceStatusUpdate(JSONObject whereJson);
 }

acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToHJXServiceImpl.java

@@ -0,0 +1,138 @@
+package org.nl.acs.ext.wms.service.impl;
+
+import cn.hutool.http.Header;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.AcsConfig;
+import org.nl.acs.device.address.service.AddressService;
+import org.nl.acs.device.address.service.dto.AddressDto;
+import org.nl.acs.ext.wms.service.AcsToHJXService;
+import org.nl.modules.lucene.service.LuceneExecuteLogService;
+import org.nl.modules.lucene.service.dto.LuceneLogDto;
+import org.nl.modules.system.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class AcsToHJXServiceImpl implements AcsToHJXService {
+
+    @Autowired
+    ParamService paramService;
+
+    @Autowired
+    AddressService addressService;
+
+    @Autowired
+    private LuceneExecuteLogService luceneLogService;
+
+    public String token;
+    @Override
+    public HttpResponse actionRequest(JSONObject jsonObject) throws IOException {
+        HttpResponse execute = null;
+        try {
+            String wmsurl = jsonObject.getString("url");
+            AddressDto addressDto = addressService.findByCode("actionRequest");
+            String url = wmsurl + addressDto.getMethods_url();
+            try {
+                execute = HttpRequest.post(url)
+                        .header(Header.USER_AGENT, "Hutool http")
+                        .header("Authorization", token)
+                        .body(String.valueOf(jsonObject))
+                        .execute();
+            } catch (Exception e) {
+                String msg = e.getMessage();
+                log.info("actionRequest-----输出参数{}", msg);
+                //网络不通
+                LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "actionRequest", String.valueOf(execute.getStatus()),
+                        String.valueOf(jsonObject),
+                        String.valueOf(execute.body()), jsonObject.getString("task_code") + "设备工位取货完成反馈失败");
+                luceneLogService.interfaceExecuteLog(luceneLogDto1);
+            }
+            log.info("actionRequest - 动作请求反馈{}", jsonObject);
+            LuceneLogDto luceneLogDto = new LuceneLogDto(4, "actionRequest", "",
+                    String.valueOf(jsonObject),
+                    "", jsonObject.getString("task_code") + "动作请求反馈");
+            luceneLogService.interfaceExecuteLog(luceneLogDto);
+        } catch (Exception e) {
+            LuceneLogDto luceneLogDto = new LuceneLogDto(4, "actionRequest", String.valueOf(execute.getStatus()),
+                    JSON.toJSONString(execute.body()),
+                    String.valueOf(execute.body()), jsonObject.getString("task_code") + "设备工位动作请求反馈失败");
+            luceneLogService.interfaceExecuteLog(luceneLogDto);
+        }
+        return execute;
+    }
+
+    @Override
+    public HttpResponse taskFeedback(JSONObject whereJson) {
+        String mesUrl = paramService.findByCode(AcsConfig.MESURL).getValue();
+        AddressDto addressDto = addressService.findByCode("feedAgvTaskStatus");
+        String methods_url = addressDto.getMethods_url();
+        String url = mesUrl + methods_url;
+        HttpResponse result = null;
+        log.info("feedAgvTaskStatus----请求参数{}", whereJson);
+        try {
+            result = HttpRequest.post(url)
+                    .body(String.valueOf(whereJson))
+                    .execute();
+            System.out.println(result);
+            log.info("feedAgvTaskStatus----返回参数{}", result);
+        } catch (Exception e) {
+            String msg = e.getMessage();
+            //网络不通
+            log.info("错误原因{}",msg);
+        }
+        return result;
+    }
+
+    @Override
+    public HttpResponse taskDeprecate(JSONObject whereJson) {
+        String mesUrl = paramService.findByCode(AcsConfig.MESURL).getValue();
+        AddressDto addressDto = addressService.findByCode("acsCancelBack");
+        String methods_url = addressDto.getMethods_url();
+        String url = mesUrl + methods_url;
+        HttpResponse result = null;
+        log.info("deprecateMesTask----请求参数{}", whereJson);
+        try {
+            result = HttpRequest.post(url)
+                    .body(String.valueOf(whereJson))
+                    .execute();
+            System.out.println(result);
+            log.info("deprecateMesTask----返回参数{}", result);
+        } catch (Exception e) {
+            String msg = e.getMessage();
+            //网络不通
+            //System.out.println(msg);
+        }
+        return result;
+    }
+
+    @Override
+    public HttpResponse actionFinish(JSONObject whereJson) throws IOException {
+        String wmsUrl = whereJson.getString("url");
+        AddressDto addressDto = addressService.findByCode("actionFinish");
+        String methods_url = addressDto.getMethods_url();
+        String url = wmsUrl + methods_url;
+        HttpResponse result = null;
+        log.info("actionFinish----请求参数{}", whereJson);
+        try {
+            result = HttpRequest.post(url)
+                    .body(String.valueOf(whereJson))
+                    .execute();
+            System.out.println(result);
+            log.info("actionFinish----返回参数{}", result);
+        } catch (Exception e) {
+            String msg = e.getMessage();
+            //网络不通
+            log.info("错误原因{}",msg);
+        }
+        return result;
+    }
+}

acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToMesServiceImpl.java

@@ -1,81 +1,53 @@
 package org.nl.acs.ext.wms.service.impl;
 
-import cn.hutool.http.Header;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.acs.AcsConfig;
 import org.nl.acs.device.address.service.AddressService;
 import org.nl.acs.device.address.service.dto.AddressDto;
+import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.ext.wms.service.AcsToMesService;
-import org.nl.modules.lucene.service.LuceneExecuteLogService;
+import org.nl.acs.opc.DeviceAppService;
-import org.nl.modules.lucene.service.dto.LuceneLogDto;
+import org.nl.config.server.AcsConfigService;
+import org.nl.modules.logging.service.LogService;
 import org.nl.modules.system.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.IOException;
-
 @Service
 @RequiredArgsConstructor
 @Slf4j
 public class AcsToMesServiceImpl implements AcsToMesService {
 
+    private final DeviceAppService deviceAppService;
     @Autowired
     ParamService paramService;
 
     @Autowired
-    AddressService addressService;
+    DeviceService deviceService;
 
     @Autowired
-    private LuceneExecuteLogService luceneLogService;
+    AddressService addressService;
+    @Autowired
+    AcsConfigService acsConfigService;
 
+    @Autowired
+    LogService logServer;
+
+    //@Value("${acsTowms.token}")
     public String token;
-    @Override
+    private String log_file_type="log_file_type";
-    public HttpResponse actionRequest(JSONObject jsonObject) throws IOException {
+    private String log_type="ACS请求LMS";
-        HttpResponse execute = null;
-        try {
-            String wmsurl = jsonObject.getString("url");
-            AddressDto addressDto = addressService.findByCode("actionRequest");
-            String url = wmsurl + addressDto.getMethods_url();
-            try {
-                execute = HttpRequest.post(url)
-                        .header(Header.USER_AGENT, "Hutool http")
-                        .header("Authorization", token)
-                        .body(String.valueOf(jsonObject))
-                        .execute();
-            } catch (Exception e) {
-                String msg = e.getMessage();
-                log.info("actionRequest-----输出参数{}", msg);
-                //网络不通
-                LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "actionRequest", String.valueOf(execute.getStatus()),
-                        String.valueOf(jsonObject),
-                        String.valueOf(execute.body()), jsonObject.getString("task_code") + "设备工位取货完成反馈失败");
-                luceneLogService.interfaceExecuteLog(luceneLogDto1);
-            }
-            log.info("actionRequest - 动作请求反馈{}", jsonObject);
-            LuceneLogDto luceneLogDto = new LuceneLogDto(4, "actionRequest", "",
-                    String.valueOf(jsonObject),
-                    "", jsonObject.getString("task_code") + "动作请求反馈");
-            luceneLogService.interfaceExecuteLog(luceneLogDto);
-        } catch (Exception e) {
-            LuceneLogDto luceneLogDto = new LuceneLogDto(4, "actionRequest", String.valueOf(execute.getStatus()),
-                    JSON.toJSONString(execute.body()),
-                    String.valueOf(execute.body()), jsonObject.getString("task_code") + "设备工位动作请求反馈失败");
-            luceneLogService.interfaceExecuteLog(luceneLogDto);
-        }
-        return execute;
-    }
 
     @Override
     public HttpResponse taskFeedback(JSONObject whereJson) {
-        String mesUrl = paramService.findByCode(AcsConfig.MESURL).getValue();
+        //TODO:改成中鼎
+        String wmsUrl = "10.10.188.151:8098";
         AddressDto addressDto = addressService.findByCode("feedAgvTaskStatus");
         String methods_url = addressDto.getMethods_url();
-        String url = mesUrl + methods_url;
+        String url = wmsUrl + methods_url;
         HttpResponse result = null;
         log.info("feedAgvTaskStatus----请求参数{}", whereJson);
         try {
@@ -94,18 +66,18 @@ public class AcsToMesServiceImpl implements AcsToMesService {
 
     @Override
     public HttpResponse taskDeprecate(JSONObject whereJson) {
-        String mesUrl = paramService.findByCode(AcsConfig.MESURL).getValue();
+        String wmsUrl = "10.10.188.151:8098";
         AddressDto addressDto = addressService.findByCode("acsCancelBack");
         String methods_url = addressDto.getMethods_url();
-        String url = mesUrl + methods_url;
+        String url = wmsUrl + methods_url;
         HttpResponse result = null;
-        log.info("deprecateMesTask----请求参数{}", whereJson);
+        log.info("deprecateWmsTask----请求参数{}", whereJson);
         try {
             result = HttpRequest.post(url)
                     .body(String.valueOf(whereJson))
                     .execute();
             System.out.println(result);
-            log.info("deprecateMesTask----返回参数{}", result);
+            log.info("deprecateWmsTask----返回参数{}", result);
         } catch (Exception e) {
             String msg = e.getMessage();
             //网络不通
@@ -115,24 +87,25 @@ public class AcsToMesServiceImpl implements AcsToMesService {
     }
 
     @Override
-    public HttpResponse actionFinish(JSONObject whereJson) throws IOException {
+    public HttpResponse deviceStatusUpdate(JSONObject whereJson) {
-        String wmsUrl = whereJson.getString("url");
+        String wmsUrl = "10.10.188.151:8098";
-        AddressDto addressDto = addressService.findByCode("actionFinish");
+        AddressDto addressDto = addressService.findByCode("deviceStatusUpdate");
         String methods_url = addressDto.getMethods_url();
         String url = wmsUrl + methods_url;
         HttpResponse result = null;
-        log.info("actionFinish----请求参数{}", whereJson);
+        log.info("deviceStatusUpdate", whereJson);
         try {
             result = HttpRequest.post(url)
                     .body(String.valueOf(whereJson))
                     .execute();
             System.out.println(result);
-            log.info("actionFinish----返回参数{}", result);
+            log.info("deviceStatusUpdate----返回参数{}", result);
         } catch (Exception e) {
             String msg = e.getMessage();
             //网络不通
-            log.info("错误原因{}",msg);
+            //System.out.println(msg);
         }
         return result;
     }
+
 }

acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsZDServiceImpl.java

@@ -1,125 +0,0 @@
-package org.nl.acs.ext.wms.service.impl;
-
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpResponse;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.acs.AcsConfig;
-import org.nl.acs.device.address.service.AddressService;
-import org.nl.acs.device.address.service.dto.AddressDto;
-import org.nl.acs.device.service.DeviceService;
-import org.nl.acs.ext.wms.service.AcsToWmsZDService;
-import org.nl.acs.opc.DeviceAppService;
-import org.nl.acs.route.service.RouteLineService;
-import org.nl.acs.route.service.dto.RouteLineDto;
-import org.nl.acs.task.service.TaskService;
-import org.nl.acs.task.service.dto.TaskDto;
-import org.nl.config.server.AcsConfigService;
-import org.nl.modules.logging.service.LogService;
-import org.nl.modules.system.service.ParamService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class AcsToWmsZDServiceImpl implements AcsToWmsZDService {
-
-    private final DeviceAppService deviceAppService;
-    @Autowired
-    ParamService paramService;
-
-    @Autowired
-    DeviceService deviceService;
-
-    @Autowired
-    AddressService addressService;
-    @Autowired
-    AcsConfigService acsConfigService;
-
-    @Autowired
-    LogService logServer;
-
-    //@Value("${acsTowms.token}")
-    public String token;
-    private String log_file_type="log_file_type";
-    private String log_type="ACS请求LMS";
-
-    @Override
-    public HttpResponse taskFeedback(JSONObject whereJson) {
-        //TODO:改成中鼎
-        String wmsUrl = "10.10.188.151:8098";
-        AddressDto addressDto = addressService.findByCode("feedAgvTaskStatus");
-        String methods_url = addressDto.getMethods_url();
-        String url = wmsUrl + methods_url;
-        HttpResponse result = null;
-        log.info("feedAgvTaskStatus----请求参数{}", whereJson);
-        try {
-            result = HttpRequest.post(url)
-                    .body(String.valueOf(whereJson))
-                    .execute();
-            System.out.println(result);
-            log.info("feedAgvTaskStatus----返回参数{}", result);
-        } catch (Exception e) {
-            String msg = e.getMessage();
-            //网络不通
-            log.info("错误原因{}",msg);
-        }
-        return result;
-    }
-
-    @Override
-    public HttpResponse taskDeprecate(JSONObject whereJson) {
-        String wmsUrl = "10.10.188.151:8098";
-        AddressDto addressDto = addressService.findByCode("acsCancelBack");
-        String methods_url = addressDto.getMethods_url();
-        String url = wmsUrl + methods_url;
-        HttpResponse result = null;
-        log.info("deprecateWmsTask----请求参数{}", whereJson);
-        try {
-            result = HttpRequest.post(url)
-                    .body(String.valueOf(whereJson))
-                    .execute();
-            System.out.println(result);
-            log.info("deprecateWmsTask----返回参数{}", result);
-        } catch (Exception e) {
-            String msg = e.getMessage();
-            //网络不通
-            //System.out.println(msg);
-        }
-        return result;
-    }
-
-    @Override
-    public HttpResponse deviceStatusUpdate(JSONObject whereJson) {
-        String wmsUrl = "10.10.188.151:8098";
-        AddressDto addressDto = addressService.findByCode("deviceStatusUpdate");
-        String methods_url = addressDto.getMethods_url();
-        String url = wmsUrl + methods_url;
-        HttpResponse result = null;
-        log.info("deviceStatusUpdate", whereJson);
-        try {
-            result = HttpRequest.post(url)
-                    .body(String.valueOf(whereJson))
-                    .execute();
-            System.out.println(result);
-            log.info("deviceStatusUpdate----返回参数{}", result);
-        } catch (Exception e) {
-            String msg = e.getMessage();
-            //网络不通
-            //System.out.println(msg);
-        }
-        return result;
-    }
-
-}

acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java

@@ -10,9 +10,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
-import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
 import org.nl.acs.AcsConfig;
 import org.nl.acs.agv.server.XianGongAgvService;
 import org.nl.acs.auto.initial.ApplicationAutoInitial;
@@ -21,23 +19,21 @@ import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device.service.StorageCellService;
 import org.nl.acs.device.service.dto.DeviceAssignedDto;
 import org.nl.acs.device.service.impl.DeviceServiceImpl;
-import org.nl.acs.ext.wms.service.AcsToMesService;
+import org.nl.acs.ext.wms.service.AcsToHJXService;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
-import org.nl.acs.ext.wms.service.AcsToWmsZDService;
+import org.nl.acs.ext.wms.service.AcsToMesService;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.dto.Instruction;
 import org.nl.acs.instruction.service.dto.InstructionDto;
 import org.nl.acs.opc.Device;
 import org.nl.acs.opc.DeviceAppService;
 import org.nl.acs.opc.DeviceAppServiceImpl;
-import org.nl.acs.opc.DeviceType;
 import org.nl.acs.route.service.RouteLineService;
 import org.nl.acs.route.service.dto.RouteLineDto;
 import org.nl.acs.task.TaskInstructionLock;
 import org.nl.acs.task.service.TaskFeedbackService;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
-import org.nl.acs.task.service.dto.TaskFeedbackDto;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.common.utils.FileUtil;
 import org.nl.modules.common.utils.SecurityUtils;
@@ -57,7 +53,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -80,9 +75,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
     @Autowired
     AcsToWmsService acstowmsService;
     @Autowired
-    AcsToWmsZDService acsToWmsZDService;
+    AcsToMesService acsToWmsZDService;
     @Autowired
-    private AcsToMesService acsToMesService;
+    private AcsToHJXService acsToMesService;
     @Autowired
     TaskFeedbackService taskFeedbackService;
     @Autowired

acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/NdcDeviceStatusUpdate.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.acs.ext.wms.service.AcsToWmsZDService;
+import org.nl.acs.ext.wms.service.AcsToMesService;
 import org.nl.acs.opc.Device;
 import org.nl.acs.opc.DeviceAppService;
 import org.nl.acs.opc.DeviceType;
@@ -18,7 +18,7 @@ public class NdcDeviceStatusUpdate {
     @Autowired
     DeviceAppService deviceAppService;
     @Autowired
-    AcsToWmsZDService acsToWmsZDService;
+    AcsToMesService acsToWmsZDService;
 
         public void run() throws Exception {
             JSONObject row = new JSONObject();

acs/nladmin-system/src/main/resources/config/application-dev.yml

@@ -7,7 +7,7 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3307}/${DB_NAME:gaosheng_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:gaosheng_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl5q}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
       # 初始连接数

acs/nladmin-system/src/main/resources/config/application-prod.yml

@@ -6,7 +6,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:10.4.46.150}:${DB_PORT:3306}/${DB_NAME:gaosheng_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:10.4.46.150}:${DB_PORT:3306}/${DB_NAME:hl5q}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
       # 初始连接数

acs/nladmin-system/src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data:

acs/nladmin-system/src/main/resources/log/AcsToZDWms.xml

@@ -27,7 +27,7 @@
       </logger>-->
 
     <!-- 打印sql -->
-    <logger name="org.nl.acs.ext.wms.service.impl.AcsToWmsZDServiceImpl" level="info" additivity="false">
+    <logger name="org.nl.acs.ext.wms.service.impl.AcsToMesServiceImpl" level="info" additivity="false">
         <appender-ref ref="FILE12"/>
     </logger>
 </included>