From d350eb591a027b4de9090c94e2d8e0ef19927709 Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Tue, 30 Jan 2024 19:03:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyt/controller/GateController.java | 11 ++++-- .../GateRepairRecordController.java | 5 +-- .../project/xyt/entity/vo/GateInfoVo.java | 3 ++ .../project/xyt/entity/vo/StFlowRVo.java | 37 +++++++++++++++++++ .../project/xyt/mapper/StGateBMapper.java | 9 +++-- .../project/xyt/service/GateService.java | 7 ++++ .../xyt/service/impl/GateServiceImpl.java | 6 +++ src/main/resources/mapper/StGateBMapper.xml | 4 ++ 8 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/gunshi/project/xyt/entity/vo/StFlowRVo.java diff --git a/src/main/java/com/gunshi/project/xyt/controller/GateController.java b/src/main/java/com/gunshi/project/xyt/controller/GateController.java index ea9f890..3fb019a 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/GateController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/GateController.java @@ -3,11 +3,10 @@ package com.gunshi.project.xyt.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; -import com.gunshi.project.xyt.model.StWaterQualityR; -import com.gunshi.project.xyt.service.GateService; import com.gunshi.project.xyt.entity.vo.GateInfoVo; +import com.gunshi.project.xyt.entity.vo.StFlowRVo; +import com.gunshi.project.xyt.service.GateService; import com.gunshi.project.xyt.so.GateHistoryPageSo; -import com.gunshi.project.xyt.so.WaterQualityPageSo; import com.gunshi.project.xyt.validate.markers.QueryPage; import com.gunshi.project.xyt.validate.markers.QueryTimeRange; import io.swagger.v3.oas.annotations.Operation; @@ -50,4 +49,10 @@ public class GateController { return R.ok(gateService.page(gateHistoryPageSo)); } + @Operation(summary = "流量计列表") + @GetMapping("/flow/list") + public R> flowList() { + return R.ok(gateService.queryFlowList()); + } + } diff --git a/src/main/java/com/gunshi/project/xyt/controller/GateRepairRecordController.java b/src/main/java/com/gunshi/project/xyt/controller/GateRepairRecordController.java index 37024ab..9654d1d 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/GateRepairRecordController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/GateRepairRecordController.java @@ -1,9 +1,6 @@ package com.gunshi.project.xyt.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.addressbook.entity.so.UamsOrgPageSo; -import com.gunshi.addressbook.entity.vo.UamsOrgFullInfoVo; -import com.gunshi.addressbook.model.UamsOrgB; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.dto.StGateRepairRecordDto; import com.gunshi.project.xyt.entity.vo.GateRepairDetailVo; @@ -58,7 +55,7 @@ public class GateRepairRecordController { @Operation(summary = "根据recordId删除检修记录") @Parameter(name = "recordId", description = "检修记录id") - @DeleteMapping("/delete") + @GetMapping("/delete") public R delete(@RequestParam("recordId") Long recordId){ return R.ok(gateRepairRecordService.deleteRecord(recordId)); } diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/GateInfoVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/GateInfoVo.java index b73ced8..ad98e0e 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/GateInfoVo.java +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/GateInfoVo.java @@ -1,6 +1,8 @@ package com.gunshi.project.xyt.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -17,6 +19,7 @@ import java.util.Date; public class GateInfoVo { @Schema(description = "闸阀ID") + @JsonSerialize(using = ToStringSerializer.class) private Long gateId; @Schema(description = "闸阀名称") diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/StFlowRVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/StFlowRVo.java new file mode 100644 index 0000000..57ceaac --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/entity/vo/StFlowRVo.java @@ -0,0 +1,37 @@ +package com.gunshi.project.xyt.entity.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.gunshi.core.dateformat.DateFormatString; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 闸门详细信息 + * Created by wanyan on 2024/1/26 + * + * @author wanyan + * @version 1.0 + */ +@Data +public class StFlowRVo { + + @Schema(description = "测站编码") + private String stcd; + + @Schema(description="测站名称") + private String stnm; + + @Schema(description = "采集时间") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + private Date tm; + + @Schema(description = "通道") + private String chid; + + @Schema(description = "小时流量") + private BigDecimal hq; + +} diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StGateBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StGateBMapper.java index 3d0a3ee..47839be 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/StGateBMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/StGateBMapper.java @@ -3,13 +3,14 @@ package com.gunshi.project.xyt.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.db.dao.IMapper; import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; -import com.gunshi.project.xyt.model.StGateB; -import java.util.List; - import com.gunshi.project.xyt.entity.vo.GateInfoVo; +import com.gunshi.project.xyt.entity.vo.StFlowRVo; +import com.gunshi.project.xyt.model.StGateB; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface StGateBMapper extends IMapper { int batchInsert(@Param("list") List list); @@ -18,4 +19,6 @@ public interface StGateBMapper extends IMapper { List queryGateList(); Page gateHistory(Page page,@Param("gateId") Long gateId,@Param("startTime") String startTime,@Param("endTime") String endTime); + + List queryFlowList(); } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/service/GateService.java b/src/main/java/com/gunshi/project/xyt/service/GateService.java index e79c644..b4d5921 100644 --- a/src/main/java/com/gunshi/project/xyt/service/GateService.java +++ b/src/main/java/com/gunshi/project/xyt/service/GateService.java @@ -3,6 +3,7 @@ package com.gunshi.project.xyt.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; import com.gunshi.project.xyt.entity.vo.GateInfoVo; +import com.gunshi.project.xyt.entity.vo.StFlowRVo; import com.gunshi.project.xyt.so.GateHistoryPageSo; import java.util.List; @@ -28,4 +29,10 @@ public interface GateService { * @return */ Page page(GateHistoryPageSo gateHistoryPageSo); + + /** + * 流量计列表查询 + * @return + */ + List queryFlowList(); } diff --git a/src/main/java/com/gunshi/project/xyt/service/impl/GateServiceImpl.java b/src/main/java/com/gunshi/project/xyt/service/impl/GateServiceImpl.java index 4be5ebf..7d6649d 100644 --- a/src/main/java/com/gunshi/project/xyt/service/impl/GateServiceImpl.java +++ b/src/main/java/com/gunshi/project/xyt/service/impl/GateServiceImpl.java @@ -5,6 +5,7 @@ import com.gunshi.db.dao.BaseOrderDao; import com.gunshi.db.dto.DateTimeRangeSo; import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; import com.gunshi.project.xyt.entity.vo.GateInfoVo; +import com.gunshi.project.xyt.entity.vo.StFlowRVo; import com.gunshi.project.xyt.mapper.StGateBMapper; import com.gunshi.project.xyt.model.StGateB; import com.gunshi.project.xyt.service.GateService; @@ -55,4 +56,9 @@ public class GateServiceImpl extends BaseOrderDao implem return stGateBMapper.gateHistory(gateHistoryPageSo.getPageSo().toPage(),gateHistoryPageSo.getGateId(),startTime,endTime); } + + @Override + public List queryFlowList() { + return stGateBMapper.queryFlowList(); + } } diff --git a/src/main/resources/mapper/StGateBMapper.xml b/src/main/resources/mapper/StGateBMapper.xml index 1d8cda2..f1e66d3 100644 --- a/src/main/resources/mapper/StGateBMapper.xml +++ b/src/main/resources/mapper/StGateBMapper.xml @@ -56,4 +56,8 @@ and a.TM #{endTime} + \ No newline at end of file