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 96bd5d0d..5b0f1880 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java @@ -31,13 +31,6 @@ public interface AuthAdminDao extends BaseMapperPlus selectUnallocatedList(FilterAuthUserRequest filterAuthUserRequest); - List findByCustomerId(@Param("CustomerId") String customerId); - boolean updateUser(UpdateUserRequset updateUserRequset); } diff --git a/src/main/java/com/glxp/api/dao/auth/AuthCheckDao.java b/src/main/java/com/glxp/api/dao/auth/AuthCheckDao.java index 93b73c3c..dbec764e 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthCheckDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthCheckDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.AuthCheckEntity; import com.glxp.api.req.auth.FilterAuthCheckRequest; import org.apache.ibatis.annotations.Mapper; @@ -7,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface AuthCheckDao { +public interface AuthCheckDao extends BaseMapperPlus { List filterDevices(FilterAuthCheckRequest filterAuthCheckRequest); diff --git a/src/main/java/com/glxp/api/dao/auth/AuthCompanyMapper.java b/src/main/java/com/glxp/api/dao/auth/AuthCompanyMapper.java index 1f9cf3c1..100fee5b 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthCompanyMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthCompanyMapper.java @@ -1,9 +1,10 @@ package com.glxp.api.dao.auth; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.AuthCompany; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface AuthCompanyMapper extends BaseMapper { +public interface AuthCompanyMapper extends BaseMapperPlus { } diff --git a/src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java index a18dd9ac..1bbba2da 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.AuthRole; import com.glxp.api.entity.auth.AuthRoleAdmin; import org.apache.ibatis.annotations.Mapper; @@ -8,7 +9,7 @@ import java.util.List; @Mapper -public interface AuthRoleAdminDao { +public interface AuthRoleAdminDao extends BaseMapperPlus { /** * 根据 adminId 查询 @@ -18,22 +19,6 @@ public interface AuthRoleAdminDao { */ List listByAdminId(Long adminId); - /** - * 根据 多个 adminId 查询 - * - * @param adminIds 传入的 adminIds - * @return - */ - List listByAdminIdIn(List adminIds); - - /** - * 根据 role_id 查询 admin_id - * - * @param roleId 传入的 roleId - * @return - */ - List listByRoleId(Long roleId); - /** * 批量插入 * @@ -43,16 +28,6 @@ public interface AuthRoleAdminDao { int insertAuthRoleAdminAll(List authRoleAdminList); - /** - * 根据 adminId 删除 - * - * @param adminId - * @return - */ - boolean deleteByAdminId(Long adminId); - boolean updateAuthRoleAdmin(AuthRoleAdmin authRoleAdmin); - - List listAdminRole(Long adminId); } diff --git a/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java b/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java index 48b5bd1a..2e1d0f13 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.AuthRole; import com.glxp.api.req.auth.AuthRoleQueryRequest; import org.apache.ibatis.annotations.Mapper; @@ -8,42 +9,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface AuthRoleDao { - - /** - * 后台管理业务查询列表 - * @return 列表 - */ - List listAdminPage(AuthRoleQueryRequest authRoleQueryRequest); - - /** - * 返回id,name 字段的列表 - * @return 列表 - */ - List listAuthAdminRolePage(@Param("status") Integer status); +public interface AuthRoleDao extends BaseMapperPlus { List listCustomerRoles(@Param("isCustomer") Integer isCustomer); List getCustomerRoles(@Param("isCustomer") Integer isCustomer); - List listAuthRoles2(); - - AuthRole findByName(String name); - - /** - * 插入 - * @param authAdmin - * @return - */ - boolean insertAuthRole(AuthRole authAdmin); - - /** - * 更新 - * @param authAdmin - * @return - */ - boolean updateAuthRole(AuthRole authAdmin); - /** * 删除 * @param id diff --git a/src/main/java/com/glxp/api/dao/auth/CustomerInfoDao.java b/src/main/java/com/glxp/api/dao/auth/CustomerInfoDao.java index a7b0015b..ec1bb1f8 100644 --- a/src/main/java/com/glxp/api/dao/auth/CustomerInfoDao.java +++ b/src/main/java/com/glxp/api/dao/auth/CustomerInfoDao.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.CustomerDetailEntity; import com.glxp.api.entity.auth.CustomerInfoEntity; import com.glxp.api.req.auth.CustomerInfoFilterRequest; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface CustomerInfoDao { +public interface CustomerInfoDao extends BaseMapperPlus{ List filterCustomerInfo(CustomerInfoFilterRequest customerInfoFilterRequest); @@ -24,9 +25,6 @@ public interface CustomerInfoDao { CustomerDetailEntity selectDetail(String customerId); - - CustomerInfoEntity isExitRoleId(String roleId); - List selectCustomerIdListByUserFlag(Integer userFlag); List getList(CustomerInfoEntity customerInfoEntity); 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 0c79fc24..615e994d 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptDao.java @@ -57,7 +57,6 @@ public interface DeptDao extends BaseMapperPlus boolean updateTime(@Param("code") String code, @Param("updateTime") Date updateTime); - DeptEntity selectByThirdSys(@Param("thirdIdSys") String thirdIdSys, @Param("thirdId") String thirdId); /** * 根据code查询* diff --git a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java index 0808e930..8285ad24 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java @@ -12,8 +12,6 @@ import java.util.List; @Mapper public interface DeptUserDao extends BaseMapperPlus { - - List selectDeptUser(FilterDeptUserReqeust filterDeptUserReqeust); List selectJoinDeptUser(FilterDeptUserReqeust filterDeptUserReqeust); @@ -26,8 +24,6 @@ public interface DeptUserDao extends BaseMapperPlus ids); - int insertBatch(List list); int replaceBatch(@Param("list")List list); diff --git a/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java b/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java index 44fbf78c..78e8d57d 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java @@ -19,8 +19,6 @@ public interface InvBusUserDao extends BaseMapperPlus filterUnSelect(FilterInvBusUserRequest filterInvBusUserRequest); - List filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); - boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity); boolean updateInvBusUser(InvBusUserEntity InvBusUserEntity); @@ -29,6 +27,5 @@ public interface InvBusUserDao extends BaseMapperPlus selectedCodes); } 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 29cc68c1..599d0bbd 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java @@ -54,13 +54,6 @@ public interface InvSpaceDao extends BaseMapperPlus selectByWarehouseCode(String warehouseCode); - /** - * 查询此货位是否存在,判断名称和编码 - * - * @param invSpace - * @return - */ - List selectExist(InvSpace invSpace); /** 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 51ff7d66..9ae8b1c4 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java @@ -26,7 +26,6 @@ public interface InvWarehouseDao extends BaseMapperPlus selectLowWarehouseAll(@Param("pcode") String pCode); } 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 d6842d4a..135eda06 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java @@ -1,15 +1,15 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.SysCustomConfigEntity; import com.glxp.api.req.auth.SysCustomConfigRequest; -import com.glxp.api.req.system.DeleteRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface SysCustomConfigDao { +public interface SysCustomConfigDao extends BaseMapperPlus { List filterSysCustomConfig(SysCustomConfigRequest 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 82bd73ce..c1a066dc 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.SysCustomConfigDetailEntity; import com.glxp.api.req.auth.SysCustomConfigDetailRequest; import com.glxp.api.req.system.DeleteRequest; @@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface SysCustomConfigDetailDao { +public interface SysCustomConfigDetailDao extends BaseMapperPlus { List filterSysCustomConfigDetail(SysCustomConfigDetailRequest 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 e5b2f5f5..01c617e8 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysDictDataMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/SysDictDataMapper.java @@ -1,5 +1,6 @@ package com.glxp.api.dao.auth; +import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.SysDictData; import com.glxp.api.req.auth.SysDictDataRequest; import org.apache.ibatis.annotations.Mapper; @@ -11,7 +12,7 @@ import java.util.List; * 字典表 数据层 */ @Mapper -public interface SysDictDataMapper { +public interface SysDictDataMapper extends BaseMapperPlus { List selectDictDataList(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 7b4bdc67..154ca84a 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysMenuDao.java @@ -24,13 +24,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 f7c46b09..0621e2fd 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysRoleMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/SysRoleMapper.java @@ -9,8 +9,6 @@ import java.util.List; @Mapper public interface SysRoleMapper { - - int insert(SysRole sysRole); int updateById(SysRole sysRole); diff --git a/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java b/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java index 58eba9a3..5146c1ff 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/SysUserRoleMapper.java @@ -17,8 +17,6 @@ public interface SysUserRoleMapper { int insert(SysUserRole sysUserRole); - SysUserRole selectByAuthId(Long id); - List selectUserRoleList(Long roleId); } 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 d9af8aed..79f328f1 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseUserDao.java @@ -20,35 +20,14 @@ public interface WarehouseUserDao extends BaseMapperPlus selectListByCode(@Param("code") String code); List selectListkey(FilterInvLinkDataRequest filterInvLinkDataRequest); - List selectNotSelectUserid(@Param("userIds") List userIds); List selectCodeByUser(@Param("userId") String userId); void deleteByCode(@Param("code") String code); - /** - * 更新此仓库下的主管状态 - * - * @param code - * @param isDirector - */ - void updateDirector(@Param("code") String code, @Param("isDirector") int isDirector); - - /** - * 根据id更新主管状态 - * - * @param id - * @param isDirector - */ - void updateDirectorById(@Param("id") Long id, @Param("isDirector") int isDirector); /** * 根据分仓编码统计绑定的用户数 diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index 43d38220..27d79b14 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -70,14 +70,6 @@ LIMIT 1 - INSERT INTO auth_user( id, userName, passWord, lastLoginIp, lastLoginTime, createTime, userFlag diff --git a/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml index 4ae0e5ed..2cb08b09 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml @@ -9,26 +9,6 @@ where user_id = #{adminId} - - - - - - INSERT INTO auth_user_role (user_id,role_id) @@ -40,11 +20,6 @@ - - delete from auth_user_role where user_id = #{adminId} - - - UPDATE auth_user_role diff --git a/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml b/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml index ff79cce5..6f902c9b 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml @@ -6,39 +6,6 @@ - - - - - - - - - - - - INSERT INTO auth_role(`name`,pid,`status`,`remark`,`listorder`,create_time,update_time,isCustomer) - values - ( - #{name}, - - - #{pid}, - - - 0, - - - #{status}, - - - #{remark}, - - - '', - - - - - #{listorder}, - - - 999, - - - #{createTime}, - #{updateTime}, - #{isCustomer} - ) - - - - UPDATE auth_role - - `name`=#{name}, - pid=#{pid}, - `status`=#{status}, - remark=#{remark}, - `listorder`=#{listorder}, - update_time=#{updateTime}, - isCustomer=#{isCustomer}, - - WHERE id=#{id} - - delete from auth_role diff --git a/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml b/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml index c6e3c7cd..1fd7917b 100644 --- a/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml +++ b/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml @@ -121,14 +121,6 @@ - - select * - from auth_dept - where ${thirdIdSys} = #{thirdId} - - - - - - replace @@ -92,21 +71,6 @@ WHERE subInvCode = #{subInvCode} and userId = #{userId} - - DELETE - FROM auth_user_bustype - - - AND subInvCode = #{subInvCode} - - - and scAction in - - #{item} - - - - UPDATE auth_user_bustype diff --git a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml index 5b921429..9160c7c4 100644 --- a/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml @@ -187,25 +187,6 @@ where invWarehouseCode = #{warehouseCode} - - - - - DELETE FROM auth_warehouse @@ -157,13 +154,6 @@ and spUse = 1 - - - DELETE - FROM auth_warehouse - WHERE parentId = #{code} - - UPDATE auth_warehouse @@ -436,18 +426,4 @@ - diff --git a/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml b/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml index 39263779..f05e0465 100644 --- a/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml +++ b/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml @@ -225,13 +225,6 @@ order by m.parent_id, m.order_num - - - - select - - from auth_warehouse_user - where id = #{id,jdbcType=INTEGER} - - delete @@ -84,62 +65,7 @@ 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}, - - - -