pms功能优化 保养计划 功能优化

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainplanbommaterial/vo/IotMainPlanBomMaterialPageReqVO.java

@@ -61,7 +61,7 @@ public class IotMainPlanBomMaterialPageReqVO extends PageParam {
     private BigDecimal naturalDatePeriod;
 
     @Schema(description = "自然日周期-提前量(天)")
-    private BigDecimal naturalDatePeroidLead;
+    private BigDecimal naturalDatePeriodLead;
 
     @Schema(description = "排序")
     private Integer sort;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainplanbommaterial/vo/IotMainPlanBomMaterialRespVO.java

@@ -75,7 +75,7 @@ public class IotMainPlanBomMaterialRespVO {
 
     @Schema(description = "自然日周期-提前量(天)")
     @ExcelProperty("自然日周期-提前量(天)")
-    private BigDecimal naturalDatePeroidLead;
+    private BigDecimal naturalDatePeriodLead;
 
     @Schema(description = "排序")
     @ExcelProperty("排序")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainplanbommaterial/vo/IotMainPlanBomMaterialSaveReqVO.java

@@ -55,7 +55,7 @@ public class IotMainPlanBomMaterialSaveReqVO {
     private BigDecimal naturalDatePeriod;
 
     @Schema(description = "自然日周期-提前量(天)")
-    private BigDecimal naturalDatePeroidLead;
+    private BigDecimal naturalDatePeriodLead;
 
     @Schema(description = "排序")
     private Integer sort;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmaintenancebom/vo/IotMaintenanceBomPageReqVO.java

@@ -56,11 +56,10 @@ public class IotMaintenanceBomPageReqVO extends PageParam {
 
     @Schema(description = "上次保养自然日期(天)")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private BigDecimal[] lastNaturalDate;
+    private LocalDateTime[] lastNaturalDate;
 
     @Schema(description = "下次保养自然日期(天)")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private BigDecimal[] nextNaturalDate;
+    private BigDecimal nextNaturalDate;
 
     @Schema(description = "BOM节点 id", example = "18063")
     private Long bomNodeId;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmaintenancebom/vo/IotMaintenanceBomRespVO.java

@@ -52,6 +52,10 @@ public class IotMaintenanceBomRespVO {
     @ExcelProperty("下次保养运行时长(小时)")
     private BigDecimal nextRunningTime;
 
+    @Schema(description = "运行时长周期提前量 H")
+    @ExcelProperty("运行时长周期提前量 H")
+    private BigDecimal timePeriodLead;
+
     @Schema(description = "上次保养运行公里数(千米)")
     @ExcelProperty("上次保养运行公里数(千米)")
     private BigDecimal lastRunningKilometers;
@@ -60,14 +64,22 @@ public class IotMaintenanceBomRespVO {
     @ExcelProperty("下次保养运行公里数(千米)")
     private BigDecimal nextRunningKilometers;
 
+    @Schema(description = "公里数周期-提前量 km")
+    @ExcelProperty("公里数周期-提前量 km")
+    private BigDecimal kiloCycleLead;
+
     @Schema(description = "上次保养自然日期(天)")
     @ExcelProperty("上次保养自然日期(天)")
-    private BigDecimal lastNaturalDate;
+    private LocalDateTime lastNaturalDate;
 
     @Schema(description = "下次保养自然日期(天)")
     @ExcelProperty("下次保养自然日期(天)")
     private BigDecimal nextNaturalDate;
 
+    @Schema(description = "自然日周期-提前量(天)")
+    @ExcelProperty("自然日周期-提前量(天)")
+    private BigDecimal naturalDatePeriodLead;
+
     @Schema(description = "BOM节点 id", example = "18063")
     private Long bomNodeId;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmaintenancebom/vo/IotMaintenanceBomSaveReqVO.java

@@ -1,9 +1,11 @@
 package cn.iocoder.yudao.module.pms.controller.admin.iotmaintenancebom.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - PMS 保养计划明细BOM新增/修改 Request VO")
 @Data
@@ -40,18 +42,27 @@ public class IotMaintenanceBomSaveReqVO {
     @Schema(description = "下次保养运行时长(小时)")
     private BigDecimal nextRunningTime;
 
+    @Schema(description = "运行时长周期提前量 H")
+    private BigDecimal timePeriodLead;
+
     @Schema(description = "上次保养运行公里数(千米)")
     private BigDecimal lastRunningKilometers;
 
     @Schema(description = "下次保养运行公里数(千米)")
     private BigDecimal nextRunningKilometers;
 
+    @Schema(description = "公里数周期-提前量 km")
+    private BigDecimal kiloCycleLead;
+
     @Schema(description = "上次保养自然日期(天)")
-    private BigDecimal lastNaturalDate;
+    private LocalDateTime lastNaturalDate;
 
     @Schema(description = "下次保养自然日期(天)")
     private BigDecimal nextNaturalDate;
 
+    @Schema(description = "自然日周期-提前量(天)")
+    private BigDecimal naturalDatePeriodLead;
+
     @Schema(description = "BOM节点 id", example = "18063")
     private Long bomNodeId;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorder/vo/IotMainWorkOrderRespVO.java

@@ -97,4 +97,9 @@ public class IotMainWorkOrderRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    /**
+     * 扩展字段
+     */
+    @Schema(description = "距离保养时间")
+    private BigDecimal remainingTime;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorderbom/vo/IotMainWorkOrderBomPageReqVO.java

@@ -63,7 +63,7 @@ public class IotMainWorkOrderBomPageReqVO extends PageParam {
     private BigDecimal nextRunningKilometers;
 
     @Schema(description = "推迟运行公里数(千米)")
-    private BigDecimal delayKilomaters;
+    private BigDecimal delayKilometers;
 
     @Schema(description = "上次保养自然日期(天)")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -100,7 +100,7 @@ public class IotMainWorkOrderBomPageReqVO extends PageParam {
     private BigDecimal naturalDatePeriod;
 
     @Schema(description = "自然日周期-提前量(天)")
-    private BigDecimal naturalDatePeroidLead;
+    private BigDecimal naturalDatePeriodLead;
 
     @Schema(description = "BOM节点id", example = "13933")
     private Long bomNodeId;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorderbom/vo/IotMainWorkOrderBomRespVO.java

@@ -75,7 +75,7 @@ public class IotMainWorkOrderBomRespVO {
 
     @Schema(description = "推迟运行公里数(千米)")
     @ExcelProperty("推迟运行公里数(千米)")
-    private BigDecimal delayKilomaters;
+    private BigDecimal delayKilometers;
 
     @Schema(description = "上次保养自然日期(天)")
     @ExcelProperty("上次保养自然日期(天)")
@@ -119,7 +119,7 @@ public class IotMainWorkOrderBomRespVO {
 
     @Schema(description = "自然日周期-提前量(天)")
     @ExcelProperty("自然日周期-提前量(天)")
-    private BigDecimal naturalDatePeroidLead;
+    private BigDecimal naturalDatePeriodLead;
 
     @Schema(description = "BOM节点id", example = "13933")
     @ExcelProperty("BOM节点id")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorderbom/vo/IotMainWorkOrderBomSaveReqVO.java

@@ -56,7 +56,7 @@ public class IotMainWorkOrderBomSaveReqVO {
     private BigDecimal nextRunningKilometers;
 
     @Schema(description = "推迟运行公里数(千米)")
-    private BigDecimal delayKilomaters;
+    private BigDecimal delayKilometers;
 
     @Schema(description = "上次保养自然日期(天)")
     private BigDecimal lastNaturalDate;
@@ -89,7 +89,7 @@ public class IotMainWorkOrderBomSaveReqVO {
     private BigDecimal naturalDatePeriod;
 
     @Schema(description = "自然日周期-提前量(天)")
-    private BigDecimal naturalDatePeroidLead;
+    private BigDecimal naturalDatePeriodLead;
 
     @Schema(description = "BOM节点id", example = "13933")
     private Long bomNodeId;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorderbommaterial/vo/IotMainWorkOrderBomMaterialPageReqVO.java

@@ -73,7 +73,7 @@ public class IotMainWorkOrderBomMaterialPageReqVO extends PageParam {
     private BigDecimal naturalDatePeriod;
 
     @Schema(description = "自然日周期-提前量(天)")
-    private BigDecimal naturalDatePeroidLead;
+    private BigDecimal naturalDatePeriodLead;
 
     @Schema(description = "物料来源 (SAP库存 本地库存...)")
     private String materialSource;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorderbommaterial/vo/IotMainWorkOrderBomMaterialRespVO.java

@@ -91,7 +91,7 @@ public class IotMainWorkOrderBomMaterialRespVO {
 
     @Schema(description = "自然日周期-提前量(天)")
     @ExcelProperty("自然日周期-提前量(天)")
-    private BigDecimal naturalDatePeroidLead;
+    private BigDecimal naturalDatePeriodLead;
 
     @Schema(description = "物料来源 (SAP库存 本地库存...)")
     @ExcelProperty("物料来源 (SAP库存 本地库存...)")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotmainworkorderbommaterial/vo/IotMainWorkOrderBomMaterialSaveReqVO.java

@@ -67,7 +67,7 @@ public class IotMainWorkOrderBomMaterialSaveReqVO {
     private BigDecimal naturalDatePeriod;
 
     @Schema(description = "自然日周期-提前量(天)")
-    private BigDecimal naturalDatePeroidLead;
+    private BigDecimal naturalDatePeriodLead;
 
     @Schema(description = "物料来源 (SAP库存 本地库存...)")
     private String materialSource;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotmaintenancebom/IotMaintenanceBomDO.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 /**
  * PMS 保养计划明细BOM DO
@@ -68,6 +69,10 @@ public class IotMaintenanceBomDO extends BaseDO {
      * 下次保养运行时长(小时)
      */
     private BigDecimal nextRunningTime;
+    /**
+     * 运行时长周期提前量 H
+     */
+    private BigDecimal timePeriodLead;
     /**
      * 上次保养运行公里数(千米)
      */
@@ -76,14 +81,22 @@ public class IotMaintenanceBomDO extends BaseDO {
      * 下次保养运行公里数(千米)
      */
     private BigDecimal nextRunningKilometers;
+    /**
+     * 公里数周期-提前量 km
+     */
+    private BigDecimal kiloCycleLead;
     /**
      * 上次保养自然日期(天)
      */
-    private BigDecimal lastNaturalDate;
+    private LocalDateTime lastNaturalDate;
     /**
      * 下次保养自然日期(天)
      */
     private BigDecimal nextNaturalDate;
+    /**
+     * 自然日周期-提前量(天)
+     */
+    private BigDecimal naturalDatePeriodLead;
     /**
      * BOM节点id
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotmainworkorderbom/IotMainWorkOrderBomDO.java

@@ -88,7 +88,7 @@ public class IotMainWorkOrderBomDO extends BaseDO {
     /**
      * 推迟运行公里数(千米)
      */
-    private BigDecimal delayKilomaters;
+    private BigDecimal delayKilometers;
     /**
      * 上次保养自然日期(天)
      */
@@ -132,7 +132,7 @@ public class IotMainWorkOrderBomDO extends BaseDO {
     /**
      * 自然日周期-提前量(天)
      */
-    private BigDecimal naturalDatePeroidLead;
+    private BigDecimal naturalDatePeriodLead;
     /**
      * BOM节点id
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotmainworkorderbommaterial/IotMainWorkOrderBomMaterialDO.java

@@ -103,7 +103,7 @@ public class IotMainWorkOrderBomMaterialDO extends BaseDO {
     /**
      * 自然日周期-提前量(天)
      */
-    private BigDecimal naturalDatePeroidLead;
+    private BigDecimal naturalDatePeriodLead;
     /**
      * 物料来源 (SAP库存 本地库存...)
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotmainplanbommaterial/IotMainPlanBomMaterialMapper.java

@@ -31,7 +31,7 @@ public interface IotMainPlanBomMaterialMapper extends BaseMapperX<IotMainPlanBom
                 .eqIfPresent(IotMainPlanBomMaterialDO::getTimePeriod, reqVO.getTimePeriod())
                 .eqIfPresent(IotMainPlanBomMaterialDO::getTimePeriodLead, reqVO.getTimePeriodLead())
                 .eqIfPresent(IotMainPlanBomMaterialDO::getNaturalDatePeriod, reqVO.getNaturalDatePeriod())
-                .eqIfPresent(IotMainPlanBomMaterialDO::getNaturalDatePeroidLead, reqVO.getNaturalDatePeroidLead())
+                .eqIfPresent(IotMainPlanBomMaterialDO::getNaturalDatePeroidLead, reqVO.getNaturalDatePeriodLead())
                 .eqIfPresent(IotMainPlanBomMaterialDO::getSort, reqVO.getSort())
                 .eqIfPresent(IotMainPlanBomMaterialDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(IotMainPlanBomMaterialDO::getRemark, reqVO.getRemark())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotmaintenancebom/IotMaintenanceBomMapper.java

@@ -30,7 +30,7 @@ public interface IotMaintenanceBomMapper extends BaseMapperX<IotMaintenanceBomDO
                 .eqIfPresent(IotMaintenanceBomDO::getLastRunningKilometers, reqVO.getLastRunningKilometers())
                 .eqIfPresent(IotMaintenanceBomDO::getNextRunningKilometers, reqVO.getNextRunningKilometers())
                 .betweenIfPresent(IotMaintenanceBomDO::getLastNaturalDate, reqVO.getLastNaturalDate())
-                .betweenIfPresent(IotMaintenanceBomDO::getNextNaturalDate, reqVO.getNextNaturalDate())
+                .eqIfPresent(IotMaintenanceBomDO::getNextNaturalDate, reqVO.getNextNaturalDate())
                 .likeIfPresent(IotMaintenanceBomDO::getName, reqVO.getName())
                 .eqIfPresent(IotMaintenanceBomDO::getCode, reqVO.getCode())
                 .eqIfPresent(IotMaintenanceBomDO::getParentId, reqVO.getParentId())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotmainworkorderbom/IotMainWorkOrderBomMapper.java

@@ -31,7 +31,7 @@ public interface IotMainWorkOrderBomMapper extends BaseMapperX<IotMainWorkOrderB
                 .eqIfPresent(IotMainWorkOrderBomDO::getDelayDuration, reqVO.getDelayDuration())
                 .eqIfPresent(IotMainWorkOrderBomDO::getLastRunningKilometers, reqVO.getLastRunningKilometers())
                 .eqIfPresent(IotMainWorkOrderBomDO::getNextRunningKilometers, reqVO.getNextRunningKilometers())
-                .eqIfPresent(IotMainWorkOrderBomDO::getDelayKilomaters, reqVO.getDelayKilomaters())
+                .eqIfPresent(IotMainWorkOrderBomDO::getDelayKilometers, reqVO.getDelayKilometers())
                 .betweenIfPresent(IotMainWorkOrderBomDO::getLastNaturalDate, reqVO.getLastNaturalDate())
                 .betweenIfPresent(IotMainWorkOrderBomDO::getNextNaturalDate, reqVO.getNextNaturalDate())
                 .betweenIfPresent(IotMainWorkOrderBomDO::getDelayNaturalDate, reqVO.getDelayNaturalDate())
@@ -42,7 +42,7 @@ public interface IotMainWorkOrderBomMapper extends BaseMapperX<IotMainWorkOrderB
                 .eqIfPresent(IotMainWorkOrderBomDO::getKilometerCycle, reqVO.getKilometerCycle())
                 .eqIfPresent(IotMainWorkOrderBomDO::getKiloCycleLead, reqVO.getKiloCycleLead())
                 .eqIfPresent(IotMainWorkOrderBomDO::getNaturalDatePeriod, reqVO.getNaturalDatePeriod())
-                .eqIfPresent(IotMainWorkOrderBomDO::getNaturalDatePeroidLead, reqVO.getNaturalDatePeroidLead())
+                .eqIfPresent(IotMainWorkOrderBomDO::getNaturalDatePeriodLead, reqVO.getNaturalDatePeriodLead())
                 .eqIfPresent(IotMainWorkOrderBomDO::getBomNodeId, reqVO.getBomNodeId())
                 .likeIfPresent(IotMainWorkOrderBomDO::getName, reqVO.getName())
                 .eqIfPresent(IotMainWorkOrderBomDO::getCode, reqVO.getCode())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotmainworkorderbommaterial/IotMainWorkOrderBomMaterialMapper.java

@@ -35,7 +35,7 @@ public interface IotMainWorkOrderBomMaterialMapper extends BaseMapperX<IotMainWo
                 .eqIfPresent(IotMainWorkOrderBomMaterialDO::getTimePeriod, reqVO.getTimePeriod())
                 .eqIfPresent(IotMainWorkOrderBomMaterialDO::getTimePeriodLead, reqVO.getTimePeriodLead())
                 .eqIfPresent(IotMainWorkOrderBomMaterialDO::getNaturalDatePeriod, reqVO.getNaturalDatePeriod())
-                .eqIfPresent(IotMainWorkOrderBomMaterialDO::getNaturalDatePeroidLead, reqVO.getNaturalDatePeroidLead())
+                .eqIfPresent(IotMainWorkOrderBomMaterialDO::getNaturalDatePeriodLead, reqVO.getNaturalDatePeriodLead())
                 .eqIfPresent(IotMainWorkOrderBomMaterialDO::getMaterialSource, reqVO.getMaterialSource())
                 .eqIfPresent(IotMainWorkOrderBomMaterialDO::getInventoryAddress, reqVO.getInventoryAddress())
                 .eqIfPresent(IotMainWorkOrderBomMaterialDO::getSort, reqVO.getSort())

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/mainworkorder/CreateMainWorkOrderJob.java

@@ -0,0 +1,116 @@
+package cn.iocoder.yudao.module.pms.job.mainworkorder;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
+import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
+import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDetailDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectPlanDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectRouteDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderDetailMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectPlanMapper;
+import cn.iocoder.yudao.module.pms.service.iotmainworkorder.IotMainWorkOrderService;
+import cn.iocoder.yudao.module.pms.service.maintenance.IotMaintenancePlanService;
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.ZoneId;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+public class CreateMainWorkOrderJob implements JobHandler {
+    @Resource
+    private IotInspectPlanMapper iotInspectPlanMapper;
+    @Resource
+    private IotInspectOrderMapper iotInspectOrderMapper;
+    @Autowired
+    private IotInspectOrderDetailMapper iotInspectOrderDetailMapper;
+
+    @Resource
+    private IotMaintenancePlanService iotMaintenancePlanService;
+    @Resource
+    private IotMainWorkOrderService iotMainWorkOrderService;
+
+    @Override
+    @TenantJob
+    public String execute(String param) throws Exception {
+        // 查询所有的 保养计划
+        List<IotInspectPlanDO> plans = iotInspectPlanMapper.selectList();
+        plans.forEach(plan -> {
+            if (plan.getLastCreateTime()==null) {
+                Date date = Date.from(
+                        plan.getCreateTime().atZone(ZoneId.systemDefault()) // 使用系统默认时区
+                                .toInstant()                    // 转为 Instant（时间戳）
+                );
+                deal(plan, date);
+            } else {
+                Date lastdate = Date.from(
+                        plan.getLastCreateTime().atZone(ZoneId.systemDefault()) // 使用系统默认时区
+                                .toInstant()                    // 转为 Instant（时间戳）
+                );
+                deal(plan, lastdate);
+            }
+        });
+        return "创建成功";
+    }
+
+    private void deal(IotInspectPlanDO plan, Date date) {
+        Date date1 = new Date();
+        if ("hour".equals(plan.getPlanUnit())){
+            //todo
+            DateTime dateTime = DateUtil.offsetMinute(date, Integer.parseInt(StringUtils.substringBeforeLast(String.valueOf(plan.getPlanCycle()),".")));
+            if (date1.compareTo(dateTime) > 0){
+                createPlan(plan);
+            }
+        } else if ("day".equals(plan.getPlanUnit())){
+            DateTime dateTime = DateUtil.offsetDay(date, Integer.parseInt(String.valueOf(plan.getPlanCycle())));
+            if (date1.compareTo(dateTime) > 0){
+                createPlan(plan);
+            }
+        } else if ("month".equals(plan.getPlanUnit())){
+            DateTime dateTime = DateUtil.offsetMonth(date, Integer.parseInt(String.valueOf(plan.getPlanCycle())));
+            if (date1.compareTo(dateTime) > 0){
+                createPlan(plan);
+            }
+        }
+    }
+
+    private void createPlan(IotInspectPlanDO iotInspectPlan) {
+        IotInspectOrderDO iotInspectOrderDO = new IotInspectOrderDO();
+        iotInspectOrderDO.setInspectOrderTitle(iotInspectPlan.getPlanTitle()+"-巡检工单");
+        iotInspectOrderDO.setInspectOrderCode("IN"+ DateUtil.format(new Date(),"yyyyMMddHHmmss"));
+        String collect = Arrays.stream(iotInspectPlan.getCharge().split(",")).map(charge -> "io" + charge + "io").collect(Collectors.joining(","));
+        iotInspectOrderDO.setCharge(collect);
+        iotInspectOrderDO.setStatus("todo");
+        iotInspectOrderDO.setDeviceIds(iotInspectPlan.getDeviceIds());
+        iotInspectOrderDO.setType("计划生成");
+        iotInspectOrderDO.setPlanCode(iotInspectPlan.getPlanCode());
+        iotInspectOrderDO.setDeleted(false);
+        iotInspectOrderDO.setChargeName(iotInspectPlan.getChargeName());
+        iotInspectOrderMapper.insert(iotInspectOrderDO);
+        List<IotInspectRouteDO> routeDOS = JSON.parseArray(iotInspectPlan.getDeviceIds(), IotInspectRouteDO.class);
+        List<IotInspectOrderDetailDO> results = new ArrayList<>();
+        //处理巡检项
+        routeDOS.forEach(routeDO -> {
+            List<Map> itemos = JSON.parseArray(routeDO.getItemJson(), Map.class);
+            itemos.forEach(item -> {
+                IotInspectOrderDetailDO detailDO = new IotInspectOrderDetailDO();
+                detailDO.setOrderId(iotInspectOrderDO.getId());
+                detailDO.setDeviceId(routeDO.getDeviceId());
+                detailDO.setItemId(Long.valueOf(String.valueOf(item.get("itemId"))));
+                detailDO.setIndexId(Long.valueOf(String.valueOf(item.get("index"))));
+                detailDO.setDeleted(false);
+                results.add(detailDO);
+            });
+        });
+        iotInspectOrderDetailMapper.insertBatch(results);
+    }
+}