admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

安全修改

Browse Source
This commit is contained in:
guoshengxiong 2025-12-01 09:36:10 +08:00
parent 8072f94e9c
commit 545094dc79
6 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
View File

@ -177,7 +177,10 @@ public class SystemUserController {
@ApiImplicitParam(name = "userId", required = false, value = "用户id", paramType = "body"),
@ApiImplicitParam(name = "roleName", required = false, value = "角色名称", paramType = "body"),
@ApiImplicitParam(name = "isSupervisingRoleName", required = false, value = "1监理角色名称的人", paramType = "body"),
@ApiImplicitParam(name = "safeQualityRegionIdForDuty", required = false, value = "安全区域id（多个，分割）查责任人", paramType = "body"),
@ApiImplicitParam(name = "safeQualityRegionIdForDuty", required = false, value = "安全区域id（多个，分割）查整改人", paramType = "body"),
@ApiImplicitParam(name = "safeQualityRegionIdForReview", required = false, value = "安全区域id（多个，分割）查复查人", paramType = "body"),
@ApiImplicitParam(name = "qualityRegionIdForDuty", required = false, value = "质量区域id（多个，分割）查整改人", paramType = "body"),
@ApiImplicitParam(name = "qualityRegionIdForReview", required = false, value = "质量区域id（多个，分割）查复查人", paramType = "body"),
@ApiImplicitParam(name = "teamIdList", required = false, value = "班组idList", paramType = "body"),
@ApiImplicitParam(name = "departmentIdList", required = false, value = "部门idList", paramType = "body"),
})

15
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -993,14 +993,22 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
if (StrUtil.isNotBlank(enterpriseId)) {
map.put("enterpriseIdList", StrUtil.split(enterpriseId, ","));
}
String safeQualityRegionIdForDuty = MapUtils.getString(map, "safeQualityRegionIdForDuty");
putSafeQualityRegionIdForDutyParam(map, MapUtils.getString(map, "safeQualityRegionIdForDuty"),QualityRegion::getSecurityDutyIds);
putSafeQualityRegionIdForDutyParam(map, MapUtils.getString(map, "safeQualityRegionIdForReview"),QualityRegion::getSecurityReviewIds);
putSafeQualityRegionIdForDutyParam(map, MapUtils.getString(map, "qualityRegionIdForDuty"), QualityRegion::getQualityDutyIds);
putSafeQualityRegionIdForDutyParam(map, MapUtils.getString(map, "qualityRegionIdForReview"), QualityRegion::getQualityReviewIds);
return systemUserMapper.getProjectChilderSystemUserList(map);
}
private void putSafeQualityRegionIdForDutyParam(Map<String, Object> map, String safeQualityRegionIdForDuty, Function<QualityRegion, String> getUserIds) {
if (StrUtil.isNotBlank(safeQualityRegionIdForDuty)) {
List<String> userIds = qualityRegionService.list(new LambdaQueryWrapper<QualityRegion>()
.in(QualityRegion::getId, StrUtil.split(safeQualityRegionIdForDuty, ","))).stream().flatMap(r -> {
if (StrUtil.isBlank(r.getSecurityDutyIds())) {
String uids = getUserIds.apply(r);
if (StrUtil.isBlank(uids)) {
return null;
} else {
return StrUtil.split(r.getSecurityDutyIds(), ",").stream();
return StrUtil.split(uids, ",").stream();
}
}).filter(Objects::nonNull).collect(Collectors.toList());
userIds.add("0");
@ -1010,7 +1018,6 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
}
map.put("userIdList", userIds);
}
return systemUserMapper.getProjectChilderSystemUserList(map);
}
@Override

2
src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerFieldController.java
View File

@ -166,7 +166,7 @@ public class XzSecurityDangerFieldController {
.eq(XzSecurityDangerField::getSn, projectSn)
.eq(XzSecurityDangerField::getCompanyProjectType, 2)
);
List<XzSecurityDangerFieldVo> companyConfigs = xzSecurityDangerFieldService.getCompanyConfigs(projectSn);
List<XzSecurityDangerFieldVo> companyConfigs = xzSecurityDangerFieldService.getCompanyConfigs(projectSn, 2);
List<XzSecurityDangerField> fieldList = companyConfigs.stream().map(vo -> {
XzSecurityDangerField field = new XzSecurityDangerField();
BeanUtil.copyProperties(vo, field);

8
src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerReviewVerifyController.java
View File

@ -30,6 +30,7 @@ import springfox.documentation.annotations.ApiIgnore;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
/**
@ -187,7 +188,7 @@ public class XzSecurityDangerReviewVerifyController {
* @param dto
*/
private void saveFieldForProject(XzSecurityDangerReviewVerifyDto dto) {
List<XzSecurityDangerFieldVo> companyConfigs = xzSecurityDangerFieldService.getCompanyConfigs(dto.getSn());
List<XzSecurityDangerFieldVo> companyConfigs = xzSecurityDangerFieldService.getCompanyConfigs(dto.getSn(),dto.getCompanyProjectType());
xzSecurityDangerFieldService.remove(new LambdaQueryWrapper<XzSecurityDangerField>()
.eq(XzSecurityDangerField::getSn, dto.getSn())
.eq(XzSecurityDangerField::getCompanyProjectType, dto.getCompanyProjectType())
@ -233,6 +234,11 @@ public class XzSecurityDangerReviewVerifyController {
dto.setModType(modType);
dto.setSn(projectSn);
dto.setCompanyProjectType(2);
if (Objects.equals(modType, 1) && dto.getReviewRoleName() == null) {
dto.setReviewRoleName("");
} else if (Objects.equals(modType, 2) && dto.getVerifyRoleName() == null) {
dto.setVerifyRoleName("");
}
save(dto);
return Result.ok();
}

5
src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerFieldService.java
View File

@ -72,10 +72,11 @@ public interface IXzSecurityDangerFieldService extends IService<XzSecurityDanger
/**
* 查询企业配置
*
* @param projectSn
* @param sn
* @param companyProjectType
* @return
*/
List<XzSecurityDangerFieldVo> getCompanyConfigs(String projectSn);
List<XzSecurityDangerFieldVo> getCompanyConfigs(String sn, Integer companyProjectType);
void saveAll(SaveAllXzSecurityDangerFieldDto dto);

12
src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerFieldServiceImpl.java
View File

@ -137,7 +137,7 @@ public class XzSecurityDangerFieldServiceImpl extends ServiceImpl<XzSecurityDang
List<XzSecurityDangerFieldVo> list = this.queryList(param);
if (Objects.equals(companyProjectType, 2) && CollUtil.isEmpty(list)) {
//项目不存在，查询企业配置
list = this.getCompanyConfigs(sn);
list = this.getCompanyConfigs(sn, 2);
if (CollUtil.isEmpty(list)) {
list = JSON.parseArray(ResourceUtil.readUtf8Str("init/data/xzSecurityDangerField.json"), XzSecurityDangerFieldVo.class);
}
@ -151,11 +151,17 @@ public class XzSecurityDangerFieldServiceImpl extends ServiceImpl<XzSecurityDang
}
@Override
public List<XzSecurityDangerFieldVo> getCompanyConfigs(String projectSn) {
public List<XzSecurityDangerFieldVo> getCompanyConfigs(String sn, Integer companyProjectType) {
List<XzSecurityDangerFieldVo> list;
String headquartersSn = companyService.getHeadquartersSnByProjectSn(projectSn);
String headquartersSn;
if (Objects.equals(companyProjectType, 2)) {
headquartersSn = companyService.getHeadquartersSnByProjectSn(sn);
} else {
headquartersSn = sn;
}
HashMap<String, Object> map = new HashMap<>();
map.put("sn", headquartersSn);
map.put("recordType", 1);
map.put("companyProjectType", 1);
list = this.queryList(map);
return list;