From 262430da28e9f83b3ba7eb47f028a3a8e64b02a6 Mon Sep 17 00:00:00 2001 From: psh Date: Thu, 28 Dec 2023 16:57:47 +0800 Subject: [PATCH] =?UTF-8?q?acs=E5=85=BC=E5=AE=B9=E6=B5=99=E5=A4=A7?= =?UTF-8?q?=E5=92=8CNDC=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/acs/AcsConfig.java | 14 +- .../nl/acs/agv/server/ZheDaAgvService.java | 2 +- .../agv/server/impl/ZheDaAgvServiceImpl.java | 50 ++---- .../service/impl/InstructionServiceImpl.java | 161 ++++++++++-------- .../org/nl/quartz/task/AutoCreateInst.java | 8 +- .../src/views/acs/route/routeLine/index.vue | 5 + 6 files changed, 119 insertions(+), 121 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java index 2d9a98f..cd465bb 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java @@ -14,18 +14,14 @@ public interface AcsConfig { String CREATETASKCHECK = "createTaskCheck"; //撤销任务检查 String CANCELTASKCHECK = "cancelTaskCheck"; - //一楼agv系统接口地址 + //agv系统接口地址 String AGVURL = "agvurl"; //AGV系统端口 String AGVPORT = "agvport"; - //二楼1区agv系统接口地址 - String AGVURL2 = "agvurl2"; - //二楼1区AGV系统端口 - String AGVPORT2 = "agvport2"; - //二楼2区agv系统接口地址 - String AGVURL22 = "agvurl22"; - //二楼2区AGV系统端口 - String AGVPORT22 = "agvport22"; + //rgv系统接口地址 + String RGVURL = "rgvurl"; + //RGV系统端口 + String RGVPORT = "rgvport"; //指定AGV系统 String AGVTYPE = "agvType"; //WMS系统接口地址 diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/ZheDaAgvService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/ZheDaAgvService.java index b99ca42..e6ee54a 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/ZheDaAgvService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/ZheDaAgvService.java @@ -36,6 +36,6 @@ public interface ZheDaAgvService { * @param instCode * @return */ - public HttpResponse deleteZDAgvInst(String instCode); + public HttpResponse deleteZDAgvInst(String instCode) throws Exception; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java index b2be778..7871154 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java @@ -69,18 +69,11 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { jo.put("destinations", destinations); if (StrUtil.equals(paramService.findByCode(AcsConfig.FORKAGV).getValue(), "1")) { - String agvurl = paramService.findByCode(AcsConfig.AGVURL).getValue(); - String agvurl2 = paramService.findByCode(AcsConfig.AGVURL2).getValue(); - String agvport = paramService.findByCode(AcsConfig.AGVPORT).getValue(); - String agvport2 = paramService.findByCode(AcsConfig.AGVPORT2).getValue(); + String agvurl = paramService.findByCode(AcsConfig.RGVURL).getValue(); + String agvport = paramService.findByCode(AcsConfig.RGVPORT).getValue(); + agvurl = agvurl + ":" + agvport + "/v1/transportOrders/" + inst.getInstruction_code(); - //不同楼层下发不同的agv系统 - if (task_type.equals("1")) { - agvurl = agvurl + ":" + agvport + "/v1/transportOrders/" + inst.getInstruction_code(); - } else { - agvurl = agvurl2 + ":" + agvport2 + "/v1/transportOrders/" + inst.getInstruction_code(); - } log.info("下发agv任务请求:{}", agvurl); HttpResponse result = HttpRequest.post(agvurl) @@ -101,14 +94,10 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { if (StrUtil.equals(paramService.findByCode(AcsConfig.FORKAGV).getValue(), "1")) { String agvurl = ""; String agvport = ""; - if (type.equals("1")) { - agvurl = paramService.findByCode(AcsConfig.AGVURL).getValue(); - agvport = paramService.findByCode(AcsConfig.AGVPORT).getValue(); - } - if (type.equals("2")) { - agvurl = paramService.findByCode(AcsConfig.AGVURL2).getValue(); - agvport = paramService.findByCode(AcsConfig.AGVPORT2).getValue(); - } + + agvurl = paramService.findByCode(AcsConfig.RGVURL).getValue(); + agvport = paramService.findByCode(AcsConfig.RGVPORT).getValue(); + agvurl = agvurl + ":" + agvport + "/v1/transportOrders"; HttpResponse result = HttpRequest.get(agvurl) @@ -278,8 +267,8 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { jo.put("destinations", destinations); - String agvurl = paramService.findByCode(AcsConfig.AGVURL).getValue(); - String agvport = paramService.findByCode(AcsConfig.AGVPORT).getValue(); + String agvurl = paramService.findByCode(AcsConfig.RGVURL).getValue(); + String agvport = paramService.findByCode(AcsConfig.RGVPORT).getValue(); String url = agvurl + ":" + agvport + "/addDestinations"; log.info("下发agv任务请求:{}", url); @@ -399,12 +388,8 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { log.info("反馈AGV请求数据:{}", requestjo); System.out.println("back agv:" + requestjo); - String agvurl = paramService.findByCode(AcsConfig.AGVURL).getValue(); - String agvport = paramService.findByCode(AcsConfig.AGVPORT).getValue(); - - if (inst.getInstruction_type().equals("4")) { - agvurl = paramService.findByCode(AcsConfig.AGVURL2).getValue(); - } + String agvurl = paramService.findByCode(AcsConfig.RGVURL).getValue(); + String agvport = paramService.findByCode(AcsConfig.RGVPORT).getValue(); agvurl = agvurl + ":" + agvport + "/v1/transportOrders/" + jobno + "/interact"; HttpResponse result = HttpRequest.post(agvurl) @@ -420,8 +405,8 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { public HttpResponse markComplete(String code) { if (StrUtil.equals(paramService.findByCode(AcsConfig.FORKAGV).getValue(), "1")) { - String agvurl = paramService.findByCode(AcsConfig.AGVURL).getValue(); - String agvport = paramService.findByCode(AcsConfig.AGVPORT).getValue(); + String agvurl = paramService.findByCode(AcsConfig.RGVURL).getValue(); + String agvport = paramService.findByCode(AcsConfig.RGVPORT).getValue(); agvurl = agvurl + ":" + agvport + "/v1/" + code + "/markComplete"; log.info("关闭agv运单序列请求:{}", agvurl); @@ -554,14 +539,11 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { @LokiLog(type = LokiLogType.AGV) @Override - public HttpResponse deleteZDAgvInst(String instCode) { + public HttpResponse deleteZDAgvInst(String instCode) throws Exception { if (StrUtil.equals(paramService.findByCode(AcsConfig.FORKAGV).getValue(), "1")) { - String agvurl = paramService.findByCode(AcsConfig.AGVURL2).getValue(); - String agvport = paramService.findByCode(AcsConfig.AGVPORT2).getValue(); + String agvurl = paramService.findByCode(AcsConfig.RGVURL).getValue(); + String agvport = paramService.findByCode(AcsConfig.RGVPORT).getValue(); Instruction instruction = instructionService.findByCode(instCode); - if (instruction.getInstruction_type().equals("1")) { - agvurl = paramService.findByCode(AcsConfig.AGVURL).getValue(); - } agvurl = agvurl + ":" + agvport + "/rmds/v1/transportOrders/" + instCode + "/withdrawal"; log.info("删除agv指令请求agvurl:{}", agvurl); HttpResponse result = HttpRequest.post(agvurl) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 32d0498..c2309e2 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -18,6 +19,7 @@ import org.nl.acs.AcsConfig; import org.nl.acs.agv.server.MagicAgvService; import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.agv.server.XianGongAgvService; +import org.nl.acs.agv.server.ZheDaAgvService; import org.nl.acs.auto.initial.ApplicationAutoInitial; import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; @@ -73,9 +75,9 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.regex.Pattern; /** -* @author jiaolm -* @date 2023-05-09 -*/ + * @author jiaolm + * @date 2023-05-09 + */ @Service @Slf4j // @CacheConfig(cacheNames = InstructionService.CACHE_KEY) @@ -88,7 +90,7 @@ public class InstructionServiceImpl extends CommonServiceImpl instructions = new CopyOnWriteArrayList(); -// List instructions_mybatis = new CopyOnWriteArrayList(); + // List instructions_mybatis = new CopyOnWriteArrayList(); @Autowired DeviceAppService deviceAppService; @Autowired @@ -110,7 +112,7 @@ public class InstructionServiceImpl extends CommonServiceImpl queryAll(InstructionQueryParam query){ + public List queryAll(InstructionQueryParam query) { return ConvertUtil.convertList(instructionMapper.selectList(QueryHelpMybatisPlus.getPredicate(query)), InstructionDto.class); } @@ -127,7 +129,7 @@ public class InstructionServiceImpl extends CommonServiceImpl ids){ + public int removeByIds(Set ids) { // delCaches(ids); return instructionMapper.deleteBatchIds(ids); } @Override @Transactional(rollbackFor = Exception.class) - public int removeById(String id){ + public int removeById(String id) { Set set = new HashSet<>(1); set.add(id); return this.removeByIds(set); @@ -175,7 +177,7 @@ public class InstructionServiceImpl extends CommonServiceImpl(ConvertUtil.convertList(list,Instruction.class)); + this.instructions = new CopyOnWriteArrayList<>(ConvertUtil.convertList(list, Instruction.class)); } @Override @@ -191,20 +193,20 @@ public class InstructionServiceImpl extends CommonServiceImpl queryPage = PageUtil.toMybatisPage(page); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); // wrapper.eq(InstructionMybatis::getIs_delete,0); - wrapper.and(StringUtils.isNotBlank(code), instructionMybatis -> instructionMybatis.like(InstructionMybatis::getInstruction_code,code).or().like(InstructionMybatis::getTask_code,code)); - wrapper.like(StringUtils.isNotBlank(vehicle_code),InstructionMybatis::getVehicle_code,vehicle_code); - wrapper.eq(StringUtils.isNotBlank(material_type),InstructionMybatis::getMaterial,material_type); - wrapper.eq(StringUtils.isNotBlank(status),InstructionMybatis::getInstruction_status,status); - wrapper.and(StringUtils.isNotBlank(point_code),instructionMybatis -> instructionMybatis.like(InstructionMybatis::getStart_point_code,point_code).or().like(InstructionMybatis::getNext_point_code,point_code)); - wrapper.eq(StringUtils.isNotBlank(instruction_type),InstructionMybatis::getInstruction_type,instruction_type); + wrapper.and(StringUtils.isNotBlank(code), instructionMybatis -> instructionMybatis.like(InstructionMybatis::getInstruction_code, code).or().like(InstructionMybatis::getTask_code, code)); + wrapper.like(StringUtils.isNotBlank(vehicle_code), InstructionMybatis::getVehicle_code, vehicle_code); + wrapper.eq(StringUtils.isNotBlank(material_type), InstructionMybatis::getMaterial, material_type); + wrapper.eq(StringUtils.isNotBlank(status), InstructionMybatis::getInstruction_status, status); + wrapper.and(StringUtils.isNotBlank(point_code), instructionMybatis -> instructionMybatis.like(InstructionMybatis::getStart_point_code, point_code).or().like(InstructionMybatis::getNext_point_code, point_code)); + wrapper.eq(StringUtils.isNotBlank(instruction_type), InstructionMybatis::getInstruction_type, instruction_type); if (!StrUtil.isEmpty(is_over)) { - if (StrUtil.equals(is_over,"1")){ - wrapper.ge(InstructionMybatis::getInstruction_status,2); - }else{ - wrapper.lt(InstructionMybatis::getInstruction_status,2); + if (StrUtil.equals(is_over, "1")) { + wrapper.ge(InstructionMybatis::getInstruction_status, 2); + } else { + wrapper.lt(InstructionMybatis::getInstruction_status, 2); } } - IPage insPage = instructionMapper.selectPage(queryPage,wrapper); + IPage insPage = instructionMapper.selectPage(queryPage, wrapper); final JSONObject json = (JSONObject) JSON.toJSON(ConvertUtil.convertPage(insPage, InstructionDto.class)); return json; } @@ -223,31 +225,31 @@ public class InstructionServiceImpl extends CommonServiceImpl wrapper = new LambdaQueryWrapper<>(); // wrapper.eq(InstructionMybatis::getIs_delete,"0"); if (!StrUtil.isEmpty(code)) { - wrapper.and(instructionMybatis -> instructionMybatis.like(InstructionMybatis::getInstruction_code,code).or().like(InstructionMybatis::getTask_code,code)); + wrapper.and(instructionMybatis -> instructionMybatis.like(InstructionMybatis::getInstruction_code, code).or().like(InstructionMybatis::getTask_code, code)); } if (!StrUtil.isEmpty(vehicle_code)) { - wrapper.like(InstructionMybatis::getVehicle_code,vehicle_code); + wrapper.like(InstructionMybatis::getVehicle_code, vehicle_code); } if (!StrUtil.isEmpty(material_type)) { - wrapper.eq(InstructionMybatis::getMaterial,material_type); + wrapper.eq(InstructionMybatis::getMaterial, material_type); } if (!StrUtil.isEmpty(status)) { - wrapper.eq(InstructionMybatis::getInstruction_status,status); + wrapper.eq(InstructionMybatis::getInstruction_status, status); } if (!StrUtil.isEmpty(point_code)) { - wrapper.and(instructionMybatis -> instructionMybatis.like(InstructionMybatis::getStart_point_code,point_code).or().like(InstructionMybatis::getNext_point_code,point_code)); + wrapper.and(instructionMybatis -> instructionMybatis.like(InstructionMybatis::getStart_point_code, point_code).or().like(InstructionMybatis::getNext_point_code, point_code)); } if (!StrUtil.isEmpty(create_time) && !StrUtil.isEmpty(end_time)) { - wrapper.between(InstructionMybatis::getCreate_time,create_time,end_time); + wrapper.between(InstructionMybatis::getCreate_time, create_time, end_time); } - IPage insPage = instructionMapper.selectPage(queryPage,wrapper); + IPage insPage = instructionMapper.selectPage(queryPage, wrapper); final JSONObject json = (JSONObject) JSON.toJSON(ConvertUtil.convertPage(insPage, InstructionDto.class)); return json; } @Override public Map getByTaskId(String id) { - List insList= new LambdaQueryChainWrapper<>(instructionMapper) + List insList = new LambdaQueryChainWrapper<>(instructionMapper) .eq(InstructionMybatis::getTask_id, id) .list(); JSONObject jsonObject = new JSONObject(); @@ -273,9 +275,9 @@ public class InstructionServiceImpl extends CommonServiceImpl queryAll(Map whereJson) { - List insList= new LambdaQueryChainWrapper<>(instructionMapper) + List insList = new LambdaQueryChainWrapper<>(instructionMapper) .list(); - return ConvertUtil.convertList(insList,Instruction.class); + return ConvertUtil.convertList(insList, Instruction.class); } @Override @@ -283,10 +285,10 @@ public class InstructionServiceImpl extends CommonServiceImpl list = arr.toJavaList(Instruction.class); - List insList= new LambdaQueryChainWrapper<>(instructionMapper) + List insList = new LambdaQueryChainWrapper<>(instructionMapper) .lt(InstructionMybatis::getInstruction_status, "2") .list(); - return ConvertUtil.convertList(insList,Instruction.class); + return ConvertUtil.convertList(insList, Instruction.class); } @@ -300,13 +302,13 @@ public class InstructionServiceImpl extends CommonServiceImpl(instructionMapper) + InstructionMybatis ins = new LambdaQueryChainWrapper<>(instructionMapper) .eq(InstructionMybatis::getInstruction_code, code) .one(); - if(ObjectUtil.isEmpty(ins)){ + if (ObjectUtil.isEmpty(ins)) { return null; } - return ConvertUtil.convert(ins,Instruction.class); + return ConvertUtil.convert(ins, Instruction.class); } @Override @@ -315,13 +317,13 @@ public class InstructionServiceImpl extends CommonServiceImpl(instructionMapper) + InstructionMybatis ins = new LambdaQueryChainWrapper<>(instructionMapper) .eq(InstructionMybatis::getTask_code, code) .one(); - if(ObjectUtil.isEmpty(ins)){ + if (ObjectUtil.isEmpty(ins)) { return null; } - return ConvertUtil.convert(ins,Instruction.class); + return ConvertUtil.convert(ins, Instruction.class); } @Override @@ -350,11 +352,11 @@ public class InstructionServiceImpl extends CommonServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(InstructionMybatis::getTask_id,id); - wrapper.apply(StringUtils.isNotBlank(wherecaluse),wherecaluse); + wrapper.eq(InstructionMybatis::getTask_id, id); + wrapper.apply(StringUtils.isNotBlank(wherecaluse), wherecaluse); InstructionMybatis ins = instructionMapper.selectOne(wrapper); if (ObjectUtil.isNotEmpty(ins)) { - return ConvertUtil.convert(ins,Instruction.class); + return ConvertUtil.convert(ins, Instruction.class); } return null; } @@ -386,7 +388,7 @@ public class InstructionServiceImpl extends CommonServiceImpl(instructionMapper) + InstructionMybatis ins = new LambdaQueryChainWrapper<>(instructionMapper) .lt(InstructionMybatis::getInstruction_status, 3) - .eq(InstructionMybatis::getNext_point_code,dto.getNext_point_code()) - .eq(InstructionMybatis::getStart_point_code,dto.getStart_point_code()) - .eq(InstructionMybatis::getTask_id,dto.getTask_id()) + .eq(InstructionMybatis::getNext_point_code, dto.getNext_point_code()) + .eq(InstructionMybatis::getStart_point_code, dto.getStart_point_code()) + .eq(InstructionMybatis::getTask_id, dto.getTask_id()) .one(); @@ -801,7 +818,7 @@ public class InstructionServiceImpl extends CommonServiceImpl(taskMapper) - .eq(Task::getTask_id,insttaskid) + .eq(Task::getTask_id, insttaskid) .one(); // =0 则不用再次请求 if (StrUtil.equals(task.getRequest_again(), "0")) { @@ -836,7 +853,7 @@ public class InstructionServiceImpl extends CommonServiceImpl(taskMapper) - .eq(Task::getTask_id,insttaskid) + .eq(Task::getTask_id, insttaskid) .one(); // =0 则不用再次请求 if (StrUtil.equals(task.getRequest_again(), "0")) { @@ -890,7 +907,7 @@ public class InstructionServiceImpl extends CommonServiceImpl(taskMapper) - .eq(Task::getTask_id,dto.getTask_id()) + .eq(Task::getTask_id, dto.getTask_id()) .one(); RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineServiceImpl.class); @@ -978,24 +995,22 @@ public class InstructionServiceImpl extends CommonServiceImpl 输送路由 agv路由 + rgv路由 @@ -269,6 +270,10 @@ export default { { typeName: 'agv路由', typeValue: '1' + }, + { + typeName: 'rgv路由', + typeValue: '2' }], permission: { add: ['admin', 'routeLine:add'],