diff --git a/README.md b/README.md new file mode 100644 index 0000000..81e08e1 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +# 自动核查 + 1、目前没有机械臂移动的指令接口,做不到自动核查 + 2、自动核查代码已经便写完毕 +# 手动核查 + 手动核查可以根据路径进行上一个下一个从而核查 + 前端通过ws获取识别结果存入数据库 + \ No newline at end of file diff --git a/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java b/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java index a2de0c1..48b4eb5 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java +++ b/src/main/java/com/iflytop/nuclear/service/impl/CheckServiceImpl.java @@ -450,8 +450,192 @@ public class CheckServiceImpl implements CheckService { String[] split = current.split("-"); int mainLine = Integer.parseInt(split[0]); int minorLine = Integer.parseInt(split[1]); - if (order == 0) {} - if (order == 1) {} + if (order == 0) { + if (mainLine == 13) { + if (minorLine > 4){ + return mainLine + "-" + (minorLine - 1); + }else { + return (mainLine - 1) + "-" + minorLine; + } + } + if (mainLine == 12) { + if (minorLine < 11){ + return mainLine + "-" + (minorLine + 1); + }else { + return (mainLine - 1) + "-" + minorLine; + } + } + if (mainLine == 11) { + if (minorLine > 2){ + return mainLine + "-" + (minorLine - 1); + }else { + return (mainLine - 1) + "-" + minorLine; + } + } + if (mainLine == 10) { + if (minorLine < 12){ + return mainLine + "-" + (minorLine + 1); + }else { + return (mainLine - 1) + "-" + minorLine; + } + } + if (mainLine == 9) { + if (minorLine > 1){ + return mainLine + "-" + (minorLine - 1); + }else { + return (mainLine - 1) + "-" + minorLine; + } + } + if (mainLine == 8) { + if (minorLine < 13){ + return mainLine + "-" + (minorLine + 1); + }else { + return (mainLine - 1) + "-" + minorLine; + } + } + if (mainLine == 7) { + if (minorLine > 1){ + return mainLine + "-" + (minorLine - 1); + }else { + return (mainLine - 1) + "-" + minorLine; + } + } + if (mainLine == 6) { + if (minorLine < 13){ + return mainLine + "-" + (minorLine + 1); + }else { + return (mainLine - 1) + "-" + minorLine; + } + } + if (mainLine == 5) { + if (minorLine > 2){ + return mainLine + "-" + (minorLine - 1); + }else { + return (mainLine - 1) + "-" + minorLine; + } + } + if (mainLine == 4) { + if (minorLine < 12){ + return mainLine + "-" + (minorLine + 1); + }else { + return (mainLine - 1) + "-" + minorLine; + } + } + if (mainLine == 3) { + if (minorLine > 3){ + return mainLine + "-" + (minorLine - 1); + }else { + return (mainLine - 1) + "-" + minorLine; + } + } + if (mainLine == 2) { + if (minorLine < 10){ + return mainLine + "-" + (minorLine + 1); + }else { + return (mainLine - 1) + "-" + minorLine; + } + } + if (mainLine == 1) { + if (minorLine > 6){ + return mainLine + "-" + (minorLine - 1); + }else { + return "start"; + } + } + } + if (order == 1) { + if(minorLine == 13) { + if (mainLine > 4){ + return (mainLine - 1) + "-" + minorLine; + }else { + return mainLine + "-" + (minorLine - 1); + } + } + if(minorLine == 12) { + if (mainLine < 11){ + return (mainLine + 1) + "-" + minorLine; + }else { + return mainLine + "-" + (minorLine - 1); + } + } + if(minorLine == 11) { + if (mainLine > 2){ + return (mainLine - 1) + "-" + minorLine; + }else { + return mainLine + "-" + (minorLine - 1); + } + } + if(minorLine == 10) { + if (mainLine < 12){ + return (mainLine + 1) + "-" + minorLine; + }else { + return mainLine + "-" + (minorLine - 1); + } + } + if(minorLine == 9) { + if (mainLine > 1){ + return (mainLine - 1) + "-" + minorLine; + }else { + return mainLine + "-" + (minorLine - 1); + } + } + if(minorLine == 8) { + if (mainLine < 13){ + return (mainLine + 1) + "-" + minorLine; + }else { + return mainLine + "-" + (minorLine - 1); + } + } + if(minorLine == 7) { + if (mainLine > 1){ + return (mainLine - 1) + "-" + minorLine; + }else { + return mainLine + "-" + (minorLine - 1); + } + } + if(minorLine == 6) { + if (mainLine < 13){ + return (mainLine + 1) + "-" + minorLine; + }else { + return mainLine + "-" + (minorLine - 1); + } + } + if(minorLine == 5) { + if (mainLine > 2){ + return (mainLine - 1) + "-" + minorLine; + }else { + return mainLine + "-" + (minorLine - 1); + } + } + if(minorLine == 4) { + if (mainLine < 12){ + return (mainLine + 1) + "-" + minorLine; + }else { + return mainLine + "-" + (minorLine - 1); + } + } + if(minorLine == 3) { + if (mainLine > 3){ + return (mainLine - 1) + "-" + minorLine; + }else { + return mainLine + "-" + (minorLine - 1); + } + } + if(minorLine == 2) { + if (mainLine < 10){ + return (mainLine + 1) + "-" + minorLine; + }else { + return mainLine + "-" + (minorLine - 1); + } + } + if(minorLine == 1) { + if (mainLine > 6){ + return (mainLine - 1) + "-" + minorLine; + }else { + return "start"; + } + } + } return null; } } diff --git a/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java b/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java index dd06cef..a60f13b 100644 --- a/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java +++ b/src/main/java/com/iflytop/nuclear/service/impl/TaskServiceImpl.java @@ -124,16 +124,15 @@ public class TaskServiceImpl extends ServiceImpl implements Ta Task task = this.getById(taskId); int checkOrder = task.getCheckOrder(); if ("1".equals(direction)) { - if (coord.equals("finish")) { + if ("finish".equals(coord)) { return null; } return checkServiceImpl.getNextCoord(coord, checkOrder); }else { - if (coord.equals("start")) { + if ("start".equals(coord)) { return null; } return checkServiceImpl.getPreCoord(coord, checkOrder); } - return null; } } diff --git a/uploadfiles/xlsx/20230710/堆芯模版-25.xlsx b/uploadfiles/xlsx/20230710/堆芯模版-25.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230710/堆芯模版-25.xlsx differ diff --git a/uploadfiles/xlsx/20230710/堆芯模版-26.xlsx b/uploadfiles/xlsx/20230710/堆芯模版-26.xlsx new file mode 100644 index 0000000..1b0a04e Binary files /dev/null and b/uploadfiles/xlsx/20230710/堆芯模版-26.xlsx differ