From 863094a9faa0eb08483ee6374b4dc9e128186003 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Fri, 16 Jan 2026 09:57:37 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/acs/agv/QueryAGVStatus.java | 39 +++++--- .../agv/server/impl/KeCongAgvServiceImpl.java | 90 ++++++++++++------- .../run/TwoNDCSocketConnectionAutoRun.java | 1 - .../service/impl/DeviceServiceImpl.java | 74 +++++++-------- .../device_driver/driver/OpcDeviceDriver.java | 6 ++ .../raster/RasterDeviceDriver.java | 7 -- .../acs/ext/wms/service/AcsToWmsService.java | 2 + .../wms/service/impl/AcsToWmsServiceImpl.java | 36 ++++++++ .../service/impl/InstructionServiceImpl.java | 8 +- .../acs/opc/DeviceOpcSynchronizeAutoRun.java | 70 +++++++-------- .../service/quartz/task/AutoCreateInst.java | 10 +-- 11 files changed, 206 insertions(+), 137 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java index d1d80cf..b103288 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java @@ -15,6 +15,7 @@ import org.nl.acs.agv.server.dao.AgvResponse; import org.nl.acs.device.domain.Device; import org.nl.acs.device_driver.agv.xg_agv_car.XgAgvCarDeviceDriver; import org.nl.acs.instruction.domain.Instruction; +import org.nl.acs.instruction.enums.InstructionStatusEnum; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.task.domain.Task; @@ -47,8 +48,9 @@ public class QueryAGVStatus { TaskService taskService = SpringContextHolder.getBean(TaskService.class); ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); List allInstFromCache = instructionService.findAllInstFromCache(); + List instructionList = allInstFromCache.stream().filter(item -> Integer.parseInt(item.getInstruction_status()) <= Integer.parseInt(InstructionStatusEnum.BUSY.getIndex())).collect(Collectors.toList()); // List agvInstruction = allInstFromCache.stream().filter(item -> AgvSystemTypeEnum.One_NDC_System_Type.getIndex().equals(item.getAgv_system_type()) || AgvSystemTypeEnum.XG_System_Type.getIndex().equals(item.getAgv_system_type())).collect(Collectors.toList()); - if (CollUtil.isEmpty(allInstFromCache) || allInstFromCache.size() < 1) { + if (CollUtil.isEmpty(instructionList) || instructionList.size() < 1) { return; } for (Instruction instruction : allInstFromCache) { @@ -57,31 +59,38 @@ public class QueryAGVStatus { JSONObject param = new JSONObject(); agvurl = agvurl + ":" + agvport + "/api/fms/taskStatus "; param.put("TaskNo", instruction.getInstruction_code()); - log.info("根据运单号查询运单状态的请求:{}", agvurl); + log.info("根据运单号查询运单状态的请求:{}", agvurl+ param); HttpResponse result = HttpRequest.get(agvurl) .body(String.valueOf(param)) .timeout(20000)//超时，毫秒 .execute(); - log.info("根据运单号查询运单状态的请求反馈:{}", result); + log.info("指令号:"+instruction.getInstruction_code()+"根据运单号查询运单状态的请求反馈:{}", result); + if (result == null) { + continue; + } String body = result.body(); JSONObject json = JSONObject.parseObject(body); JSONObject taskStatus = json.getJSONObject("TaskStatus"); String instructionCode = taskStatus.getString("TaskNo"); + if (instructionCode == null) { + continue; + } if ("true".equals(json.getString("Result")) && instructionCode.equals(instruction.getInstruction_code())) { // 正在执行=running， // 完成=finish， // 失败=failed(主动失败)， // 终止=aborted(被人为终止)， String state = json.getString("Status"); - String carNo = json.getString("VehicleNo"); - if ("running".equals(state)) { - TaskDto task = taskService.findById(instruction.getTask_id()); - if ("0".equals(instruction.getInstruction_status())&&"1".equals(task.getTask_status())) { - instruction.setCarno(carNo); + TaskDto task = taskService.findById(instruction.getTask_id()); + if (!StrUtil.isEmpty(json.getString("VehicleNo"))) { + String carNo = json.getString("VehicleNo"); + instruction.setCarno(carNo); + task.setCar_no(carNo); + } + if ("running".equals(state)||"idle".equals(state)) { + if ("0".equals(instruction.getInstruction_status())) { instruction.setInstruction_status("1"); instructionService.update(instruction); - instructionService.update(instruction); - task.setCar_no(carNo); task.setTask_id(instruction.getTask_id()); taskService.update(task); } @@ -96,13 +105,15 @@ public class QueryAGVStatus { e.printStackTrace(); } } - } else if ("failed".equals(state) || "aborted".equals(state)) { - TaskDto task = taskService.findById(instruction.getTask_id()); + } else if ("failed".equals(state) || "aborted".equals(state) || "deleted".equals(state)) { + TaskDto taskDto = taskService.findById(instruction.getTask_id()); List list = Arrays.asList("0", "1"); - if (list.contains(instruction.getInstruction_status())&&"1".equals(task.getTask_status())) { - instruction.setInstruction_status("1"); + if (list.contains(instruction.getInstruction_status())) { + instruction.setInstruction_status("3"); instruction.setRemark("调度取消指令"); instructionService.update(instruction); + taskDto.setRemark("调度取消指令"); + taskService.update(taskDto); } } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/KeCongAgvServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/KeCongAgvServiceImpl.java index 08328c0..e842e28 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/KeCongAgvServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/KeCongAgvServiceImpl.java @@ -285,7 +285,7 @@ public class KeCongAgvServiceImpl implements KeCongAgvService { .build(); logDto2.setLog_level(4); //二次分配更新点位 - updataTask(inst, type,jo.getString("data")); + updataTask(inst, type, jo.getString("data")); return jo.getString("data"); } else { LuceneLogDto logDto2 = LuceneLogDto.builder() @@ -318,18 +318,18 @@ public class KeCongAgvServiceImpl implements KeCongAgvService { String vehicleNo = requestParam.getString("VehicleNo"); LuceneLogDto logDto1 = LuceneLogDto.builder() .device_code(vehicleNo) - .content("agv申请进入或者离开,请求参数:"+ requestParam) + .content("agv申请进入或者离开,请求参数:" + requestParam) .build(); logDto1.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto1); - if (resourceID.equals("659") || resourceID.equals("17")) { + if (resourceID.equals("10")) { JSONObject json = new JSONObject(); json.put("code", "200"); json.put("message", "操作成功"); - log.info("agv申请离开成功，返回参数："+ json); + log.info("agv申请离开成功，返回参数：" + json); LuceneLogDto logDto2 = LuceneLogDto.builder() .device_code(vehicleNo) - .content("agv申请离开成功，返回参数："+ json) + .content("agv申请离开成功，返回参数：" + json) .build(); logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); @@ -369,7 +369,7 @@ public class KeCongAgvServiceImpl implements KeCongAgvService { } } - private void updataTask(Instruction instructionDto,String type, String newPoint) { + private void updataTask(Instruction instructionDto, String type, String newPoint) { TaskDto taskUpdate = new TaskDto(); if ("1".equals(type)) { @@ -396,23 +396,26 @@ public class KeCongAgvServiceImpl implements KeCongAgvService { String vehicleNo = requestParam.getString("VehicleNo"); LuceneLogDto logDto1 = LuceneLogDto.builder() .device_code(vehicleNo) - .content("agv申请离开,请求参数:"+ requestParam) + .content("agv申请离开请求参数:" + requestParam) .build(); logDto1.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto1); - Device device = deviceAppService.findDeviceByCode(resourceID); - RasterDeviceDriver rasterDeviceDriver = (RasterDeviceDriver) device.getDeviceDriver(); - rasterDeviceDriver.setOption(1); - JSONObject jo = new JSONObject(); - jo.put("code", "200"); - jo.put("message", "请求成功"); + List storageCells = storageCellMapper.selectList(new LambdaQueryWrapper().eq(StorageCell::getAddress, resourceID).orderByDesc(StorageCell::getUpdate_time)); + StorageCell storageCell = storageCells.get(0); + if (storageCell == null) { + throw new BadRequestException("未找到该设备"); + } + JSONObject json = new JSONObject(); + json.put("code", "200"); + json.put("message", "操作成功"); + log.info("agv申请离开成功，返回agv参数:" + json); LuceneLogDto logDto2 = LuceneLogDto.builder() .device_code(vehicleNo) - .content("agv申请离开成功，返回agv参数:" + jo) + .content("agv申请离开成功，返回agv参数:" + json) .build(); logDto2.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto2); - return jo; + return json; } @Override @@ -444,7 +447,7 @@ public class KeCongAgvServiceImpl implements KeCongAgvService { .execute(); log.info("暂停agv请求反馈:{}", result); return result; - }else { + } else { return null; } } else { @@ -480,7 +483,7 @@ public class KeCongAgvServiceImpl implements KeCongAgvService { log.info("恢复所有agv请求反馈:{}", result); return result; - }else { + } else { return null; } } else { @@ -495,23 +498,48 @@ public class KeCongAgvServiceImpl implements KeCongAgvService { String vehicleNo = requestParam.getString("VehicleNo"); LuceneLogDto logDto1 = LuceneLogDto.builder() .device_code(vehicleNo) - .content("agv申请进入,请求参数:"+ requestParam) + .content("agv申请进入请求参数:" + requestParam) .build(); logDto1.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto1); - Device device = deviceAppService.findDeviceByCode(resourceID); - RasterDeviceDriver rasterDeviceDriver = (RasterDeviceDriver) device.getDeviceDriver(); - rasterDeviceDriver.setOption(1); - JSONObject jo = new JSONObject(); - jo.put("code", "200"); - jo.put("message", "请求成功"); - LuceneLogDto logDto2 = LuceneLogDto.builder() - .device_code(vehicleNo) - .content("agv申请进入成功，返回agv参数:" + jo) - .build(); - logDto2.setLog_level(4); - luceneExecuteLogService.deviceExecuteLog(logDto2); - return jo; + List storageCells = storageCellMapper.selectList(new LambdaQueryWrapper().eq(StorageCell::getAddress, resourceID).orderByDesc(StorageCell::getUpdate_time)); + StorageCell storageCell = storageCells.get(0); + if (storageCell == null) { + throw new RuntimeException("设备不存在"); + } + String storage_code = storageCell.getStorage_code(); + Device device = deviceAppService.findDeviceByCode(storage_code); + if (device == null) { + throw new RuntimeException("设备不存在"); + } + String lamd_device = device.getExtraValue().get("link_three_lamp").toString(); + Device linkDevice = deviceAppService.findDeviceByCode(lamd_device); + RasterDeviceDriver rasterDeviceDriver = (RasterDeviceDriver) linkDevice.getDeviceDriver(); + if (rasterDeviceDriver.getRaster() == 1) { + JSONObject json = new JSONObject(); + json.put("code", "200"); + json.put("message", "操作成功"); + log.info("agv申请进入成功，返回agv参数:" + json); + LuceneLogDto logDto2 = LuceneLogDto.builder() + .device_code(vehicleNo) + .content("agv申请进入成功，当前光电信号为："+rasterDeviceDriver.getRaster()+",返回agv参数:" + json) + .build(); + logDto2.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto2); + return json; + } else { + JSONObject json = new JSONObject(); + json.put("code", "400"); + json.put("message", "申请进入失败，光电信号不为1，当前信号为：" + rasterDeviceDriver.getRaster()); + log.info("agv申请进入失败，返回agv参数:" + json); + LuceneLogDto logDto2 = LuceneLogDto.builder() + .device_code(vehicleNo) + .content("agv申请进入失败，光电信号不为1，当前信号为：" + rasterDeviceDriver.getRaster()+"，返回agv参数:" + json) + .build(); + logDto2.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto2); + return json; + } } @Override diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java index fe8c323..f6e35c3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java @@ -127,7 +127,6 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable { } break; } - int[] arr = new int[count]; StringBuffer bs = new StringBuffer(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index e7ca314..c7dfcfc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -31,6 +31,10 @@ import org.nl.acs.route.domain.RouteLine; import org.nl.acs.route.service.mapper.RouteLineMapper; import org.nl.acs.storage_cell.domain.StorageCell; import org.nl.acs.storage_cell.service.mapper.StorageCellMapper; +import org.nl.acs.udw.UnifiedData; +import org.nl.acs.udw.UnifiedDataAccessorFactory; +import org.nl.acs.udw.dto.UdwDto; +import org.nl.acs.udw.service.impl.UnifiedDataUnit; import org.nl.acs.utils.ConvertUtil; import org.nl.acs.utils.PageUtil; import org.nl.acs.utils.ReadUtil; @@ -390,20 +394,15 @@ public class DeviceServiceImpl extends CommonServiceImpl i log.info("设备删除成功!"); if (deviceByCode != null) { - if (StrUtil.equals("storage", deviceByCode.getDeviceDriverDefination().getFitDeviceTypes().get(0).name())) { -// storageTab.delete("substring_index( storage_code,'-',1)= '" + device_code + "'"); - storageCellMapper.deleteByStorageCode(device_code); - } else { // JSONObject data = storageTab.query("storage_code ='" + device_code + "'").uniqueResult(0); - StorageCell storageCell = new LambdaQueryChainWrapper<>(storageCellMapper) - .eq(StorageCell::getStorage_code, device_code) - .one(); - if (storageCell != null) { + StorageCell storageCell = new LambdaQueryChainWrapper<>(storageCellMapper) + .eq(StorageCell::getStorage_code, device_code) + .one(); + if (storageCell != null) { // storageTab.delete("storage_code = '" + device_code + "'"); - Map map = new HashMap<>(); - map.put("storage_code", device_code); - storageCellMapper.deleteByMap(map); - } + Map map = new HashMap<>(); + map.put("storage_code", device_code); + storageCellMapper.deleteByMap(map); } } // wo.delete("device_id = '" + device_id + "'"); @@ -993,7 +992,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i standardInspectSiteDeviceDriver.setBatch(batch); device.setMaterial_type(material_type); device.setBatch(batch); - }else if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { + } else if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { BeltConveyorDeviceDriver beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) device.getDeviceDriver(); beltConveyorDeviceDriver.setDeviceStatus(form); } @@ -1262,29 +1261,24 @@ public class DeviceServiceImpl extends CommonServiceImpl i @Override public JSONArray testRead(Map map) { List dbItems = (List) map.get("dbItems"); - String opc_id = (String) map.get("opc_id"); - - List itemString = new ArrayList(); - - for (int i = 0; i < dbItems.size(); i++) { - Object ob = dbItems.get(i); - JSONObject json = (JSONObject) JSONObject.toJSON(ob); - itemString.add(json.getString("code")); - - } - Server server = ReadUtil.getServer(opc_id); - final Map readList = ReadUtil.read(itemString, server); - + Object ob = dbItems.get(0); + JSONObject json = (JSONObject) JSONObject.toJSON(ob); + String code = json.getString("code"); + String unified_key = "opc_value"; + UnifiedDataUnit unifiedDataUnit = UnifiedDataAccessorFactory.getUnifiedDataAppService().getUnifiedDataUnit(unified_key); + String key; + Map storage; + Iterator var14; + storage = unifiedDataUnit.getStorage(); + var14 = storage.keySet().iterator(); JSONArray result = new JSONArray(); - for (int i = 0; i < dbItems.size(); i++) { - Object ob = dbItems.get(i); - JSONObject json = (JSONObject) JSONObject.toJSON(ob); - String code = json.getString("code"); - if (readList.containsKey(code)) { - json.put("dbr_value", readList.get(code)); + JSONObject jo = new JSONObject(); + while (var14.hasNext()) { + key = (String) var14.next(); + if (code.equals(key)) { + json.put("dbr_value", ((Boolean) ((UnifiedData) storage.get(key)).getValue()).booleanValue() ? 1 : 0); + result.add(json); } - result.add(json); - } return result; } @@ -1865,13 +1859,13 @@ public class DeviceServiceImpl extends CommonServiceImpl i String in_device_name = null; String en_device_name = null; String zh_device_name = null; - if(list.size() > 6 && ObjectUtil.isNotEmpty(list.get(6))){ + if (list.size() > 6 && ObjectUtil.isNotEmpty(list.get(6))) { in_device_name = list.get(6).toString(); } - if(list.size() > 7 && ObjectUtil.isNotEmpty(list.get(7))){ + if (list.size() > 7 && ObjectUtil.isNotEmpty(list.get(7))) { en_device_name = list.get(7).toString(); } - if(list.size() > 8 && ObjectUtil.isNotEmpty(list.get(8))){ + if (list.size() > 8 && ObjectUtil.isNotEmpty(list.get(8))) { zh_device_name = list.get(8).toString(); } @@ -1894,13 +1888,13 @@ public class DeviceServiceImpl extends CommonServiceImpl i if (ObjectUtil.isNotEmpty(dto)) { continue; } - if(StrUtil.isEmpty(zh_device_name)){ + if (StrUtil.isEmpty(zh_device_name)) { zh_device_name = StrUtil.isNotEmpty(device_name) ? device_name : device_code; } - if(StrUtil.isEmpty(en_device_name)){ + if (StrUtil.isEmpty(en_device_name)) { en_device_name = StrUtil.isNotEmpty(device_name) ? device_name : device_code; } - if (StrUtil.isEmpty(in_device_name)){ + if (StrUtil.isEmpty(in_device_name)) { in_device_name = StrUtil.isNotEmpty(device_name) ? device_name : device_code; } //按照列获取 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java index 5d79db4..95bb2ce 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java @@ -116,6 +116,12 @@ public interface OpcDeviceDriver extends DeviceDriver { return ((Short) value).intValue(); } else if (value instanceof Number) { return ((Number) value).intValue(); + } else if (value instanceof Boolean) { + if (((Boolean) value).booleanValue()) { + return Integer.valueOf(1); + } else { + return Integer.valueOf(0); + } } throw new ClassCastException("Cannot cast " + value.getClass().getName() + " to Integer"); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/raster/RasterDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/raster/RasterDeviceDriver.java index 1433975..363f6f0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/raster/RasterDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/raster/RasterDeviceDriver.java @@ -61,13 +61,6 @@ public class RasterDeviceDriver extends AbstractOpcDeviceDriver implements Devic if (this.raster != this.last_raster) { logService.deviceExecuteLog(new LuceneLogDto(this.device_code, "自动线程读取信号: 光栅信号,由" + this.last_raster + "->" + this.raster)); } - - if (this.raster == 1) { - keCongAgvService.pause(device_code); - } - if (this.raster == 0) { - keCongAgvService.resume(device_code); - } last_raster = raster; } 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 4cd231e..aff1aba 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 @@ -227,4 +227,6 @@ public interface AcsToWmsService { ManipulatorApplyPointResponse manipulatorApplyPointRequest(ManipulatorApplyPointRequest param); String applyIn(JSONObject ja); + + String applyOut(JSONObject ja); } 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 8e77bdf..e3ea3f5 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 @@ -770,6 +770,42 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } } + @Override + public String applyOut(JSONObject param) { + try { + MDC.put(log_file_type, log_type); + log.info("applyOut-----agv申请进入,请求lms参数{}", param); + String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); + AddressDto addressDto = addressService.findByCode("applyOut"); + String url = wmsurl + addressDto.getMethods_url(); + HttpResponse result2 = null; + try { + result2 = HttpRequest.post(url) + .addInterceptor(tLogHutoolhttpInterceptor) + .header(Header.USER_AGENT, "Hutool http") + .header("Authorization", token) + .body(String.valueOf(param)) + .execute(); + } catch (Exception e) { + String msg = e.getMessage(); + log.info("applyOut-----输出参数{}", msg); + //网络不通 + } + if (ObjectUtil.isEmpty(result2)) { + log.info("applyOut-----输出参数{}", "返回结果为空"); + return null; + } + log.info("applyOut-----agv申请离开,lms返回参数{}", result2.body()); + LuceneLogDto luceneLogDto = new LuceneLogDto(4, "applyOut", String.valueOf(result2.getStatus()), + JSON.toJSONString(param), String.valueOf(result2.body()), "agv申请离开"); + luceneLogService.interfaceExecuteLog(luceneLogDto); + return result2.body(); + + } finally { + MDC.remove(log_file_type); + } + } + @Override public String forceMove(JSONObject param) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index d19cc9c..7885a14 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -504,10 +504,10 @@ public class InstructionServiceImpl extends CommonServiceImpl byCodeAndExcute = this.findByNextCode(task_code,dto.getNext_device_code()); - if (CollUtil.isNotEmpty(byCodeAndExcute)) { - throw new BadRequestException("存在相同终点的任务，无法生成指令"); - } +// List byCodeAndExcute = this.findByNextCode(task_code,dto.getNext_device_code()); +// if (CollUtil.isNotEmpty(byCodeAndExcute)) { +// throw new BadRequestException("存在相同终点的任务，无法生成指令"); +// } String start_device_code = dto.getStart_device_code(); // if (StrUtil.isNotEmpty(dto.getTask_code())) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java index 69ee0c4..c7c56d6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java @@ -55,41 +55,41 @@ public class DeviceOpcSynchronizeAutoRun extends AbstractAutoRunnable { @Override public void autoRun() throws Exception { - { - //Thread.sleep(10000L); - isRun = true; - - Map servers = this.opcServerManageService.queryAllServerMap(); - Map>> pros; - do { - Thread.sleep(1000L); - pros = this.deviceAppService.findAllFormatProtocolFromDriver(); - } while (ObjectUtil.isEmpty(pros)); - Set keys = pros.keySet(); - Iterator var4 = keys.iterator(); - //代码执行一次 - while (var4.hasNext()) { - String key = (String) var4.next(); - List> list = (List) pros.get(key); - OpcServerManageDto opcServer = (OpcServerManageDto) servers.get(key); - Iterator var8 = list.iterator(); - while (var8.hasNext()) { - List groupProtols = (List) var8.next(); - DeviceOpcProtocolRunable runable = new DeviceOpcProtocolRunable(); - runable.setProtocols(groupProtols); - runable.setOpcServer(opcServer); - this.executorService.submit(runable); - } - } - - // 同步无光电设备信号 - //Map>> pros1 = this.deviceAppService.findAllFormatProtocolFromDriver(); - //List opcDrivers = this.deviceAppService.findDeviceDriver(DeviceDriver.class); - - while (true) { - Thread.sleep(3000L); - } - } +// { +// //Thread.sleep(10000L); +// isRun = true; +// +// Map servers = this.opcServerManageService.queryAllServerMap(); +// Map>> pros; +// do { +// Thread.sleep(1000L); +// pros = this.deviceAppService.findAllFormatProtocolFromDriver(); +// } while (ObjectUtil.isEmpty(pros)); +// Set keys = pros.keySet(); +// Iterator var4 = keys.iterator(); +// //代码执行一次 +// while (var4.hasNext()) { +// String key = (String) var4.next(); +// List> list = (List) pros.get(key); +// OpcServerManageDto opcServer = (OpcServerManageDto) servers.get(key); +// Iterator var8 = list.iterator(); +// while (var8.hasNext()) { +// List groupProtols = (List) var8.next(); +// DeviceOpcProtocolRunable runable = new DeviceOpcProtocolRunable(); +// runable.setProtocols(groupProtols); +// runable.setOpcServer(opcServer); +// this.executorService.submit(runable); +// } +// } +// +// // 同步无光电设备信号 +// //Map>> pros1 = this.deviceAppService.findAllFormatProtocolFromDriver(); +// //List opcDrivers = this.deviceAppService.findDeviceDriver(DeviceDriver.class); +// +// while (true) { +// Thread.sleep(3000L); +// } +// } } @Override diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java index 103e08a..f189e75 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java @@ -105,11 +105,11 @@ public class AutoCreateInst { continue; } //判断是否存在到同一个等待点的任务 - List byCodeAndExcute = instructionService.findByNextCode(taskcode,next_device_code); - if (CollUtil.isNotEmpty(byCodeAndExcute)) { - log.info("存在相同等待点的任务，无法生成指令"); - continue; - } +// List byCodeAndExcute = instructionService.findByNextCode(taskcode,next_device_code); +// if (CollUtil.isNotEmpty(byCodeAndExcute)) { +// log.info("存在相同等待点的任务，无法生成指令"); +// continue; +// } // RouteLineDto routeLineDto = shortPathsList.get(0); // String path = routeLineDto.getPath();