diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonFinalParam.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonFinalParam.java index 9624160..3d2adc4 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonFinalParam.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonFinalParam.java @@ -8,7 +8,6 @@ import lombok.Data; import org.springframework.stereotype.Component; @Data -@Component public class CommonFinalParam { private final String DELETE = "0"; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index 0f8581b..673ef69 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -66,7 +66,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme @Autowired DeviceErrorLogService errorLogServer = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class); - /** + /** * 心跳 */ Integer heartbeat = 0; @@ -76,17 +76,17 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme */ Integer item_deviceCode = 0; Integer last_item_deviceCode = 0; - /** + /** * 工作模式 */ Integer mode = 0; Integer last_mode = 0; /** - *作业状态 + * 作业状态 */ Integer command = 0; Integer last_command = 0; - /** + /** * 任务号 */ Integer task = 0; @@ -111,7 +111,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme */ Integer y = 0; Integer last_y = 0; - /** + /** * 行走开关信号 */ Float move = 0F; @@ -121,12 +121,12 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme */ Float cargoMove = 0F; Float last_cargoMove = 0F; - /** + /** * 行走动作信号 */ Float action = 0F; Float last_action = 0F; - /** + /** * 行走激光数值 */ Integer distancex = 0; @@ -137,41 +137,41 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme Integer distancey = 0; Integer last_distancey = 0; /** - *载货台超限信号 + * 载货台超限信号 */ Float cargoError = 0F; Float last_cargoError = 0F; /** - *货叉探货信号 + * 货叉探货信号 */ Float forkCargo = 0F; Float last_forkCargo = 0F; /** - *货叉位置信号 + * 货叉位置信号 */ Float forkLocation = 0F; Float last_forkLocation = 0F; /** - *货叉动作信号 + * 货叉动作信号 */ Float forkAction = 0F; Float last_forkAction = 0F; - /** + /** * 特殊开关量1 */ Float special1 = 0F; Float last_special1 = 0F; - /** + /** * 特殊开关量2 */ Float special2 = 0F; Float last_special2 = 0F; /** - *托盘条码 + * 托盘条码 */ int[] trayCode; int[] last_trayCode; - /** + /** * 水箱和消防缓存位有无货 */ Float storage_cache = 0F; @@ -181,58 +181,58 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme */ Integer stacker_rpm = 0; Integer last_stacker_rpm = 0; - /** + /** * 电流 */ Integer stacker_electricCurrent = 0; Integer last_stacker_electricCurrent = 0; - /** + /** * 轴运行次数 */ Integer stacker_runing_time = 0; Integer last_stacker_runing_time = 0; - /** + /** * 轴工作时间（小时） */ Integer stacker_workingHours = 0; Integer last_stacker_workingHours = 0; /** - *载货台速度（转/分钟） + * 载货台速度（转/分钟） */ Integer cargo_rpm = 0; Integer last_cargo_rpm = 0; /** - *载货台电流 + * 载货台电流 */ Integer cargo_electric_Current = 0; Integer last_cargo_electric_Current = 0; /** - *载货台轴工作小时数 + * 载货台轴工作小时数 */ Integer cargo_workingHour = 0; Integer last_cargo_workingHour = 0; /** - *载货台轴运行次数 + * 载货台轴运行次数 */ Integer cargo_runingTimes = 0; Integer last_cargo_runingTimes = 0; /** - *货叉速度（转/分钟 + * 货叉速度（转/分钟 */ Integer fork_rpm = 0; Integer last_fork_rpm = 0; /** - *货叉电流 + * 货叉电流 */ Integer fork_electric_Current = 0; Integer last_fork_electric_Current = 0; /** - *货叉轴工作时间（小时 + * 货叉轴工作时间（小时 */ Integer fork_workingHours = 0; Integer last_fork_workingHours = 0; /** - *货叉轴运行次数 + * 货叉轴运行次数 */ Integer fork_runingTimes = 0; Integer last_fork_runingTimes = 0; @@ -250,7 +250,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme List getDeviceCodeList = null; List putDeviceCodeList = null; - /** + /** * 请求成功标记 */ Boolean requireSucess = false; @@ -459,7 +459,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme //更改指令状态 if (task > 0) { Instruction inst = checkInst(); - if (inst != null) { + if (ObjectUtil.isNotEmpty(inst)) { if (StrUtil.equals(inst.getInstruction_status(), "0")) { inst.setInstruction_status(CommonFinalParam.ONE); inst.setExecute_device_code(this.device_code); @@ -730,7 +730,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } map.put("to_x", inst.getFrom_y()); } - if(ObjectUtil.isNotEmpty(map)){ + if (ObjectUtil.isNotEmpty(map)) { list.add(map); this.writing(list); } @@ -828,7 +828,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme if (command == 8) { map.put("to_command", 8); } - if(ObjectUtil.isNotEmpty(map)){ + if (ObjectUtil.isNotEmpty(map)) { list.add(map); this.writing(list); } @@ -873,6 +873,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } } + /** * 完成指令 * @@ -926,7 +927,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } - /** + /** * 将扩展表中的字符串数据转换成集合 */ @Override diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/feedBackTaskStatus/FeedBackTaskStatusRequest.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/feedBackTaskStatus/FeedBackTaskStatusRequest.java index 961bbc8..1d3593b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/feedBackTaskStatus/FeedBackTaskStatusRequest.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/feedBackTaskStatus/FeedBackTaskStatusRequest.java @@ -6,6 +6,7 @@ import org.nl.acs.ext.wms.data.one.BaseRequest; @Data public class FeedBackTaskStatusRequest extends BaseRequest { + /** * 任务id */ diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java index c422828..fa78c94 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java @@ -131,10 +131,9 @@ public interface TaskService extends CommonService { /** * 查询所有数据不分页 * - * @param whereJson 条件参数 * @return List */ - List queryAll(String whereJson); + List queryAll(); /** * 根据状态查询 @@ -177,6 +176,13 @@ public interface TaskService extends CommonService { */ List queryByStauts(String task_status); + /** + * 根绝状态查询缓存 + * @param task_status + * @return + */ + List findByTaskStatus(String task_status); + /** * 根据编码查询 * @@ -234,14 +240,6 @@ public interface TaskService extends CommonService { List queryTaskByNextAndIntStatus(String head_next_device_code); - /** - * 根据关联编号查询非立刻下发的关联任务 - * - * @param link_num - * @return TaskDto - */ - TaskDto queryTaskByLinkNum(String link_num); - /** * 创建 * @@ -297,14 +295,6 @@ public interface TaskService extends CommonService { void cancel(String ids) throws Exception; - /** - * 取消任务 - * - * @param ids - * @throws Exception - */ - void cancelNoSendWms(String ids) throws Exception; - /** * 手动创建指令 * @@ -314,24 +304,6 @@ public interface TaskService extends CommonService { */ Instruction createInst(String ids) throws Exception; - /** - * 手动创建指令 - * - * @param inst - * @return - * @throws Exception - */ - Instruction createInst(Instruction inst) throws Exception; - - - /** - * ' - * 创建指令 - * - * @param dto - * @return - */ - Instruction createTemporaryInst(TaskDto dto); /** * 导出数据 @@ -351,14 +323,6 @@ public interface TaskService extends CommonService { void createTaskByClick(JSONObject json); - /** - * 检查是否允许创建任务 - * - * @param code - * @return - */ - int checkAllowCreate(String code); - /** * 从缓存中删除任务 * @@ -367,6 +331,13 @@ public interface TaskService extends CommonService { */ boolean removeByCodeFromCache(String code); + /** + * 向缓存中添加就绪和执行中任务 + * + * @param taskDto + */ + void addTaskToCache(TaskDto taskDto); + /** * 根据容器编号查询任务 * @@ -392,21 +363,6 @@ public interface TaskService extends CommonService { */ TaskDto findByNextCode(String device_code); - /** - * 根据目的地设备编号查询当前是否有设备 - * - * @param device_code - * @return - */ - List findAllByNextCode(String device_code); - - /** - * 根据设备编号查询当前是否有设备 - * - * @param device_code - * @return - */ - Integer queryAllTaskMaterialQty(String device_code); /** * 根据起点设备编号查询当前是否有设备 @@ -467,13 +423,6 @@ public interface TaskService extends CommonService { */ String queryAssignedByDevice(String device_code, String task_nextdevice_code); - /** - * 查询相同任务类型的数量 - * - * @param taskType - * @return - */ - Integer querySameTaskByType(String taskType); /** * 查询相同起点任务的数量 @@ -492,17 +441,6 @@ public interface TaskService extends CommonService { Integer querySameDestinationTask(String code); - /** - * 查询相同起终任务的数量 - * - * @param start_device - * @param next_device - * @param status - * @return Integer - */ - Integer querySameDeviceReadyTask(String start_device, String next_device, String status); - - /** * 条件查询任务和指令 * 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 3a4ab13..6784b08 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 @@ -28,6 +28,7 @@ import org.nl.acs.device.service.dto.DeviceAssignedDto; import org.nl.acs.device.service.impl.DeviceServiceImpl; import org.nl.acs.device_driver.DeviceDriverDefination; import org.nl.acs.device_driver.RequestMethodEnum; +import org.nl.acs.ext.wms.data.one.BaseRequest; import org.nl.acs.ext.wms.data.one.feedBackTaskStatus.FeedBackTaskStatusRequest; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.domain.Instruction; @@ -41,8 +42,6 @@ import org.nl.acs.route.domain.RoutePlan; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.route.service.mapper.RoutePlanMapper; -import org.nl.acs.storage_cell.service.StorageCellService; -import org.nl.acs.task.TaskInstructionLock; import org.nl.acs.task.enums.TaskStatusEnum; import org.nl.acs.task.service.TaskFeedbackService; import org.nl.acs.task.service.dto.TaskFeedbackDto; @@ -88,32 +87,32 @@ import java.util.stream.Collectors; public class TaskServiceImpl extends CommonServiceImpl implements TaskService, ApplicationAutoInitial { @Autowired - TaskMapper taskMapper; + private TaskMapper taskMapper; @Autowired - RoutePlanMapper routePlanMapper; + private RoutePlanMapper routePlanMapper; + @Autowired + private DeviceAppService deviceAppService; + @Autowired + private AcsToWmsService acstowmsService; + @Autowired + private TaskFeedbackService taskFeedbackService; + @Autowired + private ISysParamService paramService; + @Autowired + private XianGongAgvService agvService; + @Autowired + private RouteLineService routeLineService; + @Autowired + private DeviceAssignedService deviceAssignedService; + @Autowired + private InstructionService instructionService; - List tasks = new CopyOnWriteArrayList<>(); + /** + * 缓存 + * 存储未完成的任务信息 + */ + private CopyOnWriteArrayList tasks = new CopyOnWriteArrayList<>(); - @Autowired - DeviceAppService deviceAppService; - @Autowired - RouteLineService routelineserver; - @Autowired - AcsToWmsService acstowmsService; - @Autowired - TaskFeedbackService taskFeedbackService; - @Autowired - ISysParamService paramService; - @Autowired - XianGongAgvService agvService; - @Autowired - RouteLineService routeLineService; - @Autowired - DeviceAssignedService deviceAssignedService; - @Autowired - InstructionService instructionService; - @Autowired - StorageCellService storageCellService; @Override public PageInfo queryAll(TaskQueryParam query, Pageable pageable) { @@ -140,23 +139,18 @@ public class TaskServiceImpl extends CommonServiceImpl impleme @Override @Transactional(rollbackFor = Exception.class) public int insert(TaskDto resources) { - Task entity = ConvertUtil.convert(resources, Task.class); - return taskMapper.insert(entity); + return taskMapper.insert(ConvertUtil.convert(resources, Task.class)); } @Override @Transactional(rollbackFor = Exception.class) public int updateById(TaskDto resources) { - Task entity = ConvertUtil.convert(resources, Task.class); - int ret = taskMapper.updateById(entity); - // delCaches(resources.id); - return ret; + return taskMapper.updateById(ConvertUtil.convert(resources, Task.class)); } @Override @Transactional(rollbackFor = Exception.class) public int removeByIds(Set ids) { - // delCaches(ids); return taskMapper.deleteBatchIds(ids); } @@ -170,27 +164,23 @@ public class TaskServiceImpl extends CommonServiceImpl impleme /** - * 获取未完成任务 + * 刷新内存信息 * * @throws Exception */ @Override public void autoInitial() throws Exception { - Class var1 = TaskInstructionLock.class; - synchronized (TaskInstructionLock.class) { - this.reload(); - } + this.reload(); } @Override public synchronized void reload() { - List list = this.queryAll("task_status <2 and is_delete =0 order by create_time"); - - tasks = new CopyOnWriteArrayList<>(list); + List list = this.queryAll(); + this.tasks = list == null ? new CopyOnWriteArrayList<>() : new CopyOnWriteArrayList<>(list); } @Override - public List queryAll(String whereJson) { + public List queryAll() { List taskList = new LambdaQueryChainWrapper<>(taskMapper) .lt(Task::getTask_status, TaskStatusEnum.FINISHED.getIndex()) .eq(Task::getIs_delete, "0") @@ -251,74 +241,65 @@ public class TaskServiceImpl extends CommonServiceImpl impleme @Override public Map queryAllByCache(Map whereJson, Pageable page) { - this.reload(); String task_code = (String) whereJson.get("task_code"); String vehicle_code = (String) whereJson.get("vehicle_code"); String material_type = (String) whereJson.get("material_type"); String status = (String) whereJson.get("status"); String point_code = (String) whereJson.get("point_code"); - String is_over = (String) whereJson.get("is_over"); String task_type = (String) whereJson.get("task_type"); - List taskList = new ArrayList(); - - synchronized (TaskServiceImpl.class) { - Iterator it = tasks.iterator(); - while (it.hasNext()) { - TaskDto task = it.next(); - if (CommonFinalParam.ONE.equals(is_over) && Integer.valueOf(task.getTask_status()) < 2) { - continue; - } - if (!CommonFinalParam.ONE.equals(is_over) && Integer.valueOf(task.getTask_status()) >= 2) { - continue; - } - if (!ObjectUtil.isEmpty(task_code) && !task.getTask_code().contains(task_code)) { - continue; - } - if (!ObjectUtil.isEmpty(status) && !task.getTask_status().equals(status)) { - continue; - } - if (!ObjectUtil.isEmpty(vehicle_code) && !task.getVehicle_code().contains(vehicle_code)) { - continue; - } - if (!ObjectUtil.isEmpty(material_type) && !task.getMaterial().equals(material_type)) { - continue; - } - if (!ObjectUtil.isEmpty(point_code)) { - if (!(task.getStart_point_code().contains(point_code) - || task.getNext_point_code().contains(point_code))) { - continue; - } - } - if (!ObjectUtil.isEmpty(task_type) && !task.getTask_type().equals(task_type)) { - continue; - } - taskList.add(task); - } - - // 按照创建时间排序 - taskList = - taskList.stream() - .sorted( - (task1, task2) -> - DateUtil.compare( - DateUtil.parseDate(task1.getCreate_time()), - DateUtil.parse(task2.getCreate_time()))) - .collect(Collectors.toList()); - - } - + String is_over = (String) whereJson.get("is_over"); Integer currentPageNumber = page.getPageNumber() + 1; Integer pageMaxSize = page.getPageSize(); - List taskDtoList = - taskList.stream() - .skip((currentPageNumber - 1) * pageMaxSize) - .limit(pageMaxSize) + List taskList = + Optional + .ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(t -> { + if (StrUtil.isNotEmpty(task_code)) { + return t.getTask_code().contains(task_code); + } + return true; + }) + .filter(t -> { + if (StrUtil.isNotEmpty(vehicle_code)) { + return t.getVehicle_code().contains(vehicle_code); + } + return true; + }) + .filter(t -> { + if (StrUtil.isNotEmpty(material_type)) { + return t.getMaterial().contains(material_type); + } + return true; + }) + .filter(t -> { + if (StrUtil.isNotEmpty(status)) { + return t.getTask_status().contains(status); + } + return true; + }) + .filter(t -> { + if (StrUtil.isNotEmpty(point_code)) { + return t.getStart_point_code().contains(point_code) || t.getNext_point_code().equals(point_code) || t.getPut_point_code().equals(point_code); + } + return true; + }) + .filter(t -> { + if (StrUtil.isNotEmpty(task_type)) { + return t.getTask_type().contains(task_type); + } + return true; + }) + .sorted((task1, task2) -> DateUtil.compare(DateUtil.parseDate(task1.getCreate_time()), DateUtil.parse(task2.getCreate_time()))) .collect(Collectors.toList()); + List skipList = taskList.stream().skip((currentPageNumber - 1) * pageMaxSize) + .limit(pageMaxSize) + .collect(Collectors.toList()); JSONObject jo = new JSONObject(); - jo.put("content", taskDtoList); + jo.put("content", skipList); jo.put("totalElements", taskList.size()); return jo; - } @Override @@ -369,7 +350,6 @@ public class TaskServiceImpl extends CommonServiceImpl impleme @Override public List queryAll(Map whereJson) { - List taskList = new LambdaQueryChainWrapper<>(taskMapper) .list(); return ConvertUtil.convertList(taskList, TaskDto.class); @@ -394,117 +374,79 @@ public class TaskServiceImpl extends CommonServiceImpl impleme @Override public List queryTaskByDeviceCode(String device_code) { - List list = new ArrayList<>(); - Iterator iterator = tasks.iterator(); - while (iterator.hasNext()) { - TaskDto task = iterator.next(); - if (task.getStart_device_code().equals(device_code) - && StrUtil.equals(task.getTask_status(), TaskStatusEnum.READY.getIndex())) { - list.add(task); - } - } - return list; + return Optional + .ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(taskDto -> taskDto.getStart_device_code().equals(device_code) + && StrUtil.equals(taskDto.getTask_status(), TaskStatusEnum.READY.getIndex())) + .collect(Collectors.toList()); } @Override public List queryTaskByStartDeviceCode(String start_device_code) { - List list = new ArrayList<>(); - Iterator iterator = tasks.iterator(); - while (iterator.hasNext()) { - TaskDto task = iterator.next(); - if (!StrUtil.equals(task.getTask_type(), "6")) { - continue; - } - if (StrUtil.equals(task.getTask_status(), TaskStatusEnum.READY.getIndex())) { - if ((task.getStart_device_code().equals(start_device_code) - || task.getStart_device_code2().equals(start_device_code))) { - list.add(task); - } - } - } - return list; + return Optional + .ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(task -> StrUtil.equals(task.getTask_type(), "6") + && StrUtil.equals(task.getTask_status(), TaskStatusEnum.READY.getIndex()) + && (task.getStart_device_code().equals(start_device_code) + || task.getStart_device_code2().equals(start_device_code))) + .collect(Collectors.toList()); } @Override public List queryTaskByBackDeviceCode(String back_start_device_code) { - List list = new ArrayList<>(); - Iterator iterator = tasks.iterator(); - while (iterator.hasNext()) { - TaskDto task = iterator.next(); - if (!StrUtil.equals(task.getTask_type(), "6")) { - continue; - } - if (task.getStart_device_code().equals(back_start_device_code) - && StrUtil.equals(task.getTask_status(), TaskStatusEnum.READY.getIndex())) { - list.add(task); - } - } - return list; + return Optional + .ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(task -> StrUtil.equals(task.getTask_type(), "6") + && task.getStart_device_code().equals(back_start_device_code) + && StrUtil.equals(task.getTask_status(), TaskStatusEnum.READY.getIndex())) + .collect(Collectors.toList()); } @Override public List queryTaskByDeviceCodeAndStatus(String device_code) { - List list = new ArrayList<>(); - Iterator iterator = tasks.iterator(); - while (iterator.hasNext()) { - TaskDto task = iterator.next(); - if (task.getStart_device_code().equals(device_code) - && StrUtil.equals(task.getTask_status(), TaskStatusEnum.BUSY.getIndex())) { - Instruction instruction = instructionService.findByTaskcodeAndStatus(task.getTask_code()); - if (ObjectUtil.isNotEmpty(instruction)) { - list.add(task); - } - } - } - return list; + return Optional + .ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(task -> task.getStart_device_code().equals(device_code) + && StrUtil.equals(task.getTask_status(), TaskStatusEnum.BUSY.getIndex())) + .filter(task -> instructionService.findByTaskcodeAndStatus(task.getTask_code()) != null) + .collect(Collectors.toList()); } @Override public List queryTaskByStartAndIntStatus(String head_start_device_code) { - List list = new ArrayList<>(); - Iterator iterator = tasks.iterator(); - while (iterator.hasNext()) { - TaskDto task = iterator.next(); - if (!StrUtil.equals(task.getTask_type(), "6")) { - continue; - } - if (StrUtil.equals(task.getTask_status(), TaskStatusEnum.BUSY.getIndex())) { - if ((task.getStart_device_code().equals(head_start_device_code) - || task.getStart_device_code2().equals(head_start_device_code))) { - Instruction instruction = instructionService.findByTaskcodeAndStatus(task.getTask_code()); - if (ObjectUtil.isNotEmpty(instruction)) { - list.add(task); - } - } - } - } - return list; + return Optional + .ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(task -> StrUtil.equals(task.getTask_type(), "6") + && StrUtil.equals(task.getTask_status(), TaskStatusEnum.BUSY.getIndex()) + && (task.getStart_device_code().equals(head_start_device_code) + || task.getStart_device_code2().equals(head_start_device_code))) + .filter(task -> instructionService.findByTaskcodeAndStatus(task.getTask_code()) != null) + .collect(Collectors.toList()); } @Override public List queryTaskByNextAndIntStatus(String back_start_device_code) { - List list = new ArrayList<>(); - Iterator iterator = tasks.iterator(); - while (iterator.hasNext()) { - TaskDto task = iterator.next(); - if (!StrUtil.equals(task.getTask_type(), "6")) { - continue; - } - if ((task.getStart_device_code().equals(back_start_device_code)) - && StrUtil.equals(task.getTask_status(), TaskStatusEnum.BUSY.getIndex())) { - Instruction instruction = instructionService.findByTaskcodeAndStatus(task.getTask_code()); - if (ObjectUtil.isNotEmpty(instruction)) { - list.add(task); - } - } - } - return list; + return Optional + .ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(task -> StrUtil.equals(task.getTask_type(), "6") + && task.getStart_device_code().equals(back_start_device_code) + && StrUtil.equals(task.getTask_status(), TaskStatusEnum.BUSY.getIndex())) + .filter(task -> instructionService.findByTaskcodeAndStatus(task.getTask_code()) != null) + .collect(Collectors.toList()); } - @Override - public TaskDto queryTaskByLinkNum(String link_num) { - return null; - } @Override public List queryByStauts(String status) { @@ -514,10 +456,22 @@ public class TaskServiceImpl extends CommonServiceImpl impleme return ConvertUtil.convertList(taskList, TaskDto.class); } + @Override - @Transactional(rollbackFor = Exception.class) + public List findByTaskStatus(String status) { + List taskDtoList = new ArrayList<>(); + Iterator iterator = tasks.iterator(); + if (iterator.hasNext()) { + TaskDto task = iterator.next(); + if(StrUtil.equals(task.getTask_status(), status)){ + taskDtoList.add(task); + } + } + return taskDtoList; + } + + public void create(TaskDto dto) throws Exception { - CommonFinalParam commonFinalParam = new CommonFinalParam(); dto = foramte(dto); if (!StrUtil.isEmpty(dto.getVehicle_code())) { TaskDto vehicle_dto = this.findByContainer(dto.getVehicle_code()); @@ -534,7 +488,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme String task_code = dto.getTask_code(); if (StrUtil.isEmpty(task_code)) { task_code = CodeUtil.getNewCode("TASK_NO"); - task_code = commonFinalParam.getBARRE() + task_code; + task_code = CommonFinalParam.HYPHEN_ + task_code; } String start_point_code = dto.getStart_point_code(); String next_point_code = dto.getNext_point_code(); @@ -558,7 +512,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme // 判断起点终点设备类型 String startDeviceType = deviceAppService.findDeviceTypeByCode(dto.getStart_device_code()); String nextDeviceType = deviceAppService.findDeviceTypeByCode(dto.getNext_device_code()); - if (routelineserver + if (routeLineService .getShortPathLines(dto.getStart_device_code(), dto.getNext_device_code(), plan_code) .size() == 0) { @@ -568,14 +522,22 @@ public class TaskServiceImpl extends CommonServiceImpl impleme DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); Device nextdevice = appService.findDeviceByCode(next_device_code); + if (nextdevice == null){ + //TODO 国际化处理 + throw new BadRequestException("终点设备未配置"); + } Device startdevice = appService.findDeviceByCode(start_device_code); + if (startdevice == null){ + //TODO 国际化处理 + throw new BadRequestException("起点设备未配置"); + } dto.setMaterial(startdevice.getMaterial_type()); if (StrUtil.equals(DeviceType.storage.toString(), startDeviceType)) { - start_point_code = start_device_code + commonFinalParam.getBARRE() + dto.getFrom_y() + commonFinalParam.getBARRE() + dto.getFrom_z(); + start_point_code = start_device_code + CommonFinalParam.HYPHEN_ + dto.getFrom_y() + CommonFinalParam.HYPHEN_ + dto.getFrom_z(); dto.setStart_point_code(start_point_code); } if (StrUtil.equals(DeviceType.storage.toString(), nextDeviceType)) { - next_point_code = next_device_code + commonFinalParam.getBARRE() + dto.getTo_y() + commonFinalParam.getBARRE() + dto.getTo_z(); + next_point_code = next_device_code + CommonFinalParam.HYPHEN_ + dto.getTo_y() + CommonFinalParam.HYPHEN_ + dto.getTo_z(); dto.setNext_point_code(next_point_code); } if (StrUtil.equals(createTaskCheck, CommonFinalParam.ONE)) { @@ -635,14 +597,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme } Task entity = ConvertUtil.convert(dto, Task.class); taskMapper.insert(entity); - synchronized (TaskServiceImpl.class) { - System.out.println("-------------------" + dto.getTask_code()); - System.out.println("-------------1" + tasks.size()); - - tasks.add(dto); - System.out.println("-------------2" + tasks.size()); - - } + tasks.add(dto); } /** @@ -657,7 +612,6 @@ public class TaskServiceImpl extends CommonServiceImpl impleme if (array.size() == 0) { throw new BadRequestException(LangProcess.msg("starting_point_isNull")); - //throw new RuntimeException("请选择起点"); } for (int i = 0; i < array.size(); i++) { JSONObject arrjo = array.getJSONObject(i); @@ -674,7 +628,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme new LambdaQueryChainWrapper<>(routePlanMapper) .eq(RoutePlan::getPlan_code, dto.getRoute_plan_code()) .one().getPlan_uuid(); - JSONArray ja = routelineserver.queryNextLine(device_code, plan_uuid); + JSONArray ja = routeLineService.queryNextLine(device_code, plan_uuid); for (int j = 0; j < ja.size(); j++) { JSONObject jo = (JSONObject) ja.get(j); next_device_code = jo.get("next_device_code").toString(); @@ -764,7 +718,6 @@ public class TaskServiceImpl extends CommonServiceImpl impleme @Override @Transactional(rollbackFor = Exception.class) public void update(TaskDto dto) { - TaskDto entity = this.findById(dto.getTask_id()); if (entity == null) { throw new BadRequestException(LangProcess.msg("error_sysAuth")); @@ -778,42 +731,12 @@ public class TaskServiceImpl extends CommonServiceImpl impleme Task task = ConvertUtil.convert(dto, Task.class); taskMapper.updateById(task); - Iterator iterator = tasks.iterator(); -// while (iterator.hasNext()) { -// TaskDto task = iterator.next(); -// if (task.getTask_code().equals(dto.getTask_code())) { -// iterator.remove(); -// } -// } - - - removeByCodeFromCache(entity.getTask_code()); - - if (StrUtil.equals(dto.getTask_status(), TaskStatusEnum.READY.getIndex()) || StrUtil.equals(dto.getTask_status(), TaskStatusEnum.BUSY.getIndex())) { - tasks.add(dto); - } - // 判断是否为WMS下发的任务，如果是反馈任务状态给WMS - CommonFinalParam commonFinalParam = new CommonFinalParam(); - String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); - if (!StrUtil.startWith(dto.getTask_code(), commonFinalParam.getBARRE()) && StrUtil.equals(hasWms, CommonFinalParam.ONE)) { - TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code()); - FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); - request.setTask_code(entity.getTask_code()); - request.setTask_status(entity.getTask_status()); - request.setRequest_medthod_code(RequestMethodEnum.feedback_task_status.getCode()); - request.setRequest_medthod_name(RequestMethodEnum.feedback_task_status.getName()); - boolean flag = false; - String resp = null; - try { - resp = acstowmsService.feedTaskStatus(request); - log.info("任务号:{},反馈wms任务状态完成成功,响应信息:{}!", entity.getTask_code(), resp); - } catch (Exception e) { - log.error("任务号:{},反馈wms任务状态失败,原因:{}!", entity.getTask_code(), e.getMessage()); - } finally { - - } - } - + //从缓存中移除任务信息 + this.removeByCodeFromCache(entity.getTask_code()); + //向缓存添加任务信息 + this.addTaskToCache(dto); + //反馈上位系统任务状态 + this.feedWmsTaskStatus(entity); } @Override @@ -827,16 +750,16 @@ public class TaskServiceImpl extends CommonServiceImpl impleme @Override @Transactional(rollbackFor = Exception.class) public void finish(String id) { - CommonFinalParam commonFinalParam = new CommonFinalParam(); TaskDto entity = this.findById(id); if (entity == null) { throw new BadRequestException(LangProcess.msg("error_sysAuth")); } - InstructionService instructionservice = SpringContextHolder.getBean("instructionServiceImpl"); - InstructionDto instdto = instructionservice.findByTaskid(id, "instruction_status <2 "); + + InstructionDto instdto = instructionService.findByTaskid(id, "instruction_status <2 "); if (instdto != null) { throw new BadRequestException(LangProcess.msg("task_insHas")); } + String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); entity.setUpdate_time(now); @@ -846,37 +769,12 @@ public class TaskServiceImpl extends CommonServiceImpl impleme Task task = ConvertUtil.convert(entity, Task.class); taskMapper.updateById(task); - removeByCodeFromCache(entity.getTask_code()); - // 判断是否为WMS下发的任务，如果是反馈任务状态给WMS - String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); - if (!StrUtil.startWith(entity.getTask_code(), commonFinalParam.getBARRE()) && StrUtil.equals(hasWms, CommonFinalParam.ONE)) { - FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); - 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()); - request.setRequest_medthod_name(RequestMethodEnum.feedback_task_status.getName()); - boolean flag = false; - String resp = null; - try { - resp = acstowmsService.feedTaskStatus(request); - log.info("任务号:{},反馈wms任务状态完成成功,响应信息:{}!", entity.getTask_code(), resp); - } catch (Exception e) { - log.error("任务号:{},反馈wms任务状态失败,原因:{}!", entity.getTask_code(), e.getMessage()); - flag = true; - e.printStackTrace(); - } finally { - - } - } - // 如果属于先知AGV，关闭运单序列 - if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) { - try { - agvService.markComplete(entity.getTask_code()); - } catch (Exception e) { - e.printStackTrace(); - } - } + //移除任务缓存信息 + this.removeByCodeFromCache(entity.getTask_code()); + //反馈上位系统任务状态 + this.feedWmsTaskStatus(entity); + //关闭仙工运单序列 + this.markComplete(entity); } @Override @@ -886,11 +784,12 @@ public class TaskServiceImpl extends CommonServiceImpl impleme if (entity == null) { throw new BadRequestException(LangProcess.msg("error_sysAuth")); } - InstructionService instructionservice = SpringContextHolder.getBean("instructionServiceImpl"); - InstructionDto instdto = instructionservice.findByTaskid(id, "instruction_status <2 "); + + InstructionDto instdto = instructionService.findByTaskid(id, "instruction_status <2 "); if (instdto != null) { throw new BadRequestException(LangProcess.msg("task_insRun")); } + String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); entity.setUpdate_time(now); @@ -899,238 +798,14 @@ public class TaskServiceImpl extends CommonServiceImpl impleme Task task = ConvertUtil.convert(entity, Task.class); taskMapper.updateById(task); - - -// synchronized (TaskServiceImpl.class){ -// Iterator it = tasks.iterator(); -// // 清理缓存 -// while (it.hasNext()) { -// TaskDto taskDto = it.next(); -// if (taskDto.getTask_id().equals(id)) { -// tasks.remove(taskDto); -// } -// }} - - removeByCodeFromCache(entity.getTask_code()); - - // 判断是否为WMS下发的任务，如果是反馈任务状态给WMS - String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); - CommonFinalParam commonFinalParam = new CommonFinalParam(); - if (!StrUtil.startWith(entity.getTask_code(), commonFinalParam.getBARRE()) && StrUtil.equals(hasWms, CommonFinalParam.ONE)) { - 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()); - request.setRequest_medthod_name(RequestMethodEnum.feedback_task_status.getName()); - boolean flag = false; - String resp = null; - try { - resp = acstowmsService.feedTaskStatus(request); - log.info("任务号:{},反馈wms任务状态完成成功,响应信息:{}!", entity.getTask_code(), resp); - } catch (Exception e) { - log.error("任务号:{},反馈wms任务状态失败,原因:{}!", entity.getTask_code(), e.getMessage()); - } finally { - - } - } - List shortPathsList = - routeLineService.getShortPathLines( - entity.getStart_device_code(), - entity.getNext_device_code(), - entity.getRoute_plan_code()); - if (ObjectUtil.isNotEmpty(shortPathsList)) { - String type = shortPathsList.get(0).getType(); - // != 0 为agv任务 - if (!StrUtil.equals(type, "0")) { - if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) { - agvService.markComplete(entity.getTask_code()); - } - } - } - + //移除任务缓存信息 + this.removeByCodeFromCache(entity.getTask_code()); + //反馈上位系统任务状态 + this.feedWmsTaskStatus(entity); + //关闭仙工运单序列 + this.markComplete(entity); } - @Override - @Transactional(rollbackFor = Exception.class) - public void cancelNoSendWms(String id) throws Exception { - TaskDto entity = this.findById(id); - if (entity == null) { - throw new BadRequestException(LangProcess.msg("error_sysAuth")); - } - InstructionService instructionservice = SpringContextHolder.getBean("instructionServiceImpl"); - InstructionDto instdto = instructionservice.findByTaskid(id, "instruction_status <2 "); - if (instdto != null) { - throw new BadRequestException(LangProcess.msg("task_insRun")); - } - String currentUsername = SecurityUtils.getCurrentUsername(); - String now = DateUtil.now(); - entity.setUpdate_time(now); - entity.setUpdate_by(currentUsername); - entity.setTask_status(TaskStatusEnum.CANCEL.getIndex()); -// WQLObject wo = WQLObject.getWQLObject("acs_task"); -// JSONObject json = (JSONObject) JSONObject.toJSON(entity); -// wo.update(json); - - Task task = ConvertUtil.convert(entity, Task.class); - taskMapper.updateById(task); - -// synchronized (TaskServiceImpl.class){ -// Iterator it = tasks.iterator(); -// // 清理缓存 -// while (it.hasNext()) { -// TaskDto taskDto = it.next(); -// if (taskDto.getTask_id().equals(id)) { -// tasks.remove(taskDto); -// } -// }} - - removeByCodeFromCache(entity.getTask_code()); - - List shortPathsList = - routeLineService.getShortPathLines( - entity.getStart_device_code(), - entity.getNext_device_code(), - entity.getRoute_plan_code()); - String type = shortPathsList.get(0).getType(); - // != 0 为agv任务 - if (!StrUtil.equals(type, "0")) { - if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) { - agvService.markComplete(entity.getTask_code()); - } - } - } - - @Override - public Instruction createTemporaryInst(TaskDto acsTask) { - if (acsTask == null) { - throw new BadRequestException(LangProcess.msg("error_sysAuth")); - } - acsTask = foramte(acsTask); - ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - InstructionService instructionservice = SpringContextHolder.getBean("instructionServiceImpl"); - // InstructionDto inst = instructionservice.findByTaskid(acsTask, "instruction_status < 2 - // "); - // if (inst != null) { - // throw new BadRequestException("有指令未完成!"); - // } - - String taskid = acsTask.getTask_id(); - String taskcode = acsTask.getTask_code(); - String vehiclecode = acsTask.getVehicle_code(); - String priority = acsTask.getPriority(); - String start_point_code = acsTask.getStart_point_code(); - String start_device_code = acsTask.getStart_device_code(); - String route_plan_code = acsTask.getRoute_plan_code(); - String vehicleType = acsTask.getVehicle_type(); - // 是否复合任务 =0非复合任务 - String compound_task = acsTask.getCompound_task(); - String next_point_code = acsTask.getNext_point_code(); - String next_device_code = acsTask.getNext_device_code(); - String start_point_code2 = acsTask.getStart_point_code2(); - String next_point_code2 = acsTask.getNext_point_code2(); - String agv_system_type = acsTask.getAgv_system_type(); - String task_type = acsTask.getTask_type(); - String from_x = acsTask.getFrom_x(); - String from_y = acsTask.getFrom_y(); - String from_z = acsTask.getFrom_z(); - String to_x = acsTask.getTo_x(); - String to_y = acsTask.getTo_y(); - String to_z = acsTask.getTo_z(); - - /** 开始平均分解校验 */ - String this_device_code = - this.queryAssignedByDevice(acsTask.getStart_device_code(), acsTask.getNext_device_code()); - if (StrUtil.isEmpty(this_device_code)) { - List shortPathsList = - routeLineService.getShortPathLines( - start_device_code, acsTask.getNext_device_code(), route_plan_code); - RouteLineDto routeLineDto = shortPathsList.get(0); - String path = routeLineDto.getPath(); - String type = routeLineDto.getType(); - String[] str = path.split("->"); - List pathlist = Arrays.asList(str); - int index = 0; - for (int m = 0; m < pathlist.size(); m++) { - if (pathlist.get(m).equals(start_device_code)) { - index = m + 1; - break; - } - } - next_device_code = pathlist.get(index); - } else { - next_device_code = this_device_code; - } - CommonFinalParam commonFinalParam = new CommonFinalParam(); - if (StrUtil.equals(appService.findDeviceTypeByCode(next_device_code), "storage")) { - next_point_code = next_device_code + commonFinalParam.getBARRE() + acsTask.getTo_y() + commonFinalParam.getBARRE() + acsTask.getTo_z(); - } else { - next_point_code = next_device_code; - } - - Instruction instdto = new Instruction(); - if (StrUtil.isEmpty(instdto.getInstruction_code())) { - instdto.setInstruction_code(CodeUtil.getNewCode("INSTRUCT_NO")); - } - instdto.setInstruction_type(task_type); - instdto.setInstruction_id(IdUtil.simpleUUID()); - instdto.setRoute_plan_code(route_plan_code); - instdto.setRemark(acsTask.getRemark()); - instdto.setMaterial(acsTask.getMaterial()); - instdto.setQuantity(acsTask.getQuantity()); - instdto.setTask_id(taskid); - instdto.setTask_code(taskcode); - instdto.setVehicle_code(vehiclecode); - String now = DateUtil.now(); - instdto.setCreate_time(now); - instdto.setCreate_by("auto"); - instdto.setStart_device_code(start_device_code); - instdto.setNext_device_code(next_device_code); - instdto.setStart_point_code(start_point_code); - instdto.setNext_point_code(next_point_code); - instdto.setPriority(priority); - instdto.setInstruction_status(InstructionStatusEnum.READY.getIndex()); - instdto.setExecute_device_code(start_point_code); - instdto.setVehicle_type(vehicleType); - instdto.setStart_point_code2(start_point_code2); - instdto.setStart_device_code2(start_point_code2); - instdto.setNext_device_code2(next_point_code2); - instdto.setNext_point_code2(next_point_code2); - instdto.setAgv_system_type(agv_system_type); - instdto.setFrom_x(from_x); - instdto.setFrom_y(from_y); - instdto.setFrom_z(from_z); - instdto.setTo_x(to_x); - instdto.setTo_y(to_y); - instdto.setTo_z(to_z); - - // 判断agv系统 - // 1、1楼叉车系统 - // 2、2楼1区域AGV系统 - // 3、2楼2区域AGV系统 - if (!StrUtil.equals(agv_system_type, CommonFinalParam.ONE)) { - // task_type - // 1、生箔； Itype=1:取空，取满，放空，放满； - // 2、分切 Itype=3取满、取空、放满、放空； - // 3、普通任务 Itype=2:取货、放货； - // 4、叉车任务 - // 5、输送任务 - // 6、行架 - // 7、立库 - if (StrUtil.equals(task_type, CommonFinalParam.ONE)) { - instdto.setAgv_inst_type(CommonFinalParam.ONE); - } else if (StrUtil.equals(task_type, "3")) { - instdto.setAgv_inst_type("2"); - } else if (StrUtil.equals(task_type, "2")) { - instdto.setAgv_inst_type("3"); - } - } else { - instdto.setAgv_inst_type("4"); - } - return instdto; - } @Override public Instruction createInst(String ids) throws Exception { @@ -1184,9 +859,8 @@ public class TaskServiceImpl extends CommonServiceImpl impleme } else { next_device_code = this_device_code; } - CommonFinalParam commonFinalParam = new CommonFinalParam(); if (StrUtil.equals(appService.findDeviceTypeByCode(next_device_code), "storage")) { - next_point_code = next_device_code + commonFinalParam.getBARRE() + acsTask.getTo_y() + commonFinalParam.getBARRE() + acsTask.getTo_z(); + next_point_code = next_device_code + CommonFinalParam.HYPHEN_ + acsTask.getTo_y() + CommonFinalParam.HYPHEN_ + acsTask.getTo_z(); } else { next_point_code = next_device_code; } @@ -1225,15 +899,6 @@ public class TaskServiceImpl extends CommonServiceImpl impleme return instdto; } - @Override - public Instruction createInst(Instruction inst) throws Exception { - - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - InstructionService instructionservice = SpringContextHolder.getBean("instructionServiceImpl"); - - instructionservice.create2(inst); - return inst; - } @Override public void download(List all, HttpServletResponse response) throws IOException { @@ -1279,132 +944,81 @@ public class TaskServiceImpl extends CommonServiceImpl impleme public void createTaskByClick(JSONObject json) { } - @Override - public int checkAllowCreate(String devicecode) { - Map map = new HashMap(); - List taskList = this.queryAllUnfinished(map); - int num = 0; - for (int i = 0; i < taskList.size(); i++) { - TaskDto onetask = taskList.get(i); - String next_code = onetask.getNext_point_code(); - if (StrUtil.equals(devicecode, next_code)) { - num = num + 1; - } - } - return num; - } @Override public boolean removeByCodeFromCache(String code) { - CopyOnWriteArrayList taskDtos = (CopyOnWriteArrayList) this.tasks; - taskDtos.removeIf((task) -> { - return task.getTask_code().equals(code); - }); - return true; + return this.tasks.removeIf(task -> task.getTask_code().equals(code)); + } + + @Override + public void addTaskToCache(TaskDto taskDto) { + if (StrUtil.equals(taskDto.getTask_status(), TaskStatusEnum.READY.getIndex()) || StrUtil.equals(taskDto.getTask_status(), TaskStatusEnum.BUSY.getIndex())) { + tasks.add(taskDto); + } } @Override public List findAllTaskFromCache() { - return tasks; + return this.tasks; } @Override public TaskDto findByContainer(String container_code) { - Iterator var3 = tasks.iterator(); + Optional optionalTask = tasks.stream() + .filter(task -> StrUtil.equals(task.getVehicle_code(), container_code)) + .findFirst(); - while (var3.hasNext()) { - TaskDto task = (TaskDto) var3.next(); - if (StrUtil.equals(task.getVehicle_code(), container_code)) { - return task; - } - } - - return null; + return optionalTask.orElse(null); } @Override public TaskDto findByCodeFromCache(String task_code) { - Iterator var3 = tasks.iterator(); + Optional optionalTask = tasks.stream() + .filter(task -> StrUtil.equals(task.getTask_code(), task_code)) + .findFirst(); - while (var3.hasNext()) { - TaskDto task = (TaskDto) var3.next(); - if (StrUtil.equals(task.getTask_code(), task_code)) { - return task; - } - } - return null; + return optionalTask.orElse(null); } @Override public TaskDto findByNextCode(String device_code) { - Iterator var3 = tasks.iterator(); - - while (var3.hasNext()) { - TaskDto task = (TaskDto) var3.next(); - if (StrUtil.equals(task.getNext_device_code(), device_code)) { - return task; - } - } - return null; + Optional optionalTask = tasks.stream() + .filter(task -> StrUtil.equals(task.getNext_device_code(), device_code)) + .findFirst(); + return optionalTask.orElse(null); } - @Override - public List findAllByNextCode(String device_code) { - return null; - } - - @Override - public Integer queryAllTaskMaterialQty(String device_code) { - return null; - } @Override public TaskDto findByStartCodeAndReady(String device_code) { - Iterator var3 = tasks.iterator(); - - while (var3.hasNext()) { - TaskDto task = (TaskDto) var3.next(); - // if (!StrUtil.equals(task.getTask_type(), "5")) { - // continue; - // } - if (StrUtil.equals(task.getStart_device_code(), device_code) - && StrUtil.equals(task.getTask_status(), TaskStatusEnum.READY.getIndex())) { - return task; - } - } - return null; + Optional optionalTask = tasks.stream() + .filter(task -> StrUtil.equals(task.getStart_device_code(), device_code) + && StrUtil.equals(task.getTask_status(), TaskStatusEnum.READY.getIndex())) + .findFirst(); + return optionalTask.orElse(null); } @Override public TaskDto findByEndCodeAndReady(String device_code, String index) { - Iterator var3 = tasks.iterator(); - - while (var3.hasNext()) { - TaskDto task = (TaskDto) var3.next(); - // if (!StrUtil.equals(task.getTask_type(), "5")) { - // continue; - // } - if (StrUtil.equals(task.getNext_device_code(), device_code) - && StrUtil.equals(task.getTask_status(), TaskStatusEnum.READY.getIndex()) && StrUtil.equals(task.getTask_type(), index)) { - return task; - } - } - return null; + Optional optionalTask = tasks.stream() + .filter(task -> StrUtil.equals(task.getNext_device_code(), device_code) + && StrUtil.equals(task.getTask_status(), TaskStatusEnum.READY.getIndex()) + && StrUtil.equals(task.getTask_type(), index)) + .findFirst(); + return optionalTask.orElse(null); } @Override public TaskDto findByStartCode(String device_code) { - Iterator var3 = tasks.iterator(); - - while (var3.hasNext()) { - TaskDto task = (TaskDto) var3.next(); - if (StrUtil.equals(task.getStart_device_code(), device_code)) { - return task; - } - } - return null; + return Optional + .ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(task -> StrUtil.equals(task.getStart_device_code(), device_code)) + .findFirst() + .orElse(null); } @Override @@ -1548,7 +1162,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme @Override public void updateByCodeFromCache(TaskDto dto) { removeByCodeFromCache(dto.getTask_code()); - tasks.add(dto); + this.tasks.add(dto); } @Override @@ -1592,21 +1206,6 @@ public class TaskServiceImpl extends CommonServiceImpl impleme return null; } - @Override - public Integer querySameDeviceReadyTask(String start_device, String next_device, String status) { - int num = 0; - Iterator iterator = tasks.iterator(); - while (iterator.hasNext()) { - TaskDto task = iterator.next(); - if (StrUtil.equals(task.getStart_device_code(), start_device) - && StrUtil.equals(task.getNext_device_code(), next_device) - && StrUtil.equals(task.getTask_status(), status)) { - num++; - } - } - - return num; - } @Override public List getTaskAndInst(Map whereJson) { @@ -1734,87 +1333,60 @@ public class TaskServiceImpl extends CommonServiceImpl impleme public List getTaskList(Map whereJson) { LambdaQueryWrapper wrapper = getTaskLambdaQueryWrapper(whereJson); List taskList = taskMapper.selectList(wrapper); - List array = new ArrayList<>(); - if (CollUtil.isNotEmpty(taskList) && taskList.size() > 0) { - for (Task task : taskList) { - JSONObject ins = new JSONObject(); - ins.put("task_code", task.getTask_code()); - ins.put("vehicle_code", task.getVehicle_code()); - ins.put("task_status", task.getTask_status()); - ins.put("priority", task.getPriority()); - ins.put("start_point_code", task.getStart_point_code()); - ins.put("next_point_code", task.getNext_point_code()); - ins.put("matarial", task.getMaterial()); - ins.put("quantity", task.getQuantity()); - ins.put("remark", task.getRemark()); - ins.put("create_by", task.getCreate_by()); - ins.put("create_time", task.getCreate_time()); - array.add(ins); - } - } - return array; + return Optional + .ofNullable(taskList) + .orElse(new ArrayList<>()) + .stream() + .map(task -> { + JSONObject ins = new JSONObject(); + ins.put("task_code", task.getTask_code()); + ins.put("vehicle_code", task.getVehicle_code()); + ins.put("task_status", task.getTask_status()); + ins.put("priority", task.getPriority()); + ins.put("start_point_code", task.getStart_point_code()); + ins.put("next_point_code", task.getNext_point_code()); + ins.put("matarial", task.getMaterial()); + ins.put("quantity", task.getQuantity()); + ins.put("remark", task.getRemark()); + ins.put("create_by", task.getCreate_by()); + ins.put("create_time", task.getCreate_time()); + return ins; + }) + .collect(Collectors.toList()); } @Override public List findByStartCodeAndBusy(String deviceCode) { - Iterator var3 = tasks.iterator(); - ArrayList tasks = new ArrayList<>(); - while (var3.hasNext()) { - TaskDto task = (TaskDto) var3.next(); - // if (!StrUtil.equals(task.getTask_type(), "5")) { - // continue; - // } - if (StrUtil.equals(task.getStart_device_code(), deviceCode) - && StrUtil.equals(task.getTask_status(), TaskStatusEnum.BUSY.getIndex())) { - if (tasks.size() < 2) { - tasks.add(task); - } - } - } - return tasks; + return Optional + .ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(task -> StrUtil.equals(task.getStart_device_code(), deviceCode) + && StrUtil.equals(task.getTask_status(), TaskStatusEnum.BUSY.getIndex())) + .limit(2) + .collect(Collectors.toList()); } - @Override - public Integer querySameTaskByType(String taskType) { - int num = 0; - Iterator iterator = tasks.iterator(); - while (iterator.hasNext()) { - TaskDto task = iterator.next(); - if (task.getTask_type().equals(taskType) && task.getTask_status().equals(TaskStatusEnum.BUSY.getIndex())) { - num++; - } - } - - return num; - } - @Override public Integer querySameOriginTask(String code) { - int num = 0; - Iterator iterator = tasks.iterator(); - while (iterator.hasNext()) { - TaskDto task = iterator.next(); - if (StrUtil.equals(task.getStart_device_code(), code)) { - num++; - } - } - - return num; + return (int) Optional + .ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(task -> StrUtil.equals(task.getStart_device_code(), code)) + .count(); } @Override public Integer querySameDestinationTask(String code) { - int num = 0; - Iterator iterator = tasks.iterator(); - while (iterator.hasNext()) { - TaskDto task = iterator.next(); - if (StrUtil.equals(task.getNext_device_code(), code)) { - num++; - } - } - - return num; + return Optional + .ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(taskDto -> StrUtil.equals(taskDto.getNext_device_code(), code)) + .collect(Collectors.toList()) + .size(); } @Override @@ -1828,7 +1400,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme JSONObject param = JSON.parseObject(dto.getParam()); List pathList = this.getPathList(inst_nextDevice_code); for (int j = 0; j < pathList.size(); j++) { - String inst_next_device_code = pathList.get(i); + String inst_next_device_code = pathList.get(j); String limit = param.getString("limit"); Boolean inOut = param.getBoolean("inOut"); if (inOut) { @@ -1846,9 +1418,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme } } else { Integer sameInstNum = instructionService.querySameDestinationInst(inst_next_device_code); - if (sameInstNum >= Integer.parseInt(limit)) { - continue; - } else { + if (sameInstNum < Integer.parseInt(limit)) { return inst_next_device_code; } } @@ -1872,4 +1442,54 @@ public class TaskServiceImpl extends CommonServiceImpl impleme List pathList = Arrays.asList(str); return pathList; } + + + /** + * 统一抽取反馈上位系统任务状态信息 + * + * @param taskDto + */ + private void feedWmsTaskStatus(TaskDto taskDto) { + // 判断是否为WMS下发的任务，如果是反馈任务状态给WMS + String hasWms = paramService.findByCode(AcsConfig.HASWMS).getValue(); + if (!StrUtil.startWith(taskDto.getTask_code(), CommonFinalParam.HYPHEN_) && StrUtil.equals(hasWms, CommonFinalParam.ONE)) { + FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); + request.setTask_id(taskDto.getExt_task_id()); + request.setTask_code(taskDto.getTask_code()); + request.setTask_status(taskDto.getTask_status()); + request.setRequest_medthod_code(RequestMethodEnum.feedback_task_status.getCode()); + request.setRequest_medthod_name(RequestMethodEnum.feedback_task_status.getName()); + //TODO 有需要根据上位系统反馈的信息再做进一步处理 + acstowmsService.feedTaskStatus(request); + } + } + + /** + * 关闭仙工运单序列 + * + * @param taskDto + */ + private void markComplete(TaskDto taskDto) { + // 如果属于先知AGV，关闭运单序列 + List shortPathsList = + routeLineService.getShortPathLines( + taskDto.getStart_device_code(), + taskDto.getNext_device_code(), + taskDto.getRoute_plan_code()); + if (ObjectUtil.isNotEmpty(shortPathsList)) { + String type = shortPathsList.get(0).getType(); + // != 0 为agv任务 + if (!StrUtil.equals(type, "0")) { + if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) { + try { + agvService.markComplete(taskDto.getTask_code()); + } catch (Exception e) { + log.error("关闭运单异常,原因:{}", e.getMessage()); + } + } + } + } + } + + } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java index 6437c1f..2e1bf6b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java @@ -45,8 +45,7 @@ public class CreateDDJInst { InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - DeviceExtraService deviceExtra = SpringContextHolder.getBean(DeviceExtraServiceImpl.class); - List taskDtos = taskserver.queryByStauts("0"); + List taskDtos = taskserver.findByTaskStatus("0"); List taskDtoList = new ArrayList<>(); if (CollUtil.isEmpty(taskDtos) || taskDtos.size() < 1) { } else { @@ -69,7 +68,7 @@ public class CreateDDJInst { if (ObjectUtils.isEmpty(list)) { throw new BadRequestException("路由不通"); } - RouteLineDto routeLineDto = (RouteLineDto) list.get(0); + RouteLineDto routeLineDto = list.get(0); String[] path = routeLineDto.getPath().split("->"); List pathlist = Arrays.asList(path); String deviceType = appService.findDeviceByCode(pathlist.get(1)).getDevice_type(); @@ -137,7 +136,6 @@ public class CreateDDJInst { RouteLineDto routeLineDto1 = shortPathsList.get(0); String path1 = routeLineDto1.getPath(); - String type1 = routeLineDto1.getType(); String[] str = path1.split("->"); List pathlist1 = Arrays.asList(str); diff --git a/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue b/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue index 316bcaf..42a5a7d 100644 --- a/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue +++ b/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue @@ -32,6 +32,7 @@ + +
+ 请选择 +
+ @@ -348,6 +353,58 @@ {{ $t('task.select.Confirm') }} + + + + 添加新行 + + + + + + + + + + + + + + + + + +
+ 取消 + + 确认 +
+ + @@ -459,7 +516,7 @@ import i18n from '@/i18n' export default { name: 'Task', components: { pagination, crudOperation }, - dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type'], + dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type', 'kezhuan'], mixins: [presenter(), header(), crud()], cruds() { return CRUD({ title: i18n.t('task.txt_box.Task'), url: 'api/task', idField: 'task_id', sort: 'task_id,desc', @@ -536,6 +593,7 @@ export default { edit: ['admin', 'task:edit'], del: ['admin', 'task:del'] }, + showAddRowButton: true, form: { task_id: null, vehicle_code: null, @@ -561,6 +619,11 @@ export default { to_z: null, agv_system_type: '1' }, + extension: [{ + name: '', + value: '' + }], + dialogVisible: false, rules: { start_point_code: [ { required: true, message: '起点不能为空', trigger: 'change' } @@ -595,12 +658,48 @@ export default { }) }, methods: { + addNewRow() { + this.extension.push({ + name: '', + value: '' + }) + }, + deleteField(index) { // 添加字段的时候删除一条数据 + if (this.extension.length > 1) { + this.extension.splice(index, 1) + } + }, + cancelForm() { + // 清空表单数据 + this.extension = [{ + name: '', + value: '' }] + this.dialogVisible = false + }, + saveForm() { + // 保存表单数据 + // 你可以在这里处理保存逻辑，并发送请求保存表单数据 + this.extension.reduce((form, item) => { + form[item.name] = item.value + return form + }, this.form) + this.dialogVisible = false + }, saveBtn() { crudTask.add(this.form).then(res => { this.crud.toQuery() this.formDia = false this.isDisabled = true }) + this.extension = [{ + name: '', + value: '' }] + }, + openDialog() { + this.dialogVisible = true + }, + closeDialog() { + this.dialogVisible = false }, // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { @@ -766,4 +865,10 @@ export default { .el-icon-arrow-down { font-size: 12px; } + +.button-container { + display: flex; + justify-content: flex-end; + align-items: flex-end; +} diff --git a/acs/nladmin-ui/src/views/system/dict/dict.js b/acs/nladmin-ui/src/views/system/dict/dict.js index 99170f7..d109d49 100644 --- a/acs/nladmin-ui/src/views/system/dict/dict.js +++ b/acs/nladmin-ui/src/views/system/dict/dict.js @@ -31,4 +31,4 @@ export function edit(data) { }) } -export default { add, edit, del } +export default { getDicts, add, edit, del } diff --git a/lms/nladmin-system/nlsso-server/pom.xml b/lms/nladmin-system/nlsso-server/pom.xml index fcebf05..c086101 100644 --- a/lms/nladmin-system/nlsso-server/pom.xml +++ b/lms/nladmin-system/nlsso-server/pom.xml @@ -18,13 +18,12 @@ UTF-8 1.8 1.16 - 2.9.2 1.2.70 1.1.22 2.5.0 1.3.1.Final 1.31.0 - 5.7.14 + 5.8.22 0.11.1 5.9.0 @@ -33,12 +32,25 @@ + + org.dromara.dynamictp + dynamic-tp-spring-boot-starter-adapter-webserver + 1.1.6.1 + + com.yomahub tlog-all-spring-boot-starter 1.5.0 + + + + org.fusesource.jansi + jansi + 1.17.1 + com.microsoft.sqlserver @@ -178,38 +190,6 @@ ${log4jdbc.version} - - - io.springfox - springfox-swagger2 - ${swagger.version} - - - io.swagger - swagger-annotations - - - io.swagger - swagger-models - - - - - io.springfox - springfox-swagger-ui - ${swagger.version} - - - io.swagger - swagger-annotations - 1.5.21 - - - io.swagger - swagger-models - 1.5.21 - - mysql diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java index 5873cbe..485db79 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java @@ -3,12 +3,13 @@ package org.nl; import cn.dev33.satoken.annotation.SaIgnore; import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation; import com.alicp.jetcache.anno.config.EnableMethodCache; -import io.swagger.annotations.Api; + import org.mybatis.spring.annotation.MapperScan; import org.nl.common.annotation.Limit; import org.nl.config.SpringContextHolder; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.boot.web.servlet.server.ServletWebServerFactory; @@ -28,8 +29,8 @@ import org.springframework.web.bind.annotation.RestController; */ @EnableAsync @RestController -@Api(hidden = true) @SpringBootApplication(exclude = { + QuartzAutoConfiguration.class, org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class }) @ServletComponentScan @@ -48,13 +49,6 @@ public class AppRun { return new SpringContextHolder(); } - @Bean - public ServletWebServerFactory webServerFactory() { - TomcatServletWebServerFactory fa = new TomcatServletWebServerFactory(); - fa.addConnectorCustomizers(connector -> connector.setProperty("relaxedQueryChars", "[]{}")); - return fa; - } - /** * 访问首页提示 * diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java index 0cd2ef5..a673dc3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java @@ -15,7 +15,7 @@ */ package org.nl.common.domain.vo; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; import org.nl.common.base.BaseDTO; @@ -41,29 +41,29 @@ public class DeptVo extends BaseDTO implements Serializable { private String ext_id; - @ApiModelProperty(value = "排序") + private Integer dept_sort; @NotBlank - @ApiModelProperty(value = "部门名称") + private String name; - @ApiModelProperty(value = "zh部门名称") + private String zh_name; - @ApiModelProperty(value = "en部门名称") + private String en_name; - @ApiModelProperty(value = "id部门名称") + private String in_name; @NotNull - @ApiModelProperty(value = "是否启用") + private Boolean is_used; - @ApiModelProperty(value = "上级部门") + private Long pid; - @ApiModelProperty(value = "子节点数目", hidden = true) + private Integer sub_count = 0; /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/RoleVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/RoleVo.java index 88cb9d1..40d3bb2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/RoleVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/RoleVo.java @@ -15,7 +15,7 @@ */ package org.nl.common.domain.vo; -import io.swagger.annotations.ApiModelProperty; + import lombok.Getter; import lombok.Setter; @@ -31,24 +31,22 @@ import java.io.Serializable; @Setter public class RoleVo implements Serializable { - - @ApiModelProperty(value = "ID", hidden = true) private Long role_id; @NotBlank - @ApiModelProperty(value = "名称", hidden = true) + private String name; - @ApiModelProperty(value = "级别，数值越小，级别越大") + private Integer level = 3; - @ApiModelProperty(value = "描述") + private String remark; - @ApiModelProperty(value = "描述") + private String order_seq; - @ApiModelProperty(value = "描述") + private String is_used; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/YmlConfigFileUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/YmlConfigFileUtil.java new file mode 100644 index 0000000..1c351b5 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/YmlConfigFileUtil.java @@ -0,0 +1,28 @@ +package org.nl.common.utils; + +import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; + +import java.util.Properties; + +/** + * @Author: lyd + * @Description: 配置文件获取方法 + * @Date: 2023/12/6 + */ +public class YmlConfigFileUtil { + public static Properties readConfig(String configFile) { + // 创建 Resource 对象 + Resource resource = new ClassPathResource(configFile); + + // 创建 YamlPropertiesFactoryBean + YamlPropertiesFactoryBean yamlPropertiesFactoryBean = new YamlPropertiesFactoryBean(); + yamlPropertiesFactoryBean.setResources(resource); + + // 获取 Properties 对象 + Properties properties = yamlPropertiesFactoryBean.getObject(); + + return properties; + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SwaggerConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SwaggerConfig.java deleted file mode 100644 index fa7ae74..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SwaggerConfig.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright 2019-2020 Zheng Jie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.nl.config; - -import com.fasterxml.classmate.TypeResolver; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.Ordered; -import org.springframework.data.domain.Pageable; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.schema.AlternateTypeRule; -import springfox.documentation.schema.AlternateTypeRuleConvention; -import springfox.documentation.service.*; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spi.service.contexts.SecurityContext; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -import java.util.ArrayList; -import java.util.List; - -import static com.google.common.collect.Lists.newArrayList; -import static springfox.documentation.schema.AlternateTypeRules.newRule; - -/** - * api页面 /doc.html - * @author Zheng Jie - * @date 2018-11-23 - */ -@Configuration -@EnableSwagger2 -public class SwaggerConfig { - - @Value("${sa-token.token-name}") - private String tokenHeader; - - @Value("${sa-token.token-prefix}") - private String tokenStartWith; - - @Value("${swagger.enabled}") - private Boolean enabled; - - @Bean - @SuppressWarnings("all") - public Docket createRestApi() { -// ParameterBuilder ticketPar = new ParameterBuilder(); -//// List pars = new ArrayList<>(); -//// ticketPar.name(tokenHeader).description("token") -//// .modelRef(new ModelRef("string")) -//// .parameterType("header") -//// .defaultValue(tokenStartWith + " ") -//// .required(true) -//// .build(); -// pars.add(ticketPar.build()); - return new Docket(DocumentationType.SWAGGER_2) - .enable(enabled) - .apiInfo(apiInfo()) - .select() -// .paths(Predicates.not(PathSelectors.regex("/error.*"))) - .paths(PathSelectors.any()) - .build() -// .globalOperationParameters(pars) - //添加登陆认证 - .securitySchemes(securitySchemes()) - .securityContexts(securityContexts()); - } - - private ApiInfo apiInfo() { - return new ApiInfoBuilder() - .description("一个简单且易上手的 Spring boot 后台管理框架") - .title("EL-ADMIN 接口文档") - .version("2.4") - .build(); - } - - private List securitySchemes() { - //设置请求头信息 - List securitySchemes = new ArrayList<>(); - ApiKey apiKey = new ApiKey(tokenHeader, tokenHeader, "header"); - securitySchemes.add(apiKey); - return securitySchemes; - } - - private List securityContexts() { - //设置需要登录认证的路径 - List securityContexts = new ArrayList<>(); - // ^(?!auth).*$ 表示所有包含auth的接口不需要使用securitySchemes即不需要带token - // ^标识开始 ()里是一子表达式 ?!/auth表示匹配不是/auth的位置，匹配上则添加请求头，注意路径已/开头 .表示任意字符 *表示前面的字符匹配多次 $标识结束 - securityContexts.add(getContextByPath("^(?!/auth).*$")); - return securityContexts; - } - - private SecurityContext getContextByPath(String pathRegex) { - return SecurityContext.builder() - .securityReferences(defaultAuth()) - .forPaths(PathSelectors.regex(pathRegex)) - .build(); - } - - private List defaultAuth() { - List securityReferences = new ArrayList<>(); - AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); - AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; - authorizationScopes[0] = authorizationScope; - securityReferences.add(new SecurityReference(tokenHeader, authorizationScopes)); - return securityReferences; - } -} - -/** - * 将Pageable转换展示在swagger中 - */ -@Configuration -class SwaggerDataConfig { - - @Bean - public AlternateTypeRuleConvention pageableConvention(final TypeResolver resolver) { - return new AlternateTypeRuleConvention() { - @Override - public int getOrder() { - return Ordered.HIGHEST_PRECEDENCE; - } - - @Override - public List rules() { - return newArrayList(newRule(resolver.resolve(Pageable.class), resolver.resolve(Page.class))); - } - }; - } - - @ApiModel - @Data - private static class Page { - @ApiModelProperty("页码 (0..N)") - private Integer page; - - @ApiModelProperty("每页显示的数目") - private Integer size; - - @ApiModelProperty("以下列格式排序标准：property[,asc | desc]。 默认排序顺序为升序。 支持多种排序条件：如：id,asc") - private List sort; - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java index c2fc8e5..e720c1c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java @@ -6,41 +6,86 @@ package org.nl.config.lucene; * @Date: 2023/8/25 */ public class LogMessageConstant { - /** */ - public final static String SORT_NAME = "time"; - /** 级别 */ + /** + * 标签 + */ + public final static String FIELD_LABEL = "label"; + /** + * 时间 + */ + public final static String FIELD_SORT_NAME = "time"; + /** + * IP + */ + public final static String FIELD_IP = "ip"; + /** + * 级别 + */ public final static String FIELD_LEVEL = "level"; - /** 时间 */ + /** + * 时间 + */ public final static String FIELD_TIMESTAMP = "timestamp"; - /** 类的限定名 */ + /** + * 类的限定名 + */ public final static String FIELD_CLASS_NAME = "logger"; - /** 线程名 */ + /** + * 线程名 + */ public final static String FIELD_THREAD = "thread"; - /** 日志内容 */ + /** + * 日志内容 + */ public final static String FIELD_MESSAGE = "message"; + /** + * tlogTraceId + */ public final static String FIELD_TRACEID = "tlogTraceId"; // 定义颜色值 - /** 文本颜色：黑色 */ + /** + * 文本颜色：黑色 + */ public final static String COLOR_BLACK = "\u001B[30m"; - /** 文本颜色：红色 */ + /** + * 文本颜色：红色 + */ public final static String COLOR_RED = "\u001B[31m"; - /** 文本颜色：绿色 */ + /** + * 文本颜色：绿色 + */ public final static String COLOR_GREEN = "\u001B[32m"; - /** 文本颜色：黄色 */ + /** + * 文本颜色：黄色 + */ public final static String COLOR_YELLOW = "\u001B[33m"; - /** 文本颜色：蓝色 */ + /** + * 文本颜色：蓝色 + */ public final static String COLOR_BLUE = "\u001B[34m"; - /** 文本颜色：品红色 */ + /** + * 文本颜色：品红色 + */ public final static String COLOR_MAGENTA = "\u001B[35m"; - /** 文本颜色：青色 */ + /** + * 文本颜色：青色 + */ public final static String COLOR_CYAN = "\u001B[36m"; - /** 文本颜色：白色 */ + /** + * 文本颜色：白色 + */ public final static String COLOR_WHITE = "\u001B[37m"; - /** 文本颜色重置 */ + /** + * 文本颜色重置 + */ public final static String COLOR_RESET = "\u001B[0m"; - /** 背景颜色：黄色 */ + /** + * 背景颜色：黄色 + */ public final static String BACKGROUND_YELLOW = "\u001B[43m"; - /** 索引路径 */ + /** + * 索引路径 + */ public final static String INDEX_DIR = "D:\\lucene\\index"; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java index 0909ac0..d342c3a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java @@ -16,11 +16,17 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; +import org.nl.common.utils.YmlConfigFileUtil; import org.wltea.analyzer.lucene.IKAnalyzer; import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.nio.file.Paths; import java.util.Map; +import java.util.Properties; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class LuceneAppender extends AppenderBase { @@ -32,7 +38,12 @@ public class LuceneAppender extends AppenderBase { public void start() { super.start(); try { - index = FSDirectory.open(Paths.get(LogMessageConstant.INDEX_DIR)); + // 读取配置文件 + Properties properties = YmlConfigFileUtil.readConfig("config/application.yml"); + + // 获取配置值 + String luceneDir = properties.getProperty("lucene.index.path"); + index = FSDirectory.open(Paths.get(luceneDir)); } catch (IOException e) { e.printStackTrace(); } @@ -54,18 +65,43 @@ public class LuceneAppender extends AppenderBase { Map mdcPropertyMap = event.getMDCPropertyMap(); Document doc = new Document(); long timeStamp = event.getTimeStamp(); + // 获取本机的IP地址 + String ipAddress = "-"; + try { + ipAddress = InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { + throw new RuntimeException(e); + } String formattedDateTime = DateUtil.format(new java.util.Date(timeStamp), "yyyy-MM-dd HH:mm:ss.SSS"); - doc.add(new LongPoint(LogMessageConstant.SORT_NAME, timeStamp)); - doc.add(new NumericDocValuesField(LogMessageConstant.SORT_NAME, timeStamp)); + doc.add(new LongPoint(LogMessageConstant.FIELD_SORT_NAME, timeStamp)); + doc.add(new NumericDocValuesField(LogMessageConstant.FIELD_SORT_NAME, timeStamp)); doc.add(new StringField(LogMessageConstant.FIELD_LEVEL, event.getLevel().toString(), Field.Store.YES)); - doc.add(new StringField(LogMessageConstant.FIELD_TIMESTAMP, formattedDateTime,Field.Store.YES)); + doc.add(new StringField(LogMessageConstant.FIELD_TIMESTAMP, formattedDateTime, Field.Store.YES)); doc.add(new StoredField(LogMessageConstant.FIELD_CLASS_NAME, event.getLoggerName())); + doc.add(new StoredField(LogMessageConstant.FIELD_IP, ipAddress)); doc.add(new StoredField(LogMessageConstant.FIELD_THREAD, event.getThreadName())); if (ObjectUtil.isNotEmpty(mdcPropertyMap) && ObjectUtil.isNotEmpty(mdcPropertyMap.get(LogMessageConstant.FIELD_TRACEID))) { String traceId = mdcPropertyMap.get(LogMessageConstant.FIELD_TRACEID); doc.add(new StringField(LogMessageConstant.FIELD_TRACEID, traceId, Field.Store.YES)); + doc.add(new StringField(LogMessageConstant.FIELD_LABEL, ObjectUtil.isNotEmpty(mdcPropertyMap.get("tag_name")) + ? mdcPropertyMap.get("tag_name") : "-", Field.Store.YES)); } else { - doc.add(new StringField(LogMessageConstant.FIELD_TRACEID, "无生成链路ID", Field.Store.YES)); + // 定义正则表达式，匹配17位数字 + String regex = "\\d{17}"; + // 创建 Pattern 对象 + Pattern pattern = Pattern.compile(regex); + // 创建 Matcher 对象 + Matcher matcher = pattern.matcher(message); + String matchedNumber = null; + // 查找匹配的数字 + while (matcher.find()) { + matchedNumber = matcher.group(); + } + if (ObjectUtil.isNotEmpty(matchedNumber)) { + doc.add(new StringField(LogMessageConstant.FIELD_TRACEID, matchedNumber, Field.Store.YES)); + } else { + doc.add(new StringField(LogMessageConstant.FIELD_TRACEID, "无生成链路ID", Field.Store.YES)); + } } doc.add(new TextField(LogMessageConstant.FIELD_MESSAGE, message, Field.Store.YES)); try { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java index ea0bb97..2e51775 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java @@ -7,8 +7,9 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.LongPoint; -import org.apache.lucene.index.*; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.search.*; import org.apache.lucene.store.Directory; @@ -26,12 +27,7 @@ import java.time.temporal.ChronoUnit; import java.util.*; /** - *

* lucene查询器 - *

- * - * @author generator - * @since 2023-11-16 */ @Slf4j public class Searcher { @@ -45,9 +41,7 @@ public class Searcher { //标准分词器，会自动去掉空格啊，is a the等单词 Analyzer analyzer = new IKAnalyzer(true); - /* - * 记录索引开始时间 - */ + // 实际上Lucene本身不支持分页。因此我们需要自己进行逻辑分页。我们要准备分页参数： // 每页条数 int pageSize = Integer.parseInt(whereJson.get("size").toString()); // 当前页码 @@ -57,59 +51,65 @@ public class Searcher { // 当前页的结束条数（不能包含） int end = start + pageSize; // 创建排序对象,需要排序字段SortField，参数：字段的名称、字段的类型、是否反转如果是false，升序。true降序 - Sort sort = new Sort(new SortField(LogMessageConstant.SORT_NAME, SortField.Type.LONG,true)); + Sort sort = new Sort(new SortField(LogMessageConstant.FIELD_SORT_NAME, SortField.Type.LONG, true)); TopDocs docs = null; BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder(); //时间范围查询 String startDate = whereJson.getString("begin_time"); String endDate = whereJson.getString("end_time"); - Calendar calendar=Calendar.getInstance(); + Calendar calendar = Calendar.getInstance(); calendar.set(1970, 0, 1); - if (startDate == null){ - startDate = DateUtil.format(calendar.getTime(),"yyyy-MM-dd HH:mm:ss.SSS"); - }else{ + if (startDate == null) { + startDate = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss.SSS"); + } else { startDate = LuceneIndexWriter.getDate(startDate); } - if (endDate == null){ - endDate = DateUtil.format(new DateTime(),"yyyy-MM-dd HH:mm:ss.SSS"); + if (endDate == null) { + endDate = DateUtil.format(new DateTime(), "yyyy-MM-dd HH:mm:ss.SSS"); } else { endDate = LuceneIndexWriter.getDate(endDate); } // 字段之间的与或非关系，MUST表示and，MUST_NOT表示not，SHOULD表示or，有几个fields就必须有几个clauses TermRangeQuery termRangeQuery = new TermRangeQuery("timestamp", new BytesRef(startDate), new BytesRef(endDate), true, true); - booleanQueryBuilder.add(termRangeQuery,BooleanClause.Occur.MUST); - if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_MESSAGE))){ + booleanQueryBuilder.add(termRangeQuery, BooleanClause.Occur.MUST); + if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_MESSAGE))) { //查询解析器 QueryParser queryParser = new QueryParser("message", analyzer); - Query query = queryParser.parse(whereJson.getString("message")); + Query query = queryParser.parse("message:" + whereJson.getString("message") + "~"); booleanQueryBuilder.add(query, BooleanClause.Occur.MUST); } - if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_TRACEID))){ + if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_TRACEID))) { //查询解析器 TermQuery termQuery = new TermQuery(new Term(LogMessageConstant.FIELD_TRACEID, whereJson.getString(LogMessageConstant.FIELD_TRACEID).trim())); booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); } - if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_LEVEL))){ + if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_LABEL))) { + //查询解析器 + TermQuery termQuery = new TermQuery(new Term(LogMessageConstant.FIELD_LABEL, + whereJson.getString(LogMessageConstant.FIELD_LABEL).trim())); + booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); + } + if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_LEVEL))) { //查询解析器 TermQuery termQuery = new TermQuery(new Term(LogMessageConstant.FIELD_LEVEL, whereJson.get(LogMessageConstant.FIELD_LEVEL).toString())); booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); } - docs = searcher.search(booleanQueryBuilder.build(), end,sort); - //记录索引时间 List list = new ArrayList<>(); + TopFieldCollector collector = TopFieldCollector.create(sort, 20000, 0); + searcher.search(booleanQueryBuilder.build(), collector); + docs = collector.topDocs(pageNum*pageSize, pageSize); ScoreDoc[] scoreDocs = docs.scoreDocs; - if (end > docs.totalHits.value) end = (int) docs.totalHits.value; + int totalSize = collector.getTotalHits(); - for (int i = start; i < end; i++) { - ScoreDoc scoreDoc = scoreDocs[i]; + for (ScoreDoc scoreDoc : scoreDocs) { Document doc = reader.document(scoreDoc.doc); - String logInfo = LogMessageConstant.COLOR_YELLOW + doc.get(LogMessageConstant.FIELD_TRACEID) + + String logInfo = LogMessageConstant.COLOR_RED + doc.get(LogMessageConstant.FIELD_TIMESTAMP) + LogMessageConstant.COLOR_RESET + " - " + - LogMessageConstant.COLOR_RED + doc.get(LogMessageConstant.FIELD_TIMESTAMP) + + LogMessageConstant.COLOR_BLUE + doc.get(LogMessageConstant.FIELD_IP) + LogMessageConstant.COLOR_RESET + " - " + LogMessageConstant.COLOR_GREEN + "[" + doc.get(LogMessageConstant.FIELD_THREAD) + "]" + LogMessageConstant.COLOR_RESET + " - " + @@ -123,7 +123,7 @@ public class Searcher { reader.close(); JSONObject jo = new JSONObject(); jo.put("content", list); - jo.put("totalElements", docs.totalHits.value); + jo.put("totalElements", totalSize); return jo; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java index bdfe2db..3728f69 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java @@ -2,8 +2,8 @@ package org.nl.system.controller.coderule; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -28,13 +28,12 @@ import java.util.Set; * @since 2022-12-19 */ @RestController -@Api(tags = "系统：编码生成") @RequestMapping("/api/genCode") public class SysCodeRuleController { @Autowired private ISysCodeRuleService codeRuleService; - @ApiOperation("查询编码") + @GetMapping @SaCheckPermission("genCode:list") public ResponseEntity queryAll(@RequestParam Map form, PageQuery pageable) { @@ -42,7 +41,7 @@ public class SysCodeRuleController { } @Log("新增编码") - @ApiOperation("新增编码") + @PostMapping @SaCheckPermission("genCode:add") public ResponseEntity create(@Validated @RequestBody SysCodeRule codeRule) { @@ -51,7 +50,7 @@ public class SysCodeRuleController { } @Log("删除编码") - @ApiOperation("删除编码") + @DeleteMapping @SaCheckPermission("genCode:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -60,7 +59,7 @@ public class SysCodeRuleController { } @Log("修改编码") - @ApiOperation("修改编码") + @PutMapping @SaCheckPermission("genCode:edit") public ResponseEntity update(@RequestBody SysCodeRule codeRule) { @@ -68,7 +67,7 @@ public class SysCodeRuleController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("导出任务数据") + @GetMapping(value = "/codeDemo") @SaCheckPermission("genCode:list") public ResponseEntity CodeDemo(@RequestParam Map form) throws IOException { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java index c0268dc..e1f09b5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java @@ -2,8 +2,8 @@ package org.nl.system.controller.coderule; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.*; * @author generator * @since 2022-12-20 */ -@Api(tags = "系统：编码详情管理") @RestController @RequestMapping("/api/codeDetail") public class SysCodeRuleDetailController { @@ -31,7 +30,7 @@ public class SysCodeRuleDetailController { @Autowired private ISysCodeRuleDetailService codeDetailService; - @ApiOperation("查询编码明细") + @GetMapping @SaCheckPermission("genCode:list") public ResponseEntity queryAll(CodeRuleDetailQuery form, PageQuery pageable){ @@ -39,7 +38,7 @@ public class SysCodeRuleDetailController { } @Log("新增编码明细") - @ApiOperation("新增编码明细") + @PostMapping @SaCheckPermission("genCode:add") public ResponseEntity create(@RequestBody SysCodeRuleDetail codeRuleDetail){ @@ -48,7 +47,7 @@ public class SysCodeRuleDetailController { } @Log("删除编码明细") - @ApiOperation("删除编码明细") + @DeleteMapping(value = "/{id}") @SaCheckPermission("genCode:del") public ResponseEntity delete(@PathVariable String id){ @@ -57,7 +56,7 @@ public class SysCodeRuleDetailController { } @Log("修改编码明细") - @ApiOperation("修改编码明细") + @PutMapping @SaCheckPermission("genCode:edit") public ResponseEntity update(@RequestBody SysCodeRuleDetail json){ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java index bf93202..b73c681 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java @@ -18,8 +18,8 @@ package org.nl.system.controller.dept; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; @@ -44,21 +44,20 @@ import java.util.Set; * @date 2019-03-25 */ @RestController -@Api(tags = "系统：部门管理") @RequestMapping("/api/dept") public class DeptController { @Autowired private ISysDeptService deptService; - @ApiOperation("查询部门") + @GetMapping public ResponseEntity query(DeptQuery query) throws Exception { List list = deptService.list(query.build()); return new ResponseEntity<>(PageUtil.toPage(list, list.size()),HttpStatus.OK); } - @ApiOperation("查询部门") + @GetMapping("/vo") public ResponseEntity queryvo(DeptQuery query, PageQuery pageQuery) throws Exception { Page deptPage = deptService.queryVo(query, pageQuery); @@ -66,13 +65,13 @@ public class DeptController { } - @ApiOperation("查询所有部门树") + @GetMapping("/allTree") public ResponseEntity allTree(DeptQuery query) { return new ResponseEntity<>(deptService.buildTree(query),HttpStatus.OK); } - @ApiOperation("查询部门:根据ID获取同级与上级数据") + @PostMapping("/superior") @SaCheckPermission(value = {"user:list", "dept:list"}, mode = SaMode.AND) public ResponseEntity getSuperior(@RequestBody List ids) { @@ -83,7 +82,7 @@ public class DeptController { } @Log("新增部门") - @ApiOperation("新增部门") + @PostMapping public ResponseEntity create(@Validated @RequestBody SysDept resources){ deptService.createDept(resources); @@ -91,7 +90,7 @@ public class DeptController { } @Log("修改部门") - @ApiOperation("修改部门") + @PutMapping public ResponseEntity update(@Validated @RequestBody SysDept dept){ if (dept.getPid() != null && dept.getDept_id().equals(dept.getPid())) { @@ -102,7 +101,7 @@ public class DeptController { } @Log("删除部门") - @ApiOperation("删除部门") + @DeleteMapping public ResponseEntity delete(@RequestBody Set deptIds){ if (CollectionUtils.isEmpty(deptIds)){ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java index 819f9a9..e7f0ff6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java @@ -1,7 +1,7 @@ package org.nl.system.controller.dict; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -36,12 +36,12 @@ public class SysDictController { @Log("查询字典") @GetMapping - @ApiOperation("查询字典") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery pageable){ return new ResponseEntity<>(TableDataInfo.build(dictService.queryAll(whereJson,pageable)), HttpStatus.OK); } - @ApiOperation("查询所有字典信息") + @GetMapping(value = "/all") public ResponseEntity queryAll(){ return new ResponseEntity<>(dictService.queryAll(),HttpStatus.OK); @@ -49,7 +49,7 @@ public class SysDictController { @Log("新增字典") @PostMapping - @ApiOperation("新增字典") + public ResponseEntity create(@RequestBody Dict dict){ dictService.create(dict); return new ResponseEntity<>(HttpStatus.CREATED); @@ -57,14 +57,14 @@ public class SysDictController { @PutMapping @Log("修改字典") - @ApiOperation("修改字典") + public ResponseEntity updateDict(@Validated @RequestBody Dict dto){ dictService.updateDict(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除字典") - @ApiOperation("删除字典") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids){ dictService.deleteBatchByIds(ids); @@ -72,13 +72,13 @@ public class SysDictController { } @GetMapping("/dictDetail") - @ApiOperation("查询字典详情") + public ResponseEntity queryDetails(@RequestParam Map criteria, PageQuery pageable){ DictQuery dictQuery = JSONObject.parseObject(JSONObject.toJSONString(criteria), DictQuery.class); return new ResponseEntity<>(TableDataInfo.build(dictService.queryAllDetail(dictQuery,pageable)),HttpStatus.OK); } - @ApiOperation("查询多个字典详情") + @GetMapping(value = "/dictDetail/map") public ResponseEntity getDictDetailMaps(@RequestParam String dictName){ String[] names = dictName.split("[,，]"); @@ -90,7 +90,7 @@ public class SysDictController { } @Log("新增字典详情") - @ApiOperation("新增字典详情") + @PostMapping("/dictDetail") public ResponseEntity createDetail(@RequestBody Dict resources){ dictService.createDetail(resources); @@ -98,7 +98,7 @@ public class SysDictController { } @Log("修改字典详情") - @ApiOperation("修改字典详情") + @PutMapping("/dictDetail") public ResponseEntity updateDetail(@RequestBody Dict resources){ dictService.updateDetail(resources); @@ -106,7 +106,7 @@ public class SysDictController { } @Log("删除字典详情") - @ApiOperation("删除字典详情") + @DeleteMapping(value = "/dictDetail/{id}") public ResponseEntity deleteDetail(@PathVariable String id){ dictService.deleteDetail(id); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java index 81d06da..d5c51ec 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java @@ -2,8 +2,8 @@ package org.nl.system.controller.generator; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.system.service.generator.ICodeGenConfigService; import org.nl.system.service.generator.dao.CodeGenConfig; @@ -23,20 +23,19 @@ import org.springframework.web.bind.annotation.*; */ @SaIgnore @RestController -@Api(tags = "系统：代码生成管理") @RequestMapping("api/genConfig") public class CodeGenConfigController { @Autowired private ICodeGenConfigService genConfigService; - @ApiOperation("查询表数据") + @GetMapping(value = "/{tableName}") public ResponseEntity query(@PathVariable String tableName){ return new ResponseEntity<>(genConfigService.findByTableName(tableName), HttpStatus.OK); } - @ApiOperation("修改") + @PutMapping public ResponseEntity update(@Validated @RequestBody CodeGenConfig genConfig){ return new ResponseEntity<>(genConfigService.update(genConfig.getTable_name(), genConfig),HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java index ed99d9a..7c6f838 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java @@ -1,8 +1,8 @@ package org.nl.system.controller.generator; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; @@ -31,7 +31,6 @@ import java.util.List; @SaIgnore @RestController @RequestMapping("/api/generator") -@Api(tags = "系统：代码生成管理") public class CodeGeneratorController { @Autowired private ICodeGeneratorService generatorService; @@ -41,26 +40,26 @@ public class CodeGeneratorController { @Value("${generator.enabled}") private Boolean generatorEnabled; - @ApiOperation("查询数据库数据") + @GetMapping(value = "/tables") public ResponseEntity queryTables(@RequestParam(defaultValue = "") String name, PageQuery pageable){ return new ResponseEntity<>(TableDataInfo.build(generatorService.getTables(name, pageable)), HttpStatus.OK); } - @ApiOperation("查询字段数据") + @GetMapping(value = "/columns") public ResponseEntity queryColumns(@RequestParam String tableName){ return new ResponseEntity<>(TableDataInfo.build(generatorService.getColumns(tableName)), HttpStatus.OK); } - @ApiOperation("批量修改字段数据") + @PutMapping public ResponseEntity save(@RequestBody List columnInfos){ generatorService.updateBatchById(columnInfos); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("同步字段数据") + @PostMapping(value = "sync") public ResponseEntity sync(@RequestBody List tables){ for (String table : tables) { @@ -69,7 +68,7 @@ public class CodeGeneratorController { return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("生成代码") + @PostMapping(value = "/{tableName}/{type}") public ResponseEntity generator(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response){ if(!generatorEnabled && type == 0){ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java index 5c51d5a..3835082 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java @@ -1,8 +1,8 @@ package org.nl.system.controller.logging; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -25,12 +25,11 @@ import java.util.Map; */ @RestController @RequestMapping("/api/logs") -@Api(tags = "系统：日志管理") public class SysLogController { @Autowired private ISysLogService logService; @GetMapping - @ApiOperation("日志查询") + public ResponseEntity query(@RequestParam Map criteria, PageQuery pageable){ criteria.put("log_type","INFO"); return new ResponseEntity<>(TableDataInfo.build(logService.queryAll(criteria,pageable)), HttpStatus.OK); @@ -44,21 +43,21 @@ public class SysLogController { } @GetMapping(value = "/error") - @ApiOperation("错误日志查询") + public ResponseEntity queryErrorLog(@RequestParam Map criteria, PageQuery pageable){ criteria.put("log_type","ERROR"); return new ResponseEntity<>(TableDataInfo.build(logService.queryAll(criteria,pageable)), HttpStatus.OK); } @GetMapping(value = "/error/{id}") - @ApiOperation("日志异常详情查询") + public ResponseEntity queryErrorLogs(@PathVariable String id){ return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK); } @DeleteMapping(value = "/del/error") @Log("删除所有ERROR日志") - @ApiOperation("删除所有ERROR日志") + public ResponseEntity delAllErrorLog(){ logService.delAllByError(); return new ResponseEntity<>(HttpStatus.OK); @@ -66,7 +65,7 @@ public class SysLogController { @DeleteMapping(value = "/del/info") @Log("删除所有INFO日志") - @ApiOperation("删除所有INFO日志") + public ResponseEntity delAllInfoLog(){ logService.delAllByInfo(); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java index c46a0ea..c9ffad0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java @@ -1,8 +1,8 @@ package org.nl.system.controller.logicflow; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -28,7 +28,6 @@ import java.util.Set; */ @Slf4j @RestController -@Api(tags = "舞台管理") @RequestMapping("/api/stage") public class StageController { @@ -37,14 +36,14 @@ public class StageController { @GetMapping @Log("查询舞台") - @ApiOperation("查询舞台") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(stageService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增舞台") - @ApiOperation("新增舞台") + public ResponseEntity create(@Validated @RequestBody Stage dto) { stageService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -52,14 +51,14 @@ public class StageController { @PutMapping @Log("修改舞台") - @ApiOperation("修改舞台") + public ResponseEntity update(@Validated @RequestBody Stage dto) { stageService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除舞台") - @ApiOperation("删除舞台") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { stageService.deleteAll(ids); @@ -68,14 +67,14 @@ public class StageController { @GetMapping("/selectList") @Log("下拉选舞台") - @ApiOperation("下拉选舞台") + public ResponseEntity selectList() { return new ResponseEntity<>(stageService.selectList(), HttpStatus.OK); } @PostMapping("/addNewStage") @Log("保存舞台数据") - @ApiOperation("保存舞台数据") + public ResponseEntity addNewStage(@Validated @RequestBody Stage dto) { log.info("dto{}",dto); stageService.addNewStage(dto); @@ -84,7 +83,7 @@ public class StageController { @PostMapping("/getNewStageDataByCode") @Log("根据stage_code获取舞台数据") - @ApiOperation("根据stage_code获取舞台数据") + public ResponseEntity getNewStageDataByCode(@RequestBody String code) { Stage one = stageService.getOne(new LambdaQueryWrapper().eq(Stage::getStage_code, code)); return new ResponseEntity<>(one, HttpStatus.CREATED); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java index dbebc40..e8aff88 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java @@ -1,8 +1,8 @@ package org.nl.system.controller.logicflow; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; @@ -27,7 +27,6 @@ import java.util.Set; */ @RestController @RequiredArgsConstructor -@Api(tags = "舞台管理") @RequestMapping("/api/stageImage") @Slf4j public class StageImageController { @@ -36,14 +35,14 @@ public class StageImageController { private IStageImageService stageImageService; @GetMapping @Log("查询舞台") - @ApiOperation("查询舞台") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(stageImageService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增舞台图片") - @ApiOperation("新增舞台图片") + public ResponseEntity create(@Validated @RequestBody StageImage entity) { stageImageService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -51,14 +50,14 @@ public class StageImageController { @PutMapping @Log("修改舞台") - @ApiOperation("修改舞台") + public ResponseEntity update(@Validated @RequestBody StageImage entity) { stageImageService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除舞台") - @ApiOperation("删除舞台") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { stageImageService.deleteAll(ids); @@ -67,7 +66,7 @@ public class StageImageController { @GetMapping("/selectList") @Log("下拉选设备图标") - @ApiOperation("下拉选设备图标") + public ResponseEntity selectList() { return new ResponseEntity<>(stageImageService.selectList(), HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java index 2806cc2..ea7b05c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java @@ -1,8 +1,8 @@ package org.nl.system.controller.lucence; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; @@ -24,7 +24,6 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "日志检索") @RequestMapping("/api/lucene") @Slf4j public class LuceneController { @@ -33,7 +32,7 @@ public class LuceneController { @PostMapping("/getAll") @Log("日志检索") - @ApiOperation("日志检索") + public ResponseEntity get(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(luceneService.getAll(whereJson), HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java index 71e5679..1a768ff 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java @@ -6,7 +6,7 @@ import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -38,19 +38,19 @@ public class SysMenuController { private ISysMenuService iSysMenuService; @GetMapping(value = "/build") - @ApiOperation("根据用户获取菜单") + public ResponseEntity buildMenus(@Validated String systemType) { //校验系统表是否存在该系统类型 return new ResponseEntity(iSysMenuService.buildMenus(systemType),HttpStatus.OK); } - @ApiOperation("返回全部的菜单") + @GetMapping(value = "/lazy") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity query(@RequestParam String pid) { return new ResponseEntity<>(iSysMenuService.getMenus(pid), HttpStatus.OK); } - @ApiOperation("获取菜单列表") + @PostMapping(value = "/getMenusByRole") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity getMenusByRole(@RequestBody JSONObject json) { @@ -60,7 +60,7 @@ public class SysMenuController { return new ResponseEntity<>(iSysMenuService.getMenusByRole(role_id, system_type, category), HttpStatus.OK); } - @ApiOperation("根据菜单ID返回所有子节点ID，包含自身ID") + @GetMapping(value = "/child") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity child(@RequestParam String id) { @@ -73,14 +73,14 @@ public class SysMenuController { } @GetMapping - @ApiOperation("查询菜单") + @SaCheckPermission("menu:list") public ResponseEntity pageQuery(MenuQuery query, PageQuery page) throws Exception { List list = iSysMenuService.query(query, page); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } - @ApiOperation("查询菜单:根据ID获取同级与上级数据") + @PostMapping("/superior") @SaCheckPermission("menu:list") public ResponseEntity getSuperior(@RequestBody JSONObject param) { @@ -94,7 +94,7 @@ public class SysMenuController { } @Log("新增菜单") - @ApiOperation("新增菜单") + @PostMapping @SaCheckPermission("menu:add") public ResponseEntity create(@RequestBody SysMenu form) { @@ -103,7 +103,7 @@ public class SysMenuController { } @Log("修改菜单") - @ApiOperation("修改菜单") + @PutMapping @SaCheckPermission("menu:edit") public ResponseEntity update( @RequestBody SysMenu form) { @@ -112,7 +112,7 @@ public class SysMenuController { } @Log("删除菜单") - @ApiOperation("删除菜单") + @DeleteMapping @SaCheckPermission("menu:del") public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java index 092e749..bf51e5f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java @@ -16,8 +16,8 @@ package org.nl.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.system.service.monitor.MonitorService; import org.springframework.http.HttpStatus; @@ -32,14 +32,13 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统-服务监控管理") @RequestMapping("/api/monitor") public class MonitorController { private final MonitorService serverService; @GetMapping - @ApiOperation("查询服务监控") + @SaCheckPermission("monitor:list") public ResponseEntity query() { return new ResponseEntity<>(serverService.getServers(),HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java index 109f2e5..df506dd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java @@ -1,8 +1,8 @@ package org.nl.system.controller.notice; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -23,7 +23,6 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "消息通知管理") @RequestMapping("/api/notice") public class SysNoticeController { @@ -32,14 +31,14 @@ public class SysNoticeController { @GetMapping @Log("查询消息通知") - @ApiOperation("查询消息通知") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(noticeService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增消息通知") - @ApiOperation("新增消息通知") + public ResponseEntity create(@Validated @RequestBody SysNotice entity){ noticeService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -47,14 +46,14 @@ public class SysNoticeController { @PutMapping @Log("修改消息通知") - @ApiOperation("修改消息通知") + public ResponseEntity update(@Validated @RequestBody SysNotice entity){ noticeService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除消息通知") - @ApiOperation("删除消息通知") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { noticeService.deleteAll(ids); @@ -95,7 +94,7 @@ public class SysNoticeController { @Log("批量已读") @PostMapping("/changeRead") - @ApiOperation("批量已读") + public ResponseEntity changeRead(@RequestBody JSONObject jsonObject) { noticeService.changeRead(jsonObject); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java index b4405bb..cd2e5e3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java @@ -1,8 +1,8 @@ package org.nl.system.controller.param; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -27,7 +27,6 @@ import java.util.Map; * @author generator * @since 2022-12-14 */ -@Api(tags = "系统参数管理") @Slf4j @RestController @RequestMapping("/api/param") @@ -37,14 +36,14 @@ class SysParamController { private ISysParamService paramService; @GetMapping @Log("查询系统参数") - @ApiOperation("查询系统参数") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(paramService.queryPage(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增系统参数") - @ApiOperation("新增系统参数") + public ResponseEntity create(@Validated @RequestBody Param param){ paramService.create(param); return new ResponseEntity<>(HttpStatus.CREATED); @@ -52,14 +51,14 @@ class SysParamController { @PutMapping @Log("修改系统参数") - @ApiOperation("修改系统参数") + public ResponseEntity update(@Validated @RequestBody Param param){ paramService.update(param); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除系统参数") - @ApiOperation("删除系统参数") + @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { List Ids = Arrays.asList(ids); @@ -69,7 +68,7 @@ class SysParamController { @PostMapping("/getValueByCode/{code}") @Log("根据编码获取值") - @ApiOperation("根据编码获取值") + @SaIgnore public ResponseEntity getValueByCode(@PathVariable String code) { return new ResponseEntity<>(paramService.findByCode(code), HttpStatus.CREATED); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java index c092f8a..935bfb4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java @@ -2,8 +2,8 @@ package org.nl.system.controller.permission; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -29,7 +29,6 @@ import java.util.Set; */ @Slf4j @RestController -@Api(tags = "数据管理") @RequestMapping("/api/dataPermission") public class SysDataPermissionController { @@ -38,14 +37,14 @@ public class SysDataPermissionController { @GetMapping @Log("查询数据权限") - @ApiOperation("查询数据权限") + public ResponseEntity query(SysDataPermissionQuery dataPermissionQuery, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(dataPermissionService.queryAll(dataPermissionQuery, page)), HttpStatus.OK); } @PostMapping @Log("新增数据权限") - @ApiOperation("新增数据权限") + public ResponseEntity create(@Validated @RequestBody SysDataPermission permission) { dataPermissionService.create(permission); return new ResponseEntity<>(HttpStatus.CREATED); @@ -53,14 +52,14 @@ public class SysDataPermissionController { @PutMapping @Log("修改数据权限") - @ApiOperation("修改数据权限") + public ResponseEntity update(@Validated @RequestBody SysDataPermission permission) { dataPermissionService.update(permission); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除数据权限") - @ApiOperation("删除数据权限") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { dataPermissionService.deleteAll(ids); @@ -69,21 +68,21 @@ public class SysDataPermissionController { @GetMapping("/scopeType") @Log("获取数据权限范围") - @ApiOperation("获取数据权限范围") + public ResponseEntity getDataScopeType(){ return new ResponseEntity<>(dataPermissionService.getDataScopeType(),HttpStatus.OK); } @GetMapping("/dataPermissionOption") @Log("获取数据权限下拉框") - @ApiOperation("获取数据权限下拉框") + public ResponseEntity getDataPermissionOption(){ return new ResponseEntity<>(dataPermissionService.getDataPermissionOption(),HttpStatus.OK); } @PostMapping("/saveDataPermission") @Log("保存数据权限") - @ApiOperation("保存数据权限") + public ResponseEntity saveDataPermission(@RequestBody JSONObject datas){ dataPermissionService.savePermission(datas); return new ResponseEntity<>(HttpStatus.CREATED); @@ -91,14 +90,14 @@ public class SysDataPermissionController { @PostMapping("/dataShow") @Log("查看数据权限") - @ApiOperation("查看数据权限") + public ResponseEntity getDataShow(@RequestBody String id){ return new ResponseEntity<>(dataPermissionService.getDataShow(id),HttpStatus.OK); } @PostMapping("/dataDetail") @Log("查看数据明细") - @ApiOperation("查看数据明细") + public ResponseEntity getDataDetail(@RequestBody JSONObject data){ return new ResponseEntity<>(dataPermissionService.getDataDetail(data),HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java index 1b6bdf2..201d193 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java @@ -2,8 +2,8 @@ package org.nl.system.controller.quartz; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -31,21 +31,20 @@ import java.util.Set; @Slf4j @RestController @RequestMapping("/api/jobs") -@Api(tags = "系统:定时任务管理") public class SysQuartzJobController { private static final String ENTITY_NAME = "quartzJob"; @Autowired private ISysQuartzJobService quartzJobService; - @ApiOperation("查询定时任务") + @GetMapping @SaCheckPermission("timing:list") public ResponseEntity query(JobQuery criteria, PageQuery pageable) { return new ResponseEntity<>(TableDataInfo.build(quartzJobService.queryAll(criteria, pageable)), HttpStatus.OK); } - @ApiOperation("查询任务执行日志") + @GetMapping(value = "/logs") @SaCheckPermission("timing:list") public ResponseEntity queryJobLog(JobQuery criteria, PageQuery pageable) { @@ -53,7 +52,7 @@ public class SysQuartzJobController { } @Log("新增定时任务") - @ApiOperation("新增定时任务") + @PostMapping @SaCheckPermission("timing:add") public ResponseEntity create(@Validated @RequestBody SysQuartzJob resources) { @@ -65,7 +64,7 @@ public class SysQuartzJobController { } @Log("修改定时任务") - @ApiOperation("修改定时任务") + @PutMapping @SaCheckPermission("timing:edit") public ResponseEntity update(@Validated @RequestBody SysQuartzJob resources) { @@ -74,7 +73,7 @@ public class SysQuartzJobController { } @Log("更改定时任务状态") - @ApiOperation("更改定时任务状态") + @PutMapping(value = "/{id}") @SaCheckPermission("timing:edit") public ResponseEntity update(@PathVariable String id) { @@ -83,7 +82,7 @@ public class SysQuartzJobController { } @Log("执行定时任务") - @ApiOperation("执行定时任务") + @PutMapping(value = "/exec/{id}") @SaCheckPermission("timing:edit") public ResponseEntity execution(@PathVariable String id) { @@ -92,7 +91,7 @@ public class SysQuartzJobController { } @Log("删除定时任务") - @ApiOperation("删除定时任务") + @DeleteMapping @SaCheckPermission("timing:del") public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java index ec89c86..6f1a0dc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java @@ -1,7 +1,7 @@ package org.nl.system.controller.redis; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; @@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统表格管理") @RequestMapping("/api/redis") @Slf4j public class RedisController { @@ -26,27 +25,27 @@ public class RedisController { @GetMapping("/get-monitor-info") @Log("查询redis的信息") - @ApiOperation("查询redis的信息") + public ResponseEntity getRedisMonitorInfo() { return new ResponseEntity<>(redisService.getRedisMonitorInfo(),HttpStatus.OK); } @GetMapping("/get-key-define-list") @Log("获得 Redis Key 模板列表") - @ApiOperation("获得 Redis Key 模板列表") + public ResponseEntity getKeyDefineList() { return new ResponseEntity<>(redisService.getKeyDefineList(),HttpStatus.OK); } @GetMapping("/get-key-value-list") @Log("获得 Redis Key Value列表") - @ApiOperation("获得 Redis Key Value列表") + public ResponseEntity getKeyValueList() { return new ResponseEntity<>( redisService.getKeyValueList(),HttpStatus.OK); } @Log("根据key删除Redis数据") - @ApiOperation("根据key删除Redis数据") + @DeleteMapping public ResponseEntity deleteByKey(@RequestBody String[] ids) { redisService.deleteByKey(ids); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java index 2eacfa3..a284976 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java @@ -2,7 +2,7 @@ package org.nl.system.controller.role; import cn.dev33.satoken.annotation.SaCheckPermission; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -30,21 +30,21 @@ public class SysRoleController { @Autowired private ISysRoleService roleService; - @ApiOperation("分页查询角色") + @GetMapping @SaCheckPermission("roles:list") public ResponseEntity pageQuery(@RequestParam Map param, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(roleService.query(param, page)), HttpStatus.OK); } - @ApiOperation("查询所有角色") + @GetMapping("/all") public ResponseEntity queryAll() { return new ResponseEntity<>(roleService.list(), HttpStatus.OK); } @Log("新增角色") - @ApiOperation("新增角色") + @PostMapping @SaCheckPermission("roles:add") public ResponseEntity create(@RequestBody JSONObject param) { @@ -53,7 +53,7 @@ public class SysRoleController { } @Log("修改角色") - @ApiOperation("修改角色") + @PutMapping @SaCheckPermission("roles:edit") public ResponseEntity update(@RequestBody JSONObject param) { @@ -62,7 +62,7 @@ public class SysRoleController { } @Log("删除角色") - @ApiOperation("删除角色") + @DeleteMapping @SaCheckPermission("roles:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -71,7 +71,7 @@ public class SysRoleController { } @Log("修改角色菜单") - @ApiOperation("修改角色菜单") + @PutMapping(value = "/menu") @SaCheckPermission("roles:edit") public ResponseEntity updateMenu(@RequestBody JSONObject form) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java index 71289a5..896878f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java @@ -7,8 +7,8 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.wf.captcha.base.Captcha; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.RedisUtils; import org.nl.common.utils.SecurityUtils; @@ -36,7 +36,6 @@ import java.util.concurrent.TimeUnit; @Slf4j @RestController @RequestMapping("/auth") -@Api(tags = "系统：系统授权接口") public class AuthorizationController { @Autowired private RedisUtils redisUtils; @@ -47,7 +46,7 @@ public class AuthorizationController { @Autowired private LoginProperties loginProperties; - @ApiOperation("登录授权") + @PostMapping(value = "/login") public ResponseEntity login(@RequestBody Map authMap, HttpServletRequest request) throws Exception { if (ObjectUtil.isEmpty(authMap)){ @@ -57,7 +56,7 @@ public class AuthorizationController { } - @ApiOperation("获取用户信息") + @GetMapping(value = "/info") public ResponseEntity getUserInfo() { CurrentUser currentUser = SecurityUtils.getCurrentUser(); @@ -67,7 +66,7 @@ public class AuthorizationController { return ResponseEntity.ok(jsonObject); } - @ApiOperation("获取指定用户信息") + @GetMapping(value = "/userInfo") public ResponseEntity getUserInfo(Long loginId) { if (loginId != null){ @@ -77,7 +76,7 @@ public class AuthorizationController { return ResponseEntity.noContent().build(); } - @ApiOperation("获取验证码") + @GetMapping(value = "/code") public ResponseEntity getCode() { // 获取运算的结果 @@ -100,7 +99,7 @@ public class AuthorizationController { return ResponseEntity.ok(imgResult); } - @ApiOperation("退出登录") + @DeleteMapping(value = "/logout") public ResponseEntity logout(HttpServletRequest request) { if (ObjectUtil.isNotEmpty(StpUtil.getTokenValue())) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java index c88e7b8..98b9bc7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java @@ -8,8 +8,8 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.RsaUtils; @@ -39,13 +39,12 @@ import java.util.List; @Slf4j @RestController @RequestMapping("/mobile/auth") -@Api(tags = "手持：系统授权接口") public class MobileAuthorizationController { @Autowired private ISysUserService userService; @Autowired private ISysRoleService roleService; - @ApiOperation("登录授权") + @PostMapping(value = "/login") @SaIgnore public ResponseEntity login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java index 019b69e..d2a0e76 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java @@ -3,8 +3,8 @@ package org.nl.system.controller.tools; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; @@ -32,19 +32,18 @@ import java.util.Set; * @since 2022-12-20 */ @RestController -@Api(tags = "工具：本地存储管理") @RequestMapping("/api/localStorage") public class ToolLocalStorageController { @Autowired private IToolLocalStorageService localStorageService; - @ApiOperation("查询文件") + @GetMapping public ResponseEntity query(ToolLocalStorageQuery criteria, PageQuery pageable) { return new ResponseEntity<>(TableDataInfo.build(localStorageService.queryAll(criteria, pageable)), HttpStatus.OK); } - @ApiOperation("上传文件") + @PostMapping @SaIgnore public ResponseEntity create(@RequestParam String name, @RequestParam("file") MultipartFile file) { @@ -52,7 +51,7 @@ public class ToolLocalStorageController { } @PostMapping("/pictures") - @ApiOperation("上传图片") + public ResponseEntity upload(@RequestParam MultipartFile file) { // 判断文件是否为图片 String suffix = FileUtil.getExtensionName(file.getOriginalFilename()); @@ -63,7 +62,7 @@ public class ToolLocalStorageController { } @Log("修改文件") - @ApiOperation("修改文件") + @PutMapping @SaCheckPermission("storage:edit") public ResponseEntity update(@Validated @RequestBody ToolLocalStorage resources) { @@ -73,7 +72,7 @@ public class ToolLocalStorageController { @Log("删除文件") @DeleteMapping - @ApiOperation("多选删除") + public ResponseEntity delete(@RequestBody Set ids) { localStorageService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java index 4893924..abb37e2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java @@ -16,8 +16,8 @@ package org.nl.system.controller.user; import com.alibaba.fastjson.JSONArray; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import org.nl.common.utils.EncryptUtils; import org.nl.system.service.secutiry.impl.OnlineUserService; import org.nl.system.service.user.dto.OnlineUserDto; @@ -37,25 +37,24 @@ import java.util.Set; */ @RestController @RequestMapping("/auth/online") -@Api(tags = "系统：在线用户管理") public class OnlineController { @Autowired private OnlineUserService onlineUserService; - @ApiOperation("查询在线用户") + @GetMapping public ResponseEntity query(String filter, Pageable pageable){ return new ResponseEntity<>(onlineUserService.getAll(filter, pageable),HttpStatus.OK); } - @ApiOperation("导出数据") + @GetMapping(value = "/download") public void download(HttpServletResponse response, String filter) throws IOException { onlineUserService.download(onlineUserService.getAll(filter), response); } - @ApiOperation("踢出用户") + @DeleteMapping public ResponseEntity delete(@RequestBody List keys) throws Exception { for (OnlineUserDto key : keys) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java index 50a5989..364088b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java @@ -21,8 +21,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.RequiredArgsConstructor; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -48,7 +48,6 @@ import java.util.Set; * @author Zheng Jie * @date 2018-11-23 */ -@Api(tags = "系统：用户管理") @RestController @RequestMapping("/api/users") @RequiredArgsConstructor @@ -58,14 +57,14 @@ public class UserController { private ISysUserService userService; - @ApiOperation("查询用户") + @GetMapping public ResponseEntity query(UserQuery query, PageQuery page){ return new ResponseEntity(TableDataInfo.build(userService.getUserDetail(query, page)),HttpStatus.OK); } @Log("新增用户") - @ApiOperation("新增用户") + @PostMapping public ResponseEntity create(@RequestBody Map user){ userService.create(user); @@ -73,7 +72,7 @@ public class UserController { } @Log("修改用户") - @ApiOperation("修改用户") + @PutMapping public ResponseEntity update( @RequestBody Map resources) throws Exception { userService.update(resources); @@ -81,7 +80,7 @@ public class UserController { } @Log("修改用户：个人中心") - @ApiOperation("修改用户：个人中心") + public ResponseEntity center(@RequestBody SysUser resources){ if(!resources.getUser_id().equals(StpUtil.getLoginIdAsLong())){ throw new BadRequestException(LangProcess.msg("error_SystemAuthError")); @@ -91,14 +90,14 @@ public class UserController { } @Log("删除用户") - @ApiOperation("删除用户") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { userService.removeByIds(ids); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("修改密码") + @PostMapping(value = "/updatePass") public ResponseEntity updatePass(@RequestBody JSONObject passVo) throws Exception { // 解密，得到字符密码 @@ -116,14 +115,14 @@ public class UserController { return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("修改头像") + @PostMapping(value = "/updateAvatar") public ResponseEntity updateAvatar(@RequestParam MultipartFile avatar){ return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK); } @Log("修改邮箱") - @ApiOperation("修改邮箱") + @PostMapping(value = "/updateEmail/{code}") public ResponseEntity updateEmail(@PathVariable String code,@RequestBody SysUser user) throws Exception { String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java index b220616..908c312 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import io.swagger.annotations.ApiModelProperty; + import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,43 +34,43 @@ public class CodeColumnConfig implements Serializable { @TableId(value = "column_id", type = IdType.ASSIGN_ID) private String column_id; - @ApiModelProperty(value = "表名") + private String table_name; - @ApiModelProperty(value = "数据库字段名称") + private String column_name; - @ApiModelProperty(value = "数据库字段类型") + private String column_type; - @ApiModelProperty(value = "数据库字段键类型") + private String key_type; - @ApiModelProperty(value = "字段额外的参数") + private String extra; - @ApiModelProperty(value = "数据库字段描述") + private String remark; - @ApiModelProperty(value = "是否必填") + private Boolean not_null; - @ApiModelProperty(value = "是否在列表显示") + private Boolean list_show; - @ApiModelProperty(value = "是否表单显示") + private Boolean form_show; - @ApiModelProperty(value = "表单类型") + private String form_type; - @ApiModelProperty(value = "查询 1:模糊 2：精确") + private String query_type; - @ApiModelProperty(value = "字典名称") + private String dict_name; - @ApiModelProperty(value = "日期注解") + private String date_annotation; /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java index 79e389f..9ed98b3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java @@ -1,6 +1,6 @@ package org.nl.system.service.generator.dto; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; /** @@ -10,39 +10,39 @@ import lombok.Data; */ @Data public class ColumnInfo { - @ApiModelProperty(value = "数据库字段名称") + private String column_name; - @ApiModelProperty(value = "数据库字段类型") + private String column_type; - @ApiModelProperty(value = "数据库字段键类型") + private String key_type; - @ApiModelProperty(value = "字段额外的参数") + private String extra; - @ApiModelProperty(value = "数据库字段描述") + private String remark; - @ApiModelProperty(value = "是否必填") + private Boolean not_null; - @ApiModelProperty(value = "是否在列表显示") + private Boolean list_show; - @ApiModelProperty(value = "是否表单显示") + private Boolean form_show; - @ApiModelProperty(value = "表单类型") + private String form_type; - @ApiModelProperty(value = "查询 1:模糊 2：精确") + private String query_type; - @ApiModelProperty(value = "字典名称") + private String dict_name; - @ApiModelProperty(value = "日期注解") + private String date_annotation; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java index b5a8daa..5566baa 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java @@ -3,7 +3,7 @@ package org.nl.system.service.notice.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,28 +26,28 @@ public class SysNotice implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "notice_id", type = IdType.NONE) - @ApiModelProperty(value = "信息标识") + private String notice_id; - @ApiModelProperty(value = "信息标题") + private String notice_title; - @ApiModelProperty(value = "信息内容") + private String notice_content; - @ApiModelProperty(value = "信息类型") + private String notice_type; - @ApiModelProperty(value = "读取状态") + private String have_read; - @ApiModelProperty(value = "读取时间") + private String read_time; - @ApiModelProperty(value = "处理状态") + private String deal_status; - @ApiModelProperty(value = "创建时间") + private String create_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java index c00c0f3..b3b88e5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/QuartzConfig.java @@ -9,6 +9,8 @@ import org.springframework.scheduling.quartz.AdaptableJobFactory; import org.springframework.scheduling.quartz.SchedulerFactoryBean; import org.springframework.stereotype.Component; +import java.util.Properties; + /** * 定时任务配置 * @author / @@ -48,6 +50,14 @@ public class QuartzConfig { @Bean(name = "scheduler") public Scheduler scheduler(QuartzJobFactory quartzJobFactory) throws Exception { SchedulerFactoryBean factoryBean=new SchedulerFactoryBean(); + + //https://blog.csdn.net/YuChenIT/article/details/133344898 + Properties prop = new Properties(); + prop.put("org.quartz.threadPool.threadCount", "9"); + factoryBean.setWaitForJobsToCompleteOnShutdown(true); + + factoryBean.setQuartzProperties(prop); + factoryBean.setJobFactory(quartzJobFactory); factoryBean.afterPropertiesSet(); Scheduler scheduler=factoryBean.getScheduler(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java index e47816a..19ea970 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java @@ -2,11 +2,12 @@ package org.nl.system.service.quartz.utils; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.yomahub.tlog.task.quartz.TLogQuartzJobBean; import lombok.extern.slf4j.Slf4j; -import org.nl.config.thread.ThreadPoolExecutorUtil; import org.nl.common.utils.RedisUtils; import org.nl.common.utils.ThrowableUtil; import org.nl.config.SpringContextHolder; +import org.nl.config.thread.ThreadPoolExecutorUtil; import org.nl.system.service.quartz.ISysQuartzJobService; import org.nl.system.service.quartz.dao.SysQuartzJob; import org.nl.system.service.quartz.dao.SysQuartzLog; @@ -15,6 +16,8 @@ import org.nl.system.service.quartz.impl.SysQuartzJobServiceImpl; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.quartz.QuartzJobBean; @@ -30,14 +33,18 @@ import java.util.concurrent.ThreadPoolExecutor; @SuppressWarnings({"unchecked", "all"}) @Slf4j @DisallowConcurrentExecution -public class ExecutionJob extends QuartzJobBean { +public class ExecutionJob extends TLogQuartzJobBean { /** * 该处仅供参考 */ - private final static ThreadPoolExecutor EXECUTOR = ThreadPoolExecutorUtil.getPoll(); + @Autowired + @Qualifier("threadPoolExecutor") + private ThreadPoolExecutor EXECUTOR; + + @Override - protected void executeInternal(JobExecutionContext context) throws JobExecutionException { + public void executeTask(JobExecutionContext context) throws JobExecutionException { SysQuartzJob quartzJob = (SysQuartzJob) context.getMergedJobDataMap().get(SysQuartzJob.JOB_KEY); // 获取spring bean ISysQuartzJobService quartzJobService = SpringContextHolder.getBean(SysQuartzJobServiceImpl.class); @@ -47,7 +54,7 @@ public class ExecutionJob extends QuartzJobBean { String uuid = quartzJob.getUuid(); SysQuartzLog logDto = new SysQuartzLog(); - logDto.setLog_id(IdUtil.getSnowflake(1,1).nextIdStr()); + logDto.setLog_id(IdUtil.getSnowflake(1, 1).nextIdStr()); logDto.setJob_name(quartzJob.getJob_name()); logDto.setBean_name(quartzJob.getBean_name()); logDto.setMethod_name(quartzJob.getMethod_name()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java index aee043f..6863b1c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java @@ -1,7 +1,7 @@ package org.nl.system.service.redis.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,26 +14,25 @@ import java.time.Duration; * @Description: 管理后台 - Redis Key 信息 Response VO * @Date: 2022-08-04 */ -@ApiModel("管理后台 - Redis Key 信息 Response VO") @Data @Builder @AllArgsConstructor public class RedisKeyDefineRespVO { - @ApiModelProperty(value = "Key 模板", required = true, example = "login_user:%s") + private String keyTemplate; - @ApiModelProperty(value = "Key 类型的枚举", required = true, example = "String") + private RedisKeyDefine.KeyTypeEnum keyType; - @ApiModelProperty(value = "Value 类型", required = true, example = "java.lang.String") + private Class valueType; - @ApiModelProperty(value = "超时类型", required = true, example = "1") + private RedisKeyDefine.TimeoutTypeEnum timeoutType; - @ApiModelProperty(value = "过期时间，单位：毫秒", required = true, example = "1024") + private Duration timeout; - @ApiModelProperty(value = "备注", required = true, example = "啦啦啦啦~") + private String memo; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisMonitorRespVO.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisMonitorRespVO.java index ce0794b..65de98a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisMonitorRespVO.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisMonitorRespVO.java @@ -1,7 +1,7 @@ package org.nl.system.service.redis.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,33 +14,31 @@ import java.util.Properties; * @Description: 管理后台 - Redis 监控信息 Response VO * @Date: 2022-08-04 */ -@ApiModel("管理后台 - Redis 监控信息 Response VO") @Data @Builder @AllArgsConstructor public class RedisMonitorRespVO { - @ApiModelProperty(value = "Redis info 指令结果", required = true, notes = "具体字段，查看 Redis 文档") + private Properties info; - @ApiModelProperty(value = "Redis key 数量", required = true, example = "1024") + private Long dbSize; - @ApiModelProperty(value = "CommandStat 数组", required = true) + private List commandStats; - @ApiModel("Redis 命令统计结果") @Data @Builder @AllArgsConstructor public static class CommandStat { - @ApiModelProperty(value = "Redis 命令", required = true, example = "get") + private String command; - @ApiModelProperty(value = "调用次数", required = true, example = "1024") + private Integer calls; - @ApiModelProperty(value = "消耗 CPU 秒数", required = true, example = "666") + private Long usec; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java index aa98321..1b4513a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java @@ -1,7 +1,7 @@ package org.nl.wms.database.classification.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -24,7 +24,6 @@ import java.util.Map; **/ @Slf4j @RestController -@Api(tags = "基础分类管理") @RequestMapping("/api/Classstandard") public class MdBaseClassstandardController { @@ -33,14 +32,14 @@ public class MdBaseClassstandardController { @GetMapping @Log("查询基础分类") - @ApiOperation("查询基础分类") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(mdBaseClassstandardService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增基础分类") - @ApiOperation("新增基础分类") + public ResponseEntity create(@Validated @RequestBody MdBaseClassstandard entity){ mdBaseClassstandardService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -48,14 +47,14 @@ public class MdBaseClassstandardController { @PutMapping @Log("修改基础分类") - @ApiOperation("修改基础分类") + public ResponseEntity update(@Validated @RequestBody MdBaseClassstandard entity){ mdBaseClassstandardService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除基础分类") - @ApiOperation("删除基础分类") + @DeleteMapping public ResponseEntity delete(@RequestBody List ids) { mdBaseClassstandardService.deleteAll(ids); @@ -64,19 +63,19 @@ public class MdBaseClassstandardController { @GetMapping("/getClassName") @Log("获取分类名称下拉框") - @ApiOperation("获取分类名称下拉框") + public ResponseEntity getClassName() { return new ResponseEntity<>(mdBaseClassstandardService.getClassName(), HttpStatus.OK); } @GetMapping("/loadClass") @Log("查询基础类型") - @ApiOperation("查询基础类型") + public ResponseEntity query(@RequestParam Map whereJson) { return new ResponseEntity<>(mdBaseClassstandardService.loadClass(whereJson), HttpStatus.OK); } - @ApiOperation("查询类别:根据ID获取同级与上级数据") + @PostMapping("/superior") public ResponseEntity getSuperior(@RequestBody String id) { MdBaseClassstandard classstandard = mdBaseClassstandardService.getById(id); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/MdBaseClassstandard.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/MdBaseClassstandard.java index e244b8f..6cc3af0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/MdBaseClassstandard.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dao/MdBaseClassstandard.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -24,64 +24,64 @@ public class MdBaseClassstandard implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "class_id", type = IdType.NONE) - @ApiModelProperty(value = "分类标识") + private String class_id; - @ApiModelProperty(value = "分类编码") + private String class_code; - @ApiModelProperty(value = "分类名称") + private String class_name; - @ApiModelProperty(value = "分类简要描述") + private String class_desc; - @ApiModelProperty(value = "上级分类标识") + private String parent_class_id; - @ApiModelProperty(value = "子级数目") + private Integer sub_count; - @ApiModelProperty(value = "是否叶子") + private Boolean is_leaf; - @ApiModelProperty(value = "是否可修改") + private Boolean is_modify; - @ApiModelProperty(value = "是否删除") + private Boolean is_delete; - @ApiModelProperty(value = "级别") + private String class_level; - @ApiModelProperty(value = "外部标识") + private String ext_id; - @ApiModelProperty(value = "外部上级标识") + private String ext_parent_id; - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; @TableField(exist = false) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java index a0c7e42..f7e1055 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java @@ -1,7 +1,7 @@ package org.nl.wms.database.material.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.annotation.Limit; import org.nl.common.base.TableDataInfo; @@ -24,7 +24,6 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "物料基础信息管理") @RequestMapping("/api/mdBaseMaterial") public class MdBaseMaterialController { @@ -35,14 +34,14 @@ public class MdBaseMaterialController { @GetMapping @Log("查询物料基础信息") - @ApiOperation("查询物料基础信息") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(mdBaseMaterialService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增物料基础信息") - @ApiOperation("新增物料基础信息") + public ResponseEntity create(@Validated @RequestBody MdBaseMaterial entity){ mdBaseMaterialService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -50,14 +49,14 @@ public class MdBaseMaterialController { @PutMapping @Log("修改物料基础信息") - @ApiOperation("修改物料基础信息") + public ResponseEntity update(@Validated @RequestBody MdBaseMaterial entity){ mdBaseMaterialService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除物料基础信息") - @ApiOperation("删除物料基础信息") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { mdBaseMaterialService.deleteAll(ids); @@ -66,7 +65,7 @@ public class MdBaseMaterialController { @PostMapping("/synchronize") @Log("物料同步") - @ApiOperation("物料同步") + @Limit(period = 1, count = 1) public ResponseEntity synchronize(@RequestBody Map whereJson) { return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java index d093aec..3598cc4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -24,85 +24,85 @@ public class MdBaseMaterial implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "material_id", type = IdType.NONE) - @ApiModelProperty(value = "物料标识") + private String material_id; - @ApiModelProperty(value = "成品物料编码") + private String material_code; - @ApiModelProperty(value = "半成品物料编码") + private String half_material_code; - @ApiModelProperty(value = "原材料物料编码") + private String raw_material_code; - @ApiModelProperty(value = "物料名称 ") + private String material_name; - @ApiModelProperty(value = "物料规格") + private String material_spec; - @ApiModelProperty(value = "物料分类标识") + private String class_id; - @ApiModelProperty(value = "静置时间(分钟)") + private Integer standing_time; - @ApiModelProperty(value = "冷却时间(分钟)") + private Integer cooling_time; - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private Boolean is_used; - @ApiModelProperty(value = "是否删除") + private Boolean is_delete; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "外部标识") + private String ext_id; - @ApiModelProperty(value = "外部时间") + private String ext_time; - @ApiModelProperty(value = "物料型号") + private String material_model; - @ApiModelProperty(value = "物料单重") + private String single_weight; - @ApiModelProperty(value = "A") + private String a_long_side; - @ApiModelProperty(value = "B") + private String b_short_side; - @ApiModelProperty(value = "H") + private String h_height; - @ApiModelProperty(value = "W") + private String w_thickness; private String matsize; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java index 8198202..e80abe4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java @@ -1,7 +1,7 @@ package org.nl.wms.database.vehicle.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -22,7 +22,6 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "载具维护管理") @RequestMapping("/api/mdBaseVehicle") public class MdBaseVehicleController { @@ -31,14 +30,14 @@ public class MdBaseVehicleController { @GetMapping @Log("查询载具维护") - @ApiOperation("查询载具维护") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(mdBaseVehicleService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增载具维护") - @ApiOperation("新增载具维护") + public ResponseEntity create(@Validated @RequestBody MdBaseVehicle entity){ mdBaseVehicleService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -46,14 +45,14 @@ public class MdBaseVehicleController { @PutMapping @Log("修改载具维护") - @ApiOperation("修改载具维护") + public ResponseEntity update(@Validated @RequestBody MdBaseVehicle entity){ mdBaseVehicleService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除载具维护") - @ApiOperation("删除载具维护") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { mdBaseVehicleService.deleteAll(ids); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java index 65ef1b8..9a53988 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java @@ -3,7 +3,7 @@ package org.nl.wms.database.vehicle.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -23,58 +23,58 @@ public class MdBaseVehicle implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "vehicle_code", type = IdType.NONE) - @ApiModelProperty(value = "载具编码") + private String vehicle_code; - @ApiModelProperty(value = "载具名称") + private String vehicle_name; - @ApiModelProperty(value = "载具类型") + private String vehicle_type; - @ApiModelProperty(value = "一维码") + private String one_code; - @ApiModelProperty(value = "二维码") + private String two_code; - @ApiModelProperty(value = "RFID编码") + private String rfid_code; - @ApiModelProperty(value = "载具宽度") + private BigDecimal vehicle_width; - @ApiModelProperty(value = "载具长度") + private BigDecimal vehicle_long; - @ApiModelProperty(value = "载具高度") + private BigDecimal vehicle_height; - @ApiModelProperty(value = "载具超仓位类型") + private String overstruct_type; - @ApiModelProperty(value = "占仓位数") + private BigDecimal occupystruct_qty; - @ApiModelProperty(value = "外部标识") + private String ext_id; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java index d5e4eb2..27c33b5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java @@ -1,7 +1,7 @@ package org.nl.wms.database.workshop.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -22,7 +22,6 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "车间基础信息管理") @RequestMapping("/api/mdBaseWorkshop") public class MdBaseWorkshopController { @@ -31,14 +30,14 @@ public class MdBaseWorkshopController { @GetMapping @Log("查询车间基础信息") - @ApiOperation("查询车间基础信息") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(mdBaseWorkshopService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增车间基础信息") - @ApiOperation("新增车间基础信息") + public ResponseEntity create(@Validated @RequestBody MdBaseWorkshop entity){ mdBaseWorkshopService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -46,14 +45,14 @@ public class MdBaseWorkshopController { @PutMapping @Log("修改车间基础信息") - @ApiOperation("修改车间基础信息") + public ResponseEntity update(@Validated @RequestBody MdBaseWorkshop entity){ mdBaseWorkshopService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除车间基础信息") - @ApiOperation("删除车间基础信息") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { mdBaseWorkshopService.deleteAll(ids); @@ -62,7 +61,7 @@ public class MdBaseWorkshopController { @GetMapping("/getWorkShopList") @Log("获取车间下拉框") - @ApiOperation("获取车间下拉框") + public ResponseEntity getWorkShopList(){ return new ResponseEntity<>(mdBaseWorkshopService.getWorkShopList(),HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java index 37a487a..db4b6f3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java @@ -3,7 +3,7 @@ package org.nl.wms.database.workshop.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -21,37 +21,37 @@ import java.io.Serializable; public class MdBaseWorkshop implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "workshop_code", type = IdType.NONE) - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "车间名称 ") + private String workshop_name; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private Boolean is_used; - @ApiModelProperty(value = "是否删除") + private Boolean is_delete; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java index d66cf3a..bb9d0e3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java @@ -2,8 +2,8 @@ package org.nl.wms.ext.acs.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; import org.nl.wms.ext.acs.service.AcsToWmsService; @@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController; * @Date: 2023/6/16 */ @RestController -@Api(tags = "acs请求lms") @RequestMapping("/api/wms") @Slf4j public class AcsToWmsController { @@ -29,7 +28,6 @@ public class AcsToWmsController { private AcsToWmsService acsToWmsService; @PostMapping("/apply") - @ApiOperation("新增任务管理") @SaIgnore public ResponseEntity apply(@RequestBody JSONObject param) { return new ResponseEntity<>(acsToWmsService.acsApply(param), HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/MesToWmsController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/MesToWmsController.java index 4bc13a9..abfce0c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/MesToWmsController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/MesToWmsController.java @@ -2,8 +2,8 @@ package org.nl.wms.ext.mes.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; import org.nl.wms.ext.mes.service.MesToWmsService; @@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RestController; * @Date: 2023/8/30 */ @RestController -@Api(tags = "mes请求lms") @RequestMapping("/api/mes") @Slf4j @SaIgnore diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java index 39bf47c..e4f86b8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java @@ -1,7 +1,7 @@ package org.nl.wms.ext.record.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -22,7 +22,6 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "外部系统接口记录管理") @RequestMapping("/api/sysInteractRecord") public class SysInteractRecordController { @@ -31,14 +30,14 @@ public class SysInteractRecordController { @GetMapping @Log("查询外部系统接口记录") - @ApiOperation("查询外部系统接口记录") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(sysInteractRecordService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增外部系统接口记录") - @ApiOperation("新增外部系统接口记录") + public ResponseEntity create(@Validated @RequestBody SysInteractRecord entity){ sysInteractRecordService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -46,14 +45,14 @@ public class SysInteractRecordController { @PutMapping @Log("修改外部系统接口记录") - @ApiOperation("修改外部系统接口记录") + public ResponseEntity update(@Validated @RequestBody SysInteractRecord entity){ sysInteractRecordService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除外部系统接口记录") - @ApiOperation("删除外部系统接口记录") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { sysInteractRecordService.deleteAll(ids); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/SysInteractRecord.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/SysInteractRecord.java index f5ef9a9..bc84395 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/SysInteractRecord.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/SysInteractRecord.java @@ -3,7 +3,7 @@ package org.nl.wms.ext.record.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,31 +22,31 @@ public class SysInteractRecord implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "interact_id", type = IdType.NONE) - @ApiModelProperty(value = "对接标识") + private String interact_id; - @ApiModelProperty(value = "对接名称") + private String interact_name; - @ApiModelProperty(value = "响应编码") + private int code; - @ApiModelProperty(value = "响应信息") + private String message; - @ApiModelProperty(value = "请求报文") + private String request_param; - @ApiModelProperty(value = "响应结果") + private String response_param; - @ApiModelProperty(value = "记录时间") + private String record_time; - @ApiModelProperty(value = "方向") + private String direction; - @ApiModelProperty(value = "是否成功") + private Boolean is_success; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java index 0d83fb5..e4fa7a7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java @@ -1,8 +1,8 @@ package org.nl.wms.sch.group.controller; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -24,7 +24,6 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "组盘信息管理管理") @RequestMapping("/api/schBaseVehiclematerialgroup") public class SchBaseVehiclematerialgroupController { @@ -33,7 +32,7 @@ public class SchBaseVehiclematerialgroupController { @GetMapping @Log("查询组盘信息管理") - @ApiOperation("查询组盘信息管理") + public ResponseEntity query(SchBaseVehiclematerialgroupQuery whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(schBaseVehiclematerialgroupService .queryAll(whereJson,page)),HttpStatus.OK); @@ -41,7 +40,7 @@ public class SchBaseVehiclematerialgroupController { @PostMapping @Log("新增组盘信息管理") - @ApiOperation("新增组盘信息管理") + public ResponseEntity create(@Validated @RequestBody SchBaseVehiclematerialgroup entity){ schBaseVehiclematerialgroupService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -49,14 +48,14 @@ public class SchBaseVehiclematerialgroupController { @PutMapping @Log("修改组盘信息管理") - @ApiOperation("修改组盘信息管理") + public ResponseEntity update(@Validated @RequestBody SchBaseVehiclematerialgroup entity){ schBaseVehiclematerialgroupService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除组盘信息管理") - @ApiOperation("删除组盘信息管理") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { schBaseVehiclematerialgroupService.deleteAll(ids); @@ -65,7 +64,7 @@ public class SchBaseVehiclematerialgroupController { @PostMapping("/getGroup") @Log("获取组盘信息管理") - @ApiOperation("获取组盘信息管理") + public ResponseEntity getGroup(@RequestBody JSONObject entity){ return new ResponseEntity<>(schBaseVehiclematerialgroupService.getGroup(entity), HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java index 2439b79..7262da0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,133 +22,133 @@ import java.math.BigDecimal; public class SchBaseVehiclematerialgroup implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "group_id", type = IdType.NONE) - @ApiModelProperty(value = "组盘标识") + private String group_id; - @ApiModelProperty(value = "载具编码") + private String vehicle_code; - @ApiModelProperty(value = "物料标识") + private String material_id; - @ApiModelProperty(value = "冗余-半成品/泥料") + private String redundance_material_code; - @ApiModelProperty(value = "载具类型") + private String vehicle_type; - @ApiModelProperty(value = "子载具编码") + private String child_vehicle_code; - @ApiModelProperty(value = "来源载具编码") + private String source_vehicle_code; - @ApiModelProperty(value = "点位编码") + private String point_code; - @ApiModelProperty(value = "点位名称") + private String point_name; - @ApiModelProperty(value = "是否满托") + private Boolean is_full; - @ApiModelProperty(value = "是否已烧制") + private Boolean is_firing; - @ApiModelProperty(value = "批次") + private String pcsn; - @ApiModelProperty(value = "碾次") + private String mix_times; - @ApiModelProperty(value = "入库时间") + private String instorage_time; - @ApiModelProperty(value = "静置时间(分钟)") + private Integer standing_time; - @ApiModelProperty(value = "物料数量") + private Integer material_qty; - @ApiModelProperty(value = "物料重量") + private BigDecimal material_weight; - @ApiModelProperty(value = "搬运工单编码") + private String workorder_code; - @ApiModelProperty(value = "组盘次数") + private Integer group_number; - @ApiModelProperty(value = "任务编码") + private String task_code; - @ApiModelProperty(value = "额外信息") + private String ext_data; - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "组盘状态") + private String group_status; - @ApiModelProperty(value = "移动途径") + private String move_way; - @ApiModelProperty(value = "业务表表名") + private String table_name; - @ApiModelProperty(value = "业务表表名主键字段") + private String table_fk; - @ApiModelProperty(value = "业务表表名主键值") + private String table_fk_id; - @ApiModelProperty(value = "业务链路标识") + private String buss_move_id; - @ApiModelProperty(value = "是否首个流程任务") + private Boolean is_first_flow_task; - @ApiModelProperty(value = "流程编码") + private String flow_code; - @ApiModelProperty(value = "流程顺序") + private BigDecimal flow_num; - @ApiModelProperty(value = "上一任务编码") + private String before_task_code; - @ApiModelProperty(value = "下一任务编码") + private String next_task_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "1:待绑定，2:已绑定，3:已解绑") + private String group_bind_material_status; - @ApiModelProperty(value = "是否删除") + private Boolean is_delete; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "出窑时间") + private String out_kiln_time; - @ApiModelProperty(value = "入窑时间") + private String into_kiln_time; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java index 0dc44a2..7122789 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java @@ -2,7 +2,7 @@ package org.nl.wms.sch.group.service.dto; import java.math.BigDecimal; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import java.io.Serializable; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/interactivelog/controller/SchBaseAcsandlmsinteractivelogController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/interactivelog/controller/SchBaseAcsandlmsinteractivelogController.java index 2bd2919..a45fa70 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/interactivelog/controller/SchBaseAcsandlmsinteractivelogController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/interactivelog/controller/SchBaseAcsandlmsinteractivelogController.java @@ -1,7 +1,7 @@ package org.nl.wms.sch.interactivelog.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -22,7 +22,6 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "ACS和LMS交互日志表管理") @RequestMapping("/api/schBaseAcsandlmsinteractivelog") public class SchBaseAcsandlmsinteractivelogController { @@ -31,14 +30,14 @@ public class SchBaseAcsandlmsinteractivelogController { @GetMapping @Log("查询ACS和LMS交互日志表") - @ApiOperation("查询ACS和LMS交互日志表") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(schBaseAcsandlmsinteractivelogService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增ACS和LMS交互日志表") - @ApiOperation("新增ACS和LMS交互日志表") + public ResponseEntity create(@Validated @RequestBody SchBaseAcsandlmsinteractivelog entity){ schBaseAcsandlmsinteractivelogService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -46,14 +45,14 @@ public class SchBaseAcsandlmsinteractivelogController { @PutMapping @Log("修改ACS和LMS交互日志表") - @ApiOperation("修改ACS和LMS交互日志表") + public ResponseEntity update(@Validated @RequestBody SchBaseAcsandlmsinteractivelog entity){ schBaseAcsandlmsinteractivelogService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除ACS和LMS交互日志表") - @ApiOperation("删除ACS和LMS交互日志表") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { schBaseAcsandlmsinteractivelogService.deleteAll(ids); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/interactivelog/service/dao/SchBaseAcsandlmsinteractivelog.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/interactivelog/service/dao/SchBaseAcsandlmsinteractivelog.java index 40c0464..c4d8073 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/interactivelog/service/dao/SchBaseAcsandlmsinteractivelog.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/interactivelog/service/dao/SchBaseAcsandlmsinteractivelog.java @@ -3,7 +3,7 @@ package org.nl.wms.sch.interactivelog.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,52 +22,52 @@ public class SchBaseAcsandlmsinteractivelog implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "log_id", type = IdType.NONE) - @ApiModelProperty(value = "日志标识") + private String log_id; - @ApiModelProperty(value = "请求名字") + private String request_name; - @ApiModelProperty(value = "生成任务的请求参数") + private String request_param; - @ApiModelProperty(value = "下发任务的请求参数") + private String response_param; - @ApiModelProperty(value = "链路标识") + private String acs_trace_id; - @ApiModelProperty(value = "请求描述") + private String request_desc; - @ApiModelProperty(value = "请求类型") + private String request_type; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否处理完成") + private Boolean is_finish; - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java index 8df449b..ed437aa 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java @@ -2,8 +2,8 @@ package org.nl.wms.sch.point.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -25,7 +25,6 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "点位管理管理") @RequestMapping("/api/schBasePoint") public class SchBasePointController { @@ -34,14 +33,14 @@ public class SchBasePointController { @GetMapping @Log("查询点位管理") - @ApiOperation("查询点位管理") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(schBasePointService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增点位管理") - @ApiOperation("新增点位管理") + public ResponseEntity create(@Validated @RequestBody SchBasePoint entity){ schBasePointService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -49,14 +48,14 @@ public class SchBasePointController { @PutMapping @Log("修改点位管理") - @ApiOperation("修改点位管理") + public ResponseEntity update(@Validated @RequestBody SchBasePoint entity){ schBasePointService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除点位管理") - @ApiOperation("删除点位管理") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { schBasePointService.deleteAll(ids); @@ -65,7 +64,7 @@ public class SchBasePointController { @Log("启动与禁用") @PostMapping("/changeUsed") - @ApiOperation("启动与禁用") + public ResponseEntity changeUsedOn(@RequestBody JSONObject jsonObject) { schBasePointService.changeUsed(jsonObject); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -73,14 +72,14 @@ public class SchBasePointController { @PostMapping("/getPointList") @Log("获取区域下拉框") - @ApiOperation("获取区域下拉框") + public ResponseEntity getPointList(@RequestBody(required = false) SchBasePoint region){ return new ResponseEntity<>(schBasePointService.getPointList(region),HttpStatus.OK); } @Log("锁定与解锁") @PostMapping("/changeLock") - @ApiOperation("锁定与解锁") + public ResponseEntity changeLock(@RequestBody JSONObject points) { schBasePointService.changeLock(points); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java index 6f92559..197b58f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,109 +25,109 @@ public class SchBasePoint implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "point_code", type = IdType.NONE) - @ApiModelProperty(value = "点位编码") + private String point_code; - @ApiModelProperty(value = "点位名称") + private String point_name; - @ApiModelProperty(value = "区域编码") + private String region_code; - @ApiModelProperty(value = "区域名称") + private String region_name; - @ApiModelProperty(value = "点位类型") + private String point_type; - @ApiModelProperty(value = "点位状态") + private String point_status; - @ApiModelProperty(value = "允许的物料类型") + private String can_material_type; - @ApiModelProperty(value = "允许的载具类型") + private String can_vehicle_type; - @ApiModelProperty(value = "载具允许最大数量") + private Integer vehicle_max_qty; - @ApiModelProperty(value = "载具类型") + private String vehicle_type; - @ApiModelProperty(value = "载具编码") + private String vehicle_code; - @ApiModelProperty(value = "载具数量") + private Integer vehicle_qty; - @ApiModelProperty(value = "块") + private Integer block_num; - @ApiModelProperty(value = "排") + private Integer row_num; - @ApiModelProperty(value = "列") + private Integer col_num; - @ApiModelProperty(value = "层") + private Integer layer_num; - @ApiModelProperty(value = "入库顺序") + private Integer in_order_seq; - @ApiModelProperty(value = "出库顺序") + private Integer out_order_seq; - @ApiModelProperty(value = "入空载具顺序") + private Integer in_empty_seq; - @ApiModelProperty(value = "出空载具顺序") + private Integer out_empty_seq; - @ApiModelProperty(value = "父点位编码") + private String parent_point_code; - @ApiModelProperty(value = "外部点位编码") + private String ext_point_code; - @ApiModelProperty(value = "在执行的任务标识") + private String ing_task_code; - @ApiModelProperty(value = "是否创建工单") + private Boolean is_has_workder; - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "是否自动") + private Boolean is_auto; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private Boolean is_used; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "允许存放的载具数据") + @TableField(exist = false) private List can_vehicle_types; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/controller/SchBaseRegionController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/controller/SchBaseRegionController.java index 9ca3089..6723121 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/controller/SchBaseRegionController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/controller/SchBaseRegionController.java @@ -1,7 +1,7 @@ package org.nl.wms.sch.region.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -22,7 +22,6 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "区域管理管理") @RequestMapping("/api/schBaseRegion") public class SchBaseRegionController { @@ -31,14 +30,14 @@ public class SchBaseRegionController { @GetMapping @Log("查询区域管理") - @ApiOperation("查询区域管理") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(regionService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增区域管理") - @ApiOperation("新增区域管理") + public ResponseEntity create(@Validated @RequestBody SchBaseRegion entity){ regionService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -46,14 +45,14 @@ public class SchBaseRegionController { @PutMapping @Log("修改区域管理") - @ApiOperation("修改区域管理") + public ResponseEntity update(@Validated @RequestBody SchBaseRegion entity){ regionService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除区域管理") - @ApiOperation("删除区域管理") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { regionService.deleteAll(ids); @@ -62,21 +61,21 @@ public class SchBaseRegionController { @PostMapping("/getRegionList") @Log("获取区域下拉框") - @ApiOperation("获取区域下拉框") + public ResponseEntity getRegionList(@RequestBody(required = false) SchBaseRegion region){ return new ResponseEntity<>(regionService.getRegionList(region),HttpStatus.OK); } @PostMapping("/getPointStatusSelectById") @Log("获取点位状态下拉框") - @ApiOperation("获取点位状态下拉框") + public ResponseEntity getPointStatusSelectById(@RequestBody String region_id) { return new ResponseEntity<>(regionService.getPointStatusSelectById(region_id), HttpStatus.OK); } @PostMapping("/getPointTypeSelectById") @Log("获取点位类型下拉框") - @ApiOperation("获取点位类型下拉框") + public ResponseEntity getPointTypeSelectById(@RequestBody String region_id) { return new ResponseEntity<>(regionService.getPointTypeSelectById(region_id), HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java index 0a6f49f..5d98118 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java @@ -3,7 +3,7 @@ package org.nl.wms.sch.region.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,46 +22,46 @@ public class SchBaseRegion implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "region_code", type = IdType.NONE) - @ApiModelProperty(value = "区域编码") + private String region_code; - @ApiModelProperty(value = "区域名称") + private String region_name; - @ApiModelProperty(value = "点位类型说明") + private String point_type_explain; - @ApiModelProperty(value = "点位状态说明") + private String point_status_explain; - @ApiModelProperty(value = "是否创建工单") + private Boolean is_has_workder; - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "顺和号") + private Integer order_seq; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java index f678ae7..0726c1d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java @@ -3,8 +3,8 @@ package org.nl.wms.sch.task.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -26,7 +26,6 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "任务管理管理") @RequestMapping("/api/schBaseTask") public class SchBaseTaskController { @@ -35,14 +34,14 @@ public class SchBaseTaskController { @GetMapping @Log("查询任务管理") - @ApiOperation("查询任务管理") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(schBaseTaskService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增任务管理") - @ApiOperation("新增任务管理") + public ResponseEntity create(@Validated @RequestBody SchBaseTask entity){ schBaseTaskService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -50,14 +49,14 @@ public class SchBaseTaskController { @PutMapping @Log("修改任务管理") - @ApiOperation("修改任务管理") + public ResponseEntity update(@Validated @RequestBody SchBaseTask entity){ schBaseTaskService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除任务管理") - @ApiOperation("删除任务管理") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { schBaseTaskService.deleteAll(ids); @@ -66,7 +65,7 @@ public class SchBaseTaskController { @GetMapping("/taskStatusList") @Log("任务状态下拉框") - @ApiOperation("任务状态下拉框") + @SaIgnore public ResponseEntity getTaskStatusList(){ return new ResponseEntity<>(TableDataInfo.build(schBaseTaskService.getTaskStatusList()),HttpStatus.OK); @@ -74,7 +73,7 @@ public class SchBaseTaskController { @PutMapping("/operation") @Log("任务操作") - @ApiOperation("任务操作") + public ResponseEntity update(@RequestBody Map map) { schBaseTaskService.operation(map); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskconfigController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskconfigController.java index 2a3a319..e8956d6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskconfigController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskconfigController.java @@ -1,7 +1,7 @@ package org.nl.wms.sch.task.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -22,7 +22,6 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "任务配置管理") @RequestMapping("/api/schBaseTaskconfig") public class SchBaseTaskconfigController { @@ -31,14 +30,14 @@ public class SchBaseTaskconfigController { @GetMapping @Log("查询任务配置") - @ApiOperation("查询任务配置") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(schBaseTaskconfigService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增任务配置") - @ApiOperation("新增任务配置") + public ResponseEntity create(@Validated @RequestBody SchBaseTaskconfig entity){ schBaseTaskconfigService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -46,14 +45,14 @@ public class SchBaseTaskconfigController { @PutMapping @Log("修改任务配置") - @ApiOperation("修改任务配置") + public ResponseEntity update(@Validated @RequestBody SchBaseTaskconfig entity){ schBaseTaskconfigService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除任务配置") - @ApiOperation("删除任务配置") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { schBaseTaskconfigService.deleteAll(ids); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java index 781a239..1d0ebb5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java @@ -3,7 +3,7 @@ package org.nl.wms.sch.task.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -23,102 +23,102 @@ public class SchBaseTask implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "task_id", type = IdType.NONE) - @ApiModelProperty(value = "任务标识") + private String task_id; - @ApiModelProperty(value = "任务编码") + private String task_code; - @ApiModelProperty(value = "任务状态") + private String task_status; - @ApiModelProperty(value = "配置编码") + private String config_code; - @ApiModelProperty(value = "点位1") + private String point_code1; - @ApiModelProperty(value = "点位2") + private String point_code2; - @ApiModelProperty(value = "点位3") + private String point_code3; - @ApiModelProperty(value = "点位4") + private String point_code4; - @ApiModelProperty(value = "组盘标识") + private String group_id; - @ApiModelProperty(value = "载具类型") + private String vehicle_type; - @ApiModelProperty(value = "载具数量") + private Integer vehicle_qty; - @ApiModelProperty(value = "载具编码") + private String vehicle_code; - @ApiModelProperty(value = "载具编码2") + private String vehicle_code2; - @ApiModelProperty(value = "处理状态") + private String handle_status; - @ApiModelProperty(value = "车号") + private String car_no; - @ApiModelProperty(value = "任务组标识") + private Long task_group_id; - @ApiModelProperty(value = "任务组顺序号") + private BigDecimal task_group_seq; - @ApiModelProperty(value = "任务完成类型") + private String finished_type; - @ApiModelProperty(value = "生成方式") + private String create_mode; - @ApiModelProperty(value = "链路标识") + private String acs_trace_id; - @ApiModelProperty(value = "生成任务的请求参数") + private String request_param; - @ApiModelProperty(value = "下发任务的请求参数") + private String response_param; - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "额外组盘信息") + private String ext_group_data; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否删除") + private Boolean is_delete; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java index e7423ca..b1ff7bf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,124 +25,124 @@ public class SchBaseTaskconfig implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "config_id", type = IdType.NONE) - @ApiModelProperty(value = "配置标识") + private String config_id; - @ApiModelProperty(value = "配置编码") + private String config_code; - @ApiModelProperty(value = "配置名称") + private String config_name; - @ApiModelProperty(value = "路由编码") + private String route_plan_code; - @ApiModelProperty(value = "任务取放类型") + private String task_qf_type; - @ApiModelProperty(value = "acs任务类型") + private String acs_task_type; - @ApiModelProperty(value = "任务名字") + private String task_name; - @ApiModelProperty(value = "任务类型") + private String task_type; - @ApiModelProperty(value = "任务方向") + private String task_direction; - @ApiModelProperty(value = "优先级") + private String priority; - @ApiModelProperty(value = "允许最大任务生成数") + private Integer task_create_max_num; - @ApiModelProperty(value = "允许最大任务下发数") + private Integer task_issue_max_num; - @ApiModelProperty(value = "是否自动下发") + private Boolean is_auto_issue; - @ApiModelProperty(value = "起点区域配置") + private String start_region_str; - @ApiModelProperty(value = "终点区域配置") + private String next_region_str; - @ApiModelProperty(value = "起点点位前缀") + private String start_point_pre; - @ApiModelProperty(value = "终点点位前缀") + private String next_region_pre; - @ApiModelProperty(value = "是否校验工单") + private Boolean is_check_workorder; - @ApiModelProperty(value = "是否判断起点锁定") + private Boolean is_check_start_lock; - @ApiModelProperty(value = "是否立即创建") + private Boolean is_immediate_create; - @ApiModelProperty(value = "是否判断终点锁定") + private Boolean is_check_next_lock; - @ApiModelProperty(value = "是否起点自动") + private Boolean is_start_auto; - @ApiModelProperty(value = "是否终点自动") + private Boolean is_next_auto; - @ApiModelProperty(value = "是否锁定起点") + private Boolean is_lock_start; - @ApiModelProperty(value = "是否锁定终点") + private Boolean is_lock_next; - @ApiModelProperty(value = "生成任务的请求参数") + private String request_param; - @ApiModelProperty(value = "下发任务的请求参数") + private String response_param; - @ApiModelProperty(value = "是否按组控制下发顺序") + private Boolean is_group_congrol_issue_seq; - @ApiModelProperty(value = "任务未完成通知时间数") + private BigDecimal unfinish_notify_time; - @ApiModelProperty(value = "sql配置") + private String sql_param; - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private Boolean is_used; - @ApiModelProperty(value = "是否删除") + private Boolean is_delete; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; @TableField(exist = false) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskDto.java index 8caae8d..0923f77 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dto/SchBaseTaskDto.java @@ -2,7 +2,7 @@ package org.nl.wms.sch.task.service.dto; import java.math.BigDecimal; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import java.io.Serializable; @@ -39,7 +39,7 @@ public class SchBaseTaskDto implements Serializable { /** 点位4 */ private String point_code4; - @ApiModelProperty(value = "组盘标识") + private String group_id; /** 载具类型 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java index 28f52d8..720c0d1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java @@ -25,7 +25,7 @@ public interface IStIvtIostorinvdtlService extends IService { * @param tableDataList 、 * @return 、 */ - ArrayList insertDtl(String iostorinv_id, List tableDataList); + ArrayList insertDtl(Long iostorinv_id, List tableDataList); /** * 获取单据明细 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java index 89df5b1..06dc2fb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java @@ -21,6 +21,7 @@ import java.math.BigDecimal; @Builder @EqualsAndHashCode(callSuper = false) @TableName("st_ivt_iostorinv") + public class StIvtIostorinv implements Serializable { private static final long serialVersionUID = 1L; @@ -29,7 +30,7 @@ public class StIvtIostorinv implements Serializable { * 出入单标识 */ @TableId - private String iostorinv_id; + private Long iostorinv_id; /** * 单据编号 @@ -59,7 +60,7 @@ public class StIvtIostorinv implements Serializable { /** * 仓库标识 */ - private String stor_id; + private Long stor_id; /** * 仓库编码 @@ -74,7 +75,7 @@ public class StIvtIostorinv implements Serializable { /** * 来源方标识 */ - private String source_id; + private Long source_id; /** * 来源方名称 @@ -119,7 +120,7 @@ public class StIvtIostorinv implements Serializable { /** * 制单人 */ - private String input_optid; + private Long input_optid; /** * 制单人姓名 @@ -134,7 +135,7 @@ public class StIvtIostorinv implements Serializable { /** * 修改人 */ - private String update_optid; + private Long update_optid; /** * 修改人姓名 @@ -149,7 +150,7 @@ public class StIvtIostorinv implements Serializable { /** * 分配人 */ - private String dis_optid; + private Long dis_optid; /** * 分配人姓名 @@ -164,7 +165,7 @@ public class StIvtIostorinv implements Serializable { /** * 确认人 */ - private String confirm_optid; + private Long confirm_optid; /** * 确认人姓名 @@ -179,27 +180,27 @@ public class StIvtIostorinv implements Serializable { /** * 部门ID */ - private String sysdeptid; + private Long sysdeptid; /** * 公司ID */ - private String syscompanyid; + private Long syscompanyid; /** * 是否删除 */ - private Boolean is_delete; + private String is_delete; /** * 是否已上传 */ - private Boolean is_upload; + private String is_upload; /** * 回传人 */ - private String upload_optid; + private Long upload_optid; /** * 回传时间 @@ -209,12 +210,12 @@ public class StIvtIostorinv implements Serializable { /** * 是否冲销 */ - private Boolean is_writeoff; + private String is_writeoff; /** * 冲销人 */ - private String writeoff_optid; + private Long writeoff_optid; /** * 冲销时间 @@ -304,17 +305,17 @@ public class StIvtIostorinv implements Serializable { /** * 移入仓库标识 */ - private String out_stor_id; + private Long out_stor_id; /** * 回传MES */ - private Boolean upload_mes; + private String upload_mes; /** * 回传SAP */ - private Boolean upload_sap; + private String upload_sap; /** * 运转费 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java index e798133..3b2f2d1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java @@ -29,17 +29,17 @@ public class StIvtIostorinvdis implements Serializable { * 出入单分配标识 */ @TableId - private String iostorinvdis_id; + private Long iostorinvdis_id; /** * 出入单标识 */ - private String iostorinv_id; + private Long iostorinv_id; /** * 出入单明细标识 */ - private String iostorinvdtl_id; + private Long iostorinvdtl_id; /** * 明细序号 @@ -49,7 +49,7 @@ public class StIvtIostorinvdis implements Serializable { /** * 库区标识 */ - private String sect_id; + private Long sect_id; /** * 库区编码 @@ -64,7 +64,7 @@ public class StIvtIostorinvdis implements Serializable { /** * 仓位标识 */ - private String struct_id; + private Long struct_id; /** * 仓位编码 @@ -79,7 +79,7 @@ public class StIvtIostorinvdis implements Serializable { /** * 物料标识 */ - private String material_id; + private Long material_id; /** * 批次 @@ -99,12 +99,12 @@ public class StIvtIostorinvdis implements Serializable { /** * 任务标识 */ - private String task_id; + private Long task_id; /** * 存储载具标识 */ - private String storagevehicle_id; + private Long storagevehicle_id; /** * 存储载具编码 @@ -114,12 +114,12 @@ public class StIvtIostorinvdis implements Serializable { /** * 是否已下发 */ - private Boolean is_issued; + private String is_issued; /** * 数量计量单位标识 */ - private String qty_unit_id; + private Long qty_unit_id; /** * 数量计量单位名称 @@ -139,12 +139,11 @@ public class StIvtIostorinvdis implements Serializable { /** * 出入点位标识 */ - private String point_id; + private Long point_id; /** * 箱号 */ private String box_no; - } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java index 9b6e179..904642d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java @@ -29,12 +29,12 @@ public class StIvtIostorinvdtl implements Serializable { * 出入单明细标识 */ @TableId - private String iostorinvdtl_id; + private Long iostorinvdtl_id; /** * 出入单标识 */ - private String iostorinv_id; + private Long iostorinv_id; /** * 明细序号 @@ -44,7 +44,7 @@ public class StIvtIostorinvdtl implements Serializable { /** * 物料标识 */ - private String material_id; + private Long material_id; /** * 批次 @@ -64,7 +64,7 @@ public class StIvtIostorinvdtl implements Serializable { /** * 数量计量单位标识 */ - private String qty_unit_id; + private Long qty_unit_id; /** * 数量计量单位名称 @@ -84,7 +84,7 @@ public class StIvtIostorinvdtl implements Serializable { /** * 来源单据明细标识 */ - private String source_billdtl_id; + private Long source_billdtl_id; /** * 来源单据类型 @@ -104,7 +104,7 @@ public class StIvtIostorinvdtl implements Serializable { /** * 基础单据明细标识 */ - private String base_billdtl_id; + private Long base_billdtl_id; /** * 基础单据类型 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java index 6ce873d..1cbd9ee 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java @@ -123,12 +123,12 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl row.getIostorinv_id().toString()) .collect(Collectors.joining("','")); List disDaoList = iStIvtIostorinvdisService.list( @@ -432,7 +432,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl { - row.setTask_id(""); row.setWork_status(IOSEnum.WORK_STATUS.code("生成")); }); iStIvtIostorinvdisService.updateBatchById(disDaoList); @@ -514,22 +513,22 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl paramList = new ArrayList<>(); @@ -347,7 +347,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl paramList = new ArrayList<>(); @@ -454,7 +454,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl insertDtl(String iostorinv_id, List tableDataList) { + public ArrayList insertDtl(Long iostorinv_id, List tableDataList) { // 查询所有对应物料集合 List materialList = iMdBaseMaterialService.list( @@ -87,21 +87,21 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl - + + true + ${log.pattern} - + @@ -63,8 +65,8 @@ https://juejin.cn/post/6844903775631572999 - + @@ -104,50 +106,6 @@ https://juejin.cn/post/6844903775631572999 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl b/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl index 5962e5c..08223a6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl +++ b/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Controller.ftl @@ -1,7 +1,7 @@ package ${package}.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -22,7 +22,7 @@ import java.util.Set; **/ @Slf4j @RestController -@Api(tags = "${apiAlias}管理") + = "${apiAlias}管理") @RequestMapping("/api/${changeClassName}") public class ${className}Controller { @@ -31,7 +31,7 @@ public class ${className}Controller { @GetMapping @Log("查询${apiAlias}") - @ApiOperation("查询${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:list')") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(${changeClassName}Service.queryAll(whereJson,page)),HttpStatus.OK); @@ -39,7 +39,7 @@ public class ${className}Controller { @PostMapping @Log("新增${apiAlias}") - @ApiOperation("新增${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:add')") public ResponseEntity create(@Validated @RequestBody ${className} entity){ ${changeClassName}Service.create(entity); @@ -48,7 +48,7 @@ public class ${className}Controller { @PutMapping @Log("修改${apiAlias}") - @ApiOperation("修改${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:edit')") public ResponseEntity update(@Validated @RequestBody ${className} entity){ ${changeClassName}Service.update(entity); @@ -56,7 +56,7 @@ public class ${className}Controller { } @Log("删除${apiAlias}") - @ApiOperation("删除${apiAlias}") + //@SaCheckPermission("@el.check('${changeClassName}:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl b/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl index 93dfaa8..da1a90e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl +++ b/lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/Entity.ftl @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; import lombok.EqualsAndHashCode; @@ -35,9 +35,9 @@ public class ${className} implements Serializable { @TableId(value = "${column.columnName}", type = <#if auto>IdType.AUTO<#else>IdType.NONE) <#if column.remark != ''> - @ApiModelProperty(value = "${column.remark}") + <#else> - @ApiModelProperty(value = "${column.changeColumnName}") + private ${column.columnType} ${column.changeColumnName}; diff --git a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue index 7c0d05b..5e73023 100644 --- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue +++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue @@ -72,7 +72,7 @@ disabled >