Merge remote-tracking branch 'origin/release-sy-v1.0.0'

shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java

@@ -8,6 +8,9 @@ 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.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;
@@ -24,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -42,6 +46,8 @@ public class SysXzqhController extends BaseController {
     @Autowired
     private SysDeptService sysDeptService;
 
+    @Autowired
+    private DfCheckingProblemV2Service dfCheckingProblemV2Service;
 
     @GetMapping("/getGuangDong")
     public AjaxResult getGuangDong() {
@@ -91,22 +97,23 @@ public class SysXzqhController extends BaseController {
 //        } else {
 //            return AjaxResult.success(xzqh);
 //        }
-//    }
+//    }RoleJudgeDto roleDeptDistrictCode = SysXzqhService.getRoleDeptDistrictCode();
 
     @GetMapping("/common")
     @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);
-            String userName = user.getUserName();
             QueryWrapper<SysXzqh> queryWrapper = new QueryWrapper<>();
             queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm()))
                     .in("LAYER", xzqh.getLayer());
-
             List<SysXzqh> list = sysXzqhService.list(queryWrapper);
             return AjaxResult.success(list);
         } else {

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;
     }
 

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,7 @@ public class SysXzqhService extends BaseService<SysXzqhMapper, SysXzqh> {
     private SysXzqhMapper sysXzqhMapper;
 
     @Autowired
-    private SysDeptService sysDeptService;
+    private  SysDeptService sysDeptService;
 
 
     public Map<String, SysXzqh> get(List<String> adcd) {

shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java

@@ -25,8 +25,16 @@ public class MonitorQueDto {
     private MonitorSourceEnum monitorType;
 
     @ApiModelProperty(value = "水库编码")
+    @JSONField(name = "RES_CODE")
     private String resCode;
 
+    @ApiModelProperty(value = "水闸编码")
+    private String wagaCode;
+
+    @ApiModelProperty(value = "大坝代码")
+    @JSONField(name = "DAM_CODE")
+    private String damCode;
+
     @JSONField(name = "STCD")
     @ApiModelProperty(value = "测站编码")
     private String stcd;
@@ -50,4 +58,6 @@ public class MonitorQueDto {
     private Integer pageSize = 10;
     @ApiModelProperty(value = "每页条数")
     private Integer pageNum = 1;
+
+
 }

shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java

@@ -6,10 +6,12 @@ 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;
 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;
@@ -50,10 +52,14 @@ 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_SW("水库溢洪道表", MonitorTypeEnum.DATA, AttResSw.class),
     ATT_RES_RSPP("水库溢洪道表", AttResRspp.class),
-    ATT_DAM_BASE("水库大坝基础信息表", SkAttDamBase.class),
-    DWS_REL_ST_RES("代表站", SkRelStRes.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_WAGA_RES("水库水闸关系表", MonitorTypeEnum.DATA, SzDwsRelWagaRes.class),
+    MS_HPM_GATE("闸门开度监测表", MonitorTypeEnum.DATA, MsHpmGate.class),
+    MS_WQM_WQAMD("水质自动监测数据表", MonitorTypeEnum.DATA, MsWqmWqamd.class),
     ;
 
     private final String zhName;
@@ -100,30 +106,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<>();
                 }
-                DataInfo dataInfo = JSON.parseObject(response.getData(), DataInfo.class);
-                Page<Object> 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;
+                try {
+                    DataInfo dataInfo = JSON.parseObject(response.getData(), DataInfo.class);
+                    Page<Object> 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;
+                } 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<>();
                 }
-                MonitorQueDto queDto = resultWrapper.getQueDto();
-                Page<Object> page = new Page<>(queDto.getPageNum(), queDto.getPageSize());
-                List<?> data = JSON.parseArray(response.getData(), this.clazz);
-                page.setRecords(Arrays.asList(data.toArray()));
-                return page;
+                try {
+                    MonitorQueDto queDto = resultWrapper.getQueDto();
+                    Page<Object> page = new Page<>(queDto.getPageNum(), queDto.getPageSize());
+                    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
@@ -144,7 +162,7 @@ public enum MonitorSourceEnum {
         private String data;
 
         public Boolean isSuccess() {
-            return "0".equals(getCode());
+            return "200".equals(getCode()) || "0".equals(getCode());
         }
     }
 

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;
@@ -56,20 +57,9 @@ public class MonitorService {
     @Value("#{${dataSync.paths:{}}}")
     private  Map<String, String> paths = new HashMap<>();
 
-    // todo 临时
-    private void  initPath (Map<String, String> 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<Object> pageQuery(MonitorQueDto queDto) {
         MonitorSourceEnum table = queDto.getMonitorType();
-        initPath(paths);
         String path = paths.get(table.getTableName());
         if (path == null) {
             log.error("未找到对应的路径配置, table:{}", table);
@@ -209,10 +199,9 @@ public class MonitorService {
         return (List<T>) page.getRecords();
     }
 
-    private <T> IPage<T> queryDataPage(MonitorSourceEnum source, MonitorQueDto queDto) {
+    public  <T> IPage<T> 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());
@@ -222,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<T>) source.getRecords().apply(resultWrapper);
     }
 
@@ -301,48 +290,61 @@ 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<AttResSw> 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<AttResRspp> 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<List<SkAttDamBase>> attDamBaseJsonMoldeFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.ATT_DAM_BASE, sp));
-        List<SkAttDamBase> 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<SkAttDamBase> attDamBaseJsonMoldeList = queryDataList(MonitorSourceEnum.ATT_DAM_BASE, sp);
+            if (!CollectionUtils.isEmpty(attDamBaseJsonMoldeList)) {
+                attDamBaseJsonMoldeList.stream()
+                        .map(SkAttDamBase::getDamTopElev)
+                        .filter(StringUtils::isNotEmpty)
+                        .mapToDouble(Double::parseDouble)
+                        .max()
+                        .ifPresent(aDouble -> attResTaskViewDto.setCrestElevation(String.format("%.2f", aDouble)));
+            } 
         }
+        sp.setResCode(resCode);
         // 代表站
-        CompletableFuture<SkRelStRes> relStResJsonModeFuture = CompletableFuture.supplyAsync(() -> queryDataOne(MonitorSourceEnum.DWS_REL_ST_RES, sp));
-        SkRelStRes relStResJsonMode = relStResJsonModeFuture.join();
-        if (Objects.isNull(relStResJsonMode)) {
+        List<SkRelStRes> 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());
-        CompletableFuture<List<MsHdmRsvr>> msHdmRsvrFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_RSVR, sp));
-        List<MsHdmRsvr> msHdmRsvrFutureList = msHdmRsvrFuture.join();
+        List<MsHdmRsvr> msHdmRsvrFutureList = queryDataList(MonitorSourceEnum.MS_HDM_RSVR, sp);
         if (!CollectionUtils.isEmpty(msHdmRsvrFutureList)) {
             // 当前水位
             MsHdmRsvr msHdmRsvr = msHdmRsvrFutureList.stream()
@@ -360,8 +362,7 @@ public class MonitorService {
         // 去年今日
         sp.setStartTime(BsSgcSkStatisticsService.getLastYearTodayStartOfDay());
         sp.setEndTime(BsSgcSkStatisticsService.getLastYearTomorrowStartOfDay());
-        CompletableFuture<List<MsHdmRsvr>> msHdmRsvrLastFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_RSVR, sp));
-        List<MsHdmRsvr> msHdmRsvrLastFutureList = msHdmRsvrLastFuture.join();
+        List<MsHdmRsvr> msHdmRsvrLastFutureList = queryDataList(MonitorSourceEnum.MS_HDM_RSVR, sp);
         if (!CollectionUtils.isEmpty(msHdmRsvrLastFutureList)) {
             MsHdmRsvr msHdmRsvr = msHdmRsvrFutureList.stream()
                     .filter(e->!Objects.isNull(e.getTm()))
@@ -375,8 +376,7 @@ public class MonitorService {
         // 近一个小时
         sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(1));
         sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime());
-        CompletableFuture<List<MsHdmObp>> msHdmObpOneListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp));
-        List<MsHdmObp> msHdmObpOneList = msHdmObpOneListFuture.join();
+        List<MsHdmObp> msHdmObpOneList = queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp);
         if (!CollectionUtils.isEmpty(msHdmObpOneList)) {
             // 近一个小时
             attResTaskViewDto.setNearlyAnHour(BsSgcSkStatisticsService.getSum(msHdmObpOneList));
@@ -385,8 +385,7 @@ public class MonitorService {
         // 近6个小时
         sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(6));
         sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime());
-        CompletableFuture<List<MsHdmObp>> msHdmObpSixListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp));
-        List<MsHdmObp> msHdmObpSixList = msHdmObpSixListFuture.join();
+        List<MsHdmObp> msHdmObpSixList = queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp);
         if (!CollectionUtils.isEmpty(msHdmObpSixList)) {
             // 近6个小时
             attResTaskViewDto.setNearlySixHours(BsSgcSkStatisticsService.getSum(msHdmObpSixList));
@@ -395,8 +394,7 @@ public class MonitorService {
         // 近9个小时
         sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(9));
         sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime());
-        CompletableFuture<List<MsHdmObp>> msHdmObpNineListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp));
-        List<MsHdmObp> msHdmObpNineList = msHdmObpNineListFuture.join();
+        List<MsHdmObp> msHdmObpNineList = queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp);
         if (!CollectionUtils.isEmpty(msHdmObpNineList)) {
             // 近9个小时
             attResTaskViewDto.setNearlyNineHours(BsSgcSkStatisticsService.getSum(msHdmObpNineList));
@@ -405,8 +403,7 @@ public class MonitorService {
         // 近12个小时
         sp.setStartTime(BsSgcSkStatisticsService.getTimeBeforeHours(12));
         sp.setEndTime(BsSgcSkStatisticsService.getCurrentTime());
-        CompletableFuture<List<MsHdmObp>> msHdmObpTwelveListFuture = CompletableFuture.supplyAsync(() -> queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp));
-        List<MsHdmObp> msHdmObpTwelveList = msHdmObpTwelveListFuture.join();
+        List<MsHdmObp> msHdmObpTwelveList = queryDataList(MonitorSourceEnum.MS_HDM_OBP, sp);
         if (!CollectionUtils.isEmpty(msHdmObpTwelveList)) {
             // 近12个小时
             attResTaskViewDto.setNearlyTwelveHours(BsSgcSkStatisticsService.getSum(msHdmObpNineList));

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;
+
+}

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<Item> data = new ArrayList<>();
 
         public Boolean isSuccess() {
-            return "0".equals(getCode());
+            return "200".equals(getCode());
         }
     }
 

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<List<Object>> wagaForRes(@RequestParam("resCode") String resCode) {
+        MonitorQueDto dto = new MonitorQueDto();
+        dto.setResCode(resCode);
+        dto.setPageNum(1);
+        dto.setPageSize(1000);
+        IPage<Object> page = monitorService.queryDataPage(MonitorSourceEnum.DWS_REL_WAGA_RES, dto);
+        return Response.ok(page.getRecords());
+    }
+
+    @GetMapping("/stcd/all/{resCode}")
+    @ApiOperation("水库所有测站")
+    public Response<List<Object>> ForRes(@RequestParam("resCode") String resCode) {
+        MonitorQueDto dto = new MonitorQueDto();
+        dto.setResCode(resCode);
+        dto.setPageNum(1);
+        dto.setPageSize(1000);
+        IPage<Object> page = monitorService.queryDataPage(MonitorSourceEnum.DWS_REL_ST_RES, dto);
+        return Response.ok(page.getRecords());
+    }
 }

shuili-system/src/main/java/com/kms/yg/cz/controller/ReservoirOverviewDataController.java → shuili-system/src/main/java/com/kms/yg/sk/controller/ReservoirOverviewDataController.java

@@ -1,4 +1,4 @@
-package com.kms.yg.cz.controller;
+package com.kms.yg.sk.controller;
 
 import com.kms.yg.cz.service.MonitorService;
 import com.kms.yg.sk.dto.AttResTaskViewDto;

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;
+}

shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGate.java → 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")

shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWqamd.java → 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")

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;
 
     /**
      * 水库编码

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;
     /**
      * 大坝代码
      */

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;
 
     /**

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;
 

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<T> {
 
     @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;
+    }
 }

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;
+    }
+
 }

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;

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;
+}

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;
+    }
+
 }

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<DfSysUserRole> {
+
+}

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<DfSysUserRole> sysUserRoles = dfSysUserRoleMapper.selectList(new LambdaQueryWrapper<DfSysUserRole>().eq(DfSysUserRole::getUserId, user.getId()));
+        if (!CollectionUtils.isEmpty(sysUserRoles)) {
+            List<String> roleIds = sysUserRoles.stream()
+                    .map(DfSysUserRole::getRoleId)
+                    .filter(roleId -> !StringUtils.isEmpty(roleId))
+                    .collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(roleIds)) {
+                List<SysRole> sysRoleIds = sysRoleService.list(new LambdaQueryWrapper<SysRole>()
+                        .in(SysRole::getId, roleIds)
+                );
+                if (!CollectionUtils.isEmpty(sysRoleIds)) {
+                    List<String> 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<BsSgcDfManateam>()
+                                        .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();
+    }
+
+}

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<DfCheckingProblemV2M
 
     private final DfYhV2Mapper dfYhV2Mapper;
 
-
     public IPage<DfProblemV2Dto> list(SearchParam<DfRecordSearchV2Dto> sp) {
         DfRecordSearchV2Dto data = sp.getData();
         if (ObjectUtils.isEmpty(data)) {
@@ -83,6 +98,8 @@ public class DfCheckingProblemV2Service extends BaseService<DfCheckingProblemV2M
                 .filter(StringUtils::isBlank)
                 .ifPresent(recordId -> 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);
 

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<DfCheckingRecordV2Map
 
     private final DfYhV2Service dfYhV2Service;
 
-
     private final DfCheckingV2ProjectItemV2Service dfCheckingV2ProjectItemV2Service;
 
     private final DfCheckingProblemV2Service dfCheckingProblemV2Service;
@@ -83,6 +81,9 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
                 queryWrapper.le(DfCheckingRecord::getEndDate, data.getEndDate());
             }
         }
+        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
+                ,DfCheckingRecord::getDikeCode
+                , AuthorityDikeCodeService.getAuthorityDikeCode());
         queryWrapper.orderByDesc(DfCheckingRecord::getCreateTime);
 
         // 查询分页数据

shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java

@@ -36,6 +36,8 @@ public class DfCheckingV2Service extends BaseService<DfCheckingV2Mapper, DfCheck
 
     private final DfCheckingV2ProjectItemV2Service dfCheckingV2ProjectItemV2Service;
 
+    private  final  DfCheckingProblemV2Service dfCheckingProblemV2Service;
+
     public IPage<DfV2CheckingDto> list(SearchParam<DfV2CheckingSearchDto> sp) {
         // 分页参数
         Page<DfCheckingV2ProjectManage> page = new Page<>(sp.getPageNum(), sp.getPageSize());
@@ -57,6 +59,9 @@ public class DfCheckingV2Service extends BaseService<DfCheckingV2Mapper, DfCheck
                     .ifPresent(name -> queryWrapper.like(DfCheckingV2ProjectManage::getName, name));
         }
 
+        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
+                ,DfCheckingV2ProjectManage::getDikeCode
+                , AuthorityDikeCodeService.getAuthorityDikeCode());
         queryWrapper.orderByDesc(DfCheckingV2ProjectManage::getCreateTime);
 
         // 查询分页数据

shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java

@@ -103,7 +103,9 @@ public class DfYhV2Service extends DefaultApprovalBusinessService<DfYhV2Mapper,
                     .ifPresent(recordId -> queryWrapper.eq(DfYhV2::getRecordId, recordId));
 
         }
-
+        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
+                , DfYhV2::getDikeCode
+                , AuthorityDikeCodeService.getAuthorityDikeCode());
         queryWrapper.orderByDesc(DfYhV2::getCreateTime);
 
         // 查询分页数据

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;
+    }
 }

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<DwCheckingProblemV2M
                 .filter(StringUtils::isBlank)
                 .ifPresent(recordId -> 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);
 

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<DwCheckingRecordV2Map
                 queryWrapper.le(DwCheckingRecord::getEndDate, data.getEndDate());
             }
         }
+        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
+                , DwCheckingRecord::getDikeCode
+                , AuthorityDikeCodeService.getAuthorityDikeCode());
         queryWrapper.orderByDesc(DwCheckingRecord::getCreateTime);
         // 查询分页数据
         Page<DwCheckingRecord> queryPage = page(page, queryWrapper);

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<DwCheckingV2Mapper, DwCheck
                     .filter(StringUtils::isNotBlank)
                     .ifPresent(name -> queryWrapper.like(DwCheckingV2ProjectManage::getName, name));
         }
+        queryWrapper.eq(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
+                , DwCheckingV2ProjectManage::getDikeCode
+                , AuthorityDikeCodeService.getAuthorityDikeCode());
         queryWrapper.orderByDesc(DwCheckingV2ProjectManage::getCreateTime);
 
         // 查询分页数据

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<DwYhV2Mapper,
                     .ifPresent(recordId -> queryWrapper.eq(DwYhV2::getRecordId, recordId));
 
         }
+        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
+                , DwYhV2::getDikeCode
+                , AuthorityDikeCodeService.getAuthorityDikeCode());
         queryWrapper.orderByDesc(DwYhV2::getCreateTime);
 
         // 查询分页数据

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;
+    }
+
 }

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<SzCheckingProblemV2M
         Optional.ofNullable(data.getRecordId())
                 .filter(StringUtils::isBlank)
                 .ifPresent(recordId -> 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);
 

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<SzCheckingRecordV2Map
                 queryWrapper.le(SzCheckingRecord::getEndDate, data.getEndDate());
             }
         }
-
+        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
+                , SzCheckingRecord::getWagaCode
+                , AuthorityDikeCodeService.getAuthorityDikeCode());
         queryWrapper.orderByDesc(SzCheckingRecord::getCreateTime);
         // 查询分页数据
         Page<SzCheckingRecord> queryPage = page(page, queryWrapper);

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<SzCheckingV2Mapper, SzCheck
                     .filter(StringUtils::isNotBlank)
                     .ifPresent(name -> queryWrapper.like(SzCheckingV2ProjectManage::getName, name));
         }
+        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
+                , SzCheckingV2ProjectManage::getWagaCode
+                , AuthorityDikeCodeService.getAuthorityDikeCode());
         queryWrapper.orderByDesc(SzCheckingV2ProjectManage::getCreateTime);
         // 查询分页数据
         Page<SzCheckingV2ProjectManage> queryPage = page(page, queryWrapper);

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<SzYhV2Mapper,
                     .ifPresent(recordId -> queryWrapper.eq(SzYhV2::getRecordId, recordId));
 
         }
+        queryWrapper.eq(StringUtils.isNotBlank(AuthorityDikeCodeService.getAuthorityDikeCode())
+                , SzYhV2::getWagaCode
+                , AuthorityDikeCodeService.getAuthorityDikeCode());
         queryWrapper.orderByDesc(SzYhV2::getCreateTime);
         // 查询分页数据
         Page<SzYhV2> queryPage = page(page, queryWrapper);

shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml

@@ -64,6 +64,9 @@
         <if test="dto.condition!= null and dto.condition.dutyHolder != null and dto.condition.dutyHolder != ''">
             AND jl.duty_holder_id = #{dto.condition.dutyHolder}
         </if>
+        <if test="dto.dikeCode!= null and dto.dikeCode != ''">
+            AND jl.dike_code = #{dto.dikeCode}
+        </if>
         ORDER BY jl.update_time DESC
     </select>
 

shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml

@@ -64,6 +64,9 @@
         <if test="dto.condition!= null and dto.condition.dutyHolder != null and dto.condition.dutyHolder != ''">
             AND jl.duty_holder_id = #{dto.condition.dutyHolder}
         </if>
+        <if test="dto.dikeCode!= null and dto.dikeCode != ''">
+            AND jl.dike_code = #{dto.dikeCode}
+        </if>
         ORDER BY jl.update_time DESC
     </select>
 

shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml

@@ -64,6 +64,9 @@
         <if test="dto.condition!= null and dto.condition.dutyHolder != null and dto.condition.dutyHolder != ''">
             AND jl.duty_holder_id = #{dto.condition.dutyHolder}
         </if>
+        <if test="dto.wagaCode!= null and dto.wagaCode != ''">
+            AND jl.waga_code = #{dto.wagaCode}
+        </if>
         ORDER BY jl.update_time DESC
     </select>