fix:水质检测

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<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/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<SysXzqhMapper, SysXzqh> {
     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<SysUserRole> sysUserRoles = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, user.getId()));
+        if (!CollectionUtils.isEmpty(sysUserRoles)) {
+            List<String> roleIds = sysUserRoles.stream()
+                    .map(SysUserRole::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 Map<String, SysXzqh> get(List<String> adcd) {

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<WaterDetectionDto> waterLst(@RequestBody MonitorQueDto dto) {
+        return new Page<>();
+    }
+
+    @PostMapping("/water-check-down")
+    @ApiOperation("水质检查下拉")
+    public Response<WaterDetectionDownDto> waterDown(@RequestBody MonitorQueDto dto) {
+        return Response.ok();
+    }
+
+    @PostMapping("/gate-opening-list")
+    @ApiOperation("闸门开度列表")
+    public IPage<GateOpeningDto> gateList(@RequestBody MonitorQueDto dto) {
+        return new Page<>();
+    }
+
+    @PostMapping("/gate-opening-down")
+    @ApiOperation("闸门开度下拉")
+    public Response<GateOpeningDownDto> gateDown(@RequestBody MonitorQueDto dto) {
+        return Response.ok();
+    }
+
+
 }

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/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<GateOpeningDownDtoItem> list;
+
+
+    @Data
+    public static class GateOpeningDownDtoItem {
+
+        @ApiModelProperty("水闸名称")
+        private String wagaName;
+
+        @ApiModelProperty("水闸code")
+        private String wagacODE;
+
+    }
+
+}

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

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<StationDtoItem> list;
+
+
+    @Data
+    public static class StationDtoItem {
+
+        @ApiModelProperty("测站名称")
+        private String stationName;
+
+        @ApiModelProperty("测站code")
+        private String stationCode;
+
+    }
+
+
+}

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