河南郸城调度计划查询详情修改

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

@@ -78,6 +78,7 @@ public class WODispatchPlanTmDoBizFun {
         //通过planId在计划视图中查询指定计划基本信息，进行如下比对：
         //若：status==1 && checkTm == next_task_time && batch_total > 0
         //则对排班调用接口生成指令工单，否则直接返回
+        Long nowLoc = TimeTool.getCurMsUTC();
         Map<String,Object> mapSel = getThisDBService().getOne(planId);
         if(mapSel!=null&&mapSel.size()>0){
             DispatchPlanInfoSSModel model = FastJsonUtil.map2Obj(mapSel,DispatchPlanInfoSSModel.class,true);
@@ -87,7 +88,7 @@ public class WODispatchPlanTmDoBizFun {
                     .listAllWithsExByDispoal("", "", andWheres, new HashMap<>(), "handle_start_time", "");
             if(model.getNextTakeTime()!=null&&model.getNextTakeTime()>0L
                     &&model.getPlanStatus()==1
-                    &&(checkTm <=model.getNextTakeTime()&&isWithinFiveMinutes(checkTm,model.getNextTakeTime()))
+                    &&(checkTm <=nowLoc&&isWithinFiveMinutes(checkTm,nowLoc))
                     &&!CollectionUtils.isEmpty(itemModels)){
                 //TODO 满足以上条件就派发调用远程接口生成指令工单
                 for (DispatchCmdBatchItemModel item:itemModels) {
@@ -318,7 +319,7 @@ public class WODispatchPlanTmDoBizFun {
                             andWheresRuls,new HashMap<>(),"","");
                     Map<String, Object> andWheresTags = new HashMap<>();
                     andWheresTags.put("plan_id", oJsonParam.getPlanId());
-                    List<Map<String,Object>> tagModels = getThisDBService().selectAllTags("","",
+                    List<Map<String,Object>> tagModels = getThisDBService().selectAllPlanTags("","",
                             andWheresTags,new HashMap<>(),"","");
                     //TODO 查询相关联的排班项信息
                     Map<String, Object> andWheres = new HashMap<>();

src/main/resources/application.properties

@@ -149,7 +149,7 @@ cloud.gw.service.address=https://119.96.165.176:9090/
 #工单服务的内部通信可信任口令
 cloud.task.service.call.password=Tri@Tech
 #工单服务访问地址
-cloud.task.service.address=https://119.96.165.176:9090/
+cloud.task.service.address=https://140.246.183.164:9000/
 
 #=================ScheduleTaskTime=========================
 #每天凌晨00:00:00到00:05:00，每隔一分钟触发一次
@@ -158,6 +158,7 @@ cron.refresh.timer.clock=0 0-5 0 * * ?
 cron.clear.local.cache=0 0 3 * * ?
 #每隔5分钟执行一次
 cron.check.wo.dispatch.plan=0 0/5 * * * ?
+#cron.check.wo.dispatch.plan=0 * * * * ?
 
 #自来水相关
 #查询分区类型配置: