From a3b3d06487728ff2a6de418c96f818f6334b5d83 Mon Sep 17 00:00:00 2001 From: hxh Date: Fri, 21 Mar 2025 17:56:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=B0=B4=E9=97=B8?= =?UTF-8?q?=E5=BC=80=E5=BA=A6/=E6=B0=B4=E8=B4=A8=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReservoirOverviewDataController.java | 60 ------------------- .../java/com/kms/yg/cz/dto/MonitorQueDto.java | 4 +- .../com/kms/yg/cz/enmu/MonitorSourceEnum.java | 14 +++-- .../com/kms/yg/cz/service/MonitorService.java | 2 +- .../sk/controller/AttResBaseSkController.java | 29 +++++++++ .../ReservoirOverviewDataController.java | 32 ++++++++++ .../com/kms/yg/sk/dto/GateOpeningDownDto.java | 33 ---------- .../com/kms/yg/sk/dto/GateOpeningDto.java | 16 ----- .../kms/yg/sk/dto/WaterDetectionDownDto.java | 34 ----------- .../com/kms/yg/sk/dto/WaterDetectionDto.java | 16 ----- .../{MsHdmGate.java => MsHpmGate.java} | 59 +++++------------- .../{MsHdmWqamd.java => MsWqmWqamd.java} | 58 +++++++++--------- .../yxgh/base/domain/sz/SzDwsRelWagaRes.java | 4 +- 13 files changed, 122 insertions(+), 239 deletions(-) delete mode 100644 shuili-system/src/main/java/com/kms/yg/cz/controller/ReservoirOverviewDataController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/controller/ReservoirOverviewDataController.java delete mode 100644 shuili-system/src/main/java/com/kms/yg/sk/dto/GateOpeningDownDto.java delete mode 100644 shuili-system/src/main/java/com/kms/yg/sk/dto/GateOpeningDto.java delete mode 100644 shuili-system/src/main/java/com/kms/yg/sk/dto/WaterDetectionDownDto.java delete mode 100644 shuili-system/src/main/java/com/kms/yg/sk/dto/WaterDetectionDto.java rename shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/{MsHdmGate.java => MsHpmGate.java} (69%) rename shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/{MsHdmWqamd.java => MsWqmWqamd.java} (82%) diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/ReservoirOverviewDataController.java b/shuili-system/src/main/java/com/kms/yg/cz/controller/ReservoirOverviewDataController.java deleted file mode 100644 index 0fb7121e..00000000 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/ReservoirOverviewDataController.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.kms.yg.cz.controller; - -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.service.MonitorService; -import com.kms.yg.sk.dto.*; -import com.kms.yxgh.base.Response; -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; - -/** - * @author lyd - * @company 数元科技有限公司 - * @create 2025-03-19 9:34 - */ -@RestController -@AllArgsConstructor -@RequestMapping("/run/sk/statistics") -public class ReservoirOverviewDataController { - - private final MonitorService monitorService; - - - @PostMapping("/view") - @ApiOperation("水库总览") - public Response getPreview(@RequestBody AttResTaskViewDto dto) { - return Response.ok(monitorService.getPreview(dto)); - } - - @PostMapping("/water-check-list") - @ApiOperation("水质检查列表") - public IPage waterLst(@RequestBody MonitorQueDto dto) { - return new Page<>(); - } - - @PostMapping("/water-check-down") - @ApiOperation("水质检查下拉") - public Response waterDown(@RequestBody MonitorQueDto dto) { - return Response.ok(); - } - - @PostMapping("/gate-opening-list") - @ApiOperation("闸门开度列表") - public IPage gateList(@RequestBody MonitorQueDto dto) { - return new Page<>(); - } - - @PostMapping("/gate-opening-down") - @ApiOperation("闸门开度下拉") - public Response gateDown(@RequestBody MonitorQueDto dto) { - return Response.ok(); - } - - -} 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 index 14346a9f..21f396cd 100644 --- 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 @@ -28,6 +28,9 @@ public class MonitorQueDto { @JSONField(name = "RES_CODE") private String resCode; + @ApiModelProperty(value = "水闸编码") + private String wagaCode; + @ApiModelProperty(value = "大坝代码") @JSONField(name = "DAM_CODE") private String damCode; @@ -57,5 +60,4 @@ public class MonitorQueDto { private Integer pageNum = 1; - } 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 dc6cdd16..c980e973 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 @@ -11,6 +11,7 @@ import com.kms.yxgh.base.domain.monitor.*; import com.kms.yxgh.base.domain.sk.AttResSw; import com.kms.yxgh.base.domain.sk.SkAttDamBase; import com.kms.yxgh.base.domain.sk.SkRelStRes; +import com.kms.yxgh.base.domain.sz.SzDwsRelWagaRes; import lombok.Data; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -55,7 +56,10 @@ public enum MonitorSourceEnum { ATT_RES_RSPP("水库溢洪道表", AttResRspp.class), ATT_DAM_BASE("水库大坝基础信息表", MonitorTypeEnum.DATA, SkAttDamBase.class), DWS_ATT_DAM_RSPP("大坝特征值表", MonitorTypeEnum.DATA, DwsAttDamRspp.class), - DWS_REL_ST_RES("代表站",MonitorTypeEnum.DATA, SkRelStRes.class), + DWS_REL_ST_RES("水库测站关系表", MonitorTypeEnum.DATA, SkRelStRes.class), + DWS_REL_WAGA_RES("水库水闸关系表", MonitorTypeEnum.DATA, SzDwsRelWagaRes.class), + MS_HPM_GATE("闸门开度监测表", MonitorTypeEnum.DATA, MsHpmGate.class), + MS_WQM_WQAMD("水质自动监测数据表", MonitorTypeEnum.DATA, MsWqmWqamd.class), ; private final String zhName; @@ -109,8 +113,8 @@ public enum MonitorSourceEnum { return new Page<>(); } try { - DataInfo dataInfo = JSON.parseObject(response.getData(), DataInfo.class); - Page page = new Page<>(dataInfo.getCurrent(), dataInfo.getSize(), dataInfo.getTotal()); + DataInfo dataInfo = JSON.parseObject(response.getData(), DataInfo.class); + Page page = new Page<>(dataInfo.getCurrent(), dataInfo.getSize(), dataInfo.getTotal()); List data = JSON.parseArray(response.getRecords(), this.clazz); page.setRecords(Arrays.asList(data.toArray())); return page; @@ -125,8 +129,8 @@ public enum MonitorSourceEnum { return new Page<>(); } try { - MonitorQueDto queDto = resultWrapper.getQueDto(); - Page page = new Page<>(queDto.getPageNum(), queDto.getPageSize()); + MonitorQueDto queDto = resultWrapper.getQueDto(); + Page page = new Page<>(queDto.getPageNum(), queDto.getPageSize()); List data = JSON.parseArray(response.getData(), this.clazz); page.setRecords(Arrays.asList(data.toArray())); return page; 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 index 13c6a9f4..0d8bb5b9 100644 --- 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 @@ -199,7 +199,7 @@ public class MonitorService { return (List) page.getRecords(); } - private IPage queryDataPage(MonitorSourceEnum source, MonitorQueDto queDto) { + public IPage queryDataPage(MonitorSourceEnum source, MonitorQueDto queDto) { MonitorSourceEnum.ResultWrapper resultWrapper = new MonitorSourceEnum.ResultWrapper(); resultWrapper.setQueDto(queDto); String path = paths.get(source.getTableName()); diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseSkController.java b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseSkController.java index 3f31e064..e1ad0e7a 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseSkController.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseSkController.java @@ -2,9 +2,13 @@ package com.kms.yg.sk.controller; 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.MonitorSourceEnum; +import com.kms.yg.cz.service.MonitorService; import com.kms.yg.sk.domain.AttResBaseSk; import com.kms.yg.sk.service.AttResBaseSkService; import com.kms.yg.sk.service.AttResCodeService; +import com.kms.yxgh.base.Response; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; @@ -13,6 +17,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 水库基础信息Controller @@ -28,6 +34,8 @@ public class AttResBaseSkController extends BaseController { private AttResBaseSkService attResBaseSkService; @Autowired private AttResCodeService attResCodeService; + @Autowired + private MonitorService monitorService; @PostMapping("/list") @ApiOperation("水库基础信息列表") @@ -54,4 +62,25 @@ public class AttResBaseSkController extends BaseController { return AjaxResult.success(attResCodeService.getById(id)); } + @GetMapping("/waga/{resCodee}") + @ApiOperation("水库有水闸") + public Response> wagaForRes(@RequestParam("resCode") String resCode) { + MonitorQueDto dto = new MonitorQueDto(); + dto.setResCode(resCode); + dto.setPageNum(1); + dto.setPageSize(1000); + IPage page = monitorService.queryDataPage(MonitorSourceEnum.DWS_REL_WAGA_RES, dto); + return Response.ok(page.getRecords()); + } + + @GetMapping("/stcd/all/{resCode}") + @ApiOperation("水库所有测站") + public Response> ForRes(@RequestParam("resCode") String resCode) { + MonitorQueDto dto = new MonitorQueDto(); + dto.setResCode(resCode); + dto.setPageNum(1); + dto.setPageSize(1000); + IPage page = monitorService.queryDataPage(MonitorSourceEnum.DWS_REL_ST_RES, dto); + return Response.ok(page.getRecords()); + } } diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/ReservoirOverviewDataController.java b/shuili-system/src/main/java/com/kms/yg/sk/controller/ReservoirOverviewDataController.java new file mode 100644 index 00000000..93ec6f65 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/controller/ReservoirOverviewDataController.java @@ -0,0 +1,32 @@ +package com.kms.yg.sk.controller; + +import com.kms.yg.cz.service.MonitorService; +import com.kms.yg.sk.dto.AttResTaskViewDto; +import com.kms.yxgh.base.Response; +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; + +/** + * @author lyd + * @company 数元科技有限公司 + * @create 2025-03-19 9:34 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/run/sk/statistics") +public class ReservoirOverviewDataController { + + private final MonitorService monitorService; + + + @PostMapping("/view") + @ApiOperation("水库总览") + public Response getPreview(@RequestBody AttResTaskViewDto dto) { + return Response.ok(monitorService.getPreview(dto)); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/dto/GateOpeningDownDto.java b/shuili-system/src/main/java/com/kms/yg/sk/dto/GateOpeningDownDto.java deleted file mode 100644 index 7d865f65..00000000 --- a/shuili-system/src/main/java/com/kms/yg/sk/dto/GateOpeningDownDto.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.kms.yg.sk.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author lyd - * @company 数元科技有限公司 - * @create 2025-03-19 9:02 - */ - -@Data -@ApiModel("闸门开度下拉") -public class GateOpeningDownDto { - - @ApiModelProperty("水闸开度下拉") - private List list; - - - @Data - public static class GateOpeningDownDtoItem { - - @ApiModelProperty("水闸名称") - private String wagaName; - - @ApiModelProperty("水闸code") - private String wagacODE; - - } - -} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/dto/GateOpeningDto.java b/shuili-system/src/main/java/com/kms/yg/sk/dto/GateOpeningDto.java deleted file mode 100644 index efa73855..00000000 --- a/shuili-system/src/main/java/com/kms/yg/sk/dto/GateOpeningDto.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.kms.yg.sk.dto; -import io.swagger.annotations.ApiModel; -import lombok.Data; - -/** - * @author lyd - * @company 数元科技有限公司 - * @create 2025-03-19 9:02 - */ - -@Data -@ApiModel("闸门开度") -public class GateOpeningDto { - - -} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/dto/WaterDetectionDownDto.java b/shuili-system/src/main/java/com/kms/yg/sk/dto/WaterDetectionDownDto.java deleted file mode 100644 index 0ad3348d..00000000 --- a/shuili-system/src/main/java/com/kms/yg/sk/dto/WaterDetectionDownDto.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.kms.yg.sk.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author lyd - * @company 数元科技有限公司 - * @create 2025-03-19 9:02 - */ - -@Data -@ApiModel("水质检查列表下拉") -public class WaterDetectionDownDto { - - @ApiModelProperty("水闸开度下拉") - private List list; - - - @Data - public static class StationDtoItem { - - @ApiModelProperty("测站名称") - private String stationName; - - @ApiModelProperty("测站code") - private String stationCode; - - } - - -} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/dto/WaterDetectionDto.java b/shuili-system/src/main/java/com/kms/yg/sk/dto/WaterDetectionDto.java deleted file mode 100644 index f9f56a4b..00000000 --- a/shuili-system/src/main/java/com/kms/yg/sk/dto/WaterDetectionDto.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.kms.yg.sk.dto; -import io.swagger.annotations.ApiModel; -import lombok.Data; - -/** - * @author lyd - * @company 数元科技有限公司 - * @create 2025-03-19 9:02 - */ - -@Data -@ApiModel("水质检查列表") -public class WaterDetectionDto { - - -} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGate.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHpmGate.java similarity index 69% rename from shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGate.java rename to shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHpmGate.java index f4104e71..1e415937 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGate.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHpmGate.java @@ -1,19 +1,20 @@ 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; -import com.kms.yxgh.base.SyBaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.Date; @TableName("ms_hpm_gate") @Data @ApiModel("水利工程闸门开度监测表") -public class MsHdmGate extends SyBaseEntity { +public class MsHpmGate implements Serializable { private static final long serialVersionUID = 1L; @@ -24,50 +25,30 @@ public class MsHdmGate extends SyBaseEntity { @TableField("PRJ_STCD") private String prjStcd; - /** - * 闸孔编号 - */ - @ApiModelProperty("闸孔编号") - @TableField("MPCD") - private String mpcd; - /** * 时间 */ + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("TM") private Date tm; /** - * 扩展关键字 - */ - @ApiModelProperty("扩展关键字") - @TableField("EXKEY") - private String exkey; - - /** - * 设备类别 - */ - @ApiModelProperty("设备类别") - @TableField("EQPTP") - private String eqptp; - - /** - * 设备编号 + * 闸门编号 */ - @ApiModelProperty("设备编号") - @TableField("EQPNO") - private String eqpno; + @ApiModelProperty("闸门编号") + @TableField("GATENO") + private String gateno; /** * 开启状态 */ @ApiModelProperty("开启状态") - @TableField("GTOPNUM") - private String gtopNum; + @TableField("GTOPST") + private String gtopst; /** @@ -75,7 +56,7 @@ public class MsHdmGate extends SyBaseEntity { */ @ApiModelProperty("开启高度") @TableField("GTOPHGT") - private String gtopHgt; + private String gtophgt; /** @@ -83,7 +64,7 @@ public class MsHdmGate extends SyBaseEntity { */ @ApiModelProperty("旋转角度") @TableField("GTOPROT") - private String gtopRot; + private String gtoprot; /** @@ -94,13 +75,6 @@ public class MsHdmGate extends SyBaseEntity { private String gtq; - /** - * 测流方法 - */ - @ApiModelProperty("设备编号") - @TableField("MSMT") - private String msmt; - /** * 采集方式 */ @@ -111,6 +85,7 @@ public class MsHdmGate extends SyBaseEntity { /** * 级联时间 */ + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") @TableField("CONN_TIME") @@ -119,6 +94,7 @@ public class MsHdmGate extends SyBaseEntity { /** * 采集时间 */ + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") @TableField("COLL_TIME") @@ -139,16 +115,11 @@ public class MsHdmGate extends SyBaseEntity { @TableField("RELIABILITY") private String reliability; - /** - * 指令ID - */ - @ApiModelProperty("指令ID") - @TableField("COMMAND_ID") - private String commandId; /** * 入库时间 */ + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") @TableField("CREATE_TIME") diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWqamd.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsWqmWqamd.java similarity index 82% rename from shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWqamd.java rename to shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsWqmWqamd.java index 98627816..5297bd5a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWqamd.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsWqmWqamd.java @@ -1,20 +1,20 @@ 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; -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.io.Serializable; import java.util.Date; @TableName("ms_wqm_wqamd") @Data @ApiModel("水质自动监测数据表") -public class MsHdmWqamd extends SyBaseEntity { +public class MsWqmWqamd implements Serializable { private static final long serialVersionUID = 1L; @@ -28,6 +28,7 @@ public class MsHdmWqamd extends SyBaseEntity { /** * 采样时间 */ + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采样时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField("SPT") @@ -38,155 +39,155 @@ public class MsHdmWqamd extends SyBaseEntity { */ @ApiModelProperty("水温（℃") @TableField("WTMP") - private BigDecimal wtmp; + private String wtmp; /** * pH值 */ @ApiModelProperty("pH值") @TableField("PH") - private BigDecimal ph; + private String ph; /** * 电导率（㎲/cm） */ @ApiModelProperty("电导率（㎲/cm）") @TableField("COND") - private BigDecimal cond; + private String cond; /** * 浑浊度（NTU） */ @ApiModelProperty("浑浊度（NTU）") @TableField("TURB") - private BigDecimal turb; + private String turb; /** * 溶解氧（mg/L） */ @ApiModelProperty("溶解氧（mg/L）") @TableField("DOX") - private BigDecimal dox; + private String dox; /** * 水温（℃ */ @ApiModelProperty("'高锰酸钾指数（mg/L)") @TableField("CODMN") - private BigDecimal codmn; + private String codmn; /** * 化学需氧量（mg/L)） */ @ApiModelProperty("化学需氧量（mg/L)）") @TableField("CODCR") - private BigDecimal codcr; + private String codcr; /** * 总氮（mg/L） */ @ApiModelProperty("总氮（mg/L）") @TableField("TN") - private BigDecimal tn; + private String tn; /** * 氨氮（mg/L） */ @ApiModelProperty("氨氮（mg/L）") @TableField("NH3N") - private BigDecimal nh3n; + private String nh3n; /** * 亚硝酸盐氮（mg/L） */ @ApiModelProperty("亚硝酸盐氮（mg/L）") @TableField("NO2") - private BigDecimal no2; + private String no2; /** * 硝酸盐氮（mg/L） */ @ApiModelProperty("硝酸盐氮（mg/L）") @TableField("NO3") - private BigDecimal no3; + private String no3; /** * 总磷（mg/L） */ @ApiModelProperty("总磷（mg/L）") @TableField("TP") - private BigDecimal tp; + private String tp; /** * 总有机碳（mg/L） */ @ApiModelProperty("总有机碳（mg/L）") @TableField("TOC") - private BigDecimal toc; + private String toc; /** * 挥发酚（mg/L） */ @ApiModelProperty("挥发酚（mg/L）") @TableField("VLPH") - private BigDecimal vlph; + private String vlph; /** * 叶绿素a（mg/L） */ @ApiModelProperty("叶绿素a（mg/L）") @TableField("CHLA") - private BigDecimal chla; + private String chla; /** * 氟化物（mg/L） */ @ApiModelProperty("氟化物（mg/L）") @TableField("F") - private BigDecimal f; + private String f; /** * 砷（mg/L） */ @ApiModelProperty("砷（mg/L）") @TableField("ARS") - private BigDecimal ars; + private String ars; /** * 汞（mg/L） */ @ApiModelProperty("汞（mg/L）") @TableField("HG") - private BigDecimal hg; + private String hg; /** * 铬（六价）（mg/L） */ @ApiModelProperty("铬（六价）（mg/L") @TableField("CR6") - private BigDecimal cr6; + private String cr6; /** * 挥发酚（mg/L） */ @ApiModelProperty("铜（mg/L）") @TableField("CU") - private BigDecimal cu; + private String cu; /** * 铅（mg/L） */ @ApiModelProperty("铅（mg/L）") @TableField("PB") - private BigDecimal pb; + private String pb; /** * 镉（mg/L） */ @ApiModelProperty("镉（mg/L）") @TableField("CD") - private BigDecimal cd; + private String cd; /** * 锌（mg/L） */ @ApiModelProperty("锌（mg/L）") @TableField("ZN") - private BigDecimal zn; + private String zn; /** * 锑（mg/L） */ @ApiModelProperty("锑（mg/L）") @TableField("SB") - private BigDecimal sb; + private String sb; /** * 备注 */ @@ -203,6 +204,7 @@ public class MsHdmWqamd extends SyBaseEntity { /** * 级联时间 */ + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") @TableField("CONN_TIME") @@ -212,6 +214,7 @@ public class MsHdmWqamd extends SyBaseEntity { * 采集时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") @TableField("COLL_TIME") private Date collTime; @@ -241,6 +244,7 @@ public class MsHdmWqamd extends SyBaseEntity { /** * 入库时间 */ + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") @TableField("CREATE_TIME") diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaRes.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaRes.java index 2a9d9c12..499f149d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaRes.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaRes.java @@ -3,17 +3,17 @@ package com.kms.yxgh.base.domain.sz; 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.io.Serializable; import java.util.Date; @TableName("dws_rel_waga_res") @Data @ApiModel("水闸所属水库关系表") -public class SzDwsRelWagaRes extends SyBaseEntity { +public class SzDwsRelWagaRes implements Serializable { private static final long serialVersionUID = 1L;