From 2122a058463ad685c35defc1c3319b6c97845349 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Thu, 11 Jan 2024 10:52:37 +0800 Subject: [PATCH] 2024.1.11 --- .../spring/modules/base/dao/BaseMapper.java | 8 ++++ .../spring/modules/base/data/SiteVoData.java | 5 +++ .../modules/base/service/BaseService.java | 11 ++++++ .../base/service/Impl/BaseServiceImpl.java | 28 ++++++++++++++ .../sys/service/impl/SysUserServiceImpl.java | 37 ++++++++++++++++--- src/main/resources/mapper/base/BaseMapper.xml | 19 +++++++++- 6 files changed, 101 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/spring/modules/base/dao/BaseMapper.java b/src/main/java/com/spring/modules/base/dao/BaseMapper.java index 1c1157e2..55ecf44a 100644 --- a/src/main/java/com/spring/modules/base/dao/BaseMapper.java +++ b/src/main/java/com/spring/modules/base/dao/BaseMapper.java @@ -404,4 +404,12 @@ public interface BaseMapper { List selectRoleList(RoleData data); List getRoleList(RoleData data); + + void deleteAccessFieldWithUsername(PlmFieldListData fieldListData); + + void deleteAccessBuWithUsername(BuData buData); + + void deleteAccessProjectWithUsername(PlmProjectInfoData projectInfoData); + + void deleteAccessSiteWithUsername(SiteVoData siteVoData); } diff --git a/src/main/java/com/spring/modules/base/data/SiteVoData.java b/src/main/java/com/spring/modules/base/data/SiteVoData.java index e1efc093..66a518da 100644 --- a/src/main/java/com/spring/modules/base/data/SiteVoData.java +++ b/src/main/java/com/spring/modules/base/data/SiteVoData.java @@ -1,5 +1,6 @@ package com.spring.modules.base.data; +import com.baomidou.mybatisplus.annotation.TableField; import com.spring.modules.base.entity.SiteData; import lombok.Data; @@ -13,6 +14,10 @@ import lombok.Data; @Data public class SiteVoData extends SiteData { + @TableField("username") private String username; + @TableField("UserID") + private String userID; + } diff --git a/src/main/java/com/spring/modules/base/service/BaseService.java b/src/main/java/com/spring/modules/base/service/BaseService.java index b8171736..c398e43d 100644 --- a/src/main/java/com/spring/modules/base/service/BaseService.java +++ b/src/main/java/com/spring/modules/base/service/BaseService.java @@ -309,4 +309,15 @@ public interface BaseService { List selectRoleList(RoleData data); List getRoleList(RoleData data); + + void deleteAccessRoleWithUsername(RoleData roleData); + + void deleteAccessProjectWithUsername(PlmProjectInfoData projectInfoData); + + void deleteAccessSiteWithUsername(SiteVoData siteVoData); + + void deleteAccessFieldWithUsername(PlmFieldListData fieldListData); + + + void deleteAccessBuWithUsername(BuData buData); } diff --git a/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java index e66ced90..0897351b 100644 --- a/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java +++ b/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java @@ -17,6 +17,7 @@ import com.spring.modules.project.data.PlmUserRoleData; import com.spring.modules.project.entity.PlmProjectInfo; import com.spring.modules.sys.service.SysMsgService; +import com.spring.modules.sys.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,6 +33,8 @@ public class BaseServiceImpl implements BaseService { @Autowired private BaseMapper baseMapper; + @Autowired + private SysUserService sysUserService; @Autowired private SysMsgService sysMsgService; @@ -139,6 +142,31 @@ public class BaseServiceImpl implements BaseService { return baseMapper.getRoleList(data); } + @Override + public void deleteAccessRoleWithUsername(RoleData roleData) { + baseMapper.deleteAccessRoleWithUsername(roleData); + } + + @Override + public void deleteAccessBuWithUsername(BuData buData) { + baseMapper.deleteAccessBuWithUsername(buData); + } + + @Override + public void deleteAccessProjectWithUsername(PlmProjectInfoData projectInfoData) { + baseMapper.deleteAccessProjectWithUsername(projectInfoData); + } + + @Override + public void deleteAccessSiteWithUsername(SiteVoData siteVoData) { + baseMapper.deleteAccessSiteWithUsername(siteVoData); + } + + @Override + public void deleteAccessFieldWithUsername(PlmFieldListData fieldListData) { + baseMapper.deleteAccessFieldWithUsername(fieldListData); + } + //=============生产订单类型=================== @Override diff --git a/src/main/java/com/spring/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/spring/modules/sys/service/impl/SysUserServiceImpl.java index bd2e6242..6ddd3c5c 100644 --- a/src/main/java/com/spring/modules/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/spring/modules/sys/service/impl/SysUserServiceImpl.java @@ -11,9 +11,12 @@ import com.spring.common.exception.XJException; import com.spring.common.utils.Constant; import com.spring.common.utils.PageUtils; import com.spring.common.utils.Query; -import com.spring.modules.base.data.SysUserEntityData; +import com.spring.modules.base.data.*; import com.spring.modules.base.entity.AccessSiteData; +import com.spring.modules.base.entity.PlmFieldFunctionList; +import com.spring.modules.base.service.BaseService; import com.spring.modules.factory.dao.AccessSiteMapper; +import com.spring.modules.project.data.PlmProjectInfoData; import com.spring.modules.sys.service.*; import com.spring.modules.sys.dao.SysUserDao; import com.spring.modules.sys.entity.SysUserEntity; @@ -24,17 +27,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; - +import java.util.*; @Service("sysUserService") public class SysUserServiceImpl extends ServiceImpl implements SysUserService { @Autowired private SysUserRoleService sysUserRoleService; + + @Autowired + private BaseService baseService; + @Autowired private SysRoleService sysRoleService; @@ -129,8 +132,30 @@ public class SysUserServiceImpl extends ServiceImpl i @Override @Transactional public void deleteBatch(Long[] userId) { + SysUserEntity sysUserEntity = baseMapper.selectById(userId[0]); + String username = sysUserEntity.getUsername(); + String site = sysUserEntity.getSite(); sysUserDao.deleteBatchIds(Arrays.asList(userId)); userJobService.deleteUserJobInfo(userId); + RoleData roleData = new RoleData(); + roleData.setSite(site); + roleData.setUsername(username); + baseService.deleteAccessRoleWithUsername(roleData); + PlmFieldListData fieldListData = new PlmFieldListData(); + fieldListData.setUsername(username); + baseService.deleteAccessFieldWithUsername(fieldListData); + BuData buData = new BuData(); + buData.setUsername(username); + buData.setSite(site); + baseService.deleteAccessBuWithUsername(buData); + PlmProjectInfoData projectInfoData = new PlmProjectInfoData(); + projectInfoData.setUsername(username); + projectInfoData.setSite(site); + baseService.deleteAccessProjectWithUsername(projectInfoData); + SiteVoData siteVoData = new SiteVoData(); + siteVoData.setUsername(username); + siteVoData.setSiteID(site); + baseService.deleteAccessSiteWithUsername(siteVoData); } @Override diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml index f87bb85d..2f66d9b4 100644 --- a/src/main/resources/mapper/base/BaseMapper.xml +++ b/src/main/resources/mapper/base/BaseMapper.xml @@ -357,6 +357,23 @@ delete from AccessField where field_id in (select field_id from plm_field_list where function_id=#{functionId}) and username=#{username} - delete from AccessRole where site=#{site} and username=#{username} + delete from AccessRole + where site=#{site} and username=#{username} + + + delete from AccessField + where username=#{username} + + + delete from AccessBu + where username=#{username} and site=#{site} + + + delete from AccessProject + where username=#{username} and site=#{site} + + + delete from AccessSite + where UserID=#{username} \ No newline at end of file