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 new file mode 100644 index 00000000..60f48951 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java @@ -0,0 +1,35 @@ +package com.kms.yg.cz.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yg.cz.dto.MonitorQueDto; +import com.kms.yg.cz.service.MonitorService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 监测信息Controller + * + * @author kms + * @date 2024-04-24 + */ +@RestController +@RequestMapping("/cz/monitor") +@AllArgsConstructor +@Api(tags = "监测信息") +public class MonitorController { + + private final MonitorService monitorService; + + + @PostMapping("/page") + @ApiOperation("分页查询监测信息") + public IPage page(@RequestBody MonitorQueDto sp) { + return monitorService.pageQuery(sp); + } +} \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yg/cz/domain/BsSgcStMon.java b/shuili-system/src/main/java/com/kms/yg/cz/domain/BsSgcStMon.java index 5297b56c..39d6219d 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/domain/BsSgcStMon.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/domain/BsSgcStMon.java @@ -1,20 +1,20 @@ package com.kms.yg.cz.domain; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.kms.yxgh.base.SyBaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @TableName("bs_sgc_st_mon") @Data @ApiModel("水文水工程监测站基础信息") -public class BsSgcStMon extends SyBaseEntity { - - @TableField(exist = false) - private String Id; +public class BsSgcStMon { @TableId() @ApiModelProperty("测站编码") @@ -23,7 +23,34 @@ public class BsSgcStMon extends SyBaseEntity { @ApiModelProperty("测站监测要素") private String monProj; - @TableField(exist = false) - private String remark; + /** + * 创建人 + */ + @ApiModelProperty("创建人") + @TableField(fill = FieldFill.INSERT) + private String createUid; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 最近修改人 + */ + @ApiModelProperty("最近修改人") + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateUid; + + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("最近修改时间") + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java new file mode 100644 index 00000000..2a5d4407 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java @@ -0,0 +1,44 @@ +package com.kms.yg.cz.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yg.cz.enmu.MonitorEnum; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@ApiModel("监测信息请求参数") +public class MonitorQueDto { + + @NotNull(message = "监测类型不能为空") + @ApiModelProperty(value = "监测类型", required = true, allowableValues = "MS_HDM_RSVR,MS_HDM_OBP,MS_HDM_RIVER,MS_DSM_SRVRDS,MS_DSM_SRHRDS") + private MonitorEnum monitorType; + + @JSONField(name = "STCD") + @ApiModelProperty(value = "测站编码") + private String stcd; + @ApiModelProperty(value = "测站名称") + @JSONField(name = "MPCD") + private String mpcd; + + @JSONField(name = "START_TIME", format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @NotNull(message = "开始时间不能为空") + @ApiModelProperty(value = "开始时间", required = true) + private Date startTime; + + @JSONField(name = "END_TIME", format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @NotNull(message = "结束时间不能为空") + @ApiModelProperty(value = "结束时间", required = true) + private Date endTime; + + @ApiModelProperty(value = "页码") + private Integer pageSize = 10; + @ApiModelProperty(value = "每页条数") + private Integer pageNum = 1; +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java new file mode 100644 index 00000000..78c7ae93 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorEnum.java @@ -0,0 +1,110 @@ +package com.kms.yg.cz.enmu; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.base.Strings; +import com.kms.yg.cz.dto.MonitorQueDto; +import lombok.Data; +import lombok.Getter; + +import java.util.List; +import java.util.function.Function; + +/** + * 基础数据同步服务枚举 + * + * @author hry + * @date 2024/3/4 18:57 + */ +@Getter +public enum MonitorEnum { + + MS_HDM_RSVR("水库水情监测表"), + MS_HDM_OBP("降水量监测表"), + MS_HDM_RIVER("河道水情监测表"), + MS_DSM_SRVRDS("表面垂直位移监测表"), + MS_DSM_SRHRDS("表面水平位移监测表"), + ; + + private final String name; + private final MonitorTypeEnum type; + + + MonitorEnum(String name) { + this(name, MonitorTypeEnum.MONITOR); + } + + MonitorEnum(String name, MonitorTypeEnum type) { + this.name = name; + this.type = type; + } + + + public String getTableName() { + return this.name().toLowerCase(); + } + + public Function> getRecords() { + return resultWrapper -> { + String json = resultWrapper.getResultJson(); + if (this.type == null || Strings.isNullOrEmpty(json)) { + return new Page<>(); + } + if (this.type == MonitorTypeEnum.MONITOR) { + MonitorResponse> response = JSON.parseObject(json, new TypeReference>>() { + }); + DataInfo dataInfo = response.getData(); + Page page = new Page<>(dataInfo.getCurrent(), dataInfo.getSize(), dataInfo.getTotal()); + page.setRecords(response.getRecords()); + return page; + } else { + DataResponse> response = JSON.parseObject(json, new TypeReference>>() { + }); + MonitorQueDto queDto = resultWrapper.getQueDto(); + Page page = new Page<>(queDto.getPageNum(), queDto.getPageSize()); + page.setRecords(response.getData()); + return page; + } + }; + } + + @Data + public static class ResultWrapper { + private String resultJson; + private MonitorQueDto queDto; + } + + @Data + public static class MonitorResponse extends DataResponse { + private R records; + } + + @Data + public static class DataResponse { + private String msg; + private String code; + private T data; + } + + @Data + public static class DataInfo { + private Integer current; + private Integer size; + private Integer total; + private Integer pages; + } + + @Getter + public enum MonitorTypeEnum { + MONITOR, + DATA + } + + @Override + public String toString() { + return "表[" + this.getName() + "](" + this.name + ")"; + } + +} diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/BsSgcStMonService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/BsSgcStMonService.java index 444986d9..b0549456 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/BsSgcStMonService.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/BsSgcStMonService.java @@ -1,8 +1,8 @@ package com.kms.yg.cz.service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kms.yg.cz.domain.BsSgcStMon; import com.kms.yg.cz.mapper.BsSgcStMonMapper; -import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @date 2024-04-24 */ @Service -public class BsSgcStMonService extends BaseService { +public class BsSgcStMonService extends ServiceImpl { } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java new file mode 100644 index 00000000..de25cee3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java @@ -0,0 +1,46 @@ +package com.kms.yg.cz.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.cz.dto.MonitorQueDto; +import com.kms.yg.cz.enmu.MonitorEnum; +import com.kms.yxgh.util.DataCenterRestTemplateUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Function; + +@Service +@Slf4j +public class MonitorService { + + @Autowired + private DataCenterRestTemplateUtils dataCenterRestTemplateUtils; + + @Value("${dataSync.url:}") + private String dataSyncUrl; + @Value("#{${dataSync.paths:{}}}") + private Map paths = new HashMap<>(); + + + public IPage pageQuery(MonitorQueDto queDto) { + MonitorEnum table = queDto.getMonitorType(); + String path = paths.get(table.getTableName()); + if (path == null) { + log.error("未找到对应的路径配置, table:{}", table); + return new Page<>(); + } + String json = dataCenterRestTemplateUtils.doPostRequest(dataSyncUrl + path, queDto); + MonitorEnum.ResultWrapper resultWrapper = new MonitorEnum.ResultWrapper(); + resultWrapper.setResultJson(json); + resultWrapper.setQueDto(queDto); + Function> function = table.getRecords(); + return function.apply(resultWrapper); + } + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmObp.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmObp.java index bab81ed1..9872f55e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmObp.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmObp.java @@ -1,31 +1,26 @@ 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; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; /** - * todo + * todo */ @TableName("ms_hdm_obp") @Data @ApiModel("降水量监测表") -public class MsHdmObp extends SyBaseEntity { - - private static final long serialVersionUID = 1L; - +public class MsHdmObp { /** * 测站编码 */ @ApiModelProperty("测站编码") - @TableField("STCD") + @JSONField(name = "STCD") private String stcd; /** @@ -33,96 +28,96 @@ public class MsHdmObp 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("INTV") + @JSONField(name = "INTV") private Long intv; /** * 时段降水量 */ @ApiModelProperty("时段降水量") - @TableField("DRP") - private BigDecimal drp; + @JSONField(name = "DRP") + private String drp; /** * 降水历时 */ @ApiModelProperty("降水历时") - @TableField("PDR") + @JSONField(name = "PDR") private Long pdr; /** * 日降水量 */ @ApiModelProperty("日降水量") - @TableField("DYP") - private BigDecimal dyp; + @JSONField(name = "DYP") + private String dyp; /** * 降水量类型 */ @ApiModelProperty("降水量类型") - @TableField("PTP") + @JSONField(name = "PTP") private String ptp; /** * 天气状况 */ @ApiModelProperty("天气状况") - @TableField("WTH") + @JSONField(name = "WTH") private String wth; /** * 采集方式 */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; /** * 级联时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") - @TableField("CONN_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date connTime; /** * 采集时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @TableField("COLL_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @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("MS_CREATE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(name = "MS_CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date msCreateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRiver.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRiver.java index 3d398085..755c031e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRiver.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRiver.java @@ -1,28 +1,24 @@ 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; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_hdm_river") @Data @ApiModel("河道水情监测表") -public class MsHdmRiver extends SyBaseEntity { - - private static final long serialVersionUID = 1L; +public class MsHdmRiver { /** * 测站编码 */ @ApiModelProperty("测站编码") - @TableField("STCD") + @JSONField(name = "STCD") private String stcd; /** @@ -30,77 +26,77 @@ public class MsHdmRiver 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("Z") - private BigDecimal z; + @JSONField(name = "Z") + private String z; /** * 流量 */ @ApiModelProperty("流量") - @TableField("Q") - private BigDecimal q; + @JSONField(name = "Q") + private String q; /** * 断面过水面积 */ @ApiModelProperty("断面过水面积") - @TableField("XSA") - private BigDecimal xsa; + @JSONField(name = "XSA") + private String xsa; /** * 断面平均流速 */ @ApiModelProperty("断面平均流速") - @TableField("XSAVV") - private BigDecimal xsavv; + @JSONField(name = "XSAVV") + private String xsavv; /** * 断面最大流速 */ @ApiModelProperty("断面最大流速") - @TableField("XSMXV") - private BigDecimal xsmxv; + @JSONField(name = "XSMXV") + private String xsmxv; /** * 河水特征码 */ @ApiModelProperty("河水特征码") - @TableField("FLWCHRCD") + @JSONField(name = "FLWCHRCD") private String flwchrcd; /** * 水势 */ @ApiModelProperty("水势") - @TableField("WPTN") + @JSONField(name = "WPTN") private String wptn; /** * 测流方法 */ @ApiModelProperty("测流方法") - @TableField("MSQMT") + @JSONField(name = "MSQMT") private String msqmt; /** * 测积方法 */ @ApiModelProperty("测积方法") - @TableField("MSAMT") + @JSONField(name = "MSAMT") private String msamt; /** * 测速方法 */ @ApiModelProperty("测速方法") - @TableField("MSVMT") + @JSONField(name = "MSVMT") private String msvmt; /** @@ -108,7 +104,7 @@ public class MsHdmRiver 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; /** @@ -116,27 +112,27 @@ public class MsHdmRiver 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; /** @@ -144,6 +140,6 @@ public class MsHdmRiver extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("MS_CREATE_TIME") + @JSONField(name = "MS_CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date msCreateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvr.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvr.java index c60e1d4f..a0e79a35 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvr.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvr.java @@ -1,20 +1,18 @@ 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; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_hdm_rsvr") @Data @ApiModel("水库水情监测表") -public class MsHdmRsvr extends SyBaseEntity { +public class MsHdmRsvr { private static final long serialVersionUID = 1L; @@ -22,7 +20,7 @@ public class MsHdmRsvr extends SyBaseEntity { * 测站编码 */ @ApiModelProperty("测站编码") - @TableField("STCD") + @JSONField(name = "STCD") private String stcd; /** @@ -30,77 +28,77 @@ public class MsHdmRsvr 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("RZ") - private BigDecimal rz; + @JSONField(name = "RZ") + private String rz; /** * 入库流量(m³/s) */ @ApiModelProperty("入库流量(m³/s)") - @TableField("INQ") - private BigDecimal inq; + @JSONField(name = "INQ") + private String inq; /** * 蓄水量 */ @ApiModelProperty("蓄水量") - @TableField("W") - private BigDecimal w; + @JSONField(name = "W") + private String w; /** * 库下水位(m) */ @ApiModelProperty("库下水位(m)") - @TableField("BLRZ") - private BigDecimal blrz; + @JSONField(name = "BLRZ") + private String blrz; /** * 出库流量(m³/s) */ @ApiModelProperty("出库流量(m³/s)") - @TableField("OTQ") - private BigDecimal otq; + @JSONField(name = "OTQ") + private String otq; /** * 库水特征码 */ @ApiModelProperty("库水特征码") - @TableField("RWCHRCD") + @JSONField(name = "RWCHRCD") private String rwchrcd; /** * 库水水势 */ @ApiModelProperty("库水水势") - @TableField("RWPTN") + @JSONField(name = "RWPTN") private String rwptn; /** * 入流时段长 */ @ApiModelProperty("入流时段长") - @TableField("INQDR") + @JSONField(name = "INQDR") private Long inqdr; /** * 测流方法 */ @ApiModelProperty("测流方法") - @TableField("MSQMT") + @JSONField(name = "MSQMT") private String msqmt; /** * 采集方式 */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; /** @@ -108,7 +106,7 @@ public class MsHdmRsvr 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; /** @@ -116,28 +114,28 @@ public class MsHdmRsvr 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; /** @@ -145,6 +143,6 @@ public class MsHdmRsvr extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("MS_CREATE_TIME") + @JSONField(name = "MS_CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date msCreateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSrhrds.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSrhrds.java index 15f23764..3a7dc35b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSrhrds.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSrhrds.java @@ -1,35 +1,31 @@ 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; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_dsm_srhrds") @Data @ApiModel("表面水平位移监测表") -public class MsHdmSrhrds extends SyBaseEntity { - - private static final long serialVersionUID = 1L; +public class MsHdmSrhrds { /** * 水利工程测站代码 */ @ApiModelProperty("水利工程测站代码") - @TableField("PRJ_STCD") + @JSONField(name = "PRJ_STCD") private String prjStcd; /** * 测点编号 */ @ApiModelProperty("测点编号") - @TableField("MPCD") + @JSONField(name = "MPCD") private String mpcd; @@ -38,28 +34,28 @@ public class MsHdmSrhrds extends SyBaseEntity { */ @ApiModelProperty("测量时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField("MSTM") + @JSONField(name = "MSTM", format = "yyyy-MM-dd HH:mm:ss") private Date mstm; /** * X向水平位移(mm) */ @ApiModelProperty("X向水平位移(mm)") - @TableField("XHRDS") - private BigDecimal xhrds; + @JSONField(name = "XHRDS") + private String xhrds; /** * Y向水平位移(mm) */ @ApiModelProperty("Y向水平位移(mm)") - @TableField("YHRDS") - private BigDecimal yhrds; + @JSONField(name = "YHRDS") + private String yhrds; /** * 采集方式 */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; /** @@ -67,7 +63,7 @@ public class MsHdmSrhrds 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; /** @@ -75,28 +71,28 @@ public class MsHdmSrhrds extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @TableField("COLL_TIME") + @JSONField(name = "COLL_TIME") 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; /** @@ -104,6 +100,6 @@ public class MsHdmSrhrds extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("MS_CREATE_TIME") + @JSONField(name = "MS_CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date msCreateTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSvrds.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSvrds.java index dca98885..bfb5be32 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSvrds.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSvrds.java @@ -1,35 +1,31 @@ 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; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; @TableName("ms_dsm_srvrds") @Data @ApiModel("表面垂直位移监测表") -public class MsHdmSvrds extends SyBaseEntity { - - private static final long serialVersionUID = 1L; +public class MsHdmSvrds { /** * 水利工程测站代码 */ @ApiModelProperty("水利工程测站代码") - @TableField("PRJ_STCD") + @JSONField(name = "PRJ_STCD") private String prjStcd; /** * 测点编号 */ @ApiModelProperty("测点编号") - @TableField("MPCD") + @JSONField(name = "MPCD") private String mpcd; @@ -38,22 +34,22 @@ public class MsHdmSvrds extends SyBaseEntity { */ @ApiModelProperty("测量时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField("MSTM") + @JSONField(name = "MSTM", format = "yyyy-MM-dd HH:mm:ss") private Date mstm; /** * 垂直位移(mm) */ @ApiModelProperty("垂直位移(mm)") - @TableField("VRDS") - private BigDecimal vrds; + @JSONField(name = "VRDS") + private String vrds; /** * 采集方式 */ @ApiModelProperty("采集方式") - @TableField("COLMT") + @JSONField(name = "COLMT") private String colmt; /** @@ -61,7 +57,7 @@ public class MsHdmSvrds 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; /** @@ -69,28 +65,28 @@ public class MsHdmSvrds 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; /** @@ -98,6 +94,6 @@ public class MsHdmSvrds extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @TableField("MS_CREATE_TIME") + @JSONField(name = "MS_CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date msCreateTime; }