资产授权

muyu-source-server/src/main/java/com/muyu/source/controller/TableInfoController.java

@@ -9,6 +9,7 @@ import com.muyu.common.system.domain.LoginUser;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.source.domain.AssetAuthorization;
 import com.muyu.source.domain.TableInfo;
+import com.muyu.source.domain.rep.AssetAuthorizationRep;
 import com.muyu.source.domain.rep.TableInfoResp;
 import com.muyu.source.service.AssetAuthorizationService;
 import com.muyu.source.service.TableInfoService;
@@ -96,9 +97,9 @@ public class TableInfoController {
         // 获取用户的部门ID
         Long deptId = sysUser.getDeptId();
         // 根据用户ID查询授权的表ID和基本信息
-        List<AssetAuthorization> idByUserId = assetAuthorizationService.findTableIdAndBasicIdByUserId(userId);
+        List<AssetAuthorizationRep> idByUserId = assetAuthorizationService.findTableIdAndBasicIdByUserId(userId);
         // 根据部门ID查询授权的表ID和基本信息
-        List<AssetAuthorization> idByDeptId = assetAuthorizationService.findTableIdAndBasicIdByDeptId(deptId);
+        List<AssetAuthorizationRep> idByDeptId = assetAuthorizationService.findTableIdAndBasicIdByDeptId(deptId);
         // 创建一个HashSet用于存储授权的表信息
         HashSet<TableInfo> hashSet = new HashSet<>();
         // 将用户ID授权的表信息添加到hashSet中
@@ -134,9 +135,9 @@ public class TableInfoController {
      * @param idByDeptId 授权信息
      * @param hashSet 授权信息
      */
-    private void extracted(List<AssetAuthorization> idByDeptId, HashSet<TableInfo> hashSet) {
+    private void extracted(List<AssetAuthorizationRep> idByDeptId, HashSet<TableInfo> hashSet) {
         // 遍历AssetAuthorizationReq列表
-        for (AssetAuthorization assetImpowerResp : idByDeptId) {
+        for (AssetAuthorizationRep assetImpowerResp : idByDeptId) {
             // 获取当前AssetAuthorizationReq对象的basicId和tableId
             Long basicId = assetImpowerResp.getBasicId();
             Long tableId = assetImpowerResp.getTableId();

muyu-source-server/src/main/java/com/muyu/source/mapper/AssetAuthorizationMapper.java

@@ -2,6 +2,7 @@ package com.muyu.source.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.source.domain.AssetAuthorization;
+import com.muyu.source.domain.rep.AssetAuthorizationRep;
 import com.muyu.source.domain.req.AssetAuthorizationReq;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -21,4 +22,8 @@ public interface AssetAuthorizationMapper extends BaseMapper<AssetAuthorization>
 
 
     List<Long> findDeptIdList(AssetAuthorizationReq req);
+
+    List<AssetAuthorizationRep> findTableIdAndBasicIdByUserId(Long userId);
+
+    List<AssetAuthorizationRep> findTableIdAndBasicIdByDeptId(Long deptId);
 }

muyu-source-server/src/main/java/com/muyu/source/service/AssetAuthorizationService.java

@@ -22,14 +22,14 @@ public interface AssetAuthorizationService extends IService<AssetAuthorization>
      * @param userId 用户ID
      * @return 授权的表ID和基本信息
      */
-    List<AssetAuthorization> findTableIdAndBasicIdByUserId(Long userId);
+    List<AssetAuthorizationRep> findTableIdAndBasicIdByUserId(Long userId);
 
     /**
      * 根据部门ID查询授权的表ID和基本信息
      * @param deptId 部门ID
      * @return 授权的表ID和基本信息
      */
-    List<AssetAuthorization> findTableIdAndBasicIdByDeptId(Long deptId);
+    List<AssetAuthorizationRep> findTableIdAndBasicIdByDeptId(Long deptId);
 
     /**
      * 查询资产赋权用户信息

muyu-source-server/src/main/java/com/muyu/source/service/Impl/AssetAuthorizationServiceImpl.java

@@ -39,10 +39,9 @@ public class AssetAuthorizationServiceImpl extends ServiceImpl<AssetAuthorizatio
      * @return 授权的表ID和基本信息
      */
     @Override
-    public List<AssetAuthorization> findTableIdAndBasicIdByUserId(Long userId) {
+    public List<AssetAuthorizationRep> findTableIdAndBasicIdByUserId(Long userId) {
-        return assetAuthorizationMapper.selectList(new LambdaQueryWrapper<>() {{
+        List<AssetAuthorizationRep> assetAuthorizationReps  = assetAuthorizationMapper.findTableIdAndBasicIdByUserId(userId);
-            eq(AssetAuthorization::getUserId, userId);
+        return assetAuthorizationReps;
-        }});
     }
     /**
      * 根据部门ID查询授权的表ID和基本信息
@@ -51,11 +50,9 @@ public class AssetAuthorizationServiceImpl extends ServiceImpl<AssetAuthorizatio
      * @return 授权的表ID和基本信息
      */
     @Override
-    public List<AssetAuthorization> findTableIdAndBasicIdByDeptId(Long deptId) {
+    public List<AssetAuthorizationRep> findTableIdAndBasicIdByDeptId(Long deptId) {
-        return assetAuthorizationMapper.selectList(new LambdaQueryWrapper<>() {{
+        List<AssetAuthorizationRep> assetAuthorizationReps  = assetAuthorizationMapper.findTableIdAndBasicIdByDeptId(deptId);
-            eq(AssetAuthorization::getDeptId, deptId);
+        return assetAuthorizationReps;
-        }});
-
     }
     /**
      * 查询资产赋权用户信息

muyu-source-server/src/main/resources/mapper/AssetAccreditMapper.xml

@@ -37,5 +37,29 @@
             </if>
         </where>
     </select>
+    <select id="findTableIdAndBasicIdByUserId" resultType="com.muyu.source.domain.rep.AssetAuthorizationRep">
+        SELECT
+        basic_id,
+        table_id
+        FROM
+        asset_authorization
+        <where>
+            <if test="userId!=null">
+                and user_id = #{userId}
+            </if>
+        </where>
+    </select>
+    <select id="findTableIdAndBasicIdByDeptId" resultType="com.muyu.source.domain.rep.AssetAuthorizationRep">
+        SELECT
+        basic_id,
+        table_id
+        FROM
+        asset_authorization
+        <where>
+            <if test="deptId!=null">
+                and dept_id = #{deptId}
+            </if>
+        </where>
+    </select>
 
 </mapper>

muyu-source-server/src/main/resources/mapper/SysUserMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.muyu.source.mapper.UserMapper">
 
 
-    <select id="findUserById" resultType="com.muyu.common.system.domain.SysUser">
+    <select id="findUserById" resultType="com.muyu.source.domain.SysUser">
         select * from sys_user where user_id=#{userId}
     </select>