修改5

huimv-receive/src/main/java/com/huimv/receive/service/impl/BaseProcessServiceImpl.java

@@ -218,18 +218,9 @@ public class BaseProcessServiceImpl extends ServiceImpl<BaseProcessMapper, BaseP
         int a = 2;
         System.out.println(s.substring(0, a) + '4' + s.substring(a + 1));
 
-//        for (int i = 0; i < strings.length; i++) {
-//            strings[i].replaceAll(strings[i], "4");
-//            if (i == strings.length - 1) {
-//                ss2 = ss2 + strings[i].replaceAll(strings[i], "4");
-//            } else {
-//                ss2 = strings[i].replaceAll(strings[i], "4") + "," + ss2;
-//            }
-//        }
-//        System.out.println(ss2);
-
-
-        String fl="0,1,2";
+
+
+        String fl="0,1,2,0,1,2";
         int count = 0;
         char l = '0';
         for (int i = 0; i < fl.length(); i++) {

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanBeforeServiceImpl.java

@@ -285,7 +285,14 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                 baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + split[1]);
 
                 Integer locationId = cleanBefore.getTestLocationId();
-                int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
+                String[] split2 = allLocationId.split(",");
+                int a=0;
+                for (int i = 0; i < split2.length; i++) {
+                    if (locationId.toString().equals(split2[i])) {
+                        a = i + 1;
+                    }
+                }
+                int indexOf = 2 * (a - 2);//当前位置在所有流程位置中的下标
                 String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                 String[] split1 = substring.split(",");
                 String sb2 = "";
@@ -298,8 +305,8 @@ public class BillCleanBeforeServiceImpl extends ServiceImpl<BillCleanBeforeMappe
                 }
                 sb2 = sb2 + baseProcess.getAllLocationStatus().substring(indexOf + 3);
                 StringBuilder sb = new StringBuilder(sb2);
-                sb.replace(indexOf + 2, indexOf + 3, "2");
-                sb.replace(indexOf + 4, indexOf + 5, "1");
+                sb.replace(indexOf + 4, indexOf + 5, "2");
+                sb.replace(indexOf + 6, indexOf + 7, "1");
                 baseProcess.setAllLocationStatus(sb.toString());
             }
         } else if (nextId == 1) {

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -1028,7 +1028,14 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         }
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
                         Integer locationId = billClean.getTestLocationId();
-                        int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
+                        String[] split2 = allLocationId.split(",");
+                        int a=0;
+                        for (int i = 0; i < split2.length; i++) {
+                            if (locationId.toString().equals(split2[i])) {
+                                a = i + 1;
+                            }
+                        }
+                        int indexOf = 2 * (a - 2);//当前位置在所有流程位置中的下标
                         String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                         String[] split1 = substring.split(",");
                         String sb2 = "";
@@ -1041,8 +1048,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                         }
                         sb2 = sb2 + baseProcess.getAllLocationStatus().substring(indexOf + 3);
                         StringBuilder sb = new StringBuilder(sb2);
-                        sb.replace(indexOf + 2, indexOf + 3, "2");
-                        sb.replace(indexOf + 4, indexOf + 5, "1");
+                        sb.replace(indexOf + 4, indexOf + 5, "2");
+                        sb.replace(indexOf + 6, indexOf + 7, "1");
                         baseProcess.setAllLocationStatus(sb.toString());
                     }
                 } else if (nextId == 1) {
@@ -1338,7 +1345,14 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
 
                             Integer locationId = billClean.getTestLocationId();
-                            int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
+                            String[] split2 = allLocationId.split(",");
+                            int a=0;
+                            for (int i = 0; i < split2.length; i++) {
+                                if (locationId.toString().equals(split2[i])) {
+                                    a = i + 1;
+                                }
+                            }
+                            int indexOf = 2 * (a - 2);//当前位置在所有流程位置中的下标
                             String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                             String[] split1 = substring.split(",");
                             String sb2 = "";
@@ -1351,8 +1365,8 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
                             }
                             sb2 = sb2 + baseProcess.getAllLocationStatus().substring(indexOf + 3);
                             StringBuilder sb = new StringBuilder(sb2);
-                            sb.replace(indexOf + 2, indexOf + 3, "2");
-                            sb.replace(indexOf + 4, indexOf + 5, "1");
+                            sb.replace(indexOf + 4, indexOf + 5, "2");
+                            sb.replace(indexOf + 6, indexOf + 7, "1");
                             baseProcess.setAllLocationStatus(sb.toString());
                         }
                     } else if (nextId == 1) {

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillGoodsInventoryServiceImpl.java

@@ -257,8 +257,8 @@ public class BillGoodsInventoryServiceImpl extends ServiceImpl<BillGoodsInventor
                 }
                 sb2 = sb2 + baseProcess.getAllLocationStatus().substring(indexOf + 3);
                 StringBuilder sb = new StringBuilder(sb2);
-                sb.replace(indexOf + 2, indexOf + 3, "2");
-                sb.replace(indexOf + 4, indexOf + 5, "1");
+                sb.replace(indexOf + 4, indexOf + 5, "2");
+                sb.replace(indexOf + 6, indexOf + 7, "1");
                 baseProcess.setAllLocationStatus(sb.toString());
             }
         } else if (nextId == 1) {

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPcrServiceImpl.java

@@ -530,7 +530,15 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + split[1]);
 
                         Integer locationId = billPcr.getTestLocationId();
-                        int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
+                        String[] split2 = allLocationId.split(",");
+                        int a=0;
+                        for (int i = 0; i < split2.length; i++) {
+                            if (locationId.toString().equals(split2[i])) {
+                                a = i + 1;
+                            }
+                        }
+                        int indexOf = 2 * (a - 2);//当前位置在所有流程位置中的下标
+
                         String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                         String[] split1 = substring.split(",");
                         String sb2 = "";
@@ -543,8 +551,8 @@ public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> impl
                         }
                         sb2 = sb2 + baseProcess.getAllLocationStatus().substring(indexOf + 3);
                         StringBuilder sb = new StringBuilder(sb2);
-                        sb.replace(indexOf + 2, indexOf + 3, "2");
-                        sb.replace(indexOf + 4, indexOf + 5, "1");
+                        sb.replace(indexOf + 4, indexOf + 5, "2");
+                        sb.replace(indexOf + 6, indexOf + 7, "1");
                         baseProcess.setAllLocationStatus(sb.toString());
 
                     }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillSamplingServiceImpl.java

@@ -284,7 +284,15 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                 }
                 baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + split[1]);
                 Integer locationId = sampling.getTestLocationId();
-                int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
+                String[] split2 = allLocationId.split(",");
+                int a=0;
+                for (int i = 0; i < split2.length; i++) {
+                    if (locationId.toString().equals(split2[i])) {
+                        a = i + 1;
+                    }
+                }
+                int indexOf = 2 * (a - 2);//当前位置在所有流程位置中的下标
+
                 String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                 String[] split1 = substring.split(",");
                 String sb2 = "";
@@ -297,8 +305,8 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
                 }
                 sb2 = sb2 + baseProcess.getAllLocationStatus().substring(indexOf + 3);
                 StringBuilder sb = new StringBuilder(sb2);
-                sb.replace(indexOf + 2, indexOf + 3, "2");
-                sb.replace(indexOf + 4, indexOf + 5, "1");
+                sb.replace(indexOf + 4, indexOf + 5, "2");
+                sb.replace(indexOf + 6, indexOf + 7, "1");
                 baseProcess.setAllLocationStatus(sb.toString());
             }
         } else if (nextId == 1) {
@@ -428,8 +436,15 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
     }
 
     public static void main(String[] args) {
-        String s = "0,1,0,2,0,3,0";
-        int i = s.indexOf("2");
+        String s = "0,35,0,36,0,38,0";
+        String[] split1 = s.split(",");
+        int a = 0;
+        for (int i = 0; i < split1.length; i++) {
+            if ("36".equals(split1[i])) {
+                a = i+1;
+            }
+        }
+        int i = 2 *(a - 2);
         System.out.println(i);
         String s1 = "2,2,2,1,0,0,0";
         String s2 = s1.substring(0, i + 3);
@@ -444,7 +459,10 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
             }
         }
         sb2 = sb2 + s1.substring(i + 3);
-        System.out.println(sb2);
+        StringBuilder sb = new StringBuilder(sb2);
+        sb.replace(i + 4, i + 5, "2");
+        sb.replace(i + 6, i + 7, "1");
+        System.out.println(sb.toString());
 
     }
 }

huimv-receive/src/main/java/com/huimv/receive/timer/SafeTimer.java

@@ -83,7 +83,7 @@ public  class SafeTimer {
                         billIsolate.getProcessId(), billIsolate.getFarmId(), billIsolate.getIsolateLocation(), billIsolate.getIsolateLocationId(),
                         billIsolate.getVistitType(), billIsolate.getPhone(), billIsolate.getDepartureName(), billIsolate.getDepartureId());
                 if (nextId == 0) {
-                    if (StringUtils.isBlank(splits[1])) {
+                    if (splits.length == 1) {
                         baseProcess.setProcessType(1);
                         String[] strings = allLocationId.split(",");
                         String ss2 = "";
@@ -199,7 +199,15 @@ public  class SafeTimer {
                         }
                         baseProcess.setCurrentFlowId(baseProcess.getCurrentFlowId() + "," + nextId + "," + splits[1]);
                         Integer locationId = billIsolate.getIsolateLocationId();
-                        int indexOf = allLocationId.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
+                        String[] split2 = allLocationId.split(",");
+                        int a=0;
+                        for (int i = 0; i < split2.length; i++) {
+                            if (locationId.toString().equals(split2[i])) {
+                                a = i + 1;
+                            }
+                        }
+                        int indexOf = 2 * (a - 2);//当前位置在所有流程位置中的下标
+
                         String substring = baseProcess.getAllLocationStatus().substring(0, indexOf + 3);//截取已经过的位置状态
                         String[] split1 = substring.split(",");
                         String sb2 = "";
@@ -212,8 +220,8 @@ public  class SafeTimer {
                         }
                         sb2 = sb2 + baseProcess.getAllLocationStatus().substring(indexOf + 3);
                         StringBuilder sb = new StringBuilder(sb2);
-                        sb.replace(indexOf + 2, indexOf + 3, "2");
-                        sb.replace(indexOf + 4, indexOf + 5, "1");
+                        sb.replace(indexOf + 4, indexOf + 5, "2");
+                        sb.replace(indexOf + 6, indexOf + 7, "1");
                         baseProcess.setAllLocationStatus(sb.toString());
                     }
                 } else if (nextId == 1) {
@@ -371,8 +379,7 @@ public  class SafeTimer {
     public static void main(String[] args) {
         String s = "0,1,0,2,0,3,0";
         String s1 = "2,2,2,1,0,0,0";
-        Integer locationId = 2;
-        int indexOf = s.indexOf(locationId.toString());//当前位置在所有流程位置中的下标
+        int indexOf = s.indexOf("2");//当前位置在所有流程位置中的下标
         System.out.println(indexOf);
         String substring = s1.substring(0, indexOf + 3);//截取已经过的位置状态
         String[] split1 = substring.split(",");