From 96a56875e1dc4a6baf0fd6e234c9ad15c6b8e853 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Fri, 12 Jul 2024 16:26:28 +0800 Subject: [PATCH] =?UTF-8?q?#master=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/equipment/feign/IEmInfoClient.java | 5 - .../hzims/equipment/feign/IEmInfoClientBack.java | 5 - .../operational/report/vo/GenerationDeviceVo.java | 24 -- .../report/vo/GenerationReportTimeVo.java | 19 -- .../operational/report/vo/GenerationReportVo.java | 24 -- .../station/entity/StationRelation.java | 130 ------- .../hzinfo/inspect/ai/vo/RemoteControlDTO.java | 31 -- .../hzinfo/inspect/task/entity/TaskEntity.java | 8 - .../entity/StandardTicketInfoEntity.java | 10 - .../service/impl/CanvasResolveServiceImpl.java | 3 +- hzims-service/safeproduct/safeproduct.iml | 374 +-------------------- 11 files changed, 2 insertions(+), 631 deletions(-) delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/GenerationDeviceVo.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/GenerationReportTimeVo.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/GenerationReportVo.java delete mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationRelation.java delete mode 100644 hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RemoteControlDTO.java diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java index b60f2ae..2cbeb99 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClient.java @@ -87,8 +87,6 @@ public interface IEmInfoClient { String RIDE_DEVICES = API_PREFIX + "/rideDevices"; - String CREWS_DEVICES = API_PREFIX + "/crewsDevices"; - @PostMapping(DETAIL) EmInfoEntity getByCode(@RequestParam("code") String id); @@ -178,7 +176,4 @@ public interface IEmInfoClient { @GetMapping(RIDE_DEVICES) List rideDevices(@RequestParam("deptIds") List deptIds); - - @GetMapping(CREWS_DEVICES) - List crewsDevices(@RequestParam("refDept") Long refDept); } diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java index c84c6eb..104d494 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/feign/IEmInfoClientBack.java @@ -120,9 +120,4 @@ public class IEmInfoClientBack implements IEmInfoClient { public List rideDevices(List longs) { return new ArrayList<>(); } - - @Override - public List crewsDevices(Long refDept) { - return new ArrayList<>(); - } } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/GenerationDeviceVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/GenerationDeviceVo.java deleted file mode 100644 index 736f7ce..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/GenerationDeviceVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hnac.hzims.operational.report.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author ysj - */ -@Data -@ApiModel("发电量报表") -public class GenerationDeviceVo { - - @ApiModelProperty("设备编号") - private String deviceCode; - - @ApiModelProperty("设备名称") - private String deviceName; - - @ApiModelProperty("属性时间范围统计数据") - private List attributes; -} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/GenerationReportTimeVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/GenerationReportTimeVo.java deleted file mode 100644 index 1540fae..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/GenerationReportTimeVo.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hnac.hzims.operational.report.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @author ysj - */ -@Data -@ApiModel("发电量报表") -public class GenerationReportTimeVo { - - @ApiModelProperty("时间") - private String time; - - @ApiModelProperty("值") - private Double value; -} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/GenerationReportVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/GenerationReportVo.java deleted file mode 100644 index 13847b5..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/GenerationReportVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hnac.hzims.operational.report.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author ysj - */ -@Data -@ApiModel("发电量报表") -public class GenerationReportVo { - - @ApiModelProperty("属性") - private String attribute; - - @ApiModelProperty("属性名称") - private String attributeName; - - @ApiModelProperty("属性时间范围统计数据") - private List times; -} diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationRelation.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationRelation.java deleted file mode 100644 index 509ca22..0000000 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationRelation.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.hnac.hzims.operational.station.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import okhttp3.internal.annotations.EverythingIsNonNull; - -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * 站点和霍山生态流量电站的关联关系表 - * @author tanghaihao - * @date 2023年10月08日 13:58 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("station_relation") -public class StationRelation implements Serializable { - private static final long serialVersionUID=1L; - - /** - * ID - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 站点编码 - */ - @TableField("station_code") - private String stationCode; - - /** - * 站点名称 - */ - @TableField(exist = false) - private String stationName; - - /** - * 设备编码 - */ - @TableField("device_code") - private String deviceCode; - - /** - * 设备名称 - */ - @TableField(exist = false) - private String deviceName; - - /** - * 核定流量 - */ - @TableField("flow_value") - private String flowValue; - - /** - * 低级告警负责人id - */ - @TableField("low_soe_user_id") - private String lowSoeUserId; - - /** - * 低级告警电话号码 - */ - @TableField("low_soe_phone") - private String lowSoePhone; - - /** - * 中级告警负责人id - */ - @TableField("middle_soe_user_id") - private String middleSoeUserId; - - /** - * 中级告警电话号码 - */ - @TableField("middle_soe_phone") - private String middleSoePhone; - - /** - * 高级告警负责人id - */ - @TableField("high_soe_user_id") - private String highSoeUserId; - - /** - * 高级告警电话号码 - */ - @TableField("high_soe_phone") - private String highSoePhone; - - /** - * 当日是否发送预警 - */ - @TableField("send_warning") - private Integer sendWarning; - - /** - * 当日是否发送告警 - */ - @TableField("send_soe") - private Integer sendSoe; - - /** - * 创建时间 - */ - @TableField("create_time") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @TableField("update_time") - private LocalDateTime updateTime; - - /** - * 逻辑删除 - */ - @TableField("is_deleted") - private Integer isDeleted; -} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RemoteControlDTO.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RemoteControlDTO.java deleted file mode 100644 index 4c5cc15..0000000 --- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/ai/vo/RemoteControlDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hnac.hzinfo.inspect.ai.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.util.Map; - -@Data -public class RemoteControlDTO { - - @ApiModelProperty("站点编号") - @NotBlank - private String stationCode; - - @ApiModelProperty("设备编码") - @NotBlank - private String deviceCode; - - @ApiModelProperty("功能标识") - @NotBlank - private String signage; - - @ApiModelProperty("参数列表") - @NotBlank - private Map params; - - @ApiModelProperty("机器码") - @NotBlank - private String machineCode; -} diff --git a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskEntity.java b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskEntity.java index 6cd2907..df18dbe 100644 --- a/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskEntity.java +++ b/hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/task/entity/TaskEntity.java @@ -48,14 +48,6 @@ public class TaskEntity extends TenantEntity { @ApiModelProperty(value = "计划名称") @QueryField(condition = SqlCondition.LIKE) private String planName; - - /** - * 路线名称 - */ - @ApiModelProperty(value = "路线名称") - @QueryField(condition = SqlCondition.LIKE) - private String routeName; - /** * 任务批次号 */ diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java index 0312ece..95f329b 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java @@ -168,14 +168,4 @@ public class StandardTicketInfoEntity extends TenantEntity implements Serializab @TableField(exist = false) @ApiModelProperty("监护人确认结果：approved-确认，rejected-作废") private String verifyResult; - - @ApiModelProperty("是否线下 ： 1-线下，0-线上") - @QueryField(condition = SqlCondition.EQUAL) - private Boolean isOffline; - - @ApiModelProperty("是否审核通过，0为通过，1为未通过") - private Boolean isApproved; - - @ApiModelProperty("图片附件") - private String picture; } diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/CanvasResolveServiceImpl.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/CanvasResolveServiceImpl.java index 7e1f001..ff1bc5a 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/CanvasResolveServiceImpl.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/CanvasResolveServiceImpl.java @@ -1,9 +1,7 @@ package com.hnac.hzims.bigmodel.interactive.service.impl; -import com.alibaba.fastjson.JSON; import com.hnac.hzims.bigmodel.interactive.constants.FuncRouteEnum; import com.hnac.hzims.bigmodel.interactive.constants.ParamKeyConstants; -import com.hnac.hzims.bigmodel.interactive.factory.ResolveFactory; import com.hnac.hzims.bigmodel.interactive.req.ModelFunctionReq; import com.hnac.hzims.bigmodel.interactive.service.IResolveService; import com.hnac.hzims.bigmodel.interactive.vo.ExtraVO; @@ -20,6 +18,7 @@ import org.springblade.core.tool.utils.StringUtil; import org.springblade.system.cache.ParamCache; import org.springframework.stereotype.Service; import org.springframework.util.Assert; +import com.hnac.hzims.bigmodel.interactive.factory.ResolveFactory; import java.util.*; import java.util.stream.IntStream; diff --git a/hzims-service/safeproduct/safeproduct.iml b/hzims-service/safeproduct/safeproduct.iml index 0abed5b..1daccae 100644 --- a/hzims-service/safeproduct/safeproduct.iml +++ b/hzims-service/safeproduct/safeproduct.iml @@ -1,380 +1,8 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file