From ddacce50557f319fac939b534a94ed10c8748524 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Mon, 29 Apr 2024 11:19:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=BC=94=E7=A4=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service-api/inspect-api/inspect-api.iml | 303 +-------------------- .../hzinfo/inspect/request/GenerateTaskVO.java | 56 ++++ .../showTemplate/entity/PlanTemplateEntity.java | 21 ++ .../TaskObjectProjectContentTemplateEntity.java | 28 ++ .../entity/TaskObjectProjectTemplateEntity.java | 21 ++ .../entity/TaskObjectTemplateEntity.java | 28 ++ .../showTemplate/entity/TaskTemplateEntity.java | 28 ++ 7 files changed, 188 insertions(+), 297 deletions(-) create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/request/GenerateTaskVO.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/PlanTemplateEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskObjectProjectContentTemplateEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskObjectProjectTemplateEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskObjectTemplateEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskTemplateEntity.java diff --git a/hzims-service-api/inspect-api/inspect-api.iml b/hzims-service-api/inspect-api/inspect-api.iml index 10b0bb6..40defed 100644 --- a/hzims-service-api/inspect-api/inspect-api.iml +++ b/hzims-service-api/inspect-api/inspect-api.iml @@ -1,309 +1,18 @@ - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/request/GenerateTaskVO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/request/GenerateTaskVO.java new file mode 100644 index 0000000..5cbef26 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/request/GenerateTaskVO.java @@ -0,0 +1,56 @@ +package com.hnac.hzinfo.inspect.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalTime; + +/** + * @ClassName GenerateTaskVO + * @description: + * @author: hx + * @create: 2023-10-12 09:01 + * @Version 4.0 + **/ +@Data +@EqualsAndHashCode +@ApiModel("生成巡检任务") +public class GenerateTaskVO implements Serializable { + + @ApiModelProperty("站点编号") + private String stationCode; + + @ApiModelProperty("站点名称") + private String stationName; + + @ApiModelProperty("区域机构ID") + private Long areaDeptId; + + @ApiModelProperty("开始日期") + @DateTimeFormat(pattern = DateUtil.PATTERN_DATE) + @JsonFormat(pattern = DateUtil.PATTERN_DATE) + private LocalDate startDate; + + @ApiModelProperty("结束日期") + @DateTimeFormat(pattern = DateUtil.PATTERN_DATE) + @JsonFormat(pattern = DateUtil.PATTERN_DATE) + private LocalDate endDate; + + @ApiModelProperty("开始时间") + @DateTimeFormat(pattern = DateUtil.PATTERN_TIME) + @JsonFormat(pattern = DateUtil.PATTERN_TIME) + private LocalTime startTime = LocalTime.of(8,0,0); + + @ApiModelProperty("结束时间") + @DateTimeFormat(pattern = DateUtil.PATTERN_TIME) + @JsonFormat(pattern = DateUtil.PATTERN_TIME) + private LocalTime endTime = LocalTime.of(16,0,0); + +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/PlanTemplateEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/PlanTemplateEntity.java new file mode 100644 index 0000000..a3f6420 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/PlanTemplateEntity.java @@ -0,0 +1,21 @@ +package com.hnac.hzinfo.inspect.showTemplate.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hnac.hzinfo.inspect.plan.entity.PlanEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode +@ApiModel("巡检计划模板-造演示数据使用") +@TableName("hz_st_re_plan_template") +public class PlanTemplateEntity extends PlanEntity implements Serializable { + + @ApiModelProperty("是否启用") + private Boolean enable; + +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskObjectProjectContentTemplateEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskObjectProjectContentTemplateEntity.java new file mode 100644 index 0000000..5ada4b2 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskObjectProjectContentTemplateEntity.java @@ -0,0 +1,28 @@ +package com.hnac.hzinfo.inspect.showTemplate.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectContentEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * @ClassName TaskObjectProjectContentTemplateEntity + * @description: + * @author: hx + * @create: 2023-10-12 14:49 + * @Version 4.0 + **/ +@Data +@ApiModel("TaskObjectProjectContentTemplateEntity对象") +@EqualsAndHashCode +@TableName("hz_st_ex_object_project_content_template") +public class TaskObjectProjectContentTemplateEntity extends TaskObjectProjectContentEntity implements Serializable { + + @ApiModelProperty("是否启用") + private Boolean enable; + +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskObjectProjectTemplateEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskObjectProjectTemplateEntity.java new file mode 100644 index 0000000..0b38c12 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskObjectProjectTemplateEntity.java @@ -0,0 +1,21 @@ +package com.hnac.hzinfo.inspect.showTemplate.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@Data +@TableName("hz_st_ex_object_project_template") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "TaskObjectProject对象", description = "") +public class TaskObjectProjectTemplateEntity extends TaskObjectProjectEntity implements Serializable { + + @ApiModelProperty("是否启用") + private Boolean enable; + +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskObjectTemplateEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskObjectTemplateEntity.java new file mode 100644 index 0000000..3f3381c --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskObjectTemplateEntity.java @@ -0,0 +1,28 @@ +package com.hnac.hzinfo.inspect.showTemplate.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.io.Serializable; + +/** + * @ClassName TaskObjectTemplateEntity + * @description: + * @author: hx + * @create: 2023-10-12 13:31 + * @Version 4.0 + **/ +@Data +@AllArgsConstructor +@ApiModel("巡检任务对象模板-演示数据占用") +@TableName("hz_st_ex_object_template") +public class TaskObjectTemplateEntity extends TaskObjectEntity implements Serializable { + + @ApiModelProperty("是否启用") + private Boolean enable; + +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskTemplateEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskTemplateEntity.java new file mode 100644 index 0000000..341b502 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/showTemplate/entity/TaskTemplateEntity.java @@ -0,0 +1,28 @@ +package com.hnac.hzinfo.inspect.showTemplate.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hnac.hzinfo.inspect.task.entity.TaskEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.io.Serializable; + +/** + * @ClassName TaskTemplateEntity + * @description: + * @author: hx + * @create: 2023-10-12 11:28 + * @Version 4.0 + **/ +@Data +@AllArgsConstructor +@ApiModel("巡检任务模板-演示数据占用") +@TableName("hz_st_ex_task_template") +public class TaskTemplateEntity extends TaskEntity implements Serializable { + + @ApiModelProperty("是否启用") + private Boolean enable; + +}