Merge branch 'master' of http://114.55.67.98:8070/songxy/AI_Engineering

ais_knowledge/knowledge/src/main/java/com/zjugis/ai/knowledge/controller/KnowledgeFileController.java

@@ -41,6 +41,12 @@ public class KnowledgeFileController {
         return success(BeanUtils.toBean(pageResult, KnowledgeFileRespVO.class));
     }
 
+    @GetMapping("/list")
+    public CommonResult<List<KnowledgeFileRespVO>> getKnowledgeDocumentList(KnowledgeFilePageReqVO pageReqVO) {
+        List<KnowledgeFileDO> pageResult = knowledgeFileService.getKnowledgeDocumentList(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, KnowledgeFileRespVO.class));
+    }
+
     @PostMapping("/update")
     public CommonResult<Boolean> updateKnowledgeDocument(@RequestBody KnowledgeFileUpdateReqVO reqVO) {
         knowledgeFileService.updateKnowledgeDocument(reqVO);

ais_knowledge/knowledge/src/main/java/com/zjugis/ai/knowledge/dal/mapper/KnowledgeFileMapper.java

@@ -5,6 +5,8 @@ import com.zjugis.ai.knowledge.controller.vo.KnowledgeFilePageReqVO;
 import com.zjugis.ai.knowledge.dal.dataobject.KnowledgeFileDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @Author 陈俊
  * @Date 2025/2/20 17:20
@@ -21,6 +23,14 @@ public interface KnowledgeFileMapper extends BaseMapperX<KnowledgeFileDO> {
                 .orderByDesc(KnowledgeFileDO::getId));
     }
 
+    default List<KnowledgeFileDO> selectList(KnowledgeFilePageReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<KnowledgeFileDO>()
+                .likeIfPresent(KnowledgeFileDO::getName, reqVO.getName())
+                .eqIfPresent(KnowledgeFileDO::getParentId, reqVO.getParentId())
+                .orderByAsc(KnowledgeFileDO::getSort)
+                .orderByDesc(KnowledgeFileDO::getId));
+    }
+
     default Long selectCountByParentId(Long parentId) {
         return selectCount(KnowledgeFileDO::getParentId, parentId);
     }

ais_knowledge/knowledge/src/main/java/com/zjugis/ai/knowledge/service/KnowledgeFileService.java

@@ -23,4 +23,6 @@ public interface KnowledgeFileService {
     void deleteKnowledgeDocument(Long id);
 
     void initKnowledgeDocument();
+
+    List<KnowledgeFileDO> getKnowledgeDocumentList(KnowledgeFilePageReqVO pageReqVO);
 }

ais_knowledge/knowledge/src/main/java/com/zjugis/ai/knowledge/service/KnowledgeFileServiceImpl.java

@@ -122,6 +122,11 @@ public class KnowledgeFileServiceImpl implements KnowledgeFileService {
         }
     }
 
+    @Override
+    public List<KnowledgeFileDO> getKnowledgeDocumentList(KnowledgeFilePageReqVO pageReqVO) {
+        return knowledgeFileMapper.selectList(pageReqVO);
+    }
+
     /**
      * 读取指定文件夹中的所有文件名
      */

ais_knowledge/knowledge/src/main/java/com/zjugis/ai/knowledge/service/KnowledgeTypeServiceImpl.java

@@ -10,6 +10,7 @@ import com.zjugis.ai.knowledge.dal.mapper.KnowledgeFileMapper;
 import com.zjugis.ai.knowledge.dal.mapper.KnowledgeTypeMapper;
 import com.zjugis.ai.knowledge.util.object.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -77,6 +78,7 @@ public class KnowledgeTypeServiceImpl implements KnowledgeTypeService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void moveUp(Long id) {
         KnowledgeTypeDO current = knowledgeTypeMapper.selectById(id);
         List<KnowledgeTypeDO> siblings = getSiblings(current.getParentId());
@@ -89,6 +91,7 @@ public class KnowledgeTypeServiceImpl implements KnowledgeTypeService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void moveDown(Long id) {
         KnowledgeTypeDO current = knowledgeTypeMapper.selectById(id);
         List<KnowledgeTypeDO> siblings = getSiblings(current.getParentId());

ais_knowledge/knowledge/src/main/resources/application-wzprod.yaml

@@ -0,0 +1,59 @@
+spring:
+  # 数据源配置项
+  autoconfigure:
+    exclude:
+      - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源
+  datasource:
+    druid: # Druid 【监控】相关的全局配置
+      web-stat-filter:
+        enabled: true
+      stat-view-servlet:
+        enabled: true
+        allow: # 设置白名单，不填则允许所有访问
+        url-pattern: /druid/*
+        login-username: # 控制台管理用户名和密码
+        login-password:
+      filter:
+        stat:
+          enabled: true
+          log-slow-sql: true # 慢 SQL 记录
+          slow-sql-millis: 100
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+    dynamic: # 多数据源配置
+      druid: # Druid 【连接池】相关的全局配置
+        initial-size: 1 # 初始连接数
+        min-idle: 1 # 最小连接池数量
+        max-active: 20 # 最大连接池数量
+        max-wait: 600000 # 配置获取连接等待超时的时间，单位：毫秒
+        time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位：毫秒
+        min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间，单位：毫秒
+        max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间，单位：毫秒
+        validation-query: SELECT 1  # 配置检测连接是否有效
+        test-while-idle: true
+        test-on-borrow: false
+        test-on-return: false
+      primary: master
+      datasource:
+        master:
+          name: zjugis-oa
+          #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
+          #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例
+          #          url: jdbc:oracle:thin:@10.10.10.8:1521:ORCL # Oracle 连接的示例
+          #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
+          url: jdbc:postgresql://127.0.0.1:15432/knowledge
+          username: knowledge
+          password: zdww1402!
+
+# 远程调用地址
+retrofit-url:
+  ai-url: http://10.36.162.54:20331/
+
+logging:
+  level:
+    com.zjugis.ai.knowledge.retrofit.docs: info
+folder:
+  path: /data/knowledge/initFile