From 2f9262f56caafcd132e02cbc43b317d3ff5b36a5 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 15 Sep 2023 11:53:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87-=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardAuthDeptService.java | 2 + .../EnterpriseStandardAuthUserService.java | 2 + ...EnterpriseStandardAuthDeptServiceImpl.java | 21 ++++++++++ ...EnterpriseStandardAuthUserServiceImpl.java | 31 +++++++++++--- .../controller/LawsEnterpriseController.java | 25 ++++++++++++ .../entity/StandardTempPermission.java | 40 +++++++++++++++++++ 6 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standard/entity/StandardTempPermission.java diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthDeptService.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthDeptService.java index c7880aa8..f4767257 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthDeptService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthDeptService.java @@ -2,6 +2,7 @@ package com.jero.modules.laws.enterprise.service; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.standard.entity.StandardTempPermission; /** * @author ThinkBook @@ -10,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface EnterpriseStandardAuthDeptService extends IService { + void saveTempPermission(StandardTempPermission standardTempPermission); } 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 edf6656d..096404dd 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 @@ -2,6 +2,7 @@ package com.jero.modules.laws.enterprise.service; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.standard.entity.StandardTempPermission; /** * @author ThinkBook @@ -10,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface EnterpriseStandardAuthUserService extends IService { + void saveTempPermission(StandardTempPermission standardTempPermission); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java index 2f6bce20..45020916 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthDeptServiceImpl.java @@ -3,12 +3,17 @@ package com.jero.modules.laws.enterprise.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardAuthDeptMapper; +import com.jero.modules.laws.standard.entity.StandardTempPermission; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; + /** * @author ThinkBook * @description 针对表【laws_enterprise_standard_auth_dept】的数据库操作Service实现 @@ -20,6 +25,22 @@ import org.springframework.transaction.annotation.Transactional; public class EnterpriseStandardAuthDeptServiceImpl extends ServiceImpl implements EnterpriseStandardAuthDeptService{ + @Override + public void saveTempPermission(StandardTempPermission standardTempPermission) { + List esAuthDepts = new ArrayList<>(); + for (String standardNo : standardTempPermission.getStandardNos()) { + for (String deptId : standardTempPermission.getDeptIds()) { + EnterpriseStandardAuthDept enterpriseStandardAuthDept = new EnterpriseStandardAuthDept(); + enterpriseStandardAuthDept.setAuthDept(deptId); + enterpriseStandardAuthDept.setStandardNo(standardNo); + if (standardTempPermission.getAuthDate() != null) { + enterpriseStandardAuthDept.setAuthExpireDate(standardTempPermission.getAuthDate()); + } + esAuthDepts.add(enterpriseStandardAuthDept); + } + } + saveBatch(esAuthDepts); + } } 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 fc8964b8..b1a9bf29 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 @@ -5,21 +5,40 @@ import com.jero.common.exception.JeroBootException; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardAuthUserMapper; +import com.jero.modules.laws.standard.entity.StandardTempPermission; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; + /** -* @author ThinkBook -* @description 针对表【laws_enterprise_standard_temp_permission(企业标准)】的数据库操作Service实现 -* @createDate 2023-09-07 11:20:30 -*/ + * @author ThinkBook + * @description 针对表【laws_enterprise_standard_temp_permission(企业标准)】的数据库操作Service实现 + * @createDate 2023-09-07 11:20:30 + */ @Service @Transactional(rollbackFor = JeroBootException.class) @Slf4j -public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl - implements EnterpriseStandardAuthUserService { +public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl implements EnterpriseStandardAuthUserService { + @Override + public void saveTempPermission(StandardTempPermission standardTempPermission) { + List esAuthUsers = new ArrayList<>(); + for (String standardNo : standardTempPermission.getStandardNos()) { + for (String userId : standardTempPermission.getUserIds()) { + EnterpriseStandardAuthUser enterpriseStandardAuthUser = new EnterpriseStandardAuthUser(); + enterpriseStandardAuthUser.setAuthUser(userId); + enterpriseStandardAuthUser.setStandardNo(standardNo); + if (standardTempPermission.getAuthDate() != null) { + enterpriseStandardAuthUser.setAuthExpireDate(standardTempPermission.getAuthDate()); + } + esAuthUsers.add(enterpriseStandardAuthUser); + } + } + saveBatch(esAuthUsers); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index db8d1bcf..72f78fb5 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -8,7 +8,11 @@ import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; import com.jero.modules.laws.standard.entity.LawsUpdateRecord; +import com.jero.modules.laws.standard.entity.StandardTempPermission; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; import com.jero.modules.personal.service.ILawsStandardCollectionService; @@ -20,6 +24,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.List; import java.util.Map; import java.util.Objects; @@ -44,6 +49,11 @@ public class LawsEnterpriseController { private ILawsUpdateRecordService lawsUpdateRecordService; @Autowired private ILawsStandardSharingService lawsStandardSharingService; + @Resource + private EnterpriseStandardAuthUserService esAuthUserService; + + @Resource + private EnterpriseStandardAuthDeptService esAuthDeptService; private static final String MODULE_VALUE = TableNameEnum.ENTERPRISE_STANDARDS.getValue(); @@ -137,4 +147,19 @@ public class LawsEnterpriseController { return Result.OK(lawsUpdateRecordService.list(queryWrapper)); } + + @AutoLog(value = "企业法规标准-临时权限设置") + @ApiOperation(value="企业法规标准-临时权限设置", notes="企业法规标准-临时权限设置") + @PostMapping(value = "/tempPermission") + public Result tempPermission(@RequestBody StandardTempPermission standardTempPermission) { + if (!standardTempPermission.getUserIds().isEmpty()) { + esAuthUserService.saveTempPermission(standardTempPermission); + } + if (!standardTempPermission.getDeptIds().isEmpty()) { + esAuthDeptService.saveTempPermission(standardTempPermission); + } + return Result.OK(); + } + + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/StandardTempPermission.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/StandardTempPermission.java new file mode 100644 index 00000000..6f41ad1c --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/StandardTempPermission.java @@ -0,0 +1,40 @@ +package com.jero.modules.laws.standard.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import java.util.Date; +import java.util.List; + +/** + * @author: Mzaxd + * @Date: 2023/9/15 11:15 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +public class StandardTempPermission { + + @NotNull + @ApiModelProperty(value = "标准标号") + List standardNos; + + @ApiModelProperty(value = "部门Ids") + List deptIds; + + @ApiModelProperty(value = "用户Ids") + List userIds; + + /**授权到期日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "授权到期日期") + Date authDate; +}