From 9fbd0016c420eef06e98a95d54717c34cc0d5cf0 Mon Sep 17 00:00:00 2001 From: psh Date: Thu, 28 Dec 2023 14:32:43 +0800 Subject: [PATCH] =?UTF-8?q?acs=E4=B8=8Elms=E4=BA=A4=E4=BA=92=E8=81=94?= =?UTF-8?q?=E8=B0=83=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/ext/wms/data/CreateTaskRequest.java | 9 +- .../wms/service/impl/WmsToAcsServiceImpl.java | 3 +- .../rest/InstructionController.java | 6 +- .../org/nl/acs/task/rest/TaskController.java | 6 +- .../task/service/impl/TaskServiceImpl.java | 1 - .../org/nl/quartz/task/AutoCreateInst.java | 130 +----------------- .../acs/service/impl/AcsToWmsServiceImpl.java | 5 +- .../nl/wms/sch/task_manage/AbstractTask.java | 26 +++- .../nl/wms/sch/task_manage/AcsTaskDto.java | 6 +- .../nl/wms/sch/task_manage/task/AcsUtil.java | 4 + .../main/resources/config/application-dev.yml | 4 +- 11 files changed, 50 insertions(+), 150 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java index 8603864..ccba7b0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/CreateTaskRequest.java @@ -50,6 +50,11 @@ public class CreateTaskRequest extends BaseRequest { */ String task_type; + /** + * agv任务类型 + */ + String agv_task_type; + /** * 备注 @@ -64,13 +69,15 @@ public class CreateTaskRequest extends BaseRequest { @Override public String toString() { return "CreateTaskRequest{" + - "task_code='" + task_code + '\'' + + "task_id='" + task_id + '\'' + + ", task_code='" + task_code + '\'' + ", start_device_code='" + start_device_code + '\'' + ", next_device_code='" + next_device_code + '\'' + ", priority='" + priority + '\'' + ", vehicle_code='" + vehicle_code + '\'' + ", vehicle_type='" + vehicle_type + '\'' + ", task_type='" + task_type + '\'' + + ", agv_task_type='" + agv_task_type + '\'' + ", remark='" + remark + '\'' + ", params=" + params + '}'; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 2d88b8d..00f27f2 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -473,6 +473,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String vehicle_code = req.getVehicle_code(); String vehicle_type = req.getVehicle_type(); String task_type = req.getTask_type(); + String agv_task_type=req.getAgv_task_type(); String remark = req.getRemark(); Map params = req.getParams(); @@ -588,7 +589,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("priority", priority); jo.put("vehicle_code", vehicle_code); jo.put("vehicle_type", vehicle_type); - jo.put("agv_system_type", "1"); + jo.put("agv_system_type", agv_task_type); jo.put("remark", remark); jo.put("params", params); jo.put("task_type", StrUtil.isEmpty(task_type) ? 1 : Integer.parseInt(task_type)); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java index 398d3e3..a121c85 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java @@ -21,9 +21,9 @@ import java.util.Map; import java.util.Set; /** -* @author jiaolm -* @date 2023-05-09 -**/ + * @author jiaolm + * @date 2023-05-09 + **/ @RestController @RequiredArgsConstructor @Api(tags = "指令服务管理") diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java index 4020563..3a5e2c5 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java @@ -22,9 +22,9 @@ import java.util.Map; import java.util.Set; /** -* @author jiaolm -* @date 2023-05-09 -**/ + * @author jiaolm + * @date 2023-05-09 + **/ @RestController @RequiredArgsConstructor @Api(tags = "任务管理") diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 3536731..4a32883 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -983,7 +983,6 @@ public class TaskServiceImpl extends CommonServiceImpl impleme if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); request.setTask_id(entity.getExt_task_id()); - request.setTask_id(entity.getExt_task_id()); request.setTask_code(entity.getTask_code()); request.setTask_status(entity.getTask_status()); request.setRequest_medthod_code(RequestMethodEnum.feedback_task_status.getCode()); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/AutoCreateInst.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/AutoCreateInst.java index 8da8e35..d406df7 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/AutoCreateInst.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/AutoCreateInst.java @@ -162,24 +162,7 @@ public class AutoCreateInst { continue; } } -// if (startdevice.getDeviceDriver() instanceof StandardEmptyPalletSiteDeviceDriver) { -// standardEmptsyPalletSiteDeviceDriver = (StandardEmptyPalletSiteDeviceDriver) startdevice.getDeviceDriver(); -// if (standardEmptsyPalletSiteDeviceDriver.getMode() != 2) { -// log.info("目标设备:" + nextdevice.getDevice_code() + "设备未待机,任务号：" + taskcode); -// acsTask.setRemark("目标设备:" + nextdevice.getDevice_code() + "设备未待机,任务号：" + taskcode); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } -// } -// if (startdevice.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) { -// lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) startdevice.getDeviceDriver(); -// if (lnshFoldDiscSiteDeviceDriver.getMode() != 2) { -// log.info("目标设备:" + nextdevice.getDevice_code() + "设备未待机,任务号：" + taskcode); -// acsTask.setRemark("目标设备:" + nextdevice.getDevice_code() + "设备未待机,任务号：" + taskcode); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } -// } + //校验 是否同任务是否存在相同终点、未完成的指令 int sameqty = instructionService.querySameDestinationInst(next_point_code); @@ -191,117 +174,6 @@ public class AutoCreateInst { } } - //空盘位生成指令需要另外逻辑 -// if (nextdevice.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) { -// lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) nextdevice.getDeviceDriver(); -// if (lnshFoldDiscSiteDeviceDriver.getMode() == 0) { -// log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 未联机，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 未联机，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } else if (lnshFoldDiscSiteDeviceDriver.getError() != 0 -// || lnshFoldDiscSiteDeviceDriver.getStatus() == 3) { -// log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 异常，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 异常，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } -// int max_emptypalletnum = Integer.parseInt(nextdevice.getExtraValue().get("max_emptypalletnum").toString()); -// int nowNumber = lnshFoldDiscSiteDeviceDriver.getContainer_qty(); -// if (nowNumber >= max_emptypalletnum) { -// log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 已满，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 已满，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } -// // 查看是否有相同终点的指令 -// int count = instructionService.queryDeviceInstCount(next_device_code); -// if (count > 0) { -// log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 已被占用，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 已被占用，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// //this.execute_log.setResource(nextdevice.getDevice_code(), nextdevice.getDevice_code()); -// //this.execute_log.log("存在相同终点的指令,任务号：" + taskcode); -// continue; -// } -// next_point_code = next_device_code + "." + (nowNumber + 1); -// } else if (nextdevice.getDeviceDriver() instanceof LnshStationDeviceDriver -// && "true".equals(nextdevice.getExtraValue().get("inspect_in_stocck"))) { -// LnshStationDeviceDriver deviceDriver = (LnshStationDeviceDriver) nextdevice.getDeviceDriver(); -// if (deviceDriver.getMode() == 0) { -// log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 未联机，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 未联机，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } else if (deviceDriver.getMove() != 0) { -// log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 有货，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 有货，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } else if (deviceDriver.getError() != 0) { -// log.info("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 异常，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 终点 [" + nextdevice.getDevice_name() + "] 异常，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } -// } - -// if (startdevice.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) { -// lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) startdevice.getDeviceDriver(); -// if (lnshFoldDiscSiteDeviceDriver.getMode() == 0) { -// log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 未联机，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 未联机，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } else if (lnshFoldDiscSiteDeviceDriver.getError() != 0 -// || lnshFoldDiscSiteDeviceDriver.getStatus() == 3) { -// log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 异常，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 异常，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } -// -// int container_qty = lnshFoldDiscSiteDeviceDriver.getContainer_qty(); -// int max_emptypalletnum = Integer.parseInt(startdevice.getExtraValue().get("max_emptypalletnum").toString()); -// if (container_qty < (max_emptypalletnum / 2)) { -// log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 可用托盘数量少于最大托盘数量 [" + max_emptypalletnum + "] / 2，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 可用托盘数量少于最大托盘数量 [" + max_emptypalletnum + "] / 2，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } -// -// int count = instructionService.queryDeviceInstCount(start_device_code); -// if (count > 0) { -// log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 已被占用，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 已被占用，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// //this.execute_log.setResource(nextdevice.getDevice_code(), nextdevice.getDevice_code()); -// //this.execute_log.log("存在相同终点的指令,任务号：" + taskcode); -// continue; -// } -// -// start_point_code = start_device_code + ".1"; -// } else if (startdevice.getDeviceDriver() instanceof LnshStationDeviceDriver -// && "true".equals(startdevice.getExtraValue().get("inspect_in_stocck"))) { -// LnshStationDeviceDriver deviceDriver = (LnshStationDeviceDriver) startdevice.getDeviceDriver(); -// if (deviceDriver.getMode() == 0) { -// log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 未联机，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 未联机，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } else if (deviceDriver.getMove() == 0) { -// log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 无货，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 无货，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } else if (deviceDriver.getError() != 0) { -// log.info("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 异常，无法生成指令。"); -// acsTask.setRemark("任务 [" + taskcode + "] 起点 [" + startdevice.getDevice_name() + "] 异常，无法生成指令。"); -// taskserver.updateByCodeFromCache(acsTask); -// continue; -// } -// } - Instruction instdto = new Instruction(); instdto.setInstruction_type(acsTask.getTask_type()); instdto.setInstruction_id(IdUtil.simpleUUID()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 7284956..ee2b372 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -129,6 +129,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { BaseResponse result = BaseResponse.build(requestNo); FeedBackTaskStatusRequest taskStatusRequest = param.toJavaObject(FeedBackTaskStatusRequest.class); String taskId = taskStatusRequest.getTask_id(); + String taskCode = taskStatusRequest.getTask_code(); if (ObjectUtil.isEmpty(taskId)) { throw new BadRequestException("任务编码不能为空！"); } @@ -159,12 +160,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { AbstractTask abstractTask = taskFactory.getTask(processingClass); // 更新任务 try { - abstractTask.updateTaskStatus(taskId, status); + abstractTask.updateTaskStatus(taskCode, status); result.setMessage("任务状态反馈成功!"); } catch (Exception e) { log.error("任务状态更新失败: {}", message); result.setCode(HttpStatus.HTTP_BAD_REQUEST); - result.setMessage("任务:[" + taskId + "]状态更新失败," + message); + result.setMessage("任务:[" + taskCode + "]状态更新失败," + message); } interactRecordService.saveRecord(requestMethodName, param, result, GeneralDefinition.ACS_LMS); return result; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java index b1dab80..8809096 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java @@ -3,6 +3,7 @@ package org.nl.wms.sch.task_manage; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.nl.common.exception.BadRequestException; @@ -23,6 +24,7 @@ import org.nl.wms.sch.task_manage.task.AcsUtil; import org.nl.wms.sch.task_manage.task.core.TaskStatus; import org.nl.wms.util.TaskUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -95,22 +97,34 @@ public abstract class AbstractTask { taskDto.setRoute_plan_code("normal"); taskDto.setStart_device_code(task.getPoint_code1()); - taskDto.setNext_device_code(task.getPoint_code2()); - taskDto.setStart_waite_code(task.getStart_wait_point()); - taskDto.setNext_waite_code(task.getNext_wait_point()); + //如果存在等待点，任务下发目标点给等待点 + if(ObjectUtil.isEmpty(task.getPoint_code2())){ + taskDto.setNext_device_code(task.getNext_wait_point()); + }else { + taskDto.setNext_device_code(task.getPoint_code2()); + } +// taskDto.setStart_wait_code(task.getStart_wait_point()); +// taskDto.setNext_wait_code(task.getNext_wait_point()); taskDto.setVehicle_code(task.getVehicle_code()); this.setTask(task.getConfig_code(), taskDto); list.add(taskDto); } - - return AcsUtil.notifyAcs("api/wms/task", list); + JSONObject result=AcsUtil.notifyAcs("api/wms/task", list); + if (HttpStatus.OK.value()==result.getInteger("status")) { + for (SchBaseTask schBaseTask : taskList) { + schBaseTask.setTask_status(TaskStatus.ISSUED.getCode()); + taskService.update(schBaseTask); + } + } + return result; } private AcsTaskDto setTask(String config_code, AcsTaskDto taskDto) { SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper() .eq(SchBaseTaskconfig::getConfig_code, config_code)); taskDto.setPriority(taskConfig.getPriority()); - taskDto.setTask_type(taskConfig.getAcs_task_type()); + taskDto.setTask_type(taskConfig.getTask_type()); + taskDto.setAgv_task_type(taskConfig.getAcs_task_type()); taskDto.setRoute_plan_code(taskConfig.getRoute_plan_code()); return taskDto; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java index 077790d..51a85e3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java @@ -10,14 +10,16 @@ public class AcsTaskDto { private String task_code; //任务类型 private String task_type; + //AGV任务类型 + private String agv_task_type; //起点 private String start_device_code; //下一点 private String next_device_code; //取货等待点 - private String start_waite_code; + private String start_wait_code; //放货等待点 - private String next_waite_code; + private String next_wait_code; //载具号 private String vehicle_code; //载具类型 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java index 9ab1617..bd841bc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java @@ -5,14 +5,17 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.config.SpringContextHolder; import org.nl.system.service.param.dao.Param; import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.ext.acs.service.dto.to.wms.AcsResponse; +import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.AcsTaskDto; import org.nl.wms.sch.task_manage.GeneralDefinition; +import org.nl.wms.sch.task_manage.task.core.TaskStatus; import org.springframework.http.HttpStatus; import java.util.List; @@ -56,6 +59,7 @@ public class AcsUtil { //acs抛异常这里 /* if (result.getString("status").equals(String.valueOf(HttpStatus.BAD_REQUEST.value()))) throw new BadRequestException(result.getString("message"));*/ + // 如果下发完毕，就修改状态 return result; } diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 75d08d6..37eb038 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -6,10 +6,10 @@ spring: druid: 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:3306}/${DB_NAME:xftn_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:tn_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} - password: ${DB_PWD:12356} + password: ${DB_PWD:123456} # password: ${DB_PWD:P@ssw0rd} # 初始连接数 initial-size: 5