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 d1ea11e..5a6752b 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 @@ -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.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.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()); 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 f5ef64f..b96635e 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 @@ -13,15 +13,13 @@ import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.auto.run.OneNDCSocketConnectionAutoRun; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.basedriver.lubei_conveyor.LubeiConveyorDeviceDriver; -import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver; 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.device_driver.driver.AbstractDeviceDriver; -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.ext.wms.service.AcsToZDWmsService; import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; import org.nl.acs.history.ErrorUtil; import org.nl.acs.history.service.DeviceErrorLogService; @@ -37,16 +35,10 @@ 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.common.utils.DateUtil; -import org.nl.modules.common.utils.StringUtils; -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; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -65,6 +57,10 @@ 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); + //外部系统交互 + AcsToZDWmsService acsToZDWmsService = SpringContextHolder.getBean(AcsToZDWmsService.class); + AcsToHJXService acsToHJXService = SpringContextHolder.getBean(AcsToHJXService.class); + AcsToMesService acsToMesService = SpringContextHolder.getBean(AcsToMesService.class); int agvaddr = 0; int agvaddr_copy = 0; @@ -106,9 +102,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic //车号 int carno = arr[20]; Instruction inst = null; - - AcsToWmsZDService acsToWmsZDService = SpringContextHolder.getBean("acsToWmsZDServiceImpl"); - AcsToMesService acsToMesService = SpringContextHolder.getBean("acsToMesServiceImpl"); logServer.deviceExecuteLog(this.device_code, "", "", "接收agv上报信息：" + "phase--" + phase + " index--" + index + " 指令号--" + ikey + " 站点号--" + agvaddr + " 车号--" + carno); Instruction link_inst = null; if (ikey != 0) { @@ -180,7 +173,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic jo.put("taskType ", task.getTask_type()); jo.put("feedbackStatus", "applyTake"); log.info("请求wms取货完成参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); + HttpResponse result = acsToZDWmsService.taskFeedback(jo); JSONObject response = JSONObject.parseObject(result.body()); int responseCode = response.getInteger("responseCode"); if (responseCode == 0) { @@ -197,17 +190,19 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic Object url = device.getExtraValue().get("address"); if (StringUtil.isEmpty(ext_system)) { log.error("请求安全交互失败，未配置焊接线IP" + device_code); + return; } jo1.put("url", url); - HttpResponse result = acsToMesService.actionRequest(jo1); + HttpResponse result = acsToHJXService.actionRequest(jo1); JSONObject response = JSONObject.parseObject(result.body()); int code = response.getInteger("code"); if (code == 200) { - log.info("请求Mes成功，申请取货 请求结果{}", code); + log.info("请求焊接线成功，申请取货 请求结果{}", code); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } else { - log.error("请求Mes失败，申请区货 错误信息{}", response); + log.error("请求焊接线失败，申请区货 错误信息{}", response); } + //MES不需对接 }else if (ext_system.equals("2")){ data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } @@ -262,7 +257,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic jo.put("taskType ", task.getTask_type()); jo.put("feedbackStatus", "takeFinish"); log.info("请求wms取货完成参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); + HttpResponse result = acsToZDWmsService.taskFeedback(jo); JSONObject response = JSONObject.parseObject(result.body()); int responseCode = response.getInteger("responseCode"); if (responseCode == 0) { @@ -277,32 +272,33 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic jo.put("carId", carno); jo.put("taskType ", task.getTask_type()); jo.put("feedbackStatus", "takeFinish"); - log.info("请求wms取货完成参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(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.info("请求ZDwcs成功，取货完成 请求结果{}", responseCode); + log.info("请求MES成功，取货完成 请求结果{}", responseCode); JSONObject jo1 = new JSONObject(); jo1.put("point", device_code); jo1.put("type", "3"); jo1.put("containerCode", task.getVehicle_code()); Object url = device.getExtraValue().get("address"); if (StringUtil.isEmpty(ext_system)) { - log.error("请求安全交互失败，未配置焊接线IP" + device_code); + log.error("请求焊接线失败，未配置焊接线IP" + device_code); + return; } jo1.put("url", url); - HttpResponse result2 = acsToMesService.actionFinish(jo1); + HttpResponse result2 = acsToHJXService.actionFinish(jo1); JSONObject response2 = JSONObject.parseObject(result2.body()); int code = response2.getInteger("code"); if (code == 200) { - log.info("请求Mes成功，申请取货完成 请求结果{}", code); + log.info("请求焊接线成功，申请取货完成 请求结果{}", code); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } else { - log.info("请求Mes失败，申请取货完成 错误信息{}", response2); + log.info("请求焊接线失败，申请取货完成 错误信息{}", response2); } } else { - log.info("请求ZDwcs失败，取货完成 错误码{}", responseCode); + log.info("请求MES取货完成失败，取货完成 错误码{}", responseCode); } //只跟MES交互的点 } else if (ext_system.equals("2")) { @@ -311,8 +307,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic jo.put("carId", carno); jo.put("taskType ", task.getTask_type()); jo.put("feedbackStatus", "takeFinish"); - log.info("请求wms取货完成参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); + log.info("请求MES取货完成参数:{}", jo); + HttpResponse result = acsToMesService.taskFeedback(jo); JSONObject response = JSONObject.parseObject(result.body()); int responseCode = response.getInteger("responseCode"); if (responseCode == 0) { @@ -364,14 +360,14 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic jo.put("carId", carno); jo.put("taskType ", task.getTask_type()); jo.put("feedbackStatus", "applyPut"); - log.info("请求wms取货完成参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); + 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); + log.error("请求wms请求放货失败参数:{}", response); } //焊接线 } else if (ext_system.equals("3")) { @@ -381,18 +377,21 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic jo1.put("containerCode", task.getVehicle_code()); Object url = device.getExtraValue().get("address"); if (StringUtil.isEmpty(ext_system)) { - log.error("请求安全交互失败，未配置焊接线IP" + device_code); + log.error("请求焊接线请求放货，未配置焊接线IP" + device_code); + return; } jo1.put("url", url); - HttpResponse result = acsToMesService.actionRequest(jo1); + HttpResponse result = acsToHJXService.actionRequest(jo1); JSONObject response = JSONObject.parseObject(result.body()); int code = response.getInteger("code"); if (code == 200) { - log.info("请求Mes成功，申请取货 请求结果{}", code); + log.info("请求焊接线放货成功，申请取货 请求结果{}", code); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } else { - log.error("请求Mes失败，申请区货 错误信息{}", response); + log.error("请求焊接线放货失败，申请区货 错误信息{}", response); + return; } + //MES不需要请求放货交互 } else if (ext_system.equals("2")) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } @@ -455,14 +454,15 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic jo.put("carId", carno); jo.put("taskType ", task.getTask_type()); jo.put("feedbackStatus", "putFinish"); - log.info("请求wms取货完成参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); + log.info("请求wms放货完成参数:{}", jo); + HttpResponse result = acsToMesService.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); + log.error("请求wms放货失败参数:{}", response); + return; } //焊接线 } else if (ext_system.equals("3")) { @@ -471,8 +471,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic jo.put("carId", carno); jo.put("taskType ", task.getTask_type()); jo.put("feedbackStatus", "putFinish"); - log.info("请求wms取货完成参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); + log.info("请求MES放货完成参数:{}", jo); + HttpResponse result = acsToMesService.taskFeedback(jo); JSONObject response = JSONObject.parseObject(result.body()); int responseCode = response.getInteger("responseCode"); if (responseCode == 0) { @@ -482,20 +482,22 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic jo1.put("containerCode", task.getVehicle_code()); Object url = device.getExtraValue().get("address"); if (StringUtil.isEmpty(ext_system)) { - log.error("请求安全交互失败，未配置焊接线IP" + device_code); + log.error("请求MES放货完成失败，未配置焊接线IP" + device_code); } jo1.put("url", url); - HttpResponse result2 = acsToMesService.actionFinish(jo1); + HttpResponse result2 = acsToHJXService.actionFinish(jo1); JSONObject response2 = JSONObject.parseObject(result2.body()); int code = response2.getInteger("code"); if (code == 200) { - log.info("请求Mes成功，申请取货完成 请求结果{}", code); + log.info("请求焊接线放货货完成成功，请求结果{}", code); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } else { - log.info("请求Mes失败，申请取货完成 错误信息{}", response2); + log.info("请求焊接线放货货完成失败 错误信息{}", response2); + return; } } else { - log.info("请求ZDwcs失败，取货完成 错误码{}", responseCode); + log.info("请求MES放货完成失败,错误码{}", responseCode); + return; } //只跟MES交互的点 } else if (ext_system.equals("2")) { @@ -504,12 +506,15 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic jo.put("carId", carno); jo.put("taskType ", task.getTask_type()); jo.put("feedbackStatus", "putFinish"); - log.info("请求wms取货完成参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); + log.info("请求MES放货完成参数:{}", jo); + HttpResponse result = acsToMesService.taskFeedback(jo); JSONObject response = JSONObject.parseObject(result.body()); int responseCode = response.getInteger("responseCode"); if (responseCode == 0) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); + }else { + log.info("请求MES放货货完成失败 错误信息{}", responseCode); + return; } } } @@ -537,20 +542,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic 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 + "对应设备号为空!"); @@ -564,79 +555,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskDto task = taskService.findByCode(inst.getTask_code()); - //mes的站点用检测站点 wms的站点用普通站点驱动 - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv允许取货信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - JSONObject jo = new JSONObject(); - jo.put("taskCode", task.getTask_code()); - jo.put("carId", carno); - jo.put("taskType ", task.getTask_type()); - jo.put("feedbackStatus", "applyTake"); - log.info("请求wms申请取货参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int responseCode = response.getInteger("responseCode"); - if (responseCode == 0) { - log.info("请求ZDwcs成功，申请取货 请求结果{}", responseCode); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求ZDwcs失败，申请取货 错误码{}", responseCode); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv允许取货信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasMes, "1")) { - JSONObject jo = new JSONObject(); - jo.put("point", device_code); - jo.put("type", "1"); - log.info("请求mes申请取货参数:{}", jo); - HttpResponse result = acsToMesService.actionRequest(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int code = response.getInteger("code"); - if (code == 200) { - log.info("请求Mes成功，申请取货 请求结果{}", code); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求Mes失败，申请取货 错误信息{}", response); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - } - - -// -// if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { -// siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); -// if (siemensConveyorDeviceDriver.getMove() == 1) { -// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); -// } else { -// log.info("请求取货条件不满足待机有货"); -// } -// } -// -// if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { -// siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); -// if (siemensConveyorDeviceDriver.getMove() == 1) { -// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); -// } else { -// log.info("请求取货条件不满足待机有货"); -// } -// } -// if (device.getDeviceDriver() instanceof StandardStorageDeviceDriver) { -// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); -// } - + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); //取货完毕 //(Itype=2/3,需要WCS反馈Phase) } else if (phase == 0x0D) { @@ -676,75 +596,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskDto task = taskService.findByCode(inst.getTask_code()); - - //mes的站点用检测站点 wms的站点用普通站点驱动 - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv取货完成信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - 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("请求wms取货完成参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int responseCode = response.getInteger("responseCode"); - if (responseCode == 0) { - log.info("请求ZDwcs成功，取货完成 请求结果{}", responseCode); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } else { - log.info("请求ZDwcs失败，取货完成 错误码{}", responseCode); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv取货完成信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasMes, "1")) { - JSONObject jo = new JSONObject(); - jo.put("point", device_code); - jo.put("type", "3"); - log.info("请求mes取货完成参数:{}", jo); - HttpResponse result = acsToMesService.actionRequest(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int code = response.getInteger("code"); - if (code == 200) { - log.info("请求Mes成功，申请取货完成 请求结果{}", code); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } else { - log.info("请求Mes失败，申请取货完成 错误信息{}", response); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - } -// if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { -// siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); -// if (siemensConveyorDeviceDriver.getTo_command() == 2) { -// log.info("取货完成请求离开，当前输送to_command:" + siemensConveyorDeviceDriver.getTo_command()); -// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); -// } else { -// log.info("取货完成请求离开下发输送信号，当前输送to_command:" + siemensConveyorDeviceDriver.getTo_command()); -// List list = new ArrayList(); -// Map map = new HashMap(); -// map.put("code", "to_command"); -// map.put("value", "2"); -// list.add(map); -// siemensConveyorDeviceDriver.writing(list); -// siemensConveyorDeviceDriver.writing(list); -// } -// } - - if (ObjectUtil.isNotEmpty(data)) { - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase：" + phase + "反馈:" + Bytes2HexString(data)); - } + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); //到达放货点 //(Itype=2/3,需要WCS反馈Phase) } else if (phase == 0x0F) { @@ -756,19 +608,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic 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 + "对应设备号为空!"); @@ -776,55 +615,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskDto task = taskService.findByCode(inst.getTask_code()); - - //mes的站点用检测站点 wms的站点用普通站点驱动 - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv允许放货信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - JSONObject jo = new JSONObject(); - jo.put("taskCode", task.getTask_code()); - jo.put("carId", carno); - jo.put("taskType ", task.getTask_type()); - jo.put("feedbackStatus", "applyPut"); - log.info("请求wms申请放货参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int responseCode = response.getInteger("responseCode"); - if (responseCode == 0) { - log.info("请求ZDwcs成功，申请放货 请求结果{}", responseCode); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求ZDwcs失败，申请放货 错误码{}", responseCode); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv允许放货信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasMes, "1")) { - JSONObject jo = new JSONObject(); - jo.put("point", device_code); - jo.put("type", "2"); - log.info("请求mes申请放货参数:{}", jo); - HttpResponse result = acsToMesService.actionRequest(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int code = response.getInteger("code"); - if (code == 200) { - log.info("请求Mes成功，申请放货 请求结果{}", code); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求Mes失败，申请放货 错误信息{}", response); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - } + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); //校验agv上报站点编号与指令起始点相同 if (ObjectUtil.isEmpty(inst)) { @@ -836,8 +627,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic log.info("==================允许AGV放货=================="); log.info("{},{}", device_code, "允许AGV放货。"); } - - //放货完毕 //(Itype=2/3,需要WCS反馈Phase) } else if (phase == 0x11) { @@ -849,25 +638,11 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic 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 + "对应设备号为空!"); return; } + device = deviceAppService.findDeviceByCode(device_code); //校验agv上报站点编号与指令起始点相同 if (ObjectUtil.isEmpty(inst)) { log.info("未找到编号{}对应的指令", ikey); @@ -875,57 +650,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskDto task = taskService.findByCode(inst.getTask_code()); - - //mes的站点用检测站点 wms的站点用普通站点驱动 - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv放货完成信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - 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 = acsToWmsZDService.taskFeedback(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int responseCode = response.getInteger("responseCode"); - if (responseCode == 0) { - log.info("请求ZDwcs成功，放货完成 请求结果{}", responseCode); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } else { - log.info("请求ZDwcs失败，放货完成 错误码{}", responseCode); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv放货完成信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasMes, "1")) { - JSONObject jo = new JSONObject(); - jo.put("point", device_code); - jo.put("type", "4"); - log.info("请求mes放货完成参数:{}", jo); - HttpResponse result = acsToMesService.actionFinish(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int code = response.getInteger("code"); - if (code == 200) { - log.info("请求Mes成功，放货完成 请求结果{}", code); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } else { - log.info("请求Mes失败，放货完成 错误信息{}", response); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - } + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); } - //到达取货点 //(Itype=2/3,需要WCS反馈Phase) else if (phase == 0x13) { @@ -943,20 +669,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic 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 + "对应设备号为空!"); @@ -970,78 +682,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskDto task = taskService.findByCode(inst.getTask_code()); - - //mes的站点用检测站点 wms的站点用普通站点驱动 - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv允许取货信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - JSONObject jo = new JSONObject(); - jo.put("taskCode", task.getTask_code()); - jo.put("carId", carno); - jo.put("taskType ", task.getTask_type()); - jo.put("feedbackStatus", "applyTake"); - log.info("请求wms申请取货参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int responseCode = response.getInteger("responseCode"); - if (responseCode == 0) { - log.info("请求ZDwcs成功，申请取货 请求结果{}", responseCode); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求ZDwcs失败，申请取货 错误码{}", responseCode); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv允许取货信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasMes, "1")) { - JSONObject jo = new JSONObject(); - jo.put("point", device_code); - jo.put("type", "1"); - log.info("请求mes申请取货参数:{}", jo); - HttpResponse result = acsToMesService.actionRequest(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int code = response.getInteger("code"); - if (code == 200) { - log.info("请求Mes成功，申请取货 请求结果{}", code); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求Mes失败，申请取货 错误信息{}", response); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - } - -// -// if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { -// siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); -// if (siemensConveyorDeviceDriver.getMove() == 1) { -// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); -// } else { -// log.info("请求取货条件不满足待机有货"); -// } -// } -// -// if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { -// siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); -// if (siemensConveyorDeviceDriver.getMove() == 1) { -// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); -// } else { -// log.info("请求取货条件不满足待机有货"); -// } -// } -// if (device.getDeviceDriver() instanceof StandardStorageDeviceDriver) { -// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); -// } - + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); //取货完毕 //(Itype=2/3,需要WCS反馈Phase) } else if (phase == 0x15) { @@ -1053,21 +694,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic 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); @@ -1081,76 +708,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskDto task = taskService.findByCode(inst.getTask_code()); - - //mes的站点用检测站点 wms的站点用普通站点驱动 - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv取货完成信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - 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("请求wms取货完成参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int responseCode = response.getInteger("responseCode"); - if (responseCode == 0) { - log.info("请求ZDwcs成功，取货完成 请求结果{}", responseCode); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } else { - log.info("请求ZDwcs失败，取货完成 错误码{}", responseCode); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv取货完成信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasMes, "1")) { - JSONObject jo = new JSONObject(); - jo.put("point", device_code); - jo.put("type", "3"); - log.info("请求mes取货完成参数:{}", jo); - HttpResponse result = acsToMesService.actionRequest(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int code = response.getInteger("code"); - if (code == 200) { - log.info("请求Mes成功，申请取货完成 请求结果{}", code); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } else { - log.info("请求Mes失败，申请取货完成 错误信息{}", response); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - } -// -// if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { -// siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); -// if (siemensConveyorDeviceDriver.getTo_command() == 2) { -// log.info("取货完成请求离开，当前输送to_command:" + siemensConveyorDeviceDriver.getTo_command()); -// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); -// } else { -// log.info("取货完成请求离开下发输送信号，当前输送to_command:" + siemensConveyorDeviceDriver.getTo_command()); -// List list = new ArrayList(); -// Map map = new HashMap(); -// map.put("code", "to_command"); -// map.put("value", "2"); -// list.add(map); -// siemensConveyorDeviceDriver.writing(list); -// siemensConveyorDeviceDriver.writing(list); -// } -// } - - if (ObjectUtil.isNotEmpty(data)) { - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase：" + phase + "反馈:" + Bytes2HexString(data)); - } + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); //到达放货点 //(Itype=2/3,需要WCS反馈Phase) } else if (phase == 0x17) { @@ -1162,19 +720,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic 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 + "对应设备号为空!"); @@ -1182,67 +727,16 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskDto task = taskService.findByCode(inst.getTask_code()); - - //mes的站点用检测站点 wms的站点用普通站点驱动 - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv允许放货信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - JSONObject jo = new JSONObject(); - jo.put("taskCode", task.getTask_code()); - jo.put("carId", carno); - jo.put("taskType ", task.getTask_type()); - jo.put("feedbackStatus", "applyPut"); - log.info("请求wms申请放货参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int responseCode = response.getInteger("responseCode"); - if (responseCode == 0) { - log.info("请求ZDwcs成功，申请放货 请求结果{}", responseCode); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求ZDwcs失败，申请放货 错误码{}", responseCode); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv允许放货信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasMes, "1")) { - JSONObject jo = new JSONObject(); - jo.put("point", device_code); - jo.put("type", "2"); - log.info("请求mes申请放货参数:{}", jo); - HttpResponse result = acsToMesService.actionRequest(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int code = response.getInteger("code"); - if (code == 200) { - log.info("请求Mes成功，申请放货 请求结果{}", code); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求Mes失败，申请放货 错误信息{}", response); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - } + 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) { @@ -1254,20 +748,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic 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 + "对应设备号为空!"); @@ -1280,57 +760,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskDto task = taskService.findByCode(inst.getTask_code()); - - //mes的站点用检测站点 wms的站点用普通站点驱动 - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv放货完成信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - 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 = acsToWmsZDService.taskFeedback(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int responseCode = response.getInteger("responseCode"); - if (responseCode == 0) { - log.info("请求ZDwcs成功，放货完成 请求结果{}", responseCode); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } else { - log.info("请求ZDwcs失败，放货完成 错误码{}", responseCode); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv放货完成信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasMes, "1")) { - JSONObject jo = new JSONObject(); - jo.put("point", device_code); - jo.put("type", "4"); - log.info("请求mes放货完成参数:{}", jo); - HttpResponse result = acsToMesService.actionFinish(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int code = response.getInteger("code"); - if (code == 200) { - log.info("请求Mes成功，放货完成 请求结果{}", code); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } else { - log.info("请求Mes失败，放货完成 错误信息{}", response); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - } + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); } - //到达取货点 //(Itype=2/3,需要WCS反馈Phase) else if (phase == 0x1B) { @@ -1348,20 +779,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic 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 + "对应设备号为空!"); @@ -1375,77 +792,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskDto task = taskService.findByCode(inst.getTask_code()); - //mes的站点用检测站点 wms的站点用普通站点驱动 - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv允许取货信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - JSONObject jo = new JSONObject(); - jo.put("taskCode", task.getTask_code()); - jo.put("carId", carno); - jo.put("taskType ", task.getTask_type()); - jo.put("feedbackStatus", "applyTake"); - log.info("请求wms申请取货参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int responseCode = response.getInteger("responseCode"); - if (responseCode == 0) { - log.info("请求ZDwcs成功，申请取货 请求结果{}", responseCode); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求ZDwcs失败，申请取货 错误码{}", responseCode); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv允许取货信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasMes, "1")) { - JSONObject jo = new JSONObject(); - jo.put("point", device_code); - jo.put("type", "1"); - log.info("请求mes申请取货参数:{}", jo); - HttpResponse result = acsToMesService.actionRequest(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int code = response.getInteger("code"); - if (code == 200) { - log.info("请求Mes成功，申请取货 请求结果{}", code); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求Mes失败，申请取货 错误信息{}", response); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - } - -// -// if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { -// siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); -// if (siemensConveyorDeviceDriver.getMove() == 1) { -// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); -// } else { -// log.info("请求取货条件不满足待机有货"); -// } -// } -// -// if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { -// siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); -// if (siemensConveyorDeviceDriver.getMove() == 1) { -// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); -// } else { -// log.info("请求取货条件不满足待机有货"); -// } -// } -// if (device.getDeviceDriver() instanceof StandardStorageDeviceDriver) { -// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); -// } + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); //取货完毕 //(Itype=2/3,需要WCS反馈Phase) @@ -1458,19 +806,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic 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)) { @@ -1486,76 +821,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskDto task = taskService.findByCode(inst.getTask_code()); - - //mes的站点用检测站点 wms的站点用普通站点驱动 - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv取货完成信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - 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("请求wms取货完成参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int responseCode = response.getInteger("responseCode"); - if (responseCode == 0) { - log.info("请求ZDwcs成功，取货完成 请求结果{}", responseCode); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } else { - log.info("请求ZDwcs失败，取货完成 错误码{}", responseCode); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv取货完成信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasMes, "1")) { - JSONObject jo = new JSONObject(); - jo.put("point", device_code); - jo.put("type", "3"); - log.info("请求mes取货完成参数:{}", jo); - HttpResponse result = acsToMesService.actionRequest(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int code = response.getInteger("code"); - if (code == 200) { - log.info("请求Mes成功，申请取货完成 请求结果{}", code); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } else { - log.info("请求Mes失败，申请取货完成 错误信息{}", response); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); - } - } -// -// if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { -// siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); -// if (siemensConveyorDeviceDriver.getTo_command() == 2) { -// log.info("取货完成请求离开，当前输送to_command:" + siemensConveyorDeviceDriver.getTo_command()); -// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); -// } else { -// log.info("取货完成请求离开下发输送信号，当前输送to_command:" + siemensConveyorDeviceDriver.getTo_command()); -// List list = new ArrayList(); -// Map map = new HashMap(); -// map.put("code", "to_command"); -// map.put("value", "2"); -// list.add(map); -// siemensConveyorDeviceDriver.writing(list); -// siemensConveyorDeviceDriver.writing(list); -// } -// } - - if (ObjectUtil.isNotEmpty(data)) { - logServer.deviceExecuteLog(this.device_code, "", "", "agvphase：" + phase + "反馈:" + Bytes2HexString(data)); - } + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, inst); //到达放货点 //(Itype=2/3,需要WCS反馈Phase) } else if (phase == 0x1F) { @@ -1567,19 +833,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic 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 + "对应设备号为空!"); @@ -1587,67 +840,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskDto task = taskService.findByCode(inst.getTask_code()); - + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); //mes的站点用检测站点 wms的站点用普通站点驱动 - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv允许放货信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - JSONObject jo = new JSONObject(); - jo.put("taskCode", task.getTask_code()); - jo.put("carId", carno); - jo.put("taskType ", task.getTask_type()); - jo.put("feedbackStatus", "applyPut"); - log.info("请求wms申请放货参数:{}", jo); - HttpResponse result = acsToWmsZDService.taskFeedback(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int responseCode = response.getInteger("responseCode"); - if (responseCode == 0) { - log.info("请求ZDwcs成功，申请放货 请求结果{}", responseCode); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求ZDwcs失败，申请放货 错误码{}", responseCode); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv允许放货信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasMes, "1")) { - JSONObject jo = new JSONObject(); - jo.put("point", device_code); - jo.put("type", "2"); - log.info("请求mes申请放货参数:{}", jo); - HttpResponse result = acsToMesService.actionRequest(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int code = response.getInteger("code"); - if (code == 200) { - log.info("请求Mes成功，申请放货 请求结果{}", code); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求Mes失败，申请放货 错误信息{}", response); - } - } else { - 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 == 0x21) { @@ -1659,20 +854,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic 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 + "对应设备号为空!"); @@ -1685,55 +866,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } TaskService taskService = SpringContextHolder.getBean("taskServiceImpl"); TaskDto task = taskService.findByCode(inst.getTask_code()); - + data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); //mes的站点用检测站点 wms的站点用普通站点驱动 - if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv放货完成信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { - 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 = acsToWmsZDService.taskFeedback(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int responseCode = response.getInteger("responseCode"); - if (responseCode == 0) { - log.info("请求ZDwcs成功，放货完成 请求结果{}", responseCode); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求ZDwcs失败，放货完成 错误码{}", responseCode); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - if ((StrUtil.startWith(task.getTask_code(), "-"))) { - log.info("定点任务下发agv放货完成信号"); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - if (!StrUtil.startWith(task.getTask_code(), "-") && StrUtil.equals(hasMes, "1")) { - JSONObject jo = new JSONObject(); - jo.put("point", device_code); - jo.put("type", "4"); - log.info("请求mes放货完成参数:{}", jo); - HttpResponse result = acsToMesService.actionFinish(jo); - JSONObject response = JSONObject.parseObject(result.body()); - int code = response.getInteger("code"); - if (code == 200) { - log.info("请求Mes成功，放货完成 请求结果{}", code); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("请求Mes失败，放货完成 错误信息{}", response); - } - } else { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } - } } //到达位置点 diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/lubei_conveyor/LubeiConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/lubei_conveyor/LubeiConveyorDeviceDriver.java index 85c9c64..43ba00f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/lubei_conveyor/LubeiConveyorDeviceDriver.java +++ b/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.AcsToWmsZDService; -import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; +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.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; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsZDController.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsZDController.java index 269a398..044c057 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsZDController.java +++ b/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("任务反馈") diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsZDService.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToHJXService.java similarity index 52% rename from acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsZDService.java rename to acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToHJXService.java index 3d9dbc2..2af3a03 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsZDService.java +++ b/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 - */ - HttpResponse deviceStatusUpdate(JSONObject whereJson); } 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 9852f9b..b97df02 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,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 + */ + HttpResponse deviceStatusUpdate(JSONObject whereJson); } 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 new file mode 100644 index 0000000..733699f --- /dev/null +++ b/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; + } +} 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 5b2952e..56910af 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 @@ -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.modules.lucene.service.dto.LuceneLogDto; +import org.nl.acs.opc.DeviceAppService; +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 - 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; - } + private String log_file_type="log_file_type"; + private String log_type="ACS请求LMS"; @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 { - String wmsUrl = whereJson.getString("url"); - AddressDto addressDto = addressService.findByCode("actionFinish"); + 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("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; } + } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsZDServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsZDServiceImpl.java deleted file mode 100644 index 5d4eb5a..0000000 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsZDServiceImpl.java +++ /dev/null @@ -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; - } - -} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 2ace820..281fe4b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/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 diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/NdcDeviceStatusUpdate.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/NdcDeviceStatusUpdate.java index df544b9..321da4b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/NdcDeviceStatusUpdate.java +++ b/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(); diff --git a/acs/nladmin-system/src/main/resources/config/application-dev.yml b/acs/nladmin-system/src/main/resources/config/application-dev.yml index 31e76d7..00fda1c 100644 --- a/acs/nladmin-system/src/main/resources/config/application-dev.yml +++ b/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} # 初始连接数 diff --git a/acs/nladmin-system/src/main/resources/config/application-prod.yml b/acs/nladmin-system/src/main/resources/config/application-prod.yml index 4625ad7..74ba692 100644 --- a/acs/nladmin-system/src/main/resources/config/application-prod.yml +++ b/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} # 初始连接数 diff --git a/acs/nladmin-system/src/main/resources/config/application.yml b/acs/nladmin-system/src/main/resources/config/application.yml index a4d00ab..7e3fbea 100644 --- a/acs/nladmin-system/src/main/resources/config/application.yml +++ b/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: diff --git a/acs/nladmin-system/src/main/resources/log/AcsToZDWms.xml b/acs/nladmin-system/src/main/resources/log/AcsToZDWms.xml index 46790f0..f572344 100644 --- a/acs/nladmin-system/src/main/resources/log/AcsToZDWms.xml +++ b/acs/nladmin-system/src/main/resources/log/AcsToZDWms.xml @@ -27,7 +27,7 @@ --> - +