Merge remote-tracking branch 'origin/master'

src/main/java/com/juxin/client/websocket/FindTask.java

@@ -252,7 +252,7 @@ public class FindTask {
             });
             req.put("bankSplits", split);
         } else {
-            req.put("errorMsg", status[RandomUtil.randomInt(0, 6)]);
+            req.put("errorMsg", ERR_MSG[RandomUtil.randomInt(0, 6)]);
         }
         result.put("reqJson", req);
         return JSONUtil.toJsonStr(result);
@@ -285,7 +285,7 @@ public class FindTask {
             });
             req.put("thirdFundsSplits", split);
         } else {
-            req.put("errorMsg", status[RandomUtil.randomInt(0, 6)]);
+            req.put("errorMsg", ERR_MSG[RandomUtil.randomInt(0, 6)]);
         }
         result.put("reqJson", req);
         return JSONUtil.toJsonStr(result);
@@ -317,7 +317,7 @@ public class FindTask {
             });
             req.put("serialNumberSplits", split);
         } else {
-            req.put("errorMsg", status[RandomUtil.randomInt(0, 6)]);
+            req.put("errorMsg", ERR_MSG[RandomUtil.randomInt(0, 6)]);
         }
         result.put("reqJson", req);
         return JSONUtil.toJsonStr(result);
@@ -351,7 +351,7 @@ public class FindTask {
             });
             req.put("allAccountSplits", split);
         } else {
-            req.put("errorMsg", status[RandomUtil.randomInt(0, 6)]);
+            req.put("errorMsg", ERR_MSG[RandomUtil.randomInt(0, 6)]);
         }
         result.put("reqJson", req);
         return JSONUtil.toJsonStr(result);
@@ -385,7 +385,7 @@ public class FindTask {
             });
             req.put("bankAllAccountSplits", split);
         } else {
-            req.put("errorMsg", status[RandomUtil.randomInt(0, 6)]);
+            req.put("errorMsg", ERR_MSG[RandomUtil.randomInt(0, 6)]);
         }
         result.put("reqJson", req);
         return JSONUtil.toJsonStr(result);
@@ -407,8 +407,8 @@ public class FindTask {
         req.put("recordId", jsonObject.get("groupId"));
         req.put("groupId", jsonObject.get("groupId"));
         String jobState = status[RandomUtil.randomInt(0, 6)];
+        req.put("jobState", jobState);
         if (Objects.equals(jobState, "success")) {
-            req.put("jobState", jobState);
             List<Map<String, String>> split = new ArrayList<>();
             List<Map<String, String>> list = jsonObject.get("list", List.class);
             list.forEach(e -> {
@@ -422,7 +422,7 @@ public class FindTask {
             });
             req.put("thirdSubjectSplits", split);
         } else {
-            req.put("errorMsg", status[RandomUtil.randomInt(0, 6)]);
+            req.put("errorMsg", ERR_MSG[RandomUtil.randomInt(0, 6)]);
         }
         result.put("reqJson", req);
         return JSONUtil.toJsonStr(result);
@@ -454,6 +454,8 @@ public class FindTask {
                 split.add(map);
             });
             req.put("bankSubjectSplits", split);
+        } else {
+            req.put("errorMsg", ERR_MSG[RandomUtil.randomInt(0, 6)]);
         }
         result.put("reqJson", req);
         return JSONUtil.toJsonStr(result);