From 55f0174f8cc2ee0f41734826992086093a703416 Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Wed, 11 Sep 2024 10:18:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F-=E5=AE=9E=E6=97=B6=E9=9B=A8?= =?UTF-8?q?=E6=83=85=EF=BC=8C=E5=A4=A7=E5=9D=9D=E5=AE=89=E5=85=A8=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OsmoticPressRController.java | 7 ++++++ .../xyt/controller/StPptnRRealController.java | 2 +- .../project/xyt/mapper/StPptnRRealMapper.java | 12 ++++++++++ .../gunshi/project/xyt/model/StPptnRReal.java | 24 +++++++++++-------- .../xyt/service/OsmoticPressRService.java | 24 +++++++++++++++++++ .../xyt/service/StPptnRRealService.java | 6 +++++ 6 files changed, 64 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressRController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressRController.java index 806cc26..44f3073 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressRController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressRController.java @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*; import java.io.Serializable; import java.util.List; +import java.util.Map; /** * 描述: 渗压监测记录表 @@ -70,6 +71,12 @@ public class OsmoticPressRController { return R.ok(service.queryPage(osmoticQueryPageSo)); } + @Operation(summary = "大屏-大坝安全监测统计") + @GetMapping("/stat") + public R> stat() { + return R.ok(service.stat()); + } + @Operation(summary = "布置图-渗压/渗流监测") @GetMapping("/list/value") public R> listValue(@Schema(name = "type",description = "类型（1渗压 2渗流）") @RequestParam("type") Integer type) { diff --git a/src/main/java/com/gunshi/project/xyt/controller/StPptnRRealController.java b/src/main/java/com/gunshi/project/xyt/controller/StPptnRRealController.java index 29d750b..f1e3f05 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StPptnRRealController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StPptnRRealController.java @@ -51,7 +51,7 @@ public class StPptnRRealController { @Operation(summary = "列表") @PostMapping("/list") public R> list() { - return R.ok(service.lambdaQuery().list()); + return R.ok(service.queryList()); } // @Operation(summary = "分页") diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StPptnRRealMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StPptnRRealMapper.java index 6ff1210..db11eaf 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/StPptnRRealMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/StPptnRRealMapper.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.gunshi.project.xyt.model.StPptnRReal; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 描述: 降水量历史表 @@ -14,4 +17,13 @@ import org.apache.ibatis.annotations.Param; public interface StPptnRRealMapper extends BaseMapper { int updatePptnRReal(@Param("stcd") String stcd); + + @Select(""" + + """) + List queryList(); } diff --git a/src/main/java/com/gunshi/project/xyt/model/StPptnRReal.java b/src/main/java/com/gunshi/project/xyt/model/StPptnRReal.java index 7d84fba..1001894 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StPptnRReal.java +++ b/src/main/java/com/gunshi/project/xyt/model/StPptnRReal.java @@ -15,6 +15,7 @@ import jakarta.validation.constraints.Size; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -55,7 +56,7 @@ public class StPptnRReal implements Serializable { @TableField(value="drp") @Schema(description="drp") // @Size(max = 0,message = "drp最大长度要小于 0") - private String drp; + private BigDecimal drp; /** * today @@ -63,7 +64,7 @@ public class StPptnRReal implements Serializable { @TableField(value="today") @Schema(description="today") // @Size(max = 0,message = "today最大长度要小于 0") - private String today; + private BigDecimal today; /** * m10 @@ -71,7 +72,7 @@ public class StPptnRReal implements Serializable { @TableField(value="m10") @Schema(description="m10") // @Size(max = 0,message = "m10最大长度要小于 0") - private String m10; + private BigDecimal m10; /** * m30 @@ -79,7 +80,7 @@ public class StPptnRReal implements Serializable { @TableField(value="m30") @Schema(description="m30") // @Size(max = 0,message = "m30最大长度要小于 0") - private String m30; + private BigDecimal m30; /** * h1 @@ -87,7 +88,7 @@ public class StPptnRReal implements Serializable { @TableField(value="h1") @Schema(description="h1") // @Size(max = 0,message = "h1最大长度要小于 0") - private String h1; + private BigDecimal h1; /** * h3 @@ -95,7 +96,7 @@ public class StPptnRReal implements Serializable { @TableField(value="h3") @Schema(description="h3") // @Size(max = 0,message = "h3最大长度要小于 0") - private String h3; + private BigDecimal h3; /** * h6 @@ -103,7 +104,7 @@ public class StPptnRReal implements Serializable { @TableField(value="h6") @Schema(description="h6") // @Size(max = 0,message = "h6最大长度要小于 0") - private String h6; + private BigDecimal h6; /** * h12 @@ -111,7 +112,7 @@ public class StPptnRReal implements Serializable { @TableField(value="h12") @Schema(description="h12") // @Size(max = 0,message = "h12最大长度要小于 0") - private String h12; + private BigDecimal h12; /** * h24 @@ -119,7 +120,7 @@ public class StPptnRReal implements Serializable { @TableField(value="h24") @Schema(description="h24") // @Size(max = 0,message = "h24最大长度要小于 0") - private String h24; + private BigDecimal h24; /** * h48 @@ -127,7 +128,7 @@ public class StPptnRReal implements Serializable { @TableField(value="h48") @Schema(description="h48") // @Size(max = 0,message = "h48最大长度要小于 0") - private String h48; + private BigDecimal h48; /** * chtm @@ -163,4 +164,7 @@ public class StPptnRReal implements Serializable { @Size(max = 10,message = "cluster最大长度要小于 10") private String cluster; + @TableField(exist = false) + @Schema(description = "站点名称") + private String stnm; } diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java index 568446b..8de2541 100644 --- a/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java +++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticPressRService.java @@ -17,12 +17,14 @@ import com.gunshi.project.xyt.util.MyBeanUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 描述: 渗压监测记录表 @@ -34,6 +36,8 @@ import java.util.stream.Collectors; @Transactional(rollbackFor = Exception.class) public class OsmoticPressRService extends ServiceImpl { + @Autowired + private OsmoticShiftRService shiftRService; public Page queryPage(OsmoticQueryPageSo osmoticQueryPageSo) { return baseMapper.queryPage(osmoticQueryPageSo.getPageSo().toPage(),osmoticQueryPageSo); @@ -450,6 +454,26 @@ public class OsmoticPressRService extends ServiceImpl stat() { + Map map = new HashMap<>(); + List press = this.listValue(1); + Integer pressSize = press.size(); + Long pressWarn = press.stream().filter(o -> o.getStatus() == 1).collect(Collectors.counting()); + + List flow = this.listValue(2); + Integer flowSize = flow.size(); + Long flowWarn = flow.stream().filter(o -> o.getStatus() == 1).collect(Collectors.counting()); + + List shift = shiftRService.listValue(); + Integer shiftSize = shift.size(); + Long shiftWarn = shift.stream().filter(o -> o.getXStatus() == 1 || o.getYStatus() ==1 || o.getHStatus() == 1).collect(Collectors.counting()); + + Integer size = pressSize + flowSize + shiftSize; + Integer warn = Stream.of(pressWarn, flowWarn, shiftWarn).mapToInt(Long::intValue).sum(); + map.put(warn,size); + return map; + } } diff --git a/src/main/java/com/gunshi/project/xyt/service/StPptnRRealService.java b/src/main/java/com/gunshi/project/xyt/service/StPptnRRealService.java index 4403dcc..631dcea 100644 --- a/src/main/java/com/gunshi/project/xyt/service/StPptnRRealService.java +++ b/src/main/java/com/gunshi/project/xyt/service/StPptnRRealService.java @@ -7,6 +7,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + /** * 描述: 降水量历史表 * author: xusan @@ -21,6 +23,10 @@ public class StPptnRRealService extends ServiceImpl queryList() { + return this.baseMapper.queryList(); + } }