From c3b3a24f6064ad1868f28a77115053a74c6d6017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Wed, 27 Sep 2023 09:35:02 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=8E=8B=E6=9C=BA=E5=8F=AB=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hf_station/HfStationDeviceDriver.java | 3 +++ .../acs/ext/wms/service/AcsToWmsService.java | 2 ++ .../wms/service/impl/AcsToWmsServiceImpl.java | 23 +++++++++++++++++++ .../wms/ext/acs/rest/AcsToWmsController.java | 8 +++++++ .../wms/ext/acs/service/AcsToWmsService.java | 2 ++ .../acs/service/impl/AcsToWmsServiceImpl.java | 10 ++++++++ 6 files changed, 48 insertions(+) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java index ad1808a..93e34a3 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java @@ -192,6 +192,9 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De order = this.itemProtocol.getOrder(); if (mode != last_mode) { + if ("true".equals(this.getExtraValue().get("ignore_release_check"))) { + acsToWmsService.deactivatePoint(this.device_code, mode != 0); + } if (mode == 3) { this.setRequireSucess(false); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java index bbf48bc..3b14669 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java @@ -69,4 +69,6 @@ public interface AcsToWmsService { */ JSONObject findVehicle(JSONObject param); + void deactivatePoint(String deviceCode, boolean isUsed); + } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index ae6ca7e..a039a81 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -16,6 +16,7 @@ import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.task.service.TaskService; import org.nl.modules.system.service.ParamService; +import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -247,4 +248,26 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } } + @Override + public void deactivatePoint(String deviceCode, boolean isUsed) { + String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); + + JSONObject param = new JSONObject(); + param.put("device_code", deviceCode); + param.put("is_used", isUsed); + log.info("deactivatePoint - 请求参数 {}", param); + AddressDto addressDto = addressService.findByCode("deactivatePoint"); + String methods_url = addressDto.getMethods_url(); + try { + HttpResponse response = HttpRequest + .post(wmsurl + methods_url) + .timeout(2000) + .body(param.toJSONString()) + .execute(); + log.info("deactivatePoint - 响应参数 {}", response.body()); + } catch (Exception e) { + log.error("deactivatePoint - 请求错误！", e); + } + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 6b86fdd..66a1e24 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -107,4 +107,12 @@ public class AcsToWmsController { public ResponseEntity updateKiln(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(acsToWmsService.updateKiln(whereJson), HttpStatus.OK); } + + @PostMapping("/deactivatePoint") + @Log("禁用或启用点位") + @ApiOperation("禁用或启用点位") + @SaIgnore + public void deactivatePoint(@RequestBody JSONObject param) { + acsToWmsService.deactivatePoint(param); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index 334082b..3fb5dc2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -95,4 +95,6 @@ public interface AcsToWmsService { */ JSONObject updateKiln(JSONObject whereJson); + void deactivatePoint(JSONObject param); + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 0d804c1..19250b0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -631,4 +631,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return resp; } + + public void deactivatePoint(JSONObject param) { + String pointCode = param.getString("device_code"); + if (StrUtil.isNotBlank(pointCode)) { + JSONObject update = new JSONObject(); + update.put("is_used", param.getBooleanValue("is_used") ? "1" : "0"); + update.put("update_time", DateUtil.now()); + WQLObject.getWQLObject("sch_base_point").update(update, "point_code = '" + pointCode + "'"); + } + } }