diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java b/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java index 68e8e88b..e4764d9d 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java @@ -5,7 +5,6 @@ import com.kms.yg.cz.dto.CharInfoDto; import com.kms.yg.cz.dto.CurrentWaterMonitorDto; import com.kms.yg.cz.dto.MonitorConfigDto; import com.kms.yg.cz.dto.MonitorQueDto; -import com.kms.yg.cz.enmu.MonitorGroupEnum; import com.kms.yg.cz.enmu.MonitorIndexEnum; import com.kms.yg.cz.service.MonitorService; import com.kms.yxgh.base.Response; @@ -67,6 +66,9 @@ public class MonitorController { @PostMapping("/index") @ApiOperation("查询监测指标信息") public Response> handleRbe(@RequestBody MonitorQueDto sp) { - return Response.ok(MonitorGroupEnum.SK.info()); + if (sp == null || sp.getGroup() == null) { + return Response.ok(); + } + return Response.ok(sp.getGroup().info()); } } \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java index 40eea8ed..2cba8e62 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java @@ -19,9 +19,16 @@ import static com.shuili.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS; @Getter public enum MonitorComposeEnum { - WATER_LEVEL(Collections.singletonList(MonitorTypeEnum.RAINFALL), Collections.singletonList(MonitorTypeEnum.WATER_LEVEL)), - ENV(Collections.singletonList(MonitorTypeEnum.AIR_TEMPE), "坝址气温", Collections.singletonList(MonitorTypeEnum.WATER_TEMPE), "库水温"), - ; + WATER_LEVEL(Collections.singletonList(MonitorTypeEnum.SK_RAINFALL), Collections.singletonList(MonitorTypeEnum.WATER_LEVEL)), + ENV(Collections.singletonList(MonitorTypeEnum.AIR_TEMPE), "气温", Collections.singletonList(MonitorTypeEnum.WATER_TEMPE), "水温"), + C_STRESS(Collections.singletonList(MonitorTypeEnum.STRESS), "压力", Collections.singletonList(MonitorTypeEnum.STRAIN), "应变"), + C_SEEPAGE_FLOW(Collections.singletonList(MonitorTypeEnum.SEEPAGE_FLOW), "渗流量", Collections.emptyList()), + C_DISPLACEMENT(Arrays.asList(MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_X_SURFACE, MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_Y_SURFACE, MonitorTypeEnum.VERTICAL_DISPLACEMENT), "位移量", Collections.emptyList()), + DF_WATER_LEVEL(Collections.singletonList(MonitorTypeEnum.RAINFALL), "降雨量", Collections.singletonList(MonitorTypeEnum.DF_WATER_LEVEL), "水位"), + SZ_WATER_LEVEL(Collections.singletonList(MonitorTypeEnum.RAINFALL), "降雨量", Arrays.asList(MonitorTypeEnum.WATER_LEVEL_ABOVE_GATE, MonitorTypeEnum.WATER_LEVEL_BELOW_GATE), "水位"), + SZ_SEEPAGE_AROUND(Collections.singletonList(MonitorTypeEnum.SEEPAGE_AROUND_DAM), "绕坝渗流", Collections.singletonList(MonitorTypeEnum.UPLIFTED_PRESSURE), "扬压力"), + SZ_DISPLACEMENT(Arrays.asList(MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_X_INTERNAL, MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_Y_INTERNAL, MonitorTypeEnum.VERTICAL_DISPLACEMENT_INTERNAL), "位移量", + Collections.singletonList(MonitorTypeEnum.CRACK_OPENING_DEGREE), "裂缝开合度"); private final List leftElements; private final String leftName; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorGroupEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorGroupEnum.java index ab8db39e..c5ef6349 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorGroupEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorGroupEnum.java @@ -9,7 +9,32 @@ import java.util.stream.Collectors; @Getter public enum MonitorGroupEnum { - SK("水库", Arrays.asList(MonitorIndexEnum.WATER, MonitorIndexEnum.RAINFALL, MonitorIndexEnum.WATER_STORE)), + SK("水库", Arrays.asList(MonitorIndexEnum.I_WATER, + MonitorIndexEnum.I_RAINFALL, + MonitorIndexEnum.I_WATER_STORE, + MonitorIndexEnum.I_BZ_TEMPE, + MonitorIndexEnum.I_WATER_TEMPE, + MonitorIndexEnum.I_UPLIFTED_PRESSURE, + MonitorIndexEnum.I_SEEPAGE_FLOW, + MonitorIndexEnum.I_DISPLACEMENT, + MonitorIndexEnum.I_DISPLACEMENT_INTERNAL, + MonitorIndexEnum.I_OPENING_DEGREE, + MonitorIndexEnum.I_STRESS, + MonitorIndexEnum.I_STRAIN + )), + SZ("水闸", Arrays.asList(MonitorIndexEnum.I_RAINFALL, + MonitorIndexEnum.I_SZ_WATER_LEVEL, + MonitorIndexEnum.I_SZ_LOW_WATER_LEVEL, + MonitorIndexEnum.I_SZ_GATE_FLOW_RATE, + MonitorIndexEnum.I_OPENING_DEGREE, + MonitorIndexEnum.I_SEEPAGE_AROUND_DAM + )), + DF("堤防", Arrays.asList(MonitorIndexEnum.I_RAINFALL, + MonitorIndexEnum.I_DF_WATER, + MonitorIndexEnum.I_SEEPAGE_FLOW, + MonitorIndexEnum.I_DISPLACEMENT + ) + ), ; private final String group; private final List indexElements; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexEnum.java index 34ade094..7d17997f 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexEnum.java @@ -1,11 +1,10 @@ + package com.kms.yg.cz.enmu; import lombok.Data; import lombok.Getter; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -15,21 +14,34 @@ import static com.kms.yg.cz.enmu.MonitorTypeEnum.*; @Getter public enum MonitorIndexEnum { - WATER("水位信息", Arrays.asList(WATER_LEVEL, MAX_WATER_LEVEL, MIN_WATER_LEVEL, AVG_WATER_LEVEL), - Arrays.asList(FSLTDZ_LIMIT, CHFLLV)), - RAINFALL("降雨量", Arrays.asList(MonitorTypeEnum.RAINFALL, MAX_RAINFALL, MIN_RAINFALL, AVG_RAINFALL)), - WATER_STORE("蓄水量", Collections.singletonList(STORE_WATER)), - ; + + I_WATER("水位信息", Constants.waterItems, Arrays.asList(FSLTDZ_LIMIT, CHFLLV)), + I_DF_WATER("水位信息", Constants.dfWaterItems), + I_RAINFALL("降雨量", Constants.rainfallItems), + I_WATER_STORE("蓄水量", Constants.waterStoreItems), + I_BZ_TEMPE("坝址气温", Constants.bzTempItems), + I_WATER_TEMPE("水库水温", Constants.waterTempItems), + I_UPLIFTED_PRESSURE("扬压力", Constants.upliftedPressureItems), + I_SEEPAGE_FLOW("渗流量", Constants.seepageFlowItems), + I_DISPLACEMENT("表面变形", Constants.displacementItems), + I_DISPLACEMENT_INTERNAL("内部变形", Constants.displacementInternalItems), + I_OPENING_DEGREE("裂缝信息", Constants.openingDegreeItems), + I_STRESS("应力", Constants.stressItems), + I_STRAIN("应变", Constants.strainItems), + I_SZ_WATER_LEVEL("闸上水位", Constants.szWaterLevelItems), + I_SZ_LOW_WATER_LEVEL("闸下水位", Constants.szWaterLevelItems), + I_SZ_GATE_FLOW_RATE("过闸流量", Constants.szGateFlowRateItems), + I_SEEPAGE_AROUND_DAM("绕坝渗流", Constants.seepageAroundDamItems); private final String group; - private final List indexElements; + private final List>> indexElements; private final List markTypes; - MonitorIndexEnum(String group, List indexElements) { + MonitorIndexEnum(String group, List>> indexElements) { this(group, indexElements, Collections.emptyList()); } - MonitorIndexEnum(String group, List indexElements, List markTypes) { + MonitorIndexEnum(String group, List>> indexElements, List markTypes) { this.group = group; this.indexElements = indexElements; this.markTypes = markTypes; @@ -38,19 +50,89 @@ public enum MonitorIndexEnum { public IndexInfo getIndexInfos() { IndexInfo indexInfo = new IndexInfo(); indexInfo.setGroup(group); - indexInfo.setItems( - Stream.concat(indexElements.stream(), - markTypes.stream()) - .filter(item -> item instanceof MonitorIndexInfo) - .map(item -> (MonitorIndexInfo) item) - .map(MonitorIndexInfo::toInfo) - .collect(Collectors.toList())); + indexInfo.setItems(Stream.concat(toListInfo(indexElements), toInfo(markTypes)).sorted(Comparator.comparing(Info::getSort)).collect(Collectors.toList())); return indexInfo; } + private Stream toListInfo(List>> list) { + return Stream.iterate(0, n -> n + 1) + .limit(list.size()) + .flatMap(i -> { + Map> map = list.get(i); + return map.entrySet().stream().flatMap(entry -> entry.getKey().toInfo(entry.getValue())) + .peek(item -> item.setSort(item.getSort() + i * 10)); + }); + } + + private Stream toInfo(List markTypes) { + return markTypes.stream().map(MonitorIndexInfo::toInfo); + } + @Data public static class IndexInfo { private String group; private List items; } -} + + + public static class Constants { + private static final List defaultOperators = Arrays.asList(OperatorEnum.TOP, OperatorEnum.MAX, OperatorEnum.MIN, OperatorEnum.AVG); + + private static final List>> waterItems = Collections.singletonList( + Collections.singletonMap(WATER_LEVEL, defaultOperators) + ); + private static final List>> rainfallItems = Collections.singletonList( + Collections.singletonMap(MonitorTypeEnum.SK_RAINFALL, defaultOperators) + + ); + private static final List>> waterStoreItems = Collections.singletonList( + Collections.singletonMap(STORE_WATER, defaultOperators) + ); + private static final List>> bzTempItems = Collections.singletonList( + Collections.singletonMap(AIR_TEMPE, defaultOperators) + ); + private static final List>> waterTempItems = Collections.singletonList( + Collections.singletonMap(MonitorTypeEnum.WATER_TEMPE, defaultOperators) + ); + public static final List>> upliftedPressureItems = Collections.singletonList( + Collections.singletonMap(MonitorTypeEnum.UPLIFTED_PRESSURE, defaultOperators) + ); + public static final List>> seepageFlowItems = Collections.singletonList( + Collections.singletonMap(MonitorTypeEnum.SEEPAGE_FLOW, defaultOperators) + ); + public static final List>> displacementItems = Arrays.asList( + Collections.singletonMap(MonitorTypeEnum.VERTICAL_DISPLACEMENT, defaultOperators) + , Collections.singletonMap(MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_X_SURFACE, defaultOperators) + , Collections.singletonMap(MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_Y_SURFACE, defaultOperators) + ); + + public static final List>> displacementInternalItems = Arrays.asList( + Collections.singletonMap(MonitorTypeEnum.VERTICAL_DISPLACEMENT_INTERNAL, defaultOperators) + , Collections.singletonMap(MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_X_INTERNAL, defaultOperators) + , Collections.singletonMap(MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_Y_INTERNAL, defaultOperators) + ); + public static final List>> openingDegreeItems = Collections.singletonList( + Collections.singletonMap(MonitorTypeEnum.CRACK_OPENING_DEGREE, defaultOperators) + ); + public static final List>> stressItems = Collections.singletonList( + Collections.singletonMap(MonitorTypeEnum.STRESS, defaultOperators) + ); + public static final List>> strainItems = Collections.singletonList( + Collections.singletonMap(MonitorTypeEnum.STRAIN, defaultOperators) + ); + public static final List>> szWaterLevelItems = Collections.singletonList( + Collections.singletonMap(MonitorTypeEnum.WATER_LEVEL_ABOVE_GATE, defaultOperators) + ); + + public static final List>> szGateFlowRateItems = Collections.singletonList( + Collections.singletonMap(MonitorTypeEnum.WATER_LEVEL_BELOW_GATE, defaultOperators) + ); + public static final List>> seepageAroundDamItems = Collections.singletonList( + Collections.singletonMap(MonitorTypeEnum.SEEPAGE_AROUND_DAM, defaultOperators) + ); + public static final List>> dfWaterItems = Collections.singletonList( + Collections.singletonMap(MonitorTypeEnum.DF_WATER_LEVEL, defaultOperators) + ); + + } +} \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexInfo.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexInfo.java index 6442ab76..d75f2d56 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexInfo.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexInfo.java @@ -4,6 +4,9 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; +import java.util.stream.Stream; + public interface MonitorIndexInfo { String getZhName(); @@ -17,9 +20,21 @@ public interface MonitorIndexInfo { info.setZhName(getZhName()); info.setUnit(getUnit()); info.setKey(name()); + info.setSort(100); + info.setValue("0.00"); return info; } + default Stream toInfo(List operators) { + return operators.stream().map(operator -> { + Info info = toInfo(); + info.setZhName(operator.getZhName() + info.getZhName()); + info.setKey(operator.name() + "_" + info.getKey()); + info.setSort(operator.getSort()); + return info; + }); + } + @AllArgsConstructor @NoArgsConstructor @Data @@ -28,6 +43,7 @@ public interface MonitorIndexInfo { private String unit; private String key; private String value; + private Integer sort; } } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java index c53bde9f..c8b4ddd7 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java @@ -30,15 +30,20 @@ public enum MonitorSourceEnum { MS_HDM_RIVER("河道水情监测表", Mock.MS_HDM_RIVER, MsHdmRiver.class), MS_DSM_SRVRDS("表面垂直位移监测表", Mock.MS_DSM_SRVRDS, MsHdmSvrds.class), MS_DSM_SRHRDS("表面水平位移监测表", Mock.MS_DSM_SRHRDS, MsHdmSrhrds.class), + MS_DSM_INVRDS("内部垂直位移监测表", MsDsmInvrds.class), + MS_DSM_INHRDS("内部水平位移监测表", MsDsmInhrds.class), + MS_HDM_TMP("气温水温监测表",MsHdmTmp.class), MS_DSM_ENV("环境监测表", MsDsmEnv.class), MS_HDM_TMPEVS("温度监测表", MsHdmTmpevs.class), MS_DSM_PTMP("测压管（计）水位监测表", MsDsmPtmp.class), MS_DSM_SPQN("渗流量监测表", MsDsmSpqn.class), MS_DSM_GSTMONREC("GNSS状态量监测表", MsHdmGstmonrec.class), MS_DSM_INSMONREC("惯导监测表", MsDsmInsmonrec.class), - MS_DSM_INHRDS("内部水平位移监测表", MsDsmInhrds.class), MS_DSM_CKOPDG("裂缝开合度位移监测表", MsHdmCkopdg.class), MS_DSM_SPPR("渗透压力监测表", MsDsmSppr.class), + MS_DSM_PR("应力监测表", MsDsmPr.class), + MS_DSM_ST("应变监测表", MsDsmSt.class), + MS_HDM_WAS("堰闸水情监测表", MsHdmWas.class), ; private final String zhName; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorTypeEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorTypeEnum.java index 1fc30329..3729b534 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorTypeEnum.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorTypeEnum.java @@ -6,20 +6,30 @@ import lombok.Getter; public enum MonitorTypeEnum implements MonitorIndexInfo { WATER_LEVEL("水位", MonitorSourceEnum.MS_HDM_RSVR, "rz", "collTime", "m", MarkTypeEnum.FSLTDZ_LIMIT), - MAX_WATER_LEVEL("最大水位", MonitorSourceEnum.MS_HDM_RSVREVS, "htrz", "collTime", "m"), - MIN_WATER_LEVEL("最小水位", MonitorSourceEnum.MS_HDM_RSVREVS, "ltrz", "collTime", "m"), - AVG_WATER_LEVEL("平均水位", MonitorSourceEnum.MS_HDM_RSVRAV, "avrz", "collTime", "m"), + DF_WATER_LEVEL("水位", MonitorSourceEnum.MS_HDM_RIVER, "z", "tm", "m"), STORE_WATER("蓄水量", MonitorSourceEnum.MS_HDM_RSVR, "w", "collTime", "m³"), - RAINFALL("降雨量", MonitorSourceEnum.MS_HDM_OBP, "drp", "collTime", "mm", MarkTypeEnum.CHFLLV), - MAX_RAINFALL("最大降雨量", MonitorSourceEnum.MS_HDM_OBP, "drp", "collTime", "mm", OperatorEnum.MAX), - MIN_RAINFALL("最小降雨量", MonitorSourceEnum.MS_HDM_OBP, "drp", "collTime", "mm", OperatorEnum.MIN), - AVG_RAINFALL("平均降雨量", MonitorSourceEnum.MS_HDM_OBP, "drp", "collTime", "mm", OperatorEnum.AVG), - AIR_TEMPE("气温", MonitorSourceEnum.MS_DSM_ENV, "aitp", "tm", "℃"), - WATER_TEMPE("水温", MonitorSourceEnum.MS_DSM_ENV, "ctp", "tm", "℃"), + SK_RAINFALL("降雨量", MonitorSourceEnum.MS_HDM_OBP, "drp", "collTime", "mm", MarkTypeEnum.CHFLLV), + RAINFALL("降雨量", MonitorSourceEnum.MS_HDM_OBP, "drp", "collTime", "mm" ), + INFLOW_RATE("入库流量", MonitorSourceEnum.MS_HDM_RSVR, "inq", "collTime", "m³/s"), + OUTFLOW_RATE("出库流量", MonitorSourceEnum.MS_HDM_RSVR, "otq", "collTime", "m³/s"), + AIR_TEMPE("气温", MonitorSourceEnum.MS_HDM_TMP, "atmp", "tm", "℃"), + WATER_TEMPE("水温", MonitorSourceEnum.MS_HDM_TMP, "wtmp", "tm", "℃"), UPLIFTED_PRESSURE("扬压力", MonitorSourceEnum.MS_DSM_PTMP, "upliftedPressure", "mstm", "MPa"), - PERMEABILITY_PRESSURE("渗透压力", MonitorSourceEnum.MS_DSM_SPPR, "spprwl", "mstm", "MPa"), + SEEPAGE_FLOW("渗流量", MonitorSourceEnum.MS_DSM_SPQN, "spqn", "mstm", "L/s"), + VERTICAL_DISPLACEMENT("表面垂直位移", MonitorSourceEnum.MS_DSM_SRVRDS, "vrds", "mstm", "mm"), + HORIZONTAL_DISPLACEMENT_X_SURFACE("表面X向水平位移", MonitorSourceEnum.MS_DSM_SRHRDS, "xhrds", "mstm", "mm"), + HORIZONTAL_DISPLACEMENT_Y_SURFACE("表面Y向水平位移", MonitorSourceEnum.MS_DSM_SRHRDS, "yhrds", "mstm", "mm"), + VERTICAL_DISPLACEMENT_INTERNAL("内部垂直位移", MonitorSourceEnum.MS_DSM_INVRDS, "vrds", "mstm", "mm"), + HORIZONTAL_DISPLACEMENT_X_INTERNAL("内部X向水平位移", MonitorSourceEnum.MS_DSM_INHRDS, "xhrds", "mstm", "mm"), + HORIZONTAL_DISPLACEMENT_Y_INTERNAL("内部Y向水平位移", MonitorSourceEnum.MS_DSM_INHRDS, "yhrds", "mstm", "mm"), + CRACK_OPENING_DEGREE("裂缝开合度", MonitorSourceEnum.MS_DSM_CKOPDG, "ckopdg", "mstm", "mm"), + STRESS("应力", MonitorSourceEnum.MS_DSM_PR, "sts", "mstm", "MPa"), + STRAIN("应变", MonitorSourceEnum.MS_DSM_ST, "stn", "mstm", "με"), - ; + WATER_LEVEL_ABOVE_GATE("闸上水位", MonitorSourceEnum.MS_HDM_WAS, "upz", "tm", "m"), + WATER_LEVEL_BELOW_GATE("闸下水位", MonitorSourceEnum.MS_HDM_WAS, "dwz", "tm", "m"), + GATE_FLOW_RATE("过闸流量", MonitorSourceEnum.MS_HDM_WAS, "tgtq", "tm", "m³/s"), + SEEPAGE_AROUND_DAM("绕坝渗流", MonitorSourceEnum.MS_DSM_PTMP, "bypassSeepage", "pstm", "L/s");; private final String zhName; private final MonitorSourceEnum source; @@ -27,39 +37,35 @@ public enum MonitorTypeEnum implements MonitorIndexInfo { private final String timeField; private final String unit; private final MarkTypeEnum markType; - private final OperatorEnum operator; - MonitorTypeEnum(String zhName, MonitorSourceEnum source, String valueField, String timeField, String unit) { - this(zhName, source, valueField, timeField, unit, null, OperatorEnum.TOP); - } - - MonitorTypeEnum(String zhName, MonitorSourceEnum source, String valueField, String timeField, String unit, MarkTypeEnum markType) { - this(zhName, source, valueField, timeField, unit, markType, OperatorEnum.TOP); - } - - MonitorTypeEnum(String zhName, MonitorSourceEnum source, String valueField, String timeField, String unit, OperatorEnum operator) { - this(zhName, source, valueField, timeField, unit, null, operator); + this(zhName, source, valueField, timeField, unit, null); } - MonitorTypeEnum(String zhName, MonitorSourceEnum source, String valueField, String timeField, String unit, MarkTypeEnum markType, OperatorEnum operator) { + MonitorTypeEnum(String zhName, MonitorSourceEnum source, String valueField, String timeField, String unit, MarkTypeEnum markType) { this.zhName = zhName; this.source = source; this.valueField = valueField; this.unit = unit; this.markType = markType; this.timeField = timeField; - this.operator = operator; } @Getter public enum OperatorEnum { - TOP, - MAX, - MIN, - AVG, - TOTAL, + TOP("当前", 0), + MAX("最大", 1), + MIN("最小", 2), + AVG("平均", 3), + TOTAL("总量", 4), ; + private final String zhName; + private final Integer sort; + + OperatorEnum(String zhName, Integer sort) { + this.zhName = zhName; + this.sort = sort; + } } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmInvrds.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmInvrds.java new file mode 100644 index 00000000..6242a2eb --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmInvrds.java @@ -0,0 +1,89 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("ms_dsm_invrds") +@Data +@ApiModel("内部垂直位移监测表") +public class MsDsmInvrds extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @JSONField(name = "PRJ_STCD") + private String prjStcd; + + @ApiModelProperty("测站测点代码") + @JSONField(name = "MPCD") + private String mpcd; + + /** + * 时间 + */ + @ApiModelProperty("时间") + @JSONField(name = "MSTM", format = "yyyy-MM-dd HH:mm:ss") + private Date mstm; + + @ApiModelProperty("内部垂直位移") + @JSONField(name = "VRDS") + private String vrds; + + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @JSONField(name = "COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @JSONField(name = "CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @JSONField(name = "COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @JSONField(name = "GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @JSONField(name = "RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @JSONField(name = "COMMAND_ID") + private String commandId; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPr.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmPr.java similarity index 74% rename from shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPr.java rename to shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmPr.java index 03d23b68..ef8078b6 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPr.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmPr.java @@ -1,5 +1,6 @@ package com.kms.yxgh.base.domain.monitor; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -14,7 +15,7 @@ import java.util.Date; @TableName("ms_dsm_pr") @Data @ApiModel("应力监测表") -public class MsHdmPr extends SyBaseEntity { +public class MsDsmPr extends SyBaseEntity { private static final long serialVersionUID = 1L; @@ -23,14 +24,14 @@ public class MsHdmPr extends SyBaseEntity { * 水利工程测站代码 */ @ApiModelProperty("水利工程测站代码") - @TableField("PRJ_STCD") + @JSONField( name = "PRJ_STCD") private String prjStcd; /** * 测点编号 */ @ApiModelProperty("测点编号") - @TableField("MPCD") + @JSONField( name = "MPCD") private String mpcd; /** @@ -38,35 +39,35 @@ public class MsHdmPr extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("测量时间") - @TableField("MSTM") + @JSONField( name = "MSTM") private Date mstm; /** * 温度（℃） */ @ApiModelProperty("温度（℃）") - @TableField("TMP") - private BigDecimal tmp; + @JSONField( name = "TMP") + private String tmp; /** * 应力（MPa） */ @ApiModelProperty("应力（MPa）") - @TableField("STS") - private BigDecimal sts; + @JSONField( name = "STS") + private String sts; /** * 采集方式 */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField( name = "COLMT") private String colmt; /** * 级联时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") - @TableField("CONN_TIME") + @JSONField( name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date connTime; /** @@ -74,28 +75,28 @@ public class MsHdmPr extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @TableField("COLL_TIME") + @JSONField( name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date collTime; /** * 数据来源 */ @ApiModelProperty("数据来源") - @TableField("GDWR_DASC") + @JSONField( name = "GDWR_DASC") private String gdwrDasc; /** * 置信度 */ @ApiModelProperty("置信度") - @TableField("RELIABILITY") + @JSONField( name = "RELIABILITY") private String reliability; /** * 指令ID */ @ApiModelProperty("指令ID") - @TableField("COMMAND_ID") + @JSONField( name = "COMMAND_ID") private String commandId; /** @@ -103,6 +104,6 @@ public class MsHdmPr extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("CREATE_TIME") + @JSONField( name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmSpqn.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmSpqn.java index 392a2ce8..703ea5bc 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmSpqn.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmSpqn.java @@ -96,12 +96,4 @@ public class MsDsmSpqn { @ApiModelProperty("指令ID") @JSONField(name = "COMMAND_ID") private String commandId; - - /** - * 入库时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("入库时间") - @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") - private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSt.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmSt.java similarity index 75% rename from shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSt.java rename to shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmSt.java index 1dd3fb45..1e6256bb 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSt.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmSt.java @@ -1,6 +1,6 @@ package com.kms.yxgh.base.domain.monitor; -import com.baomidou.mybatisplus.annotation.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; @@ -14,7 +14,7 @@ import java.util.Date; @TableName("ms_dsm_st") @Data @ApiModel("应变监测表") -public class MsHdmSt extends SyBaseEntity { +public class MsDsmSt extends SyBaseEntity { private static final long serialVersionUID = 1L; @@ -23,14 +23,14 @@ public class MsHdmSt extends SyBaseEntity { * 水利工程测站代码 */ @ApiModelProperty("水利工程测站代码") - @TableField("PRJ_STCD") + @JSONField(name = "PRJ_STCD") private String prjStcd; /** * 测点编号 */ @ApiModelProperty("测点编号") - @TableField("MPCD") + @JSONField(name = "MPCD") private String mpcd; /** @@ -38,35 +38,35 @@ public class MsHdmSt extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("测量时间") - @TableField("MSTM") + @JSONField(name = "MSTM", format = "yyyy-MM-dd HH:mm:ss") private Date mstm; /** * 温度（℃） */ @ApiModelProperty("温度（℃）") - @TableField("TMP") + @JSONField(name = "TMP") private BigDecimal tmp; /** * 应变10-6 */ @ApiModelProperty("应变10-6") - @TableField("STN") + @JSONField(name = "STN") private BigDecimal stn; /** * 采集方式 */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; /** * 级联时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") - @TableField("CONN_TIME") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date connTime; /** @@ -74,28 +74,28 @@ public class MsHdmSt extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @TableField("COLL_TIME") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date collTime; /** * 数据来源 */ @ApiModelProperty("数据来源") - @TableField("GDWR_DASC") + @JSONField(name = "GDWR_DASC") private String gdwrDasc; /** * 置信度 */ @ApiModelProperty("置信度") - @TableField("RELIABILITY") + @JSONField(name = "RELIABILITY") private String reliability; /** * 指令ID */ @ApiModelProperty("指令ID") - @TableField("COMMAND_ID") + @JSONField(name = "COMMAND_ID") private String commandId; /** @@ -103,6 +103,6 @@ public class MsHdmSt extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("CREATE_TIME") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmCkopdg.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmCkopdg.java index 0537447a..d181dc88 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmCkopdg.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmCkopdg.java @@ -1,6 +1,6 @@ package com.kms.yxgh.base.domain.monitor; -import com.baomidou.mybatisplus.annotation.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; @@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_dsm_ckopdg") @@ -23,14 +22,14 @@ public class MsHdmCkopdg extends SyBaseEntity { * 水利工程测站代码 */ @ApiModelProperty("水利工程测站代码") - @TableField("PRJ_STCD") + @JSONField(name = "PRJ_STCD") private String prjStcd; /** * 测点编号 */ @ApiModelProperty("测点编号") - @TableField("MPCD") + @JSONField(name = "MPCD") private String mpcd; /** @@ -38,27 +37,27 @@ public class MsHdmCkopdg extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("测量时间") - @TableField("MSTM") + @JSONField(name = "MSTM", format = "yyyy-MM-dd HH:mm:ss") private Date mstm; /** * 温度（℃） */ @ApiModelProperty("温度（℃）") - @TableField("TMP") - private BigDecimal tmp; + @JSONField(name = "TMP") + private String tmp; /** * 裂缝开合度（位移）（mm） */ @ApiModelProperty("裂缝开合度（位移）（mm）") - @TableField("CKOPDG") - private BigDecimal ckopdg; + @JSONField(name = "CKOPDG") + private String ckopdg; /** * 采集方式 */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; /** @@ -66,7 +65,7 @@ public class MsHdmCkopdg extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") - @TableField("CONN_TIME") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date connTime; /** @@ -74,28 +73,28 @@ public class MsHdmCkopdg extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @TableField("COLL_TIME") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date collTime; /** * 数据来源 */ @ApiModelProperty("数据来源") - @TableField("GDWR_DASC") + @JSONField(name = "GDWR_DASC") private String gdwrDasc; /** * 置信度 */ @ApiModelProperty("置信度") - @TableField("RELIABILITY") + @JSONField(name = "RELIABILITY") private String reliability; /** * 指令ID */ @ApiModelProperty("指令ID") - @TableField("COMMAND_ID") + @JSONField(name = "COMMAND_ID") private String commandId; /** @@ -103,6 +102,6 @@ public class MsHdmCkopdg extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("CREATE_TIME") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInvrds.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInvrds.java deleted file mode 100644 index 7e1b8a0c..00000000 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInvrds.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.kms.yxgh.base.domain.monitor; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yxgh.base.SyBaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -@TableName("ms_dsm_invrds") -@Data -@ApiModel("内部垂直位移监测表") -public class MsHdmInvrds extends SyBaseEntity { - - - private static final long serialVersionUID = 1L; - - /** - * 水利工程测站代码 - */ - @ApiModelProperty("水利工程测站代码") - @TableField("PRJ_STCD") - private String prjStcd; - - /** - * 时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("时间") - @TableField("TM") - private Date tm; - - /** - * 闸上水位 - */ - @ApiModelProperty("闸上水位") - @TableField("SLUPSZ") - private BigDecimal slupsz; - /** - * 闸上水位 - */ - @ApiModelProperty("闸下水位") - @TableField("SLDSZ") - private BigDecimal sldsz; - - /** - * 过闸流量（m³/s） - */ - @ApiModelProperty("过闸流量（m³/s）") - @TableField("THRSLQ") - private BigDecimal thrslq; - /** - * 开启孔数（m³/s - */ - @ApiModelProperty("开启孔数（m³/s") - @TableField("GTOPN") - private BigDecimal gtopn; - /** - * 闸上水势 - */ - @ApiModelProperty("闸上水势") - @TableField("UPSWTP") - private BigDecimal upswtp; - /** - * 闸下水势 - */ - @ApiModelProperty("闸下水势") - @TableField("DSWTP") - private BigDecimal dswtp; - - /** - * 填报人 - */ - @ApiModelProperty("填报人") - @TableField("REPORTER") - private String reporter; - - /** - * 填报人联系方式 - */ - @ApiModelProperty("填报人联系方式") - @TableField("RPTTLNMB") - private String rpttlnmb; - - /** - * 备注 - */ - @ApiModelProperty("备注") - @TableField("NT") - private String nt; - - /** - * 采集方式 - */ - @ApiModelProperty("采集方式") - @TableField("COLMT") - private String colmt; - - /** - * 级联时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("级联时间") - @TableField("CONN_TIME") - private Date connTime; - - /** - * 采集时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("采集时间") - @TableField("COLL_TIME") - private Date collTime; - - /** - * 数据来源 - */ - @ApiModelProperty("数据来源") - @TableField("GDWR_DASC") - private String gdwrDasc; - - /** - * 置信度 - */ - @ApiModelProperty("置信度") - @TableField("RELIABILITY") - private String reliability; - - /** - * 指令ID - */ - @ApiModelProperty("指令ID") - @TableField("COMMAND_ID") - private String commandId; - - /** - * 入库时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("入库时间") - @TableField("CREATE_TIME") - private Date createTime; -} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmp.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmp.java index 6fb18dcd..833b50f2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmp.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmp.java @@ -1,6 +1,6 @@ package com.kms.yxgh.base.domain.monitor; -import com.baomidou.mybatisplus.annotation.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; @@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_hdm_tmp") @@ -22,7 +21,7 @@ public class MsHdmTmp extends SyBaseEntity { * 测站编码 */ @ApiModelProperty("测站编码") - @TableField("STCD") + @JSONField(name = "STCD") private String stcd; /** @@ -30,29 +29,29 @@ public class MsHdmTmp extends SyBaseEntity { */ @ApiModelProperty("时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField("TM") + @JSONField(name = "TM", format = "yyyy-MM-dd HH:mm:ss") private Date tm; /** * 气温（℃） */ @ApiModelProperty("气温（℃）") - @TableField("ATMP") - private BigDecimal atmp; + @JSONField(name = "ATMP") + private String atmp; /** * 水温（℃） */ @ApiModelProperty("水温（℃）") - @TableField("WTMP") - private BigDecimal wtmp; + @JSONField(name = "WTMP") + private String wtmp; /** * 采集方式 */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; /** @@ -60,7 +59,7 @@ public class MsHdmTmp extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") - @TableField("CONN_TIME") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date connTime; /** @@ -68,35 +67,28 @@ public class MsHdmTmp extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @TableField("COLL_TIME") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date collTime; /** * 数据来源 */ @ApiModelProperty("数据来源") - @TableField("GDWR_DASC") + @JSONField(name = "GDWR_DASC") private String gdwrDasc; /** * 置信度 */ @ApiModelProperty("置信度") - @TableField("RELIABILITY") + @JSONField(name = "RELIABILITY") private String reliability; /** * 指令ID */ @ApiModelProperty("指令ID") - @TableField("COMMAND_ID") + @JSONField(name = "COMMAND_ID") private String commandId; - /** - * 入库时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("入库时间") - @TableField("CREATE_TIME") - private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWas.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWas.java index 0bb08a38..b80aae08 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWas.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWas.java @@ -1,6 +1,6 @@ package com.kms.yxgh.base.domain.monitor; -import com.baomidou.mybatisplus.annotation.TableField; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; @@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_hdm_was") @@ -22,7 +21,7 @@ public class MsHdmWas extends SyBaseEntity { * 测站编码 */ @ApiModelProperty("测站编码") - @TableField("STCD") + @JSONField(name = "STCD") private String stcd; /** @@ -30,63 +29,63 @@ public class MsHdmWas extends SyBaseEntity { */ @ApiModelProperty("时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField("TM") + @JSONField(name = "TM", format = "yyyy-MM-dd HH:mm:ss") private Date tm; /** * 闸上水位（m） */ @ApiModelProperty("闸上水位（m）") - @TableField("UPZ") - private BigDecimal upz; + @JSONField(name = "UPZ") + private String upz; /** * 闸下水位（m） */ @ApiModelProperty("闸下水位（m）") - @TableField("DWZ") - private BigDecimal dwz; + @JSONField(name = "DWZ") + private String dwz; /** * 总过闸流量（m³/s） */ @ApiModelProperty("总过闸流量（m³/s）") - @TableField("TGTQ") - private BigDecimal tgtq; + @JSONField(name = "TGTQ") + private String tgtq; /** * 闸水特征码 */ @ApiModelProperty("闸水特征码") - @TableField("SWCHRCD") + @JSONField(name = "SWCHRCD") private String swchrcd; /** * 闸上水势 */ @ApiModelProperty("闸上水势") - @TableField("SUPWPTN") + @JSONField(name = "SUPWPTN") private String supwptn; /** * 闸下水势 */ @ApiModelProperty("闸下水势") - @TableField("SDWWPTN") + @JSONField(name = "SDWWPTN") private String sdwwptn; /** * 测流方法 */ @ApiModelProperty("测流方法") - @TableField("MSQMT") + @JSONField(name = "MSQMT") private String msqmt; /** * 采集方式 */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; /** @@ -94,7 +93,7 @@ public class MsHdmWas extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") - @TableField("CONN_TIME") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date connTime; /** @@ -102,28 +101,28 @@ public class MsHdmWas extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @TableField("COLL_TIME") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date collTime; /** * 数据来源 */ @ApiModelProperty("数据来源") - @TableField("GDWR_DASC") + @JSONField(name = "GDWR_DASC") private String gdwrDasc; /** * 置信度 */ @ApiModelProperty("置信度") - @TableField("RELIABILITY") + @JSONField(name = "RELIABILITY") private String reliability; /** * 指令ID */ @ApiModelProperty("指令ID") - @TableField("COMMAND_ID") + @JSONField(name = "COMMAND_ID") private String commandId; /** @@ -131,6 +130,6 @@ public class MsHdmWas extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("CREATE_TIME") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date createTime; }