Browse Source

fix:权限判断

release-sy-v1.0.0
“lyd” 4 weeks ago
parent
commit
feda467c73
  1. 14
      shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java
  2. 7
      shuili-system/src/main/java/com/kms/common/utils/UserUtils.java
  3. 64
      shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java
  4. 22
      shuili-system/src/main/java/com/kms/yxgh/common/dto/ApprovalSearchDto.java
  5. 9
      shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java
  6. 5
      shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java
  7. 26
      shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSysUserRole.java
  8. 12
      shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java
  9. 15
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSysUserRoleMapper.java
  10. 99
      shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java
  11. 19
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java
  12. 5
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java
  13. 5
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java
  14. 4
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java
  15. 11
      shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwRecordSearchV2Dto.java
  16. 5
      shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingProblemV2Service.java
  17. 4
      shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingRecordV2Service.java
  18. 4
      shuili-system/src/main/java/com/kms/yxgh/dw/service/DwCheckingV2Service.java
  19. 4
      shuili-system/src/main/java/com/kms/yxgh/dw/service/DwYhV2Service.java
  20. 12
      shuili-system/src/main/java/com/kms/yxgh/sz/dto/v2/SzRecordSearchV2Dto.java
  21. 5
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingProblemV2Service.java
  22. 5
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingRecordV2Service.java
  23. 4
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingV2Service.java
  24. 4
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java
  25. 3
      shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml
  26. 3
      shuili-system/src/main/resources/mapper/yxgh/DwYhV2Mapper.xml
  27. 3
      shuili-system/src/main/resources/mapper/yxgh/SzYhV2Mapper.xml

14
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<SysXzqh> queryWrapper = new QueryWrapper<>();
queryWrapper.likeRight("XZQHDM", getQuery(xzqh.getXzqhdm()))

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

64
shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java

@ -39,69 +39,7 @@ public class SysXzqhService extends BaseService<SysXzqhMapper, SysXzqh> {
private SysXzqhMapper sysXzqhMapper;
@Autowired
private static SysDeptService sysDeptService;
@Autowired
private static SysRoleService sysRoleService;
@Autowired
private static SysUserRoleService sysUserRoleService;
@Autowired
private static BsSgcDfManateamService bsSgcDfManateamService;
/**
* 获取当前用户部门所属行政区划
* 如果当前登录用户角色编码属于(YW00143YW00129YW00164)则返回当前用户部门的行政区划代码
*如果当前登录用户角色编码属于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;
}
private SysDeptService sysDeptService;
public Map<String, SysXzqh> get(List<String> adcd) {

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

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

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

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

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

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

99
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 {
/**
* 获取当前用户部门所属行政区划
* 如果当前登录用户角色编码属于(YW00143YW00129YW00164)则返回当前用户部门的行政区划代码
*如果当前登录用户角色编码属于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();
}
}

19
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);

5
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);
// 查询分页数据

5
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);
// 查询分页数据

4
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);
// 查询分页数据

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

5
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);

4
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);

4
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);
// 查询分页数据

4
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);
// 查询分页数据

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

5
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);

5
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);

4
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);

4
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);

3
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>

3
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>

3
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>

Loading…
Cancel
Save