diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindAreaDutyVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindAreaDutyVo.java
index 89f5c9d..54ca70e 100644
--- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindAreaDutyVo.java
+++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindAreaDutyVo.java
@@ -16,6 +16,10 @@ public class WindAreaDutyVo {
 	@ApiModelProperty(value = "机构Id")
 	private Long deptId;
 
+	@ApiModelProperty(value = "机构名称")
+	private String deptName;
+
+
 	@ApiModelProperty(value = "开始时间")
 	private String start;
 
@@ -109,38 +113,50 @@ public class WindAreaDutyVo {
 	/**=============================================风电指标数据=============================================**/
 
 	@ApiModelProperty("计划发电量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double plan;
 
 	@ApiModelProperty(value = "年实际发电量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double generate;
 
 	@ApiModelProperty(value = "年发电量完成率")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double generateComplete;
 
 	@ApiModelProperty("平均风速: m/s")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double speed;
 
 	@ApiModelProperty("上网电量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double surfPower;
 
 	@ApiModelProperty("下网电量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double belowPower;
 
 	@ApiModelProperty("可用时长")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double available;
 
 	@ApiModelProperty("综合用电量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double comprehensivePower;
 
 	@ApiModelProperty("峰值功率")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double peakPower;
 
 	@ApiModelProperty("故障时长: 单位-小时")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double faultHours;
 
 	@ApiModelProperty("短期预测准确率")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double accuracy;
 
 	@ApiModelProperty("超短准确率")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double ultraShortAccuracy;
 }
diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindKpiAppVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindKpiAppVo.java
index bc36b91..fea2ddb 100644
--- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindKpiAppVo.java
+++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindKpiAppVo.java
@@ -13,6 +13,15 @@ import lombok.Data;
 @ApiModel(value = "风电站点app指标数据")
 public class WindKpiAppVo {
 
+	@ApiModelProperty(value = "机构Id")
+	private Long deptId;
+
+	@ApiModelProperty(value = "机构名称")
+	private String deptName;
+
+	@ApiModelProperty(value = "机构类型")
+	private Integer type;
+
 	@ApiModelProperty(value = "风电站数量")
 	private Integer count;
 
diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindScoreVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindScoreVo.java
index 8493839..4fca850 100644
--- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindScoreVo.java
+++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/WindScoreVo.java
@@ -30,6 +30,10 @@ public class WindScoreVo {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double generateMon;
 
+	@ApiModelProperty(value = "月计划发电量")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private Double planMon;
+
 	@ApiModelProperty(value = "年计划发电量")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double planYear;
@@ -46,13 +50,13 @@ public class WindScoreVo {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Double speedRate;
 
-	@ApiModelProperty(value = "短期准确率")
+	@ApiModelProperty(value = "月利用小时")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
-	private Double accuracy;
+	private Double availableMon;
 
-	@ApiModelProperty(value = "超短期准确率")
+	@ApiModelProperty(value = "月发电量完成率")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
-	private Double ultraShortAccuracyRate;
+	private Double completeMonRate;
 
 	@ApiModelProperty(value = "近年发电量集合")
 	private List<PowerYearVo> powerYearVoList;
diff --git a/hzims-service-api/inspect-api/pom.xml b/hzims-service-api/inspect-api/pom.xml
index 9be580b..5b20afc 100644
--- a/hzims-service-api/inspect-api/pom.xml
+++ b/hzims-service-api/inspect-api/pom.xml
@@ -64,6 +64,12 @@
             <artifactId>common-api</artifactId>
             <version>4.0.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.hnac.hzims</groupId>
+            <artifactId>safeproduct-api</artifactId>
+            <version>4.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 
diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/Constants.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/Constants.java
index fc2195b..9887f7c 100644
--- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/Constants.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/Constants.java
@@ -6,6 +6,7 @@ import lombok.Getter;
  * @Author: py
  */
 public class Constants {
+
 	public final static String APP_NAME = "hzinfo-inspect";
 
 	/**
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/AIData.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/AIData.java
similarity index 92%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/AIData.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/AIData.java
index 27617e7..2b0a524 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/AIData.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/AIData.java
@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import lombok.Data;
 import lombok.ToString;
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockDTO.java
similarity index 87%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockDTO.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockDTO.java
index 6c9d584..112b47b 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockDTO.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockDTO.java
@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockTypeDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockTypeDTO.java
similarity index 88%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockTypeDTO.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockTypeDTO.java
index ce26f2f..3147ebd 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockTypeDTO.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockTypeDTO.java
@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/FaceResponse.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/FaceResponse.java
similarity index 86%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/FaceResponse.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/FaceResponse.java
index 17dd734..423751c 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/FaceResponse.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/FaceResponse.java
@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import lombok.Data;
 import lombok.ToString;
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotDTO.java
similarity index 88%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotDTO.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotDTO.java
index aad1275..3f16038 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotDTO.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotDTO.java
@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskDTO.java
similarity index 94%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskDTO.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskDTO.java
index a8c8cf2..0116ef7 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskDTO.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskDTO.java
@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import com.hnac.hzinfo.inspect.ai.entity.RobotTaskIdentifyEntity;
 import com.hnac.hzinfo.inspect.utils.QueryField;
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskIdentifyDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskIdentifyDTO.java
similarity index 89%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskIdentifyDTO.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskIdentifyDTO.java
index 8bdff02..b579af2 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskIdentifyDTO.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskIdentifyDTO.java
@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/UserFaceDataDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/UserFaceDataDTO.java
similarity index 88%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/UserFaceDataDTO.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/UserFaceDataDTO.java
index 1ed3a07..4914d9a 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/UserFaceDataDTO.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/UserFaceDataDTO.java
@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import com.hnac.hzinfo.inspect.ai.entity.UserFaceDataEntity;
 import lombok.Data;
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/VideoReturnDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/VideoReturnDTO.java
similarity index 94%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/VideoReturnDTO.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/VideoReturnDTO.java
index a2a80c5..9ac1138 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/VideoReturnDTO.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/VideoReturnDTO.java
@@ -1,4 +1,4 @@
-package com.hnac.hzinfo.inspect.ai.dto;
+package com.hnac.hzinfo.inspect.ai.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/InspectPdf.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/InspectPdf.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/InspectPdf.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/InspectPdf.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java
diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/TaskContants.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/TaskContants.java
index 287cd05..3d1e0b2 100644
--- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/TaskContants.java
+++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/TaskContants.java
@@ -13,6 +13,10 @@ import java.util.Set;
  *
  */
 public interface TaskContants {
+
+	// 巡检任务派发 定时任务
+	String INSPECT_TASK_DISTRIBUTE = "taskJobDistribute";
+
 	/**
 	 * 处理同时开启几个任务的
 	 */
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java
similarity index 100%
rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java
rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java
diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java
index 74bf8bb..f9dbf68 100644
--- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java
+++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java
@@ -1,5 +1,6 @@
 package com.hnac.hzims.spare.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.spare.entity.SpTemporaryStockDetailEntity;
 import com.hnac.hzims.spare.entity.WtSpBasicEntity;
 import com.hnac.hzims.spare.vo.WtSpBasicVO;
@@ -14,7 +15,7 @@ import java.util.Map;
  *
  * @author Chill
  */
-public interface WtSpBasicMapper extends UserDataScopeBaseMapper<WtSpBasicEntity> {
+public interface WtSpBasicMapper extends BaseMapper<WtSpBasicEntity> {
     /**
      * 备品备件基础信息列表
      * @param params
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
index acc0803..e1eec7d 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java
@@ -836,6 +836,7 @@ public class EmInfoServiceImpl extends BaseServiceImpl<EmInfoMapper, EmInfoEntit
 					dto.setModelSignage(emTreeInspect.getModelSignage());
 					dto.setAttrSignage(emTreeInspect.getModelAttrSignage());
 					dto.setAttrName(emTreeInspect.getModelAttrName());
+					dto.setCreateDept(emInfo.getDepartment());
 					dto.setId(null);
 					contentDTOList.add(dto);
 				}
diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/SysLogMapper.xml b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/SysLogMapper.xml
index c059325..fb42000 100644
--- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/SysLogMapper.xml
+++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/SysLogMapper.xml
@@ -17,6 +17,7 @@
             from hzims_sys_log
             where is_deleted = 0
               and to_days(operation_time) = to_days(now())
+              and tenant_id = '200000'
             group by module_name;
         </select>
     <select id="statisticsTitleByModuleName"
@@ -25,6 +26,7 @@
         from hzims_sys_log
         <where>
             module_name = #{statisticsVo.moduleName}
+            and  tenant_id = '200000'
             <if test="statisticsVo.createTime != null">
                 and operation_time &gt;= #{statisticsVo.createTime}
             </if>
diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/service/impl/SysLogServiceImpl.java b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/service/impl/SysLogServiceImpl.java
index e4a9e94..6efd51e 100644
--- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/service/impl/SysLogServiceImpl.java
+++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/service/impl/SysLogServiceImpl.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author dfy
@@ -67,10 +67,9 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
     }
 
 
-
-
     /**
      * 日志查询接口
+     *
      * @param sysLog
      * @return
      */
@@ -96,13 +95,13 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
         }
 
         //功能模块
-        if (StringUtils.isNotEmpty(moduleName)){
-            queryWrapper.lambda().eq(SysLog::getModuleName,moduleName);
+        if (StringUtils.isNotEmpty(moduleName)) {
+            queryWrapper.lambda().eq(SysLog::getModuleName, moduleName);
         }
 
         //操作方法
-        if (StringUtils.isNotEmpty(title)){
-            queryWrapper.lambda().eq(SysLog::getTitle,title);
+        if (StringUtils.isNotEmpty(title)) {
+            queryWrapper.lambda().eq(SysLog::getTitle, title);
         }
 
 
@@ -112,17 +111,17 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
         }
 
         //结束时间
-        if (ObjectUtils.isNotEmpty(endTime)){
-            queryWrapper.lambda().le(SysLog::getOperationTime,endTime);
+        if (ObjectUtils.isNotEmpty(endTime)) {
+            queryWrapper.lambda().le(SysLog::getOperationTime, endTime);
         }
 
         //根据操作时间和功能模块查询
-        if (StringUtils.isNotEmpty(dateCalculated) && StringUtils.isNotEmpty(moduleName)){
-            queryWrapper.lambda().eq(SysLog::getModuleName,moduleName);
-            queryWrapper.eq("date_format(operation_time,'%Y-%m')",dateCalculated);
+        if (StringUtils.isNotEmpty(dateCalculated) && StringUtils.isNotEmpty(moduleName)) {
+            queryWrapper.lambda().eq(SysLog::getModuleName, moduleName);
+            queryWrapper.eq("date_format(operation_time,'%Y-%m')", dateCalculated);
         }
 
-
+        queryWrapper.lambda().eq(SysLog::getTenantId, "200000");
         queryWrapper.lambda().orderByDesc(SysLog::getOperationTime);
 
         return queryWrapper;
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ContentMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ContentMapper.java
new file mode 100644
index 0000000..159ec5c
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ContentMapper.java
@@ -0,0 +1,12 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.obj.entity.ContentEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface ContentMapper extends BaseMapper<ContentEntity>{
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectMapper.java
new file mode 100644
index 0000000..b130b94
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectMapper.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface ObjectMapper extends BaseMapper<ObjectEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectUserMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectUserMapper.java
new file mode 100644
index 0000000..bf7bd6b
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ObjectUserMapper.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.obj.entity.ObjectUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface ObjectUserMapper extends BaseMapper<ObjectUserEntity>{
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanMapper.java
new file mode 100644
index 0000000..e4a1c2d
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanMapper.java
@@ -0,0 +1,12 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.hnac.hzinfo.inspect.plan.entity.PlanEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface PlanMapper extends UserDataScopeBaseMapper<PlanEntity> {
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanObjectTemplateMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanObjectTemplateMapper.java
new file mode 100644
index 0000000..cffeb83
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanObjectTemplateMapper.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.plan.entity.PlanObjectTemplateEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface PlanObjectTemplateMapper extends BaseMapper<PlanObjectTemplateEntity> {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanOrgMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanOrgMapper.java
new file mode 100644
index 0000000..7a9b54f
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanOrgMapper.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.plan.entity.PlanOrgEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface PlanOrgMapper extends BaseMapper<PlanOrgEntity> {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanPositionMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanPositionMapper.java
new file mode 100644
index 0000000..31ee860
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanPositionMapper.java
@@ -0,0 +1,14 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.plan.entity.PlanPositionEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface PlanPositionMapper extends BaseMapper<PlanPositionEntity> {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanUserMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanUserMapper.java
new file mode 100644
index 0000000..6d4d19e
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/PlanUserMapper.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.plan.entity.PlanUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface PlanUserMapper extends BaseMapper<PlanUserEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ProjectContentMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ProjectContentMapper.java
new file mode 100644
index 0000000..8e9ae3e
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ProjectContentMapper.java
@@ -0,0 +1,15 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface ProjectContentMapper extends BaseMapper<ProjectContentEntity>{
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ProjectMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ProjectMapper.java
new file mode 100644
index 0000000..c237f71
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/ProjectMapper.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface ProjectMapper extends BaseMapper<ProjectEntity>{
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectMapper.java
new file mode 100644
index 0000000..0c0869c
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectMapper.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface TaskObjectMapper extends BaseMapper<TaskObjectEntity> {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectProjectContentMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectProjectContentMapper.java
new file mode 100644
index 0000000..4bdca02
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectProjectContentMapper.java
@@ -0,0 +1,16 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface TaskObjectProjectContentMapper extends BaseMapper<TaskObjectProjectContentEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectProjectMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectProjectMapper.java
new file mode 100644
index 0000000..fdef106
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskObjectProjectMapper.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface TaskObjectProjectMapper extends BaseMapper<TaskObjectProjectEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskResultMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskResultMapper.java
new file mode 100644
index 0000000..ee0f34b
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskResultMapper.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.task.entity.TaskResultEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface TaskResultMapper extends BaseMapper<TaskResultEntity> {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskUserMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskUserMapper.java
new file mode 100644
index 0000000..83c6db3
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TaskUserMapper.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.task.entity.TaskUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface TaskUserMapper extends BaseMapper<TaskUserEntity> {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TemplateMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TemplateMapper.java
new file mode 100644
index 0000000..0b82110
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TemplateMapper.java
@@ -0,0 +1,15 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface TemplateMapper extends BaseMapper<TemplateEntity> {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TemplateProjectMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TemplateProjectMapper.java
new file mode 100644
index 0000000..6d42089
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/inspect/TemplateProjectMapper.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.mapper.inspect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ysj
+ */
+@Mapper
+public interface TemplateProjectMapper extends BaseMapper<TemplateProjectEntity>{
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/DutyMainMapper.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/DutyMainMapper.java
new file mode 100644
index 0000000..08159cf
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/DutyMainMapper.java
@@ -0,0 +1,17 @@
+package com.hnac.hzims.scheduled.mapper.operation;
+
+import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity;
+import com.hnac.hzims.operational.duty.vo.*;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.core.datascope.annotation.UserDataAuth;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ysj
+ */
+public interface DutyMainMapper extends UserDataScopeBaseMapper<ImsDutyMainEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BusinessScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BusinessScheduledTask.java
new file mode 100644
index 0000000..1c353d9
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BusinessScheduledTask.java
@@ -0,0 +1,40 @@
+package com.hnac.hzims.scheduled.scheduled;
+
+import com.hnac.hzims.scheduled.service.inspect.TaskService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.Date;
+
+import static com.hnac.hzinfo.inspect.task.TaskContants.INSPECT_TASK_DISTRIBUTE;
+
+
+/**
+ * 业务模块定时任务
+ * @author ysj
+ */
+@Slf4j
+@Component
+public class BusinessScheduledTask {
+
+    @Autowired
+    private TaskService service;
+
+    /**
+     * 首页-指标数据加载
+     */
+    @XxlJob(INSPECT_TASK_DISTRIBUTE)
+    //@Scheduled(cron = "0/40 * * * * ? ")
+    public ReturnT<String> inspectTaskDistribute(String param) {
+        if (Func.isBlank(param)) {
+            param = DateUtil.format(new Date(), "yyyy-MM");
+        }
+        service.inspectTaskDistribute(param);
+        return new ReturnT<>("SUCCESS");
+    }
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java
index ee4a1a1..78cb8d8 100644
--- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java
@@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -16,6 +15,7 @@ import static com.hnac.hzims.operational.main.constant.MainConstants.*;
 
 
 /**
+ * 监测点定时任务
  * @author ysj
  */
 @Slf4j
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/RealTargetScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/RealTargetScheduledTask.java
index 3834f1a..6a55529 100644
--- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/RealTargetScheduledTask.java
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/RealTargetScheduledTask.java
@@ -19,6 +19,7 @@ import static com.hnac.hzims.operational.main.constant.MainConstants.*;
 
 
 /**
+ * 各厂站实时/指标数据 定时任务
  * @author ysj
  */
 @Slf4j
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ReportScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ReportScheduledTask.java
index 7f59697..5146c24 100644
--- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ReportScheduledTask.java
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ReportScheduledTask.java
@@ -15,6 +15,7 @@ import static com.hnac.hzims.operational.main.constant.MainConstants.AREA_MONTH_
 
 
 /**
+ * 报表定时任务
  * @author ysj
  */
 @Slf4j
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java
index e8d43b6..e10c021 100644
--- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java
@@ -16,6 +16,7 @@ import static com.hnac.hzims.operational.main.constant.MainConstants.*;
 
 
 /**
+ * 智能生产定时任务
  * @author ysj
  */
 @Slf4j
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ContentService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ContentService.java
new file mode 100644
index 0000000..f1f04cf
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ContentService.java
@@ -0,0 +1,11 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.obj.entity.ContentEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface ContentService extends BaseService<ContentEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectService.java
new file mode 100644
index 0000000..7512337
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectService.java
@@ -0,0 +1,11 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface ObjectService extends BaseService<ObjectEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectUserService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectUserService.java
new file mode 100644
index 0000000..2963621
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ObjectUserService.java
@@ -0,0 +1,11 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.obj.entity.ObjectUserEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface ObjectUserService extends BaseService<ObjectUserEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanObjectTemplateService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanObjectTemplateService.java
new file mode 100644
index 0000000..9c7314f
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanObjectTemplateService.java
@@ -0,0 +1,11 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.plan.entity.PlanObjectTemplateEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface PlanObjectTemplateService extends BaseService<PlanObjectTemplateEntity> {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanOrgService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanOrgService.java
new file mode 100644
index 0000000..3372f82
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanOrgService.java
@@ -0,0 +1,11 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.plan.entity.PlanOrgEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface PlanOrgService extends BaseService<PlanOrgEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanPositionService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanPositionService.java
new file mode 100644
index 0000000..334cfc6
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanPositionService.java
@@ -0,0 +1,11 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.plan.entity.PlanPositionEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface PlanPositionService extends BaseService<PlanPositionEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanService.java
new file mode 100644
index 0000000..ac2b6aa
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanService.java
@@ -0,0 +1,12 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.plan.entity.PlanEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface PlanService extends BaseService<PlanEntity> {
+
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanUserService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanUserService.java
new file mode 100644
index 0000000..7634f14
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/PlanUserService.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.plan.entity.PlanUserEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ *  巡检计划用户模板服务类
+ *
+ * @author Chill
+ */
+public interface PlanUserService extends BaseService<PlanUserEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectContentService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectContentService.java
new file mode 100644
index 0000000..82cd962
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectContentService.java
@@ -0,0 +1,12 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+
+import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface ProjectContentService extends BaseService<ProjectContentEntity>{
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectService.java
new file mode 100644
index 0000000..ef2a474
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/ProjectService.java
@@ -0,0 +1,12 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+
+import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface ProjectService extends BaseService<ProjectEntity>{
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectContentService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectContentService.java
new file mode 100644
index 0000000..0db0ebb
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectContentService.java
@@ -0,0 +1,11 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface TaskObjectProjectContentService extends BaseService<TaskObjectProjectContentEntity> {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectService.java
new file mode 100644
index 0000000..400d84b
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectProjectService.java
@@ -0,0 +1,11 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface TaskObjectProjectService extends BaseService<TaskObjectProjectEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectService.java
new file mode 100644
index 0000000..fb033a0
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskObjectService.java
@@ -0,0 +1,11 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface TaskObjectService extends BaseService<TaskObjectEntity> {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskRemindManager.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskRemindManager.java
new file mode 100644
index 0000000..5ef3415
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskRemindManager.java
@@ -0,0 +1,295 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hnac.hzinfo.core.push.enums.PushAudienceType;
+import com.hnac.hzinfo.core.push.model.PushAudience;
+import com.hnac.hzinfo.core.push.model.PushInfo;
+import com.hnac.hzinfo.core.push.model.PushPlatform;
+import com.hnac.hzinfo.inspect.task.TaskContants;
+import com.hnac.hzinfo.inspect.task.entity.TaskEntity;
+import com.xxl.job.core.log.XxlJobLogger;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.sms.model.SmsResponse;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.CollectionUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.resource.feign.IPushClient;
+import org.springblade.resource.feign.ISmsClient;
+import org.springblade.resource.vo.PushInfoVO;
+import org.springblade.system.user.cache.UserCache;
+import org.springblade.system.user.entity.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.DefaultTypedTuple;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+
+/**
+ * 巡检任务通知、短信提醒管理器
+ * 提醒列表使用redis缓存
+ *
+ * @author py
+ */
+@Slf4j
+@Component
+public class TaskRemindManager {
+
+	/**
+	 * 巡检任务开始前发送短信信息阿里云模板
+	 **/
+	@Value("${hzims.inspect.task.templateCode.taskBegin}")
+	private String taskBeginTemplateCode;
+
+	/**
+	 * 巡检任务结束前发送短信信息阿里云模板
+	 **/
+	@Value("${hzims.inspect.task.templateCode.taskEnd}")
+	private String taskEndTemplateCode;
+
+	/**
+	 * 巡检消息推送模板 - 极光
+	 **/
+	@Value("${hzims.inspect.task.jgPushCode}")
+	private String jgPushCode;
+
+	@Autowired
+	private TaskService taskService;
+	@Autowired
+	private RedisTemplate redisTemplate;
+	@Autowired
+	private ISmsClient smsClient;
+	@Autowired
+	private IPushClient pushClient;
+
+
+	/**
+	 * 开始前提醒任务列表
+	 */
+	final static String REMIND_TASK_BEGIN_LIST = "hzinfo:remind:begin:tasks";
+	/**
+	 * 结束前提醒任务列表
+	 */
+	final static String REMIND_TASK_END_LIST = "hzinfo:remind:end:tasks";
+
+	/**
+	 * 开始
+	 * 重置redis开始提醒缓存列表
+	 * 按照时间排序 ： 正序
+	 */
+	public void replaceBeginTaskCacheList(List<TaskEntity> taskBegin){
+		//先删除
+		redisTemplate.opsForZSet().removeRange(REMIND_TASK_BEGIN_LIST,0, -1);
+		setTaskBeginList(taskBegin);
+	}
+
+	/**
+	 * 结束
+	 * 重置redis结束提醒缓存列表
+	 * 按照时间排序 ： 正序
+	 */
+	public void replaceEndTaskCacheList(List<TaskEntity> taskEnd){
+		//先删除
+		redisTemplate.opsForZSet().removeRange(REMIND_TASK_END_LIST,0, -1);
+		setTaskEndList(taskEnd);
+	}
+
+	/**
+	 * 开始
+	 * 任务批量加入redis提醒缓存列表中
+	 *
+	 */
+	public void setTaskBeginList(List<TaskEntity> tasks){
+		HashSet set = new HashSet();
+
+		for (TaskEntity task : tasks) {
+			DefaultTypedTuple<TaskEntity> tuple = new DefaultTypedTuple<>(task, (double) task.getStartRemindTime().toEpochSecond(ZoneOffset.of("+8")));
+			set.add(tuple);
+		}
+		if(Func.isNotEmpty(set)){
+			redisTemplate.opsForZSet().add(REMIND_TASK_BEGIN_LIST, set);
+		}
+	}
+
+	/**
+	 * 结束
+	 * 任务批量加入redis提醒缓存列表中
+	 */
+	public void setTaskEndList(List<TaskEntity> tasks){
+		HashSet set = new HashSet();
+		for (TaskEntity task : tasks) {
+			DefaultTypedTuple<TaskEntity> tuple = new DefaultTypedTuple<>(task, (double) task.getEndRemindTime().toEpochSecond(ZoneOffset.of("+8")));
+			set.add(tuple);
+		}
+		if(Func.isNotEmpty(set)){
+			redisTemplate.opsForZSet().add(REMIND_TASK_END_LIST, set);
+		}
+	}
+
+
+	/**
+	 * 把任务加入redis提醒缓存列表中
+	 * 加入的时候 按照时间排序 ： 正序
+	 */
+	public void addTaskToCacheList(TaskEntity task){
+		DateTimeFormatter dfShort = DateTimeFormatter.ofPattern("yyyy-MM-dd ");
+		DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+		redisTemplate.expire(REMIND_TASK_BEGIN_LIST,365,TimeUnit.DAYS);
+		if(task.getStartRemindTime().isAfter(LocalDateTime.parse(dfShort.format(LocalDate.now()) + "00:00:00", df))){
+			redisTemplate.opsForZSet().add(REMIND_TASK_BEGIN_LIST, task, task.getStartRemindTime().toEpochSecond(ZoneOffset.of("+8")));
+			log.info("--------------- key = hzinfo:remind:begin:tasks ---- size = " + redisTemplate.opsForZSet().size(REMIND_TASK_BEGIN_LIST));
+		}
+
+		if(task.getEndRemindTime().isAfter(LocalDateTime.parse(dfShort.format(LocalDate.now()) + "00:00:00", df))){
+			redisTemplate.opsForZSet().add(REMIND_TASK_END_LIST, task, task.getEndRemindTime().toEpochSecond(ZoneOffset.of("+8")));
+			log.info("--------------- key = hzinfo:remind:end:tasks ---- size = " + redisTemplate.opsForZSet().size(REMIND_TASK_END_LIST));
+		}
+	}
+
+	/**
+	 * 任务开始前
+	 */
+	static final int BEGIN_SEND_FLAG = 1;
+	/**
+	 * 任务结束前
+	 */
+	static final int END_SEND_FLAG = 2;
+
+	/**
+	 * 任务开始、结束前提醒
+	 */
+	public void taskRemind(){
+		sendMsg(BEGIN_SEND_FLAG);
+		sendMsg(END_SEND_FLAG);
+	}
+
+	/**
+	 * 任务开始、结束前提醒
+	 */
+	public void cleanCache(){
+		long currentTime = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
+		String key = REMIND_TASK_BEGIN_LIST;
+		for (int i = 0; i < 2; i++) {
+			if(i == 1 ){
+				key = REMIND_TASK_END_LIST;
+			}
+			Set<TaskEntity> tasks = redisTemplate.opsForZSet().rangeByScore(key,0, currentTime);
+			if(Func.isNotEmpty(tasks)){
+				for (TaskEntity task : tasks) {
+					//用户id为空，删除数据
+					redisTemplate.opsForZSet().remove(key, task);
+				}
+			}
+			log.info(key + " 清空cache后 ---- size = " + redisTemplate.opsForZSet().size(key));
+		}
+
+	}
+
+	/**
+	 * 任务开始/结束前
+	 * 推送消息、发送短信
+	 * @param sendFlag 发送标识：任务开始前提醒 1；任务结束前提醒 2；
+	 */
+	private void sendMsg(int sendFlag){
+		//redis key; 消息推送标题; 短信模板code
+		String key = "", title = "", templateCode = "";
+
+		switch (sendFlag){
+			case BEGIN_SEND_FLAG:
+				key = REMIND_TASK_BEGIN_LIST;
+				title = "任务开始前提醒";
+				templateCode = taskBeginTemplateCode;
+				break;
+			case END_SEND_FLAG:
+				key = REMIND_TASK_END_LIST;
+				title = "任务结束前提醒";
+				templateCode = taskEndTemplateCode;
+				break;
+			default:
+				break;
+		}
+
+		DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+		long currentTime = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
+		Set<TaskEntity> tasks = redisTemplate.opsForZSet().rangeByScore(key,0, currentTime);
+		if(Func.isNotEmpty(tasks)){
+			//若该任务已完成 则无需再进行短信推送
+			List<Long> taskIds = tasks.stream().map(TaskEntity::getId).collect(Collectors.toList());
+			List<TaskEntity> undoneTaskList = taskService.list(Wrappers.<TaskEntity>lambdaQuery()
+				.ne(TaskEntity::getStatus, TaskContants.TaskStatusEnum.FINISH_STATUS.getStatus())
+				.in(TaskEntity::getId, taskIds)
+			);
+			if(CollectionUtil.isEmpty(undoneTaskList)) {
+				XxlJobLogger.log("巡检短信通知列表为空；redis内取出数据为：" + JSON.toJSONString(taskIds));
+				return;
+			}
+			List<Long> undoneTaskIds = undoneTaskList.stream().map(TaskEntity::getId).collect(Collectors.toList());
+			for (TaskEntity task : tasks) {
+				if(!undoneTaskIds.contains(task.getId())) {
+					XxlJobLogger.log(task.getId()+"巡检任务已完成，无需推送短信");
+					return;
+				}
+				XxlJobLogger.log(task.getId()+"开始推送消息！");
+				// 移动端消息推送 : 使用 用户id做TAG，前端注册用户id为TAG
+				PushInfoVO pushInfoVO = new PushInfoVO();
+				pushInfoVO.setTenantId(task.getTenantId());
+				PushPlatform platform = PushPlatform.all();
+				Map<PushAudienceType, List<String>> audienceMap = new HashMap<>();
+				audienceMap.put(PushAudienceType.TAG, Collections.singletonList(task.getUserId().toString()));
+				PushAudience audience = new PushAudience(false, audienceMap);
+				PushInfo pushInfo = new PushInfo(jgPushCode
+					, title
+					, "任务“"+ task.getPlanName() + "”的计划执行时间是：" + df.format(task.getPlanStartTime())+ " —— " + df.format(task.getPlanEndTime())
+					, ""
+					, null
+					, platform
+					, audience);
+				pushInfoVO.setPushInfo(pushInfo);
+
+				Map<String, String> smsMap = new HashMap<>(3);
+				smsMap.put("one", task.getPlanName());
+				if(sendFlag == BEGIN_SEND_FLAG){
+					smsMap.put("two", df.format(task.getPlanStartTime()));
+				} else if(sendFlag == END_SEND_FLAG){
+					smsMap.put("two", df.format(task.getPlanEndTime()));
+				}  //smsMap.put("three", df.format(task.getPlanEndTime()));
+
+
+				String jsonParam = JSON.toJSONString(smsMap);
+
+				User user = UserCache.getUser(task.getUserId());
+				String userPhone = Func.isNotEmpty(user) ? user.getPhone() : null;
+				log.info("------------ 发送短信  用户手机号 = "  + userPhone);
+
+				String finalTemplateCode = templateCode;
+				XxlJobLogger.log(task.getId()+"开始推送短信！");
+				ThreadFactory threadFactory = Executors.defaultThreadFactory();
+				ThreadPoolExecutor pool = new ThreadPoolExecutor(5, 5, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingDeque(), threadFactory);
+				pool.execute(() -> {
+					if(Func.isNotEmpty(userPhone)){
+						// 发送短信
+						R<SmsResponse> success = smsClient.sendMessage(task.getTenantId(), finalTemplateCode, jsonParam, userPhone);
+						log.info("msg -- 用户手机号：" +  userPhone + " ; 短信内容：" + jsonParam + " ; TenantId：" + task.getTenantId() + " ; finalTemplateCode：" + finalTemplateCode + "；返回信息 = " + (Func.isNotEmpty(success)?success.toString(): "返回为空"));
+					}
+					//推送消息给移动端
+					pushClient.tenantPush(pushInfoVO);
+					log.info("msg -- 推送信息完成" );
+				});
+
+				//把已发送的数据移除
+				// redisTemplate.opsForZSet().remove(key, task);
+				log.info("已推送、发送短信后 --------------- key = " + key + " ---- size = " + redisTemplate.opsForZSet().size(key));
+			}
+		}
+	}
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskResultService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskResultService.java
new file mode 100644
index 0000000..960f773
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskResultService.java
@@ -0,0 +1,11 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.task.entity.TaskResultEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface TaskResultService extends BaseService<TaskResultEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java
index 6d25531..4e3aa2b 100644
--- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskService.java
@@ -11,5 +11,7 @@ import java.util.List;
  */
 public interface TaskService extends BaseService<TaskEntity> {
 
+    void inspectTaskDistribute(String param);
+
 	DutyInspectTaskVO task(String start, String end, List<Long> areas);
 }
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskUserService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskUserService.java
new file mode 100644
index 0000000..558a4c6
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskUserService.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.task.entity.TaskUserEntity;
+import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
+
+/**
+ * @author ysj
+ */
+public interface TaskUserService extends BaseService<TaskUserEntity> {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskVideoManager.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskVideoManager.java
new file mode 100644
index 0000000..bb53251
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TaskVideoManager.java
@@ -0,0 +1,98 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.ai.vo.VideoReturnDTO;
+import com.hnac.hzinfo.inspect.plan.PlanContants;
+import com.hnac.hzinfo.inspect.task.entity.TaskEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+
+/**
+ * 视频巡检任务
+ * 提醒列表使用redis缓存
+ * @Author: py
+ */
+@Component
+public class TaskVideoManager {
+
+	/**
+	 * 视频巡检任务列表
+	 */
+	final static String VIDEO_TASK_LIST = "hzinfo:video:tasks";
+
+	/**
+	 * 视频巡检  AI识别结果列表
+	 */
+	final static String VIDEO_TASK_AI_RESULT= "hzinfo:video:ai:results";
+
+	@Autowired
+	private RedisTemplate redisTemplate;
+
+	/**
+	 * 把AI识别结果加入redis缓存中
+	 */
+	public void addAiResultToMap(VideoReturnDTO returnDTO){
+		redisTemplate.opsForHash().put(VIDEO_TASK_AI_RESULT, returnDTO.getVideo(), returnDTO);
+	}
+
+	/**
+	 * 从redis缓存中取出AI识别结果
+	 */
+	public VideoReturnDTO getAiResultFromMap(String video){
+		if(redisTemplate.opsForHash().hasKey(VIDEO_TASK_AI_RESULT, video)){
+			return (VideoReturnDTO)redisTemplate.opsForHash().get(VIDEO_TASK_AI_RESULT, video);
+		}
+		return null;
+	}
+
+
+
+	/**
+	 * 把任务加入redis提醒缓存列表中
+	 */
+	public void addTaskToVideoCacheList(TaskEntity task){
+		if(task.getAutoVideo().equals(PlanContants.InspectTypeEnum.VIDEO.getVal())){
+			redisTemplate.opsForHash().put(VIDEO_TASK_LIST, task.getId(), task);
+		}
+	}
+
+
+	/**
+	 * 把任务加入redis提醒缓存列表中
+	 */
+	public void deleteTaskFromCacheList(TaskEntity task){
+		redisTemplate.opsForHash().delete(VIDEO_TASK_LIST, task.getId());
+	}
+
+
+	/**
+	 *
+	 */
+	public void deleteTaskFromCacheList(String taskId){
+		redisTemplate.opsForHash().delete(VIDEO_TASK_LIST, taskId);
+	}
+
+	/**
+	 * 从缓存中取出当前时间加一分钟之前的所有数据
+	 */
+	public List<TaskEntity> getTasksFromCacheList(){
+		List<TaskEntity> tasks = new ArrayList<>();
+		HashMap<String, TaskEntity> map = (HashMap<String, TaskEntity>) redisTemplate.opsForHash().entries(VIDEO_TASK_LIST);
+		map.forEach((id, task) ->{
+			if(task.getPlanStartTime().isBefore(LocalDateTime.now().plusMinutes(1L))){
+				tasks.add(task);
+				deleteTaskFromCacheList(id);
+			}
+		});
+		return tasks;
+	}
+
+
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateProjectService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateProjectService.java
new file mode 100644
index 0000000..d67b8df
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateProjectService.java
@@ -0,0 +1,12 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+
+import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface TemplateProjectService extends BaseService<TemplateProjectEntity>{
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateService.java
new file mode 100644
index 0000000..f0e8005
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/TemplateService.java
@@ -0,0 +1,11 @@
+package com.hnac.hzims.scheduled.service.inspect;
+
+import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @author ysj
+ */
+public interface TemplateService extends BaseService<TemplateEntity> {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ContentServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ContentServiceImpl.java
new file mode 100644
index 0000000..b182d6e
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ContentServiceImpl.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.ContentMapper;
+import com.hnac.hzims.scheduled.service.inspect.ContentService;
+import com.hnac.hzinfo.inspect.obj.entity.ContentEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class ContentServiceImpl extends BaseServiceImpl<ContentMapper, ContentEntity> implements ContentService {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectServiceImpl.java
new file mode 100644
index 0000000..4aa787a
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectServiceImpl.java
@@ -0,0 +1,19 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.ObjectMapper;
+import com.hnac.hzims.scheduled.service.inspect.ObjectService;
+import com.hnac.hzinfo.inspect.obj.entity.ObjectEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class ObjectServiceImpl extends BaseServiceImpl<ObjectMapper, ObjectEntity> implements ObjectService {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectUserServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectUserServiceImpl.java
new file mode 100644
index 0000000..8f09fa0
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ObjectUserServiceImpl.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.ObjectUserMapper;
+import com.hnac.hzims.scheduled.service.inspect.ObjectUserService;
+import com.hnac.hzinfo.inspect.obj.entity.ObjectUserEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class ObjectUserServiceImpl extends BaseServiceImpl<ObjectUserMapper, ObjectUserEntity> implements ObjectUserService {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanObjectTemplateServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanObjectTemplateServiceImpl.java
new file mode 100644
index 0000000..4e63cdc
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanObjectTemplateServiceImpl.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.PlanObjectTemplateMapper;
+import com.hnac.hzims.scheduled.service.inspect.PlanObjectTemplateService;
+import com.hnac.hzinfo.inspect.plan.entity.PlanObjectTemplateEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class PlanObjectTemplateServiceImpl extends BaseServiceImpl<PlanObjectTemplateMapper, PlanObjectTemplateEntity> implements PlanObjectTemplateService {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanOrgServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanOrgServiceImpl.java
new file mode 100644
index 0000000..4606dad
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanOrgServiceImpl.java
@@ -0,0 +1,15 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.hnac.hzims.scheduled.mapper.inspect.PlanOrgMapper;
+import com.hnac.hzims.scheduled.service.inspect.PlanOrgService;
+import com.hnac.hzinfo.inspect.plan.entity.PlanOrgEntity;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ysj
+ */
+@Service
+public class PlanOrgServiceImpl extends BaseServiceImpl<PlanOrgMapper, PlanOrgEntity> implements PlanOrgService {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanPositionServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanPositionServiceImpl.java
new file mode 100644
index 0000000..2cff9b7
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanPositionServiceImpl.java
@@ -0,0 +1,22 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.PlanPositionMapper;
+import com.hnac.hzims.scheduled.service.inspect.PlanPositionService;
+import com.hnac.hzinfo.inspect.plan.entity.PlanPositionEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class PlanPositionServiceImpl extends BaseServiceImpl<PlanPositionMapper, PlanPositionEntity> implements PlanPositionService {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanServiceImpl.java
new file mode 100644
index 0000000..4ac6701
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanServiceImpl.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.PlanMapper;
+import com.hnac.hzims.scheduled.service.inspect.PlanService;
+import com.hnac.hzinfo.inspect.plan.entity.PlanEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class PlanServiceImpl extends BaseServiceImpl<PlanMapper, PlanEntity> implements PlanService {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanUserServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanUserServiceImpl.java
new file mode 100644
index 0000000..6364750
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanUserServiceImpl.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.PlanUserMapper;
+import com.hnac.hzims.scheduled.service.inspect.PlanUserService;
+import com.hnac.hzinfo.inspect.plan.entity.PlanUserEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class PlanUserServiceImpl extends BaseServiceImpl<PlanUserMapper, PlanUserEntity> implements PlanUserService {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectContentServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectContentServiceImpl.java
new file mode 100644
index 0000000..d71a052
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectContentServiceImpl.java
@@ -0,0 +1,22 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.ProjectContentMapper;
+import com.hnac.hzims.scheduled.service.inspect.ProjectContentService;
+import com.hnac.hzinfo.inspect.obj.entity.ProjectContentEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class ProjectContentServiceImpl extends BaseServiceImpl<ProjectContentMapper, ProjectContentEntity> implements ProjectContentService {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectServiceImpl.java
new file mode 100644
index 0000000..6da2ded
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/ProjectServiceImpl.java
@@ -0,0 +1,22 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.ProjectMapper;
+import com.hnac.hzims.scheduled.service.inspect.ProjectService;
+import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class ProjectServiceImpl extends BaseServiceImpl<ProjectMapper, ProjectEntity> implements ProjectService {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectContentServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectContentServiceImpl.java
new file mode 100644
index 0000000..f9eb13a
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectContentServiceImpl.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.TaskObjectProjectContentMapper;
+import com.hnac.hzims.scheduled.service.inspect.TaskObjectProjectContentService;
+import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class TaskObjectProjectContentServiceImpl extends BaseServiceImpl<TaskObjectProjectContentMapper, TaskObjectProjectContentEntity> implements TaskObjectProjectContentService {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectServiceImpl.java
new file mode 100644
index 0000000..7eeaf59
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectProjectServiceImpl.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.TaskObjectProjectMapper;
+import com.hnac.hzims.scheduled.service.inspect.TaskObjectProjectService;
+import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class TaskObjectProjectServiceImpl extends BaseServiceImpl<TaskObjectProjectMapper, TaskObjectProjectEntity> implements TaskObjectProjectService {
+
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectServiceImpl.java
new file mode 100644
index 0000000..6fdb9b1
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskObjectServiceImpl.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.TaskObjectMapper;
+import com.hnac.hzims.scheduled.service.inspect.TaskObjectService;
+import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class TaskObjectServiceImpl extends BaseServiceImpl<TaskObjectMapper, TaskObjectEntity> implements TaskObjectService {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskResultServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskResultServiceImpl.java
new file mode 100644
index 0000000..11f66c0
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskResultServiceImpl.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.TaskResultMapper;
+import com.hnac.hzims.scheduled.service.inspect.TaskResultService;
+import com.hnac.hzinfo.inspect.task.entity.TaskResultEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class TaskResultServiceImpl extends BaseServiceImpl<TaskResultMapper, TaskResultEntity> implements TaskResultService {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java
index e323d5b..bbebe02 100644
--- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskServiceImpl.java
@@ -1,18 +1,45 @@
 package com.hnac.hzims.scheduled.service.inspect.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
+import com.hnac.hzims.operational.duty.vo.ImsDutyMainFeignVO;
 import com.hnac.hzims.scheduled.mapper.inspect.TaskMapper;
-import com.hnac.hzims.scheduled.service.inspect.TaskService;
-import com.hnac.hzinfo.inspect.task.entity.TaskEntity;
+import com.hnac.hzims.scheduled.service.inspect.*;
+import com.hnac.hzims.scheduled.service.operation.DutyMainService;
+import com.hnac.hzinfo.inspect.obj.entity.*;
+import com.hnac.hzinfo.inspect.plan.PlanContants;
+import com.hnac.hzinfo.inspect.plan.entity.*;
+import com.hnac.hzinfo.inspect.task.TaskContants;
+import com.hnac.hzinfo.inspect.task.entity.*;
 import com.hnac.hzinfo.inspect.task.vo.DutyInspectTaskVO;
+import com.xxl.job.core.log.XxlJobLogger;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.CollectionUtil;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.WeekFields;
+import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -25,6 +52,687 @@ import java.util.stream.Collectors;
 @DS("inspect")
 public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, TaskEntity> implements TaskService {
 
+    private final PlanService planService;
+
+    private final ObjectService objectService;
+
+    private final PlanOrgService planOrgService;
+
+    private final ContentService contentService;
+
+    private final ProjectService projectService;
+
+    private final TemplateService templateService;
+
+    private final DutyMainService dutyMainService;
+
+    private final PlanUserService planUserService;
+
+    private final TaskUserService taskUserService;
+
+    private final ObjectUserService objectUserService;
+
+    private final TaskResultService taskResultService;
+
+    private final TaskObjectService taskObjectService;
+
+    private final PlanPositionService planPostionService;
+
+    private final ProjectContentService projectContentService;
+
+    private final TemplateProjectService templateProjectService;
+
+    private final TaskObjectProjectService taskObjectProjectService;
+
+    private final PlanObjectTemplateService planObjectTemplateService;
+
+    private final TaskObjectProjectContentService taskObjectProjectContentService;
+
+    private final TaskVideoManager taskVideoManager;
+
+    private final TaskRemindManager remindCacheManager;
+
+    private final IUserClient userClient;
+
+    /**
+     * 巡检任务派发
+     * @param param
+     */
+    @Override
+    public void inspectTaskDistribute(String param) {
+        // 清理无效任务
+        this.close();
+
+        // 派发任务状态前置修改
+        this.status();
+
+        // 遍历派发任务
+        this.distribute();
+    }
+
+
+    /**
+     * 清理无效任务
+     */
+    private void close() {
+        // 关闭超过计划结束时间 、已审核 、派发中的巡检计划
+        UpdateWrapper<PlanEntity> plan = new UpdateWrapper<>();
+        plan.lambda().set(PlanEntity::getStatus, Integer.valueOf(PlanContants.PlanStatusEnum.FINISH_STATUS.getStatus()))
+                .in(PlanEntity::getStatus, Integer.valueOf(PlanContants.PlanStatusEnum.PAUSE_STATUS.getStatus()), Integer.valueOf(PlanContants.PlanStatusEnum.CHECK_STATUS.getStatus()), Integer.valueOf(PlanContants.PlanStatusEnum.UNDERWAY_STATUS.getStatus()))
+                .lt(PlanEntity::getEndTime, LocalDate.now());
+        this.planService.update(plan);
+        //关闭超过计划结束时间的巡检任务
+        UpdateWrapper<TaskEntity> task = new UpdateWrapper<>();
+        task.lambda().set(TaskEntity::getStatus, Integer.valueOf(TaskContants.TaskStatusEnum.UNFINISH_STATUS.getStatus()))
+                .ne(TaskEntity::getStatus, Integer.valueOf(TaskContants.TaskStatusEnum.FINISH_STATUS.getStatus()))
+                .lt(TaskEntity::getPlanEndTime, LocalDate.now());
+        this.update(task);
+    }
+
+    /**
+     * 派发状态前置 : 已审核计划 且 已过计划开始时间
+     */
+    private void status() {
+        UpdateWrapper<PlanEntity> plan = new UpdateWrapper<>();
+        plan.lambda().set(PlanEntity::getStatus, Integer.valueOf(PlanContants.PlanStatusEnum.UNDERWAY_STATUS.getStatus()))
+                .eq(PlanEntity::getStatus, Integer.valueOf(PlanContants.PlanStatusEnum.CHECK_STATUS.getStatus()))
+                .le(PlanEntity::getStartTime, LocalDate.now());
+        this.planService.update(plan);
+    }
+
+    /**
+     * 派发任务
+     */
+    private void distribute() {
+        // 查询需要派发任务列表
+        List<PlanEntity> plans = planService.list(Wrappers.<PlanEntity>lambdaQuery()
+                .eq(PlanEntity::getStatus,Integer.valueOf(PlanContants.PlanStatusEnum.UNDERWAY_STATUS.getStatus())));
+        if(CollectionUtil.isEmpty(plans)){
+            return;
+        }
+        plans.forEach(plan->{
+            if(PlanContants.PlanCycleEnum.NEVER_CYCLE.getCycle().equals(plan.getCycle())){//计划周期每次，只需要派发一次任务
+                plan.setStatus(Integer.valueOf(PlanContants.PlanStatusEnum.FINISH_STATUS.getStatus()));
+                this.planService.updateById(plan);
+            }
+            if(PlanContants.PlanMethodEnum.SEIZE.getMethod().equals(plan.getMethod())){
+                // 抢占模式
+                this.seize(plan);
+            }else if(PlanContants.PlanMethodEnum.CONCURRENT.getMethod().equals(plan.getMethod())){
+                // 并发模式
+                this.concurrent(plan);
+            }
+        });
+    }
+
+
+    /**
+     * 抢占模式
+     * @param plan
+     */
+    private void seize(PlanEntity plan) {
+        // 计划班次模式
+        if("4".equals(plan.getType())){
+            this.seizeClass(plan);
+        }
+        // 其他模式
+        this.seizeOther(plan);
+    }
+
+    /**
+     * 并发模式
+     * @param plan
+     */
+    private void concurrent(PlanEntity plan) {
+        // 计划班次模式
+        if("4".equals(plan.getType())){
+            this.concurrentClass(plan);
+        }
+        // 其他模式
+        this.concurrentOther(plan);
+    }
+
+    /**
+     * 抢占-班次模式
+     * @param plan
+     */
+    private void seizeClass(PlanEntity plan) {
+        List<TaskUserEntity> taskUserList = Lists.newArrayList();
+
+        if(Func.isEmpty(plan.getExecTimeJson())){
+            XxlJobLogger.log("seizeClass_巡检计划未设置值班班次: plan = " + plan);
+            return;
+        }
+        JSONArray array = JSONArray.parseArray(plan.getExecTimeJson());
+        for (int index = 0; index < plan.getTaskTimesADay(); index++) {
+            // 取巡检任务执行开始、结束时间、是否下一天
+            JSONObject time = array.getJSONObject(index);
+            plan.setExecStartTime(time.get("execStartTime").toString());
+            plan.setExecEndTime(time.get("execEndTime").toString());
+            if(time.containsKey("isNextDay")){
+                plan.setIsNextDay(time.getBoolean("isNextDay"));
+            }
+            // 保存巡检任务
+            TaskEntity task = this.saveTask(plan,1);
+            if(ObjectUtil.isEmpty(task) || !time.containsKey("classId")){
+                XxlJobLogger.log("seizeClass_任务执行时间json数据不包含classId");
+                continue;
+            }
+            // 查询值班数据
+            ImsDutyMainFeignVO main = dutyMainService.mainPerson(time.getLong("classId"), DateUtil.format(LocalDate.now(),DateUtil.PATTERN_DATE));
+            if(ObjectUtil.isNotEmpty(main) && CollectionUtil.isNotEmpty(main.getPersons())){
+                plan.setDutyId(main.getMainId());
+                main.getPersons().forEach(persons->{
+                    // 任务用户关联记录
+                    TaskUserEntity taskUser = TaskUserEntity.builder().taskId(task.getId()).userId(persons).claimStatus(TaskContants.ClaimStatusEnum.UN_COLLECT.getStatus()).build();
+                    taskUser.setTenantId(plan.getTenantId());
+                    taskUserList.add(taskUser);
+                    //添加到提醒cache
+                    task.setUserId(persons);
+                    remindCacheManager.addTaskToCacheList(task);
+                    taskVideoManager.addTaskToVideoCacheList(task);
+                });
+            }
+            String reason  = this.saveTaskObject(plan,task);
+            if(reason.equals(StringUtils.EMPTY)){
+                LocalDateTime now = LocalDateTime.now();
+                reason = plan.getName() + now.getYear() + "年" + now.getMonthValue() + "月" + now.getDayOfMonth() + "日的任务派发成功";
+            }
+            XxlJobLogger.log(reason);
+            TaskResultEntity taskResultEntity = TaskResultEntity.builder().planId(task.getPlanId()).batchNumber(task.getBatchNumber()).reason(reason).build();
+            taskResultEntity.setTenantId(plan.getTenantId());
+            taskResultService.save(taskResultEntity);
+        }
+        if(taskUserList.size()>0){
+            taskUserService.saveBatch(taskUserList);
+        }
+    }
+
+
+    /**
+     * 抢占-其他模式
+     * @param plan
+     */
+    private void seizeOther(PlanEntity plan) {
+        List<PlanUserEntity> users = this.getUsersByPlan(plan);
+        List<TaskUserEntity> taskUserList = Lists.newArrayList();
+
+        JSONArray timeJsonArray = null;
+        if(Func.isNotEmpty(plan.getExecTimeJson())){
+            timeJsonArray = JSON.parseArray(plan.getExecTimeJson());
+        }
+        for (int j = 0; j < plan.getTaskTimesADay(); j++) {
+            if(Func.isNotEmpty(timeJsonArray)){
+                JSONObject time = timeJsonArray.getJSONObject(j);
+                plan.setExecStartTime(time.get("execStartTime").toString());
+                plan.setExecEndTime(time.get("execEndTime").toString());
+                if(time.containsKey("isNextDay")){
+                    plan.setIsNextDay(time.getBoolean("isNextDay"));
+                }
+            } else {
+                plan.setExecStartTime("00:00:00");
+                plan.setExecEndTime("23:59:59");
+            }
+            TaskEntity task = this.saveTask(plan,1);
+            if(task==null){continue;}
+            for(PlanUserEntity user:users){
+                TaskUserEntity taskUser = TaskUserEntity.builder().taskId(task.getId()).userId(user.getUserId()).claimStatus(TaskContants.ClaimStatusEnum.UN_COLLECT.getStatus()).build();
+                taskUser.setTenantId(plan.getTenantId());
+                taskUserList.add(taskUser);
+                //添加到提醒cache
+                task.setUserId(user.getUserId());
+                remindCacheManager.addTaskToCacheList(task);
+                taskVideoManager.addTaskToVideoCacheList(task);
+            }
+            String reason  = this.saveTaskObject(plan,task);
+            if(reason.equals(StringUtils.EMPTY)){
+                LocalDateTime now = LocalDateTime.now();
+                reason = plan.getName() + now.getYear() + "年" + now.getMonthValue() + "月" + now.getDayOfMonth() + "日的任务派发成功";
+            }
+            XxlJobLogger.log(reason);
+            TaskResultEntity taskResultEntity = TaskResultEntity.builder().planId(task.getPlanId()).batchNumber(task.getBatchNumber()).reason(reason).build();
+            taskResultEntity.setTenantId(plan.getTenantId());
+            taskResultService.save(taskResultEntity);
+        }
+
+        if(taskUserList.size()>0){
+            taskUserService.saveBatch(taskUserList);
+        } else {
+            XxlJobLogger.log("没有用户: plan = " + plan);
+            XxlJobLogger.log("SeizeTaskService...没有任务用户: plan = " + plan);
+        }
+    }
+
+
+    /**
+     * 并发-班次模式
+     * @param plan
+     */
+    private void concurrentClass(PlanEntity plan) {
+        List<TaskUserEntity> taskUserList = Lists.newArrayList();
+
+        LocalDateTime now = LocalDateTime.now();
+        String defaultReason = plan.getName() + now.getYear() + "年" + now.getMonthValue() + "月" + now.getDayOfMonth() + "日的任务派发成功";
+        JSONArray timeJsonArray;
+        if (Func.isNotEmpty(plan.getExecTimeJson())) {
+            timeJsonArray = JSON.parseArray(plan.getExecTimeJson());
+        } else {
+            XxlJobLogger.log("巡检计划未设置值班班次: plan = " + plan);
+            return;
+        }
+        for (int j = 0; j < plan.getTaskTimesADay(); j++) {
+            JSONObject time = timeJsonArray.getJSONObject(j);
+            plan.setExecStartTime(time.get("execStartTime").toString());
+            plan.setExecEndTime(time.get("execEndTime").toString());
+            if (time.containsKey("isNextDay")) {
+                plan.setIsNextDay(time.getBoolean("isNextDay"));
+            }
+
+            //获取值班用户
+            if (time.containsKey("classId")) {
+                Long classId = time.getLong("classId");
+                DateTimeFormatter dfShort = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                ImsDutyMainFeignVO mainPerson = dutyMainService.mainPerson(classId, dfShort.format(LocalDate.now()));
+                List<Long> ids = mainPerson.getPersons();
+                plan.setDutyId(mainPerson.getMainId());
+                if (Func.isNotEmpty(ids)) {
+                    for (Long id : ids) {
+                        TaskEntity task = saveTask(plan, ids.size());
+                        if (task == null) {
+                            continue;
+                        }
+                        TaskUserEntity taskUser = TaskUserEntity.builder().taskId(task.getId()).userId(id).claimStatus(TaskContants.ClaimStatusEnum.UN_COLLECT.getStatus()).build();
+                        taskUser.setTenantId(plan.getTenantId());
+                        taskUserList.add(taskUser);
+                        String reason = saveTaskObject(plan, task);
+                        if (reason.equals(StringUtils.EMPTY)) {
+                            reason = defaultReason;
+                        }
+
+                        XxlJobLogger.log(reason);
+                        TaskResultEntity taskResultEntity = TaskResultEntity.builder().planId(task.getPlanId()).batchNumber(task.getBatchNumber()).reason(reason).build();
+                        taskResultEntity.setTenantId(plan.getTenantId());
+                        taskResultService.save(taskResultEntity);
+
+                        //添加到提醒cache
+                        task.setUserId(id);
+                        remindCacheManager.addTaskToCacheList(task);
+                        taskVideoManager.addTaskToVideoCacheList(task);
+                    }
+                } else {
+                    XxlJobLogger.log("获取该班次值班人员为空, plan = " + plan);
+                    return;
+                }
+            } else {
+                XxlJobLogger.log("巡检计划未设置值班班次, plan = " + plan);
+                return;
+            }
+        }
+        if (taskUserList.size() > 0) {
+            taskUserService.saveBatch(taskUserList);
+        }
+    }
+
+    /**
+     * 并发其他模式
+     * @param plan
+     */
+    private void concurrentOther(PlanEntity plan) {
+        LocalDateTime now = LocalDateTime.now();
+        String defaultReason = plan.getName() + now.getYear() + "年" + now.getMonthValue() + "月" + now.getDayOfMonth() + "日的任务派发成功";
+        List<PlanUserEntity> users = this.getUsersByPlan(plan);
+        List<TaskUserEntity> taskUserList = Lists.newArrayList();
+
+        JSONArray timeJsonArray = null;
+        if (Func.isNotEmpty(plan.getExecTimeJson())) {
+            timeJsonArray = JSON.parseArray(plan.getExecTimeJson());
+        }
+        for (PlanUserEntity user : users) {
+            for (int j = 0; j < plan.getTaskTimesADay(); j++) {
+                if (Func.isNotEmpty(timeJsonArray)) {
+                    JSONObject time = timeJsonArray.getJSONObject(j);
+                    plan.setExecStartTime(time.get("execStartTime").toString());
+                    plan.setExecEndTime(time.get("execEndTime").toString());
+                    if (time.containsKey("isNextDay")) {
+                        plan.setIsNextDay(time.getBoolean("isNextDay"));
+                    }
+                } else {
+                    plan.setExecStartTime("00:00:00");
+                    plan.setExecEndTime("23:59:59");
+                }
+                TaskEntity task = saveTask(plan, users.size());
+                if (task == null) {
+                    continue;
+                }
+                TaskUserEntity taskUser = TaskUserEntity.builder().taskId(task.getId()).userId(user.getId()).claimStatus(TaskContants.ClaimStatusEnum.UN_COLLECT.getStatus()).build();
+                taskUser.setTenantId(plan.getTenantId());
+                taskUserList.add(taskUser);
+                String reason = saveTaskObject(plan, task);
+                if (reason.equals(StringUtils.EMPTY)) {
+                    reason = defaultReason;
+                }
+                XxlJobLogger.log(reason);
+
+                TaskResultEntity taskResultEntity = TaskResultEntity.builder().planId(task.getPlanId()).batchNumber(task.getBatchNumber()).reason(reason).build();
+                taskResultEntity.setTenantId(plan.getTenantId());
+                taskResultService.save(taskResultEntity);
+
+                //添加到提醒cache
+                task.setUserId(user.getUserId());
+                remindCacheManager.addTaskToCacheList(task);
+                taskVideoManager.addTaskToVideoCacheList(task);
+            }
+        }
+        if (taskUserList.size() > 0) {
+            taskUserService.saveBatch(taskUserList);
+        } else {
+            log.error("ConcurrentTaskServcie...没有任务用户: plan = " + plan);
+            XxlJobLogger.log("ConcurrentTaskServcie...没有任务用户: plan = " + plan);
+        }
+    }
+
+    /**
+     * 根据巡检计划返回与计划有关的所有用户
+     * @param plan 巡检计划实例
+     * @return 计划相关用户集合
+     */
+    public List<PlanUserEntity> getUsersByPlan(PlanEntity plan) {
+        List<PlanUserEntity> res = new LinkedList<>();
+        if(PlanContants.PlanTypeEnum.USER_TYPE.getType().equals(plan.getType()) || PlanContants.PlanTypeEnum.FREE_TYPE.getType().equals(plan.getType())){
+            QueryWrapper<PlanUserEntity> planUserQw = new QueryWrapper<>();
+            planUserQw.lambda().eq(PlanUserEntity::getPlanId, plan.getId());
+            res.addAll(planUserService.list(planUserQw));
+        }else if(PlanContants.PlanTypeEnum.POSITION_TYPE.getType().equals(plan.getType())){
+            QueryWrapper<PlanPositionEntity> planPositionEntityQueryWrapper = new QueryWrapper<>();
+            planPositionEntityQueryWrapper.lambda().eq(PlanPositionEntity::getPlanId, plan.getId());
+            planPostionService.list(planPositionEntityQueryWrapper).forEach(entity->{
+                //获取该机构下所有用户列表
+                List<User> users = new ArrayList<>();
+                List<User> positionUsers = userClient.userListByPosition(entity.getPositionId()).getData();
+                if(CollectionUtil.isNotEmpty(positionUsers)){
+                    users = positionUsers.stream().filter(user->user.getCreateDept().toString().contains(entity.getCreateDept().toString())).collect(Collectors.toList());
+                }
+                XxlJobLogger.log("岗位信息：" + entity + "; 获取到的user:{}",users.stream().map(User::getName).collect(Collectors.joining(",")));
+                for(User u:users){
+                    res.add(PlanUserEntity.builder().planId(plan.getId()).userId(u.getId()).build());
+                }
+            });
+        }else if(PlanContants.PlanTypeEnum.ORG_TYPE.getType().equals(plan.getType())){
+            QueryWrapper<PlanOrgEntity> planOrgEntityQueryWrapper = new QueryWrapper<>();
+            planOrgEntityQueryWrapper.lambda().eq(PlanOrgEntity::getPlanId, plan.getId());
+            planOrgService.list(planOrgEntityQueryWrapper).forEach(entity->{
+                List<User> users = userClient.userListByDeptId(entity.getOrgId()).getData();
+                for(User u:users){
+                    res.add(PlanUserEntity.builder().planId(plan.getId()).userId(u.getId()).build());
+                }
+            });
+        }else if(PlanContants.PlanTypeEnum.CLASS_TYPE.getType().equals(plan.getType())){
+            XxlJobLogger.log("巡检计划为班次时，有单独的处理流程，不应该跑到该分支下面来, plan = " + plan);
+            JSONArray timeJsonArray;
+            if(Func.isNotEmpty(plan.getExecTimeJson())){
+                timeJsonArray = JSON.parseArray(plan.getExecTimeJson());
+            }
+            else{
+                throw new ServiceException("巡检计划未设置值班班次: plan = " + plan);
+            }
+            for(int i=0;i<plan.getTaskTimesADay();i++){
+                JSONObject time = timeJsonArray.getJSONObject(i);
+                plan.setExecStartTime(time.get("execStartTime").toString());
+                plan.setExecEndTime(time.get("execEndTime").toString());
+                if (time.containsKey("isNextDay")) {
+                    plan.setIsNextDay(time.getBoolean("isNextDay"));
+                }
+                //获取值班用户
+                if (time.containsKey("classId")) {
+                    DateTimeFormatter dfShort = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                    ImsDutyMainFeignVO mainPerson = dutyMainService.mainPerson(time.getLong("classId"), dfShort.format(LocalDate.now()));
+                    List<Long> ids =  mainPerson.getPersons();
+                    log.info("--计划为：{}；人员ID为：{}--",plan.getName(),ids.stream().map(String::valueOf).collect(Collectors.joining(",")));
+                    plan.setDutyId(mainPerson.getMainId());
+                    if(Func.isNotEmpty(ids)){
+                        for (Long id : ids) {
+                            res.add(PlanUserEntity.builder().planId(plan.getId()).userId(id).build());
+                        }
+                    } else {
+                        XxlJobLogger.log("获取该班次值班人员为空, plan = " + plan);
+                    }
+                }
+            }
+        }
+        //设置租户
+        return res.stream().distinct().peek(entity-> entity.setTenantId(plan.getTenantId())).collect(Collectors.toList());
+    }
+
+    /**
+     * 保存巡检任务
+     * @param plan 巡检计划
+     * @param totalTaskNum 任务数 : 抢占任务只生成一个
+     * @return 巡检任务实例
+     */
+    public TaskEntity saveTask(PlanEntity plan,int totalTaskNum) {
+        totalTaskNum = plan.getTaskTimesADay() * totalTaskNum;
+        TaskEntity task = new TaskEntity();
+        LocalDate now = LocalDate.now();
+        DateTimeFormatter dfShort = DateTimeFormatter.ofPattern("yyyy-MM-dd ");
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        if(PlanContants.PlanCycleEnum.NEVER_CYCLE.getCycle().equals(plan.getCycle())) {
+            task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue()+ "_" +now.getDayOfMonth() + "N");
+            task.setPlanEndTime(LocalDateTime.parse(dfShort.format(plan.getEndTime())+plan.getExecEndTime(), df));
+        }else if(PlanContants.PlanCycleEnum.EVERYDAY_CYCLE.getCycle().equals(plan.getCycle())) {
+            task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue()+ "_" +now.getDayOfMonth());
+            if(Func.isNotEmpty(plan.getIsNextDay()) && plan.getIsNextDay()){
+                task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusDays(1L)) + plan.getExecEndTime(), df));
+            } else {
+                task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now) + plan.getExecEndTime(), df));
+            }
+        }else if(PlanContants.PlanCycleEnum.EVERYWEEK_CYCLE.getCycle().equals(plan.getCycle())) {
+            WeekFields weekFields = WeekFields.of(DayOfWeek.MONDAY,1);
+            int weeks = now.get(weekFields.weekOfYear());
+            task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue() +  "_" +weeks + "W");
+            task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusWeeks(1)) + plan.getExecEndTime(), df));
+        }else if(PlanContants.PlanCycleEnum.EVERYMONTH_CYCLE.getCycle().equals(plan.getCycle())) {
+            task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue());
+            task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusMonths(1))+plan.getExecEndTime(), df));
+        }else if(PlanContants.PlanCycleEnum.EVERYQUARTER_CYCLE.getCycle().equals(plan.getCycle())) {
+            task.setBatchNumber(now.getYear()+ "_" +now.getMonthValue() + "Q");
+            task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusMonths(3)) + plan.getExecEndTime(), df));
+        }else if(PlanContants.PlanCycleEnum.EVERYYEAR_CYCLE.getCycle().equals(plan.getCycle())){
+            task.setBatchNumber(String.valueOf(now.getYear()));
+            task.setPlanEndTime(LocalDateTime.parse(dfShort.format(now.plusYears(1))+plan.getExecEndTime(), df));
+        }
+        if(PlanContants.PlanCycleEnum.NEVER_CYCLE.getCycle().equals(plan.getCycle())) {
+            task.setPlanStartTime(LocalDateTime.parse(dfShort.format(plan.getStartTime()) + plan.getExecStartTime(), df));
+        } else {
+            task.setPlanStartTime(LocalDateTime.parse(dfShort.format(now) + plan.getExecStartTime(), df));
+        }
+        task.setDutyId(plan.getDutyId());
+        task.setPlanId(plan.getId());
+        task.setPlanName(plan.getName());
+        task.setType(plan.getType());
+        task.setCycle(plan.getCycle());
+        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());
+        task.setMessageTemplateId(plan.getMessageTemplateId());
+        task.setMethod(plan.getMethod());
+        task.setEndRemindFlag(true);
+        task.setStartRemindFlag(true);
+        task.setStartRemindTime(task.getPlanStartTime().minusMinutes(plan.getStartRemind()));
+        task.setEndRemindTime(task.getPlanEndTime().minusMinutes(plan.getEndRemind()));
+        int taskCount = this.count(Wrappers.<TaskEntity>query().lambda().eq(TaskEntity::getPlanId,task.getPlanId()).eq(TaskEntity::getBatchNumber, task.getBatchNumber()));
+        XxlJobLogger.log("该计划已生成计划批次：{},数量：{}",task.getBatchNumber(),taskCount);
+        if(taskCount >= totalTaskNum){
+            log.info("计划id={}本周期batchNumber={}的任务已生成",plan.getId(),task.getBatchNumber());
+            return null;
+        }
+        this.save(task);
+        return task;
+    }
+
+    /**
+     * 保存巡检对象数据
+     * @param plan 巡检计划实例
+     * @param task 巡检任务实例
+     * @return
+     */
+    public String saveTaskObject(PlanEntity plan, TaskEntity task) {
+        String result = StringUtils.EMPTY;
+        List<TaskObjectEntity> taskObjectList = Lists.newArrayList();
+        // 自由模式
+        if(PlanContants.PlanTypeEnum.FREE_TYPE.getType().equals(plan.getType())){
+            // 查询计划用户
+            List<PlanUserEntity> planUsers = planUserService.list(Wrappers.<PlanUserEntity>query().lambda().eq(PlanUserEntity::getPlanId,plan.getId()));
+            if(CollectionUtil.isEmpty(planUsers)){
+                return result;
+            }
+            for(PlanUserEntity planUser : planUsers){
+                // 查询巡检对象用户
+                List<ObjectUserEntity> objectUsers= objectUserService.list(Wrappers.<ObjectUserEntity>query().lambda().eq(ObjectUserEntity::getUserId,planUser.getUserId()));
+                if(CollectionUtil.isEmpty(objectUsers)){
+                    break;
+                }
+                for (ObjectUserEntity objectUser : objectUsers){
+                    List<TaskObjectEntity> existEntity = taskObjectList.stream().filter(taskObjectEntity -> objectUser.getObjectId().equals(taskObjectEntity.getObjectId())).collect(Collectors.toList());
+                    if(ObjectUtil.isNotEmpty(existEntity)){
+                        break;
+                    }
+                    // 保存巡检对象
+                    result = saveTaskObject(taskObjectList,task,objectUser.getObjectId(),objectUser.getTemplateId());
+                    if(!result.equals(StringUtils.EMPTY)){
+                        break;
+                    }
+                }
+            }
+        }else{
+            List<PlanObjectTemplateEntity> templates = planObjectTemplateService.list(Wrappers.<PlanObjectTemplateEntity>query().lambda().eq(PlanObjectTemplateEntity::getPlanId,plan.getId()));
+            for (PlanObjectTemplateEntity template : templates) {
+                result = saveTaskObject(taskObjectList,task,template.getObjectId(),template.getTemplateId());
+                if(!result.equals(StringUtils.EMPTY)){
+                    break;
+                }
+            }
+        }
+        if(taskObjectList.size()>0 && result.equals(StringUtils.EMPTY)){
+            taskObjectService.saveBatch(taskObjectList);
+        }
+        return result;
+    }
+
+    /**
+     * 保存巡检对象
+     * @param taskObjectList
+     * @param task
+     * @param objectId
+     * @param templateId
+     * @return
+     */
+    private String saveTaskObject(List<TaskObjectEntity> taskObjectList,TaskEntity task,Long objectId,Long templateId){
+        String result = StringUtils.EMPTY;
+        ObjectEntity io = objectService.getById(objectId);
+        if(io == null) {
+            return "巡检对象id="+objectId+"找不到记录";
+        }
+        TemplateEntity templateInfo = templateService.getById(templateId);
+        if(templateInfo == null) {
+            return "巡检模板id="+templateId+"找不到记录";
+        }
+        TaskObjectEntity ito = new TaskObjectEntity();
+        ito.setTaskId(task.getId());
+        ito.setObjectId(objectId);
+        ito.setCode(io.getCode());
+        ito.setName(io.getName());
+        ito.setAddress(io.getAddress());
+        ito.setLttd(io.getLttd());
+        ito.setLgtd(io.getLgtd());
+        ito.setCreateUser(task.getCreateUser());
+        ito.setCreateDept(task.getCreateDept());
+        ito.setCreateTime(task.getCreateTime());
+        ito.setDuplicateRecord(templateInfo.getDuplicateRecord());
+        ito.setTenantId(task.getTenantId());
+        ito.setStatus(TaskContants.StatusEnum.INIT_STATUS.getStatus());
+        taskObjectList.add(ito);
+        List<TemplateProjectEntity> projects = templateProjectService.list(Wrappers.<TemplateProjectEntity>query().lambda().eq(TemplateProjectEntity::getTemplateId,templateId));
+        for (TemplateProjectEntity project : projects) {
+            result = saveTaskObjectProject(task, objectId, project);
+            if(!result.equals(StringUtils.EMPTY)){
+                break;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 从巡检任务、巡检计划对象模板、巡检模板项目获取信息插入巡检任务项目表以及对应的历史数据表
+     * @param objectId 巡检计划对象模板实例
+     * @param project 巡检模板项目实例
+     * @return
+     */
+    private String saveTaskObjectProject(TaskEntity task, Long objectId, TemplateProjectEntity project) {
+        String result = StringUtils.EMPTY;
+        ProjectEntity ip = projectService.getById(project.getProjectId());
+        if(ip == null) {
+            return "巡检项目id="+project.getProjectId()+"找不到记录";
+        }
+        TaskObjectProjectEntity itop = new TaskObjectProjectEntity();
+        itop.setObjectId(objectId);
+        itop.setProjectId(ip.getId());
+        itop.setTaskId(task.getId());
+        itop.setName(ip.getName());
+        itop.setCode(ip.getCode());
+        itop.setDescription(ip.getDescription());
+        itop.setCreateTime(project.getCreateTime());
+        itop.setTenantId(task.getTenantId());
+        itop.setCreateUser(task.getCreateUser());
+        itop.setCreateDept(task.getCreateDept());
+        itop.setStatus(TaskContants.StatusEnum.INIT_STATUS.getStatus());
+        taskObjectProjectService.save(itop);
+        List<ProjectContentEntity> contents = projectContentService.list(Wrappers.<ProjectContentEntity>query().lambda().eq(ProjectContentEntity::getProjectId,project.getProjectId()));
+        for (ProjectContentEntity content : contents) {
+            result = saveTaskObjectProjectContent(task, objectId, content);
+            if(!result.equals(StringUtils.EMPTY)){
+                break;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 从巡检任务、巡检计划对象模板、巡检项目内容获取信息插入巡检任务内容表以及对应的历史数据表
+     * @param objectId 巡检计划对象模板实例
+     * @param content 巡检项目内容实例
+     * @return
+     */
+    private String saveTaskObjectProjectContent(TaskEntity task, Long objectId, ProjectContentEntity content) {
+        ContentEntity ioc = contentService.getById(content.getContentId());
+        if(ioc == null) {return "巡检内容id="+content.getContentId()+"找不到记录";}
+        TaskObjectProjectContentEntity itopc = new TaskObjectProjectContentEntity();
+        itopc.setTaskId(task.getId());
+        itopc.setObjectId(objectId);
+        itopc.setProjectId(content.getProjectId());
+        itopc.setContentId(content.getContentId());
+        itopc.setCode(ioc.getCode());
+        itopc.setName(ioc.getName());
+        itopc.setDescription(ioc.getDescription());
+        itopc.setCheckType(ioc.getCheckType());
+        itopc.setRecordType(ioc.getRecordType());
+        itopc.setCreateTime(content.getCreateTime());
+        itopc.setTenantId(task.getTenantId());
+        itopc.setCreateUser(task.getCreateUser());
+        itopc.setCreateDept(task.getCreateDept());
+        itopc.setCheckTypeSon(ioc.getCheckTypeSon());
+        itopc.setCameraAddr(ioc.getCameraAddr());
+        itopc.setCameraId(ioc.getCameraId());
+        itopc.setClockId(ioc.getClockId());
+        itopc.setOtherParam(ioc.getOtherParam());
+        itopc.setStatus(TaskContants.StatusEnum.INIT_STATUS.getStatus());
+        itopc.setDictType(ioc.getDictType());
+        taskObjectProjectContentService.save(itopc);
+        return StringUtils.EMPTY;
+    }
+
     /**
      * 时间区间机构的巡检任务数据查询
      * @param start
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskUserServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskUserServiceImpl.java
new file mode 100644
index 0000000..baf26c8
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TaskUserServiceImpl.java
@@ -0,0 +1,23 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.TaskUserMapper;
+import com.hnac.hzims.scheduled.service.inspect.TaskUserService;
+import com.hnac.hzinfo.inspect.task.entity.TaskUserEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class TaskUserServiceImpl extends BaseServiceImpl<TaskUserMapper, TaskUserEntity> implements TaskUserService {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateProjectServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateProjectServiceImpl.java
new file mode 100644
index 0000000..f970386
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateProjectServiceImpl.java
@@ -0,0 +1,21 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.TemplateProjectMapper;
+import com.hnac.hzims.scheduled.service.inspect.TemplateProjectService;
+import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class TemplateProjectServiceImpl extends BaseServiceImpl<TemplateProjectMapper, TemplateProjectEntity> implements TemplateProjectService {
+
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateServiceImpl.java
new file mode 100644
index 0000000..f4b5b41
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/TemplateServiceImpl.java
@@ -0,0 +1,20 @@
+package com.hnac.hzims.scheduled.service.inspect.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hnac.hzims.scheduled.mapper.inspect.TemplateMapper;
+import com.hnac.hzims.scheduled.service.inspect.TemplateService;
+import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author ysj
+ */
+@Service
+@Slf4j
+@AllArgsConstructor
+@DS("inspect")
+public class TemplateServiceImpl extends BaseServiceImpl<TemplateMapper, TemplateEntity> implements TemplateService {
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DutyMainService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DutyMainService.java
new file mode 100644
index 0000000..1fe0e7e
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/DutyMainService.java
@@ -0,0 +1,13 @@
+package com.hnac.hzims.scheduled.service.operation;
+
+import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity;
+import com.hnac.hzims.operational.duty.vo.ImsDutyMainFeignVO;
+import org.springblade.core.mp.base.BaseService;
+
+
+/**
+ * @author ysj
+ */
+public interface DutyMainService extends BaseService<ImsDutyMainEntity> {
+    ImsDutyMainFeignVO mainPerson(Long classId, String date);
+}
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DutyMainServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DutyMainServiceImpl.java
new file mode 100644
index 0000000..a49a30d
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/impl/DutyMainServiceImpl.java
@@ -0,0 +1,44 @@
+package com.hnac.hzims.scheduled.service.operation.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity;
+import com.hnac.hzims.operational.duty.vo.ImsDutyMainFeignVO;
+import com.hnac.hzims.scheduled.mapper.operation.DutyMainMapper;
+import com.hnac.hzims.scheduled.service.operation.DutyMainService;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 服务实现类
+ *
+ * @author Chill
+ */
+@Service
+@Slf4j
+public class DutyMainServiceImpl extends BaseServiceImpl<DutyMainMapper, ImsDutyMainEntity> implements DutyMainService {
+
+
+    @Override
+    public ImsDutyMainFeignVO mainPerson(Long classId, String date) {
+        ImsDutyMainEntity entity = this.getOne(new LambdaQueryWrapper<ImsDutyMainEntity>() {{
+            eq(ImsDutyMainEntity::getDutyDate, date);
+            eq(ImsDutyMainEntity::getClassId, classId);
+        }});
+        if(ObjectUtil.isEmpty(entity)){
+           return new ImsDutyMainFeignVO();
+        }
+        ImsDutyMainFeignVO main = new ImsDutyMainFeignVO();
+        main.setMainId(entity.getId());
+        String[] persons = entity.getDutyPersonIds().split("\\^");
+        //string 转为  long
+        List<Long> personList = Arrays.stream(persons).map(person -> Long.parseLong(person.trim())).collect(Collectors.toList());
+        main.setPersons(personList);
+        return main;
+    }
+}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ContentMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ContentMapper.xml
new file mode 100644
index 0000000..e68eb88
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ContentMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.ContentMapper">
+
+</mapper>
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/DutyMainMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/DutyMainMapper.xml
new file mode 100644
index 0000000..3ce9fcd
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/DutyMainMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hnac.hzims.scheduled.mapper.operation.DutyMainMapper">
+    <resultMap id="BaseResultMap" type="com.hnac.hzims.operational.duty.entity.ImsDutyMainEntity">
+        <id column="ID" property="id" jdbcType="BIGINT"/>
+        <result column="TENANT_ID" property="tenantId" jdbcType="VARCHAR"/>
+        <result column="DUTY_PERSON_IDS" property="dutyPersonIds" jdbcType="LONGVARCHAR"/>
+        <result column="DUTY_DATE" property="dutyDate" jdbcType="DATE"/>
+        <result column="CLASS_ID" property="classId" jdbcType="BIGINT"/>
+        <result column="DUTY_GROUP_ID" property="dutyGroupId" jdbcType="BIGINT"/>
+        <result column="CLASS_NAME" property="className" jdbcType="VARCHAR"/>
+        <result column="STATUS" property="status" jdbcType="TINYINT"/>
+        <result column="REMARK" property="remark" jdbcType="LONGVARCHAR"/>
+        <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="CREATE_USER" property="createUser" jdbcType="BIGINT"/>
+        <result column="UPDATE_USER" property="updateUser" jdbcType="BIGINT"/>
+        <result column="IS_DELETED" property="isDeleted" jdbcType="TINYINT"/>
+        <result column="CREATE_DEPT" property="createDept" jdbcType="BIGINT"/>
+    </resultMap>
+</mapper>
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectMapper.xml
new file mode 100644
index 0000000..d50799a
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.ObjectMapper">
+
+</mapper>
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectUserMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectUserMapper.xml
new file mode 100644
index 0000000..66a295e
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ObjectUserMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.ObjectUserMapper">
+
+</mapper>
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanMapper.xml
new file mode 100644
index 0000000..09f72d8
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.PlanMapper">
+
+</mapper>
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanObjectTemplateMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanObjectTemplateMapper.xml
new file mode 100644
index 0000000..1d0d4b3
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanObjectTemplateMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.PlanObjectTemplateMapper">
+
+</mapper>
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanOrgMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanOrgMapper.xml
new file mode 100644
index 0000000..667ee81
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanOrgMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.PlanOrgMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanPositionMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanPositionMapper.xml
new file mode 100644
index 0000000..7d8f0e9
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanPositionMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.PlanPositionMapper">
+
+</mapper>
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanUserMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanUserMapper.xml
new file mode 100644
index 0000000..3e8602b
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/PlanUserMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.PlanUserMapper">
+
+</mapper>
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ProjectContentMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ProjectContentMapper.xml
new file mode 100644
index 0000000..56170b0
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ProjectContentMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.ProjectContentMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ProjectMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ProjectMapper.xml
new file mode 100644
index 0000000..88668db
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/ProjectMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.ProjectMapper">
+
+</mapper>
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskMapper.xml
index 9acf610..e2899b8 100644
--- a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskMapper.xml
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskMapper.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.TaskMapper">
-</mapper>
+
+</mapper>
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectMapper.xml
new file mode 100644
index 0000000..6d89084
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.TaskObjectMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectProjectContentMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectProjectContentMapper.xml
new file mode 100644
index 0000000..ad59b3e
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectProjectContentMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.TaskObjectProjectContentMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectProjectMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectProjectMapper.xml
new file mode 100644
index 0000000..eb355f8
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskObjectProjectMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.TaskObjectProjectMapper">
+
+
+</mapper>
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskResultMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskResultMapper.xml
new file mode 100644
index 0000000..e2986ad
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskResultMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.TaskResultMapper">
+
+</mapper>
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskUserMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskUserMapper.xml
new file mode 100644
index 0000000..ca9da30
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TaskUserMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.TaskUserMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TemplateMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TemplateMapper.xml
new file mode 100644
index 0000000..7096dd1
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TemplateMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.TemplateMapper">
+
+</mapper>
diff --git a/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TemplateProjectMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TemplateProjectMapper.xml
new file mode 100644
index 0000000..b4ab0b8
--- /dev/null
+++ b/hzims-service/hzims-scheduled/src/main/resources/mapper/inspect/TemplateProjectMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.hnac.hzims.scheduled.mapper.inspect.TemplateProjectMapper">
+
+</mapper>
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java
index a757c26..e2912b5 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java
@@ -2,15 +2,13 @@ package com.hnac.hzinfo.inspect.ai.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hnac.hzinfo.inspect.ai.AIContants;
-import com.hnac.hzinfo.inspect.ai.dto.AIData;
-import com.hnac.hzinfo.inspect.ai.dto.VideoReturnDTO;
+import com.hnac.hzinfo.inspect.ai.vo.AIData;
+import com.hnac.hzinfo.inspect.ai.vo.VideoReturnDTO;
 import com.hnac.hzinfo.inspect.ai.entity.RobotTaskIdentifyEntity;
 import com.hnac.hzinfo.inspect.ai.service.IClockService;
 import com.hnac.hzinfo.inspect.ai.service.IRobotTaskIdentifyService;
-import com.hnac.hzinfo.inspect.ai.util.BigDecimalUtil;
 import com.hnac.hzinfo.inspect.ai.util.CommonUtil;
 import com.hnac.hzinfo.inspect.ai.util.EndianUtil;
 import com.hnac.hzinfo.inspect.ai.vo.RobotTaskVO;
@@ -52,7 +50,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.ByteArrayInputStream;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  *  服务实现类
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/UserFaceDataServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/UserFaceDataServiceImpl.java
index b4a4369..4ab3c0f 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/UserFaceDataServiceImpl.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/UserFaceDataServiceImpl.java
@@ -4,7 +4,7 @@ package com.hnac.hzinfo.inspect.ai.service.impl;
 import com.google.common.base.Functions;
 import com.google.common.collect.Lists;
 import com.hnac.hzinfo.inspect.ai.config.FaceConfig;
-import com.hnac.hzinfo.inspect.ai.dto.FaceResponse;
+import com.hnac.hzinfo.inspect.ai.vo.FaceResponse;
 import com.hnac.hzinfo.inspect.ai.entity.UserFaceDataEntity;
 import com.hnac.hzinfo.inspect.ai.mapper.UserFaceDataMapper;
 import com.hnac.hzinfo.inspect.ai.service.IUserFaceDataService;
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/VideoTaskAiMqttConsumer.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/VideoTaskAiMqttConsumer.java
index 4965ed7..da71241 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/VideoTaskAiMqttConsumer.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/VideoTaskAiMqttConsumer.java
@@ -1,6 +1,6 @@
 package com.hnac.hzinfo.inspect.ai.service.impl;
 
-import com.hnac.hzinfo.inspect.ai.dto.VideoReturnDTO;
+import com.hnac.hzinfo.inspect.ai.vo.VideoReturnDTO;
 import com.hnac.hzinfo.inspect.task.job.service.TaskVideoManager;
 import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.core.tool.jackson.JsonUtil;
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskVideoManager.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskVideoManager.java
index 2644e49..8a267a6 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskVideoManager.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskVideoManager.java
@@ -1,6 +1,6 @@
 package com.hnac.hzinfo.inspect.task.job.service;
 
-import com.hnac.hzinfo.inspect.ai.dto.VideoReturnDTO;
+import com.hnac.hzinfo.inspect.ai.vo.VideoReturnDTO;
 import com.hnac.hzinfo.inspect.plan.PlanContants;
 import com.hnac.hzinfo.inspect.task.entity.TaskEntity;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java
index 0456099..c9d10d5 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/controller/ImsDutyRecController.java
@@ -139,7 +139,8 @@ public class ImsDutyRecController extends BladeController {
 	@GetMapping("/getTheCurrentDuty")
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "获取当前值班班组")
-	@OperationAnnotation(title = "交接班管理",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE,action
+	@OperationAnnotation(moduleName = "值班管理",title = "交接班管理",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,action
 			= "获取当前值班班组")
 	public R<ImsDutyRecVO> getTheCurrentDuty(@ApiParam(value = "机构ID") Long deptId){
 		if(null == deptId){
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java
index f27bbbb..c40e116 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WindHomeServiceImpl.java
@@ -34,7 +34,6 @@ import com.hnac.hzims.ticket.workTicket.feign.ITicketInfoClient;
 import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO;
 import com.hnac.hzinfo.inspect.task.feign.IInspectTaskReportClient;
 import com.hnac.hzinfo.inspect.task.vo.DutyInspectTaskVO;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
@@ -142,12 +141,16 @@ public class WindHomeServiceImpl implements WindHomeService {
         }
         // 月发电量
         score.setGenerateMon(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),"yyyy-MM"))).mapToDouble(WindEntity::getPower).sum());
+        // 月计划发电量
+        score.setPlanMon(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),"yyyy-MM"))).mapToDouble(WindEntity::getPlan).sum());
+        // 月发电量完成率
+        if(Math.abs(score.getGenerateMon()) > 0 && Math.abs(score.getPlanMon()) > 0){
+            score.setCompleteMonRate(BigDecimal.valueOf(score.getGenerateMon() / score.getPlanMon() * 100).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
+        }
         // 月平均风速
         score.setSpeedRate(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),"yyyy-MM"))).mapToDouble(WindEntity::getSpeed).average().getAsDouble());
-        // 月短期准确率
-        score.setAccuracy(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),"yyyy-MM"))).mapToDouble(WindEntity::getAccuracy).average().getAsDouble());
-        // 月超短期准确率
-        score.setUltraShortAccuracyRate(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),"yyyy-MM"))).mapToDouble(WindEntity::getUltraShortAccuracy).average().getAsDouble());
+        // 月利用小时
+        score.setAvailableMon(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),"yyyy-MM"))).mapToDouble(WindEntity::getAvailable).sum());
         // 日发电量
         score.setGenerateDay(winds.stream().filter(o->o.getFillDate().contains(DateUtil.format(new Date(),DateUtil.PATTERN_DATE))).mapToDouble(WindEntity::getPower).sum());
         // 近年发电量
@@ -306,6 +309,8 @@ public class WindHomeServiceImpl implements WindHomeService {
         WindKpiAppVo kpi = new WindKpiAppVo();
         // 站点数量
         kpi.setCount(stations.size());
+        // 机构名称
+        this.subordinateDept(kpi);
         // 风电数据
         List<WindEntity> winds = windService.list(new LambdaQueryWrapper<WindEntity>() {{
             in(WindEntity::getStationCode,stations.stream().map(StationEntity::getCode).collect(Collectors.toList()))
@@ -331,6 +336,24 @@ public class WindHomeServiceImpl implements WindHomeService {
     }
 
     /**
+     * 设置省子公司名称
+     * @param kpi
+     */
+    private void subordinateDept(WindKpiAppVo kpi) {
+        R<List<Dept>> result = sysClient.getDeptByCurrentUser();
+        if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData())){
+            return;
+        }
+        Optional<Dept> optional;
+        optional = result.getData().stream().min(Comparator.comparing(Dept::getDeptCategory));
+        optional.ifPresent(dept -> {
+            kpi.setDeptId(dept.getId());
+            kpi.setDeptName(dept.getDeptName());
+            kpi.setType(dept.getDeptCategory());
+        });
+    }
+
+    /**
      * 风电app区域数据
      * @param deptId
      * @return
@@ -401,6 +424,10 @@ public class WindHomeServiceImpl implements WindHomeService {
     public WindAreaDutyVo app_area_duty(Long deptId) {
         WindAreaDutyVo areaDuty = new WindAreaDutyVo();
         areaDuty.setDeptId(deptId);
+        R<Dept> result = sysClient.getDept(deptId);
+        if(result.isSuccess() && ObjectUtil.isNotEmpty(result.getData())){
+            areaDuty.setDeptName(result.getData().getDeptName());
+        }
         // 风电统计数据
         this.windFill(areaDuty,deptId);
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ImsDeptController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ImsDeptController.java
index 87f3bd1..8d6ba21 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ImsDeptController.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/ImsDeptController.java
@@ -96,7 +96,7 @@ public class ImsDeptController {
 	@GetMapping(value = "/getHydropowerTree")
 	public R<List<DeptTreeVo>> getHydropowerTree(@ApiParam(value="站点类型: 水电、光伏、风电...") Integer stationType,@RequestParam(required = false) Integer serveType) {
 		if(ObjectUtil.isEmpty(serveType)){
-			R.data(imsDeptService.getHydropowerTree(stationType,null));
+			return R.data(imsDeptService.getHydropowerTree(stationType,null));
 		}
 		return R.data(imsDeptService.getHydropowerTree(stationType,serveType));
 	}
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java
index 99267e8..ae6938e 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java
@@ -9,7 +9,8 @@ import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo;
 import com.hnac.hzims.ticket.standardTicket.dto.StandardTicketInfoDto;
 import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity;
 import com.hnac.hzims.ticket.standardTicket.vo.StandardTicketInfoVO;
-import com.hnac.hzims.ticket.twoTicket.vo.TicketCountQueryVo;
+import com.hnac.hzims.ticket.twoTicket.vo.ticket.StandardTicketCountQueryVo;
+import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountQueryVo;
 import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo;
 import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO;
 import org.springblade.core.mp.base.BaseService;
@@ -130,9 +131,11 @@ public interface IStandardTicketInfoService extends BaseService<StandardTicketIn
 
 
 	/**
-	 * 查看操作票
-	 * @param ticketCountQueryVo
-	 * @return
-	 */
-	List<StandardTicketInfoEntity> listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo);
+     * 查看操作票
+     *
+     * @param entityPage
+     * @param ticketCountQueryVo
+     * @return
+     */
+	IPage<StandardTicketInfoVO> listByOperationTicketWithKeyword(Page<StandardTicketInfoEntity> entityPage, StandardTicketCountQueryVo ticketCountQueryVo);
 }
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java
index d2c2a7c..925f8c5 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java
@@ -2,7 +2,6 @@ package com.hnac.hzims.ticket.standardTicket.service;
 
 
 import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
-import com.hnac.hzims.ticket.twoTicket.vo.TicketCountQueryVo;
 import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo;
 
 import javax.servlet.http.HttpServletResponse;
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java
index 1262a20..ab8a946 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity;
@@ -27,7 +28,8 @@ import com.hnac.hzims.ticket.standardTicket.vo.OperateTicketStatisticVO;
 import com.hnac.hzims.ticket.standardTicket.vo.StandardTicketInfoVO;
 import com.hnac.hzims.ticket.standardTicket.vo.StandardTicketMeasureVO;
 import com.hnac.hzims.ticket.standardTicket.wrapper.StandardTicketInfoWrapper;
-import com.hnac.hzims.ticket.twoTicket.vo.TicketCountQueryVo;
+import com.hnac.hzims.ticket.twoTicket.vo.ticket.StandardTicketCountQueryVo;
+import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountQueryVo;
 import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketInfoVo;
 import com.hnac.hzims.ticket.twoTicket.vo.operation.StandardTicketMeasureVo;
 import com.hnac.hzims.ticket.utils.ExcelUtil;
@@ -35,6 +37,7 @@ import com.hnac.hzims.ticket.utils.PdfUtils;
 import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity;
 import com.hnac.hzims.ticket.workTicket.service.IWorkTicketInfoService;
 import com.hnac.hzims.ticket.workTicket.vo.TicketMonthVO;
+import com.hnac.hzims.ticket.workTicket.vo.WorkTicketInfoVO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -45,6 +48,8 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.DateUtil;
@@ -55,6 +60,7 @@ import org.springblade.flow.core.vo.ComleteTask;
 import org.springblade.system.cache.DictCache;
 import org.springblade.system.user.cache.UserCache;
 import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -84,6 +90,7 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl<StandardTicke
     private final IStandardTicketMeasureService measureService;
     private final IWorkTicketInfoService iWorkTicketInfoService;
     private final TicketInfoEvaluateService ticketInfoEvaluateService;
+    private final IUserClient userClient;
 
 
     @Value("${hzims.ticket.path.xlsx.savePath}")
@@ -707,40 +714,65 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl<StandardTicke
     /**
      * 查看操作票
      *
+     * @param entityPage
      * @param ticketCountQueryVo
      * @return
      */
     @Override
-    public List<StandardTicketInfoEntity> listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
+    public IPage<StandardTicketInfoVO> listByOperationTicketWithKeyword(Page<StandardTicketInfoEntity> entityPage,
+                                                                        StandardTicketCountQueryVo ticketCountQueryVo) {
         String flowTaskName = ticketCountQueryVo.getFlowTaskName();
         String dateTime = ticketCountQueryVo.getDateTime();
         String type = ticketCountQueryVo.getType();
-        QueryWrapper<StandardTicketInfoEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(StringUtils.isNotBlank(type), StandardTicketInfoEntity::getTicketType, type);
+
+        Long deptId = ticketCountQueryVo.getDeptId();
+
+        BladeUser bladeUser = AuthUtil.getUser();
+        List<Long> createDept = userClient.getDataScope(bladeUser.getUserId());
+
+        StandardTicketInfoDto standardTicketInfoDto = new StandardTicketInfoDto();
+        BeanUtils.copyProperties(ticketCountQueryVo, standardTicketInfoDto);
+        LambdaQueryWrapper<StandardTicketInfoEntity> queryWrapper = this.getQueryWrapper(standardTicketInfoDto);
+        queryWrapper.eq(StringUtils.isNotBlank(type), StandardTicketInfoEntity::getTicketType, type);
+        queryWrapper.eq(ObjectUtils.isNotEmpty(deptId), StandardTicketInfoEntity::getSignageCode, deptId);
+        if (ticketCountQueryVo.getCreateDept() == null) {
+            queryWrapper.in(CollectionUtils.isNotEmpty(createDept), BaseEntity::getCreateDept, createDept);
+        } else {
+            queryWrapper.in(BaseEntity::getCreateDept, ticketCountQueryVo.getCreateDept());
+        }
+
         if (StringUtils.isNotEmpty(flowTaskName)) {
             if ("开票".equals(flowTaskName)) {
-                queryWrapper.lambda().isNotNull(StandardTicketInfoEntity::getFlowTaskName);
+                queryWrapper.isNotNull(StandardTicketInfoEntity::getFlowTaskName);
             } else {
-                queryWrapper.lambda().eq(StandardTicketInfoEntity::getFlowTaskName, flowTaskName);
+                queryWrapper.eq(StandardTicketInfoEntity::getFlowTaskName, flowTaskName);
             }
         }
+        if (StringUtils.isNotBlank(dateTime)) {
+            queryWrapper.apply("date_format(create_time,'%Y-%m') = {0}", dateTime);
+        }
         String qualified = ticketCountQueryVo.getQualified();
         if (StringUtils.isNoneBlank(qualified) && "合格".equals(qualified)) {
-            List<StandardTicketInfoEntity> workTicketInfoEntities = baseMapper.selectList(null);
+            List<StandardTicketInfoEntity> workTicketInfoEntities = baseMapper.selectList(queryWrapper);
             List<Long> ticketIdList = workTicketInfoEntities.stream().map(BaseEntity::getId).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(ticketIdList)) {
+                return new Page<StandardTicketInfoVO>();
+            }
             LambdaQueryWrapper<TicketInfoEvaluateEntity> evaluateEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
             evaluateEntityLambdaQueryWrapper.in(TicketInfoEvaluateEntity::getTicketId, ticketIdList);
             evaluateEntityLambdaQueryWrapper.eq(BaseEntity::getStatus, 1);
             List<TicketInfoEvaluateEntity> evaluateEntities = ticketInfoEvaluateService.list(evaluateEntityLambdaQueryWrapper);
-            List<Long> idList =
-                    evaluateEntities.stream().map(TicketInfoEvaluateEntity::getTicketId).collect(Collectors.toList());
-            queryWrapper.lambda().in(BaseEntity::getId, idList);
-        }
-
-
-        if (StringUtils.isNotBlank(dateTime)) {
-            queryWrapper.apply("date_format(create_time,'%Y-%m') = {0}", dateTime);
+            List<Long> idList = evaluateEntities.stream().map(TicketInfoEvaluateEntity::getTicketId).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(idList)) {
+                return new Page<StandardTicketInfoVO>();
+            }
+            queryWrapper.in(BaseEntity::getId, idList);
         }
-        return baseMapper.selectList(queryWrapper);
+        queryWrapper.orderByDesc(StandardTicketInfoEntity::getCreateTime);
+        queryWrapper.orderByDesc(BaseEntity::getCreateTime);
+        Page<StandardTicketInfoEntity> entityPage1 = baseMapper.selectPage(entityPage, queryWrapper);
+        IPage<StandardTicketInfoVO> page = new Page<>(entityPage1.getCurrent(), entityPage1.getSize(), entityPage1.getTotal());
+        page.setRecords(StandardTicketInfoWrapper.build().listVO(entityPage1.getRecords()));
+        return page;
     }
 }
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketCountController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketCountController.java
index d8c653b..db4ed6f 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketCountController.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/controller/TicketCountController.java
@@ -1,22 +1,23 @@
 package com.hnac.hzims.ticket.twoTicket.controller;
 
-import cn.hutool.http.server.HttpServerResponse;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity;
 import com.hnac.hzims.ticket.standardTicket.service.IStandardTicketInfoService;
-import com.hnac.hzims.ticket.standardTicket.service.OperationTicketService;
-import com.hnac.hzims.ticket.twoTicket.service.IFirstWorkTicketService;
+import com.hnac.hzims.ticket.standardTicket.vo.StandardTicketInfoVO;
 import com.hnac.hzims.ticket.twoTicket.service.TicketCountService;
-import com.hnac.hzims.ticket.twoTicket.vo.TicketCountQueryVo;
+import com.hnac.hzims.ticket.twoTicket.vo.ticket.StandardTicketCountQueryVo;
+import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountQueryVo;
 import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountResponseVo;
 import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountVo;
 import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity;
 import com.hnac.hzims.ticket.workTicket.service.IWorkTicketInfoService;
+import com.hnac.hzims.ticket.workTicket.vo.WorkTicketInfoVO;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.time.YearMonth;
 import java.util.List;
 
 /**
@@ -79,10 +80,14 @@ public class TicketCountController {
     /**
      * 查看工作票
      */
-    @GetMapping("/listByTicketWithKeyword")
-    public R listByTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
-        List<WorkTicketInfoEntity> workTicketInfoEntities =
-                workTicketService.listByTicketWithKeyword(ticketCountQueryVo);
+    @GetMapping("/listByTicketWithKeyword/{page}/{size}")
+    public R<IPage<WorkTicketInfoVO>> listByTicketWithKeyword(
+            @PathVariable Long page,
+            @PathVariable Long size,
+            TicketCountQueryVo ticketCountQueryVo) {
+        Page<WorkTicketInfoEntity> entityPage = new Page<>(page,size);
+        IPage<WorkTicketInfoVO> workTicketInfoEntities =
+                workTicketService.listByTicketWithKeyword(entityPage,ticketCountQueryVo);
         return R.data(workTicketInfoEntities);
     }
 
@@ -90,10 +95,14 @@ public class TicketCountController {
     /**
      * 查看操作票
      */
-    @GetMapping("/listByOperationTicketWithKeyword")
-    public R listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
-        List<StandardTicketInfoEntity> ticketInfoEntities =
-                standardTicketInfoService.listByOperationTicketWithKeyword(ticketCountQueryVo);
+    @GetMapping("/listByOperationTicketWithKeyword/{page}/{size}")
+    public R listByOperationTicketWithKeyword(
+            @PathVariable Long page,
+            @PathVariable Long size,
+            StandardTicketCountQueryVo ticketCountQueryVo) {
+        Page<StandardTicketInfoEntity> entityPage = new Page<>(page,size);
+        IPage<StandardTicketInfoVO> ticketInfoEntities =
+                standardTicketInfoService.listByOperationTicketWithKeyword(entityPage,ticketCountQueryVo);
         return R.data(ticketInfoEntities);
     }
 
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/handler/TicketCountSheetWriteHandler.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/handler/TicketCountSheetWriteHandler.java
index 5490e80..034565a 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/handler/TicketCountSheetWriteHandler.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/handler/TicketCountSheetWriteHandler.java
@@ -42,10 +42,10 @@ public class TicketCountSheetWriteHandler implements SheetWriteHandler {
         CellStyle headerStyle  = createHeadCellStyle(workbook);
         Sheet sheet = workbook.getSheetAt(0);
         sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 0));
-        sheet.addMergedRegion(new CellRangeAddress(0, 0, 1, 4));
-        sheet.addMergedRegion(new CellRangeAddress(0, 0, 5, 8));
-        sheet.addMergedRegion(new CellRangeAddress(0, 0, 9, 12));
-        sheet.addMergedRegion(new CellRangeAddress(0, 0, 13, 15));
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 1, 7));
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 8, 14));
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 15, 21));
+        sheet.addMergedRegion(new CellRangeAddress(0, 0, 22, 25));
         sheet.setHorizontallyCenter(true);
         sheet.setVerticallyCenter(true);
         sheet.setDefaultRowHeight((short) 20);
@@ -62,16 +62,16 @@ public class TicketCountSheetWriteHandler implements SheetWriteHandler {
         cell.setCellStyle(headerStyle);
 
 
-        Cell cell1 = row1.createCell(5);
+        Cell cell1 = row1.createCell(8);
         cell1.setCellValue("第二种工作票");
         cell1.setCellStyle(headerStyle);
 
 
-        Cell cell2 = row1.createCell(9);
+        Cell cell2 = row1.createCell(15);
         cell2.setCellValue("机械工作票");
         cell2.setCellStyle(headerStyle);
 
-        Cell cell3 = row1.createCell(13);
+        Cell cell3 = row1.createCell(22);
         cell3.setCellValue("倒闸操作票");
         cell3.setCellStyle(headerStyle);
     }
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java
index f7eb744..e5d1090 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java
@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.hnac.hzims.common.logs.utils.StringUtils;
+import com.hnac.hzims.operational.station.entity.StationEntity;
+import com.hnac.hzims.operational.station.feign.IStationClient;
 import com.hnac.hzims.ticket.allTicket.entity.TicketInfoEvaluateEntity;
 import com.hnac.hzims.ticket.allTicket.service.TicketInfoEvaluateService;
 import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity;
@@ -80,6 +82,8 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
 
     private final IStandardTicketInfoService standardTicketInfoService;
 
+    private final IStationClient stationClient;
+
 
     /**
      * 两票生成月报统计
@@ -291,26 +295,26 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
      */
     private List<TicketCountResponseVo> getTicketCountResponseList(List<TicketCount> ticketCounts) {
         //先判断在存储
-        Map<String, TicketCountResponseVo> map = new HashMap<>();
+        Map<Long, TicketCountResponseVo> map = new HashMap<>();
         for (TicketCount ticketCount : ticketCounts) {
-            String deptName = ticketCount.getDeptName();
-            if (map.containsKey(deptName)) {
-                TicketCountResponseVo ticketCountResponseVo = map.get(deptName);
+            Long deptId = ticketCount.getDeptId();
+            if (map.containsKey(deptId)) {
+                TicketCountResponseVo ticketCountResponseVo = map.get(deptId);
                 isExistsTicket(ticketCount, ticketCountResponseVo);
-                map.put(deptName, ticketCountResponseVo);
+                map.put(deptId, ticketCountResponseVo);
             } else {
                 TicketCountResponseVo ticketCountResponseVo = new TicketCountResponseVo();
                 isExistsTicket(ticketCount, ticketCountResponseVo);
-                map.put(deptName, ticketCountResponseVo);
+                map.put(deptId, ticketCountResponseVo);
             }
         }
         //map遍历
         List<TicketCountResponseVo> result = new ArrayList<>();
         if (MapUtils.isNotEmpty(map)) {
-            Set<Map.Entry<String, TicketCountResponseVo>> entries = map.entrySet();
-            for (Map.Entry<String, TicketCountResponseVo> entry : entries) {
+            Set<Map.Entry<Long, TicketCountResponseVo>> entries = map.entrySet();
+            for (Map.Entry<Long, TicketCountResponseVo> entry : entries) {
                 TicketCountResponseVo value = entry.getValue();
-                value.setDeptName(entry.getKey());
+                value.setDeptId(entry.getKey());
                 result.add(value);
             }
 
@@ -328,12 +332,13 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
     private void isExistsTicket(TicketCount ticketCount, TicketCountResponseVo ticketCountResponseVo) {
         String deptName = ticketCount.getDeptName();
         ticketCountResponseVo.setDeptName(deptName);
+        ticketCountResponseVo.setDeptId(ticketCount.getDeptId());
         if ("3".equals(ticketCount.getTicketType())) {
             ticketCountResponseVo.setFourTicketNumber(this.getCount(ticketCount.getTicketNumber()));
             ticketCountResponseVo.setFourTicketProportionNum(this.getCount(ticketCount.getTicketProportionNum()));
             ticketCountResponseVo.setFourTicketCompleteNum(this.getCount(ticketCount.getTicketCompleteNum()));
             ticketCountResponseVo.setFourTicketDelayNum(this.getCount(ticketCount.getTicketDelayNum()));
-            ticketCountResponseVo.setFourPercentPassTicket(ticketCount.getPercentPassTicket());
+            ticketCountResponseVo.setFourPercentPassTicket(this.getCountV2(ticketCount.getPercentPassTicket()));
 
         }
 
@@ -344,7 +349,7 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
             ticketCountResponseVo.setOneTicketDelayNum(this.getCount(ticketCount.getTicketDelayNum()));
             ticketCountResponseVo.setOneInvalidatedTicketNumNum(this.getCount(ticketCount.getInvalidatedTicketNum()));
             ticketCountResponseVo.setOneWrongTicketNum(this.getCount(ticketCount.getWrongTicketNum()));
-            ticketCountResponseVo.setOnePercentPassTicket(ticketCount.getPercentPassTicket());
+            ticketCountResponseVo.setOnePercentPassTicket(this.getCountV2(ticketCount.getPercentPassTicket()));
         }
 
 
@@ -355,7 +360,7 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
             ticketCountResponseVo.setTwoTicketDelayNum(this.getCount(ticketCount.getTicketDelayNum()));
             ticketCountResponseVo.setTwoInvalidatedTicketNumNum(this.getCount(ticketCount.getInvalidatedTicketNum()));
             ticketCountResponseVo.setTwoWrongTicketNum(this.getCount(ticketCount.getWrongTicketNum()));
-            ticketCountResponseVo.setTwoPercentPassTicket(ticketCount.getPercentPassTicket());
+            ticketCountResponseVo.setTwoPercentPassTicket(this.getCountV2(ticketCount.getPercentPassTicket()));
         }
 
 
@@ -366,7 +371,7 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
             ticketCountResponseVo.setThreeTicketDelayNum(this.getCount(ticketCount.getTicketDelayNum()));
             ticketCountResponseVo.setThreeInvalidatedTicketNumNum(this.getCount(ticketCount.getInvalidatedTicketNum()));
             ticketCountResponseVo.setThreeWrongTicketNum(this.getCount(ticketCount.getWrongTicketNum()));
-            ticketCountResponseVo.setThreePercentPassTicket(ticketCount.getPercentPassTicket());
+            ticketCountResponseVo.setThreePercentPassTicket(this.getCountV2(ticketCount.getPercentPassTicket()));
         }
     }
 
@@ -380,6 +385,13 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
 
 
     /**
+     * 验证是否为null
+     */
+    private String getCountV2(String count) {
+        return count == null ? "0%" : count;
+    }
+
+    /**
      * 统计操作票功能
      *
      * @param createDept 所属机构及下属机构
@@ -397,7 +409,7 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
         }
         //根据站点分组
         Map<String, List<StandardTicketInfoEntity>> createDeptTickets =
-                ticketInfoEntities.stream().collect(Collectors.groupingBy(StandardTicketInfoEntity::getSignageCode));
+                ticketInfoEntities.stream().filter(item -> item.getSignageCode() != null).collect(Collectors.groupingBy(StandardTicketInfoEntity::getSignageCode));
         //获取 操作票的id，删除
         if (CollectionUtils.isNotEmpty(items)) {
             List<Long> collect =
@@ -418,9 +430,12 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
             if (ObjectUtils.isNotEmpty(entry.getKey())) {
                 ticketCount.setDeptId(NumberUtils.toLong(entry.getKey()));
                 //根据id获取部门名称
-                R<String> deptName = systemClient.getDeptName(NumberUtils.toLong(entry.getKey()));
-                if (deptName.isSuccess()) {
-                    ticketCount.setDeptName(deptName.getData() == null ? "" : deptName.getData());
+                StationEntity stationEntity = new StationEntity();
+                stationEntity.setCode(entry.getKey());
+                R<StationEntity> stationClientOne = stationClient.getOne(stationEntity);
+                if (stationClientOne.isSuccess()) {
+                    StationEntity data = stationClientOne.getData();
+                    ticketCount.setDeptName(data.getName() == null ? "" : data.getName());
                 }
             }
             List<StandardTicketInfoEntity> values = entry.getValue();
@@ -440,6 +455,15 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
             evaluateEntityLambdaQueryWrapper.eq(BaseEntity::getStatus, 1);
             List<TicketInfoEvaluateEntity> evaluateEntities = ticketInfoEvaluateService.list(evaluateEntityLambdaQueryWrapper);
             ticketCount.setTicketProportionNum(evaluateEntities.size());
+
+            //7.合格率
+            if (CollectionUtils.isNotEmpty(evaluateEntities)) {
+                String percentPassTicketNum = (1 / evaluateEntities.size()) == 0 ? "0" : (1 / evaluateEntities.size()) +
+                        "%";
+                ticketCount.setPercentPassTicket(percentPassTicketNum);
+            }
+
+
             ticketCountList.add(ticketCount);
         }
         return ticketCountList;
@@ -468,7 +492,7 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
         }
         //根据站点分组
         Map<String, List<WorkTicketInfoEntity>> createDeptTickets =
-                ticketInfoEntities.stream().collect(Collectors.groupingBy(WorkTicketInfoEntity::getSignageCode));
+                ticketInfoEntities.stream().filter(item -> item.getSignageCode() != null).collect(Collectors.groupingBy(WorkTicketInfoEntity::getSignageCode));
         if (CollectionUtils.isNotEmpty(items)) {
             //获取工作票的id，删除
             List<Long> collect =
@@ -487,9 +511,12 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
             if (ObjectUtils.isNotEmpty(entry.getKey())) {
                 ticketCount.setDeptId(NumberUtils.toLong(entry.getKey()));
                 //根据id获取部门名称
-                R<String> deptName = systemClient.getDeptName(NumberUtils.toLong(entry.getKey()));
-                if (deptName.isSuccess()) {
-                    ticketCount.setDeptName(deptName.getData() == null ? "" : deptName.getData());
+                StationEntity stationEntity = new StationEntity();
+                stationEntity.setCode(entry.getKey());
+                R<StationEntity> stationClientOne = stationClient.getOne(stationEntity);
+                if (stationClientOne.isSuccess()) {
+                    StationEntity data = stationClientOne.getData();
+                    ticketCount.setDeptName(data.getName() == null ? "" : data.getName());
                 }
             }
             List<WorkTicketInfoEntity> values = entry.getValue();
@@ -519,7 +546,7 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
 
             //5.废弃数量
             List<WorkTicketInfoEntity> invalidatedTicketNums =
-                    values.stream().filter(item -> "废弃".equals(item.getFlowTaskName())).collect(Collectors.toList());
+                    values.stream().filter(item -> "废票".equals(item.getFlowTaskName())).collect(Collectors.toList());
             ticketCount.setInvalidatedTicketNum(invalidatedTicketNums.size());
 
             //6.错票数量
@@ -528,9 +555,12 @@ public class TicketCountServiceImpl extends BaseServiceImpl<TicketCountMapper, T
             ticketCount.setWrongTicketNum(wrongTicketNums.size());
 
             //7.合格率
-            String percentPassTicketNum = (1 / evaluateEntities.size()) == 0 ? "0" : (1 / evaluateEntities.size()) +
-                    "%";
-            ticketCount.setPercentPassTicket(percentPassTicketNum);
+            if (CollectionUtils.isNotEmpty(evaluateEntities)) {
+                String percentPassTicketNum = (1 / evaluateEntities.size()) == 0 ? "0%" :
+                        (1 / evaluateEntities.size()) + "%";
+                ticketCount.setPercentPassTicket(percentPassTicketNum);
+            }
+
             ticketCountList.add(ticketCount);
         }
         return ticketCountList;
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/ticket/StandardTicketCountQueryVo.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/ticket/StandardTicketCountQueryVo.java
new file mode 100644
index 0000000..519c706
--- /dev/null
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/ticket/StandardTicketCountQueryVo.java
@@ -0,0 +1,48 @@
+package com.hnac.hzims.ticket.twoTicket.vo.ticket;
+
+import com.hnac.hzims.ticket.standardTicket.dto.StandardTicketInfoDto;
+import lombok.Data;
+
+/**
+ * @Author WL
+ * @Version v1.0
+ * @Serial 1.0
+ * @Date 2023/7/25 9:10
+ */
+@Data
+public class StandardTicketCountQueryVo extends StandardTicketInfoDto {
+
+
+    /**
+     * 票据类型
+     */
+    private String type;
+
+
+    /**
+     * 延期
+     */
+    private String input;
+
+    /**
+     * 结束  作废
+     */
+    private String flowTaskName;
+
+    /**
+     * 合格
+     */
+    private String qualified;
+
+
+    /**
+     * 时间
+     */
+    private String dateTime;
+
+
+    /**
+     * 站点Id
+     */
+    private Long deptId;
+}
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/TicketCountQueryVo.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/ticket/TicketCountQueryVo.java
similarity index 64%
rename from hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/TicketCountQueryVo.java
rename to hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/ticket/TicketCountQueryVo.java
index 0181fd6..929c4a3 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/TicketCountQueryVo.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/ticket/TicketCountQueryVo.java
@@ -1,5 +1,6 @@
-package com.hnac.hzims.ticket.twoTicket.vo;
+package com.hnac.hzims.ticket.twoTicket.vo.ticket;
 
+import com.hnac.hzims.ticket.workTicket.dto.WorkTicketInfoDto;
 import lombok.Data;
 
 /**
@@ -9,7 +10,7 @@ import lombok.Data;
  * @Date 2023/7/24 8:32
  */
 @Data
-public class TicketCountQueryVo {
+public class TicketCountQueryVo extends WorkTicketInfoDto {
 
     /**
      * 票据类型
@@ -37,4 +38,10 @@ public class TicketCountQueryVo {
      * 时间
      */
     private String dateTime;
+
+
+    /**
+     * 站点id
+     */
+    private Long deptId;
 }
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/ticket/TicketCountResponseVo.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/ticket/TicketCountResponseVo.java
index 2016ea6..0f3ad9e 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/ticket/TicketCountResponseVo.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/ticket/TicketCountResponseVo.java
@@ -117,7 +117,7 @@ public class TicketCountResponseVo {
      * 第二种工作票延期数量
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "延期数量", index = 11)
+    @ExcelProperty(value = "延期数量", index = 12)
     private Integer twoTicketDelayNum = 0;
 
 
@@ -125,16 +125,15 @@ public class TicketCountResponseVo {
      * 第二种工作票合格数量
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "合格数量", index = 12)
+    @ExcelProperty(value = "合格数量", index = 13)
     private Integer twoTicketProportionNum = 0;
 
 
-
     /**
      * 第二种工作票合格率
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "合格率", index = 13)
+    @ExcelProperty(value = "合格率", index = 14)
     private String twoPercentPassTicket = "0";
 
 
@@ -142,7 +141,7 @@ public class TicketCountResponseVo {
      * 水力机械工作票开票数量
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "开票数量", index = 14)
+    @ExcelProperty(value = "开票数量", index = 15)
     private Integer threeTicketNumber = 0;
 
 
@@ -150,14 +149,14 @@ public class TicketCountResponseVo {
      * 水力机械工作票完成数量
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "完成数量", index = 15)
+    @ExcelProperty(value = "完成数量", index = 16)
     private Integer threeTicketCompleteNum = 0;
 
     /**
-     *水力机械工作票错票数量
+     * 水力机械工作票错票数量
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "错票数量", index = 16)
+    @ExcelProperty(value = "错票数量", index = 17)
     private Integer threeWrongTicketNum = 0;
 
 
@@ -165,7 +164,7 @@ public class TicketCountResponseVo {
      * 水力机械工作废票数量
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "废票数量", index = 17)
+    @ExcelProperty(value = "废票数量", index = 18)
     private Integer threeInvalidatedTicketNumNum = 0;
 
 
@@ -173,7 +172,7 @@ public class TicketCountResponseVo {
      * 水力机械工作票延期数量
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "延期数量", index = 18)
+    @ExcelProperty(value = "延期数量", index = 19)
     private Integer threeTicketDelayNum = 0;
 
 
@@ -181,24 +180,23 @@ public class TicketCountResponseVo {
      * 水力机械工作票合格数量
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "合格数量", index = 19)
+    @ExcelProperty(value = "合格数量", index = 20)
     private Integer threeTicketProportionNum = 0;
 
 
     /**
-     *水力机械工作票票合格率
+     * 水力机械工作票票合格率
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "合格率", index = 20)
+    @ExcelProperty(value = "合格率", index = 21)
     private String threePercentPassTicket = "0";
 
 
-
     /**
      * 操作票开票数量
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "开票数量", index = 21)
+    @ExcelProperty(value = "开票数量", index = 22)
     private Integer fourTicketNumber = 0;
 
 
@@ -206,7 +204,7 @@ public class TicketCountResponseVo {
      * 操作票开票完成数量
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "完成数量", index = 22)
+    @ExcelProperty(value = "完成数量", index = 23)
     private Integer fourTicketCompleteNum = 0;
 
 
@@ -221,17 +219,23 @@ public class TicketCountResponseVo {
      * 操作票作票合格数量
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "合格数量", index = 23)
+    @ExcelProperty(value = "合格数量", index = 24)
     private Integer fourTicketProportionNum = 0;
 
 
-
     /**
      * 操作票合格率
      */
     @ColumnWidth(14)
-    @ExcelProperty(value = "合格数量", index = 24)
+    @ExcelProperty(value = "合格率", index = 25)
     private String fourPercentPassTicket = "0";
 
 
+    /**
+     * 机构名称
+     */
+    @ExcelIgnore
+    private Long deptId;
+
+
 }
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java
index a95c59f..67950c1 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java
@@ -2,10 +2,9 @@ package com.hnac.hzims.ticket.workTicket.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hnac.hzims.ticket.areamonthly.vo.AreaMonthlyVo;
 import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo;
 import com.hnac.hzims.ticket.areamonthly.vo.StandardWorkVo;
-import com.hnac.hzims.ticket.twoTicket.vo.TicketCountQueryVo;
+import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountQueryVo;
 import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo;
 import com.hnac.hzims.ticket.workTicket.dto.TicketAccessTaskDto;
 import com.hnac.hzims.ticket.workTicket.dto.WorkTicketInfoDto;
@@ -173,8 +172,10 @@ public interface IWorkTicketInfoService extends BaseService<WorkTicketInfoEntity
 
 	/**
 	 * 查看工作票
+	 *
+	 * @param entityPage
 	 * @param ticketCountQueryVo
 	 * @return
 	 */
-	List<WorkTicketInfoEntity> listByTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo);
+	IPage<WorkTicketInfoVO> listByTicketWithKeyword(Page<WorkTicketInfoEntity> entityPage, TicketCountQueryVo ticketCountQueryVo);
 }
diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java
index 559dd69..5186610 100644
--- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java
+++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java
@@ -26,12 +26,11 @@ import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo;
 import com.hnac.hzims.ticket.areamonthly.vo.StandardWorkVo;
 import com.hnac.hzims.ticket.aspect.AroundFlow;
 import com.hnac.hzims.ticket.constants.TicketConstants;
-import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity;
 import com.hnac.hzims.ticket.twoTicket.entity.TicketInfoDanger;
 import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish;
 import com.hnac.hzims.ticket.twoTicket.service.TicketInfoDangerService;
 import com.hnac.hzims.ticket.twoTicket.service.impl.WorkTicketFinishServiceImpl;
-import com.hnac.hzims.ticket.twoTicket.vo.TicketCountQueryVo;
+import com.hnac.hzims.ticket.twoTicket.vo.ticket.TicketCountQueryVo;
 import com.hnac.hzims.ticket.twoTicket.vo.process.WorkTicketVo;
 import com.hnac.hzims.ticket.utils.ExcelUtil;
 import com.hnac.hzims.ticket.workTicket.dto.*;
@@ -54,6 +53,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
@@ -1022,8 +1022,7 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
 
             //成员信息
             if (workTicketInfo.getClassGroupMembersName() == null) {
-                workTicketInfo.setClassGroupMembersName(sb.toString().endsWith(",") ?
-                        sb.toString().substring(0, sb.length() - 1) : sb.toString());
+                workTicketInfo.setClassGroupMembersName(sb.toString().endsWith(",") ? sb.toString().substring(0, sb.length() - 1) : sb.toString());
             }
         }
 
@@ -1064,28 +1063,22 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
 
 
         //6.工作开始时间和结束时间
-        List<WorkTicketOperateTimeEntity> workTicketOperateTimeEntities =
-                workTicketOperateTimeService.selectByTicketId(ticketId);
+        List<WorkTicketOperateTimeEntity> workTicketOperateTimeEntities = workTicketOperateTimeService.selectByTicketId(ticketId);
         if (CollectionUtils.isNotEmpty(workTicketOperateTimeEntities)) {
             workTicketVo.setWorkTicketOperateTimeEntities(workTicketOperateTimeEntities);
         }
 
 
         //7. 工作票负责人变更
-        WorkTicketPrincipalChangeEntity workTicketPrincipalChangeEntity =
-                workTicketPrincipalChangeService.selectByTicketId(ticketId);
+        WorkTicketPrincipalChangeEntity workTicketPrincipalChangeEntity = workTicketPrincipalChangeService.selectByTicketId(ticketId);
         if (ObjectUtils.isNotEmpty(workTicketPrincipalChangeEntity)) {
             //原负责人
             if (workTicketPrincipalChangeEntity.getInitialPrincipal() != null) {
-                workTicketPrincipalChangeEntity.setInitialPrincipalName(
-                        UserCache.getUser(workTicketPrincipalChangeEntity.getInitialPrincipal()).getName()
-                );
+                workTicketPrincipalChangeEntity.setInitialPrincipalName(UserCache.getUser(workTicketPrincipalChangeEntity.getInitialPrincipal()).getName());
             }
             //变更负责人
             if (workTicketPrincipalChangeEntity.getChangePrincipal() != null) {
-                workTicketPrincipalChangeEntity.setChangePrincipalName(
-                        UserCache.getUser(workTicketPrincipalChangeEntity.getChangePrincipal()).getName()
-                );
+                workTicketPrincipalChangeEntity.setChangePrincipalName(UserCache.getUser(workTicketPrincipalChangeEntity.getChangePrincipal()).getName());
             }
 
             workTicketVo.setWorkTicketPrincipalChange(workTicketPrincipalChangeEntity);
@@ -1135,11 +1128,12 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
     /**
      * 查看工作票
      *
+     * @param entityPage
      * @param ticketCountQueryVo
      * @return
      */
     @Override
-    public List<WorkTicketInfoEntity> listByTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) {
+    public IPage<WorkTicketInfoVO> listByTicketWithKeyword(Page<WorkTicketInfoEntity> entityPage, TicketCountQueryVo ticketCountQueryVo) {
         //延期
         String input = ticketCountQueryVo.getInput();
         //开票 结束 作废
@@ -1150,36 +1144,65 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
         String type = ticketCountQueryVo.getType();
 
         String dateTime = ticketCountQueryVo.getDateTime();
-        //查询
-        QueryWrapper<WorkTicketInfoEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(StringUtils.isNotBlank(type), WorkTicketInfoEntity::getType,
-                type);
-        queryWrapper.lambda().eq(StringUtils.isNotEmpty(input), WorkTicketInfoEntity::getInput, input);
 
+        Long deptId = ticketCountQueryVo.getDeptId();
+
+        BladeUser bladeUser = AuthUtil.getUser();
+        List<Long> createDept = userClient.getDataScope(bladeUser.getUserId());
+        //查询
+        WorkTicketInfoDto workTicketInfoDto = new WorkTicketInfoDto();
+        BeanUtils.copyProperties(ticketCountQueryVo, workTicketInfoDto);
+        LambdaQueryWrapper<WorkTicketInfoEntity> queryWrapper = this.getQueryWrapper(workTicketInfoDto);
+        queryWrapper.eq(StringUtils.isNotBlank(type), WorkTicketInfoEntity::getType, type);
+        queryWrapper.eq(StringUtils.isNotEmpty(input), WorkTicketInfoEntity::getInput, input);
+        queryWrapper.eq(ObjectUtils.isNotEmpty(deptId), WorkTicketInfoEntity::getSignageCode, deptId);
+        if (ticketCountQueryVo.getCreateDept() == null) {
+            queryWrapper.in(CollectionUtils.isNotEmpty(createDept), BaseEntity::getCreateDept, createDept);
+        } else {
+            queryWrapper.in(BaseEntity::getCreateDept, ticketCountQueryVo.getCreateDept());
+        }
         if (StringUtils.isNotEmpty(flowTaskName)) {
             if ("开票".equals(flowTaskName)) {
-                queryWrapper.lambda().isNotNull(WorkTicketInfoEntity::getFlowTaskName);
+                queryWrapper.isNotNull(WorkTicketInfoEntity::getFlowTaskName);
             } else {
-                queryWrapper.lambda().eq(WorkTicketInfoEntity::getFlowTaskName, flowTaskName);
+                queryWrapper.eq(WorkTicketInfoEntity::getFlowTaskName, flowTaskName);
             }
         }
 
-
         if (StringUtils.isNotBlank(dateTime)) {
             queryWrapper.apply("date_format(create_time,'%Y-%m') = {0}", dateTime);
         }
         //合格
         if (StringUtils.isNoneBlank(qualified) && "合格".equals(qualified)) {
-            List<WorkTicketInfoEntity> workTicketInfoEntities = baseMapper.selectList(null);
+            List<WorkTicketInfoEntity> workTicketInfoEntities = baseMapper.selectList(queryWrapper);
             List<Long> ticketIdList = workTicketInfoEntities.stream().map(BaseEntity::getId).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(ticketIdList)) {
+                return new Page<WorkTicketInfoVO>();
+            }
             LambdaQueryWrapper<TicketInfoEvaluateEntity> evaluateEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
             evaluateEntityLambdaQueryWrapper.in(TicketInfoEvaluateEntity::getTicketId, ticketIdList);
             evaluateEntityLambdaQueryWrapper.eq(BaseEntity::getStatus, 1);
             List<TicketInfoEvaluateEntity> evaluateEntities = ticketInfoEvaluateService.list(evaluateEntityLambdaQueryWrapper);
-            List<Long> idList =
-                    evaluateEntities.stream().map(TicketInfoEvaluateEntity::getTicketId).collect(Collectors.toList());
-            queryWrapper.lambda().in(BaseEntity::getId, idList);
+            List<Long> idList = evaluateEntities.stream().map(TicketInfoEvaluateEntity::getTicketId).collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(idList)) {
+                return new Page<WorkTicketInfoVO>();
+            }
+            queryWrapper.in(BaseEntity::getId, idList);
         }
-        return baseMapper.selectList(queryWrapper);
+        queryWrapper.orderByDesc(BaseEntity::getCreateTime);
+        Page<WorkTicketInfoEntity> pages = this.page(entityPage, queryWrapper);
+        //数据转换
+        IPage<WorkTicketInfoVO> workTicketInfoVOIPage = new Page<>(pages.getCurrent(), pages.getSize());
+        workTicketInfoVOIPage.setRecords(WorkTicketInfoWrapper.build().listVO(pages.getRecords()));
+        workTicketInfoVOIPage.setPages(pages.getPages());
+        workTicketInfoVOIPage.setTotal(pages.getTotal());
+        //获取创建人
+        workTicketInfoVOIPage.getRecords().forEach(item -> {
+            User user = UserCache.getUser(item.getCreateUser());
+            if (user != null) {
+                item.setCreateUserName(user.getName());
+            }
+        });
+        return workTicketInfoVOIPage;
     }
 }