modify:修改结构

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/task/job/service/TaskJobService.java

@@ -124,13 +124,6 @@ public class TaskJobService {
 					if(!result.equals(StringUtils.EMPTY)){
 						break;
 					}
-                    /*List<ObjectTemplateEntity> otList = objectTemplateService.list(Wrappers.<ObjectTemplateEntity>query().lambda().eq(ObjectTemplateEntity::getObjectId,ou.getObjectId()));
-                    for (ObjectTemplateEntity template : otList) {
-                        result = distributeTaskObjs(taskObjectList,task,template.getObjectId(),template.getTemplateId());
-                        if(!result.equals(StringUtils.EMPTY)){
-                            break;
-                        }
-                    }*/
                 }
             }
         }else{
@@ -394,7 +387,6 @@ public class TaskJobService {
 			task.setPlanStartTime(LocalDateTime.parse(dfShort.format(now) + plan.getExecStartTime(), df));
 		}
         task.setStatus(Integer.valueOf(TaskContants.TaskStatusEnum.INIT_STATUS.getStatus()));
-//		task.setTenantId(plan.getTenantId());
 		task.setCreateUser(plan.getCreateUser());
 		task.setCreateDept(plan.getCreateDept());
 		task.setAutoVideo(plan.getAutoVideo());
@@ -409,12 +401,7 @@ public class TaskJobService {
 			log.info("计划id={}本周期batchNumber={}的任务已生成",plan.getId(),task.getBatchNumber());
 			return null;
 		}
-		/*if(!(PlanContants.PlanTypeEnum.CLASS_TYPE.getType().equals(plan.getType())
-			&& PlanContants.PlanMethodEnum.CONCURRENT.getMethod().equals(plan.getMethod()))){
-
-		}*/
         taskService.save(task);
-//		remindCacheManager.addTaskToVideoCacheList(task);
         return task;
     }
 

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/task/job/service/impl/ConcurrentTaskServcie.java

@@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
-//import com.hnac.hzims.operational.duty.feign.IDutyMainClient;
-//import com.hnac.hzims.operational.duty.vo.ImsDutyMainFeignVO;
 import org.springblade.hzinfo_inspect.plan.entity.PlanEntity;
 import org.springblade.hzinfo_inspect.plan.entity.PlanUserEntity;
 import org.springblade.hzinfo_inspect.plan.service.IPlanService;
@@ -25,7 +23,6 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -51,8 +48,6 @@ public class ConcurrentTaskServcie extends TaskJobService implements ITaskJobSer
 	private TaskVideoManager taskVideoManager;
 	@Autowired
 	private IPlanService planService;
-//	@Autowired
-//	private IDutyMainClient dutyMainClient;
 
 	/**
 	 * 派发任务
@@ -98,7 +93,6 @@ public class ConcurrentTaskServcie extends TaskJobService implements ITaskJobSer
 				XxlJobLogger.log(reason);
 
 				TaskResultEntity taskResultEntity = TaskResultEntity.builder().planId(task.getPlanId()).batchNumber(task.getBatchNumber()).reason(reason).build();
-//				taskResultEntity.setTenantId(plan.getTenantId());
 				taskResultEntity.setCreateDept(plan.getCreateDept());
 				taskResultService.save(taskResultEntity);