From d337ed888a60d2ab16927bf3a3a146e18c1277a4 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Mon, 26 Jan 2026 14:19:35 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/agv/server/ZheDaAgvService.java | 4 +- .../agv/server/impl/ZheDaAgvServiceImpl.java | 4 +- .../address/rest/AddressController.java | 6 + .../address/service/AddressService.java | 3 + .../service/impl/AddressServiceImpl.java | 23 +- .../agv/ndcone/AgvNdcOneDeviceDriver.java | 458 +++--------------- .../acs/ext/wms/rest/MesToAcsController.java | 8 +- .../ext/wms/rest/WmsZDToAcsController.java | 8 +- .../acs/ext/wms/service/AcsToMesService.java | 8 +- .../ext/wms/service/AcsToZDWmsService.java | 6 +- .../acs/ext/wms/service/MesToAcsService.java | 7 +- .../ext/wms/service/WmsZDToAcsService.java | 7 +- .../wms/service/impl/AcsToHJXServiceImpl.java | 21 +- .../wms/service/impl/AcsToMesServiceImpl.java | 27 +- .../service/impl/AcsToZDWmsServiceImpl.java | 27 +- .../wms/service/impl/MesToAcsServiceImpl.java | 23 +- .../service/impl/WmsZDToAcsServiceImpl.java | 23 +- .../modules/lucene/rest/LuceneController.java | 23 +- .../modules/lucene/service/LuceneService.java | 2 + .../service/impl/LuceneServiceImpl.java | 44 +- .../resources/log/AcsToHJXServiceImpl.xml | 33 ++ .../resources/log/AcsToMesServiceImpl.xml | 2 +- .../resources/log/MesToAcsServiceImpl.xml | 2 +- .../resources/log/WmsZDToAcsServiceImpl.xml | 2 +- acs/nladmin-ui/src/api/acs/Address.js | 9 +- .../src/views/monitor/logQuery/index.vue | 146 ++++++ .../src/views/monitor/logQuery/search.vue | 125 +++++ 27 files changed, 608 insertions(+), 443 deletions(-) create mode 100644 acs/nladmin-system/src/main/resources/log/AcsToHJXServiceImpl.xml create mode 100644 acs/nladmin-ui/src/views/monitor/logQuery/index.vue create mode 100644 acs/nladmin-ui/src/views/monitor/logQuery/search.vue diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/ZheDaAgvService.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/ZheDaAgvService.java index 791cadd..b5d3253 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/ZheDaAgvService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/ZheDaAgvService.java @@ -4,6 +4,8 @@ package org.nl.acs.agv.server; import cn.hutool.http.HttpResponse; import org.nl.acs.instruction.service.dto.Instruction; +import java.io.IOException; + /** * 浙大AGV服务 */ @@ -29,7 +31,7 @@ public interface ZheDaAgvService { HttpResponse queryZDAgvDeviceStatus(); - String process(String jobno, String type, String address, String action, String processingVehicle); + String process(String jobno, String type, String address, String action, String processingVehicle) throws IOException; public HttpResponse markComplete(String code); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java index 5a6752b..ab8170e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java @@ -31,6 +31,7 @@ import org.nl.modules.wql.util.SpringContextHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -141,8 +142,7 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { @LokiLog(type = LokiLogType.AGV) @Override - public synchronized String process(String jobno, String type, String address, String action, String processingVehicle) - { + public synchronized String process(String jobno, String type, String address, String action, String processingVehicle) throws IOException { { log.info("查询到AGV请求参数,jobno:{},address:{}", jobno + ",address:" + address + ",type:" + type + ",action:" + action); //释放AGV资源，继续后续动作 diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/address/rest/AddressController.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/address/rest/AddressController.java index 27d14cf..1b161ad 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/address/rest/AddressController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/address/rest/AddressController.java @@ -72,4 +72,10 @@ public class AddressController { public void download(HttpServletResponse response, @RequestParam Map whereJson) throws IOException { AddressService.download(AddressService.queryAll(whereJson), response); } + + @GetMapping("/queryAddressCodeList") + @Log("查询接口方法地址编码") + public ResponseEntity queryAddressCodeList() { + return new ResponseEntity<>(AddressService.queryAddressCodeList(), HttpStatus.OK); + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/AddressService.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/AddressService.java index 08b47e6..1591762 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/AddressService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/AddressService.java @@ -1,6 +1,7 @@ package org.nl.acs.device.address.service; +import com.alibaba.fastjson.JSONObject; import org.nl.acs.device.address.service.dto.AddressDto; import org.springframework.data.domain.Pageable; @@ -79,4 +80,6 @@ public interface AddressService { * @throws IOException / */ void download(List dtos, HttpServletResponse response) throws IOException; + + JSONObject queryAddressCodeList(); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/impl/AddressServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/impl/AddressServiceImpl.java index 82d34cf..977d420 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/impl/AddressServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/address/service/impl/AddressServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.acs.device.address.service.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; @@ -22,10 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author ljfei @@ -146,4 +144,21 @@ public class AddressServiceImpl implements AddressService { } FileUtil.downloadExcel(list, response); } + + @Override + public JSONObject queryAddressCodeList() { + List list = new ArrayList<>(); + List addressDtoList = this.queryAll(new HashMap()); + if (CollectionUtil.isNotEmpty(addressDtoList)){ + for (AddressDto addressDto : addressDtoList) { + JSONObject jo = new JSONObject(); + jo.put("label",addressDto.getMethods_name()); + jo.put("value",addressDto.getMethods_code()); + list.add(jo); + } + } + JSONObject ja1 = new JSONObject(); + ja1.put("content",list); + return ja1; + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index 734aaf6..1026a96 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -35,6 +35,8 @@ import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceManageDto; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; +import org.nl.modules.lucene.service.LuceneExecuteLogService; +import org.nl.modules.lucene.service.dto.LuceneLogDto; import org.nl.modules.system.service.ParamService; import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.wql.util.SpringContextHolder; @@ -57,6 +59,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class); DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class); + LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean(LuceneExecuteLogService.class); //外部系统交互 AcsToZDWmsService acsToZDWmsService = SpringContextHolder.getBean(AcsToZDWmsService.class); AcsToHJXService acsToHJXService = SpringContextHolder.getBean(AcsToHJXService.class); @@ -113,20 +116,10 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic Device device = null; String device_code = null; -// if (phase == 0x67) { -// //故障信息 -// if (arr[18] * 256 + arr[19] == 0) { -// -// } -// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); -// } - //将车号写入DeviceManageDto DeviceManageDto deviceManageDto = new DeviceManageDto(); deviceManageDto.setCarno(carno); - String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); - String hasMes = paramService.findByCode(AcsConfig.HASMES).getValue(); //分配 车id //(不需要WCS反馈) if (phase == 0x02) { @@ -161,6 +154,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } else { if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { + //WMS MES普通站点不需对接 data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { Object ext_system = device.getExtraValue().get("ext_system"); @@ -180,6 +174,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } else { log.error("请求wms取货失败参数:{}", response); + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(this.getDeviceCode()) + .content("请求wms取货失败参数::"+ response) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); } //焊接线 } else if (ext_system.equals("3")) { @@ -190,6 +190,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic Object url = device.getExtraValue().get("address"); if (StringUtil.isEmpty(ext_system)) { log.error("请求安全交互失败，未配置焊接线IP" + device_code); + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(this.getDeviceCode()) + .content("请求安全交互失败，未配置焊接线IP" + device_code) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); return; } jo1.put("url", url); @@ -198,16 +204,33 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic int code = response.getInteger("code"); if (code == 200) { log.info("请求焊接线成功，申请取货 请求结果{}", code); + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(this.getDeviceCode()) + .content("请求焊接线成功，申请取货 请求结果:"+code) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } else { log.error("请求焊接线失败，申请区货 错误信息{}", response); + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(this.getDeviceCode()) + .content("请求焊接线失败，申请区货 错误信息:"+ response) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); } - //MES不需对接 } else if (ext_system.equals("2")) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } } else { log.error("检测站点未配置检测系统"); + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(this.getDeviceCode()) + .content("检测站点未配置检测系统") + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); return; } } @@ -244,6 +267,22 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } else { if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { + //MES下发需要上报取货完成 + if ("2".equals(task.getCreate_by())) { + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", carno); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "takeFinish"); + log.info("请求MES取货完成参数:{}", jo); + HttpResponse result = acsToMesService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode != 0){ + log.error("请求MES取货完成失败参数:{}", response); + return; + } + } data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { Object ext_system = device.getExtraValue().get("ext_system"); @@ -299,7 +338,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } else { log.info("请求MES取货完成失败，取货完成 错误码{}", responseCode); } - //只跟MES交互的点 } else if (ext_system.equals("2")) { JSONObject jo = new JSONObject(); jo.put("taskCode", task.getTask_code()); @@ -390,7 +428,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic log.error("请求焊接线放货失败，申请区货 错误信息{}", response); return; } - //MES不需要请求放货交互 } else if (ext_system.equals("2")) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } @@ -442,26 +479,37 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } else { if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - if ("1".equals(task.getCreate_by())){ + //mes下发需要上报放货完成 + if ("2".equals(task.getCreate_by())){ JSONObject jo = new JSONObject(); jo.put("taskCode", task.getTask_code()); jo.put("carId", carno); jo.put("taskType ", task.getTask_type()); jo.put("feedbackStatus", "putFinish"); - log.info("请求wms放货完成参数:{}", jo); + log.info("请求MES放货完成参数:{}", jo); + HttpResponse result = acsToMesService.taskFeedback(jo); + JSONObject response = JSONObject.parseObject(result.body()); + int responseCode = response.getInteger("responseCode"); + if (responseCode != 0) { + log.error("请求MES放货失败参数:{}", response); + return; + } //wms下发需要上报放货完成 + } else if ("1".equals(task.getCreate_by())){ + JSONObject jo = new JSONObject(); + jo.put("taskCode", task.getTask_code()); + jo.put("carId", carno); + jo.put("taskType ", task.getTask_type()); + jo.put("feedbackStatus", "putFinish"); + log.info("请求WMS放货完成参数:{}", jo); HttpResponse result = acsToZDWmsService.taskFeedback(jo); JSONObject response = JSONObject.parseObject(result.body()); int responseCode = response.getInteger("responseCode"); - if (responseCode == 0) { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.error("请求wms放货失败参数:{}", response); + if (responseCode != 0) { + log.info("请求WMS放货货完成失败 错误信息{}", responseCode); return; } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } - + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { Object ext_system = device.getExtraValue().get("ext_system"); //检测站点，安全交互类型为中鼎的 @@ -517,7 +565,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic log.info("请求MES放货完成失败,错误码{}", responseCode); return; } - //只跟MES交互的点 } else if (ext_system.equals("2")) { JSONObject jo = new JSONObject(); jo.put("taskCode", task.getTask_code()); @@ -543,350 +590,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } } - //到达取货点 - //(Itype=2/3,需要WCS反馈Phase) - else if (phase == 0x0B) { - log.info("==================AGV请求取货=================="); - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到指令：" + ikey); - log.info("{},{}", device_code, "未找到指令 [" + ikey + "]"); - return; - } - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - log.info("{},{}", device_code, "agv地址参数有误,phase:" + phase); - return; - } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - device = deviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - return; - } - //校验agv上报站点编号与指令起始点相同 - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到编号{}对应的指令", ikey); - log.info("{},{}", device_code, "未找到关联编号对应的指令" + ikey); - return; - } - TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); - TaskDto task = taskService.findByCode(inst.getTask_code()); - //mes的站点用检测站点 wms的站点用普通站点驱动 - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - //取货完毕 - //(Itype=2/3,需要WCS反馈Phase) - } else if (phase == 0x0D) { - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - logServer.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase); - return; - } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); -// if (agvaddr != 0) { -// old_device_code = deviceService.queryDeviceCodeByAddress(agvaddr); -// if (StrUtil.contains(old_device_code, "-")) { -// String[] point = old_device_code.split("-"); -// device_code = point[0]; -// } else if (StrUtil.contains(old_device_code, ".")) { -// String[] point = old_device_code.split("\\."); -// device_code = point[0]; -// emptyNum = point[1]; -// } else { -// device_code = old_device_code; -// } -// } - device = deviceAppService.findDeviceByCode(device_code); - - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - logServer.deviceExecuteLog(this.device_code, "", "", "对应设备号为空" + device_code); - return; - } - //校验agv上报站点编号与指令起始点相同 - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到关联编号{}对应的指令", ikey); - logServer.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey); - return; - } - TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); - TaskDto task = taskService.findByCode(inst.getTask_code()); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - //到达放货点 - //(Itype=2/3,需要WCS反馈Phase) - } else if (phase == 0x0F) { - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - logServer.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase); - return; - } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - device = deviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - return; - } - TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); - TaskDto task = taskService.findByCode(inst.getTask_code()); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - - //校验agv上报站点编号与指令起始点相同 - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到关联编号{}对应的指令", ikey); - return; - } - - if (flag) { - log.info("==================允许AGV放货=================="); - log.info("{},{}", device_code, "允许AGV放货。"); - } - //放货完毕 - //(Itype=2/3,需要WCS反馈Phase) - } else if (phase == 0x11) { - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - logServer.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase); - return; - } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - return; - } - device = deviceAppService.findDeviceByCode(device_code); - //校验agv上报站点编号与指令起始点相同 - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到编号{}对应的指令", ikey); - return; - } - TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); - TaskDto task = taskService.findByCode(inst.getTask_code()); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - //到达取货点 - //(Itype=2/3,需要WCS反馈Phase) - else if (phase == 0x13) { - log.info("==================AGV请求取货=================="); - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到指令：" + ikey); - log.info("{},{}", device_code, "未找到指令 [" + ikey + "]"); - return; - } - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - log.info("{},{}", device_code, "agv地址参数有误,phase:" + phase); - return; - } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - device = deviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - return; - } - //校验agv上报站点编号与指令起始点相同 - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到编号{}对应的指令", ikey); - log.info("{},{}", device_code, "未找到关联编号对应的指令" + ikey); - return; - } - TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); - TaskDto task = taskService.findByCode(inst.getTask_code()); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - //取货完毕 - //(Itype=2/3,需要WCS反馈Phase) - } else if (phase == 0x15) { - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - logServer.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase); - return; - } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - device = deviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - logServer.deviceExecuteLog(this.device_code, "", "", "对应设备号为空" + device_code); - return; - } - //校验agv上报站点编号与指令起始点相同 - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到关联编号{}对应的指令", ikey); - logServer.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey); - return; - } - TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); - TaskDto task = taskService.findByCode(inst.getTask_code()); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - //到达放货点 - //(Itype=2/3,需要WCS反馈Phase) - } else if (phase == 0x17) { - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - logServer.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase); - return; - } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - device = deviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - return; - } - TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); - TaskDto task = taskService.findByCode(inst.getTask_code()); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - //校验agv上报站点编号与指令起始点相同 - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到关联编号{}对应的指令", ikey); - return; - } - if (flag) { - log.info("==================允许AGV放货=================="); - log.info("{},{}", device_code, "允许AGV放货。"); - } - //放货完毕 - //(Itype=2/3,需要WCS反馈Phase) - } else if (phase == 0x19) { - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - logServer.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase); - return; - } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - device = deviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - return; - } - //校验agv上报站点编号与指令起始点相同 - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到编号{}对应的指令", ikey); - return; - } - TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); - TaskDto task = taskService.findByCode(inst.getTask_code()); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - //到达取货点 - //(Itype=2/3,需要WCS反馈Phase) - else if (phase == 0x1B) { - log.info("==================AGV请求取货=================="); - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到指令：" + ikey); - log.info("{},{}", device_code, "未找到指令 [" + ikey + "]"); - return; - } - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - log.info("{},{}", device_code, "agv地址参数有误,phase:" + phase); - return; - } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - device = deviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - return; - } - //校验agv上报站点编号与指令起始点相同 - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到编号{}对应的指令", ikey); - log.info("{},{}", device_code, "未找到关联编号对应的指令" + ikey); - return; - } - TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); - TaskDto task = taskService.findByCode(inst.getTask_code()); - //mes的站点用检测站点 wms的站点用普通站点驱动 - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - - //取货完毕 - //(Itype=2/3,需要WCS反馈Phase) - } else if (phase == 0x1D) { - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - logServer.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase); - return; - } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - device = deviceAppService.findDeviceByCode(device_code); - - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - logServer.deviceExecuteLog(this.device_code, "", "", "对应设备号为空" + device_code); - return; - } - //校验agv上报站点编号与指令起始点相同 - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到关联编号{}对应的指令", ikey); - logServer.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey); - return; - } - TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); - TaskDto task = taskService.findByCode(inst.getTask_code()); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - //到达放货点 - //(Itype=2/3,需要WCS反馈Phase) - } else if (phase == 0x1F) { - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - logServer.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase); - return; - } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - device = deviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - return; - } - TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); - TaskDto task = taskService.findByCode(inst.getTask_code()); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - //mes的站点用检测站点 wms的站点用普通站点驱动 - //校验agv上报站点编号与指令起始点相同 - //放货完毕 - //(Itype=2/3,需要WCS反馈Phase) - } else if (phase == 0x21) { - if (agvaddr == 0) { - agvaddr = agvaddr_copy; - } - if (agvaddr < 1) { - logServer.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase); - return; - } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - device = deviceAppService.findDeviceByCode(device_code); - if (ObjectUtil.isEmpty(device_code)) { - log.info(agvaddr + "对应设备号为空!"); - return; - } - //校验agv上报站点编号与指令起始点相同 - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到编号{}对应的指令", ikey); - return; - } - TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); - TaskDto task = taskService.findByCode(inst.getTask_code()); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - //mes的站点用检测站点 wms的站点用普通站点驱动 - } //到达位置点 //(需要WCS反馈) @@ -895,10 +598,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic agvaddr = arr[18] * 256 + arr[19]; agvaddr_copy = agvaddr; data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else if (phase == 0x50) {//进入交通灯区域 - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else if (phase == 0x51) {//离开交通灯区域 - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } else if (phase == 0x67) {//agv异常 if (ikey == 0) { this.setErrorInfo(ikey, "0", "正常"); @@ -917,23 +616,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); last_error = error; - } else if (phase == 0x70) { - //x坐标 - x = ikey; - } else if (phase == 0x71) { - //y坐标 - y = ikey; - } else if (phase == 0x72) { - //车辆角度 - angle = ikey; - } else if (phase == 0x73) { - //agv电量 - electric_qty = ikey; - } else if (phase == 0x74) { -// //三色灯状态 -// status = ikey; -// //将小车状态写入DeviceManageDto -// deviceManageDto.setStatus(status); } if (!ObjectUtil.isEmpty(data)) { logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + Bytes2HexString(data)); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/MesToAcsController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/MesToAcsController.java index 8bd98c7..ce1e9b6 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/MesToAcsController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/MesToAcsController.java @@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.io.IOException; + @RestController @RequiredArgsConstructor @Api(tags = "mes接口") @@ -31,7 +33,7 @@ public class MesToAcsController { @Log("任务接收") @ApiOperation("任务接收") @SaIgnore - public ResponseEntity taskCreate(@RequestBody JSONObject whereJson) { + public ResponseEntity taskCreate(@RequestBody JSONObject whereJson) throws IOException { return new ResponseEntity<>(mesToAcsService.taskCreate(whereJson), HttpStatus.OK); } @@ -39,7 +41,7 @@ public class MesToAcsController { @Log("任务操作") @ApiOperation("任务操作") @SaIgnore - public ResponseEntity taskOperation(@RequestBody JSONObject whereJson) { + public ResponseEntity taskOperation(@RequestBody JSONObject whereJson) throws IOException { return new ResponseEntity<>(mesToAcsService.taskOperation(whereJson), HttpStatus.OK); } @@ -47,7 +49,7 @@ public class MesToAcsController { @Log("任务状态查询") @ApiOperation("任务状态查询") @SaIgnore - public ResponseEntity taskStatus(@RequestBody JSONObject whereJson) { + public ResponseEntity taskStatus(@RequestBody JSONObject whereJson) throws IOException { return new ResponseEntity<>(mesToAcsService.taskStatus(whereJson), HttpStatus.OK); } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsZDToAcsController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsZDToAcsController.java index 6791c5d..02dcce6 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsZDToAcsController.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/WmsZDToAcsController.java @@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.io.IOException; + @RestController @RequiredArgsConstructor @Api(tags = "wms接口") @@ -31,7 +33,7 @@ public class WmsZDToAcsController { @Log("任务接收") @ApiOperation("任务接收") @SaIgnore - public ResponseEntity taskCreate(@RequestBody JSONObject whereJson) { + public ResponseEntity taskCreate(@RequestBody JSONObject whereJson) throws IOException { return new ResponseEntity<>(wmsZDToAcsService.taskCreate(whereJson), HttpStatus.OK); } @@ -39,7 +41,7 @@ public class WmsZDToAcsController { @Log("任务操作") @ApiOperation("任务操作") @SaIgnore - public ResponseEntity taskOperation(@RequestBody JSONObject whereJson) { + public ResponseEntity taskOperation(@RequestBody JSONObject whereJson) throws IOException { return new ResponseEntity<>(wmsZDToAcsService.taskOperation(whereJson), HttpStatus.OK); } @@ -47,7 +49,7 @@ public class WmsZDToAcsController { @Log("任务状态查询") @ApiOperation("任务状态查询") @SaIgnore - public ResponseEntity taskStatus(@RequestBody JSONObject whereJson) { + public ResponseEntity taskStatus(@RequestBody JSONObject whereJson) throws IOException { return new ResponseEntity<>(wmsZDToAcsService.taskStatus(whereJson), HttpStatus.OK); } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToMesService.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToMesService.java index b97df02..94778a0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToMesService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToMesService.java @@ -3,6 +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 { @@ -12,7 +14,7 @@ public interface AcsToMesService { * * */ - HttpResponse taskFeedback(JSONObject whereJson); + HttpResponse taskFeedback(JSONObject whereJson) throws IOException; /** * 任务取消 @@ -20,7 +22,7 @@ public interface AcsToMesService { * * */ - HttpResponse taskDeprecate(JSONObject whereJson); + HttpResponse taskDeprecate(JSONObject whereJson) throws IOException; /** * 设备状态上传 @@ -28,5 +30,5 @@ public interface AcsToMesService { * * @return Map */ - HttpResponse deviceStatusUpdate(JSONObject whereJson); + HttpResponse deviceStatusUpdate(JSONObject whereJson) throws IOException; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToZDWmsService.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToZDWmsService.java index ab374cb..12545cc 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToZDWmsService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToZDWmsService.java @@ -3,6 +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 AcsToZDWmsService { @@ -12,7 +14,7 @@ public interface AcsToZDWmsService { * * */ - HttpResponse taskFeedback(JSONObject whereJson); + HttpResponse taskFeedback(JSONObject whereJson) throws IOException; /** * 任务取消 @@ -20,7 +22,7 @@ public interface AcsToZDWmsService { * * */ - HttpResponse taskDeprecate(JSONObject whereJson); + HttpResponse taskDeprecate(JSONObject whereJson) throws IOException; /** * 设备状态上传 diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/MesToAcsService.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/MesToAcsService.java index e17e82d..c6cf3f4 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/MesToAcsService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/MesToAcsService.java @@ -2,6 +2,7 @@ package org.nl.acs.ext.wms.service; import com.alibaba.fastjson.JSONObject; +import java.io.IOException; import java.util.Map; public interface MesToAcsService { @@ -10,19 +11,19 @@ public interface MesToAcsService { * * @return Map */ - Map taskCreate(JSONObject whereJson); + Map taskCreate(JSONObject whereJson) throws IOException; /** * 任务处理 * * @return Map */ - Map taskOperation(JSONObject whereJson); + Map taskOperation(JSONObject whereJson) throws IOException; /** * 任务状态 * * @return Map */ - Map taskStatus(JSONObject whereJson); + Map taskStatus(JSONObject whereJson) throws IOException; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/WmsZDToAcsService.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/WmsZDToAcsService.java index 165f6a6..c62c98d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/WmsZDToAcsService.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/WmsZDToAcsService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import org.nl.acs.ext.wms.data.CreateTaskRequest; import org.nl.acs.ext.wms.data.CreateTaskResponse; +import java.io.IOException; import java.util.List; import java.util.Map; @@ -14,19 +15,19 @@ public interface WmsZDToAcsService { * * @return Map */ - Map taskCreate(JSONObject whereJson); + Map taskCreate(JSONObject whereJson) throws IOException; /** * 任务处理 * * @return Map */ - Map taskOperation(JSONObject whereJson); + Map taskOperation(JSONObject whereJson) throws IOException; /** * 任务状态 * * @return Map */ - Map taskStatus(JSONObject whereJson); + Map taskStatus(JSONObject whereJson) throws IOException; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToHJXServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToHJXServiceImpl.java index 722739d..17e47b1 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToHJXServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToHJXServiceImpl.java @@ -52,21 +52,18 @@ public class AcsToHJXServiceImpl implements AcsToHJXService { 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 - 动作请求反馈{}", execute); -// LuceneLogDto luceneLogDto = new LuceneLogDto(4, "actionRequest", "", -// String.valueOf(jsonObject), -// "", jsonObject.getString("task_code") + "动作请求反馈"); -// luceneLogService.interfaceExecuteLog(luceneLogDto); + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "actionRequest", String.valueOf(execute.getStatus()), + String.valueOf(jsonObject), + String.valueOf(execute.body()), "向焊接线申请请求" + ("1".equals(jsonObject.getString("type")) ? "取货" : "放货")); + luceneLogService.interfaceExecuteLog(luceneLogDto1); } 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); + log.info("actionRequest - 动作请求反馈{}", execute); + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "actionRequest", String.valueOf(execute.getStatus()), + String.valueOf(jsonObject), + String.valueOf(execute.body()), "向焊接线申请请求" + ("1".equals(jsonObject.getString("type")) ? "取货" : "放货")); + luceneLogService.interfaceExecuteLog(luceneLogDto1); } return execute; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToMesServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToMesServiceImpl.java index 80ebf17..d51e9b3 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToMesServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToMesServiceImpl.java @@ -12,10 +12,14 @@ import org.nl.acs.ext.wms.service.AcsToMesService; import org.nl.acs.opc.DeviceAppService; import org.nl.config.server.AcsConfigService; import org.nl.modules.logging.service.LogService; +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 @@ -33,6 +37,9 @@ public class AcsToMesServiceImpl implements AcsToMesService { @Autowired AcsConfigService acsConfigService; + @Autowired + private LuceneExecuteLogService luceneLogService; + @Autowired LogService logServer; @@ -42,8 +49,7 @@ public class AcsToMesServiceImpl implements AcsToMesService { private String log_type="ACS请求LMS"; @Override - public HttpResponse taskFeedback(JSONObject whereJson) { - //TODO:改成中鼎 + public HttpResponse taskFeedback(JSONObject whereJson) throws IOException { String wmsUrl = paramService.findByCode("mes_url").getValue(); AddressDto addressDto = addressService.findByCode("feedMesAgvTaskStatus"); String methods_url = addressDto.getMethods_url(); @@ -56,16 +62,21 @@ public class AcsToMesServiceImpl implements AcsToMesService { .execute(); System.out.println(result); log.info("feedAgvTaskStatus----返回参数{}", result); + } catch (Exception e) { String msg = e.getMessage(); //网络不通 log.info("错误原因{}",msg); } + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "feedMesAgvTaskStatus", String.valueOf(result.getStatus()), + String.valueOf(whereJson), + String.valueOf(result.body()), addressDto.getMethods_name()); + luceneLogService.interfaceExecuteLog(luceneLogDto1); return result; } @Override - public HttpResponse taskDeprecate(JSONObject whereJson) { + public HttpResponse taskDeprecate(JSONObject whereJson) throws IOException { String wmsUrl = paramService.findByCode("mes_url").getValue(); AddressDto addressDto = addressService.findByCode("acsCancelBack"); String methods_url = addressDto.getMethods_url(); @@ -83,11 +94,15 @@ public class AcsToMesServiceImpl implements AcsToMesService { //网络不通 //System.out.println(msg); } + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "feedMesAgvTaskStatus", String.valueOf(result.getStatus()), + String.valueOf(whereJson), + String.valueOf(result.body()), addressDto.getMethods_name()); + luceneLogService.interfaceExecuteLog(luceneLogDto1); return result; } @Override - public HttpResponse deviceStatusUpdate(JSONObject whereJson) { + public HttpResponse deviceStatusUpdate(JSONObject whereJson) throws IOException { String wmsUrl = paramService.findByCode("mes_url").getValue(); AddressDto addressDto = addressService.findByCode("deviceStatusUpdate"); String methods_url = addressDto.getMethods_url(); @@ -105,6 +120,10 @@ public class AcsToMesServiceImpl implements AcsToMesService { //网络不通 //System.out.println(msg); } + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "deviceStatusUpdate", String.valueOf(result.getStatus()), + String.valueOf(whereJson), + String.valueOf(result.body()), addressDto.getMethods_name()); + luceneLogService.interfaceExecuteLog(luceneLogDto1); return result; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToZDWmsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToZDWmsServiceImpl.java index b1a48a2..249dfa9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToZDWmsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToZDWmsServiceImpl.java @@ -13,10 +13,14 @@ import org.nl.acs.ext.wms.service.AcsToZDWmsService; import org.nl.acs.opc.DeviceAppService; import org.nl.config.server.AcsConfigService; import org.nl.modules.logging.service.LogService; +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 @@ -33,6 +37,8 @@ public class AcsToZDWmsServiceImpl implements AcsToZDWmsService { AddressService addressService; @Autowired AcsConfigService acsConfigService; + @Autowired + private LuceneExecuteLogService luceneLogService; @Autowired LogService logServer; @@ -43,8 +49,7 @@ public class AcsToZDWmsServiceImpl implements AcsToZDWmsService { private String log_type="ACS请求LMS"; @Override - public HttpResponse taskFeedback(JSONObject whereJson) { - //TODO:改成中鼎 + public HttpResponse taskFeedback(JSONObject whereJson) throws IOException { //String wmsUrl = "172.30.15.32:30010"; String wmsUrl = paramService.findByCode("wms_url").getValue(); AddressDto addressDto = addressService.findByCode("feedZdAgvTaskStatus"); @@ -58,16 +63,24 @@ public class AcsToZDWmsServiceImpl implements AcsToZDWmsService { .execute(); System.out.println(result); log.info("feedAgvTaskStatus----返回参数{}", result); + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "feedZdAgvTaskStatus", String.valueOf(result.getStatus()), + String.valueOf(whereJson), + String.valueOf(result.body()), addressDto.getMethods_name()); + luceneLogService.interfaceExecuteLog(luceneLogDto1); } catch (Exception e) { String msg = e.getMessage(); //网络不通 log.info("错误原因{}",msg); + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "feedZdAgvTaskStatus", String.valueOf(result.getStatus()), + String.valueOf(whereJson), + String.valueOf(result.body()), addressDto.getMethods_name()); + luceneLogService.interfaceExecuteLog(luceneLogDto1); } return result; } @Override - public HttpResponse taskDeprecate(JSONObject whereJson) { + public HttpResponse taskDeprecate(JSONObject whereJson) throws IOException{ String wmsUrl = paramService.findByCode("wms_url").getValue(); AddressDto addressDto = addressService.findByCode("acsCancelBack"); String methods_url = addressDto.getMethods_url(); @@ -80,10 +93,18 @@ public class AcsToZDWmsServiceImpl implements AcsToZDWmsService { .execute(); System.out.println(result); log.info("deprecateWmsTask----返回参数{}", result); + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "acsCancelBack", String.valueOf(result.getStatus()), + String.valueOf(whereJson), + String.valueOf(result.body()), addressDto.getMethods_name()); + luceneLogService.interfaceExecuteLog(luceneLogDto1); } catch (Exception e) { String msg = e.getMessage(); //网络不通 //System.out.println(msg); + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "acsCancelBack", String.valueOf(result.getStatus()), + String.valueOf(whereJson), + String.valueOf(result.body()), addressDto.getMethods_name()); + luceneLogService.interfaceExecuteLog(luceneLogDto1); } return result; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/MesToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/MesToAcsServiceImpl.java index c74493a..a7fe13e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/MesToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/MesToAcsServiceImpl.java @@ -11,11 +11,14 @@ import org.nl.acs.route.service.RouteLineService; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; import org.nl.modules.logging.service.LogService; +import org.nl.modules.lucene.service.LuceneExecuteLogService; +import org.nl.modules.lucene.service.dto.LuceneLogDto; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -31,13 +34,19 @@ public class MesToAcsServiceImpl implements MesToAcsService { TaskService taskService; + @Autowired + private LuceneExecuteLogService luceneLogService; @Autowired LogService logServer; @Override - public Map taskCreate(JSONObject whereJson) { + public Map taskCreate(JSONObject whereJson) throws IOException { Map map = new HashMap<>(); log.info("taskCreate--------------:输入参数：" + whereJson.toString()); + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "taskMESCreate", null, + String.valueOf(whereJson), + "", "接收mes任务"); + luceneLogService.interfaceExecuteLog(luceneLogDto1); //获取甲方wcs传过来的参数 JSONObject params = whereJson.getJSONObject("params"); String locationFrom = whereJson.getString("locationFrom"); @@ -259,9 +268,13 @@ public class MesToAcsServiceImpl implements MesToAcsService { } @Override - public Map taskOperation(JSONObject whereJson) { + public Map taskOperation(JSONObject whereJson) throws IOException { Map map = new HashMap<>(); log.info("taskOperation--------------:输入参数：" + whereJson.toString()); + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "mesTaskOperation", null, + String.valueOf(whereJson), + "", "MES发起任务操作"); + luceneLogService.interfaceExecuteLog(luceneLogDto1); String wmsTaskCode = whereJson.getString("wmsTaskCode"); String operation = whereJson.getString("operation"); if (ObjectUtil.isEmpty(wmsTaskCode)) { @@ -294,9 +307,13 @@ public class MesToAcsServiceImpl implements MesToAcsService { } @Override - public Map taskStatus(JSONObject whereJson) { + public Map taskStatus(JSONObject whereJson) throws IOException { Map map = new HashMap<>(); log.info("taskStatus--------------:输入参数：" + whereJson.toString()); + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "mesTaskStatus", null, + String.valueOf(whereJson), + "", "MES查询任务状态"); + luceneLogService.interfaceExecuteLog(luceneLogDto1); String taskCode = whereJson.getString("taskCode"); if (ObjectUtil.isEmpty(taskCode)) { map.put("status", "400"); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsZDToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsZDToAcsServiceImpl.java index 31fa684..b879fc3 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsZDToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsZDToAcsServiceImpl.java @@ -12,12 +12,15 @@ 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.logging.service.LogService; +import org.nl.modules.lucene.service.LuceneExecuteLogService; +import org.nl.modules.lucene.service.dto.LuceneLogDto; import org.nl.modules.wql.core.bean.WQLObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import oshi.driver.mac.net.NetStat; +import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -32,12 +35,18 @@ public class WmsZDToAcsServiceImpl implements WmsZDToAcsService { @Autowired TaskService taskService; + @Autowired + private LuceneExecuteLogService luceneLogService; @Autowired LogService logServer; @Override - public Map taskCreate(JSONObject whereJson) { + public Map taskCreate(JSONObject whereJson) throws IOException { + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "taskWMSCreate", null, + String.valueOf(whereJson), + "", "接收wms任务"); + luceneLogService.interfaceExecuteLog(luceneLogDto1); Map map = new HashMap<>(); log.info("taskCreate--------------:输入参数：" + whereJson.toString()); //获取甲方wcs传过来的参数 @@ -262,9 +271,13 @@ public class WmsZDToAcsServiceImpl implements WmsZDToAcsService { } @Override - public Map taskOperation(JSONObject whereJson) { + public Map taskOperation(JSONObject whereJson) throws IOException { Map map = new HashMap<>(); log.info("taskOperation--------------:输入参数：" + whereJson.toString()); + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "wmsTaskOperation", null, + String.valueOf(whereJson), + "", "wms发起任务操作"); + luceneLogService.interfaceExecuteLog(luceneLogDto1); String wmsTaskCode = whereJson.getString("wmsTaskCode"); String operation = whereJson.getString("operation"); if (ObjectUtil.isEmpty(wmsTaskCode)) { @@ -297,9 +310,13 @@ public class WmsZDToAcsServiceImpl implements WmsZDToAcsService { } @Override - public Map taskStatus(JSONObject whereJson) { + public Map taskStatus(JSONObject whereJson) throws IOException { Map map = new HashMap<>(); log.info("taskStatus--------------:输入参数：" + whereJson.toString()); + LuceneLogDto luceneLogDto1 = new LuceneLogDto(4, "wmsTaskStatus", null, + String.valueOf(whereJson), + "", "wms查询任务状态"); + luceneLogService.interfaceExecuteLog(luceneLogDto1); String taskCode = whereJson.getString("taskCode"); if (ObjectUtil.isEmpty(taskCode)) { map.put("status", "400"); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/rest/LuceneController.java b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/rest/LuceneController.java index 6d351c3..edbe436 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/rest/LuceneController.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/rest/LuceneController.java @@ -1,11 +1,24 @@ package org.nl.modules.lucene.rest; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.lucene.document.Document; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.Term; +import org.apache.lucene.search.*; +import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.util.BytesRef; import org.nl.modules.logging.annotation.Log; import org.nl.modules.lucene.service.LuceneService; +import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -14,7 +27,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.Map; +import java.nio.file.Paths; +import java.util.*; @RestController @@ -40,4 +54,11 @@ public class LuceneController { public ResponseEntity get(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(luceneService.getAll(whereJson, page), HttpStatus.OK); } + + @GetMapping("/getAddressLog") + @Log("接口日志检索") + //@PreAuthorize("@el.check('task:list')") + public ResponseEntity getAddressLog(@RequestParam Map whereJson, Pageable page) { + return new ResponseEntity<>(luceneService.getAddressLog(whereJson, page), HttpStatus.OK); + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/LuceneService.java b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/LuceneService.java index 18156d3..86d325f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/LuceneService.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/LuceneService.java @@ -21,4 +21,6 @@ public interface LuceneService { * @return Map */ Map getAll(Map whereJson, Pageable page); + + Map getAddressLog(Map whereJson, Pageable page); } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java index cfce669..955d3be 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java @@ -1,18 +1,34 @@ package org.nl.modules.lucene.service.impl; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.CharsetUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.lucene.document.Document; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.Term; +import org.apache.lucene.search.*; +import org.apache.lucene.store.FSDirectory; +import org.apache.lucene.util.BytesRef; +import org.nl.modules.lucene.common.LuceneIndexWriter; import org.nl.modules.lucene.common.Searcher; import org.nl.modules.lucene.service.LuceneService; import org.springframework.beans.factory.annotation.Value; +import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.util.Map; +import java.nio.file.Paths; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; @Service @@ -82,4 +98,30 @@ public class LuceneServiceImpl implements LuceneService { return jo; } + + @Override + public Map getAddressLog(Map whereJson, Pageable page) { + + JSONObject jo = new JSONObject(); + try { + JSONObject jsonObject = (JSONObject) Searcher.search(luceneUrl, "", whereJson); + JSONArray array = jsonObject.getJSONArray("content"); + int totalElements = Integer.parseInt(jsonObject.get("totalElements").toString()); + jo.put("content", array); + jo.put("totalElements", totalElements); + } catch (Exception e) { + log.error("索引查询为空", e); + throw new NullPointerException("索引查询为空"); + } + + return jo; + } + + public static String getDate(String timeString) throws ParseException { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");//时间格式 + Date date = sdf.parse(timeString); + timeString = DateUtil.format(date, "yyyy-MM-dd HH:mm:ss.SSS");//格式化后的时间 + return timeString; + } + } diff --git a/acs/nladmin-system/src/main/resources/log/AcsToHJXServiceImpl.xml b/acs/nladmin-system/src/main/resources/log/AcsToHJXServiceImpl.xml new file mode 100644 index 0000000..bb4ded3 --- /dev/null +++ b/acs/nladmin-system/src/main/resources/log/AcsToHJXServiceImpl.xml @@ -0,0 +1,33 @@ + + + + + + + + + ${LOG_HOME}/ACS请求焊接线/%d{yyyy-MM-dd}.%i.log + + 15 + + 200MB + + 2GB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + ${log.charset} + + + + + + + + + + + diff --git a/acs/nladmin-system/src/main/resources/log/AcsToMesServiceImpl.xml b/acs/nladmin-system/src/main/resources/log/AcsToMesServiceImpl.xml index d6a8a03..b8e0a78 100644 --- a/acs/nladmin-system/src/main/resources/log/AcsToMesServiceImpl.xml +++ b/acs/nladmin-system/src/main/resources/log/AcsToMesServiceImpl.xml @@ -27,7 +27,7 @@ --> - + diff --git a/acs/nladmin-system/src/main/resources/log/MesToAcsServiceImpl.xml b/acs/nladmin-system/src/main/resources/log/MesToAcsServiceImpl.xml index 768cdf3..26c96cf 100644 --- a/acs/nladmin-system/src/main/resources/log/MesToAcsServiceImpl.xml +++ b/acs/nladmin-system/src/main/resources/log/MesToAcsServiceImpl.xml @@ -27,7 +27,7 @@ --> - + diff --git a/acs/nladmin-system/src/main/resources/log/WmsZDToAcsServiceImpl.xml b/acs/nladmin-system/src/main/resources/log/WmsZDToAcsServiceImpl.xml index 7495b1c..6aa7614 100644 --- a/acs/nladmin-system/src/main/resources/log/WmsZDToAcsServiceImpl.xml +++ b/acs/nladmin-system/src/main/resources/log/WmsZDToAcsServiceImpl.xml @@ -27,7 +27,7 @@ --> - + diff --git a/acs/nladmin-ui/src/api/acs/Address.js b/acs/nladmin-ui/src/api/acs/Address.js index 381c96c..a51f3b0 100644 --- a/acs/nladmin-ui/src/api/acs/Address.js +++ b/acs/nladmin-ui/src/api/acs/Address.js @@ -8,6 +8,13 @@ export function add(data) { }) } +export function queryAddressCodeList() { + return request({ + url: 'api/Address/queryAddressCodeList', + method: 'get' + }) +} + export function del(ids) { return request({ url: 'api/Address/', @@ -24,4 +31,4 @@ export function edit(data) { }) } -export default { add, edit, del } +export default { add, edit, del, queryAddressCodeList } diff --git a/acs/nladmin-ui/src/views/monitor/logQuery/index.vue b/acs/nladmin-ui/src/views/monitor/logQuery/index.vue new file mode 100644 index 0000000..7188811 --- /dev/null +++ b/acs/nladmin-ui/src/views/monitor/logQuery/index.vue @@ -0,0 +1,146 @@ + + + + + diff --git a/acs/nladmin-ui/src/views/monitor/logQuery/search.vue b/acs/nladmin-ui/src/views/monitor/logQuery/search.vue new file mode 100644 index 0000000..3ceda08 --- /dev/null +++ b/acs/nladmin-ui/src/views/monitor/logQuery/search.vue @@ -0,0 +1,125 @@ + + + + + +