'优化巡查自检-巡检计划-新增、巡查自检-巡检计划-修改接口，普通计划分批次创建巡检子计划记录，首次新增7天的巡检记录；开发巡检计划分批次方法逻辑，并创建定时任务每天23点调用巡检计划分批次方法创建巡检分批计划记录'

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/TaskController.java

@@ -35,6 +35,9 @@ public class TaskController {
     @Autowired
     private DemReportDataService demReportDataService;
 
+    @Autowired
+    private PatrolInspectionPlanService patrolInspectionPlanService;
+
     //    @Scheduled(cron = "0/5 * *  * * ?") // 间隔5秒执行
     @Scheduled(cron = "0 0/5 * * * ? ") // 间隔5分钟执行
     public void task() {
@@ -70,5 +73,11 @@ public class TaskController {
         demReportDataService.regularReportData();
     }
 
+    @Scheduled(cron = "0 50 16 * * ? ")////每天23点
+    public void task5(){
+        System.out.println(Thread.currentThread().getName() + "巡检计划分批次创建执行中");
+        patrolInspectionPlanService.addPatrolInspectionPlanSon();
+    }
+
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/PatrolInspectionPlanService.java

@@ -26,6 +26,8 @@ public interface PatrolInspectionPlanService extends CrudService<PatrolInspectio
 
     void updatePatrolInspectionPlan(PatrolInspectionPlanVo patrolInspectionPlanVo);
 
+    void addPatrolInspectionPlanSon();
+
     void delPatrolInspectionPlan(Integer id);
 
     CommonPage<PatrolInspectionPlanDataVo> patrolInspectionPlanList(String planName,Integer planType, Integer areaId,Integer pageNum, Integer pageSize, Integer id);

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanServiceImpl.java

@@ -1,6 +1,7 @@
 package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
@@ -204,6 +205,9 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         if (patrolInspectionPlanVo.getPlanType() == 1) {//普通计划
             //计算两时间天数
             int day = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), patrolInspectionPlanVo.getEndDate())+1;
+            if(day > 7){
+                day = 7;
+            }
 //            if (patrolInspectionPlanVo.getStartDate().equals(patrolInspectionPlanVo.getEndDate())){
 //                day = 1;
 //            }else {
@@ -398,7 +402,11 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         if (patrolInspectionPlanVo.getPlanType() == 1) {//普通计划
             //计算两时间天数
             int day = OnlineMethod.fun(patrolInspectionPlanVo.getStartDate(), patrolInspectionPlanVo.getEndDate())+1;
-            String timeStr1 = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            if(day > 7){
+                day = 7;
+            }
+
+            String timeStr1 = patrolInspectionPlanVo.getStartDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             for (int i = 0; i < day; i++) {
                 for (int j = 0; j < patrolInspectionPlanVo.getPlanScheduleList().size(); j++) {
                     LocalDate s = OnlineMethod.getDate(timeStr1, "yyyy-MM-dd", true, i );
@@ -469,6 +477,85 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         }
     }
 
+    @Override
+    @Transactional
+    public void addPatrolInspectionPlanSon(){
+        LambdaQueryWrapper<PatrolInspectionPlan> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.le(PatrolInspectionPlan::getStartDate,LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
+                .ge(PatrolInspectionPlan::getEndDate,OnlineMethod.getDate(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), "yyyy-MM-dd", true, 7))
+                .eq(PatrolInspectionPlan::getEnable,1);
+        List<PatrolInspectionPlan> list = this.list(queryWrapper);
+        if(CollectionUtils.isNotEmpty(list)){
+            List<Integer> planIdList = new ArrayList<>();
+            for (int i = 0; i < list.size(); i++) {
+                planIdList.add(list.get(i).getId());
+            }
+
+            //巡检日程关联信息
+            LambdaQueryWrapper<PatrolInspectionPlanSchedule> queryWrapper1 = Wrappers.lambdaQuery();
+            queryWrapper1.in(PatrolInspectionPlanSchedule::getPlanId,planIdList);
+            List<PatrolInspectionPlanSchedule> scheduleList = planScheduleService.list(queryWrapper1);
+            if(CollectionUtils.isEmpty(scheduleList)){
+                throw new BusinessException("无巡检日程关联信息");
+            }
+
+            //主计划地点关联
+            LambdaQueryWrapper<PatrolInspectionPlanSite> queryWrapper2 = Wrappers.lambdaQuery();
+            queryWrapper2.in(PatrolInspectionPlanSite::getPlanId,planIdList);
+            List<PatrolInspectionPlanSite> siteList = planSiteService.list(queryWrapper2);
+            if(CollectionUtils.isEmpty(siteList)){
+                throw new BusinessException("无主计划地点关联信息");
+            }
+
+            for (int m = 0; m < list.size(); m++) {
+                //子表数据添加
+                if (list.get(m).getPlanType() == 1) {//普通计划 当前日期+7天在巡检计划时间范围内，就创建一条当前日期+7天日期对应的巡检记录
+                    for (int j = 0; j < scheduleList.size(); j++) {
+                        if(list.get(m).getId().equals(scheduleList.get(j).getPlanId())){
+                            LocalDate s = OnlineMethod.getDate(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), "yyyy-MM-dd", true, 7);
+                            Date date = Date.from(s.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
+                            String week = OnlineMethod.getWeekOfDate(date);
+                            if (!list.get(m).getRestDay().contains(week)) {
+                                PatrolInspectionPlanSon patrolInspectionPlanSon = new PatrolInspectionPlanSon();
+                                patrolInspectionPlanSon.setPlanId(list.get(m).getId());
+                                patrolInspectionPlanSon.setInspectionDate(s);
+                                patrolInspectionPlanSon.setStartTime(scheduleList.get(j).getStartTime());
+                                patrolInspectionPlanSon.setEndTime(scheduleList.get(j).getEndTime());
+                                patrolInspectionPlanSon.setPersonnelId(scheduleList.get(j).getPersonnelId());
+                                patrolInspectionPlanSon.setAreaId(list.get(m).getAreaId());
+                                patrolInspectionPlanSon.setPlanType(list.get(m).getPlanType());
+                                patrolInspectionPlanSon.setPlanCycle(list.get(m).getPlanCycle());
+                                patrolInspectionPlanSon.setPlanFrequency(list.get(m).getPlanFrequency());
+                                patrolInspectionPlanSon.setLapTime(list.get(m).getLapTime());
+                                patrolInspectionPlanSon.setIntervalTime(list.get(m).getIntervalTime());
+                                patrolInspectionPlanSon.setPlanDescribe(list.get(m).getPlanDescribe());
+                                patrolInspectionPlanSon.setCompletion(0);
+                                patrolInspectionPlanSon.setCreateTime(LocalDateTime.now());
+                                patrolInspectionPlanSon.setCreator(SecurityUtils.getUsername());
+                                patrolInspectionPlanSon.setAlternateField("0");
+                                patrolInspectionPlanSon.setTenantId(SecurityUtils.getTenantId());
+                                patrolInspectionPlanSon.setCompanyId(list.get(m).getCompanyId());
+                                patrolInspectionPlanSonService.save(patrolInspectionPlanSon);
+                                Integer zfid = patrolInspectionPlanSon.getId();
+                                for (int k = 0; k < siteList.size(); k++) {
+                                    if(list.get(m).getId().equals(siteList.get(k).getPlanId())){
+                                        PatrolInspectionPlanSiteSon planSiteSon = new PatrolInspectionPlanSiteSon();
+                                        planSiteSon.setPlanId(zfid);
+                                        planSiteSon.setSiteId(siteList.get(k).getSiteId());
+                                        planSiteSon.setInspectionStatus(1);
+                                        planSiteSonService.save(planSiteSon);
+                                    }
+
+                                }
+                            }
+                        }
+
+                    }
+                }
+            }
+
+        }
+    }
 
     @Override
     @Transactional