ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: 临时权限设置改完按标准id关联

Browse Source
This commit is contained in:
mzaxd
2023-09-27 16:02:36 +08:00
parent c3927bac94
commit 74ab2f188d
8 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+39 -6
View File
@@ -148,15 +148,14 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
// 对返回的数据做处理
// 做字段翻译和拼接
infoPage.setRecords(processResultMapPageList(infoPage.getRecords(), fieldListSelect));
// 企标独有权限
if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) {
// 是否能查看详情
this.detailFlag(infoPage.getRecords());
}
// 是否收藏判断标识
collectionFlag(infoPage.getRecords());
// // 企标独有权限
// if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) {
// // 是否能查看详情
// this.detailFlag(infoPage.getRecords());
// }
// 待处理
return infoPage;
}
@@ -241,6 +240,40 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
return fieldList;
}
/**
* @Author: liao
* @Date: 2023/9/11 14:49
* @Description: 是否能进入详情页判断
**/
private void detailFlag(List<Map<String, Object>> records) {
// 获取全部id集合
List<String> ids = records.stream().map(kv ->
String.valueOf(kv.get("id"))).collect(Collectors.toList());
if (CollectionUtils.isEmpty(ids)) return;
// 获取登录用户
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 查询标准收藏表
LambdaQueryWrapper<LawsStandardCollection> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(LawsStandardCollection::getCollectorId, loginUser.getId());
queryWrapper.in(LawsStandardCollection::getStandardId, ids);
List<LawsStandardCollection> standardCollectionList = lawsStandardCollectionService.list(queryWrapper);
if (CollectionUtils.isEmpty(standardCollectionList)) {
records.forEach(map -> map.put(FieldCommon.COLLECTION_FLAG, false));
return;
}
List<String> standardIdList = standardCollectionList.stream()
.map(LawsStandardCollection::getStandardId).collect(Collectors.toList());
records.forEach(map -> {
if (standardIdList.contains(String.valueOf(map.get("id")))) {
map.put(FieldCommon.COLLECTION_FLAG, true);
} else {
map.put(FieldCommon.COLLECTION_FLAG, false);
}
});
}
/**
* @Author: liao
* @Date: 2023/9/11 14:49
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardAuthDept.java
+9 -9
View File
@@ -27,32 +27,32 @@ public class EnterpriseStandardAuthDept implements Serializable {
/**主键ID*/
@TableId
@ApiModelProperty(value = "部门id")
@ApiModelProperty(value = "主键ID")
private String id;
/**创建人*/
@ApiModelProperty(value = "部门id")
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建时间*/
@ApiModelProperty(value = "部门id")
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "部门id")
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新时间*/
@ApiModelProperty(value = "部门id")
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "部门id")
@ApiModelProperty(value = "所属部门")
private String orgCode;
/**标准编号*/
@ApiModelProperty(value = "部门id")
private String standardNo;
/**标准Id*/
@ApiModelProperty(value = "标准Id")
private String standardId;
/**部门id*/
@ApiModelProperty(value = "部门id")
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardAuthUser.java
+3 -3
View File
@@ -57,9 +57,9 @@ public class EnterpriseStandardAuthUser implements Serializable {
@ApiModelProperty(value = "所属部门")
private String orgCode;
/**企标编号*/
@ApiModelProperty(value = "企标编号")
private String standardNo;
/**企标Id*/
@ApiModelProperty(value = "企标Id")
private String standardId;
/**授权人员*/
@ApiModelProperty(value = "授权人员")
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthDeptMapper.xml
+2 -2
View File
@@ -11,7 +11,7 @@
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
<result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
<result property="standardId" column="standard_id" jdbcType="VARCHAR"/>
<result property="authDept" column="auth_dept" jdbcType="VARCHAR"/>
<result property="authExpireDate" column="auth_expire_date" jdbcType="TIMESTAMP"/>
</resultMap>
@@ -19,6 +19,6 @@
<sql id="Base_Column_List">
id,create_by,create_time,
update_by,update_time,org_code,
standard_no,authDept
standard_id,authDept
</sql>
</mapper>
laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml
+2 -2
View File
@@ -11,7 +11,7 @@
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
<result property="standardNo" column="standard_no" jdbcType="VARCHAR"/>
<result property="standardId" column="standard_id" jdbcType="VARCHAR"/>
<result property="authUser" column="auth_user" jdbcType="VARCHAR"/>
<result property="authExpireDate" column="auth_expire_date" jdbcType="TIMESTAMP"/>
</resultMap>
@@ -19,6 +19,6 @@
<sql id="Base_Column_List">
id,create_by,create_time,
update_by,update_time,org_code,
standard_no,auth_user,auth_expire_date
standard_id,auth_user,auth_expire_date
</sql>
</mapper>
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java
+2 -2
View File
@@ -27,11 +27,11 @@ public class EnterpriseStandardAuthDeptServiceImpl extends ServiceImpl<Enterpris
@Override
public void saveTempPermission(LawsStandardTempPermission lawsStandardTempPermission) {
List<EnterpriseStandardAuthDept> esAuthDepts = new ArrayList<>();
for (String standardNo : lawsStandardTempPermission.getStandardNoList()) {
for (String standardId : lawsStandardTempPermission.getStandardIdList()) {
for (String deptId : lawsStandardTempPermission.getDeptIdList()) {
EnterpriseStandardAuthDept enterpriseStandardAuthDept = new EnterpriseStandardAuthDept();
enterpriseStandardAuthDept.setAuthDept(deptId);
enterpriseStandardAuthDept.setStandardNo(standardNo);
enterpriseStandardAuthDept.setStandardId(standardId);
if (lawsStandardTempPermission.getAuthDate() != null) {
enterpriseStandardAuthDept.setAuthExpireDate(lawsStandardTempPermission.getAuthDate());
}
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
+2 -2
View File
@@ -26,11 +26,11 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
@Override
public void saveTempPermission(LawsStandardTempPermission lawsStandardTempPermission) {
List<EnterpriseStandardAuthUser> esAuthUsers = new ArrayList<>();
for (String standardNo : lawsStandardTempPermission.getStandardNoList()) {
for (String standardId : lawsStandardTempPermission.getStandardIdList()) {
for (String userId : lawsStandardTempPermission.getUserIdList()) {
EnterpriseStandardAuthUser enterpriseStandardAuthUser = new EnterpriseStandardAuthUser();
enterpriseStandardAuthUser.setAuthUser(userId);
enterpriseStandardAuthUser.setStandardNo(standardNo);
enterpriseStandardAuthUser.setStandardId(standardId);
if (lawsStandardTempPermission.getAuthDate() != null) {
enterpriseStandardAuthUser.setAuthExpireDate(lawsStandardTempPermission.getAuthDate());
}
laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsStandardTempPermission.java
+9 -7
View File
@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -25,9 +26,9 @@ import java.util.stream.Collectors;
public class LawsStandardTempPermission {
@NotBlank
@ApiModelProperty(value = "标准标号")
String standardNos;
List<String> standardNoList;
@ApiModelProperty(value = "标准id")
String standardIds;
List<String> standardIdList;
@ApiModelProperty(value = "部门Ids")
String deptIds;
@@ -41,12 +42,13 @@ public class LawsStandardTempPermission {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "授权到期日期")
@NotNull(message = "授权到期日期不能为空")
Date authDate;
public void setStandardNos(String standardNos) {
this.standardNos = standardNos;
this.standardNoList =
Arrays.stream(standardNos.split(",")).map(String::trim).collect(Collectors.toList());
public void setStandardIds(String standardIds) {
this.standardIds = standardIds;
this.standardIdList =
Arrays.stream(standardIds.split(",")).map(String::trim).collect(Collectors.toList());
}
public void setDeptIds(String deptIds) {