优化代码

java110

2023-02-22 35981de2d74f44eb10a60bfcbd9c995b980be021

 service-job/src/main/java/com/java110/job/task/maintainance/GeneratorMaintainanceTaskTemplate.java

@@ -6,6 +6,7 @@
import com.java110.dto.maintainancePlanMachine.MaintainancePlanMachineDto;
import com.java110.dto.maintainancePlanStaff.MaintainancePlanStaffDto;
import com.java110.dto.maintainanceTask.MaintainanceTaskDto;
import com.java110.dto.maintainanceTaskDetail.MaintainanceTaskDetailDto;
import com.java110.dto.scheduleClassesStaff.ScheduleClassesStaffDto;
import com.java110.dto.task.TaskDto;
import com.java110.intf.community.*;
@@ -109,7 +110,7 @@
        if (maintainanceTaskDetailPos.size() < 1) {
            return;
        }
        maintainanceTaskV1InnerServiceSMOImpl.saveMaintainanceTask(maintainanceTaskPos);
        maintainanceTaskV1InnerServiceSMOImpl.saveMaintainanceTasks(maintainanceTaskPos);

        maintainanceTaskV1InnerServiceSMOImpl.saveMaintainanceTaskDetail(maintainanceTaskDetailPos);

@@ -128,7 +129,7 @@
            case MaintainancePlanDto.INSPECTION_PLAN_PERIOD_DAY:
                hasCondition = hasGeneratorTaskConditionByDay(tmpMaintainancePlanDto, taskDto, communityDto, tmpMaintainancePlanStaffDto, maintainanceTaskPos, maintainanceTaskDetailPos);
                break;
            case MaintainancePlanDto.INSPECTION_PLAN_PERIOD_WEEK:
            case MaintainancePlanDto.INSPECTION_PLAN_PERIOD_NEXT_DAY:
                hasCondition = hasGeneratorTaskConditionByWeek(tmpMaintainancePlanDto, taskDto, communityDto, tmpMaintainancePlanStaffDto, maintainanceTaskPos, maintainanceTaskDetailPos);
                break;
        }
@@ -151,6 +152,7 @@
        maintainanceTaskPo.setOriginalPlanUserId(tmpMaintainancePlanStaffDto.getStaffId());
        maintainanceTaskPo.setOriginalPlanUserName(tmpMaintainancePlanStaffDto.getStaffName());
        maintainanceTaskPo.setTaskType("1000");
        maintainanceTaskPo.setState(MaintainanceTaskDto.STATE_WAIT);

        MaintainancePlanMachineDto maintainancePlanMachineDto = new MaintainancePlanMachineDto();
        maintainancePlanMachineDto.setCommunityId(tmpMaintainancePlanDto.getCommunityId());
@@ -170,6 +172,7 @@
            maintainanceTaskDetailPo.setPointEndTime(nowTime + "18:00:00");
            maintainanceTaskDetailPo.setSortNumber("1");
            maintainanceTaskDetailPo.setTaskDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_taskDetailId));
            maintainanceTaskDetailPo.setState(MaintainanceTaskDetailDto.STATE_WAIT);
            maintainanceTaskDetailPos.add(maintainanceTaskDetailPo);
        }
        maintainanceTaskPos.add(maintainanceTaskPo);
@@ -261,7 +264,7 @@

        int subDay = DateUtil.daysBetween(DateUtil.getCurrentDate(), DateUtil.getDateFromStringB(tmpMaintainancePlanDto.getStartDate()));

        if(subDay % day != 0){
        if (subDay % day != 0) {
            return false;
        }

@@ -269,7 +272,7 @@
        //当前时间是否 到了 巡检任务前30分钟
        int beforeTime = 30;

        String planTime = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B) + " "  + "09:00:00";
        String planTime = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B) + " " + "09:00:00";

        Calendar calendar = Calendar.getInstance();
        calendar.setTime(DateUtil.getDateFromStringA(planTime));