From e28c8f3f47fbda62709804614ec09478909cb45d Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Mon, 25 Mar 2024 10:09:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8C=87=E6=A0=87=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=88=E6=97=A5=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WarningDataController.java | 21 ----- .../{MonitoringData.java => Indicator.java} | 5 +- .../com/kms/yxgh/common/dto/IndicatorDto.java | 84 +++++++++++++++++++ .../java/com/kms/yxgh/common/job/Job.java | 45 +++++----- ...ngDataMapper.java => IndicatorMapper.java} | 4 +- .../yxgh/common/service/IndicatorService.java | 16 ++++ sql/sy/v1.2.0/全量脚本/statistic.sql | 3 + 7 files changed, 133 insertions(+), 45 deletions(-) delete mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/controller/WarningDataController.java rename shuili-system/src/main/java/com/kms/yxgh/common/domain/{MonitoringData.java => Indicator.java} (91%) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/IndicatorDto.java rename shuili-system/src/main/java/com/kms/yxgh/common/mapper/{MonitoringDataMapper.java => IndicatorMapper.java} (70%) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/service/IndicatorService.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/controller/WarningDataController.java b/shuili-system/src/main/java/com/kms/yxgh/common/controller/WarningDataController.java deleted file mode 100644 index b9587e9d..00000000 --- a/shuili-system/src/main/java/com/kms/yxgh/common/controller/WarningDataController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.kms.yxgh.common.controller; - -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName: WarningDataController - * @Description: TODO - * @Date: 2024/3/24 下午9:27 - * * - * @author: hxh - * @version: 1.0 - */ -@RestController -@AllArgsConstructor -@RequestMapping("/run/api/indicator") -@Api(tags = "运行管理运行指标相关") -public class WarningDataController { -} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/domain/MonitoringData.java b/shuili-system/src/main/java/com/kms/yxgh/common/domain/Indicator.java similarity index 91% rename from shuili-system/src/main/java/com/kms/yxgh/common/domain/MonitoringData.java rename to shuili-system/src/main/java/com/kms/yxgh/common/domain/Indicator.java index dd50d2d3..271d74c1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/domain/MonitoringData.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/domain/Indicator.java @@ -19,7 +19,7 @@ import java.util.Date; @TableName("bs_sgc_stc_jc") @Data @ApiModel("监测数据表") -public class MonitoringData extends SyBaseEntity { +public class Indicator extends SyBaseEntity { // 测站编码 private String stcd; // 上游水位 @@ -52,6 +52,9 @@ public class MonitoringData extends SyBaseEntity { private Date collectionTime; private Integer year; + private Integer month; + private Integer day; + private Integer hour; @TableField(exist = false) private String remark; diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/IndicatorDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/IndicatorDto.java new file mode 100644 index 00000000..972d3a51 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/IndicatorDto.java @@ -0,0 +1,84 @@ +package com.kms.yxgh.common.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName: IndicatorDto + * @Description: TODO + * @Date: 2024/3/25 上午9:55 + * * + * @author: hxh + * @version: 1.0 + */ +@Data +@ApiModel("监测数据表") +public class IndicatorDto { + + @ApiModelProperty("id") + private String name; + @ApiModelProperty("编码") + private String code; + @ApiModelProperty("类型:1堤防，2水闸") + private String type; + + @ApiModelProperty("测站编码") + private String stcd; + // 上游水位 + @ApiModelProperty("上游水位") + private Float upstreamLevel; + // 下游水位 + @ApiModelProperty("下游水位") + private Float downstreamLevel; + // 开度 + @ApiModelProperty("开度") + private Float opening; + // 过闸流量 + @ApiModelProperty("过闸流量") + private Float gateFlow; + + // 雨量 + @ApiModelProperty("雨量") + private Float rainFall; + // 绕渗透压 + @ApiModelProperty("绕渗透压") + private Float bypassOsmoticPressure; + // 渗透压计高程 + @ApiModelProperty("渗透压计高程") + private Float osmoticPressureGaugeElevation; + // 闸机扬压力 + @ApiModelProperty("闸机扬压力") + private Float boostPressure; + // 水闸接缝 + @ApiModelProperty("水闸接缝") + private Float seam; + // 裂缝开合度 + @ApiModelProperty("裂缝开合度") + private Float crackOpeningDegree; + // 闸墩变形x + @ApiModelProperty("闸墩变形x") + private Float deformationX; + // 闸墩变形y + @ApiModelProperty("闸墩变形y") + private Float deformationY; + // 闸机油温 + @ApiModelProperty("闸机油温") + private Float oilTemperature; + // 采集时间 + @ApiModelProperty("采集时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date collectionTime; + + @ApiModelProperty("年") + private Integer year; + @ApiModelProperty("月") + private Integer month; + @ApiModelProperty("日") + private Integer day; + @ApiModelProperty("时") + private Integer hour; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/job/Job.java b/shuili-system/src/main/java/com/kms/yxgh/common/job/Job.java index 5298ef30..83a8031c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/job/Job.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/job/Job.java @@ -8,10 +8,10 @@ import com.kms.yg.df.domain.BsSgcDfJbxx; import com.kms.yg.df.mapper.BsSgcDfJbxxMapper; import com.kms.yg.sz.domain.BsSgcSzGcda; import com.kms.yg.sz.mapper.BsSgcSzGcdaMapper; -import com.kms.yxgh.common.domain.MonitoringData; +import com.kms.yxgh.common.domain.Indicator; import com.kms.yxgh.common.domain.MonitoringStation; import com.kms.yxgh.common.domain.VideoWarning; -import com.kms.yxgh.common.mapper.MonitoringDataMapper; +import com.kms.yxgh.common.mapper.IndicatorMapper; import com.kms.yxgh.common.mapper.MonitoringStationMapper; import com.kms.yxgh.common.mapper.VideoWarningMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -50,7 +50,7 @@ public class Job { private VideoWarningMapper videoWarningMapper; @Autowired - private MonitoringDataMapper monitoringDataMapper; + private IndicatorMapper indicatorMapper; @Autowired private MonitoringStationMapper monitoringStationMapper; @@ -81,24 +81,27 @@ public class Job { int size = RandomUtil.randomInt(2, 4); for (int i = 0; i < size; i++) { MonitoringStation monitoringStation = monitoringStationList.get(RandomUtil.randomInt(monitoringStationList.size())); - MonitoringData monitoringData = new MonitoringData(); - monitoringData.setStcd(monitoringStation.getStcd()); - monitoringData.setUpstreamLevel((float) RandomUtil.randomDouble(0, 100)); - monitoringData.setDownstreamLevel((float) RandomUtil.randomDouble(0, 100)); - monitoringData.setOpening((float) RandomUtil.randomDouble(0, 100)); - monitoringData.setGateFlow((float) RandomUtil.randomDouble(0, 100)); - monitoringData.setRainFall((float) RandomUtil.randomDouble(0, 100)); - monitoringData.setBypassOsmoticPressure((float) RandomUtil.randomDouble(0, 100)); - monitoringData.setOsmoticPressureGaugeElevation((float) RandomUtil.randomDouble(0, 100)); - monitoringData.setBoostPressure((float) RandomUtil.randomDouble(0, 100)); - monitoringData.setSeam((float) RandomUtil.randomDouble(0, 100)); - monitoringData.setCrackOpeningDegree((float) RandomUtil.randomDouble(0, 100)); - monitoringData.setDeformationX((float) RandomUtil.randomDouble(0, 100)); - monitoringData.setDeformationY((float) RandomUtil.randomDouble(0, 100)); - monitoringData.setOilTemperature((float) RandomUtil.randomDouble(0, 100)); - monitoringData.setCollectionTime(new Date()); - monitoringData.setYear(monitoringData.getCollectionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().getYear()); - monitoringDataMapper.insert(monitoringData); + Indicator indicator = new Indicator(); + indicator.setStcd(monitoringStation.getStcd()); + indicator.setUpstreamLevel((float) RandomUtil.randomDouble(0, 100)); + indicator.setDownstreamLevel((float) RandomUtil.randomDouble(0, 100)); + indicator.setOpening((float) RandomUtil.randomDouble(0, 100)); + indicator.setGateFlow((float) RandomUtil.randomDouble(0, 100)); + indicator.setRainFall((float) RandomUtil.randomDouble(0, 100)); + indicator.setBypassOsmoticPressure((float) RandomUtil.randomDouble(0, 100)); + indicator.setOsmoticPressureGaugeElevation((float) RandomUtil.randomDouble(0, 100)); + indicator.setBoostPressure((float) RandomUtil.randomDouble(0, 100)); + indicator.setSeam((float) RandomUtil.randomDouble(0, 100)); + indicator.setCrackOpeningDegree((float) RandomUtil.randomDouble(0, 100)); + indicator.setDeformationX((float) RandomUtil.randomDouble(0, 100)); + indicator.setDeformationY((float) RandomUtil.randomDouble(0, 100)); + indicator.setOilTemperature((float) RandomUtil.randomDouble(0, 100)); + indicator.setCollectionTime(new Date()); + indicator.setYear(indicator.getCollectionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().getYear()); + indicator.setMonth(indicator.getCollectionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().getMonthValue()); + indicator.setDay(indicator.getCollectionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().getDayOfMonth()); + indicator.setHour(indicator.getCollectionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalTime().getHour()); + indicatorMapper.insert(indicator); } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/MonitoringDataMapper.java b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/IndicatorMapper.java similarity index 70% rename from shuili-system/src/main/java/com/kms/yxgh/common/mapper/MonitoringDataMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/common/mapper/IndicatorMapper.java index ae4cf914..4ff475a6 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/MonitoringDataMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/IndicatorMapper.java @@ -1,7 +1,7 @@ package com.kms.yxgh.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.common.domain.MonitoringData; +import com.kms.yxgh.common.domain.Indicator; import org.springframework.stereotype.Repository; /** @@ -14,5 +14,5 @@ import org.springframework.stereotype.Repository; */ @Repository -public interface MonitoringDataMapper extends BaseMapper { +public interface IndicatorMapper extends BaseMapper { } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/service/IndicatorService.java b/shuili-system/src/main/java/com/kms/yxgh/common/service/IndicatorService.java new file mode 100644 index 00000000..7e53bcee --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/service/IndicatorService.java @@ -0,0 +1,16 @@ +package com.kms.yxgh.common.service; + +import org.springframework.stereotype.Service; + +/** + * @ClassName: WarningDataService + * @Description: TODO + * @Date: 2024/3/25 上午9:42 + * * + * @author: hxh + * @version: 1.0 + */ + +@Service +public class IndicatorService { +} diff --git a/sql/sy/v1.2.0/全量脚本/statistic.sql b/sql/sy/v1.2.0/全量脚本/statistic.sql index 738b9df6..ea714491 100644 --- a/sql/sy/v1.2.0/全量脚本/statistic.sql +++ b/sql/sy/v1.2.0/全量脚本/statistic.sql @@ -17,6 +17,9 @@ CREATE TABLE `bs_sgc_stc_jc` ( `DEFORMATION_Y` float NULL DEFAULT NULL COMMENT '闸墩变形y', `OIL_TEMPERATURE` float NULL DEFAULT NULL COMMENT '闸机油温', `YEAR` int NOT NULL COMMENT '年份', + `MONTH` int NOT NULL COMMENT '月份', + `DAY` int NOT NULL COMMENT '日期', + `HOUR` int NOT NULL COMMENT '小时', `COLLECTION_TIME` datetime DEFAULT NULL COMMENT '采集时间', `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',