diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java index 1c5adbb9..b8a32ed6 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java @@ -120,61 +120,21 @@ public class BsSgcDfSafeJbxxController extends BaseController { @PostMapping("/list") @ApiOperation("堤防管理基本信息列表") public IPage list(@RequestBody SearchParam sp) { - BsSgcDfSafeJbxx data = sp.getData(); - SysUser sysUser = UserUtils.getUser(); - logger.error("user is ",sysUser); - Set roles = permissionService.getRolePermission(sysUser); - SysDept dept = sysUser.getDept(); - String xzqhId=null; - String name =null; - if (dept != null) { - xzqhId = dept.getXzqhId(); - if (ObjectUtils.isNotEmpty(sp.getData()) && StringUtils.isNotEmpty(sp.getData().getAdcd())) { - xzqhId = sp.getData().getAdcd(); - } - name = dept.getName(); - } else { - logger.error("Dept is null for user: {}", sysUser.getUserName()); - // 设置默认值或抛出异常 - if (ObjectUtils.isNotEmpty(sp.getData()) && StringUtils.isNotEmpty(sp.getData().getAdcd())) { - xzqhId = sp.getData().getAdcd(); - }else { - xzqhId = "440000000000"; - } - name=""; - } - boolean isGLDW=false; - for (String roleId:roles){ - if (roleId.equals("YW00352")){ - isGLDW=true; - break; - } - } + Page page=new Page<>(); - if (isGLDW){ - page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), - Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName()) - .eq(BsSgcDfSafeJbxx::getMnun,name) + BsSgcDfSafeJbxx data = sp.getData(); + page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class) + .eq(data.getDikeCode()!=null,BsSgcDfSafeJbxx::getDikeCode,data.getDikeCode()) + .like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName()) .eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType()) .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus()) .eq(data.getDikeGrad() != null, BsSgcDfSafeJbxx::getDikeGrad, data.getDikeGrad()) - .likeRight(data.getAdcd()!=null,BsSgcDfSafeJbxx::getAdcd,sysXzqhService.getSubString(xzqhId)) + .likeRight(data.getAdcd()!=null,BsSgcDfSafeJbxx::getAdcd,data.getAdcd()) .isNull(BsSgcDfSafeJbxx::getExprDate) .orderByAsc(BsSgcDfSafeJbxx::getDikeGrad) .orderByDesc(BsSgcDfSafeJbxx::getCreateTime)); - }else { - page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), - Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName()) - .eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType()) - .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus()) - .eq(data.getDikeGrad() != null, BsSgcDfSafeJbxx::getDikeGrad, data.getDikeGrad()) - .isNull(BsSgcDfSafeJbxx::getExprDate) - .likeRight(data.getAdcd()!= null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(xzqhId)) - .orderByAsc(BsSgcDfSafeJbxx::getDikeGrad) - .orderByDesc(BsSgcDfSafeJbxx::getCreateTime)); - } - return page; - + return page; } @PostMapping("/listByStatus") diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java index 2d43cc76..3c4ec36a 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java @@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; 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 org.springframework.util.StringUtils; import java.util.Date; @@ -485,4 +487,12 @@ public class BsSgcDfSafeJbxx extends BaseEntity implements IAdcd { private String elevSysConver; private String mnun; + + public String getDikeCode() { + if (StringUtils.isEmpty(this.dikeCode)) { + this.dikeCode = AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return this.dikeCode; + } + } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/dto/RoleJudgeDto.java b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/RoleJudgeDto.java index bd0dd44d..271394a4 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/dto/RoleJudgeDto.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/RoleJudgeDto.java @@ -21,4 +21,6 @@ public class RoleJudgeDto { @ApiModelProperty("工程code") private String dikeCode; + private String wagaCode; + } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java index 2ac858de..f2b3a015 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java @@ -118,61 +118,21 @@ public class BsSgcSzSafeJbxxController extends BaseController { @PostMapping("/list") @ApiOperation("水闸安全管理基本信息列表") public IPage list(@RequestBody SearchParam sp) { + Page page=new Page<>(); BsSgcSzSafeJbxx data = sp.getData(); - SysUser sysUser = UserUtils.getUser(); - logger.error("user is",sysUser); - Set roles = permissionService.getRolePermission(sysUser); - SysDept dept = sysUser.getDept(); - String xzqhId=null; - String name =null; - if (dept != null) { - xzqhId = dept.getXzqhId(); - if (ObjectUtils.isNotEmpty(sp.getData()) && StringUtils.isNotEmpty(sp.getData().getAdcd())) { - xzqhId = sp.getData().getAdcd(); - } - name = dept.getName(); - } else { - logger.error("Dept is null for user: {}", sysUser.getUserName()); - // 设置默认值或抛出异常 - if (ObjectUtils.isNotEmpty(sp.getData()) && StringUtils.isNotEmpty(sp.getData().getAdcd())) { - xzqhId = sp.getData().getAdcd(); - }else { - xzqhId = "440000000000"; - } - name=""; - } - - boolean isGLDW=false; - for (String roleId:roles){ - if (roleId.equals("YW00352")){ - isGLDW=true; - break; - } - } - Page page=new Page<>(); - if (isGLDW){ page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), - Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName()) - .eq(BsSgcSzSafeJbxx::getMnun,name) + Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) + .eq(data.getAdcd()!=null,BsSgcSzSafeJbxx::getWagaCode,data.getWageCode()) + .like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName()) .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType()) .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus()) .eq(data.getEngScal()!=null,BsSgcSzSafeJbxx::getEngScal,data.getEngScal()) - .likeRight(xzqhId!=null,BsSgcSzSafeJbxx::getAdcd,sysXzqhService.getSubString(xzqhId)) + .likeRight(data.getAdcd()!=null,BsSgcSzSafeJbxx::getAdcd,data.getAdcdQx()) .isNull(BsSgcSzSafeJbxx::getExprDate) .last("ORDER BY CASE WHEN eng_scal IS NULL OR eng_scal = '' THEN 1 ELSE 0 END, eng_scal ASC") ); - }else { - page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), - Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName()) - .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType()) - .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus()) - .eq(data.getEngScal()!=null,BsSgcSzSafeJbxx::getEngScal,data.getEngScal()) - .isNull(BsSgcSzSafeJbxx::getExprDate) - .likeRight(data.getAdcd() != null , BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(xzqhId)) - .last("ORDER BY CASE WHEN eng_scal IS NULL OR eng_scal = '' THEN 1 ELSE 0 END, eng_scal ASC") - ); - } + return page; } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java index be247c9e..83ae2475 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java @@ -7,11 +7,13 @@ import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.common.dto.IAdcd; +import com.kms.yxgh.df.service.AuthorityDikeCodeService; 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 org.springframework.util.StringUtils; import java.util.Date; @@ -308,7 +310,12 @@ public class BsSgcSzSafeJbxx extends BaseEntity implements IAdcd { @JsonFormat(pattern = "yyyy-MM-dd") private Date checkDate; - + public String getWageCode() { + if (StringUtils.isEmpty(this.wagaCode)) { + this.wagaCode = AuthorityDikeCodeService.getAuthorityDikeCode(); + } + return this.wagaCode; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java index 72eb9b45..3103074c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/AuthorityDikeCodeService.java @@ -1,5 +1,6 @@ package com.kms.yxgh.df.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.kms.yg.sz.domain.BsSgcSzManateam; import org.springframework.util.StringUtils; import com.kms.common.utils.UserUtils; import com.kms.system.service.SysDeptService; @@ -14,7 +15,7 @@ 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 com.kms.yg.sz.service.BsSgcSzManateamService; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -38,9 +39,11 @@ public class AuthorityDikeCodeService { SysRoleService sysRoleService = SpringUtils.getBean(SysRoleService.class); DfSysUserRoleMapper dfSysUserRoleMapper = SpringUtils.getBean(DfSysUserRoleMapper.class); BsSgcDfManateamService bsSgcDfManateamService = SpringUtils.getBean(BsSgcDfManateamService.class); + BsSgcSzManateamService bsSgcSzManateamService=SpringUtils.getBean(BsSgcSzManateamService.class); SysDeptService sysDeptService = SpringUtils.getBean(SysDeptService.class); + RoleJudgeDto dto=new RoleJudgeDto(); SysUser user = UserUtils.getUser(); if (Objects.isNull(user)) { @@ -82,10 +85,21 @@ public class AuthorityDikeCodeService { .orderByDesc(BsSgcDfManateam::getCreateTime) .last(" limit 1 ") ); + + BsSgcSzManateam bsSgcSzManateam = bsSgcSzManateamService + .getOne(new LambdaQueryWrapper() + .eq(!StringUtils.isEmpty(user.getPhonenumber()),BsSgcSzManateam::getPhone, user.getPhonenumber()) + .orderByDesc(BsSgcSzManateam::getCreateTime) + .last(" limit 1 ") + ); if (!Objects.isNull(bsSgcDfManateam)) { dto.setDikeCode(bsSgcDfManateam.getDikeCode()); - return dto; } + if (!Objects.isNull(bsSgcSzManateam)){ + dto.setWagaCode(bsSgcSzManateam.getWagaCode()); + } + return dto; + } } } @@ -98,6 +112,10 @@ public class AuthorityDikeCodeService { return getRoleDeptDistrictCode().getDikeCode(); } + public static String getAuthorityWagaCode() { + return getRoleDeptDistrictCode().getWagaCode(); + } + public static String getAuthorityXzqhCode() { return getRoleDeptDistrictCode().getXzqhId(); }