修改应用子库相关代码

know_sub_business/src/main/java/com/supervision/knowsub/service/impl/ApplicationSubLibraryServiceImpl.java

@@ -104,7 +104,6 @@ public class ApplicationSubLibraryServiceImpl implements ApplicationSubLibrarySe
     @Override
     public IPage<SubLibraryResVo> listSubLibrary(SubLibraryReqVo subLibraryReqVo,Integer pageNum,Integer pageSize) {
 
-        // todo: 部门名称 待补充
         return systemBaseService.listSubLibrary(subLibraryReqVo, pageNum, pageSize);
     }
 

know_sub_model/src/main/java/com/supervision/knowsub/dto/dept/BaseDeptRelationDTO.java

@@ -0,0 +1,32 @@
+package com.supervision.knowsub.dto.dept;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 应用子库关联部门DTO
+ */
+@Data
+public class BaseDeptRelationDTO {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 子库ID
+     */
+    private String baseId;
+
+    /**
+     * 部门ID
+     */
+    private String deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+}

know_sub_model/src/main/java/com/supervision/knowsub/mapper/SystemBaseDeptRelationMapper.java

@@ -1,7 +1,11 @@
 package com.supervision.knowsub.mapper;
 
+import com.supervision.knowsub.dto.dept.BaseDeptRelationDTO;
 import com.supervision.knowsub.model.SystemBaseDeptRelation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @author Administrator
@@ -11,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface SystemBaseDeptRelationMapper extends BaseMapper<SystemBaseDeptRelation> {
 
+    List<BaseDeptRelationDTO> listBaseDeptRelation(@Param("systemBaseIds") List<String> systemBaseIds);
 }
 
 

know_sub_model/src/main/java/com/supervision/knowsub/service/SystemBaseDeptRelationService.java

@@ -1,8 +1,11 @@
 package com.supervision.knowsub.service;
 
+import com.supervision.knowsub.dto.dept.BaseDeptRelationDTO;
 import com.supervision.knowsub.model.SystemBaseDeptRelation;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【ks_system_base_dept_relation(子库与部门关系表)】的数据库操作Service
@@ -10,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface SystemBaseDeptRelationService extends IService<SystemBaseDeptRelation> {
 
+
+    List<BaseDeptRelationDTO> listBaseDeptRelation(List<String> systemBaseIds);
+
 }

know_sub_model/src/main/java/com/supervision/knowsub/service/impl/SystemBaseDeptRelationServiceImpl.java

@@ -1,11 +1,14 @@
 package com.supervision.knowsub.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.supervision.knowsub.dto.dept.BaseDeptRelationDTO;
 import com.supervision.knowsub.model.SystemBaseDeptRelation;
 import com.supervision.knowsub.service.SystemBaseDeptRelationService;
 import com.supervision.knowsub.mapper.SystemBaseDeptRelationMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【ks_system_base_dept_relation(子库与部门关系表)】的数据库操作Service实现
@@ -15,6 +18,10 @@ import org.springframework.stereotype.Service;
 public class SystemBaseDeptRelationServiceImpl extends ServiceImpl<SystemBaseDeptRelationMapper, SystemBaseDeptRelation>
     implements SystemBaseDeptRelationService{
 
+    @Override
+    public List<BaseDeptRelationDTO> listBaseDeptRelation(List<String> systemBaseIds) {
+        return super.getBaseMapper().listBaseDeptRelation(systemBaseIds);
+    }
 }
 
 

know_sub_model/src/main/java/com/supervision/knowsub/service/impl/SystemBaseServiceImpl.java

@@ -6,8 +6,8 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.supervision.knowsub.dto.dept.BaseDeptRelationDTO;
 import com.supervision.knowsub.model.SystemBase;
-import com.supervision.knowsub.model.SystemBaseDeptRelation;
 import com.supervision.knowsub.service.SystemBaseDeptRelationService;
 import com.supervision.knowsub.service.SystemBaseService;
 import com.supervision.knowsub.mapper.SystemBaseMapper;
@@ -46,12 +46,13 @@ public class SystemBaseServiceImpl extends ServiceImpl<SystemBaseMapper, SystemB
 
         // 关联部门信息
         List<String> systemBaseIds = page.getRecords().stream().map(SystemBase::getId).toList();
-        List<SystemBaseDeptRelation> relationList = systemBaseDeptRelationService.lambdaQuery().in(SystemBaseDeptRelation::getBaseId, systemBaseIds).list();
+        List<BaseDeptRelationDTO> baseDeptRelationDTOS = systemBaseDeptRelationService.listBaseDeptRelation(systemBaseIds);
         // 聚合部门信息，方便添加到SubLibraryResVo信息中
-        Map<String, List<DeptInfo>> deptIdMapDeptInfo = relationList.stream().collect(
-                Collectors.groupingBy(SystemBaseDeptRelation::getBaseId, Collectors.mapping(relation -> {
+        Map<String, List<DeptInfo>> deptIdMapDeptInfo = baseDeptRelationDTOS.stream().collect(
+                Collectors.groupingBy(BaseDeptRelationDTO::getBaseId, Collectors.mapping(relation -> {
                     DeptInfo deptInfo = new DeptInfo();
                     deptInfo.setDeptId(relation.getDeptId());
+                    deptInfo.setDeptName(relation.getDeptName());
                     return deptInfo;
                 }, Collectors.toList())));
 

know_sub_model/src/main/java/com/supervision/knowsub/vo/sublibrary/SubLibraryResVo.java

@@ -3,6 +3,7 @@ package com.supervision.knowsub.vo.sublibrary;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -20,5 +21,9 @@ public class SubLibraryResVo {
     @Schema(description = "关联部门信息")
     private List<DeptInfo> deptInfoList;
 
+    private String deptName;
+
+    private LocalDateTime createTime;
+
 
 }

know_sub_model/src/main/resources/mapper/SystemBaseDeptRelationMapper.xml

@@ -19,4 +19,19 @@
         create_user_id,create_time,update_user_id,
         update_time
     </sql>
+    <select id="listBaseDeptRelation" resultType="com.supervision.knowsub.dto.dept.BaseDeptRelationDTO">
+        select dr.id       as id,
+               dr.base_id  as baseId,
+               dr.dept_id  as deptId,
+               d.dept_name as deptName
+        from ks_system_base_dept_relation dr
+                 left join ks_system_dept d on dr.dept_id = d.id
+        where 1=1
+        <if test="systemBaseIds != null and systemBaseIds.size() > 0">
+            and dr.base_id in
+            <foreach collection="systemBaseIds" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
 </mapper>