ljf
/
shuili
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feat: 指标数据添加月日时

master_tdsql
hxh 1 year ago
parent
ad518cef7d
commit
e28c8f3f47
7 changed files with 133 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      shuili-system/src/main/java/com/kms/yxgh/common/controller/WarningDataController.java
  2. 5
      shuili-system/src/main/java/com/kms/yxgh/common/domain/Indicator.java
  3. 84
      shuili-system/src/main/java/com/kms/yxgh/common/dto/IndicatorDto.java
  4. 45
      shuili-system/src/main/java/com/kms/yxgh/common/job/Job.java
  5. 4
      shuili-system/src/main/java/com/kms/yxgh/common/mapper/IndicatorMapper.java
  6. 16
      shuili-system/src/main/java/com/kms/yxgh/common/service/IndicatorService.java
  7. 3
      sql/sy/v1.2.0/全量脚本/statistic.sql

21
shuili-system/src/main/java/com/kms/yxgh/common/controller/WarningDataController.java
View File

@ -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 {
}

5
shuili-system/src/main/java/com/kms/yxgh/common/domain/MonitoringData.java → shuili-system/src/main/java/com/kms/yxgh/common/domain/Indicator.java
View File

@ -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;

84
shuili-system/src/main/java/com/kms/yxgh/common/dto/IndicatorDto.java
View File

@ -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;
}

45
shuili-system/src/main/java/com/kms/yxgh/common/job/Job.java
View File

@ -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);
}
}

4
shuili-system/src/main/java/com/kms/yxgh/common/mapper/MonitoringDataMapper.java → shuili-system/src/main/java/com/kms/yxgh/common/mapper/IndicatorMapper.java
View File

@ -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<MonitoringData> {
public interface IndicatorMapper extends BaseMapper<Indicator> {
}

16
shuili-system/src/main/java/com/kms/yxgh/common/service/IndicatorService.java
View File

@ -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 {
}

3
sql/sy/v1.2.0/全量脚本/statistic.sql
View File

@ -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 '创建时间',

Write Preview
Loading…
Cancel
Save