From cd956a9047262670498a0190ab6fcd73248e7931 Mon Sep 17 00:00:00 2001 From: hxh Date: Thu, 20 Mar 2025 14:06:30 +0800 Subject: [PATCH 01/15] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yg/cz/service/MonitorService.java | 11 ----------- 1 file changed, 11 deletions(-) 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 104ced11..291bc3bc 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 @@ -56,20 +56,9 @@ public class MonitorService { @Value("#{${dataSync.paths:{}}}") private Map paths = new HashMap<>(); - // todo 临时 - private void initPath (Map map) { - paths.put("att_res_sw","/ZHSL_ZY/jck/yggx/dws_att_res_sw"); - paths.put("att_res_rspp","/ZHSL_ZY/jck/ytjgx/dws_att_res_rspp"); - paths.put("att_dam_base","/ZHSL_ZY/jck/yggx/dws_att_dam_base"); - paths.put("ms_hdm_rsvr","/ZHSL_ZY/bzjck/ms_hdm_rsvr"); - paths.put("dws_rel_st_res","/ZHSL_ZY/jck/ytjgx/dws_rel_st_res"); - paths.put("ms_hdm_obp","/ZHSL_ZY/bzjck/ms_hdm_obp"); - } - public IPage pageQuery(MonitorQueDto queDto) { MonitorSourceEnum table = queDto.getMonitorType(); - initPath(paths); String path = paths.get(table.getTableName()); if (path == null) { log.error("未找到对应的路径配置, table:{}", table); From fc29d807b07b4a39de9f5c31fcf9f338afa8bd11 Mon Sep 17 00:00:00 2001 From: hxh Date: Thu, 20 Mar 2025 14:06:42 +0800 Subject: [PATCH 02/15] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yg/cz/service/MonitorService.java | 1 - 1 file changed, 1 deletion(-) 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 291bc3bc..f8f0096f 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 @@ -201,7 +201,6 @@ public class MonitorService { private IPage queryDataPage(MonitorSourceEnum source, MonitorQueDto queDto) { MonitorSourceEnum.ResultWrapper resultWrapper = new MonitorSourceEnum.ResultWrapper(); resultWrapper.setQueDto(queDto); - initPath(paths); String path = paths.get(source.getTableName()); if (path == null) { resultWrapper.setResultJson(source.getMockData()); From 69dd2c4eeb6aea98f587d670edbf87248b5fef46 Mon Sep 17 00:00:00 2001 From: hxh Date: Thu, 20 Mar 2025 15:13:26 +0800 Subject: [PATCH 03/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BA=94?= =?UTF-8?q?=E7=AD=94=E6=88=90=E5=8A=9F=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java index b5150b49..b3053d56 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java @@ -69,6 +69,7 @@ public class BsSgcDfSpPlayService { return result; } + @Data public static class DataResponse { private String msg; @@ -76,7 +77,7 @@ public class BsSgcDfSpPlayService { private List data = new ArrayList<>(); public Boolean isSuccess() { - return "0".equals(getCode()); + return "200".equals(getCode()); } } From 362bebe6686c7c3a8a68bb2e7fad8abd884af9b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Thu, 20 Mar 2025 15:22:27 +0800 Subject: [PATCH 04/15] =?UTF-8?q?fix:=E6=B0=B4=E5=BA=93=E6=80=BB=E8=A7=88b?= =?UTF-8?q?ug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/base/domain/sk/AttResSw.java | 5 ++++- .../java/com/kms/yxgh/base/domain/sk/SkAttDamBase.java | 6 ++++-- .../java/com/kms/yxgh/base/domain/sk/SkRelStRes.java | 10 ++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/AttResSw.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/AttResSw.java index 6ec25e59..8ae7d8bc 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/AttResSw.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/AttResSw.java @@ -3,10 +3,12 @@ package com.kms.yxgh.base.domain.sk; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.Date; @@ -19,7 +21,8 @@ import java.util.Date; @TableName("att_res_sw") @Data @ApiModel("水库溢洪道表") -public class AttResSw { +public class AttResSw extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; /** * 水库编码 diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkAttDamBase.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkAttDamBase.java index 6978e57e..35271577 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkAttDamBase.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkAttDamBase.java @@ -3,17 +3,19 @@ package com.kms.yxgh.base.domain.sk; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.Date; @TableName("att_dam_base") @Data @ApiModel("水库大坝基础信息表") -public class SkAttDamBase { - +public class SkAttDamBase extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; /** * 大坝代码 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkRelStRes.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkRelStRes.java index eb11dac9..5e0d98f6 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkRelStRes.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkRelStRes.java @@ -2,15 +2,17 @@ package com.kms.yxgh.base.domain.sk; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.io.Serializable; import java.util.Date; @TableName("dw_rel_st_res") @Data @ApiModel("代表站") -public class SkRelStRes { - +public class SkRelStRes extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -39,14 +41,14 @@ public class SkRelStRes { * 河流代码 */ @ApiModelProperty("测站代码") - @JSONField(name = "ST_CODE") + @JSONField(name = "STCD") private String stCode; /** * 河流名称 */ @ApiModelProperty("测站名称") - @JSONField(name = "ST_NAME") + @JSONField(name = "STNM") private String stName; /** From c10b9aad3d905794b9a8211fc6caf0dcd27dec63 Mon Sep 17 00:00:00 2001 From: hxh Date: Thu, 20 Mar 2025 15:49:29 +0800 Subject: [PATCH 05/15] =?UTF-8?q?fix:=20=E8=A7=A3=E6=9E=90=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=A1=A8=E7=B1=BB=E5=9E=8B=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 494e321a..9745e86b 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 @@ -50,9 +50,9 @@ public enum MonitorSourceEnum { MS_DSM_PR("应力监测表", MsDsmPr.class), MS_DSM_ST("应变监测表", MsDsmSt.class), MS_HDM_WAS("堰闸水情监测表", MsHdmWas.class), - ATT_RES_SW("水库溢洪道表", AttResSw.class), - ATT_RES_RSPP("水库溢洪道表", AttResRspp.class), - ATT_DAM_BASE("水库大坝基础信息表", SkAttDamBase.class), + ATT_RES_SW("水库溢洪道表", MonitorTypeEnum.DATA, AttResSw.class), + ATT_RES_RSPP("水库溢洪道表", MonitorTypeEnum.DATA, AttResRspp.class), + ATT_DAM_BASE("水库大坝基础信息表", MonitorTypeEnum.DATA, SkAttDamBase.class), DWS_REL_ST_RES("代表站", SkRelStRes.class), ; From 910ff4de662303f02a177cc82d84d2b33b608778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Thu, 20 Mar 2025 16:12:51 +0800 Subject: [PATCH 06/15] =?UTF-8?q?fix:=E6=B0=B4=E5=BA=93=E6=80=BB=E8=A7=88b?= =?UTF-8?q?ug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yg/cz/dto/MonitorQueDto.java | 7 ++ .../com/kms/yg/cz/enmu/MonitorSourceEnum.java | 2 + .../com/kms/yg/cz/service/MonitorService.java | 65 ++++++++++--------- .../com/kms/yg/sk/domain/DwsAttDamRspp.java | 47 ++++++++++++++ 4 files changed, 89 insertions(+), 32 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/domain/DwsAttDamRspp.java 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 1ba767ac..32c979e4 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 @@ -27,6 +27,10 @@ public class MonitorQueDto { @ApiModelProperty(value = "水库编码") private String resCode; + @ApiModelProperty(value = "大坝代码") + @JSONField(name = "DAM_CODE") + private String damCode; + @JSONField(name = "STCD") @ApiModelProperty(value = "测站编码") private String stcd; @@ -50,4 +54,7 @@ public class MonitorQueDto { private Integer pageSize = 10; @ApiModelProperty(value = "每页条数") 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 9745e86b..ba634de4 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.base.Strings; import com.kms.yg.cz.dto.MonitorQueDto; import com.kms.yg.sk.domain.AttResRspp; +import com.kms.yg.sk.domain.DwsAttDamRspp; import com.kms.yxgh.base.domain.monitor.*; import com.kms.yxgh.base.domain.sk.AttResSw; import com.kms.yxgh.base.domain.sk.SkAttDamBase; @@ -53,6 +54,7 @@ public enum MonitorSourceEnum { ATT_RES_SW("水库溢洪道表", MonitorTypeEnum.DATA, AttResSw.class), ATT_RES_RSPP("水库溢洪道表", MonitorTypeEnum.DATA, AttResRspp.class), ATT_DAM_BASE("水库大坝基础信息表", MonitorTypeEnum.DATA, SkAttDamBase.class), + DWS_ATT_DAM_RSPP("大坝特征值表", MonitorTypeEnum.DATA, DwsAttDamRspp.class), DWS_REL_ST_RES("代表站", SkRelStRes.class), ; 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 f8f0096f..ce00c16b 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 @@ -13,6 +13,7 @@ import com.kms.yg.cz.enmu.*; import com.kms.yg.cz.enmu.MonitorTypeEnum; import com.kms.yg.cz.mapper.MonitorConfigMapper; import com.kms.yg.sk.domain.AttResRspp; +import com.kms.yg.sk.domain.DwsAttDamRspp; import com.kms.yg.sk.dto.AttResTaskViewDto; import com.kms.yxgh.base.domain.monitor.MsHdmObp; import com.kms.yxgh.base.domain.monitor.MsHdmRsvr; @@ -289,35 +290,41 @@ public class MonitorService { AttResTaskViewDto attResTaskViewDto=new AttResTaskViewDto(); BsSgcSkStatisticsService.dtoInit(attResTaskViewDto); MonitorQueDto sp=new MonitorQueDto(); - sp.setResCode(dto.getResCode()); + String resCode = dto.getResCode(); + sp.setResCode(resCode); - CompletableFuture currentWatterFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.ATT_RES_SW, sp)); - AttResSw attResSw = currentWatterFuture.join(); + AttResSw attResSw = queryDataOne(MonitorSourceEnum.ATT_RES_SW, sp); // 堰顶高程 if (!Objects.isNull(attResSw)) { attResTaskViewDto.setElevationWeirCrest(attResSw.getWrcrel()); } // 设计洪水位、校核洪水位 - CompletableFuture attResRsppJsonModelFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.ATT_RES_RSPP, sp)); - AttResRspp attResRsppJsonModel = attResRsppJsonModelFuture.join(); - if (!Objects.isNull(attResRsppJsonModel)) { - attResTaskViewDto.setDesignLevel(attResRsppJsonModel.getDsfllv()); - attResTaskViewDto.setCheckWaterLevel(attResRsppJsonModel.getChfllv()); + AttResRspp attResRspp = queryDataOne(MonitorSourceEnum.ATT_RES_RSPP, sp); + if (!Objects.isNull(attResRspp)) { + attResTaskViewDto.setDesignLevel(attResRspp.getDsfllv()); + attResTaskViewDto.setCheckWaterLevel(attResRspp.getChfllv()); } - // 坝顶高程 - CompletableFuture> attDamBaseJsonMoldeFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.ATT_DAM_BASE, sp)); - List attDamBaseJsonMoldeList = attDamBaseJsonMoldeFuture.join(); - if (!CollectionUtils.isEmpty(attDamBaseJsonMoldeList)) { - attDamBaseJsonMoldeList.stream() - .map(SkAttDamBase::getDamTopElev) - .filter(e-> !StringUtils.isNotEmpty(e)) - .mapToDouble(Double::parseDouble) - .max() - .ifPresent(aDouble -> attResTaskViewDto.setCrestElevation(String.format("%.2f", aDouble))); + + // 获取嵌套关联字段 + DwsAttDamRspp dwsAttDamRspp = queryDataOne(DWS_ATT_DAM_RSPP, sp); + if (!Objects.isNull(dwsAttDamRspp)) { + String damCode = dwsAttDamRspp.getDamCode(); + sp.setDamCode(damCode); + sp.setResCode(""); + // 坝顶高程 + List attDamBaseJsonMoldeList = queryDataList(MonitorSourceEnum.ATT_DAM_BASE, sp); + if (!CollectionUtils.isEmpty(attDamBaseJsonMoldeList)) { + attDamBaseJsonMoldeList.stream() + .map(SkAttDamBase::getDamTopElev) + .filter(e-> !StringUtils.isNotEmpty(e)) + .mapToDouble(Double::parseDouble) + .max() + .ifPresent(aDouble -> attResTaskViewDto.setCrestElevation(String.format("%.2f", aDouble))); + } } + sp.setResCode(resCode); // 代表站 - CompletableFuture relStResJsonModeFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.DWS_REL_ST_RES, sp)); - SkRelStRes relStResJsonMode = relStResJsonModeFuture.join(); + SkRelStRes relStResJsonMode = queryDataOne(MonitorSourceEnum.DWS_REL_ST_RES, sp); if (Objects.isNull(relStResJsonMode)) { return attResTaskViewDto; } @@ -329,8 +336,7 @@ public class MonitorService { sp.setStcd(relStResJsonMode.getStCode()); sp.setStartTime(BsSgcSkStatisticsService.getStartOfDay()); sp.setEndTime(BsSgcSkStatisticsService.getStartOfNextDay()); - CompletableFuture> msHdmRsvrFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_RSVR, sp)); - List msHdmRsvrFutureList = msHdmRsvrFuture.join(); + List msHdmRsvrFutureList = queryDataList(MonitorSourceEnum.MS_HDM_RSVR, sp); if (!CollectionUtils.isEmpty(msHdmRsvrFutureList)) { // 当前水位 MsHdmRsvr msHdmRsvr = msHdmRsvrFutureList.stream() @@ -348,8 +354,7 @@ public class MonitorService { // 去年今日 sp.setStartTime(BsSgcSkStatisticsService.getLastYearTodayStartOfDay()); sp.setEndTime(BsSgcSkStatisticsService.getLastYearTomorrowStartOfDay()); - CompletableFuture> msHdmRsvrLastFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_RSVR, sp)); - List msHdmRsvrLastFutureList = msHdmRsvrLastFuture.join(); + List msHdmRsvrLastFutureList = queryDataList(MonitorSourceEnum.MS_HDM_RSVR, sp); if (!CollectionUtils.isEmpty(msHdmRsvrLastFutureList)) { MsHdmRsvr msHdmRsvr = msHdmRsvrFutureList.stream() .filter(e->!Objects.isNull(e.getTm())) @@ -363,8 +368,7 @@ public class MonitorService { // 近一个小时 sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(1)); sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); - CompletableFuture> msHdmObpOneListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); - List msHdmObpOneList = msHdmObpOneListFuture.join(); + List msHdmObpOneList = queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp); if (!CollectionUtils.isEmpty(msHdmObpOneList)) { // 近一个小时 attResTaskViewDto.setNearlyAnHour(BsSgcSkStatisticsService.getSum(msHdmObpOneList)); @@ -373,8 +377,7 @@ public class MonitorService { // 近6个小时 sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(6)); sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); - CompletableFuture> msHdmObpSixListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); - List msHdmObpSixList = msHdmObpSixListFuture.join(); + List msHdmObpSixList = queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp); if (!CollectionUtils.isEmpty(msHdmObpSixList)) { // 近6个小时 attResTaskViewDto.setNearlySixHours(BsSgcSkStatisticsService.getSum(msHdmObpSixList)); @@ -383,8 +386,7 @@ public class MonitorService { // 近9个小时 sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(9)); sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); - CompletableFuture> msHdmObpNineListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); - List msHdmObpNineList = msHdmObpNineListFuture.join(); + List msHdmObpNineList = queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp); if (!CollectionUtils.isEmpty(msHdmObpNineList)) { // 近9个小时 attResTaskViewDto.setNearlyNineHours(BsSgcSkStatisticsService.getSum(msHdmObpNineList)); @@ -393,8 +395,7 @@ public class MonitorService { // 近12个小时 sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(12)); sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime()); - CompletableFuture> msHdmObpTwelveListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp)); - List msHdmObpTwelveList = msHdmObpTwelveListFuture.join(); + List msHdmObpTwelveList = queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp); if (!CollectionUtils.isEmpty(msHdmObpTwelveList)) { // 近12个小时 attResTaskViewDto.setNearlyTwelveHours(BsSgcSkStatisticsService.getSum(msHdmObpNineList)); diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/DwsAttDamRspp.java b/shuili-system/src/main/java/com/kms/yg/sk/domain/DwsAttDamRspp.java new file mode 100644 index 00000000..fbc4a32a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/domain/DwsAttDamRspp.java @@ -0,0 +1,47 @@ +package com.kms.yg.sk.domain; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 【基础库_大坝特征值表 + * + * @author kms + * @date 2024-04-24 + */ +@TableName("dws_att_dam_rspp") +@Data +@ApiModel("基础库_大坝特征值表") +public class DwsAttDamRspp { + + @JSONField(name = "DAM_CODE") + private String damCode; + @JSONField(name = "RES_CODE") + private String resCode; + @JSONField(name = "MWRTBD_TYPE") + private String mwrtbdType; + @JSONField(name = "ERB_SIN") + private String erbSin; + @JSONField(name = "DBA_SBT") + private String dbaSbt; + @JSONField(name = "ASELST") + private String aselst; + @JSONField(name = "DMBSGLCN") + private String dmbsglcn; + @JSONField(name = "DMBSASMS") + private String dmbsasms; + @JSONField(name = "NOTE") + private String note; + @JSONField(name = "EFF_DATE") + private String effDate; +} From 87b8db5d397bb38bb49b9c59258deff1a7919e68 Mon Sep 17 00:00:00 2001 From: hxh Date: Thu, 20 Mar 2025 16:39:27 +0800 Subject: [PATCH 07/15] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yg/cz/service/MonitorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f8f0096f..a8f9dc41 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 @@ -210,7 +210,7 @@ public class MonitorService { } String json = dataCenterRestTemplateUtils.doPostRequest(dataSyncUrl + path, queDto); resultWrapper.setResultJson(json); - // log.debug("请求接口:{},参数:[{}],结果[{}]", dataSyncUrl + path, queDto, json); + log.debug("请求接口:{},参数:[{}],结果[{}]", dataSyncUrl + path, queDto, json); return (IPage) source.getRecords().apply(resultWrapper); } From 23be64fe8cddb00ec9dae7cdbbce18b1a4df36b9 Mon Sep 17 00:00:00 2001 From: hxh Date: Thu, 20 Mar 2025 18:04:01 +0800 Subject: [PATCH 08/15] =?UTF-8?q?fix:=20=E5=A4=A7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=8E=A5=E5=8F=A3=E8=A7=A3=E6=9E=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yg/cz/enmu/MonitorSourceEnum.java | 34 +++++++++++++------ .../com/kms/yg/cz/service/MonitorService.java | 2 +- 2 files changed, 24 insertions(+), 12 deletions(-) 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 ba634de4..dc6cdd16 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 @@ -52,10 +52,10 @@ public enum MonitorSourceEnum { MS_DSM_ST("应变监测表", MsDsmSt.class), MS_HDM_WAS("堰闸水情监测表", MsHdmWas.class), ATT_RES_SW("水库溢洪道表", MonitorTypeEnum.DATA, AttResSw.class), - ATT_RES_RSPP("水库溢洪道表", MonitorTypeEnum.DATA, AttResRspp.class), + ATT_RES_RSPP("水库溢洪道表", AttResRspp.class), ATT_DAM_BASE("水库大坝基础信息表", MonitorTypeEnum.DATA, SkAttDamBase.class), DWS_ATT_DAM_RSPP("大坝特征值表", MonitorTypeEnum.DATA, DwsAttDamRspp.class), - DWS_REL_ST_RES("代表站", SkRelStRes.class), + DWS_REL_ST_RES("代表站",MonitorTypeEnum.DATA, SkRelStRes.class), ; private final String zhName; @@ -102,30 +102,42 @@ public enum MonitorSourceEnum { if (this.type == null || Strings.isNullOrEmpty(json)) { return new Page<>(); } - if (this.type == MonitorTypeEnum.MONITOR) { + if (this.type.equals(MonitorTypeEnum.MONITOR)) { MonitorResponse response = JSON.parseObject(json, MonitorResponse.class); if (!response.isSuccess()) { log.error("record获取数据失败:{} [{}]", this.clazz, json); return new Page<>(); } + try { 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; + List data = JSON.parseArray(response.getRecords(), this.clazz); + page.setRecords(Arrays.asList(data.toArray())); + return page; + } catch (Exception e) { + log.error("data获取数据失败:{} [{}],type[{}]", this.clazz, response, this.type); + } + return new Page<>(); } else { DataResponse response = JSON.parseObject(json, DataResponse.class); if (!response.isSuccess()) { log.error("data获取数据失败:{} [{}]", this.clazz, json); return new Page<>(); } + try { 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; + List data = JSON.parseArray(response.getData(), this.clazz); + page.setRecords(Arrays.asList(data.toArray())); + return page; + } catch (Exception e) { + log.error("data获取数据失败:{} [{}],type:[{}]", this.clazz, response, this.type); + } + return new Page<>(); } - }; + } + + ; } @Data @@ -146,7 +158,7 @@ public enum MonitorSourceEnum { private String data; public Boolean isSuccess() { - return "0".equals(getCode()); + return "200".equals(getCode()) || "0".equals(getCode()); } } 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 2ec79bb4..34ce45e8 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 @@ -211,7 +211,7 @@ public class MonitorService { } String json = dataCenterRestTemplateUtils.doPostRequest(dataSyncUrl + path, queDto); resultWrapper.setResultJson(json); - log.debug("请求接口:{},参数:[{}],结果[{}]", dataSyncUrl + path, queDto, json); + // log.debug("请求接口:{},参数:[{}],结果[{}]", dataSyncUrl + path, queDto, json); return (IPage) source.getRecords().apply(resultWrapper); } From d1ef22f59d032a28d26a740432aa0581d04c249e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Thu, 20 Mar 2025 18:11:13 +0800 Subject: [PATCH 09/15] =?UTF-8?q?fix:=E6=B0=B4=E5=BA=93=E6=80=BB=E8=A7=88b?= =?UTF-8?q?ug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yg/cz/service/MonitorService.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) 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 ce00c16b..b4e9318a 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 @@ -324,16 +324,24 @@ public class MonitorService { } sp.setResCode(resCode); // 代表站 - SkRelStRes relStResJsonMode = queryDataOne(MonitorSourceEnum.DWS_REL_ST_RES, sp); - if (Objects.isNull(relStResJsonMode)) { + List relStResJsonModeList = queryDataList(MonitorSourceEnum.DWS_REL_ST_RES, sp); + if (CollectionUtils.isEmpty(relStResJsonModeList)) { return attResTaskViewDto; } - attResTaskViewDto.setStationName(relStResJsonMode.getStName()); - attResTaskViewDto.setStationCode(relStResJsonMode.getStCode()); - + SkRelStRes skRelStRes = relStResJsonModeList.stream() + .filter(e -> !StringUtils.isNotEmpty(e.getFlag())) + .filter(e -> Objects.equals(e.getFlag(), "1")) + .findFirst() + .orElse(null); + log.info("获取SkRelStRes返回数据:{}",JSON.toJSONString(skRelStRes)); + if (Objects.isNull(skRelStRes)) { + return attResTaskViewDto; + } + attResTaskViewDto.setStationName(skRelStRes.getStName()); + attResTaskViewDto.setStationCode(skRelStRes.getStCode()); // 当前水位 - sp.setStcd(relStResJsonMode.getStCode()); + sp.setStcd(skRelStRes.getStCode()); sp.setStartTime(BsSgcSkStatisticsService.getStartOfDay()); sp.setEndTime(BsSgcSkStatisticsService.getStartOfNextDay()); List msHdmRsvrFutureList = queryDataList(MonitorSourceEnum.MS_HDM_RSVR, sp); From 1221cb029ecf616c485aceee3ee6f57054fcc1d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Thu, 20 Mar 2025 18:17:28 +0800 Subject: [PATCH 10/15] =?UTF-8?q?fix:=E6=B0=B4=E5=BA=93=E6=80=BB=E8=A7=88b?= =?UTF-8?q?ug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yg/cz/service/MonitorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b4e9318a..4e143afb 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 @@ -329,7 +329,7 @@ public class MonitorService { return attResTaskViewDto; } SkRelStRes skRelStRes = relStResJsonModeList.stream() - .filter(e -> !StringUtils.isNotEmpty(e.getFlag())) + .filter(e -> StringUtils.isNotEmpty(e.getFlag())) .filter(e -> Objects.equals(e.getFlag(), "1")) .findFirst() .orElse(null); From 27ab6b44eb3fa081520e000a6fad409e283ac643 Mon Sep 17 00:00:00 2001 From: hxh Date: Thu, 20 Mar 2025 18:44:41 +0800 Subject: [PATCH 11/15] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Drescode=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java | 1 + 1 file changed, 1 insertion(+) 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 32c979e4..14346a9f 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 @@ -25,6 +25,7 @@ public class MonitorQueDto { private MonitorSourceEnum monitorType; @ApiModelProperty(value = "水库编码") + @JSONField(name = "RES_CODE") private String resCode; @ApiModelProperty(value = "大坝代码") From 1864c13794eca62e01dd07266d86ce626ebe8ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Thu, 20 Mar 2025 19:04:28 +0800 Subject: [PATCH 12/15] =?UTF-8?q?fix:=E6=B0=B4=E5=BA=93=E6=80=BB=E8=A7=88b?= =?UTF-8?q?ug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yg/cz/service/MonitorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 04afd151..13c6a9f4 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 @@ -316,7 +316,7 @@ public class MonitorService { if (!CollectionUtils.isEmpty(attDamBaseJsonMoldeList)) { attDamBaseJsonMoldeList.stream() .map(SkAttDamBase::getDamTopElev) - .filter(e-> !StringUtils.isNotEmpty(e)) + .filter(StringUtils::isNotEmpty) .mapToDouble(Double::parseDouble) .max() .ifPresent(aDouble -> attResTaskViewDto.setCrestElevation(String.format("%.2f", aDouble))); From 87243ed04fd6faff651a89796c15a3164c756822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Fri, 21 Mar 2025 15:31:44 +0800 Subject: [PATCH 13/15] =?UTF-8?q?fix:=E6=B0=B4=E8=B4=A8=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysXzqhController.java | 5 +- .../kms/system/service/SysXzqhService.java | 76 ++++++++++++++++++- .../ReservoirOverviewDataController.java | 30 +++++++- .../kms/yg/df/domain/dto/RoleJudgeDto.java | 24 ++++++ .../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 ++++ 8 files changed, 228 insertions(+), 6 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yg/df/domain/dto/RoleJudgeDto.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/dto/GateOpeningDownDto.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/dto/GateOpeningDto.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/dto/WaterDetectionDownDto.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/dto/WaterDetectionDto.java diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java index 3df9f237..83640c39 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java @@ -8,6 +8,7 @@ import com.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.dto.RoleJudgeDto; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; @@ -91,7 +92,7 @@ public class SysXzqhController extends BaseController { // } else { // return AjaxResult.success(xzqh); // } -// } +// }RoleJudgeDto roleDeptDistrictCode = SysXzqhService.getRoleDeptDistrictCode(); @GetMapping("/common") @ApiOperation("通用行政区划") @@ -102,11 +103,9 @@ public class SysXzqhController extends BaseController { SysDept sysDept = sysDeptService.getById(deptId); String xzqhId = sysDept.getXzqhId(); SysXzqh xzqh = sysXzqhService.getById(xzqhId); - String userName = user.getUserName(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm())) .in("LAYER", xzqh.getLayer()); - List list = sysXzqhService.list(queryWrapper); return AjaxResult.success(list); } else { diff --git a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java index 1453bd77..d90b558f 100644 --- a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java +++ b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java @@ -1,17 +1,27 @@ package com.kms.system.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kms.common.utils.UserUtils; +import com.kms.system.domain.SysRoleDept; +import com.kms.system.domain.SysUserRole; import com.kms.system.domain.SysXzqh; -import com.kms.system.mapper.SysXzqhMapper; +import com.kms.system.mapper.*; +import com.kms.yg.df.domain.BsSgcDfManateam; +import com.kms.yg.df.domain.dto.RoleJudgeDto; +import com.kms.yg.df.service.BsSgcDfManateamService; import com.shuili.common.core.domain.entity.SysDept; +import com.shuili.common.core.domain.entity.SysRole; import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; @@ -29,7 +39,69 @@ public class SysXzqhService extends BaseService { private SysXzqhMapper sysXzqhMapper; @Autowired - private SysDeptService sysDeptService; + private static SysDeptService sysDeptService; + + @Autowired + private static SysRoleService sysRoleService; + + @Autowired + private static SysUserRoleService sysUserRoleService; + + @Autowired + private static BsSgcDfManateamService bsSgcDfManateamService; + + /** + * 获取当前用户部门所属行政区划 + * 如果当前登录用户角色编码属于(YW00143、YW00129、YW00164)则返回当前用户部门的行政区划代码 + *如果当前登录用户角色编码属于（YW00352/YW00402）中，则通过当前用户手机号去BS_SGC_DF_MANATEAM（数据库表）找到他在工程对象代码进行数据过滤； + * @return String + */ + public static RoleJudgeDto getRoleDeptDistrictCode() { + RoleJudgeDto dto=new RoleJudgeDto(); + SysUser user = UserUtils.getUser(); + List sysUserRoles = sysUserRoleService.list(new LambdaQueryWrapper().eq(SysUserRole::getUserId, user.getId())); + if (!CollectionUtils.isEmpty(sysUserRoles)) { + List roleIds = sysUserRoles.stream() + .map(SysUserRole::getRoleId) + .filter(roleId -> !StringUtils.isEmpty(roleId)) + .collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(roleIds)) { + List sysRoleIds = sysRoleService.list(new LambdaQueryWrapper() + .in(SysRole::getId, roleIds) + ); + if (!CollectionUtils.isEmpty(sysRoleIds)) { + List roleCodes = sysRoleIds.stream() + .map(SysRole::getRoleKey) + .collect(Collectors.toList()); + if (roleCodes.contains("YW00143") + || roleCodes.contains("YW00129") + || roleCodes.contains("YW00164")) { + SysDept sysDept = sysDeptService.getById(user.getDeptId()); + if (!Objects.isNull(sysDept)) { + dto.setXzqhId(StringUtils.isEmpty(sysDept.getXzqhId()) + ? null:sysDept.getXzqhId()); + return dto; + } + } + if (roleCodes.contains("YW00352") + || roleCodes.contains("YW00402")) { + BsSgcDfManateam bsSgcDfManateam = bsSgcDfManateamService + .getById(new LambdaQueryWrapper() + .eq(!StringUtils.isEmpty(user.getPhonenumber()),BsSgcDfManateam::getPhone, user.getPhonenumber()) + .orderByDesc(BsSgcDfManateam::getCreateTime) + .last(" limit 1 ") + ); + if (!Objects.isNull(bsSgcDfManateam)) { + dto.setDikeCode(StringUtils.isEmpty(bsSgcDfManateam.getDikeCode()) + ? null:bsSgcDfManateam.getDikeCode()); + return dto; + } + } + } + } + } + return dto; + } public Map get(List adcd) { 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 index 42372181..0fb7121e 100644 --- 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 @@ -1,7 +1,10 @@ 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.AttResTaskViewDto; +import com.kms.yg.sk.dto.*; import com.kms.yxgh.base.Response; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -29,4 +32,29 @@ public class ReservoirOverviewDataController { 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/df/domain/dto/RoleJudgeDto.java b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/RoleJudgeDto.java new file mode 100644 index 00000000..bd0dd44d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/RoleJudgeDto.java @@ -0,0 +1,24 @@ +package com.kms.yg.df.domain.dto; + +import com.shuili.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author lyd + * @company 数元科技有限公司 + * @create 2025-03-19 9:02 + */ + +@Data +@ApiModel("用户控制权判断") +public class RoleJudgeDto { + + @ApiModelProperty("行政区划id") + private String xzqhId; + + @ApiModelProperty("工程code") + private String dikeCode; + +} 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 new file mode 100644 index 00000000..7d865f65 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/dto/GateOpeningDownDto.java @@ -0,0 +1,33 @@ +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 new file mode 100644 index 00000000..efa73855 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/dto/GateOpeningDto.java @@ -0,0 +1,16 @@ +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 new file mode 100644 index 00000000..0ad3348d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/dto/WaterDetectionDownDto.java @@ -0,0 +1,34 @@ +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 new file mode 100644 index 00000000..f9f56a4b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/dto/WaterDetectionDto.java @@ -0,0 +1,16 @@ +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 { + + +} From a3b3d06487728ff2a6de418c96f818f6334b5d83 Mon Sep 17 00:00:00 2001 From: hxh Date: Fri, 21 Mar 2025 17:56:50 +0800 Subject: [PATCH 14/15] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=B0=B4?= =?UTF-8?q?=E9=97=B8=E5=BC=80=E5=BA=A6/=E6=B0=B4=E8=B4=A8=E6=8C=87?= =?UTF-8?q?=E6=A0=87=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; From feda467c7354a215356b44a11334dcecbb274dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Fri, 21 Mar 2025 18:32:05 +0800 Subject: [PATCH 15/15] =?UTF-8?q?fix:=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysXzqhController.java | 14 ++- .../java/com/kms/common/utils/UserUtils.java | 7 ++ .../kms/system/service/SysXzqhService.java | 64 +----------- .../yxgh/common/dto/ApprovalSearchDto.java | 22 +++++ .../common/dto/ObjectStatisticQueDto.java | 9 ++ .../yxgh/common/enums/StaticIndexEnum.java | 5 +- .../com/kms/yxgh/df/domain/DfSysUserRole.java | 26 +++++ .../yxgh/df/dto/v2/DfRecordSearchV2Dto.java | 12 +++ .../yxgh/df/mapper/DfSysUserRoleMapper.java | 15 +++ .../df/service/AuthorityDikeCodeService.java | 99 +++++++++++++++++++ .../service/DfCheckingProblemV2Service.java | 19 +++- .../df/service/DfCheckingRecordV2Service.java | 5 +- .../yxgh/df/service/DfCheckingV2Service.java | 5 + .../kms/yxgh/df/service/DfYhV2Service.java | 4 +- .../kms/yxgh/dw/dto/DwRecordSearchV2Dto.java | 11 +++ .../service/DwCheckingProblemV2Service.java | 5 + .../dw/service/DwCheckingRecordV2Service.java | 4 + .../yxgh/dw/service/DwCheckingV2Service.java | 4 + .../kms/yxgh/dw/service/DwYhV2Service.java | 4 + .../yxgh/sz/dto/v2/SzRecordSearchV2Dto.java | 12 +++ .../service/SzCheckingProblemV2Service.java | 5 +- .../sz/service/SzCheckingRecordV2Service.java | 5 +- .../yxgh/sz/service/SzCheckingV2Service.java | 4 + .../kms/yxgh/sz/service/SzYhV2Service.java | 4 + .../resources/mapper/yxgh/DfYhV2Mapper.xml | 3 + .../resources/mapper/yxgh/DwYhV2Mapper.xml | 3 + .../resources/mapper/yxgh/SzYhV2Mapper.xml | 3 + 27 files changed, 297 insertions(+), 76 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSysUserRole.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSysUserRoleMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java index 83640c39..5acfc9b5 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java @@ -9,6 +9,8 @@ import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.df.domain.dto.RoleJudgeDto; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; +import com.kms.yxgh.df.service.DfCheckingProblemV2Service; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; @@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; +import java.util.Objects; /** @@ -43,6 +46,8 @@ public class SysXzqhController extends BaseController { @Autowired private SysDeptService sysDeptService; + @Autowired + private DfCheckingProblemV2Service dfCheckingProblemV2Service; @GetMapping("/getGuangDong") public AjaxResult getGuangDong() { @@ -98,10 +103,13 @@ public class SysXzqhController extends BaseController { @ApiOperation("通用行政区划") public AjaxResult common(@RequestParam(value = "xzqhdm", required = false) String xzqhdm) { if (StringUtils.isEmpty(xzqhdm)) { - SysUser user = UserUtils.getUser(); - String deptId = user.getDeptId(); - SysDept sysDept = sysDeptService.getById(deptId); + SysDept sysDept = sysDeptService.getById(Objects.requireNonNull(UserUtils.getUser()).getDeptId()); + RoleJudgeDto roleDeptDistrictCode = AuthorityDikeCodeService.getRoleDeptDistrictCode(); String xzqhId = sysDept.getXzqhId(); + // 权限切入 + if (!StringUtils.isEmpty(roleDeptDistrictCode.getXzqhId())) { + xzqhId=roleDeptDistrictCode.getXzqhId(); + } SysXzqh xzqh = sysXzqhService.getById(xzqhId); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm())) diff --git a/shuili-system/src/main/java/com/kms/common/utils/UserUtils.java b/shuili-system/src/main/java/com/kms/common/utils/UserUtils.java index f957e8cc..277fa591 100644 --- a/shuili-system/src/main/java/com/kms/common/utils/UserUtils.java +++ b/shuili-system/src/main/java/com/kms/common/utils/UserUtils.java @@ -7,6 +7,9 @@ import com.kms.system.mapper.SysDeptMapper; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysUserService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.dto.RoleJudgeDto; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; +import com.kms.yxgh.df.service.DfCheckingProblemV2Service; import com.shuili.common.core.domain.entity.SysDept; import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.utils.SpringUtils; @@ -70,6 +73,10 @@ public class UserUtils { cicd = xzqh.getXzqhdm(); } } + RoleJudgeDto roleDeptDistrictCode = AuthorityDikeCodeService.getRoleDeptDistrictCode(); + if (!StringUtils.isEmpty(roleDeptDistrictCode.getXzqhId())) { + cicd = roleDeptDistrictCode.getXzqhId(); + } return cicd; } diff --git a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java index d90b558f..412f53e9 100644 --- a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java +++ b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java @@ -39,69 +39,7 @@ public class SysXzqhService extends BaseService { private SysXzqhMapper sysXzqhMapper; @Autowired - private static SysDeptService sysDeptService; - - @Autowired - private static SysRoleService sysRoleService; - - @Autowired - private static SysUserRoleService sysUserRoleService; - - @Autowired - private static BsSgcDfManateamService bsSgcDfManateamService; - - /** - * 获取当前用户部门所属行政区划 - * 如果当前登录用户角色编码属于(YW00143、YW00129、YW00164)则返回当前用户部门的行政区划代码 - *如果当前登录用户角色编码属于（YW00352/YW00402）中，则通过当前用户手机号去BS_SGC_DF_MANATEAM（数据库表）找到他在工程对象代码进行数据过滤； - * @return String - */ - public static RoleJudgeDto getRoleDeptDistrictCode() { - RoleJudgeDto dto=new RoleJudgeDto(); - SysUser user = UserUtils.getUser(); - List sysUserRoles = sysUserRoleService.list(new LambdaQueryWrapper().eq(SysUserRole::getUserId, user.getId())); - if (!CollectionUtils.isEmpty(sysUserRoles)) { - List roleIds = sysUserRoles.stream() - .map(SysUserRole::getRoleId) - .filter(roleId -> !StringUtils.isEmpty(roleId)) - .collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(roleIds)) { - List sysRoleIds = sysRoleService.list(new LambdaQueryWrapper() - .in(SysRole::getId, roleIds) - ); - if (!CollectionUtils.isEmpty(sysRoleIds)) { - List roleCodes = sysRoleIds.stream() - .map(SysRole::getRoleKey) - .collect(Collectors.toList()); - if (roleCodes.contains("YW00143") - || roleCodes.contains("YW00129") - || roleCodes.contains("YW00164")) { - SysDept sysDept = sysDeptService.getById(user.getDeptId()); - if (!Objects.isNull(sysDept)) { - dto.setXzqhId(StringUtils.isEmpty(sysDept.getXzqhId()) - ? null:sysDept.getXzqhId()); - return dto; - } - } - if (roleCodes.contains("YW00352") - || roleCodes.contains("YW00402")) { - BsSgcDfManateam bsSgcDfManateam = bsSgcDfManateamService - .getById(new LambdaQueryWrapper() - .eq(!StringUtils.isEmpty(user.getPhonenumber()),BsSgcDfManateam::getPhone, user.getPhonenumber()) - .orderByDesc(BsSgcDfManateam::getCreateTime) - .last(" limit 1 ") - ); - if (!Objects.isNull(bsSgcDfManateam)) { - dto.setDikeCode(StringUtils.isEmpty(bsSgcDfManateam.getDikeCode()) - ? null:bsSgcDfManateam.getDikeCode()); - return dto; - } - } - } - } - } - return dto; - } + private SysDeptService sysDeptService; public Map get(List adcd) { diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java index e752150f..f91e22b9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java @@ -1,9 +1,11 @@ package com.kms.yxgh.common.dto; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.util.StringUtils; @ApiModel("审批搜索") @Data @@ -20,4 +22,24 @@ public class ApprovalSearchDto { @ApiModelProperty("业务条件") private T condition; + + @ApiModelProperty(value = "堤防编码") + private String dikeCode; + + public String getDikeCode() { + if (StringUtils.isEmpty(this.dikeCode)) { + return AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return null; + } + + @ApiModelProperty(value = "水闸编码") + private String wagaCode; + + public String getWagaCode() { + if (StringUtils.isEmpty(this.wagaCode)) { + return AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return null; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java index 9b8ff9cc..480d5713 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java @@ -3,9 +3,11 @@ package com.kms.yxgh.common.dto; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.common.enums.ProjectCharEnum; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotNull; import java.util.Date; @@ -35,4 +37,11 @@ public class ObjectStatisticQueDto implements IAdcd { @ApiModelProperty(value = "结束时间", required = true) private Date endTime; + public String getCode() { + if (StringUtils.isEmpty(this.code)) { + return AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return null; + } + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java index 25ac0d04..da6211ac 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java @@ -26,10 +26,7 @@ import com.kms.yxgh.df.mapper.DfCheckingV2Mapper; import com.kms.yxgh.df.mapper.DfDangerousTaskItemRelMapper; import com.kms.yxgh.df.mapper.DfDangerousTaskMapper; import com.kms.yxgh.df.mapper.DfYhV2Mapper; -import com.kms.yxgh.df.service.DfCheckingProblemV2Service; -import com.kms.yxgh.df.service.DfDangerousTaskItemRelService; -import com.kms.yxgh.df.service.DfDangerousTaskService; -import com.kms.yxgh.df.service.DfYhV2Service; +import com.kms.yxgh.df.service.*; import com.kms.yxgh.dw.mapper.DwCheckingProblemV2Mapper; import com.kms.yxgh.dw.mapper.DwCheckingRecordV2Mapper; import com.kms.yxgh.dw.mapper.DwCheckingV2Mapper; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSysUserRole.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSysUserRole.java new file mode 100644 index 00000000..8db23a72 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSysUserRole.java @@ -0,0 +1,26 @@ +package com.kms.yxgh.df.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * 用户和角色关联 sys_user_role + * + * @author kms + */ +@TableName("sys_user_role") +@Data +@ApiModel("用户和角色关联表") +public class DfSysUserRole extends SyBaseEntity +{ + private String userId; + + + private String id; + + private String roleId; + + private String remark; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java index d164e35f..0ffe2045 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java @@ -1,9 +1,11 @@ package com.kms.yxgh.df.dto.v2; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.util.StringUtils; import java.util.Date; @@ -48,4 +50,14 @@ public class DfRecordSearchV2Dto { @ApiModelProperty(value = "结束时间") private Date endDate; + @ApiModelProperty(value = "堤防编码") + private String dikeCode; + + public String getDikeCode() { + if (StringUtils.isEmpty(this.dikeCode)) { + return AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return null; + } + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSysUserRoleMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSysUserRoleMapper.java new file mode 100644 index 00000000..97f802bf --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSysUserRoleMapper.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.df.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.DfSysUserRole; +import org.springframework.stereotype.Repository; + +/** + * 害堤动物防治计划执行记录用药Mapper接口 + * + * @author sy + * @date 2024-01-04 + */ +@Repository +public interface DfSysUserRoleMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java new file mode 100644 index 00000000..f2a955de --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java @@ -0,0 +1,99 @@ +package com.kms.yxgh.df.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.springframework.util.StringUtils; +import com.kms.common.utils.UserUtils; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysRoleService; +import com.kms.yg.df.domain.BsSgcDfManateam; +import com.kms.yg.df.domain.dto.RoleJudgeDto; +import com.kms.yg.df.service.BsSgcDfManateamService; +import com.kms.yxgh.df.domain.DfSysUserRole; +import com.kms.yxgh.df.mapper.DfSysUserRoleMapper; +import com.shuili.common.core.domain.entity.SysDept; +import com.shuili.common.core.domain.entity.SysRole; +import com.shuili.common.core.domain.entity.SysUser; +import com.shuili.common.utils.SpringUtils; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * + * @author kms + * @date 2023-12-04 + */ +public class AuthorityDikeCodeService { + + + /** + * 获取当前用户部门所属行政区划 + * 如果当前登录用户角色编码属于(YW00143、YW00129、YW00164)则返回当前用户部门的行政区划代码 + *如果当前登录用户角色编码属于（YW00352/YW00402）中，则通过当前用户手机号去BS_SGC_DF_MANATEAM（数据库表）找到他在工程对象代码进行数据过滤； + * @return String + */ + public static RoleJudgeDto getRoleDeptDistrictCode() { + + SysDeptService sysDeptService = SpringUtils.getBean(SysDeptService.class); + SysRoleService sysRoleService = SpringUtils.getBean(SysRoleService.class); + DfSysUserRoleMapper dfSysUserRoleMapper = SpringUtils.getBean(DfSysUserRoleMapper.class); + BsSgcDfManateamService bsSgcDfManateamService = SpringUtils.getBean(BsSgcDfManateamService.class); + + RoleJudgeDto dto=new RoleJudgeDto(); + SysUser user = UserUtils.getUser(); + if (Objects.isNull(user)) { + return dto; + } + List sysUserRoles = dfSysUserRoleMapper.selectList(new LambdaQueryWrapper().eq(DfSysUserRole::getUserId, user.getId())); + if (!CollectionUtils.isEmpty(sysUserRoles)) { + List roleIds = sysUserRoles.stream() + .map(DfSysUserRole::getRoleId) + .filter(roleId -> !StringUtils.isEmpty(roleId)) + .collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(roleIds)) { + List sysRoleIds = sysRoleService.list(new LambdaQueryWrapper() + .in(SysRole::getId, roleIds) + ); + if (!CollectionUtils.isEmpty(sysRoleIds)) { + List roleCodes = sysRoleIds.stream() + .map(SysRole::getRoleKey) + .collect(Collectors.toList()); + if (roleCodes.contains("YW00143") + || roleCodes.contains("YW00129") + || roleCodes.contains("YW00164")) { + SysDept sysDept = sysDeptService.getById(user.getDeptId()); + if (!Objects.isNull(sysDept)) { + dto.setXzqhId(StringUtils.isEmpty(sysDept.getXzqhId()) + ? null:sysDept.getXzqhId()); + return dto; + } + } + if (roleCodes.contains("YW00352") + || roleCodes.contains("YW00402")) { + BsSgcDfManateam bsSgcDfManateam = bsSgcDfManateamService + .getById(new LambdaQueryWrapper() + .eq(!StringUtils.isEmpty(user.getPhonenumber()),BsSgcDfManateam::getPhone, user.getPhonenumber()) + .orderByDesc(BsSgcDfManateam::getCreateTime) + .last(" limit 1 ") + ); + if (!Objects.isNull(bsSgcDfManateam)) { + dto.setDikeCode(StringUtils.isEmpty(bsSgcDfManateam.getDikeCode()) + ? null:bsSgcDfManateam.getDikeCode()); + return dto; + } + } + } + } + } + return dto; + } + + + public static String getAuthorityDikeCode() { + RoleJudgeDto roleDeptDistrictCode = getRoleDeptDistrictCode(); + return StringUtils.isEmpty(roleDeptDistrictCode.getDikeCode()) + ? null : roleDeptDistrictCode.getDikeCode(); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java index 343dd692..0b496733 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java @@ -5,18 +5,34 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.common.utils.UserUtils; +import com.kms.system.domain.SysUserRole; +import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysRoleService; +import com.kms.system.service.SysUserRoleService; +import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfManateam; +import com.kms.yg.df.domain.dto.RoleJudgeDto; +import com.kms.yg.df.service.BsSgcDfManateamService; import com.kms.yxgh.df.domain.DfCheckingProblemV2; +import com.kms.yxgh.df.domain.DfSysUserRole; import com.kms.yxgh.df.domain.DfYhV2; import com.kms.yxgh.df.dto.v2.DfProblemV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; import com.kms.yxgh.df.mapper.DfCheckingProblemV2Mapper; +import com.kms.yxgh.df.mapper.DfSysUserRoleMapper; import com.kms.yxgh.df.mapper.DfYhV2Mapper; import com.kms.yxgh.util.NumberConstant; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.domain.entity.SysDept; +import com.shuili.common.core.domain.entity.SysRole; +import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.service.BaseService; import com.shuili.common.utils.BeanUtils; import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Objects; @@ -37,7 +53,6 @@ public class DfCheckingProblemV2Service extends BaseService list(SearchParam sp) { DfRecordSearchV2Dto data = sp.getData(); if (ObjectUtils.isEmpty(data)) { @@ -83,6 +98,8 @@ public class DfCheckingProblemV2Service extends BaseService queryWrapper.eq(DfCheckingProblemV2::getRecordId, recordId)); + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()),DfCheckingProblemV2::getDikeCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.ne(DfCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); queryWrapper.orderByDesc(DfCheckingProblemV2::getCreateTime); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java index 612f4bd3..fb781ab3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java @@ -12,7 +12,6 @@ import com.kms.yxgh.df.domain.DfCheckingProblemV2; import com.kms.yxgh.df.domain.DfCheckingRecord; import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem; import com.kms.yxgh.df.domain.DfYhV2; -import com.kms.yxgh.df.dto.v2.DfProblemV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; import com.kms.yxgh.df.mapper.DfCheckingRecordV2Mapper; @@ -41,7 +40,6 @@ public class DfCheckingRecordV2Service extends BaseService list(SearchParam sp) { // 分页参数 Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); @@ -57,6 +59,9 @@ public class DfCheckingV2Service extends BaseService queryWrapper.like(DfCheckingV2ProjectManage::getName, name)); } + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + ,DfCheckingV2ProjectManage::getDikeCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.orderByDesc(DfCheckingV2ProjectManage::getCreateTime); // 查询分页数据 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java index 62267919..9083bcb5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java @@ -103,7 +103,9 @@ public class DfYhV2Service extends DefaultApprovalBusinessService queryWrapper.eq(DfYhV2::getRecordId, recordId)); } - + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , DfYhV2::getDikeCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.orderByDesc(DfYhV2::getCreateTime); // 查询分页数据 diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java index 8461f211..05dcfe6d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java @@ -1,9 +1,11 @@ package com.kms.yxgh.dw.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.util.StringUtils; import java.util.Date; @@ -48,4 +50,13 @@ public class DwRecordSearchV2Dto { @ApiModelProperty(value = "结束时间") private Date endDate; + @ApiModelProperty(value = "堤防编码") + private String dikeCode; + + public String getCode() { + if (StringUtils.isEmpty(this.dikeCode)) { + return AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return null; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java index a0095921..06ddbe7a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage; +import com.kms.yxgh.df.domain.DfYhV2; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.dw.domain.DwCheckingProblemV2; import com.kms.yxgh.dw.domain.DwYhV2; import com.kms.yxgh.dw.dto.DwProblemV2Dto; @@ -85,6 +87,9 @@ public class DwCheckingProblemV2Service extends BaseService queryWrapper.eq(DwCheckingProblemV2::getRecordId, recordId)); + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , DwCheckingProblemV2::getDikeCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.ne(DwCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); queryWrapper.orderByDesc(DwCheckingProblemV2::getCreateTime); diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java index ef4f873b..e229fcc7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.common.enums.DfYhV2StatusEnum; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.dw.domain.*; import com.kms.yxgh.dw.domain.DwCheckingRecord; import com.kms.yxgh.dw.dto.DwRecordDetailV2Dto; @@ -81,6 +82,9 @@ public class DwCheckingRecordV2Service extends BaseService queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java index 5df52001..83d70439 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.df.service.DfCheckingV2Service; import com.kms.yxgh.dw.domain.DwCheckingRecord; import com.kms.yxgh.dw.domain.DwCheckingV2ProjectItem; @@ -58,6 +59,9 @@ public class DwCheckingV2Service extends BaseService queryWrapper.like(DwCheckingV2ProjectManage::getName, name)); } + queryWrapper.eq(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , DwCheckingV2ProjectManage::getDikeCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.orderByDesc(DwCheckingV2ProjectManage::getCreateTime); // 查询分页数据 diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java index c2d2ccde..62e910dd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java @@ -16,6 +16,7 @@ import com.kms.yxgh.common.dto.DocV2Dto; import com.kms.yxgh.common.enums.DfYhV2StatusEnum; import com.kms.yxgh.common.service.ApprovalService; import com.kms.yxgh.common.service.DefaultApprovalBusinessService; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.dw.domain.DwCheckingProblemV2; import com.kms.yxgh.dw.domain.DwCheckingRecord; import com.kms.yxgh.dw.domain.DwCheckingV2ProjectManage; @@ -100,6 +101,9 @@ public class DwYhV2Service extends DefaultApprovalBusinessService queryWrapper.eq(DwYhV2::getRecordId, recordId)); } + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , DwYhV2::getDikeCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.orderByDesc(DwYhV2::getCreateTime); // 查询分页数据 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java index 5507d792..385744f2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java @@ -1,9 +1,11 @@ package com.kms.yxgh.sz.dto.v2; import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.util.StringUtils; import java.util.Date; @@ -48,4 +50,14 @@ public class SzRecordSearchV2Dto { @ApiModelProperty(value = "结束时间") private Date endDate; + @ApiModelProperty(value = "堤防编码") + private String wagaCode; + + public String getWagaCode() { + if (StringUtils.isEmpty(this.wagaCode)) { + return AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return null; + } + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java index b40cf312..1375576b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.df.domain.DfCheckingProblemV2; import com.kms.yxgh.df.dto.v2.DfProblemV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.dw.domain.DwYhV2; import com.kms.yxgh.sz.domain.SzCheckingProblemV2; import com.kms.yxgh.sz.domain.SzYhV2; @@ -85,7 +86,9 @@ public class SzCheckingProblemV2Service extends BaseService queryWrapper.eq(SzCheckingProblemV2::getProblemLevel, recordId)); - + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , SzCheckingProblemV2::getWagaCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.ne(SzCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); queryWrapper.orderByDesc(SzCheckingProblemV2::getCreateTime); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java index 90b64816..fa892f90 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.common.enums.DfYhV2StatusEnum; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.df.service.DfCheckingV2Service; import com.kms.yxgh.sz.domain.SzCheckingProblemV2; import com.kms.yxgh.sz.domain.SzCheckingRecord; @@ -82,7 +83,9 @@ public class SzCheckingRecordV2Service extends BaseService queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java index 927352df..1b48da4e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.df.service.DfCheckingV2Service; import com.kms.yxgh.sz.domain.SzCheckingRecord; import com.kms.yxgh.sz.domain.SzCheckingV2ProjectItem; @@ -53,6 +54,9 @@ public class SzCheckingV2Service extends BaseService queryWrapper.like(SzCheckingV2ProjectManage::getName, name)); } + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , SzCheckingV2ProjectManage::getWagaCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.orderByDesc(SzCheckingV2ProjectManage::getCreateTime); // 查询分页数据 Page queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java index f2fcba2b..6da6ac41 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java @@ -16,6 +16,7 @@ import com.kms.yxgh.common.dto.DocV2Dto; import com.kms.yxgh.common.enums.DfYhV2StatusEnum; import com.kms.yxgh.common.service.ApprovalService; import com.kms.yxgh.common.service.DefaultApprovalBusinessService; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; import com.kms.yxgh.df.service.DfCheckingV2Service; import com.kms.yxgh.sz.domain.SzCheckingProblemV2; import com.kms.yxgh.sz.domain.SzCheckingRecord; @@ -103,6 +104,9 @@ public class SzYhV2Service extends DefaultApprovalBusinessService queryWrapper.eq(SzYhV2::getRecordId, recordId)); } + queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode()) + , SzYhV2::getWagaCode + , AuthorityDikeCodeService.getAuthorityDikeCode()); queryWrapper.orderByDesc(SzYhV2::getCreateTime); // 查询分页数据 Page queryPage = page(page, queryWrapper); diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml index 1187c15c..22ad9340 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml @@ -64,6 +64,9 @@ AND jl.duty_holder_id = #{dto.condition.dutyHolder} + + AND jl.dike_code = #{dto.dikeCode} + ORDER BY jl.update_time DESC diff --git a/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml index 70a98698..64a578b9 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml @@ -64,6 +64,9 @@ AND jl.duty_holder_id = #{dto.condition.dutyHolder} + + AND jl.dike_code = #{dto.dikeCode} + ORDER BY jl.update_time DESC diff --git a/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml index d2a76c4a..03d01220 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml @@ -64,6 +64,9 @@ AND jl.duty_holder_id = #{dto.condition.dutyHolder} + + AND jl.waga_code = #{dto.wagaCode} + ORDER BY jl.update_time DESC