1分钟内不重复拉取

src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpReturnInventoryController.java

@@ -92,8 +92,8 @@ public class SpReturnInventoryController {
                 Criteria c = new Criteria();
                 Criteria c = new Criteria();
                 c.orOperator(
                 c.orOperator(
                         Criteria.where("spareStatus").is(3),
                         Criteria.where("spareStatus").is(3),
-//                        Criteria.where("spareStatus").is(2).and("isConfirmed").is(true)
-                        Criteria.where("isConfirmed").is(true)
+                        Criteria.where("spareStatus").is(2).and("isConfirmed").is(true)
+//                        Criteria.where("isConfirmed").is(true)
                 );
                 );
                 query.addCriteria(c);
                 query.addCriteria(c);
             } else if (criteria.getStatus() == 2) {
             } else if (criteria.getStatus() == 2) {
@@ -103,7 +103,7 @@ public class SpReturnInventoryController {
                 c.orOperator(
                 c.orOperator(
                         Criteria.where("spareStatus").is(0),
                         Criteria.where("spareStatus").is(0),
                         Criteria.where("spareStatus").is(1),
                         Criteria.where("spareStatus").is(1),
-                        Criteria.where("isConfirmed").is(false)
+                        Criteria.where("spareStatus").is(2).and("isConfirmed").is(false)
                 );
                 );
                 query.addCriteria(c);
                 query.addCriteria(c);
             }
             }

src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpSpareNoController.java

@@ -112,8 +112,8 @@ public class SpSpareNoController {
                 Criteria c = new Criteria();
                 Criteria c = new Criteria();
                 c.orOperator(
                 c.orOperator(
                         Criteria.where("spareStatus").is(3),
                         Criteria.where("spareStatus").is(3),
-//                        Criteria.where("spareStatus").is(2).and("isConfirmed").is(true)
-                        Criteria.where("isConfirmed").is(true)
+                        Criteria.where("spareStatus").is(2).and("isConfirmed").is(true)
+//                        Criteria.where("isConfirmed").is(true)
                 );
                 );
                 query.addCriteria(c);
                 query.addCriteria(c);
             } else if (criteria.getStatus() == 2) {
             } else if (criteria.getStatus() == 2) {
@@ -123,7 +123,7 @@ public class SpSpareNoController {
                 c.orOperator(
                 c.orOperator(
                         Criteria.where("spareStatus").is(0),
                         Criteria.where("spareStatus").is(0),
                         Criteria.where("spareStatus").is(1),
                         Criteria.where("spareStatus").is(1),
-                        Criteria.where("isConfirmed").is(false)
+                        Criteria.where("spareStatus").is(2).and("isConfirmed").is(false)
                 );
                 );
                 query.addCriteria(c);
                 query.addCriteria(c);
             }
             }

src/main/java/com/neotel/smfcore/custom/luxsan_sp/util/ReturnNoCache.java

@@ -52,8 +52,9 @@ public class ReturnNoCache {
         if(!NeedReLoad()){
         if(!NeedReLoad()){
             return;
             return;
         }
         }
-        List<GetReturnInventoryResult> resultList = LuxsanSpApi.getReturnInventory(new GetReturnInventoryRequest(SpareNostatus.FUNCTION_DEPT, SpareNostatus.FORMAL_DEPT_ID));
         lasLoadTime=new Date().getTime();
         lasLoadTime=new Date().getTime();
+        List<GetReturnInventoryResult> resultList = LuxsanSpApi.getReturnInventory(new GetReturnInventoryRequest(SpareNostatus.FUNCTION_DEPT, SpareNostatus.FORMAL_DEPT_ID));
+
         List<String> newSpNo=resultList.stream().map(GetReturnInventoryResult::getOrderNo).collect(Collectors.toList());
         List<String> newSpNo=resultList.stream().map(GetReturnInventoryResult::getOrderNo).collect(Collectors.toList());
         Criteria criteria=Criteria.where("spareNo").in(newSpNo.toArray());
         Criteria criteria=Criteria.where("spareNo").in(newSpNo.toArray());
         List<ReturnInventoryNo> existList = returnNoManager.findByQuery(new Query(criteria));
         List<ReturnInventoryNo> existList = returnNoManager.findByQuery(new Query(criteria));

src/main/java/com/neotel/smfcore/custom/luxsan_sp/util/SpareNoCache.java

@@ -64,8 +64,8 @@ public class SpareNoCache {
         if(!NeedReLoad()){
         if(!NeedReLoad()){
             return;
             return;
         }
         }
-        List<GetSpareNoResult> resultList = LuxsanSpApi.getSpareNo(new GetSpareNoRequest(SpareNostatus.FORMAL_DEPT_ID, SpareNostatus.FUNCTION_DEPT));
         lasLoadTime=new Date().getTime();
         lasLoadTime=new Date().getTime();
+        List<GetSpareNoResult> resultList = LuxsanSpApi.getSpareNo(new GetSpareNoRequest(SpareNostatus.FORMAL_DEPT_ID, SpareNostatus.FUNCTION_DEPT));
         List<String> newSpNo=resultList.stream().map(GetSpareNoResult::getSpareNo).collect(Collectors.toList());
         List<String> newSpNo=resultList.stream().map(GetSpareNoResult::getSpareNo).collect(Collectors.toList());
         Criteria criteria=Criteria.where("spareNo").in(newSpNo.toArray());
         Criteria criteria=Criteria.where("spareNo").in(newSpNo.toArray());
         List<SpareNo> existList = spareNoManager.findByQuery(new Query(criteria));
         List<SpareNo> existList = spareNoManager.findByQuery(new Query(criteria));