From ea4d8bc82f85413e46c1be258b1d05ec9fecc9b4 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Tue, 15 Nov 2022 16:21:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7viewer=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=97=B6=E6=B7=BB=E5=8A=A0=E5=93=81=E7=89=8C=E8=B7=9F=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E9=A2=86=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectUserBrandController.java | 29 ++++++++++++ .../ProjectUserDutyTerritoryController.java | 29 ++++++++++++ .../system/controller/SysUserController.java | 23 +++++++++- .../system}/entity/ProjectUserBrand.java | 2 +- .../entity/ProjectUserDutyTerritory.java | 2 +- .../modules/system/enums/ProjectRoleEnum.java | 1 + .../mapper/ProjectUserBrandMapper.java | 7 +-- .../ProjectUserDutyTerritoryMapper.java | 7 +-- .../mapper/xml/ProjectUserBrandMapper.xml | 6 +-- .../xml/ProjectUserDutyTerritoryMapper.xml | 6 +-- .../service/IProjectUserBrandService.java | 4 +- .../IProjectUserDutyTerritoryService.java | 4 +- .../system/service/ISysUserService.java | 6 +-- .../impl/ProjectUserBrandServiceImpl.java | 10 ++-- .../ProjectUserDutyTerritoryServiceImpl.java | 10 ++-- .../service/impl/SysUserServiceImpl.java | 46 ++++++++++++++++++- .../ProjectUserBrandController.java | 29 ------------ .../ProjectUserDutyTerritoryController.java | 28 ----------- .../project/entity/ProjectLibraryBase.java | 3 ++ .../mapper/xml/ProjectLibraryBaseMapper.xml | 4 +- 20 files changed, 161 insertions(+), 95 deletions(-) create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ProjectUserBrandController.java create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ProjectUserDutyTerritoryController.java rename jero-boot/{jero-boot-modules/src/main/java/com/jero/modules/project => jero-boot-module-system/src/main/java/com/jero/modules/system}/entity/ProjectUserBrand.java (97%) rename jero-boot/{jero-boot-modules/src/main/java/com/jero/modules/project => jero-boot-module-system/src/main/java/com/jero/modules/system}/entity/ProjectUserDutyTerritory.java (97%) rename jero-boot/{jero-boot-modules/src/main/java/com/jero/modules/project => jero-boot-module-system/src/main/java/com/jero/modules/system}/mapper/ProjectUserBrandMapper.java (59%) rename jero-boot/{jero-boot-modules/src/main/java/com/jero/modules/project => jero-boot-module-system/src/main/java/com/jero/modules/system}/mapper/ProjectUserDutyTerritoryMapper.java (60%) rename jero-boot/{jero-boot-modules/src/main/java/com/jero/modules/project => jero-boot-module-system/src/main/java/com/jero/modules/system}/mapper/xml/ProjectUserBrandMapper.xml (75%) rename jero-boot/{jero-boot-modules/src/main/java/com/jero/modules/project => jero-boot-module-system/src/main/java/com/jero/modules/system}/mapper/xml/ProjectUserDutyTerritoryMapper.xml (72%) rename jero-boot/{jero-boot-modules/src/main/java/com/jero/modules/project => jero-boot-module-system/src/main/java/com/jero/modules/system}/service/IProjectUserBrandService.java (86%) rename jero-boot/{jero-boot-modules/src/main/java/com/jero/modules/project => jero-boot-module-system/src/main/java/com/jero/modules/system}/service/IProjectUserDutyTerritoryService.java (86%) rename jero-boot/{jero-boot-modules/src/main/java/com/jero/modules/project => jero-boot-module-system/src/main/java/com/jero/modules/system}/service/impl/ProjectUserBrandServiceImpl.java (79%) rename jero-boot/{jero-boot-modules/src/main/java/com/jero/modules/project => jero-boot-module-system/src/main/java/com/jero/modules/system}/service/impl/ProjectUserDutyTerritoryServiceImpl.java (78%) delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserBrandController.java delete mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserDutyTerritoryController.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ProjectUserBrandController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ProjectUserBrandController.java new file mode 100644 index 000000000..1ac0b4bcb --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ProjectUserBrandController.java @@ -0,0 +1,29 @@ +package com.jero.modules.system.controller; + + +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.system.entity.ProjectUserBrand; +import com.jero.modules.system.service.IProjectUserBrandService; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** +* @Description: 用户品牌表 +* @Author: jero-boot +* @Date: 2022-11-15 +* @Version: V1.0 +*/ +@Api(tags="用户品牌表") +@RestController +@RequestMapping("/project/projectUserBrand") +@Slf4j +public class ProjectUserBrandController extends JeroController { + @Autowired + private IProjectUserBrandService projectUserBrandService; + + +} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ProjectUserDutyTerritoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ProjectUserDutyTerritoryController.java new file mode 100644 index 000000000..deab14630 --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/ProjectUserDutyTerritoryController.java @@ -0,0 +1,29 @@ +package com.jero.modules.system.controller; + + +import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.system.entity.ProjectUserDutyTerritory; +import com.jero.modules.system.service.IProjectUserDutyTerritoryService; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** +* @Description: 用户责任领域 +* @Author: jero-boot +* @Date: 2022-11-15 +* @Version: V1.0 +*/ +@Api(tags="用户责任领域") +@RestController +@RequestMapping("/project/projectUserDutyTerritory") +@Slf4j +public class ProjectUserDutyTerritoryController extends JeroController { + @Autowired + private IProjectUserDutyTerritoryService projectUserDutyTerritoryService; + + +} diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index e4198f9f9..7b0d81c06 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -41,6 +41,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecgframework.poi.excel.ExcelImportUtil; @@ -111,6 +112,12 @@ public class SysUserController { @Resource private BaseCommonService baseCommonService; + @Autowired + private IProjectUserBrandService projectUserBrandService; + + @Autowired + private IProjectUserDutyTerritoryService projectUserDutyTerritoryService; + /** * 获取用户列表数据 * @@ -227,6 +234,11 @@ public class SysUserController { Result result = new Result(); try { String ids = jsonObject.getString("ids"); + String roles = jsonObject.getString("selectedroles"); + String dutyTerritories = jsonObject.getString("dutyTerritories"); + String brands = jsonObject.getString("brands"); + List projectUserBrandList = new ArrayList<>(); + List projectUserDutyTerritoryList = new ArrayList<>(); List idList = Arrays.asList(ids.split(",")); for (String id : idList) { SysUser sysUser = sysUserService.getById(id); @@ -238,11 +250,20 @@ public class SysUserController { user.setId(id); user.setUpdateTime(new Date()); - String roles = jsonObject.getString("selectedroles"); sysUserService.editUserWithRole(user, roles); + if (ObjectUtils.isNotEmpty(roles)) { + //如果角色包含viewer，设置责任领域权限和品牌权限 + sysUserService.setBrandAndDutyTerritory(roles, dutyTerritories, brands, projectUserBrandList, projectUserDutyTerritoryList, id); + } result.success("修改成功!"); } } + if (ObjectUtils.isNotEmpty(projectUserBrandList)) { + projectUserBrandService.saveBatch(projectUserBrandList); + } + if (ObjectUtils.isNotEmpty(projectUserDutyTerritoryList)) { + projectUserDutyTerritoryService.saveBatch(projectUserDutyTerritoryList); + } } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectUserBrand.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/ProjectUserBrand.java similarity index 97% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectUserBrand.java rename to jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/ProjectUserBrand.java index 946c70e9f..07ace8a88 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectUserBrand.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/ProjectUserBrand.java @@ -1,4 +1,4 @@ -package com.jero.modules.project.entity; +package com.jero.modules.system.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectUserDutyTerritory.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/ProjectUserDutyTerritory.java similarity index 97% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectUserDutyTerritory.java rename to jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/ProjectUserDutyTerritory.java index 2e4e0a244..029de2474 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectUserDutyTerritory.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/ProjectUserDutyTerritory.java @@ -1,4 +1,4 @@ -package com.jero.modules.project.entity; +package com.jero.modules.system.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java index 8f4b0c151..9c348e93c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java @@ -10,6 +10,7 @@ public enum ProjectRoleEnum { REGULATI_AND_HOMOLOGATION_ENGINEER("法规工程师/认证工程师","4","Regulatory Engineer/Certification Engineer"), MANAGER("领导角色","11","R&H Manager"), ADMIN("系统管理员","12","admin"), + VIEWER("Viewer","","Viewer"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectUserBrandMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/ProjectUserBrandMapper.java similarity index 59% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectUserBrandMapper.java rename to jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/ProjectUserBrandMapper.java index c0d9ca97b..ace0b9b79 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectUserBrandMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/ProjectUserBrandMapper.java @@ -1,9 +1,6 @@ -package com.jero.modules.project.mapper; +package com.jero.modules.system.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.project.entity.ProjectUserBrand; +import com.jero.modules.system.entity.ProjectUserBrand; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectUserDutyTerritoryMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/ProjectUserDutyTerritoryMapper.java similarity index 60% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectUserDutyTerritoryMapper.java rename to jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/ProjectUserDutyTerritoryMapper.java index 6f1c309fe..6ccf9460c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectUserDutyTerritoryMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/ProjectUserDutyTerritoryMapper.java @@ -1,9 +1,6 @@ -package com.jero.modules.project.mapper; +package com.jero.modules.system.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.project.entity.ProjectUserDutyTerritory; +import com.jero.modules.system.entity.ProjectUserDutyTerritory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectUserBrandMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/ProjectUserBrandMapper.xml similarity index 75% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectUserBrandMapper.xml rename to jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/ProjectUserBrandMapper.xml index da34ad5c8..1c31443f5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectUserBrandMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/ProjectUserBrandMapper.xml @@ -1,9 +1,9 @@ - - + + - \ No newline at end of file + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectUserDutyTerritoryMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/ProjectUserDutyTerritoryMapper.xml similarity index 72% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectUserDutyTerritoryMapper.xml rename to jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/ProjectUserDutyTerritoryMapper.xml index db9d37d76..37fa6dc00 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectUserDutyTerritoryMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/ProjectUserDutyTerritoryMapper.xml @@ -1,9 +1,9 @@ - - + + - \ No newline at end of file + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserBrandService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/IProjectUserBrandService.java similarity index 86% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserBrandService.java rename to jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/IProjectUserBrandService.java index 7919d93bf..a66b051ef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserBrandService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/IProjectUserBrandService.java @@ -1,6 +1,6 @@ -package com.jero.modules.project.service; +package com.jero.modules.system.service; -import com.jero.modules.project.entity.ProjectUserBrand; +import com.jero.modules.system.entity.ProjectUserBrand; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserDutyTerritoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/IProjectUserDutyTerritoryService.java similarity index 86% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserDutyTerritoryService.java rename to jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/IProjectUserDutyTerritoryService.java index fa2284ffc..e7b8f9e2f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserDutyTerritoryService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/IProjectUserDutyTerritoryService.java @@ -1,6 +1,6 @@ -package com.jero.modules.project.service; +package com.jero.modules.system.service; -import com.jero.modules.project.entity.ProjectUserDutyTerritory; +import com.jero.modules.system.entity.ProjectUserDutyTerritory; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index 250953aaa..311c4c00c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -8,9 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.SysUserCacheInfo; -import com.jero.modules.system.entity.PPEmployee; -import com.jero.modules.system.entity.SysRole; -import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.entity.*; import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.model.SysUserSysDepartModel; import org.springframework.transaction.annotation.Transactional; @@ -301,4 +299,6 @@ public interface ISysUserService extends IService { * @return */ boolean isRegulationOwner(LoginUser currentUser); + + void setBrandAndDutyTerritory(String roles, String dutyTerritories, String brands, List projectUserBrandList, List projectUserDutyTerritoryList, String userId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserBrandServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/ProjectUserBrandServiceImpl.java similarity index 79% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserBrandServiceImpl.java rename to jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/ProjectUserBrandServiceImpl.java index eb72c447c..8b70f71bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserBrandServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/ProjectUserBrandServiceImpl.java @@ -1,11 +1,11 @@ -package com.jero.modules.project.service.impl; +package com.jero.modules.system.service.impl; -import com.jero.modules.project.entity.ProjectUserBrand; -import com.jero.modules.project.mapper.ProjectUserBrandMapper; -import com.jero.modules.project.service.IProjectUserBrandService; +import com.jero.modules.system.entity.ProjectUserBrand; +import com.jero.modules.system.mapper.ProjectUserBrandMapper; +import com.jero.modules.system.service.IProjectUserBrandService; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Date; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserDutyTerritoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/ProjectUserDutyTerritoryServiceImpl.java similarity index 78% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserDutyTerritoryServiceImpl.java rename to jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/ProjectUserDutyTerritoryServiceImpl.java index 971918bb1..40bdf68b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserDutyTerritoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/ProjectUserDutyTerritoryServiceImpl.java @@ -1,11 +1,11 @@ -package com.jero.modules.project.service.impl; +package com.jero.modules.system.service.impl; -import com.jero.modules.project.entity.ProjectUserDutyTerritory; -import com.jero.modules.project.mapper.ProjectUserDutyTerritoryMapper; -import com.jero.modules.project.service.IProjectUserDutyTerritoryService; +import com.jero.modules.system.entity.ProjectUserDutyTerritory; +import com.jero.modules.system.mapper.ProjectUserDutyTerritoryMapper; +import com.jero.modules.system.service.IProjectUserDutyTerritoryService; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Date; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index a9db69c51..f5c2df47b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -17,14 +17,19 @@ import com.jero.common.util.oConvertUtils; import com.jero.modules.base.service.BaseCommonService; import com.jero.modules.system.entity.*; import com.jero.modules.system.enums.PPSyncEnum; +import com.jero.modules.system.enums.ProjectRoleEnum; import com.jero.modules.system.enums.RoleEnum; import com.jero.modules.system.mapper.*; import com.jero.modules.system.model.SysUserSysDepartModel; +import com.jero.modules.system.service.IProjectUserBrandService; +import com.jero.modules.system.service.IProjectUserDutyTerritoryService; +import com.jero.modules.system.service.ISysRoleService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.vo.SysUserDepVo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -67,8 +72,15 @@ public class SysUserServiceImpl extends ServiceImpl impl private SysDepartRoleMapper sysDepartRoleMapper; @Resource private BaseCommonService baseCommonService; + @Autowired + private ISysRoleService sysRoleService; + @Autowired + private IProjectUserBrandService projectUserBrandService; + @Autowired + private IProjectUserDutyTerritoryService projectUserDutyTerritoryService; - @Override + + @Override @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true) public Result resetPassword(String username, String oldpassword, String newpassword, String confirmpassword) { SysUser user = userMapper.getUserByName(username); @@ -698,4 +710,36 @@ public class SysUserServiceImpl extends ServiceImpl impl } return result; } + + @Override + public void setBrandAndDutyTerritory(String roles, String dutyTerritories, String brands, List projectUserBrandList, List projectUserDutyTerritoryList, String userId) { + List roleCodes = sysRoleService.listByIds(Arrays.asList(roles.split(","))).stream().map(SysRole::getRoleCode).collect(Collectors.toList()); + if (roleCodes.contains(ProjectRoleEnum.VIEWER.getCode())) { + //先删后加 + QueryWrapper brandDelWrapper = new QueryWrapper<>(); + brandDelWrapper.eq("user_id", userId); + projectUserBrandService.remove(brandDelWrapper); + + QueryWrapper dutyTerritoryDelWrapper = new QueryWrapper<>(); + dutyTerritoryDelWrapper.eq("user_id", userId); + projectUserDutyTerritoryService.remove(dutyTerritoryDelWrapper); + + if (ObjectUtils.isNotEmpty(dutyTerritories)) { + for (String dutyTerritory : dutyTerritories.split(",")) { + ProjectUserDutyTerritory projectUserDutyTerritory = new ProjectUserDutyTerritory(); + projectUserDutyTerritory.setUserId(userId); + projectUserDutyTerritory.setDutyTerritory(dutyTerritory); + projectUserDutyTerritoryList.add(projectUserDutyTerritory); + } + } + if (ObjectUtils.isNotEmpty(brands)) { + for (String brand : brands.split(",")) { + ProjectUserBrand projectUserBrand = new ProjectUserBrand(); + projectUserBrand.setUserId(userId); + projectUserBrand.setBrandType(brand); + projectUserBrandList.add(projectUserBrand); + } + } + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserBrandController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserBrandController.java deleted file mode 100644 index 16e120aba..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserBrandController.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.jero.modules.project.controller; - - -import com.jero.modules.project.entity.ProjectUserBrand; -import com.jero.modules.project.service.IProjectUserBrandService; - -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; - - - /** - * @Description: 用户品牌表 - * @Author: jero-boot - * @Date: 2022-11-15 - * @Version: V1.0 - */ -@Api(tags="用户品牌表") -@RestController -@RequestMapping("/project/projectUserBrand") -@Slf4j -public class ProjectUserBrandController extends JeroController { - @Autowired - private IProjectUserBrandService projectUserBrandService; - - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserDutyTerritoryController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserDutyTerritoryController.java deleted file mode 100644 index 5bc5ed374..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserDutyTerritoryController.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jero.modules.project.controller; - - -import com.jero.modules.project.entity.ProjectUserDutyTerritory; -import com.jero.modules.project.service.IProjectUserDutyTerritoryService; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; - - - /** - * @Description: 用户责任领域 - * @Author: jero-boot - * @Date: 2022-11-15 - * @Version: V1.0 - */ -@Api(tags="用户责任领域") -@RestController -@RequestMapping("/project/projectUserDutyTerritory") -@Slf4j -public class ProjectUserDutyTerritoryController extends JeroController { - @Autowired - private IProjectUserDutyTerritoryService projectUserDutyTerritoryService; - - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index d831a5896..7442085f7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -135,6 +135,9 @@ public class ProjectLibraryBase implements Comparable { @TableField(exist = false) private List children; + //品牌 + private String brand; + @Override public int compareTo(ProjectLibraryBase o) { return Integer.valueOf(this.projectVersion)-Integer.valueOf(o.projectVersion);//升序 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index f438c3f24..b504c0987 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -20,6 +20,7 @@ + @@ -49,7 +50,8 @@ plb.explanation, plb.software_version, plb.sort, - plb.flag + plb.flag, + plb.brand from project_library_base as plb left join project_name_info as pni on plb.project_name_id=pni.id left join sys_user as studiouser on plb.studio_engineer=studiouser.id