From 7e1a7c45fdd42ae2e33aaf7f58ba25e8aff8cc96 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 5 Jan 2024 10:19:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86--=E8=AE=BE=E7=BD=AE=E7=BB=B4=E6=8A=A4=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 5 ++ .../ParamsTemplateEOController.java | 46 ++++++++++++++++++- .../template/entity/ParamsTemplateEO.java | 13 ++++++ 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index c29d15589..8c1aea125 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -687,3 +687,8 @@ ALTER TABLE `project_certification_inventory` ADD COLUMN `platform_certification_inventory_id` varchar(36) NULL COMMENT '平台件-认证清单id' AFTER `remark`; +-- 参数模板管理 添加维护人 2024-01-05 未同步生产环境 +ALTER TABLE `params_template` +ADD COLUMN `maintainer_id` varchar(3000) NULL COMMENT '维护人' AFTER `status`; + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java index 13f88bac3..cf9780d0e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java @@ -1,5 +1,6 @@ package com.jero.modules.cert.template.controller; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,17 +8,21 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.vo.LoginUser; import com.jero.modules.cert.template.entity.ParamsTemplateEO; import com.jero.modules.cert.template.service.IParamsTemplateEOService; import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum; import com.jero.modules.dummy.enums.OrderEnum; -import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysDictItemMapper; +import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.todoCenter.enums.FlagEnum; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -57,6 +62,8 @@ public class ParamsTemplateEOController extends JeroController pageList) { + //是否为超级管理员 + boolean administrator = sysUserService.isAdministrator(); + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + List records = pageList.getRecords(); + if(ObjectUtil.isNotEmpty(records)){ + List userIdList = records.stream() + .filter(e -> StringUtils.isNotBlank(e.getMaintainerId())) + .map(ParamsTemplateEO::getMaintainerId).distinct().collect(Collectors.toList()); + if(ObjectUtil.isNotEmpty(userIdList)){ + List sysUserList = sysUserService.querySysUserListByIdList(userIdList); + for (ParamsTemplateEO record : records) { + if(StringUtils.isNotBlank(record.getMaintainerId())){ + List userList = sysUserList.stream().filter(e -> record.getMaintainerId().contains(e.getId())).collect(Collectors.toList()); + if(ObjectUtil.isNotEmpty(userList)){ + List collect = userList.stream().map(SysUser::getRealname).collect(Collectors.toList()); + record.setMaintainerName(StringUtils.join(collect,",")); + } + } + //权限 + if(administrator + || currentUser.getUsername().equals(record.getCreateBy()) + || (StringUtils.isNotBlank(record.getMaintainerId()) && record.getMaintainerId().contains(currentUser.getUsername()))){ + record.setAuthorityFlag(FlagEnum.ZERO.getValue()); + }else{ + record.setAuthorityFlag(FlagEnum.ONE.getValue()); + } + } + } + } + } + private IPage regionSort(ParamsTemplateEO paramsTemplateEO, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, QueryWrapper queryWrapper, IPage pageList) { if(StringUtils.isNotBlank(paramsTemplateEO.getOrderByField()) && "region".equals(paramsTemplateEO.getOrderByField())){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java index c59b80358..ce0acae4f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsTemplateEO.java @@ -100,4 +100,17 @@ public class ParamsTemplateEO implements Serializable { @TableField(exist = false) private String orderByField; // 字段 + + @ApiModelProperty(value = "维护人") + private java.lang.String maintainerId; + + @TableField(exist = false) + @ApiModelProperty(value = "维护人回显") + private java.lang.String maintainerName; + + @TableField(exist = false) + @ApiModelProperty(value = "权限标识-->有权限0，没有权限1") + private java.lang.String authorityFlag; + + }