From b38e805ffa0a838c89c6911cfac9707792937c10 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 12 Dec 2023 18:12:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=B4=E6=97=B6=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardAuthUserMapper.java | 4 ++ .../xml/EnterpriseStandardAuthUserMapper.xml | 8 +++ .../EnterpriseStandardAuthUserService.java | 17 +++++ ...EnterpriseStandardAuthUserServiceImpl.java | 26 ++++++++ .../controller/TempAuthRecordQueryDto.java | 65 +++++++++++++++++++ 5 files changed, 120 insertions(+) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardAuthUserMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardAuthUserMapper.java index c071ec07..7608195e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardAuthUserMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/EnterpriseStandardAuthUserMapper.java @@ -1,7 +1,10 @@ package com.jero.modules.laws.enterprise.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.laws.standard.controller.TempAuthRecordQueryDto; +import org.apache.ibatis.annotations.Param; /** * @author ThinkBook @@ -11,6 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface EnterpriseStandardAuthUserMapper extends BaseMapper { + IPage tempAuthRecord(IPage page, @Param("param") TempAuthRecordQueryDto tempAuthRecordQueryDto); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml index 30804e61..d6df62cc 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml @@ -21,4 +21,12 @@ update_by,update_time,org_code, standard_id,auth_user,auth_expire_date + + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java index 275c70cd..0fdd9e2b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java @@ -1,7 +1,9 @@ package com.jero.modules.laws.enterprise.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.standard.controller.TempAuthRecordQueryDto; import com.jero.modules.laws.standard.entity.LawsStandardTempPermission; import java.util.List; @@ -50,4 +52,19 @@ public interface EnterpriseStandardAuthUserService extends IService tempAuthRecord(TempAuthRecordQueryDto tempAuthRecordQueryDto, Integer pageNo, Integer pageSize); + + /** + * 解除授权 + * @param authId + */ + void revokeAuth(String authId); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java index 7e166b52..4a21ebd4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java @@ -3,6 +3,8 @@ package com.jero.modules.laws.enterprise.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.ResultCommon; import com.jero.common.constant.enums.YesOrNoEnum; @@ -11,9 +13,11 @@ import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser; +import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardAuthUserMapper; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; +import com.jero.modules.laws.standard.controller.TempAuthRecordQueryDto; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.entity.LawsStandardTempPermission; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; @@ -75,6 +79,9 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl adminRoleCodeList; @@ -648,6 +655,25 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl tempAuthRecord(TempAuthRecordQueryDto tempAuthRecordQueryDto, Integer pageNo, Integer pageSize) { + IPage page = new Page<>(pageNo, pageSize); + return authUserMapper.tempAuthRecord(page, tempAuthRecordQueryDto); + } + + @Override + public void revokeAuth(String authId) { + EnterpriseStandardAuthDept authDept = authDeptService.getById(authId); + EnterpriseStandardAuthUser authUser = this.getById(authId); + // 判断哪个不为null + if (authDept != null) { + authDeptService.removeById(authId); + } + if (authUser != null) { + this.removeById(authId); + } + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java new file mode 100644 index 00000000..5cafa0eb --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java @@ -0,0 +1,65 @@ +package com.jero.modules.laws.standard.controller; + +import cn.hutool.core.util.StrUtil; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +/** + * @author: Mzaxd + * @Date: 2023/12/12 17:03 + */ + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TempAuthRecordQueryDto { + + @ApiModelProperty(value = "权限Id") + private String id; + + /**授权到期日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "授权到期日期") + private Date authExpireDate; + + /**授权部门*/ + @ApiModelProperty(value = "授权部门") + private String authDept; + + /**授权人员*/ + @ApiModelProperty(value = "授权人员") + private String authUser; + + @ApiModelProperty(value = "标准Id") + private String standardId; + + @ApiModelProperty(value = "标准号") + private String standardNumber; + + private List authUserList; + + private List authDeptList; + + public void setAuthDept(String authDept) { + this.authDept = authDept; + if (StrUtil.isNotBlank(authDept)) { + this.authDeptList = Arrays.asList(authDept.split(",")); + } + } + + public void setAuthUser(String authUser) { + this.authUser = authUser; + if (StrUtil.isNotBlank(authUser)) { + this.authUserList = Arrays.asList(authUser.split(",")); + } + } +}