From fafbb6a8422b2e5b26e2494cc43e594e7d47ea16 Mon Sep 17 00:00:00 2001 From: yanps Date: Thu, 7 Dec 2023 15:53:47 +0800 Subject: [PATCH] fix: instruction --- .../org/nl/acs/instruction/ComparatorAsc.java | 33 ++++++ .../org/nl/acs/instruction/ComparatorEx.java | 5 +- .../org/nl/acs/instruction/CompareOrder.java | 8 +- .../instruction/CompareOrderComparator.java | 9 +- .../instruction/InstructionComparator.java | 9 +- .../org/nl/acs/instruction/OperateType.java | 12 +- .../org/nl/acs/instruction/OptionType.java | 8 +- .../enums/InstructionStatusEnum.java | 3 + .../service/InstructionService.java | 109 ++++++++++++++---- .../nl/acs/instruction/service/SortUtlEx.java | 4 +- .../service/impl/InstructionServiceImpl.java | 62 +--------- .../service/mapper/InstructionMapper.java | 5 + 12 files changed, 176 insertions(+), 91 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorAsc.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorAsc.java index 96ab8dc..7eeca82 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorAsc.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorAsc.java @@ -1,13 +1,46 @@ package org.nl.acs.instruction; +/** + * @author 20220102CG\noblelift + */ public interface ComparatorAsc { + /** + * 升序 + * @param var1 + * @param var2 + * @return + */ boolean small(T var1, T var2); + /** + * 降序 + * @param var1 + * @param var2 + * @return + */ boolean big(T var1, T var2); + /** + * 无比较 + * @param var1 + * @param var2 + * @return + */ boolean hasNoCompare(T var1, T var2); + /** + * 只有第一个比较 + * @param var1 + * @param var2 + * @return + */ boolean onlyFirstNotCompare(T var1, T var2); + /** + * 只有第二个比较 + * @param var1 + * @param var2 + * @return + */ boolean onlySecondNotCompare(T var1, T var2); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorEx.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorEx.java index b18a62c..b48de06 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorEx.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/ComparatorEx.java @@ -1,7 +1,9 @@ package org.nl.acs.instruction; import java.util.Comparator; - +/** + * @author 20220102CG\noblelift + */ public abstract class ComparatorEx implements Comparator { private ComparatorAsc ces; private boolean smallFirst = true; @@ -66,6 +68,7 @@ public abstract class ComparatorEx implements Comparator { } } + @Override public int compare(T o1, T o2) { if (o1 != null && o2 != null) { return this.ces.hasNoCompare(o1, o2) ? this.notCompareFirst(o1, o2, this.notCompareFirst) : this.smallFirst(o1, o2, this.smallFirst); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrder.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrder.java index 9d314cb..00ca371 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrder.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrder.java @@ -1,6 +1,12 @@ package org.nl.acs.instruction; - +/** + * @author 20220102CG\noblelift + */ public interface CompareOrder { + /** + * 排序 + * @return + */ default int getOrder() { return 0; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrderComparator.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrderComparator.java index 45569b1..3780f29 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrderComparator.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/CompareOrderComparator.java @@ -1,23 +1,30 @@ package org.nl.acs.instruction; - +/** + * @author 20220102CG\noblelift + */ public class CompareOrderComparator extends ComparatorEx { private static ComparatorAsc ces = new ComparatorAsc() { + @Override public boolean small(Object o1, Object o2) { return ((CompareOrder) o1).getOrder() < ((CompareOrder) o2).getOrder(); } + @Override public boolean big(Object o1, Object o2) { return ((CompareOrder) o1).getOrder() > ((CompareOrder) o2).getOrder(); } + @Override public boolean hasNoCompare(Object o1, Object o2) { return !(o1 instanceof CompareOrder) || !(o2 instanceof CompareOrder); } + @Override public boolean onlyFirstNotCompare(Object o1, Object o2) { return !(o1 instanceof CompareOrder) && o2 instanceof CompareOrder; } + @Override public boolean onlySecondNotCompare(Object o1, Object o2) { return !(o2 instanceof CompareOrder) && o1 instanceof CompareOrder; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/InstructionComparator.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/InstructionComparator.java index 04b72ea..a7ad9d0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/InstructionComparator.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/InstructionComparator.java @@ -6,10 +6,13 @@ import org.nl.acs.instruction.domain.Instruction; import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; - +/** + * @author 20220102CG\noblelift + */ public class InstructionComparator extends ComparatorEx { private static CompareOrderComparator compare = new CompareOrderComparator(); private static ComparatorAsc ces = new ComparatorAsc() { + @Override public boolean small(Instruction o1, Instruction o2) { Integer level = Integer.parseInt(o1.getPriority()); Integer level2 = Integer.parseInt(o2.getPriority()); @@ -33,6 +36,7 @@ public class InstructionComparator extends ComparatorEx { } + @Override public boolean big(Instruction o1, Instruction o2) { Integer level = Integer.parseInt(o1.getPriority()); Integer level2 = Integer.parseInt(o2.getPriority()); @@ -56,14 +60,17 @@ public class InstructionComparator extends ComparatorEx { return false; } + @Override public boolean hasNoCompare(Instruction o1, Instruction o2) { return false; } + @Override public boolean onlyFirstNotCompare(Instruction o1, Instruction o2) { return false; } + @Override public boolean onlySecondNotCompare(Instruction o1, Instruction o2) { return false; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OperateType.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OperateType.java index a2409c2..bbdfc53 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OperateType.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OperateType.java @@ -1,7 +1,15 @@ package org.nl.acs.instruction; - +/** + * @author 20220102CG\noblelift + */ public enum OperateType implements OptionType { + /** + * 人工 + */ manual("人工", 2), + /** + * 自动 + */ auto("自动", 1); private String description; @@ -12,10 +20,12 @@ public enum OperateType implements OptionType { this.order = order; } + @Override public String description() { return this.description; } + @Override public int getOrder() { return this.order; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OptionType.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OptionType.java index 1d7340e..e51d048 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OptionType.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/OptionType.java @@ -1,5 +1,11 @@ package org.nl.acs.instruction; - +/** + * @author 20220102CG\noblelift + */ public interface OptionType extends CompareOrder { + /** + * 获取描述 + * @return + */ String description(); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/enums/InstructionStatusEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/enums/InstructionStatusEnum.java index d6ac642..afe5031 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/enums/InstructionStatusEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/enums/InstructionStatusEnum.java @@ -12,6 +12,9 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum InstructionStatusEnum { + /** + * 任务状态 + */ READY("0", "READY", "就绪"), BUSY("1", "BUSY", "执行中"), FINISHED("2", "FINISHED", "完成"), diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java index a364d27..61abec7 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java @@ -40,17 +40,42 @@ public interface InstructionService extends CommonService { */ List queryAll(InstructionQueryParam query); + /** + * 根据ID查询 + * + * @param id / + * @return InstructionDto + */ InstructionMybatis getById(String id); + /** + * 根据ID查询 + * @param id + * @return + */ InstructionDto findById(String id); /** - * 插入一条新数据。 + * 根据ID更新 + * @param resources + * @return */ int updateById(InstructionDto resources); + /** + * 根据ID删除 + * + * @param id / + * @return / + */ int removeById(String id); + /** + * 批量删除 + * + * @param ids / + * @return / + */ int removeByIds(Set ids); /** @@ -72,9 +97,9 @@ public interface InstructionService extends CommonService { /** * 查询数据分页 - * - * @param page 分页参数 - * @return Map + * @param whereJson + * @param page + * @return */ Map getAll(Map whereJson, Pageable page); @@ -131,23 +156,34 @@ public interface InstructionService extends CommonService { */ Instruction findByTaskcode(String code); + /** + * 根据任务code查询 + * + * @param code code + * @return Instruction + */ Instruction findByTaskcodeAndStatus(String code); /** * 根据任务id查询 - * - * @param id id - * @return Instruction + * @param id + * @param wherecase + * @return */ Instruction findByTaskid(String id, String wherecase); /** * 创建 - * - * @param dto / + * @param dto + * @throws Exception */ void create(Instruction dto) throws Exception; + /** + * 创建2 + * @param dto + * @throws Exception + */ void create2(Instruction dto) throws Exception; /** @@ -167,8 +203,8 @@ public interface InstructionService extends CommonService { /** * 多选删除 - * - * @param ids / + * @param ids + * @throws Exception */ void deleteAll(String[] ids) throws Exception; @@ -183,45 +219,45 @@ public interface InstructionService extends CommonService { /** * 完成指令 - * * @param id + * @throws Exception */ void finish(String id) throws Exception; /** * 完成指令 - * - * @param + * @param dto + * @throws Exception */ void finish(Instruction dto) throws Exception; /** * 完成并创建下一条指令 - * - * @param + * @param dto + * @throws Exception */ void finishAndCreateNextInst(Instruction dto) throws Exception; /** * 取消指令 - * * @param id + * @throws Exception */ void cancel(String id) throws Exception; /** * 取消指令 - * * @param id + * @throws Exception */ void forceCancel(String id) throws Exception; /** * 取消指令不下发agv - * * @param id + * @throws Exception */ void cancelNOSendAgv(String id) throws Exception; @@ -233,7 +269,11 @@ public interface InstructionService extends CommonService { */ Instruction findByCodeFromCache(String code); - + /** + * 根据编码查询 + * @param code + * @return + */ List findByLinkNum(String code); /** @@ -252,6 +292,12 @@ public interface InstructionService extends CommonService { */ Instruction findByLinkNumNoSend(String code); + /** + * 根据条码缓存查询 + * + * @param barcode barcode + * @return Instruction + */ Instruction findByBarcodeFromCache(String barcode); /** @@ -271,7 +317,9 @@ public interface InstructionService extends CommonService { Instruction findByIdFromCache(String id); /** + * 格式化 * @param inst + * @return */ Instruction foramte(Instruction inst); @@ -314,21 +362,33 @@ public interface InstructionService extends CommonService { */ //Integer querySameOriginInst(String code); + /** + * 根据编码删除 + * @param code + * @return + */ boolean removeByCodeFromCache(String code); - + /** + * 创建关联指令 + * @param type + * @param inst + * @return + */ boolean createLkInst(String type, Instruction inst); - + /** + * 初始化指令 + * @param id + */ void init(String id); /** * 根据指令某个参数查找指令集合 - * * @param instruction1 + * @param flay * @return */ - List findByDeviceCodes(Instruction instruction1, Boolean flay); @@ -343,6 +403,7 @@ public interface InstructionService extends CommonService { * 导出指令记录 * @param instList * @param response + * @throws IOException */ void downloadInstLogging(List instList, HttpServletResponse response) throws IOException; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/SortUtlEx.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/SortUtlEx.java index 73c0ddc..f894431 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/SortUtlEx.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/SortUtlEx.java @@ -3,7 +3,9 @@ package org.nl.acs.instruction.service; import java.util.Collections; import java.util.Comparator; import java.util.List; - +/** + * @author 20220102CG\noblelift + */ public class SortUtlEx { public SortUtlEx() { } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 71bfd9d..83be65a 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -84,13 +84,11 @@ import java.util.regex.Pattern; @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) public class InstructionServiceImpl extends CommonServiceImpl implements InstructionService, ApplicationAutoInitial { - // private final RedisUtils redisUtils; @Autowired InstructionMapper instructionMapper; @Autowired TaskMapper taskMapper; List instructions = new CopyOnWriteArrayList(); - // List instructions_mybatis = new CopyOnWriteArrayList(); @Autowired DeviceAppService deviceAppService; @Autowired @@ -283,9 +281,6 @@ public class InstructionServiceImpl extends CommonServiceImpl list = arr.toJavaList(Instruction.class); List insList = new LambdaQueryChainWrapper<>(instructionMapper) .lt(InstructionMybatis::getInstruction_status, InstructionStatusEnum.FINISHED.getIndex()) .list(); @@ -295,13 +290,6 @@ public class InstructionServiceImpl extends CommonServiceImpl(instructionMapper) .eq(InstructionMybatis::getInstruction_code, code) @@ -314,10 +302,6 @@ public class InstructionServiceImpl extends CommonServiceImpl(instructionMapper) .eq(InstructionMybatis::getTask_code, code) .one(); @@ -342,15 +326,6 @@ public class InstructionServiceImpl extends CommonServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(InstructionMybatis::getTask_id, id); @@ -459,9 +434,6 @@ public class InstructionServiceImpl extends CommonServiceImpl(taskMapper) .eq(Task::getTask_id, insttaskid) @@ -828,19 +789,12 @@ public class InstructionServiceImpl extends CommonServiceImpl(taskMapper) .eq(Task::getTask_id, insttaskid) @@ -893,9 +847,6 @@ public class InstructionServiceImpl extends CommonServiceImpl(taskMapper) .eq(Task::getTask_id, dto.getTask_id()) .one(); @@ -1041,9 +992,6 @@ public class InstructionServiceImpl extends CommonServiceImpl { + /** + * 根据任务id获取指令 + * @param task_id + * @return + */ List getByTaskId(@Param("task_id") String task_id); // List getallbyinstruction_statusAndis_delete();