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/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/CameraInfoEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/ClockTypeEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/RobotTaskIdentifyEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/entity/UserFaceDataEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/AIData.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/AIData.java similarity index 92% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/AIData.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/AIData.java index 27617e7..2b0a524 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/AIData.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/AIData.java @@ -1,4 +1,4 @@ -package com.hnac.hzinfo.inspect.ai.dto; +package com.hnac.hzinfo.inspect.ai.vo; import lombok.Data; import lombok.ToString; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockDTO.java similarity index 87% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockDTO.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockDTO.java index 6c9d584..112b47b 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockDTO.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockDTO.java @@ -1,4 +1,4 @@ -package com.hnac.hzinfo.inspect.ai.dto; +package com.hnac.hzinfo.inspect.ai.vo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockTypeDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockTypeDTO.java similarity index 88% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockTypeDTO.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockTypeDTO.java index ce26f2f..3147ebd 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/ClockTypeDTO.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/ClockTypeDTO.java @@ -1,4 +1,4 @@ -package com.hnac.hzinfo.inspect.ai.dto; +package com.hnac.hzinfo.inspect.ai.vo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/FaceResponse.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/FaceResponse.java similarity index 86% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/FaceResponse.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/FaceResponse.java index 17dd734..423751c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/FaceResponse.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/FaceResponse.java @@ -1,4 +1,4 @@ -package com.hnac.hzinfo.inspect.ai.dto; +package com.hnac.hzinfo.inspect.ai.vo; import lombok.Data; import lombok.ToString; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotDTO.java similarity index 88% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotDTO.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotDTO.java index aad1275..3f16038 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotDTO.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotDTO.java @@ -1,4 +1,4 @@ -package com.hnac.hzinfo.inspect.ai.dto; +package com.hnac.hzinfo.inspect.ai.vo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskDTO.java similarity index 94% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskDTO.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskDTO.java index a8c8cf2..0116ef7 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskDTO.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskDTO.java @@ -1,4 +1,4 @@ -package com.hnac.hzinfo.inspect.ai.dto; +package com.hnac.hzinfo.inspect.ai.vo; import com.hnac.hzinfo.inspect.ai.entity.RobotTaskIdentifyEntity; import com.hnac.hzinfo.inspect.utils.QueryField; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskIdentifyDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskIdentifyDTO.java similarity index 89% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskIdentifyDTO.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskIdentifyDTO.java index 8bdff02..b579af2 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/RobotTaskIdentifyDTO.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RobotTaskIdentifyDTO.java @@ -1,4 +1,4 @@ -package com.hnac.hzinfo.inspect.ai.dto; +package com.hnac.hzinfo.inspect.ai.vo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/UserFaceDataDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/UserFaceDataDTO.java similarity index 88% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/UserFaceDataDTO.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/UserFaceDataDTO.java index 1ed3a07..4914d9a 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/UserFaceDataDTO.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/UserFaceDataDTO.java @@ -1,4 +1,4 @@ -package com.hnac.hzinfo.inspect.ai.dto; +package com.hnac.hzinfo.inspect.ai.vo; import com.hnac.hzinfo.inspect.ai.entity.UserFaceDataEntity; import lombok.Data; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/VideoReturnDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/VideoReturnDTO.java similarity index 94% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/VideoReturnDTO.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/VideoReturnDTO.java index a2a80c5..9ac1138 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/dto/VideoReturnDTO.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/VideoReturnDTO.java @@ -1,4 +1,4 @@ -package com.hnac.hzinfo.inspect.ai.dto; +package com.hnac.hzinfo.inspect.ai.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/InspectPdf.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/InspectPdf.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/InspectPdf.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/InspectPdf.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectDangerEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectTemplateEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ObjectUserEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/OtherObjectEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/ProjectContentEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/obj/entity/TemplateProjectEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectContentEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskObjectProjectEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskRecordEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskResultEntity.java diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java similarity index 100% rename from hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java rename to hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskUserEntity.java diff --git a/hzims-service/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/service/impl/RobotTaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java index a757c26..e2912b5 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/RobotTaskServiceImpl.java @@ -2,15 +2,13 @@ package com.hnac.hzinfo.inspect.ai.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hnac.hzinfo.inspect.ai.AIContants; -import com.hnac.hzinfo.inspect.ai.dto.AIData; -import com.hnac.hzinfo.inspect.ai.dto.VideoReturnDTO; +import com.hnac.hzinfo.inspect.ai.vo.AIData; +import com.hnac.hzinfo.inspect.ai.vo.VideoReturnDTO; import com.hnac.hzinfo.inspect.ai.entity.RobotTaskIdentifyEntity; import com.hnac.hzinfo.inspect.ai.service.IClockService; import com.hnac.hzinfo.inspect.ai.service.IRobotTaskIdentifyService; -import com.hnac.hzinfo.inspect.ai.util.BigDecimalUtil; import com.hnac.hzinfo.inspect.ai.util.CommonUtil; import com.hnac.hzinfo.inspect.ai.util.EndianUtil; import com.hnac.hzinfo.inspect.ai.vo.RobotTaskVO; @@ -52,7 +50,6 @@ import org.springframework.web.multipart.MultipartFile; import java.io.ByteArrayInputStream; import java.util.*; -import java.util.stream.Collectors; /** * 服务实现类 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/UserFaceDataServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/UserFaceDataServiceImpl.java index b4a4369..4ab3c0f 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/UserFaceDataServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/UserFaceDataServiceImpl.java @@ -4,7 +4,7 @@ package com.hnac.hzinfo.inspect.ai.service.impl; import com.google.common.base.Functions; import com.google.common.collect.Lists; import com.hnac.hzinfo.inspect.ai.config.FaceConfig; -import com.hnac.hzinfo.inspect.ai.dto.FaceResponse; +import com.hnac.hzinfo.inspect.ai.vo.FaceResponse; import com.hnac.hzinfo.inspect.ai.entity.UserFaceDataEntity; import com.hnac.hzinfo.inspect.ai.mapper.UserFaceDataMapper; import com.hnac.hzinfo.inspect.ai.service.IUserFaceDataService; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/VideoTaskAiMqttConsumer.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/VideoTaskAiMqttConsumer.java index 4965ed7..da71241 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/VideoTaskAiMqttConsumer.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/VideoTaskAiMqttConsumer.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.ai.service.impl; -import com.hnac.hzinfo.inspect.ai.dto.VideoReturnDTO; +import com.hnac.hzinfo.inspect.ai.vo.VideoReturnDTO; import com.hnac.hzinfo.inspect.task.job.service.TaskVideoManager; import org.springblade.core.log.logger.BladeLogger; import org.springblade.core.tool.jackson.JsonUtil; diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskVideoManager.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskVideoManager.java index 2644e49..8a267a6 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskVideoManager.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/TaskVideoManager.java @@ -1,6 +1,6 @@ package com.hnac.hzinfo.inspect.task.job.service; -import com.hnac.hzinfo.inspect.ai.dto.VideoReturnDTO; +import com.hnac.hzinfo.inspect.ai.vo.VideoReturnDTO; import com.hnac.hzinfo.inspect.plan.PlanContants; import com.hnac.hzinfo.inspect.task.entity.TaskEntity; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/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);