From 973ef80d4945bcd44c5e5d30a38b24fa1328cbc1 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 25 Jul 2023 16:43:17 +0800 Subject: [PATCH] =?UTF-8?q?#=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1=E6=B4=BE?= =?UTF-8?q?=E5=8F=91=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/operational/main/vo/WindAreaDutyVo.java | 4 + .../hzims/operational/main/vo/WindKpiAppVo.java | 9 ++ .../hzims/operational/main/vo/WindScoreVo.java | 12 +- hzims-service-api/inspect-api/pom.xml | 6 + .../hzinfo/inspect/ai/entity/CameraInfoEntity.java | 135 +++++++++++++++++++++ .../hnac/hzinfo/inspect/ai/entity/ClockEntity.java | 54 +++++++++ .../hzinfo/inspect/ai/entity/ClockTypeEntity.java | 64 ++++++++++ .../hnac/hzinfo/inspect/ai/entity/RobotEntity.java | 59 +++++++++ .../hzinfo/inspect/ai/entity/RobotTaskEntity.java | 91 ++++++++++++++ .../inspect/ai/entity/RobotTaskIdentifyEntity.java | 62 ++++++++++ .../inspect/ai/entity/UserFaceDataEntity.java | 35 ++++++ .../java/com/hnac/hzinfo/inspect/ai/vo/AIData.java | 34 ++++++ .../com/hnac/hzinfo/inspect/ai/vo/ClockDTO.java | 18 +++ .../hnac/hzinfo/inspect/ai/vo/ClockTypeDTO.java | 18 +++ .../hnac/hzinfo/inspect/ai/vo/FaceResponse.java | 19 +++ .../com/hnac/hzinfo/inspect/ai/vo/RobotDTO.java | 18 +++ .../hnac/hzinfo/inspect/ai/vo/RobotTaskDTO.java | 29 +++++ .../hzinfo/inspect/ai/vo/RobotTaskIdentifyDTO.java | 18 +++ .../hnac/hzinfo/inspect/ai/vo/UserFaceDataDTO.java | 18 +++ .../hnac/hzinfo/inspect/ai/vo/VideoReturnDTO.java | 35 ++++++ .../hnac/hzinfo/inspect/obj/entity/InspectPdf.java | 17 +++ .../inspect/obj/entity/ObjectDangerEntity.java | 43 +++++++ .../hzinfo/inspect/obj/entity/ObjectEntity.java | 108 +++++++++++++++++ .../inspect/obj/entity/ObjectTemplateEntity.java | 46 +++++++ .../inspect/obj/entity/ObjectUserEntity.java | 35 ++++++ .../inspect/obj/entity/OtherObjectEntity.java | 112 +++++++++++++++++ .../inspect/obj/entity/ProjectContentEntity.java | 113 +++++++++++++++++ .../hzinfo/inspect/obj/entity/TemplateEntity.java | 61 ++++++++++ .../inspect/obj/entity/TemplateProjectEntity.java | 50 ++++++++ .../inspect/task/entity/TaskObjectEntity.java | 77 ++++++++++++ .../entity/TaskObjectProjectContentEntity.java | 123 +++++++++++++++++++ .../task/entity/TaskObjectProjectEntity.java | 75 ++++++++++++ .../inspect/task/entity/TaskRecordEntity.java | 52 ++++++++ .../inspect/task/entity/TaskResultEntity.java | 32 +++++ .../hzinfo/inspect/task/entity/TaskUserEntity.java | 53 ++++++++ .../mapper/inspect/TaskObjectProjectMapper.java | 4 - .../service/inspect/TaskObjectService.java | 4 - .../service/inspect/TaskRemindManager.java | 1 - .../service/inspect/TaskVideoManager.java | 2 +- .../service/inspect/impl/ContentServiceImpl.java | 12 +- .../inspect/impl/ObjectUserServiceImpl.java | 2 +- .../impl/PlanObjectTemplateServiceImpl.java | 2 +- .../service/inspect/impl/PlanOrgServiceImpl.java | 2 +- .../inspect/impl/PlanPositionServiceImpl.java | 6 +- .../service/inspect/impl/PlanUserServiceImpl.java | 2 +- .../inspect/impl/ProjectContentServiceImpl.java | 3 +- .../service/inspect/impl/ProjectServiceImpl.java | 2 +- .../impl/TaskObjectProjectContentServiceImpl.java | 4 +- .../inspect/impl/TaskObjectProjectServiceImpl.java | 5 +- .../inspect/impl/TaskObjectServiceImpl.java | 6 +- .../inspect/impl/TaskResultServiceImpl.java | 2 +- .../service/inspect/impl/TaskServiceImpl.java | 2 - .../service/inspect/impl/TaskUserServiceImpl.java | 2 +- .../inspect/impl/TemplateProjectServiceImpl.java | 15 +-- .../service/inspect/impl/TemplateServiceImpl.java | 2 +- .../com/hnac/hzinfo/inspect/ai/dto/AIData.java | 34 ------ .../com/hnac/hzinfo/inspect/ai/dto/ClockDTO.java | 18 --- .../hnac/hzinfo/inspect/ai/dto/ClockTypeDTO.java | 18 --- .../hnac/hzinfo/inspect/ai/dto/FaceResponse.java | 19 --- .../com/hnac/hzinfo/inspect/ai/dto/RobotDTO.java | 18 --- .../hnac/hzinfo/inspect/ai/dto/RobotTaskDTO.java | 29 ----- .../inspect/ai/dto/RobotTaskIdentifyDTO.java | 18 --- .../hzinfo/inspect/ai/dto/UserFaceDataDTO.java | 18 --- .../hnac/hzinfo/inspect/ai/dto/VideoReturnDTO.java | 35 ------ .../hzinfo/inspect/ai/entity/CameraInfoEntity.java | 135 --------------------- .../hnac/hzinfo/inspect/ai/entity/ClockEntity.java | 54 --------- .../hzinfo/inspect/ai/entity/ClockTypeEntity.java | 64 ---------- .../hnac/hzinfo/inspect/ai/entity/RobotEntity.java | 59 --------- .../hzinfo/inspect/ai/entity/RobotTaskEntity.java | 91 -------------- .../inspect/ai/entity/RobotTaskIdentifyEntity.java | 62 ---------- .../inspect/ai/entity/UserFaceDataEntity.java | 35 ------ .../ai/service/impl/RobotTaskServiceImpl.java | 7 +- .../ai/service/impl/UserFaceDataServiceImpl.java | 2 +- .../ai/service/impl/VideoTaskAiMqttConsumer.java | 2 +- .../hnac/hzinfo/inspect/obj/entity/InspectPdf.java | 17 --- .../inspect/obj/entity/ObjectDangerEntity.java | 43 ------- .../hzinfo/inspect/obj/entity/ObjectEntity.java | 108 ----------------- .../inspect/obj/entity/ObjectTemplateEntity.java | 46 ------- .../inspect/obj/entity/ObjectUserEntity.java | 35 ------ .../inspect/obj/entity/OtherObjectEntity.java | 112 ----------------- .../inspect/obj/entity/ProjectContentEntity.java | 113 ----------------- .../hzinfo/inspect/obj/entity/TemplateEntity.java | 61 ---------- .../inspect/obj/entity/TemplateProjectEntity.java | 50 -------- .../inspect/task/entity/TaskObjectEntity.java | 77 ------------ .../entity/TaskObjectProjectContentEntity.java | 123 ------------------- .../task/entity/TaskObjectProjectEntity.java | 75 ------------ .../inspect/task/entity/TaskRecordEntity.java | 52 -------- .../inspect/task/entity/TaskResultEntity.java | 32 ----- .../hzinfo/inspect/task/entity/TaskUserEntity.java | 53 -------- .../inspect/task/job/service/TaskVideoManager.java | 2 +- .../main/service/impl/WindHomeServiceImpl.java | 37 +++++- 91 files changed, 1786 insertions(+), 1783 deletions(-) create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/AIData.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockDTO.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockTypeDTO.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/FaceResponse.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotDTO.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskDTO.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskIdentifyDTO.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/UserFaceDataDTO.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/VideoReturnDTO.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/InspectPdf.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java create mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/AIData.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockDTO.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockTypeDTO.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/FaceResponse.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotDTO.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskDTO.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskIdentifyDTO.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/UserFaceDataDTO.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/VideoReturnDTO.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/InspectPdf.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java delete mode 100644 hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java 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 104dde6..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; 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 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 @@ common-api 4.0.0-SNAPSHOT + + com.hnac.hzims + safeproduct-api + 4.0.0-SNAPSHOT + compile + diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..ba20dad --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java @@ -0,0 +1,135 @@ +package com.hnac.hzinfo.inspect.ai.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hnac.hzinfo.inspect.utils.QueryField; +import com.hnac.hzinfo.inspect.utils.SqlCondition; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + + +/** + * 实体类 + * + * @author + */ +@Data +@TableName("hz_st_camera_info") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ImsMonCameraInfo对象", description = "视频巡检、机器人巡检摄像头信息") +public class CameraInfoEntity extends TenantEntity { + + private static final long serialVersionUID = 187639487673L; + + /** + * 摄像头名称 + */ + @QueryField(condition = SqlCondition.LIKE) + @ApiModelProperty(value = "摄像头名称") + private String name; + + /** + * 摄像头类型 + */ + @QueryField(condition = SqlCondition.EQUAL) + @ApiModelProperty(value = "摄像头类型") + private String type; + + /** + * 摄像头地址 + */ + @QueryField(condition = SqlCondition.LIKE) + @ApiModelProperty(value = "摄像头地址") + private String address; + /** + * 配置拍照间隔时间 + */ + @ApiModelProperty(value = "配置拍照间隔时间") + private BigDecimal spanTime; + /** + * 像素值(_x_代表使用原始值，640x480代表强制缩放到640x480) + */ + @ApiModelProperty(value = "像素值(_x_代表使用原始值，640x480代表强制缩放到640x480)") + private String resolution; + /** + * 摄像头IP + */ + @QueryField(condition = SqlCondition.LIKE) + @ApiModelProperty(value = "摄像头IP") + private String ip; + /** + * 摄像头端口 + */ + @QueryField(condition = SqlCondition.EQUAL) + @ApiModelProperty(value = "摄像头端口") + private Integer port; + /** + * 摄像头账号 + */ + @QueryField(condition = SqlCondition.LIKE) + @ApiModelProperty(value = "摄像头账号") + private String user; + /** + * 摄像头账号密码 + */ + @ApiModelProperty(value = "摄像头账号密码") + private String password; + /** + * 告警检测项目（字典表值， 通过 ^ 隔开），字典类型：minitor_item + */ + @QueryField(condition = SqlCondition.LIKE) + @ApiModelProperty(value = "告警检测项目（字典表值， 通过 ^ 隔开），字典类型：minitor_item") + private String monitorItems; + + + /** + * 视频流地址类型 + */ + @ApiModelProperty(value = "视频流地址类型, 字典值：vedio_address_type") + private Long addressType; + /** + * 视频流地址 + */ + @ApiModelProperty(value = "视频流地址") + private String livesourceaddress; + /** + * 监测点编号 + */ + @QueryField(condition = SqlCondition.LIKE) + @ApiModelProperty(value = "监测点编号") + private String pointCode; + /** + * 最后请求时间 + */ + @DateTimeFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @ApiModelProperty(value = "最后请求时间") + private Date lastRequesttime; + /** + * 检测点id + */ + @ApiModelProperty(value = "检测点id") + private Long pointId; + /** + * 是否云台控制 + */ + @ApiModelProperty(value = "是否云台控制") + private Integer isControl; + /** + * 是否平台接入 + */ + @ApiModelProperty(value = "是否平台接入") + private Integer isHikvideo; + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..bb5948a --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java @@ -0,0 +1,54 @@ +package com.hnac.hzinfo.inspect.ai.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import org.springblade.core.tenant.mp.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.time.LocalDateTime; + + +/** + * 实体类 + * + * @author py + */ +@Data +@TableName("hz_st_clock") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "Clock对象", description = "表针识别的表盘记录表") +public class ClockEntity extends TenantEntity { + + private static final long serialVersionUID = -8765183637141826283L; + + /** + * 表名字 + */ + @ApiModelProperty(value = "表名称") + private String name; + + /** + * 表针类型ID + */ + @ApiModelProperty(value = "表针类型ID") + private Long clockTypeId; + /** + * 表针基准指针位置：指针尾x|指针尾y|指针头x|指针头y，不同指针之间通过" ^ " 隔开例如：2.1|3.1|4.2|4.3^2.1|3.1|4.2|4.3 （多个指针，从左开始数）默认为0|0|0|0 ， 需要人为校准，如果觉得精确度不行，再设置该字段值 + */ + @ApiModelProperty(value = "表针基准指针位置：指针尾x|指针尾y|指针头x|指针头y，不同指针之间通过 ^ 隔开例如：2.1|3.1|4.2|4.3^2.1|3.1|4.2|4.3 ") + private String pointerBaseValues; + /** + * 视频巡检摄像机ID + */ + @ApiModelProperty(value = "视频巡检摄像机ID") + private Long cameraId; + /** + * 表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0', + * 表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录 + */ + @ApiModelProperty(value = "表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录") + private String cameraAddr; + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..8f5c978 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java @@ -0,0 +1,64 @@ +package com.hnac.hzinfo.inspect.ai.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.ToString; +import org.springblade.core.tenant.mp.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.time.LocalDateTime; + + +/** + * 实体类 + * + * @author py + */ +@Data +@TableName("hz_st_clock_type") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ClockType对象", description = "表针识别的表盘类型") +@ToString +public class ClockTypeEntity extends TenantEntity { + + private static final long serialVersionUID = 2365864357228801446L; + + /** + * 表盘名称 + */ + @ApiModelProperty(value = "表盘名称") + private String clockName; + /** + * 指针数量 + */ + @ApiModelProperty(value = "指针数量") + private Integer pointerNum; + /** + * 刻度对应值 例如：0|10^90|30,0|10^90|30 （0、90表示弧度，10、30表示测量值，弧度与测量值直接用 | 分隔开；0|10表示一组值，多组值之间通过” ^ “隔开，多个指针之间通过 , 隔开，从左开始数） + */ + @ApiModelProperty(value = "刻度对应值 例如：0|10^90|30,0|10^90|30 （0、90表示弧度，10、30表示测量值，弧度与测量值直接用 | 分隔开；0|10表示一组值，多组值之间通过” ^ “隔开，多个指针之间通过 , 隔开，从左开始数）") + private String scaleValues; + /** + * 指针起始弧度值，0|90^0|180（0|90 表示指针1（多个指针，从左开始数）的起止值，多个指针数据通过“ ^ ” 隔开） + */ + @ApiModelProperty(value = "指针起始弧度值，0|90^0|180（0|90 表示指针1（多个指针，从左开始数）的起止值，多个指针数据通过“ ^ ” 隔开）") + private String pointerRadians; + /** + * 表盘精度（例如10， 0.1，0.001， 0.0001）等， 多个表针精度通过^ 隔开：0.1^10 + */ + @ApiModelProperty(value = "表盘精度（例如10， 0.1，0.001， 0.0001）等， 多个表针精度通过^ 隔开：0.1^10") + private String clockPrecision; + /** + * 表盘类型 （来源字典表：clockType） + */ + @ApiModelProperty(value = "表盘类型 （来源字典表：clockType）") + private String clockType; + /** + * 测量单位（多个测量值单位之间通过^分割：KV^KW + */ + @ApiModelProperty(value = "测量单位（多个测量值单位之间通过^分割：KV^KW") + private String unit; + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..3a02a3c --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java @@ -0,0 +1,59 @@ +package com.hnac.hzinfo.inspect.ai.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hnac.hzinfo.inspect.utils.QueryField; +import com.hnac.hzinfo.inspect.utils.SqlCondition; +import jdk.nashorn.internal.objects.annotations.Constructor; +import lombok.Builder; +import lombok.NoArgsConstructor; +import org.springblade.core.tenant.mp.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.time.LocalDateTime; + + +/** + * 实体类 + * + * @author Chill + */ +@Data +@TableName("hz_st_robot") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "Robot对象", description = "机器人巡检机器人实体类") +public class RobotEntity extends TenantEntity { + + private static final long serialVersionUID = 4503880134032836625L; + + /** + * 机器人用户ID + */ + @QueryField(condition = SqlCondition.EQUAL) + @ApiModelProperty(value = "机器人用户ID") + private Long userId; + + /** + * 机器人带的摄像头ID + */ + @QueryField(condition = SqlCondition.EQUAL) + @ApiModelProperty(value = "机器人带的摄像头ID, 多个摄像头通过 , 隔开") + private String cameraId; + + /** + * 机器人名称 + */ + @QueryField(condition = SqlCondition.LIKE) + @ApiModelProperty(value = "机器人名称") + private String name; + + /** + * 描述信息 + */ + @QueryField(condition = SqlCondition.LIKE) + @ApiModelProperty(value = "描述信息") + private Long remark; + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..53bc46c --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java @@ -0,0 +1,91 @@ +package com.hnac.hzinfo.inspect.ai.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.hnac.hzinfo.inspect.utils.QueryField; +import com.hnac.hzinfo.inspect.utils.SqlCondition; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.util.List; + + +/** + * 实体类 + * 这个表是机器人操作的任务表，与我们的巡检任务不是一回事 + * + * @author py + */ +@Data +@TableName("hz_st_robot_task") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "RobotTask对象", description = "巡检项目内容机器人任务表") +public class RobotTaskEntity extends TenantEntity { + + private static final long serialVersionUID = 1502971713296633995L; + + + /** + * 智能巡检任务类型， 1 视频巡检, 2 机器人巡检(默认） + */ + @ApiModelProperty(value = "智能巡检任务类型") + private String type; + + /** + * 摄像头id + */ + @ApiModelProperty(value = "摄像头id") + private Long cameraId; + + /** + * 机械臂参数 ：一个数组： 1,2,3,4,5,6 + */ + @ApiModelProperty(value = "机械臂参数 ：一个数组： 1,2,3,4,5,6 数和数之间通过,隔开") + private String machineParams; + + /** + * 机械臂伸缩参数 ： 0 不变，1 伸 2 缩 + */ + @ApiModelProperty(value = "机械臂伸缩参数 ： 字典值 flexibleFlag ： 0 不变，1 伸 2 缩") + private String flexibleFlag; + + /** + * 任务名称 + */ + @QueryField(condition = SqlCondition.LIKE) + @ApiModelProperty(value = "任务名称") + private String name; + + /** + * 任务类型 ： 0图片,1识别,10热成像 + */ + @QueryField(condition = SqlCondition.EQUAL) + @ApiModelProperty(value = "任务类型 ： 0图片,1识别,10热成像") + private String checkTypeSon; + /** + * 项目ID + */ + @QueryField(condition = SqlCondition.EQUAL) + @ApiModelProperty(value = "项目ID") + private Long projectId; + + /** + * 内容IDS，ID之间通过英文逗号隔开，内容需要是同一种检测类型子类，如果是识别，所选内容需要是同一个图上 + */ + @ApiModelProperty(value = "内容IDS，ID之间通过英文逗号隔开，内容需要是同一种检测类型子类，如果是识别，所选内容需要是同一个图上") + private String contentIds; + + /** + * 机器人任务 - 识别参数 + */ + @TableField(exist=false) + @ApiModelProperty(value = "机器人任务 - 识别参数") + private List identifyParams; + + + + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..0c54704 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java @@ -0,0 +1,62 @@ +package com.hnac.hzinfo.inspect.ai.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.hnac.hzinfo.inspect.obj.entity.ContentEntity; +import com.hnac.hzinfo.inspect.utils.QueryField; +import com.hnac.hzinfo.inspect.utils.SqlCondition; +import org.springblade.core.tenant.mp.TenantEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.time.LocalDateTime; +import java.util.List; + + +/** + * 实体类 + * + * @author py + */ +@Data +@TableName("hz_st_robot_task_identify") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "RobotTaskIdentify对象", description = "机器人任务 - 识别参数表") +public class RobotTaskIdentifyEntity extends TenantEntity { + + private static final long serialVersionUID = -2790294825132358822L; + + /** + * 机器人任务ID + */ + @QueryField(condition = SqlCondition.EQUAL) + @ApiModelProperty(value = "机器人任务ID") + private Long robotTaskId; + /** + * 识别类型：11表针识别，13灯识别， + */ + @QueryField(condition = SqlCondition.EQUAL) + @ApiModelProperty(value = "识别类型：11表针识别，13灯识别，") + private String identifyKey; + /** + * 所在图该类型每行的列数， 5,4 表示第一行5个元素，第二行4个元素；多行直接用逗号隔开 + */ + @ApiModelProperty(value = "所在图该类型每行的列数， 5,4 表示第一行5个元素，第二行4个元素；多行之间用逗号隔开") + private String rowLines; + /** + * 内容IDS，ID之间通过英文逗号隔开，内容需要是同一种检测类型子类，如果是识别，所选内容需要是同一个图上 + */ + @ApiModelProperty(value = "内容IDS，ID之间通过英文逗号隔开，内容需要是同一种检测类型子类，如果是识别，所选内容需要是同一个图上") + private String contentIds; + + + /** + * 机器人任务中的内容 + */ + @TableField(exist=false) + @ApiModelProperty(value = "机器人任务中的内容") + private List contents; + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..3b8cce4 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java @@ -0,0 +1,35 @@ +package com.hnac.hzinfo.inspect.ai.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + + +/** + * 实体类 + * + * @author py + */ +@Data +@TableName("hz_st_user_face_data") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "UserFaceData对象", description = "用户人脸数据表") +public class UserFaceDataEntity extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + @ApiModelProperty(value = "用户ID") + private Long userId; + /** + * 人脸数据 + */ + @ApiModelProperty(value = "人脸数据") + private String faceData; + +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/AIData.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/AIData.java new file mode 100644 index 0000000..2b0a524 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/AIData.java @@ -0,0 +1,34 @@ +package com.hnac.hzinfo.inspect.ai.vo; + +import lombok.Data; +import lombok.ToString; + +/** + * @Author: py + */ +@Data +@ToString +public class AIData { + /** + * 工装识别 未穿工装人数 + */ + private Integer suit; + + /** + * 安全帽 未戴安全帽人数 + */ + private Integer hat; + + /** + * 入侵检测 入侵人数 + */ + private Integer person; + + public static AIData getZeroInstance(){ + AIData data = new AIData(); + data.setSuit(0); + data.setHat(0); + data.setPerson(0); + return data; + } +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockDTO.java new file mode 100644 index 0000000..112b47b --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockDTO.java @@ -0,0 +1,18 @@ +package com.hnac.hzinfo.inspect.ai.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.hnac.hzinfo.inspect.ai.entity.ClockEntity; + +/** + * 模型DTO + * + * @author Chill + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ClockDTO extends ClockEntity { + + private static final long serialVersionUID = 1L; + +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockTypeDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockTypeDTO.java new file mode 100644 index 0000000..3147ebd --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockTypeDTO.java @@ -0,0 +1,18 @@ +package com.hnac.hzinfo.inspect.ai.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.hnac.hzinfo.inspect.ai.entity.ClockTypeEntity; + +/** + * 模型DTO + * + * @author Chill + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ClockTypeDTO extends ClockTypeEntity { + + private static final long serialVersionUID = 1L; + +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/FaceResponse.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/FaceResponse.java new file mode 100644 index 0000000..423751c --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/FaceResponse.java @@ -0,0 +1,19 @@ +package com.hnac.hzinfo.inspect.ai.vo; + +import lombok.Data; +import lombok.ToString; + +import java.util.List; + +/** + * 人脸返回数据格式 + * @Author: py + */ +@Data +@ToString +public class FaceResponse { + private String code; + private String status; + private String msg; + private List data; +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotDTO.java new file mode 100644 index 0000000..3f16038 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotDTO.java @@ -0,0 +1,18 @@ +package com.hnac.hzinfo.inspect.ai.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.hnac.hzinfo.inspect.ai.entity.RobotEntity; + +/** + * 模型DTO + * + * @author Chill + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class RobotDTO extends RobotEntity { + + private static final long serialVersionUID = -1670403359532835429L; + +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskDTO.java new file mode 100644 index 0000000..0116ef7 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskDTO.java @@ -0,0 +1,29 @@ +package com.hnac.hzinfo.inspect.ai.vo; + +import com.hnac.hzinfo.inspect.ai.entity.RobotTaskIdentifyEntity; +import com.hnac.hzinfo.inspect.utils.QueryField; +import com.hnac.hzinfo.inspect.utils.SqlCondition; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.hnac.hzinfo.inspect.ai.entity.RobotTaskEntity; + +import java.util.List; + +/** + * 模型DTO + * + * @author Chill + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "RobotTask对象", description = "巡检项目内容机器人任务表") +public class RobotTaskDTO extends RobotTaskEntity { + + private static final long serialVersionUID = 8445346022067680992L; + + + + +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskIdentifyDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskIdentifyDTO.java new file mode 100644 index 0000000..b579af2 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskIdentifyDTO.java @@ -0,0 +1,18 @@ +package com.hnac.hzinfo.inspect.ai.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import com.hnac.hzinfo.inspect.ai.entity.RobotTaskIdentifyEntity; + +/** + * 模型DTO + * + * @author + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class RobotTaskIdentifyDTO extends RobotTaskIdentifyEntity { + + private static final long serialVersionUID = 4350560090643971547L; + +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/UserFaceDataDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/UserFaceDataDTO.java new file mode 100644 index 0000000..4914d9a --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/UserFaceDataDTO.java @@ -0,0 +1,18 @@ +package com.hnac.hzinfo.inspect.ai.vo; + +import com.hnac.hzinfo.inspect.ai.entity.UserFaceDataEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 模型DTO + * + * @author py + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class UserFaceDataDTO extends UserFaceDataEntity { + + private static final long serialVersionUID = 1L; + +} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/VideoReturnDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/VideoReturnDTO.java new file mode 100644 index 0000000..9ac1138 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/VideoReturnDTO.java @@ -0,0 +1,35 @@ +package com.hnac.hzinfo.inspect.ai.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * 视频巡检 胡晓往MQ中推送的数据结构 + * @Author: py + */ +@Data +@ToString +public class VideoReturnDTO { + private static final long serialVersionUID = 4350560090643971548L; + + private String video; + + private String pic; + + @DateTimeFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @ApiModelProperty(value = "时间") + private Date time; + + private AIData data; + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..88403ec --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/InspectPdf.java @@ -0,0 +1,17 @@ +package com.hnac.hzinfo.inspect.obj.entity; + +import lombok.Data; + +/** + * pdf 模板字段 + */ +@Data +public class InspectPdf { + private String data_1; + + private String data_2; + + private String data_3; + + private String data_4; +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..3df07a5 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java @@ -0,0 +1,43 @@ +package com.hnac.hzinfo.inspect.obj.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + + +/** + * 实体类 + * + * @author Chill + */ +@Data +@TableName("hz_st_re_object_danger") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ObjectDanger对象", description = "巡检对象危险点关联表( 一个巡检对象对应多个危险点）") +public class ObjectDangerEntity extends TenantEntity { + + private static final long serialVersionUID = 6190850398432879394L; + + /** + * 巡检对象ID + */ + @ApiModelProperty(value = "巡检对象ID") + private Long objectId; + + /** + * 危险点ID + */ + @ApiModelProperty(value = "危险点ID") + private Long dangerId; + + /** + * 排序 + */ + @ApiModelProperty(value = "排序") + private Integer sort; + + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..4a7efdb --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java @@ -0,0 +1,108 @@ +package com.hnac.hzinfo.inspect.obj.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import com.hnac.hzims.safeproduct.entity.DangerSourceEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.support.QueryField; +import org.springblade.core.mp.support.SqlCondition; +import org.springblade.core.tenant.mp.TenantEntity; + +import javax.validation.constraints.Size; +import java.math.BigDecimal; +import java.util.List; + + +/** + * 巡检对象实体类 + * + * @author ninglong + */ +@Data +@TableName("hz_st_re_object") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "巡检对象", description = "巡检对象") +public class ObjectEntity extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 对象编码 + */ + @ApiModelProperty(value = "对象编码") + private String code; + + @ApiModelProperty("设备编码") + private String emCode; + /** + * 对象名称 + */ + @ApiModelProperty(value = "对象名称,长度必须为1到128") + @Size(min=1,max = 128,message ="对象名称长度必须为1到128") + private String name; + /** + * 地理位置 + */ + @ApiModelProperty(value = "地理位置,长度必须为1到128") + @Size(min=1,max = 128,message ="地理位置长度必须为1到128") + private String address; + /** + * 经度(东经) + */ + @ApiModelProperty(value = "经度(东经)") + @JsonSerialize(nullsUsing = NullSerializer.class) + private BigDecimal lgtd; + /** + * 纬度(北纬) + */ + @ApiModelProperty(value = "纬度(北纬)") + @JsonSerialize(nullsUsing = NullSerializer.class) + private BigDecimal lttd; + /** + * 对象来源 对象来源于哪一个表 + */ + @ApiModelProperty(value = "对象来源 对象来源于哪一个表") + private String tableCode; + /** + * 对象实际ID 对象所在的来源表对应的真实ID + */ + @ApiModelProperty(value = "对象实际ID 对象所在的来源表对应的真实ID") + private Long realId; + /** + * 对象描述 + */ + @ApiModelProperty(value = "对象描述,长度必须为0到512") + @Size(min=0,max = 512,message ="对象描述长度必须为0到512") + private String description; + + /** + * 支持的巡检类型 0普通巡检，1视频自动巡检，2机器人巡检 + */ + @ApiModelProperty(value = "inspectType 支持的巡检类型 0普通巡检，1视频自动巡检，2机器人巡检") + @QueryField(condition = SqlCondition.EQUAL) + private String supportAutoVideo; + + + /** + * 对象危险点list + */ + @TableField(exist = false) + @ApiModelProperty(value = "对象危险点list") + private List objectDangers; + + /** + * 对象危险点详情list + */ + @TableField(exist = false) + @ApiModelProperty(value = "对象危险点详情list") + private List dangerSources; + + @ApiModelProperty(value = "设备编号，按逗号分隔") + @QueryField(condition = SqlCondition.LIKE) + private String emCodes; +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..c27d8af --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java @@ -0,0 +1,46 @@ +package com.hnac.hzinfo.inspect.obj.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import org.springblade.core.mp.base.BaseEntity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@Data +@ApiModel +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Builder +@TableName(value="hz_st_re_object_template") +public class ObjectTemplateEntity extends BaseEntity { + + private static final long serialVersionUID = 3611587990613010673L; + + @ApiModelProperty(value = "模板id") + private Long templateId; + @ApiModelProperty(value = "对象id") + private Long objectId; + + + @ApiModelProperty(value = "模板编码") + @TableField(exist = false) + private String code; + @ApiModelProperty(value = "模板名称") + @TableField(exist = false) + private String name; + + /** + * 支持的巡检类型 0普通巡检，1视频自动巡检，2机器人巡检 + */ + @ApiModelProperty(value = "inspectType 支持的巡检类型 0普通巡检，1视频自动巡检，2机器人巡检") + @TableField(exist = false) + private String supportAutoVideo; +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..b09b7bd --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java @@ -0,0 +1,35 @@ +/** + * + */ +package com.hnac.hzinfo.inspect.obj.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 巡检对象用户 + * @author ninglong + */ +@Data +@ApiModel +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Builder +@TableName(value="hz_st_re_object_user") +public class ObjectUserEntity extends TenantEntity { + + private static final long serialVersionUID = 1224431667042529779L; + + @ApiModelProperty(value="对象id") + private Long objectId; + + @ApiModelProperty(value="用户id") + private Long userId; + + @ApiModelProperty(value = "模板id") + private Long templateId; +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..27ca125 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java @@ -0,0 +1,112 @@ +package com.hnac.hzinfo.inspect.obj.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +import javax.validation.constraints.Size; +import java.math.BigDecimal; +import java.util.Date; + + +/** + * 巡检对象实体类 + * + * @author py + */ +@Data +@TableName("hz_st_other_object") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "其他巡检对象", description = "其他巡检对象") +public class OtherObjectEntity extends TenantEntity { + + private static final long serialVersionUID = 5811271564051268417L; + + @TableField(exist = false) + @ApiModelProperty("主键id") + private Long id; + + @TableField(exist = false) + @ApiModelProperty("创建人") + private Long createUser; + + @TableField(exist = false) + @ApiModelProperty("创建部门") + private Long createDept; + + @TableField(exist = false) + @ApiModelProperty("创建时间") + private Date createTime; + + @TableField(exist = false) + @ApiModelProperty("更新人") + private Long updateUser; + + @TableField(exist = false) + @ApiModelProperty("更新时间") + private Date updateTime; + + @TableField(exist = false) + @ApiModelProperty("业务状态") + private Integer status; + + @TableField(exist = false) + @ApiModelProperty("是否已删除") + private Integer isDeleted; + + + /** + * 来源类型 + */ + @ApiModelProperty(value = "来源类型") + private String type; + + /** + * 对象编码 + */ + @ApiModelProperty(value = "对象编码") + private String code; + + /** + * 对象名称 + */ + @ApiModelProperty(value = "对象名称,长度必须为1到128") + @Size(min=1,max = 128,message ="对象名称长度必须为1到128") + private String name; + + /** + * 地理位置 + */ + @ApiModelProperty(value = "地理位置,长度必须为1到128") + @Size(min=1,max = 128,message ="地理位置长度必须为1到128") + private String address; + /** + * 经度(东经) + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ApiModelProperty(value = "经度(东经)") + private BigDecimal lgtd; + /** + * 纬度(北纬) + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ApiModelProperty(value = "纬度(北纬)") + private BigDecimal lttd; + /** + * 对象来源 对象来源于哪一个表 + */ + @ApiModelProperty(value = "对象来源 对象来源于哪一个表") + private String tableCode; + /** + * 对象实际ID 对象所在的来源表对应的真实ID + */ + @ApiModelProperty(value = "对象实际ID 对象所在的来源表对应的真实ID") + private Long realId; + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..508c4f6 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java @@ -0,0 +1,113 @@ +package com.hnac.hzinfo.inspect.obj.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import org.springblade.core.mp.base.BaseEntity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@Data +@ApiModel +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Builder +@TableName(value="hz_st_re_project_content") +public class ProjectContentEntity extends BaseEntity { + + private static final long serialVersionUID = 735528015136698761L; + + @ApiModelProperty(value = "项目id") + private Long projectId; + @ApiModelProperty(value = "内容id") + private Long contentId; + @ApiModelProperty(value = "排序") + private Integer sort; + + /** + * 内容编码 + */ + @ApiModelProperty(value = "内容编码") + @TableField(exist = false) + private String code; + /** + * 内容名称 + */ + @ApiModelProperty(value = "内容名称") + @TableField(exist = false) + private String name; + + /** + * 记录类型 0不记录 1仅选择 2仅记值 3选择并记值 + */ + @ApiModelProperty(value = "记录类型 0不记录 1仅选择 2仅记值 3选择并记值") + @TableField(exist = false) + private String recordType; + /** + * 检测类型 + */ + @ApiModelProperty(value = "检测类型") + @TableField(exist = false) + private String checkType; + + /** + * 检测类型子类 + */ + @ApiModelProperty(value = "检测类型子类") + @TableField(exist = false) + private String checkTypeSon; + + /** + * 表针识别，表盘ID + */ + @ApiModelProperty(value = "表针识别，表盘ID") + @TableField(exist = false) + private Long clockId; + + /** + * 视频巡检摄像机ID + */ + @ApiModelProperty(value = "视频巡检摄像机ID") + @TableField(exist = false) + private Long cameraId; + + /** + * 开关/灯/表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0 + */ + @ApiModelProperty(value = "开关/灯/表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0") + @TableField(exist = false) + private String cameraAddr; + + /** + * 其他参数，例如多联断路器内断路器的个数 + */ + @ApiModelProperty(value = "其他参数，例如多联断路器内断路器的个数") + @TableField(exist = false) + private String otherParam; + + /** + * 校验值，用来判断当前值是否正确：枚举数据通过 “ , ”隔开, 区间通过~隔开 + */ + @ApiModelProperty(value = "校验值，用来判断当前值是否正确：枚举数据通过 “ , ”隔开, 区间通过~隔开") + @TableField(exist = false) + private String checkVal; + + /** + * 记值方式为选择时选择值 + */ + @ApiModelProperty(value = "记值方式为选择时选择值") + @TableField(exist = false) + private String dictType; + + @ApiModelProperty(value = "检测标准") + @TableField(exist = false) + private String description; + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..3803f95 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java @@ -0,0 +1,61 @@ +package com.hnac.hzinfo.inspect.obj.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.google.common.collect.Lists; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +import javax.validation.constraints.Size; +import java.util.List; + + +/** + * 实体类 + * + * @author Chill + */ +@Data +@TableName("hz_st_re_template") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "巡检模板对象", description = "") +public class TemplateEntity extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 模板代码 + */ + @ApiModelProperty(value = "模板代码") + private String code; + /** + * 模板名称 + */ + @ApiModelProperty(value = "模板名称长度必须为1到128") + @Size(min=1,max = 128,message ="模板名称长度必须为1到128") + private String name; + /** + * 模板描述 + */ + @ApiModelProperty(value = "模板描述长度必须为0到512") + @Size(min=0,max = 512,message ="模板描述长度必须为0到512") + private String description; + /** + * 是否重复记录 0 不允许 1允许 + */ + @ApiModelProperty(value = "是否重复记录 0 不允许 1允许") + private String duplicateRecord; + + @TableField(exist = false) + @ApiModelProperty(value = "需要过滤的模板id") + private List ids = Lists.newArrayList(); + + /** + * 支持的巡检类型 0普通巡检，1视频自动巡检，2机器人巡检 + */ + @ApiModelProperty(value = "inspectType 支持的巡检类型 0普通巡检，1视频自动巡检，2机器人巡检") + private String supportAutoVideo; +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..c121555 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java @@ -0,0 +1,50 @@ +package com.hnac.hzinfo.inspect.obj.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import org.springblade.core.mp.base.BaseEntity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@Data +@ApiModel +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Builder +@TableName(value="hz_st_re_template_project") +public class TemplateProjectEntity extends BaseEntity { + + private static final long serialVersionUID = 1874573847442392682L; + + @ApiModelProperty(value = "模板id") + private Long templateId; + @ApiModelProperty(value = "项目id") + private Long projectId; + @ApiModelProperty(value = "排序") + private Integer sort; + + /** + * 项目编码 + */ + @ApiModelProperty(value = "项目编码") + @TableField(exist = false) + private String code; + /** + * 项目名称 + */ + @ApiModelProperty(value = "项目名称") + @TableField(exist = false) + private String name; + + @ApiModelProperty(value = "描述") + @TableField(exist = false) + private String description; +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..59d0571 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java @@ -0,0 +1,77 @@ +package com.hnac.hzinfo.inspect.task.entity; + +import java.math.BigDecimal; +import java.util.List; + +import org.springblade.core.tenant.mp.TenantEntity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.google.common.collect.Lists; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 实体类 + * + * @author Chill + */ +@Data +@TableName("hz_st_ex_object") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "TaskObject对象", description = "") +public class TaskObjectEntity extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private Long taskId; + /** + * 对象ID + */ + @ApiModelProperty(value = "对象ID") + private Long objectId; + /** + * 对象编码 + */ + @ApiModelProperty(value = "对象编码") + private String code; + /** + * 对象名称 + */ + @ApiModelProperty(value = "对象名称") + private String name; + + /** + * 地理位置 + */ + @ApiModelProperty(value = "地理位置") + private String address; + /** + * 经度(东经) + */ + @ApiModelProperty(value = "经度(东经)") + private BigDecimal lgtd; + /** + * 纬度(北纬) + */ + @ApiModelProperty(value = "纬度(北纬)") + private BigDecimal lttd; + /** + * 是否重复记录 0 不允许 1允许 + */ + @ApiModelProperty(value = "是否重复记录 0 不允许 1允许") + private String duplicateRecord; + + @TableField(exist=false) + @ApiModelProperty(value = "任务对象项目") + private List projects = Lists.newArrayList(); + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..33b939c --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java @@ -0,0 +1,123 @@ +package com.hnac.hzinfo.inspect.task.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.NullSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + + +/** + * 实体类 + * + * @author Chill + */ +@Data +@TableName("hz_st_ex_object_project_content") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "TaskObjectProjectContent对象", description = "") +public class TaskObjectProjectContentEntity extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private Long taskId; + /** + * 对象ID + */ + @ApiModelProperty(value = "对象ID") + private Long objectId; + /** + * 项目ID + */ + @ApiModelProperty(value = "项目ID") + private Long projectId; + /** + * 内容ID + */ + @ApiModelProperty(value = "内容ID") + private Long contentId; + /** + * 内容编码:由系统自动生成自动生成 + */ + @ApiModelProperty(value = "内容编码:由系统自动生成自动生成") + private String code; + /** + * 内容名称 + */ + @ApiModelProperty(value = "内容名称") + private String name; + /** + * 内容描述 + */ + @ApiModelProperty(value = "内容描述") + private String description; + + /** + * 完成标识 + */ + @ApiModelProperty(value = "完成标识 0 不可用 1 可用") + private String available; + /** + * 检测类型 + */ + @ApiModelProperty(value = "检测类型") + private String checkType; + /** + * 记录类型 + */ + @ApiModelProperty(value = "记录类型") + private String recordType; + + /** + * 表针识别，表盘ID + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ApiModelProperty(value = "表针识别，表盘ID") + private Long clockId; + + /** + * 视频巡检摄像机ID + */ + @JsonSerialize(nullsUsing = NullSerializer.class) + @ApiModelProperty(value = "视频巡检摄像机ID") + private Long cameraId; + + /** + * 检测类型子类 + */ + @ApiModelProperty(value = "检测类型子类") + private String checkTypeSon; + + /** + * 开关/灯/表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0 + */ + @ApiModelProperty(value = "开关/灯/表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0") + private String cameraAddr; + + + /** + * 其他参数，例如多联断路器内断路器的个数 + */ + @ApiModelProperty(value = "其他参数，例如多联断路器内断路器的个数") + private String otherParam; + + /** + * 校验值，用来判断当前值是否正确：枚举数据通过 “ , ”隔开, 区间通过~隔开 + */ + @ApiModelProperty(value = "校验值，用来判断当前值是否正确：枚举数据通过 “ , ”隔开, 区间通过~隔开") + private String checkVal; + + /** + * 记值方式为选择时选择值 + */ + @ApiModelProperty(value = "记值方式为选择时选择值") + private String dictType; + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..2aaaeec --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java @@ -0,0 +1,75 @@ +package com.hnac.hzinfo.inspect.task.entity; + +import java.util.List; + +import org.springblade.core.tenant.mp.TenantEntity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.google.common.collect.Lists; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 实体类 + * + * @author Chill + */ +@Data +@TableName("hz_st_ex_object_project") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "TaskObjectProject对象", description = "") +public class TaskObjectProjectEntity extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private Long taskId; + /** + * 对象ID + */ + @ApiModelProperty(value = "对象ID") + private Long objectId; + /** + * 项目ID + */ + @ApiModelProperty(value = "项目ID") + private Long projectId; + + + /** + * 目标编码 + */ + @ApiModelProperty(value = "目标编码") + private String code; + /** + * 目标名称 + */ + @ApiModelProperty(value = "目标名称") + private String name; + + /** + * 目标描述 + */ + @ApiModelProperty(value = "目标描述") + private String description; + + @TableField(exist=false) + @ApiModelProperty(value = "任务对象项目内容") + private List contents = Lists.newArrayList(); + + /** + * 用户ID + */ + @TableField(exist=false) + @ApiModelProperty(value = "用户ID") + private Long userId; + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..c8efd1f --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java @@ -0,0 +1,52 @@ +package com.hnac.hzinfo.inspect.task.entity; + +import org.springblade.core.tenant.mp.TenantEntity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 实体类 + * + * @author Chill + */ +@Data +@TableName("hz_st_task_record") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "巡检报备对象", description = "巡检报备") +public class TaskRecordEntity extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private Long taskId; + /** + * 报备人 + */ + @ApiModelProperty(value = "报备人") + private Long creator; + /** + * 报备原因 + */ + @ApiModelProperty(value = "报备原因") + private String reason; + /** + * 报备模式 0 任务报备 1 人员报备 + */ + @ApiModelProperty(value = "报备模式 0 任务报备 1 人员报备") + private String type; + /** + * 任务执行人 + */ + @ApiModelProperty(value = "任务执行人") + private Long executor; + +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..3e96769 --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java @@ -0,0 +1,32 @@ +package com.hnac.hzinfo.inspect.task.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 任务派发结果表 + * @author ninglong + * @create 2020-08-24 10:32 + */ +@Data +@TableName("hz_st_hi_task_result") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "任务派发结果", description = "") +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class TaskResultEntity extends TenantEntity { + + /** + * 计划ID + */ + @ApiModelProperty(value = "计划ID") + private Long planId; + @ApiModelProperty(value = "批次号") + private String batchNumber; + @ApiModelProperty(value = "原因") + private String reason; +} diff --git a/hzims-service-api/inspect-api/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 new file mode 100644 index 0000000..4ff234c --- /dev/null +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java @@ -0,0 +1,53 @@ +package com.hnac.hzinfo.inspect.task.entity; + +import java.time.LocalDateTime; + +import org.springblade.core.tenant.mp.TenantEntity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + + +/** + * 实体类 + * @author Chill + */ +@Data +@TableName("hz_st_ex_task_user") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "巡检任务用户", description = "巡检任务用户") +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class TaskUserEntity extends TenantEntity { + + private static final long serialVersionUID = 1L; + + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private Long taskId; + /** + * 用户ID + */ + @ApiModelProperty(value = "用户ID") + private Long userId; + /** + * 领用状态 0:未领用 1:已领用 每条任务可以存在多个用户，但是只有一个领用人 + */ + @ApiModelProperty(value = "领用状态 0:未领用 1:已领用 每条任务可以存在多个用户，但是只有一个领用人") + private String claimStatus; + /** + * 计划模式 0 人员 1岗位 2机构 3自由模式 4 自由人模式 + */ + @ApiModelProperty(value = "领用时间") + private LocalDateTime claimTime; +} \ No newline at end of file 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 index 6279cdf..fdef106 100644 --- 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 @@ -2,11 +2,7 @@ package com.hnac.hzims.scheduled.mapper.inspect; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzinfo.inspect.task.entity.TaskObjectProjectEntity; -import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * @author ysj 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 index 2b6c0d6..fb033a0 100644 --- 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 @@ -1,12 +1,8 @@ package com.hnac.hzims.scheduled.service.inspect; import com.hnac.hzinfo.inspect.task.entity.TaskObjectEntity; -import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO; -import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO; import org.springblade.core.mp.base.BaseService; -import java.util.List; - /** * @author ysj */ 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 index 94d7f06..5ef3415 100644 --- 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 @@ -8,7 +8,6 @@ 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.hnac.hzinfo.inspect.task.job.HzThreadPool; import com.xxl.job.core.log.XxlJobLogger; import lombok.extern.slf4j.Slf4j; import org.springblade.core.sms.model.SmsResponse; 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 index 23c4340..bb53251 100644 --- 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 @@ -1,6 +1,6 @@ package com.hnac.hzims.scheduled.service.inspect; -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/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 index 21020c5..b182d6e 100644 --- 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 @@ -1,24 +1,14 @@ 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 com.hnac.hzinfo.inspect.obj.mapper.ContentMapper; -import com.hnac.hzinfo.inspect.obj.services.DatabaseCopyHandler; -import com.hnac.hzinfo.inspect.obj.utils.CodeUtils; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.tool.utils.CollectionUtil; -import org.springblade.core.tool.utils.Func; -import org.springblade.core.tool.utils.StringUtil; import org.springframework.stereotype.Service; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; - /** * @author ysj */ 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 index 4da90a4..8f09fa0 100644 --- 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 @@ -1,9 +1,9 @@ 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 com.hnac.hzinfo.inspect.obj.mapper.ObjectUserMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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 index 3dda58f..4e63cdc 100644 --- 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 @@ -1,9 +1,9 @@ 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 com.hnac.hzinfo.inspect.plan.mapper.PlanObjectTemplateMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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 index 3b97ec7..4606dad 100644 --- 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 @@ -1,8 +1,8 @@ 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 com.hnac.hzinfo.inspect.plan.mapper.PlanOrgMapper; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.stereotype.Service; 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 index c61a5f5..2cff9b7 100644 --- 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 @@ -1,9 +1,9 @@ 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 com.hnac.hzinfo.inspect.plan.mapper.PlanPositionMapper; -import com.hnac.hzinfo.inspect.plan.service.IPlanPositionService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; @@ -17,6 +17,6 @@ import org.springframework.stereotype.Service; @Slf4j @AllArgsConstructor @DS("inspect") -public class PlanPositionServiceImpl extends BaseServiceImpl implements IPlanPositionService { +public class PlanPositionServiceImpl extends BaseServiceImpl 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/PlanUserServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/inspect/impl/PlanUserServiceImpl.java index a73e57a..6364750 100644 --- 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 @@ -1,9 +1,9 @@ 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 com.hnac.hzinfo.inspect.plan.mapper.PlanUserMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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 index 69aab3d..d71a052 100644 --- 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 @@ -1,10 +1,9 @@ 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 com.hnac.hzinfo.inspect.obj.mapper.ProjectContentMapper; -import com.hnac.hzinfo.inspect.obj.services.DatabaseCopyHandler; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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 index a41d5b9..6da2ded 100644 --- 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 @@ -1,9 +1,9 @@ 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 com.hnac.hzinfo.inspect.obj.mapper.ProjectMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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 index cdfc58e..f9eb13a 100644 --- 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 @@ -1,16 +1,14 @@ 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 com.hnac.hzinfo.inspect.task.mapper.TaskObjectProjectContentMapper; 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 */ 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 index 9c0b12f..7eeaf59 100644 --- 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 @@ -1,17 +1,14 @@ 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 com.hnac.hzinfo.inspect.task.mapper.TaskObjectProjectMapper; -import com.hnac.hzinfo.inspect.task.vo.TaskObjectProjectOfflineVO; 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 */ 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 index 2b7856d..6fdb9b1 100644 --- 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 @@ -1,18 +1,14 @@ 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 com.hnac.hzinfo.inspect.task.mapper.TaskObjectMapper; -import com.hnac.hzinfo.inspect.task.vo.TaskObjectOfflineVO; -import com.hnac.hzinfo.inspect.task.vo.TaskObjectVO; 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 */ 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 index 438d74d..11f66c0 100644 --- 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 @@ -1,9 +1,9 @@ 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 com.hnac.hzinfo.inspect.task.mapper.TaskResultMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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 925e765..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 @@ -18,8 +18,6 @@ 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.job.service.TaskRemindManager; -import com.hnac.hzinfo.inspect.task.job.service.TaskVideoManager; import com.hnac.hzinfo.inspect.task.vo.DutyInspectTaskVO; import com.xxl.job.core.log.XxlJobLogger; import lombok.AllArgsConstructor; 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 index 34f8911..baf26c8 100644 --- 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 @@ -1,9 +1,9 @@ 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 com.hnac.hzinfo.inspect.task.mapper.TaskUserMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; 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 index bd3aa45..f970386 100644 --- 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 @@ -1,26 +1,13 @@ package com.hnac.hzims.scheduled.service.inspect.impl; import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hnac.hzims.scheduled.mapper.inspect.TemplateProjectMapper; import com.hnac.hzims.scheduled.service.inspect.TemplateProjectService; -import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity; -import com.hnac.hzinfo.inspect.obj.entity.TemplateEntity; import com.hnac.hzinfo.inspect.obj.entity.TemplateProjectEntity; -import com.hnac.hzinfo.inspect.obj.mapper.TemplateProjectMapper; -import com.hnac.hzinfo.inspect.obj.services.DatabaseCopyHandler; -import com.hnac.hzinfo.inspect.obj.services.TemplateService; -import com.hnac.hzinfo.inspect.obj.services.impl.ProjectContentServiceImpl; -import com.hnac.hzinfo.inspect.obj.utils.CodeUtils; -import com.hnac.hzinfo.inspect.obj.vo.ProjectContentDto; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; /** * @author ysj 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 index 1f009da..f4b5b41 100644 --- 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 @@ -1,9 +1,9 @@ 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 com.hnac.hzinfo.inspect.obj.mapper.TemplateMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/AIData.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/AIData.java deleted file mode 100644 index 27617e7..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/AIData.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.dto; - -import lombok.Data; -import lombok.ToString; - -/** - * @Author: py - */ -@Data -@ToString -public class AIData { - /** - * 工装识别 未穿工装人数 - */ - private Integer suit; - - /** - * 安全帽 未戴安全帽人数 - */ - private Integer hat; - - /** - * 入侵检测 入侵人数 - */ - private Integer person; - - public static AIData getZeroInstance(){ - AIData data = new AIData(); - data.setSuit(0); - data.setHat(0); - data.setPerson(0); - return data; - } -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockDTO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockDTO.java deleted file mode 100644 index 6c9d584..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.dto; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import com.hnac.hzinfo.inspect.ai.entity.ClockEntity; - -/** - * 模型DTO - * - * @author Chill - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ClockDTO extends ClockEntity { - - private static final long serialVersionUID = 1L; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockTypeDTO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockTypeDTO.java deleted file mode 100644 index ce26f2f..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockTypeDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.dto; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import com.hnac.hzinfo.inspect.ai.entity.ClockTypeEntity; - -/** - * 模型DTO - * - * @author Chill - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ClockTypeDTO extends ClockTypeEntity { - - private static final long serialVersionUID = 1L; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/FaceResponse.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/FaceResponse.java deleted file mode 100644 index 17dd734..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/FaceResponse.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.dto; - -import lombok.Data; -import lombok.ToString; - -import java.util.List; - -/** - * 人脸返回数据格式 - * @Author: py - */ -@Data -@ToString -public class FaceResponse { - private String code; - private String status; - private String msg; - private List data; -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotDTO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotDTO.java deleted file mode 100644 index aad1275..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.dto; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import com.hnac.hzinfo.inspect.ai.entity.RobotEntity; - -/** - * 模型DTO - * - * @author Chill - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class RobotDTO extends RobotEntity { - - private static final long serialVersionUID = -1670403359532835429L; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskDTO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskDTO.java deleted file mode 100644 index a8c8cf2..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.dto; - -import com.hnac.hzinfo.inspect.ai.entity.RobotTaskIdentifyEntity; -import com.hnac.hzinfo.inspect.utils.QueryField; -import com.hnac.hzinfo.inspect.utils.SqlCondition; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import com.hnac.hzinfo.inspect.ai.entity.RobotTaskEntity; - -import java.util.List; - -/** - * 模型DTO - * - * @author Chill - */ -@Data -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "RobotTask对象", description = "巡检项目内容机器人任务表") -public class RobotTaskDTO extends RobotTaskEntity { - - private static final long serialVersionUID = 8445346022067680992L; - - - - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskIdentifyDTO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskIdentifyDTO.java deleted file mode 100644 index 8bdff02..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskIdentifyDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.dto; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import com.hnac.hzinfo.inspect.ai.entity.RobotTaskIdentifyEntity; - -/** - * 模型DTO - * - * @author - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class RobotTaskIdentifyDTO extends RobotTaskIdentifyEntity { - - private static final long serialVersionUID = 4350560090643971547L; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/UserFaceDataDTO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/UserFaceDataDTO.java deleted file mode 100644 index 1ed3a07..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/UserFaceDataDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.dto; - -import com.hnac.hzinfo.inspect.ai.entity.UserFaceDataEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 模型DTO - * - * @author py - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class UserFaceDataDTO extends UserFaceDataEntity { - - private static final long serialVersionUID = 1L; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/VideoReturnDTO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/VideoReturnDTO.java deleted file mode 100644 index a2a80c5..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/VideoReturnDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.dto; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * 视频巡检 胡晓往MQ中推送的数据结构 - * @Author: py - */ -@Data -@ToString -public class VideoReturnDTO { - private static final long serialVersionUID = 4350560090643971548L; - - private String video; - - private String pic; - - @DateTimeFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - @ApiModelProperty(value = "时间") - private Date time; - - private AIData data; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java deleted file mode 100644 index ba20dad..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hnac.hzinfo.inspect.utils.QueryField; -import com.hnac.hzinfo.inspect.utils.SqlCondition; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.tenant.mp.TenantEntity; -import org.springframework.format.annotation.DateTimeFormat; - -import java.math.BigDecimal; -import java.util.Date; - - -/** - * 实体类 - * - * @author - */ -@Data -@TableName("hz_st_camera_info") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "ImsMonCameraInfo对象", description = "视频巡检、机器人巡检摄像头信息") -public class CameraInfoEntity extends TenantEntity { - - private static final long serialVersionUID = 187639487673L; - - /** - * 摄像头名称 - */ - @QueryField(condition = SqlCondition.LIKE) - @ApiModelProperty(value = "摄像头名称") - private String name; - - /** - * 摄像头类型 - */ - @QueryField(condition = SqlCondition.EQUAL) - @ApiModelProperty(value = "摄像头类型") - private String type; - - /** - * 摄像头地址 - */ - @QueryField(condition = SqlCondition.LIKE) - @ApiModelProperty(value = "摄像头地址") - private String address; - /** - * 配置拍照间隔时间 - */ - @ApiModelProperty(value = "配置拍照间隔时间") - private BigDecimal spanTime; - /** - * 像素值(_x_代表使用原始值，640x480代表强制缩放到640x480) - */ - @ApiModelProperty(value = "像素值(_x_代表使用原始值，640x480代表强制缩放到640x480)") - private String resolution; - /** - * 摄像头IP - */ - @QueryField(condition = SqlCondition.LIKE) - @ApiModelProperty(value = "摄像头IP") - private String ip; - /** - * 摄像头端口 - */ - @QueryField(condition = SqlCondition.EQUAL) - @ApiModelProperty(value = "摄像头端口") - private Integer port; - /** - * 摄像头账号 - */ - @QueryField(condition = SqlCondition.LIKE) - @ApiModelProperty(value = "摄像头账号") - private String user; - /** - * 摄像头账号密码 - */ - @ApiModelProperty(value = "摄像头账号密码") - private String password; - /** - * 告警检测项目（字典表值， 通过 ^ 隔开），字典类型：minitor_item - */ - @QueryField(condition = SqlCondition.LIKE) - @ApiModelProperty(value = "告警检测项目（字典表值， 通过 ^ 隔开），字典类型：minitor_item") - private String monitorItems; - - - /** - * 视频流地址类型 - */ - @ApiModelProperty(value = "视频流地址类型, 字典值：vedio_address_type") - private Long addressType; - /** - * 视频流地址 - */ - @ApiModelProperty(value = "视频流地址") - private String livesourceaddress; - /** - * 监测点编号 - */ - @QueryField(condition = SqlCondition.LIKE) - @ApiModelProperty(value = "监测点编号") - private String pointCode; - /** - * 最后请求时间 - */ - @DateTimeFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss" - ) - @ApiModelProperty(value = "最后请求时间") - private Date lastRequesttime; - /** - * 检测点id - */ - @ApiModelProperty(value = "检测点id") - private Long pointId; - /** - * 是否云台控制 - */ - @ApiModelProperty(value = "是否云台控制") - private Integer isControl; - /** - * 是否平台接入 - */ - @ApiModelProperty(value = "是否平台接入") - private Integer isHikvideo; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java deleted file mode 100644 index bb5948a..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import org.springblade.core.tenant.mp.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.time.LocalDateTime; - - -/** - * 实体类 - * - * @author py - */ -@Data -@TableName("hz_st_clock") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "Clock对象", description = "表针识别的表盘记录表") -public class ClockEntity extends TenantEntity { - - private static final long serialVersionUID = -8765183637141826283L; - - /** - * 表名字 - */ - @ApiModelProperty(value = "表名称") - private String name; - - /** - * 表针类型ID - */ - @ApiModelProperty(value = "表针类型ID") - private Long clockTypeId; - /** - * 表针基准指针位置：指针尾x|指针尾y|指针头x|指针头y，不同指针之间通过" ^ " 隔开例如：2.1|3.1|4.2|4.3^2.1|3.1|4.2|4.3 （多个指针，从左开始数）默认为0|0|0|0 ， 需要人为校准，如果觉得精确度不行，再设置该字段值 - */ - @ApiModelProperty(value = "表针基准指针位置：指针尾x|指针尾y|指针头x|指针头y，不同指针之间通过 ^ 隔开例如：2.1|3.1|4.2|4.3^2.1|3.1|4.2|4.3 ") - private String pointerBaseValues; - /** - * 视频巡检摄像机ID - */ - @ApiModelProperty(value = "视频巡检摄像机ID") - private Long cameraId; - /** - * 表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0', - * 表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录 - */ - @ApiModelProperty(value = "表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录") - private String cameraAddr; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java deleted file mode 100644 index 8f5c978..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.ToString; -import org.springblade.core.tenant.mp.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.time.LocalDateTime; - - -/** - * 实体类 - * - * @author py - */ -@Data -@TableName("hz_st_clock_type") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "ClockType对象", description = "表针识别的表盘类型") -@ToString -public class ClockTypeEntity extends TenantEntity { - - private static final long serialVersionUID = 2365864357228801446L; - - /** - * 表盘名称 - */ - @ApiModelProperty(value = "表盘名称") - private String clockName; - /** - * 指针数量 - */ - @ApiModelProperty(value = "指针数量") - private Integer pointerNum; - /** - * 刻度对应值 例如：0|10^90|30,0|10^90|30 （0、90表示弧度，10、30表示测量值，弧度与测量值直接用 | 分隔开；0|10表示一组值，多组值之间通过” ^ “隔开，多个指针之间通过 , 隔开，从左开始数） - */ - @ApiModelProperty(value = "刻度对应值 例如：0|10^90|30,0|10^90|30 （0、90表示弧度，10、30表示测量值，弧度与测量值直接用 | 分隔开；0|10表示一组值，多组值之间通过” ^ “隔开，多个指针之间通过 , 隔开，从左开始数）") - private String scaleValues; - /** - * 指针起始弧度值，0|90^0|180（0|90 表示指针1（多个指针，从左开始数）的起止值，多个指针数据通过“ ^ ” 隔开） - */ - @ApiModelProperty(value = "指针起始弧度值，0|90^0|180（0|90 表示指针1（多个指针，从左开始数）的起止值，多个指针数据通过“ ^ ” 隔开）") - private String pointerRadians; - /** - * 表盘精度（例如10， 0.1，0.001， 0.0001）等， 多个表针精度通过^ 隔开：0.1^10 - */ - @ApiModelProperty(value = "表盘精度（例如10， 0.1，0.001， 0.0001）等， 多个表针精度通过^ 隔开：0.1^10") - private String clockPrecision; - /** - * 表盘类型 （来源字典表：clockType） - */ - @ApiModelProperty(value = "表盘类型 （来源字典表：clockType）") - private String clockType; - /** - * 测量单位（多个测量值单位之间通过^分割：KV^KW - */ - @ApiModelProperty(value = "测量单位（多个测量值单位之间通过^分割：KV^KW") - private String unit; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java deleted file mode 100644 index 3a02a3c..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.hnac.hzinfo.inspect.utils.QueryField; -import com.hnac.hzinfo.inspect.utils.SqlCondition; -import jdk.nashorn.internal.objects.annotations.Constructor; -import lombok.Builder; -import lombok.NoArgsConstructor; -import org.springblade.core.tenant.mp.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.time.LocalDateTime; - - -/** - * 实体类 - * - * @author Chill - */ -@Data -@TableName("hz_st_robot") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "Robot对象", description = "机器人巡检机器人实体类") -public class RobotEntity extends TenantEntity { - - private static final long serialVersionUID = 4503880134032836625L; - - /** - * 机器人用户ID - */ - @QueryField(condition = SqlCondition.EQUAL) - @ApiModelProperty(value = "机器人用户ID") - private Long userId; - - /** - * 机器人带的摄像头ID - */ - @QueryField(condition = SqlCondition.EQUAL) - @ApiModelProperty(value = "机器人带的摄像头ID, 多个摄像头通过 , 隔开") - private String cameraId; - - /** - * 机器人名称 - */ - @QueryField(condition = SqlCondition.LIKE) - @ApiModelProperty(value = "机器人名称") - private String name; - - /** - * 描述信息 - */ - @QueryField(condition = SqlCondition.LIKE) - @ApiModelProperty(value = "描述信息") - private Long remark; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java deleted file mode 100644 index 53bc46c..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.hnac.hzinfo.inspect.utils.QueryField; -import com.hnac.hzinfo.inspect.utils.SqlCondition; -import lombok.Data; -import lombok.EqualsAndHashCode; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.springblade.core.tenant.mp.TenantEntity; - -import java.util.List; - - -/** - * 实体类 - * 这个表是机器人操作的任务表，与我们的巡检任务不是一回事 - * - * @author py - */ -@Data -@TableName("hz_st_robot_task") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "RobotTask对象", description = "巡检项目内容机器人任务表") -public class RobotTaskEntity extends TenantEntity { - - private static final long serialVersionUID = 1502971713296633995L; - - - /** - * 智能巡检任务类型， 1 视频巡检, 2 机器人巡检(默认） - */ - @ApiModelProperty(value = "智能巡检任务类型") - private String type; - - /** - * 摄像头id - */ - @ApiModelProperty(value = "摄像头id") - private Long cameraId; - - /** - * 机械臂参数 ：一个数组： 1,2,3,4,5,6 - */ - @ApiModelProperty(value = "机械臂参数 ：一个数组： 1,2,3,4,5,6 数和数之间通过,隔开") - private String machineParams; - - /** - * 机械臂伸缩参数 ： 0 不变，1 伸 2 缩 - */ - @ApiModelProperty(value = "机械臂伸缩参数 ： 字典值 flexibleFlag ： 0 不变，1 伸 2 缩") - private String flexibleFlag; - - /** - * 任务名称 - */ - @QueryField(condition = SqlCondition.LIKE) - @ApiModelProperty(value = "任务名称") - private String name; - - /** - * 任务类型 ： 0图片,1识别,10热成像 - */ - @QueryField(condition = SqlCondition.EQUAL) - @ApiModelProperty(value = "任务类型 ： 0图片,1识别,10热成像") - private String checkTypeSon; - /** - * 项目ID - */ - @QueryField(condition = SqlCondition.EQUAL) - @ApiModelProperty(value = "项目ID") - private Long projectId; - - /** - * 内容IDS，ID之间通过英文逗号隔开，内容需要是同一种检测类型子类，如果是识别，所选内容需要是同一个图上 - */ - @ApiModelProperty(value = "内容IDS，ID之间通过英文逗号隔开，内容需要是同一种检测类型子类，如果是识别，所选内容需要是同一个图上") - private String contentIds; - - /** - * 机器人任务 - 识别参数 - */ - @TableField(exist=false) - @ApiModelProperty(value = "机器人任务 - 识别参数") - private List identifyParams; - - - - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java deleted file mode 100644 index 0c54704..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.hnac.hzinfo.inspect.obj.entity.ContentEntity; -import com.hnac.hzinfo.inspect.utils.QueryField; -import com.hnac.hzinfo.inspect.utils.SqlCondition; -import org.springblade.core.tenant.mp.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.time.LocalDateTime; -import java.util.List; - - -/** - * 实体类 - * - * @author py - */ -@Data -@TableName("hz_st_robot_task_identify") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "RobotTaskIdentify对象", description = "机器人任务 - 识别参数表") -public class RobotTaskIdentifyEntity extends TenantEntity { - - private static final long serialVersionUID = -2790294825132358822L; - - /** - * 机器人任务ID - */ - @QueryField(condition = SqlCondition.EQUAL) - @ApiModelProperty(value = "机器人任务ID") - private Long robotTaskId; - /** - * 识别类型：11表针识别，13灯识别， - */ - @QueryField(condition = SqlCondition.EQUAL) - @ApiModelProperty(value = "识别类型：11表针识别，13灯识别，") - private String identifyKey; - /** - * 所在图该类型每行的列数， 5,4 表示第一行5个元素，第二行4个元素；多行直接用逗号隔开 - */ - @ApiModelProperty(value = "所在图该类型每行的列数， 5,4 表示第一行5个元素，第二行4个元素；多行之间用逗号隔开") - private String rowLines; - /** - * 内容IDS，ID之间通过英文逗号隔开，内容需要是同一种检测类型子类，如果是识别，所选内容需要是同一个图上 - */ - @ApiModelProperty(value = "内容IDS，ID之间通过英文逗号隔开，内容需要是同一种检测类型子类，如果是识别，所选内容需要是同一个图上") - private String contentIds; - - - /** - * 机器人任务中的内容 - */ - @TableField(exist=false) - @ApiModelProperty(value = "机器人任务中的内容") - private List contents; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java deleted file mode 100644 index 3b8cce4..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.tenant.mp.TenantEntity; - - -/** - * 实体类 - * - * @author py - */ -@Data -@TableName("hz_st_user_face_data") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "UserFaceData对象", description = "用户人脸数据表") -public class UserFaceDataEntity extends TenantEntity { - - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - @ApiModelProperty(value = "用户ID") - private Long userId; - /** - * 人脸数据 - */ - @ApiModelProperty(value = "人脸数据") - private String faceData; - -} 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/obj/entity/InspectPdf.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/InspectPdf.java deleted file mode 100644 index 88403ec..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/InspectPdf.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hnac.hzinfo.inspect.obj.entity; - -import lombok.Data; - -/** - * pdf 模板字段 - */ -@Data -public class InspectPdf { - private String data_1; - - private String data_2; - - private String data_3; - - private String data_4; -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java deleted file mode 100644 index 3df07a5..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hnac.hzinfo.inspect.obj.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.tenant.mp.TenantEntity; - - -/** - * 实体类 - * - * @author Chill - */ -@Data -@TableName("hz_st_re_object_danger") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "ObjectDanger对象", description = "巡检对象危险点关联表( 一个巡检对象对应多个危险点）") -public class ObjectDangerEntity extends TenantEntity { - - private static final long serialVersionUID = 6190850398432879394L; - - /** - * 巡检对象ID - */ - @ApiModelProperty(value = "巡检对象ID") - private Long objectId; - - /** - * 危险点ID - */ - @ApiModelProperty(value = "危险点ID") - private Long dangerId; - - /** - * 排序 - */ - @ApiModelProperty(value = "排序") - private Integer sort; - - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java deleted file mode 100644 index 4a7efdb..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.hnac.hzinfo.inspect.obj.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.NullSerializer; -import com.hnac.hzims.safeproduct.entity.DangerSourceEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.mp.support.QueryField; -import org.springblade.core.mp.support.SqlCondition; -import org.springblade.core.tenant.mp.TenantEntity; - -import javax.validation.constraints.Size; -import java.math.BigDecimal; -import java.util.List; - - -/** - * 巡检对象实体类 - * - * @author ninglong - */ -@Data -@TableName("hz_st_re_object") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "巡检对象", description = "巡检对象") -public class ObjectEntity extends TenantEntity { - - private static final long serialVersionUID = 1L; - - /** - * 对象编码 - */ - @ApiModelProperty(value = "对象编码") - private String code; - - @ApiModelProperty("设备编码") - private String emCode; - /** - * 对象名称 - */ - @ApiModelProperty(value = "对象名称,长度必须为1到128") - @Size(min=1,max = 128,message ="对象名称长度必须为1到128") - private String name; - /** - * 地理位置 - */ - @ApiModelProperty(value = "地理位置,长度必须为1到128") - @Size(min=1,max = 128,message ="地理位置长度必须为1到128") - private String address; - /** - * 经度(东经) - */ - @ApiModelProperty(value = "经度(东经)") - @JsonSerialize(nullsUsing = NullSerializer.class) - private BigDecimal lgtd; - /** - * 纬度(北纬) - */ - @ApiModelProperty(value = "纬度(北纬)") - @JsonSerialize(nullsUsing = NullSerializer.class) - private BigDecimal lttd; - /** - * 对象来源 对象来源于哪一个表 - */ - @ApiModelProperty(value = "对象来源 对象来源于哪一个表") - private String tableCode; - /** - * 对象实际ID 对象所在的来源表对应的真实ID - */ - @ApiModelProperty(value = "对象实际ID 对象所在的来源表对应的真实ID") - private Long realId; - /** - * 对象描述 - */ - @ApiModelProperty(value = "对象描述,长度必须为0到512") - @Size(min=0,max = 512,message ="对象描述长度必须为0到512") - private String description; - - /** - * 支持的巡检类型 0普通巡检，1视频自动巡检，2机器人巡检 - */ - @ApiModelProperty(value = "inspectType 支持的巡检类型 0普通巡检，1视频自动巡检，2机器人巡检") - @QueryField(condition = SqlCondition.EQUAL) - private String supportAutoVideo; - - - /** - * 对象危险点list - */ - @TableField(exist = false) - @ApiModelProperty(value = "对象危险点list") - private List objectDangers; - - /** - * 对象危险点详情list - */ - @TableField(exist = false) - @ApiModelProperty(value = "对象危险点详情list") - private List dangerSources; - - @ApiModelProperty(value = "设备编号，按逗号分隔") - @QueryField(condition = SqlCondition.LIKE) - private String emCodes; -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java deleted file mode 100644 index c27d8af..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hnac.hzinfo.inspect.obj.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import org.springblade.core.mp.base.BaseEntity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -@Data -@ApiModel -@AllArgsConstructor -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Builder -@TableName(value="hz_st_re_object_template") -public class ObjectTemplateEntity extends BaseEntity { - - private static final long serialVersionUID = 3611587990613010673L; - - @ApiModelProperty(value = "模板id") - private Long templateId; - @ApiModelProperty(value = "对象id") - private Long objectId; - - - @ApiModelProperty(value = "模板编码") - @TableField(exist = false) - private String code; - @ApiModelProperty(value = "模板名称") - @TableField(exist = false) - private String name; - - /** - * 支持的巡检类型 0普通巡检，1视频自动巡检，2机器人巡检 - */ - @ApiModelProperty(value = "inspectType 支持的巡检类型 0普通巡检，1视频自动巡检，2机器人巡检") - @TableField(exist = false) - private String supportAutoVideo; -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java deleted file mode 100644 index b09b7bd..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * - */ -package com.hnac.hzinfo.inspect.obj.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.*; -import org.springblade.core.tenant.mp.TenantEntity; - -/** - * 巡检对象用户 - * @author ninglong - */ -@Data -@ApiModel -@AllArgsConstructor -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Builder -@TableName(value="hz_st_re_object_user") -public class ObjectUserEntity extends TenantEntity { - - private static final long serialVersionUID = 1224431667042529779L; - - @ApiModelProperty(value="对象id") - private Long objectId; - - @ApiModelProperty(value="用户id") - private Long userId; - - @ApiModelProperty(value = "模板id") - private Long templateId; -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java deleted file mode 100644 index 27ca125..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.hnac.hzinfo.inspect.obj.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.NullSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.tenant.mp.TenantEntity; - -import javax.validation.constraints.Size; -import java.math.BigDecimal; -import java.util.Date; - - -/** - * 巡检对象实体类 - * - * @author py - */ -@Data -@TableName("hz_st_other_object") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "其他巡检对象", description = "其他巡检对象") -public class OtherObjectEntity extends TenantEntity { - - private static final long serialVersionUID = 5811271564051268417L; - - @TableField(exist = false) - @ApiModelProperty("主键id") - private Long id; - - @TableField(exist = false) - @ApiModelProperty("创建人") - private Long createUser; - - @TableField(exist = false) - @ApiModelProperty("创建部门") - private Long createDept; - - @TableField(exist = false) - @ApiModelProperty("创建时间") - private Date createTime; - - @TableField(exist = false) - @ApiModelProperty("更新人") - private Long updateUser; - - @TableField(exist = false) - @ApiModelProperty("更新时间") - private Date updateTime; - - @TableField(exist = false) - @ApiModelProperty("业务状态") - private Integer status; - - @TableField(exist = false) - @ApiModelProperty("是否已删除") - private Integer isDeleted; - - - /** - * 来源类型 - */ - @ApiModelProperty(value = "来源类型") - private String type; - - /** - * 对象编码 - */ - @ApiModelProperty(value = "对象编码") - private String code; - - /** - * 对象名称 - */ - @ApiModelProperty(value = "对象名称,长度必须为1到128") - @Size(min=1,max = 128,message ="对象名称长度必须为1到128") - private String name; - - /** - * 地理位置 - */ - @ApiModelProperty(value = "地理位置,长度必须为1到128") - @Size(min=1,max = 128,message ="地理位置长度必须为1到128") - private String address; - /** - * 经度(东经) - */ - @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "经度(东经)") - private BigDecimal lgtd; - /** - * 纬度(北纬) - */ - @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "纬度(北纬)") - private BigDecimal lttd; - /** - * 对象来源 对象来源于哪一个表 - */ - @ApiModelProperty(value = "对象来源 对象来源于哪一个表") - private String tableCode; - /** - * 对象实际ID 对象所在的来源表对应的真实ID - */ - @ApiModelProperty(value = "对象实际ID 对象所在的来源表对应的真实ID") - private Long realId; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java deleted file mode 100644 index 508c4f6..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.hnac.hzinfo.inspect.obj.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import org.springblade.core.mp.base.BaseEntity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -@Data -@ApiModel -@AllArgsConstructor -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Builder -@TableName(value="hz_st_re_project_content") -public class ProjectContentEntity extends BaseEntity { - - private static final long serialVersionUID = 735528015136698761L; - - @ApiModelProperty(value = "项目id") - private Long projectId; - @ApiModelProperty(value = "内容id") - private Long contentId; - @ApiModelProperty(value = "排序") - private Integer sort; - - /** - * 内容编码 - */ - @ApiModelProperty(value = "内容编码") - @TableField(exist = false) - private String code; - /** - * 内容名称 - */ - @ApiModelProperty(value = "内容名称") - @TableField(exist = false) - private String name; - - /** - * 记录类型 0不记录 1仅选择 2仅记值 3选择并记值 - */ - @ApiModelProperty(value = "记录类型 0不记录 1仅选择 2仅记值 3选择并记值") - @TableField(exist = false) - private String recordType; - /** - * 检测类型 - */ - @ApiModelProperty(value = "检测类型") - @TableField(exist = false) - private String checkType; - - /** - * 检测类型子类 - */ - @ApiModelProperty(value = "检测类型子类") - @TableField(exist = false) - private String checkTypeSon; - - /** - * 表针识别，表盘ID - */ - @ApiModelProperty(value = "表针识别，表盘ID") - @TableField(exist = false) - private Long clockId; - - /** - * 视频巡检摄像机ID - */ - @ApiModelProperty(value = "视频巡检摄像机ID") - @TableField(exist = false) - private Long cameraId; - - /** - * 开关/灯/表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0 - */ - @ApiModelProperty(value = "开关/灯/表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0") - @TableField(exist = false) - private String cameraAddr; - - /** - * 其他参数，例如多联断路器内断路器的个数 - */ - @ApiModelProperty(value = "其他参数，例如多联断路器内断路器的个数") - @TableField(exist = false) - private String otherParam; - - /** - * 校验值，用来判断当前值是否正确：枚举数据通过 “ , ”隔开, 区间通过~隔开 - */ - @ApiModelProperty(value = "校验值，用来判断当前值是否正确：枚举数据通过 “ , ”隔开, 区间通过~隔开") - @TableField(exist = false) - private String checkVal; - - /** - * 记值方式为选择时选择值 - */ - @ApiModelProperty(value = "记值方式为选择时选择值") - @TableField(exist = false) - private String dictType; - - @ApiModelProperty(value = "检测标准") - @TableField(exist = false) - private String description; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java deleted file mode 100644 index 3803f95..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.hnac.hzinfo.inspect.obj.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.google.common.collect.Lists; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.tenant.mp.TenantEntity; - -import javax.validation.constraints.Size; -import java.util.List; - - -/** - * 实体类 - * - * @author Chill - */ -@Data -@TableName("hz_st_re_template") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "巡检模板对象", description = "") -public class TemplateEntity extends TenantEntity { - - private static final long serialVersionUID = 1L; - - /** - * 模板代码 - */ - @ApiModelProperty(value = "模板代码") - private String code; - /** - * 模板名称 - */ - @ApiModelProperty(value = "模板名称长度必须为1到128") - @Size(min=1,max = 128,message ="模板名称长度必须为1到128") - private String name; - /** - * 模板描述 - */ - @ApiModelProperty(value = "模板描述长度必须为0到512") - @Size(min=0,max = 512,message ="模板描述长度必须为0到512") - private String description; - /** - * 是否重复记录 0 不允许 1允许 - */ - @ApiModelProperty(value = "是否重复记录 0 不允许 1允许") - private String duplicateRecord; - - @TableField(exist = false) - @ApiModelProperty(value = "需要过滤的模板id") - private List ids = Lists.newArrayList(); - - /** - * 支持的巡检类型 0普通巡检，1视频自动巡检，2机器人巡检 - */ - @ApiModelProperty(value = "inspectType 支持的巡检类型 0普通巡检，1视频自动巡检，2机器人巡检") - private String supportAutoVideo; -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java deleted file mode 100644 index c121555..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.hnac.hzinfo.inspect.obj.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import org.springblade.core.mp.base.BaseEntity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -@Data -@ApiModel -@AllArgsConstructor -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Builder -@TableName(value="hz_st_re_template_project") -public class TemplateProjectEntity extends BaseEntity { - - private static final long serialVersionUID = 1874573847442392682L; - - @ApiModelProperty(value = "模板id") - private Long templateId; - @ApiModelProperty(value = "项目id") - private Long projectId; - @ApiModelProperty(value = "排序") - private Integer sort; - - /** - * 项目编码 - */ - @ApiModelProperty(value = "项目编码") - @TableField(exist = false) - private String code; - /** - * 项目名称 - */ - @ApiModelProperty(value = "项目名称") - @TableField(exist = false) - private String name; - - @ApiModelProperty(value = "描述") - @TableField(exist = false) - private String description; -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java deleted file mode 100644 index 59d0571..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.hnac.hzinfo.inspect.task.entity; - -import java.math.BigDecimal; -import java.util.List; - -import org.springblade.core.tenant.mp.TenantEntity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.google.common.collect.Lists; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -/** - * 实体类 - * - * @author Chill - */ -@Data -@TableName("hz_st_ex_object") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "TaskObject对象", description = "") -public class TaskObjectEntity extends TenantEntity { - - private static final long serialVersionUID = 1L; - - /** - * 任务ID - */ - @ApiModelProperty(value = "任务ID") - private Long taskId; - /** - * 对象ID - */ - @ApiModelProperty(value = "对象ID") - private Long objectId; - /** - * 对象编码 - */ - @ApiModelProperty(value = "对象编码") - private String code; - /** - * 对象名称 - */ - @ApiModelProperty(value = "对象名称") - private String name; - - /** - * 地理位置 - */ - @ApiModelProperty(value = "地理位置") - private String address; - /** - * 经度(东经) - */ - @ApiModelProperty(value = "经度(东经)") - private BigDecimal lgtd; - /** - * 纬度(北纬) - */ - @ApiModelProperty(value = "纬度(北纬)") - private BigDecimal lttd; - /** - * 是否重复记录 0 不允许 1允许 - */ - @ApiModelProperty(value = "是否重复记录 0 不允许 1允许") - private String duplicateRecord; - - @TableField(exist=false) - @ApiModelProperty(value = "任务对象项目") - private List projects = Lists.newArrayList(); - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java deleted file mode 100644 index 33b939c..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.hnac.hzinfo.inspect.task.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.NullSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.tenant.mp.TenantEntity; - - -/** - * 实体类 - * - * @author Chill - */ -@Data -@TableName("hz_st_ex_object_project_content") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "TaskObjectProjectContent对象", description = "") -public class TaskObjectProjectContentEntity extends TenantEntity { - - private static final long serialVersionUID = 1L; - - /** - * 任务ID - */ - @ApiModelProperty(value = "任务ID") - private Long taskId; - /** - * 对象ID - */ - @ApiModelProperty(value = "对象ID") - private Long objectId; - /** - * 项目ID - */ - @ApiModelProperty(value = "项目ID") - private Long projectId; - /** - * 内容ID - */ - @ApiModelProperty(value = "内容ID") - private Long contentId; - /** - * 内容编码:由系统自动生成自动生成 - */ - @ApiModelProperty(value = "内容编码:由系统自动生成自动生成") - private String code; - /** - * 内容名称 - */ - @ApiModelProperty(value = "内容名称") - private String name; - /** - * 内容描述 - */ - @ApiModelProperty(value = "内容描述") - private String description; - - /** - * 完成标识 - */ - @ApiModelProperty(value = "完成标识 0 不可用 1 可用") - private String available; - /** - * 检测类型 - */ - @ApiModelProperty(value = "检测类型") - private String checkType; - /** - * 记录类型 - */ - @ApiModelProperty(value = "记录类型") - private String recordType; - - /** - * 表针识别，表盘ID - */ - @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "表针识别，表盘ID") - private Long clockId; - - /** - * 视频巡检摄像机ID - */ - @JsonSerialize(nullsUsing = NullSerializer.class) - @ApiModelProperty(value = "视频巡检摄像机ID") - private Long cameraId; - - /** - * 检测类型子类 - */ - @ApiModelProperty(value = "检测类型子类") - private String checkTypeSon; - - /** - * 开关/灯/表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0 - */ - @ApiModelProperty(value = "开关/灯/表盘在摄像机可视面二维坐标位置，例如：2,1 表示第三行第二列，行列均从0开始记录,默认 0,0，如果有多张图则：0,0,1( 最后一位表示所在图片，最后一位1表示第二张图)，默认0,0,0") - private String cameraAddr; - - - /** - * 其他参数，例如多联断路器内断路器的个数 - */ - @ApiModelProperty(value = "其他参数，例如多联断路器内断路器的个数") - private String otherParam; - - /** - * 校验值，用来判断当前值是否正确：枚举数据通过 “ , ”隔开, 区间通过~隔开 - */ - @ApiModelProperty(value = "校验值，用来判断当前值是否正确：枚举数据通过 “ , ”隔开, 区间通过~隔开") - private String checkVal; - - /** - * 记值方式为选择时选择值 - */ - @ApiModelProperty(value = "记值方式为选择时选择值") - private String dictType; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java deleted file mode 100644 index 2aaaeec..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.hnac.hzinfo.inspect.task.entity; - -import java.util.List; - -import org.springblade.core.tenant.mp.TenantEntity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.google.common.collect.Lists; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -/** - * 实体类 - * - * @author Chill - */ -@Data -@TableName("hz_st_ex_object_project") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "TaskObjectProject对象", description = "") -public class TaskObjectProjectEntity extends TenantEntity { - - private static final long serialVersionUID = 1L; - - /** - * 任务ID - */ - @ApiModelProperty(value = "任务ID") - private Long taskId; - /** - * 对象ID - */ - @ApiModelProperty(value = "对象ID") - private Long objectId; - /** - * 项目ID - */ - @ApiModelProperty(value = "项目ID") - private Long projectId; - - - /** - * 目标编码 - */ - @ApiModelProperty(value = "目标编码") - private String code; - /** - * 目标名称 - */ - @ApiModelProperty(value = "目标名称") - private String name; - - /** - * 目标描述 - */ - @ApiModelProperty(value = "目标描述") - private String description; - - @TableField(exist=false) - @ApiModelProperty(value = "任务对象项目内容") - private List contents = Lists.newArrayList(); - - /** - * 用户ID - */ - @TableField(exist=false) - @ApiModelProperty(value = "用户ID") - private Long userId; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java deleted file mode 100644 index c8efd1f..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hnac.hzinfo.inspect.task.entity; - -import org.springblade.core.tenant.mp.TenantEntity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -/** - * 实体类 - * - * @author Chill - */ -@Data -@TableName("hz_st_task_record") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "巡检报备对象", description = "巡检报备") -public class TaskRecordEntity extends TenantEntity { - - private static final long serialVersionUID = 1L; - - /** - * 任务ID - */ - @ApiModelProperty(value = "任务ID") - private Long taskId; - /** - * 报备人 - */ - @ApiModelProperty(value = "报备人") - private Long creator; - /** - * 报备原因 - */ - @ApiModelProperty(value = "报备原因") - private String reason; - /** - * 报备模式 0 任务报备 1 人员报备 - */ - @ApiModelProperty(value = "报备模式 0 任务报备 1 人员报备") - private String type; - /** - * 任务执行人 - */ - @ApiModelProperty(value = "任务执行人") - private Long executor; - -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java deleted file mode 100644 index 3e96769..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hnac.hzinfo.inspect.task.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.*; -import org.springblade.core.tenant.mp.TenantEntity; - -/** - * 任务派发结果表 - * @author ninglong - * @create 2020-08-24 10:32 - */ -@Data -@TableName("hz_st_hi_task_result") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "任务派发结果", description = "") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class TaskResultEntity extends TenantEntity { - - /** - * 计划ID - */ - @ApiModelProperty(value = "计划ID") - private Long planId; - @ApiModelProperty(value = "批次号") - private String batchNumber; - @ApiModelProperty(value = "原因") - private String reason; -} diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java deleted file mode 100644 index 4ff234c..0000000 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hnac.hzinfo.inspect.task.entity; - -import java.time.LocalDateTime; - -import org.springblade.core.tenant.mp.TenantEntity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - - -/** - * 实体类 - * @author Chill - */ -@Data -@TableName("hz_st_ex_task_user") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "巡检任务用户", description = "巡检任务用户") -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class TaskUserEntity extends TenantEntity { - - private static final long serialVersionUID = 1L; - - /** - * 任务ID - */ - @ApiModelProperty(value = "任务ID") - private Long taskId; - /** - * 用户ID - */ - @ApiModelProperty(value = "用户ID") - private Long userId; - /** - * 领用状态 0:未领用 1:已领用 每条任务可以存在多个用户，但是只有一个领用人 - */ - @ApiModelProperty(value = "领用状态 0:未领用 1:已领用 每条任务可以存在多个用户，但是只有一个领用人") - private String claimStatus; - /** - * 计划模式 0 人员 1岗位 2机构 3自由模式 4 自由人模式 - */ - @ApiModelProperty(value = "领用时间") - private LocalDateTime claimTime; -} \ No newline at end of file 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/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 winds = windService.list(new LambdaQueryWrapper() {{ 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> result = sysClient.getDeptByCurrentUser(); + if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData())){ + return; + } + Optional 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 result = sysClient.getDept(deptId); + if(result.isSuccess() && ObjectUtil.isNotEmpty(result.getData())){ + areaDuty.setDeptName(result.getData().getDeptName()); + } // 风电统计数据 this.windFill(areaDuty,deptId);