From fe9b1da02a0becca7171d3ff253ce99616ac6a9e Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 6 Mar 2025 11:20:33 +0800 Subject: [PATCH] =?UTF-8?q?3/6=20auth=20=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/dao/auth/AuthAdminDao.java | 1 - .../com/glxp/api/dao/auth/AuthLicenseDao.java | 1 - .../java/com/glxp/api/dao/auth/DeptDao.java | 1 - .../com/glxp/api/dao/auth/InvSpaceDao.java | 30 +-- .../glxp/api/dao/auth/InvWarehouseDao.java | 2 - .../glxp/api/dao/auth/SysCustomConfigDao.java | 1 - .../dao/auth/SysCustomConfigDetailDao.java | 2 - .../glxp/api/dao/auth/SysDictDataMapper.java | 2 - .../com/glxp/api/dao/auth/SysMenuDao.java | 9 - .../com/glxp/api/dao/auth/SysRoleMapper.java | 13 +- .../dao/auth/WarehouseBussinessTypeDao.java | 17 -- .../glxp/api/dao/auth/WarehouseUserDao.java | 15 -- .../service/auth/impl/SysRoleServiceImpl.java | 2 +- .../mybatis/mapper/auth/AuthAdminDao.xml | 19 -- .../mybatis/mapper/auth/AuthLicenseDao.xml | 7 +- .../resources/mybatis/mapper/auth/DeptDao.xml | 5 - .../mybatis/mapper/auth/InvSpaceDao.xml | 183 ---------------- .../mybatis/mapper/auth/InvWarehouseDao.xml | 23 -- .../mybatis/mapper/auth/SysMenuDao.xml | 6 - .../mybatis/mapper/auth/SysRoleMapper.xml | 19 -- .../mapper/auth/WarehouseBussinessTypeDao.xml | 204 ------------------ .../mybatis/mapper/auth/WarehouseUserDao.xml | 192 ----------------- 22 files changed, 5 insertions(+), 749 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java index 7a2f27a36..c26f286f5 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java @@ -20,7 +20,6 @@ public interface AuthAdminDao extends BaseMapperPlus listAdminPage(FilterAuthUserRequest filterAuthUserRequest); - boolean replaceAuthAdmin(AuthAdmin authAdmin); /** * 根据id查询 diff --git a/src/main/java/com/glxp/api/dao/auth/AuthLicenseDao.java b/src/main/java/com/glxp/api/dao/auth/AuthLicenseDao.java index c93de622f..dce43bda7 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthLicenseDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthLicenseDao.java @@ -15,7 +15,6 @@ public interface AuthLicenseDao { int remove(String appid); - int romveByCustomerId(String customerId); /** * 根据名称查询授权码和秘钥 diff --git a/src/main/java/com/glxp/api/dao/auth/DeptDao.java b/src/main/java/com/glxp/api/dao/auth/DeptDao.java index 748cbf303..5ce6b2216 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptDao.java @@ -56,7 +56,6 @@ public interface DeptDao extends BaseMapperPlus List selectByPcode(@Param("pcode") String pcode); - DeptEntity selectByThirdSys(@Param("thirdIdSys") String thirdIdSys, @Param("thirdId") String thirdId); /** * 根据code查询* diff --git a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java index 8615c95b3..d485a28d9 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java @@ -15,16 +15,10 @@ public interface InvSpaceDao extends BaseMapperPlus list); - int batchInsert(@Param("list") List list); /** * 查询货位列表 @@ -34,13 +28,6 @@ public interface InvSpaceDao extends BaseMapperPlus filterList(FilterInvSpaceRequest filterInvSpaceRequest); - /** - * 查询货位数据 - * - * @param invSpace - * @return - */ - List selectAllList(InvSpace invSpace); /** * 查询货位编码和名称 @@ -68,23 +55,8 @@ public interface InvSpaceDao extends BaseMapperPlus selectByWarehouseCode(String warehouseCode); - /** - * 查询此货位是否存在，判断名称和编码 - * - * @param invSpace - * @return - */ - List selectExist(InvSpace invSpace); - /** - * 根据仓库，分库，货位编码查询货位信息 - * - * @param invStorageCode - * @param invWarehouseCode - * @param inSpaceCode - * @return - */ - List selectByInvCode(@Param("invStorageCode") String invStorageCode, @Param("invWarehouseCode") String invWarehouseCode, @Param("invSpaceCode") String invSpaceCode); + /** * 查询此仓库下，货位名称是否重复 diff --git a/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java index 372b57795..6d1ee199d 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java @@ -23,8 +23,6 @@ public interface InvWarehouseDao extends BaseMapperPlus invSubWarehouseEntities); boolean deleteByParentCode(@Param("code") String code); diff --git a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java index 9b222518c..d6842d4ab 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java @@ -21,6 +21,5 @@ public interface SysCustomConfigDao { SysCustomConfigEntity selectById(Long id); - boolean deleteContact(DeleteRequest request); } diff --git a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java index ec55c3848..82bd73cee 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java @@ -23,6 +23,4 @@ public interface SysCustomConfigDetailDao { SysCustomConfigDetailEntity selectById(Long id); - boolean deleteContact(DeleteRequest request); - } diff --git a/src/main/java/com/glxp/api/dao/auth/SysDictDataMapper.java b/src/main/java/com/glxp/api/dao/auth/SysDictDataMapper.java index 9b38d5236..6fd030d50 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysDictDataMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/SysDictDataMapper.java @@ -23,8 +23,6 @@ public interface SysDictDataMapper { int updateById(SysDictData sysDictData); - int updateByType(SysDictData sysDictData); - SysDictData exists(SysDictDataRequest sysDictDataRequest); diff --git a/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java b/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java index 48bf49aff..ce50ff796 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java @@ -10,10 +10,7 @@ import java.util.List; @Mapper public interface SysMenuDao { - SysMenu selectById(Long id); - - int insert(SysMenu menu); int updateById(SysMenu menu); @@ -24,12 +21,6 @@ public interface SysMenuDao { List selectMenuList(FilterMenuRequest filterMenuRequest); - /** - * 根据用户所有权限 - * - * @return 权限列表 - */ - List selectMenuPerms(); /** * 根据用户查询系统菜单列表 diff --git a/src/main/java/com/glxp/api/dao/auth/SysRoleMapper.java b/src/main/java/com/glxp/api/dao/auth/SysRoleMapper.java index ae5b18f4f..242449f43 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysRoleMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/SysRoleMapper.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.SysRole; import com.glxp.api.req.auth.FilterRoleRequest; import org.apache.ibatis.annotations.Mapper; @@ -8,15 +9,13 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface SysRoleMapper { +public interface SysRoleMapper extends BaseMapperPlus { int insert(SysRole sysRole); int updateById(SysRole sysRole); - int delete(Long id); - SysRole selectById(Long id); int deleteBatchIds(@Param("ids") List ids); @@ -46,12 +45,4 @@ public interface SysRoleMapper { */ List selectRoleListByUserId(Long userId); - /** - * 根据用户ID查询角色 - * - * @param userName 用户名 - * @return 角色列表 - */ - List selectRolesByUserName(String userName); - } diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java index e33347276..3a125db56 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java @@ -14,23 +14,6 @@ public interface WarehouseBussinessTypeDao extends BaseMapperPlus list); - - int updateBatchSelective(List list); - - List selectListByCode(@Param("code") String code); List selectListByCodeEnable(FilterInvBusUserRequest filterInvBusUserRequest); diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java index 109b703e8..599cb6909 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -18,23 +18,8 @@ public interface WarehouseUserDao extends BaseMapperPlus list); - - int updateBatchSelective(List list); - - List selectListByCode(@Param("code") String code); List selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest); diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java index 067b75985..d4071c6c5 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java @@ -312,7 +312,7 @@ public class SysRoleServiceImpl implements ISysRoleService { // 删除角色与菜单关联 roleMenuMapper.deleteById(roleId); // 删除角色与部门关联 - return sysRoleMapper.delete(roleId); + return sysRoleMapper.deleteById(roleId); } /** diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index 52a57de40..3b9fefb21 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -120,25 +120,6 @@ #{locInvCode}, #{comments}, #{lastUpdatePwdTime}) - - replace - INTO auth_user(id, userName, passWord, lastLoginIp, - lastLoginTime, createTime, userFlag, lastModifyTime, employeeName, CustomerId, - locDeptCode, locInvCode, comments, lastUpdatePwdTime) - values (#{id}, - #{userName}, - #{passWord}, - #{lastLoginIp}, - #{lastLoginTime}, - #{createTime}, - #{userFlag,jdbcType=INTEGER}, - #{lastModifyTime}, - #{employeeName}, - #{CustomerId}, - #{locDeptCode}, - #{locInvCode}, - #{comments}, #{lastUpdatePwdTime}) - diff --git a/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml b/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml index f9160c537..562a7be11 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthLicenseDao.xml @@ -33,11 +33,6 @@ where id = #{id} - - delete - from auth_license - where customerId = #{customerId} - - @@ -282,27 +154,6 @@ - - - - - replace - INTO auth_warehouse - ( id, code, `name`, parentId, remark, defaultInv, advanceType, spUse, parentCode - , thirdId, thirdId1, thirdId2, thirdId3, thirdId4, updateTime) - values (#{id}, - #{code}, - #{name}, - #{parentId}, - #{remark}, - #{defaultInv}, - #{advanceType}, - #{spUse}, - #{parentCode}, - #{thirdId}, - #{thirdId1}, - #{thirdId2}, - #{thirdId3}, - #{thirdId4}, #{updateTime}) - - - DELETE FROM auth_warehouse diff --git a/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml b/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml index 527cf5927..c8af554ec 100644 --- a/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml +++ b/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml @@ -193,12 +193,6 @@ order by m.parent_id, m.order_num - - diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml index 7e6637271..093e5d6a8 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml @@ -13,13 +13,6 @@ id, code, `action`, `name` - delete @@ -27,194 +20,6 @@ where id = #{id,jdbcType=INTEGER} - - - insert into auth_warehouse_bustype - - - code, - - - `action`, - - - `name`, - - - - - #{code,jdbcType=VARCHAR}, - - - #{action,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - - - - update auth_warehouse_bustype - - - code = #{code,jdbcType=VARCHAR}, - - - `action` = #{action,jdbcType=VARCHAR}, - - - `name` = #{name,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - - update auth_warehouse_bustype - set code = #{code,jdbcType=VARCHAR}, - `action` = #{action,jdbcType=VARCHAR}, - `name` = #{name,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - - - - update auth_warehouse_bustype - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.action,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.name,jdbcType=VARCHAR} - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - update auth_warehouse_bustype - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.action,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.name,jdbcType=VARCHAR} - - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - insert into auth_warehouse_bustype - - - id, - - code, - `action`, - `name`, - - values - - - #{id,jdbcType=INTEGER}, - - #{code,jdbcType=VARCHAR}, - #{action,jdbcType=VARCHAR}, - #{name,jdbcType=VARCHAR}, - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - code = #{code,jdbcType=VARCHAR}, - `action` = #{action,jdbcType=VARCHAR}, - `name` = #{name,jdbcType=VARCHAR}, - - - - - insert into auth_warehouse_bustype - - - id, - - - code, - - - `action`, - - - `name`, - - - values - - - #{id,jdbcType=INTEGER}, - - - #{code,jdbcType=VARCHAR}, - - - #{action,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - - code = #{code,jdbcType=VARCHAR}, - - - `action` = #{action,jdbcType=VARCHAR}, - - - `name` = #{name,jdbcType=VARCHAR}, - - - - diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml index 38f7fa303..d5849b334 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml @@ -51,198 +51,6 @@ insert into auth_warehouse_user (code, userId, userName, isDirector) values (#{code,jdbcType=VARCHAR}, #{userid,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{isDirector}) - - - insert into auth_warehouse_user - - - code, - - - userId, - - - userName, - - isDirector - - - - #{code,jdbcType=VARCHAR}, - - - #{userid,jdbcType=BIGINT}, - - - #{username,jdbcType=VARCHAR}, - - #{isDirector} - - - - - update auth_warehouse_user - - - code = #{code,jdbcType=VARCHAR}, - - - userId = #{userid,jdbcType=BIGINT}, - - - userName = #{username,jdbcType=VARCHAR}, - - - isDirector = #{isDirector} - where id = #{id,jdbcType=INTEGER} - - - - update auth_warehouse_user - set code = #{code,jdbcType=VARCHAR}, - userId = #{userid,jdbcType=BIGINT}, - userName = #{username,jdbcType=VARCHAR} isDirector = #{isDirector} - where id = #{id,jdbcType=INTEGER} - - - - update auth_warehouse_user - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.userid,jdbcType=BIGINT} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.username,jdbcType=VARCHAR} - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - update auth_warehouse_user - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.userid,jdbcType=BIGINT} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.username,jdbcType=VARCHAR} - - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - insert into auth_warehouse_user - - - id, - - code, - userId, - userName, - isDirector, - - values - - - #{id,jdbcType=INTEGER}, - - #{code,jdbcType=VARCHAR}, - #{userid,jdbcType=BIGINT}, - #{username,jdbcType=VARCHAR}, - #{isDirector} - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - code = #{code,jdbcType=VARCHAR}, - userId = #{userid,jdbcType=BIGINT}, - userName = #{username,jdbcType=VARCHAR}, - - - - - insert into auth_warehouse_user - - - id, - - - code, - - - userId, - - - userName, - - - values - - - #{id,jdbcType=INTEGER}, - - - #{code,jdbcType=VARCHAR}, - - - #{userid,jdbcType=BIGINT}, - - - #{username,jdbcType=VARCHAR}, - - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - - code = #{code,jdbcType=VARCHAR}, - - - userId = #{userid,jdbcType=BIGINT}, - - - userName = #{username,jdbcType=VARCHAR}, - - -