Merge branch 'develop' of http://116.63.130.83:3000/andyliu/KprAIModelPower into develop

src/main/java/com/shkpr/service/aimodelpower/bizmgr/WODispatchPlanTmDoBizFun.java

@@ -155,14 +155,14 @@ public class WODispatchPlanTmDoBizFun {
                         jsonParam.put("data",jsonArray);
                         ResponseRes res = ServiceMgrProxy.getInstance().applyTaskServiceApi().postPlanCommand(jsonParam);
                         JSONObject resDataObj = JSONObject.parseObject(res.getResdata().toString());
-                        System.out.println("0".equals(resDataObj.getJSONArray("data").getJSONObject(0).getString("code")));
+
+                        Map<String, Object> upPlanUpWhere = new HashMap<>();//修改计划的条件
+                        upPlanUpWhere.put("plan_id", model.getPlanId());
+                        Map<String, Object> upPlan = new HashMap<>();//要修改的计划
                         if (ResponseCode.RESULT_NORMAL.toStrCode().equals(res.getRescode())
                                 &&!resDataObj.getJSONArray("data").isEmpty()
                                 &&"0".equals(resDataObj.getJSONArray("data").getJSONObject(0).getString("code"))) {
                             //TODO 再计算下一次的时间,并且更新至调度计划的数据库
-                            Map<String, Object> upPlanUpWhere = new HashMap<>();//修改计划的条件
-                            upPlanUpWhere.put("plan_id", model.getPlanId());
-                            Map<String, Object> upPlan = new HashMap<>();//要修改的计划
                             DispatchPlanInfoNextTimeModel nextTimeModel = new DispatchPlanInfoNextTimeModel();
                             List<DispatchCmdBatchItemNextTimeModel> itemModelNextTimes = new ArrayList<>();
                             if (!CollectionUtils.isEmpty(itemModels)) {
@@ -181,13 +181,18 @@ public class WODispatchPlanTmDoBizFun {
                             } else {
                                 upPlan.put("next_take_time", returnNextTakeTime(nextTimeModel));
                             }
-                            //TODO 计算成功数
-
-                            upPlan.put("last_take_time",resDataObj.getJSONArray("data").getJSONObject(0).getLong("okTime"));
-                            getThisDBService().updateWiths(upPlan, upPlanUpWhere);
+                            upPlan.put("errors", "");
+                            upPlan.put("last_take_time", resDataObj.getJSONArray("data").getJSONObject(0).getLong("okTime"));
 
                             code = ResponseCode.RESULT_NORMAL;
                         }
+                        upPlan.put("takes",(model.getTakes()==null?0:model.getTakes())+jsonArray.size());
+                        if(res!=null&&!ResponseCode.RESULT_NORMAL.toStrCode().equals(res.getRescode())){
+                            //TODO 全失败,添加失败原因
+                            upPlan.put("errors",res.getRescode()+":"+res.getResmsg());
+                        }
+                        getThisDBService().updateWiths(upPlan, upPlanUpWhere);
+
                     } catch (Exception ex) {
                         LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO, mStrClassName, mStrClassName
                                 , String.format("check planInfo errorMsg:%s end<====",
@@ -283,9 +288,9 @@ public class WODispatchPlanTmDoBizFun {
         String sql = "";
         if(jsonParam.getDownFlag()!=null) {
             if(jsonParam.getDownFlag()==0) {
-                sql += " AND " + WODispatchPlanInfoTable.R_INFO.LAST_TAKE_TIME + " = 0 ";
-            }else{
                 sql += " AND " + WODispatchPlanInfoTable.R_INFO.LAST_TAKE_TIME + " > 0 ";
+            }else{
+                sql += " AND " + WODispatchPlanInfoTable.R_INFO.LAST_TAKE_TIME + " = 0 ";
             }
         }
         int nTotals = getThisDBService().totalCountsEx("", andWheres, null, lilterExtend+sql);