fix(web): 提交遗漏文件

service-ai/database/service_ai_feedback.sql

@@ -1,11 +1,18 @@
 CREATE TABLE `service_ai_feedback`
 (
-    `id`            bigint      NOT NULL,
+    `id`            bigint   NOT NULL,
-    `source`        longtext    NOT NULL,
+    `created_time`  datetime(6) DEFAULT NULL,
-    `conclusion`    longtext,
+    `modified_time` datetime(6) DEFAULT NULL,
     `analysis`      longtext,
-    `pictures`      longtext,
+    `conclusion`    longtext,
-    `status`        varchar(50) NOT NULL DEFAULT 'ANALYSIS_PROCESSING',
+    `source`        longtext NOT NULL,
-    `created_time`  datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `status`        tinyint  NOT NULL,
-    `modified_time` datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+    PRIMARY KEY (`id`)
+) DEFAULT CHARSET = utf8mb4;
+
+CREATE TABLE `service_ai_feedback_pictures`
+(
+    `feedback_id` bigint NOT NULL,
+    `pictures_id` bigint NOT NULL,
+    PRIMARY KEY (`feedback_id`, `pictures_id`)
 ) DEFAULT CHARSET = utf8mb4;

service-ai/database/service_ai_file.sql

@@ -1,11 +1,12 @@
 CREATE TABLE `service_ai_file`
 (
-    `id`           bigint   NOT NULL,
+    `id`            bigint NOT NULL,
-    `filename`     varchar(500)      DEFAULT NULL,
+    `created_time`  datetime(6)  DEFAULT NULL,
-    `size`         bigint            DEFAULT NULL,
+    `modified_time` datetime(6)  DEFAULT NULL,
-    `md5`          varchar(100)      DEFAULT NULL,
+    `filename`      varchar(255) DEFAULT NULL,
-    `path`         varchar(500)      DEFAULT NULL,
+    `md5`           varchar(255) DEFAULT NULL,
-    `type`         varchar(50)       DEFAULT NULL,
+    `path`          varchar(255) DEFAULT NULL,
-    `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `size`          bigint       DEFAULT NULL,
+    `type`          varchar(255) DEFAULT NULL,
     PRIMARY KEY (`id`)
 ) DEFAULT CHARSET = utf8mb4;

service-ai/database/service_ai_group.sql

@@ -1,9 +1,10 @@
 CREATE TABLE `service_ai_group`
 (
     `id`            bigint       NOT NULL,
+    `created_time`  datetime(6) DEFAULT NULL,
+    `modified_time` datetime(6) DEFAULT NULL,
+    `name`          varchar(255) NOT NULL,
+    `status`        tinyint      NOT NULL,
     `knowledge_id`  bigint       NOT NULL,
-    `name`          varchar(100) NOT NULL,
+    PRIMARY KEY (`id`)
-    `status`        varchar(10)  NOT NULL DEFAULT 'RUNNING',
+) DEFAULT CHARSET=utf8mb4;
-    `created_time`  datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    `modified_time` datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
-) DEFAULT CHARSET = utf8mb4;

service-ai/database/service_ai_knowledge.sql

@@ -1,11 +1,11 @@
 CREATE TABLE `service_ai_knowledge`
 (
     `id`               bigint       NOT NULL,
-    `vector_source_id` varchar(100) NOT NULL,
+    `created_time`     datetime(6) DEFAULT NULL,
-    `name`             varchar(100) NOT NULL,
+    `modified_time`    datetime(6) DEFAULT NULL,
     `description`      longtext     NOT NULL,
-    `strategy`         varchar(10)  NOT NULL,
+    `name`             varchar(255) NOT NULL,
-    `created_time`     datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `strategy`         tinyint      NOT NULL,
-    `modified_time`    datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `vector_source_id` bigint       NOT NULL,
     PRIMARY KEY (`id`)
 ) DEFAULT CHARSET = utf8mb4;

service-ai/pom.xml

@@ -110,6 +110,11 @@
                 <artifactId>jasypt-spring-boot-starter</artifactId>
                 <version>3.0.5</version>
             </dependency>
+            <dependency>
+                <groupId>com.blinkfox</groupId>
+                <artifactId>fenix-spring-boot-starter</artifactId>
+                <version>3.0.0</version>
+            </dependency>
 
             <!-- 日志相关 -->
             <dependency>

service-ai/service-ai-core/src/main/java/com/lanyuanxiaoyao/service/ai/core/configuration/SnowflakeId.java

@@ -1,74 +0,0 @@
-package com.lanyuanxiaoyao.service.ai.core.configuration;
-
-import java.time.Instant;
-
-/**
- * 使用雪花算法作为ID生成器
- *
- * @author lanyuanxiaoyao
- * @date 2024-11-14
- */
-public class SnowflakeId {
-  /**
-   * 起始的时间戳
-   */
-  private final static long START_TIMESTAMP = 1;
-
-  /**
-   * 序列号占用的位数
-   */
-  private final static long SEQUENCE_BIT = 11;
-
-  /**
-   * 序列号最大值
-   */
-  private final static long MAX_SEQUENCE_BIT = ~(-1 << SEQUENCE_BIT);
-
-  /**
-   * 时间戳值向左位移
-   */
-  private final static long TIMESTAMP_OFFSET = SEQUENCE_BIT;
-
-  /**
-   * 序列号
-   */
-  private static long sequence = 0;
-  /**
-   * 上一次时间戳
-   */
-  private static long lastTimestamp = -1;
-
-  public static synchronized long next() {
-    long currentTimestamp = nowTimestamp();
-    if (currentTimestamp < lastTimestamp) {
-      throw new RuntimeException("Clock have moved backwards.");
-    }
-
-    if (currentTimestamp == lastTimestamp) {
-      // 相同毫秒内, 序列号自增
-      sequence = (sequence + 1) & MAX_SEQUENCE_BIT;
-      // 同一毫秒的序列数已经达到最大
-      if (sequence == 0) {
-        currentTimestamp = nextTimestamp();
-      }
-    } else {
-      // 不同毫秒内, 序列号置为0
-      sequence = 0;
-    }
-
-    lastTimestamp = currentTimestamp;
-    return (currentTimestamp - START_TIMESTAMP) << TIMESTAMP_OFFSET | sequence;
-  }
-
-  private static long nextTimestamp() {
-    long milli = nowTimestamp();
-    while (milli <= lastTimestamp) {
-      milli = nowTimestamp();
-    }
-    return milli;
-  }
-
-  private static long nowTimestamp() {
-    return Instant.now().toEpochMilli();
-  }
-}

service-ai/service-ai-web/pom.xml

@@ -20,8 +20,16 @@
                     <groupId>com.google.protobuf</groupId>
                     <artifactId>protobuf-java</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jetty</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.ai</groupId>
             <artifactId>spring-ai-starter-model-openai</artifactId>
@@ -40,7 +48,11 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jdbc</artifactId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.blinkfox</groupId>
+            <artifactId>fenix-spring-boot-starter</artifactId>
         </dependency>
         <dependency>
             <groupId>com.mysql</groupId>
@@ -89,6 +101,11 @@
                             <artifactId>lombok-mapstruct-binding</artifactId>
                             <version>0.2.0</version>
                         </path>
+                        <path>
+                            <groupId>org.hibernate</groupId>
+                            <artifactId>hibernate-jpamodelgen</artifactId>
+                            <version>6.6.8.Final</version>
+                        </path>
                     </annotationProcessorPaths>
                     <compilerArgs>
                         <arg>-Amapstruct.defaultComponentModel=spring</arg>

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/WebApplication.java

@@ -1,5 +1,6 @@
 package com.lanyuanxiaoyao.service.ai.web;
 
+import com.blinkfox.fenix.EnableFenix;
 import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
 import org.springframework.beans.BeansException;
 import org.springframework.boot.ApplicationArguments;
@@ -10,6 +11,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.retry.annotation.EnableRetry;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -23,6 +25,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableEncryptableProperties
 @EnableRetry
 @EnableScheduling
+@EnableFenix
+@EnableJpaAuditing
 public class WebApplication implements ApplicationRunner, ApplicationContextAware {
   private static ApplicationContext context;
 

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/base/controller/DetailController.java

@@ -0,0 +1,13 @@
+package com.lanyuanxiaoyao.service.ai.web.base.controller;
+
+import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse;
+
+/**
+ * @author lanyuanxiaoyao
+ * @date 2024-11-28
+ */
+public interface DetailController<DETAIL_ITEM> {
+  String DETAIL = "/detail/{id}";
+
+  AmisResponse<DETAIL_ITEM> detail(Long id) throws Exception;
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/base/controller/ListController.java

@@ -0,0 +1,16 @@
+package com.lanyuanxiaoyao.service.ai.web.base.controller;
+
+import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisCrudResponse;
+import com.lanyuanxiaoyao.service.ai.web.base.controller.query.Query;
+
+/**
+ * @author lanyuanxiaoyao
+ * @date 2024-11-28
+ */
+public interface ListController {
+  String LIST = "/list";
+
+  AmisCrudResponse list() throws Exception;
+
+  AmisCrudResponse list(Query query) throws Exception;
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/base/controller/RemoveController.java

@@ -0,0 +1,13 @@
+package com.lanyuanxiaoyao.service.ai.web.base.controller;
+
+import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse;
+
+/**
+ * @author lanyuanxiaoyao
+ * @date 2024-11-28
+ */
+public interface RemoveController {
+  String REMOVE = "/remove/{id}";
+
+  AmisResponse<Object> remove(Long id) throws Exception;
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/base/controller/SaveController.java

@@ -0,0 +1,13 @@
+package com.lanyuanxiaoyao.service.ai.web.base.controller;
+
+import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse;
+
+/**
+ * @author lanyuanxiaoyao
+ * @date 2024-11-28
+ */
+public interface SaveController<SAVE_ITEM> {
+  String SAVE = "/save";
+
+  AmisResponse<Long> save(SAVE_ITEM item) throws Exception;
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/base/controller/SimpleController.java

@@ -0,0 +1,8 @@
+package com.lanyuanxiaoyao.service.ai.web.base.controller;
+
+/**
+ * @author lanyuanxiaoyao
+ * @date 2024-11-28
+ */
+public interface SimpleController<SAVE_ITEM, LIST_ITEM, DETAIL_ITEM> extends SaveController<SAVE_ITEM>, ListController, DetailController<DETAIL_ITEM>, RemoveController {
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/base/controller/SimpleControllerSupport.java

@@ -0,0 +1,105 @@
+package com.lanyuanxiaoyao.service.ai.web.base.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisCrudResponse;
+import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse;
+import com.lanyuanxiaoyao.service.ai.web.base.controller.query.Query;
+import com.lanyuanxiaoyao.service.ai.web.base.entity.SimpleEntity;
+import com.lanyuanxiaoyao.service.ai.web.base.service.SimpleServiceSupport;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author lanyuanxiaoyao
+ * @date 2024-11-26
+ */
+@Slf4j
+public abstract class SimpleControllerSupport<ENTITY extends SimpleEntity, SAVE_ITEM, LIST_ITEM, DETAIL_ITEM> implements SimpleController<SAVE_ITEM, LIST_ITEM, DETAIL_ITEM> {
+  protected final SimpleServiceSupport<ENTITY> service;
+
+  public SimpleControllerSupport(SimpleServiceSupport<ENTITY> service) {
+    this.service = service;
+  }
+
+  @PostMapping(SAVE)
+  @Override
+  public AmisResponse<Long> save(@RequestBody SAVE_ITEM item) throws Exception {
+    SaveItemMapper<ENTITY, SAVE_ITEM> mapper = saveItemMapper();
+    return AmisResponse.responseSuccess(service.save(mapper.from(item)));
+  }
+
+  @GetMapping(LIST)
+  @Override
+  public AmisCrudResponse list() throws Exception {
+    ListItemMapper<ENTITY, LIST_ITEM> mapper = listItemMapper();
+    return AmisCrudResponse.responseCrudData(
+        service.list()
+            .collect(entity -> {
+              try {
+                return mapper.from(entity);
+              } catch (Exception e) {
+                throw new RuntimeException(e);
+              }
+            })
+    );
+  }
+
+  @PostMapping(LIST)
+  @Override
+  public AmisCrudResponse list(@RequestBody Query query) throws Exception {
+    if (ObjectUtil.isNull(query)) {
+      return AmisCrudResponse.responseCrudData(List.of(), 0);
+    }
+    ListItemMapper<ENTITY, LIST_ITEM> mapper = listItemMapper();
+    Page<ENTITY> result = service.list(query);
+    return AmisCrudResponse.responseCrudData(
+        result.get()
+            .map(entity -> {
+              try {
+                return mapper.from(entity);
+              } catch (Exception e) {
+                throw new RuntimeException(e);
+              }
+            })
+            .toList(),
+        result.getTotalElements()
+    );
+  }
+
+  @GetMapping(DETAIL)
+  @Override
+  public AmisResponse<DETAIL_ITEM> detail(@PathVariable("id") Long id) throws Exception {
+    DetailItemMapper<ENTITY, DETAIL_ITEM> mapper = detailItemMapper();
+    return AmisResponse.responseSuccess(mapper.from(service.detailOrThrow(id)));
+  }
+
+  @GetMapping(REMOVE)
+  @Override
+  public AmisResponse<Object> remove(@PathVariable("id") Long id) throws Exception {
+    service.remove(id);
+    return AmisResponse.responseSuccess();
+  }
+
+  protected abstract SaveItemMapper<ENTITY, SAVE_ITEM> saveItemMapper();
+
+  protected abstract ListItemMapper<ENTITY, LIST_ITEM> listItemMapper();
+
+  protected abstract DetailItemMapper<ENTITY, DETAIL_ITEM> detailItemMapper();
+
+  public interface SaveItemMapper<ENTITY, SAVE_ITEM> {
+    ENTITY from(SAVE_ITEM item) throws Exception;
+  }
+
+  public interface ListItemMapper<ENTITY, LIST_ITEM> {
+    LIST_ITEM from(ENTITY entity) throws Exception;
+  }
+
+  public interface DetailItemMapper<ENTITY, DETAIL_ITEM> {
+    DETAIL_ITEM from(ENTITY entity) throws Exception;
+  }
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/base/controller/query/Query.java

@@ -0,0 +1,61 @@
+package com.lanyuanxiaoyao.service.ai.web.base.controller.query;
+
+import lombok.Data;
+import org.eclipse.collections.api.list.ImmutableList;
+import org.eclipse.collections.api.map.ImmutableMap;
+
+/**
+ * 统一查询
+ *
+ * @author lanyuanxiaoyao
+ * @date 2024-12-03
+ */
+@Data
+public class Query {
+  private Queryable query;
+  private ImmutableList<Sortable> sort;
+  private Pageable page;
+
+  @Data
+  public static class Queryable {
+    private ImmutableList<String> nullEqual;
+    private ImmutableList<String> notNullEqual;
+    private ImmutableList<String> empty;
+    private ImmutableList<String> notEmpty;
+    private ImmutableMap<String, ?> equal;
+    private ImmutableMap<String, ?> notEqual;
+    private ImmutableMap<String, String> like;
+    private ImmutableMap<String, String> notLike;
+    private ImmutableMap<String, ?> great;
+    private ImmutableMap<String, ?> less;
+    private ImmutableMap<String, ?> greatEqual;
+    private ImmutableMap<String, ?> lessEqual;
+    private ImmutableMap<String, ImmutableList<?>> in;
+    private ImmutableMap<String, ImmutableList<?>> notIn;
+    private ImmutableMap<String, Between> between;
+    private ImmutableMap<String, Between> notBetween;
+
+    @Data
+    public static class Between {
+      private String start;
+      private String end;
+    }
+  }
+
+  @Data
+  public static class Sortable {
+    private String column;
+    private Direction direction;
+
+    public enum Direction {
+      ASC,
+      DESC,
+    }
+  }
+
+  @Data
+  public static class Pageable {
+    private Integer index;
+    private Integer size;
+  }
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/base/entity/IdOnlyEntity.java

@@ -0,0 +1,29 @@
+package com.lanyuanxiaoyao.service.ai.web.base.entity;
+
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.hibernate.annotations.GenericGenerator;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+/**
+ * 实体类公共字段
+ *
+ * @author lanyuanxiaoyao
+ * @date 2024-11-20
+ */
+@Getter
+@Setter
+@ToString
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public class IdOnlyEntity {
+  @Id
+  @GeneratedValue(generator = "snowflake")
+  @GenericGenerator(name = "snowflake", strategy = "com.lanyuanxiaoyao.service.ai.web.configuration.SnowflakeIdGenerator")
+  private Long id;
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/base/entity/SimpleEntity.java

@@ -0,0 +1,29 @@
+package com.lanyuanxiaoyao.service.ai.web.base.entity;
+
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+/**
+ * 实体类公共字段
+ *
+ * @author lanyuanxiaoyao
+ * @date 2024-11-20
+ */
+@Getter
+@Setter
+@ToString(callSuper = true)
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public class SimpleEntity extends IdOnlyEntity {
+  @CreatedDate
+  private LocalDateTime createdTime;
+  @LastModifiedDate
+  private LocalDateTime modifiedTime;
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/base/entity/SimpleItem.java

@@ -0,0 +1,17 @@
+package com.lanyuanxiaoyao.service.ai.web.base.entity;
+
+import java.time.LocalDateTime;
+import lombok.Data;
+
+/**
+ * 创建对象使用的接收类
+ *
+ * @author lanyuanxiaoyao
+ * @date 2024-11-26
+ */
+@Data
+public class SimpleItem {
+  private Long id;
+  private LocalDateTime createdTime;
+  private LocalDateTime modifiedTime;
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/base/repository/SimpleRepository.java

@@ -0,0 +1,16 @@
+package com.lanyuanxiaoyao.service.ai.web.base.repository;
+
+import com.blinkfox.fenix.jpa.FenixJpaRepository;
+import com.blinkfox.fenix.specification.FenixJpaSpecificationExecutor;
+import org.springframework.data.repository.NoRepositoryBean;
+import org.springframework.data.repository.query.QueryByExampleExecutor;
+
+/**
+ * 整合一下
+ *
+ * @author lanyuanxiaoyao
+ * @date 2024-11-21
+ */
+@NoRepositoryBean
+public interface SimpleRepository<E, ID> extends FenixJpaRepository<E, ID>, FenixJpaSpecificationExecutor<E>, QueryByExampleExecutor<E> {
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/base/service/SimpleService.java

@@ -0,0 +1,34 @@
+package com.lanyuanxiaoyao.service.ai.web.base.service;
+
+import com.lanyuanxiaoyao.service.ai.web.base.controller.query.Query;
+import com.lanyuanxiaoyao.service.ai.web.base.entity.SimpleEntity;
+import java.util.Optional;
+import org.eclipse.collections.api.list.ImmutableList;
+import org.eclipse.collections.api.set.ImmutableSet;
+import org.springframework.data.domain.Page;
+
+/**
+ * @author lanyuanxiaoyao
+ * @date 2024-11-28
+ */
+public interface SimpleService<ENTITY extends SimpleEntity> {
+  Long save(ENTITY entity) throws Exception;
+
+  Long count() throws Exception;
+
+  ImmutableList<ENTITY> list() throws Exception;
+
+  ImmutableList<ENTITY> list(ImmutableSet<Long> ids) throws Exception;
+
+  Page<ENTITY> list(Query query) throws Exception;
+
+  Optional<ENTITY> detailOptional(Long id) throws Exception;
+
+  ENTITY detail(Long id) throws Exception;
+
+  ENTITY detailOrThrow(Long id) throws Exception;
+
+  ENTITY detailOrNull(Long id) throws Exception;
+
+  void remove(Long id) throws Exception;
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/base/service/SimpleServiceSupport.java

@@ -0,0 +1,251 @@
+package com.lanyuanxiaoyao.service.ai.web.base.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import cn.hutool.core.util.EnumUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.lanyuanxiaoyao.service.ai.web.base.controller.query.Query;
+import com.lanyuanxiaoyao.service.ai.web.base.entity.IdOnlyEntity_;
+import com.lanyuanxiaoyao.service.ai.web.base.entity.SimpleEntity;
+import com.lanyuanxiaoyao.service.ai.web.base.entity.SimpleEntity_;
+import com.lanyuanxiaoyao.service.ai.web.base.repository.SimpleRepository;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.transaction.Transactional;
+import java.util.Optional;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.collections.api.factory.Lists;
+import org.eclipse.collections.api.list.ImmutableList;
+import org.eclipse.collections.api.list.MutableList;
+import org.eclipse.collections.api.set.ImmutableSet;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+
+/**
+ * @author lanyuanxiaoyao
+ * @date 2024-11-21
+ */
+@Slf4j
+public abstract class SimpleServiceSupport<ENTITY extends SimpleEntity> implements SimpleService<ENTITY> {
+  private static final Integer DEFAULT_PAGE_INDEX = 1;
+  private static final Integer DEFAULT_PAGE_SIZE = 10;
+  protected final SimpleRepository<ENTITY, Long> repository;
+
+  public SimpleServiceSupport(SimpleRepository<ENTITY, Long> repository) {
+    this.repository = repository;
+  }
+
+  @Transactional(rollbackOn = Throwable.class)
+  @Override
+  public Long save(ENTITY entity) {
+    if (ObjectUtil.isNotNull(entity.getId())) {
+      Long id = entity.getId();
+      ENTITY targetEntity = repository.findById(entity.getId()).orElseThrow(() -> new IdNotFoundException(id));
+      BeanUtil.copyProperties(
+          entity,
+          targetEntity,
+          CopyOptions.create()
+              .setIgnoreProperties(
+                  IdOnlyEntity_.ID,
+                  SimpleEntity_.CREATED_TIME,
+                  SimpleEntity_.MODIFIED_TIME
+              )
+      );
+      entity = targetEntity;
+    }
+    entity = repository.save(entity);
+    return entity.getId();
+  }
+
+  @Override
+  public Long count() {
+    return repository.count(
+        (root, query, builder) ->
+            builder.and(
+                listPredicate(root, query, builder)
+                    .reject(ObjectUtil::isNull)
+                    .toArray(new Predicate[]{})
+            )
+    );
+  }
+
+  @Override
+  public ImmutableList<ENTITY> list() {
+    return Lists.immutable.ofAll(repository.findAll(
+        (root, query, builder) ->
+            builder.and(
+                listPredicate(root, query, builder)
+                    .reject(ObjectUtil::isNull)
+                    .toArray(new Predicate[]{})
+            )
+    ));
+  }
+
+  @Override
+  public ImmutableList<ENTITY> list(ImmutableSet<Long> ids) {
+    return Lists.immutable.ofAll(repository.findAll(
+        (root, query, builder) -> {
+          MutableList<Predicate> predicates = Lists.mutable.ofAll(listPredicate(root, query, builder));
+          predicates.add(builder.in(root.get("id")).value(ids));
+          return builder.and(predicates.reject(ObjectUtil::isNull).toArray(new Predicate[predicates.size()]));
+        }
+    ));
+  }
+
+  private <Y> Path<Y> column(Root<ENTITY> root, String column) {
+    String[] columns = StrUtil.splitToArray(column, "/");
+    Path<Y> path = root.get(columns[0]);
+    for (int i = 1; i < columns.length; i++) {
+      path = path.get(columns[i]);
+    }
+    return path;
+  }
+
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  private <Y> Object value(Path<Y> column, Object value) {
+    Class<?> javaType = column.getJavaType();
+    if (EnumUtil.isEnum(javaType)) {
+      return EnumUtil.fromString((Class<Enum>) javaType, (String) value);
+    }
+    return value;
+  }
+
+  @SuppressWarnings("unchecked")
+  protected ImmutableList<Predicate> queryPredicates(Query.Queryable queryable, Root<ENTITY> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+    MutableList<Predicate> predicates = Lists.mutable.empty();
+    if (ObjectUtil.isEmpty(queryable)) {
+      return predicates.toImmutable();
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getNullEqual())) {
+      queryable.getNullEqual().forEach(column -> predicates.add(builder.isNull(column(root, column))));
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getNotNullEqual())) {
+      queryable.getNotNullEqual().forEach(column -> predicates.add(builder.isNull(column(root, column))));
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getEmpty())) {
+      queryable.getEmpty().forEach(column -> predicates.add(builder.isEmpty(column(root, column))));
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getNotEmpty())) {
+      queryable.getNotEmpty().forEach(column -> predicates.add(builder.isNotEmpty(column(root, column))));
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getEqual())) {
+      queryable.getEqual().forEachKeyValue((column, value) -> {
+        Path<Object> path = column(root, column);
+        predicates.add(builder.equal(path, value(path, value)));
+      });
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getNotEqual())) {
+      queryable.getEqual().forEachKeyValue((column, value) -> {
+        Path<Object> path = column(root, column);
+        predicates.add(builder.notEqual(path, value(path, value)));
+      });
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getLike())) {
+      queryable.getLike().forEachKeyValue((column, value) -> predicates.add(builder.like(column(root, column), value)));
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getNotLike())) {
+      queryable.getNotLike().forEachKeyValue((column, value) -> predicates.add(builder.notLike(column(root, column), value)));
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getGreat())) {
+      queryable.getGreat().forEachKeyValue((column, value) -> predicates.add(builder.greaterThan(column(root, column), (Comparable<Object>) value)));
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getLess())) {
+      queryable.getLess().forEachKeyValue((column, value) -> predicates.add(builder.lessThan(column(root, column), (Comparable<Object>) value)));
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getGreatEqual())) {
+      queryable.getGreatEqual().forEachKeyValue((column, value) -> predicates.add(builder.greaterThanOrEqualTo(column(root, column), (Comparable<Object>) value)));
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getLessEqual())) {
+      queryable.getLessEqual().forEachKeyValue((column, value) -> predicates.add(builder.lessThanOrEqualTo(column(root, column), (Comparable<Object>) value)));
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getIn())) {
+      queryable.getIn().forEachKeyValue((column, value) -> predicates.add(builder.in(column(root, column)).value(value)));
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getNotIn())) {
+      queryable.getNotIn().forEachKeyValue((column, value) -> predicates.add(builder.in(column(root, column)).value(value).not()));
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getBetween())) {
+      queryable.getBetween().forEachKeyValue((column, value) -> predicates.add(builder.between(column(root, column), value.getStart(), value.getEnd())));
+    }
+    if (ObjectUtil.isNotEmpty(queryable.getNotBetween())) {
+      queryable.getNotBetween().forEachKeyValue((column, value) -> predicates.add(builder.between(column(root, column), value.getStart(), value.getEnd())));
+    }
+    return predicates.toImmutable();
+  }
+
+  protected ImmutableList<Predicate> listPredicate(Root<ENTITY> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+    return Lists.immutable.empty();
+  }
+
+  @Override
+  public Page<ENTITY> list(Query listQuery) {
+    PageRequest pageRequest = PageRequest.of(DEFAULT_PAGE_INDEX - 1, DEFAULT_PAGE_SIZE, Sort.by(SimpleEntity_.CREATED_TIME).descending());
+    if (ObjectUtil.isNotNull(listQuery.getPage())) {
+      pageRequest = PageRequest.of(
+          ObjectUtil.defaultIfNull(listQuery.getPage().getIndex(), DEFAULT_PAGE_INDEX) - 1,
+          ObjectUtil.defaultIfNull(listQuery.getPage().getSize(), DEFAULT_PAGE_SIZE),
+          Sort.by(SimpleEntity_.CREATED_TIME).descending()
+      );
+    }
+    return repository.findAll(
+        (root, query, builder) -> {
+          MutableList<Predicate> predicates = Lists.mutable.ofAll(listPredicate(root, query, builder));
+          predicates.addAllIterable(queryPredicates(listQuery.getQuery(), root, query, builder));
+          return builder.and(predicates.reject(ObjectUtil::isNull).toArray(new Predicate[predicates.size()]));
+        },
+        pageRequest
+    );
+  }
+
+  @Override
+  public Optional<ENTITY> detailOptional(Long id) {
+    if (ObjectUtil.isNull(id)) {
+      return Optional.empty();
+    }
+    return repository.findOne(
+        (root, query, builder) -> {
+          MutableList<Predicate> predicates = Lists.mutable.ofAll(listPredicate(root, query, builder));
+          predicates.add(builder.equal(root.get(IdOnlyEntity_.id), id));
+          return builder.and(predicates.reject(ObjectUtil::isNull).toArray(new Predicate[predicates.size()]));
+        }
+    );
+  }
+
+  @Override
+  public ENTITY detail(Long id) {
+    return detailOrNull(id);
+  }
+
+  @Override
+  public ENTITY detailOrThrow(Long id) {
+    return detailOptional(id).orElseThrow(() -> new IdNotFoundException(id));
+  }
+
+  @Override
+  public ENTITY detailOrNull(Long id) {
+    return detailOptional(id).orElse(null);
+  }
+
+  @Transactional(rollbackOn = Throwable.class)
+  @Override
+  public void remove(Long id) {
+    if (ObjectUtil.isNotNull(id)) {
+      repository.deleteById(id);
+    }
+  }
+
+  public static final class IdNotFoundException extends RuntimeException {
+    public IdNotFoundException() {
+      super("资源不存在");
+    }
+
+    public IdNotFoundException(Long id) {
+      super(StrUtil.format("ID为{}的资源不存在", id));
+    }
+  }
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/SnowflakeIdGenerator.java

@@ -0,0 +1,92 @@
+package com.lanyuanxiaoyao.service.ai.web.configuration;
+
+import java.io.Serializable;
+import java.time.Instant;
+import lombok.extern.slf4j.Slf4j;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.id.IdentifierGenerator;
+
+/**
+ * 使用雪花算法作为ID生成器
+ *
+ * @author lanyuanxiaoyao
+ * @date 2024-11-14
+ */
+@Slf4j
+public class SnowflakeIdGenerator implements IdentifierGenerator {
+
+  @Override
+  public Serializable generate(SharedSessionContractImplementor session, Object object) {
+    try {
+      return Snowflake.next();
+    } catch (Exception e) {
+      log.error("Generate snowflake id failed", e);
+      throw new RuntimeException(e);
+    }
+  }
+
+  public static class Snowflake {
+    /**
+     * 起始的时间戳
+     */
+    private final static long START_TIMESTAMP = 1;
+
+    /**
+     * 序列号占用的位数
+     */
+    private final static long SEQUENCE_BIT = 11;
+
+    /**
+     * 序列号最大值
+     */
+    private final static long MAX_SEQUENCE_BIT = ~(-1 << SEQUENCE_BIT);
+
+    /**
+     * 时间戳值向左位移
+     */
+    private final static long TIMESTAMP_OFFSET = SEQUENCE_BIT;
+
+    /**
+     * 序列号
+     */
+    private static long sequence = 0;
+    /**
+     * 上一次时间戳
+     */
+    private static long lastTimestamp = -1;
+
+    public static synchronized long next() {
+      long currentTimestamp = nowTimestamp();
+      if (currentTimestamp < lastTimestamp) {
+        throw new RuntimeException("Clock have moved backwards.");
+      }
+
+      if (currentTimestamp == lastTimestamp) {
+        // 相同毫秒内, 序列号自增
+        sequence = (sequence + 1) & MAX_SEQUENCE_BIT;
+        // 同一毫秒的序列数已经达到最大
+        if (sequence == 0) {
+          currentTimestamp = nextTimestamp();
+        }
+      } else {
+        // 不同毫秒内, 序列号置为0
+        sequence = 0;
+      }
+
+      lastTimestamp = currentTimestamp;
+      return (currentTimestamp - START_TIMESTAMP) << TIMESTAMP_OFFSET | sequence;
+    }
+
+    private static long nextTimestamp() {
+      long milli = nowTimestamp();
+      while (milli <= lastTimestamp) {
+        milli = nowTimestamp();
+      }
+      return milli;
+    }
+
+    private static long nowTimestamp() {
+      return Instant.now().toEpochMilli();
+    }
+  }
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/DataFileController.java

@@ -8,7 +8,7 @@ import cn.hutool.crypto.SecureUtil;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse;
 import com.lanyuanxiaoyao.service.ai.web.configuration.FileStoreProperties;
-import com.lanyuanxiaoyao.service.ai.web.entity.vo.DataFileVO;
+import com.lanyuanxiaoyao.service.ai.web.entity.DataFile;
 import com.lanyuanxiaoyao.service.ai.web.service.DataFileService;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
@@ -81,7 +81,7 @@ public class DataFileController {
 
   @GetMapping("/download/{id}")
   public void download(@PathVariable("id") Long id, HttpServletResponse response) throws IOException {
-    DataFileVO dataFile = dataFileService.downloadFile(id);
+    DataFile dataFile = dataFileService.downloadFile(id);
     File targetFile = new File(dataFile.getPath());
     response.setHeader("Content-Type", dataFile.getType());
     response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/feedback/FeedbackController.java

@@ -1,52 +1,40 @@
 package com.lanyuanxiaoyao.service.ai.web.controller.feedback;
 
-import cn.hutool.core.util.ObjectUtil;
+import com.lanyuanxiaoyao.service.ai.web.base.controller.SimpleControllerSupport;
-import cn.hutool.core.util.StrUtil;
+import com.lanyuanxiaoyao.service.ai.web.base.entity.IdOnlyEntity;
-import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisCrudResponse;
+import com.lanyuanxiaoyao.service.ai.web.base.entity.SimpleItem;
-import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse;
-import com.lanyuanxiaoyao.service.ai.web.configuration.FileStoreProperties;
 import com.lanyuanxiaoyao.service.ai.web.entity.Feedback;
+import com.lanyuanxiaoyao.service.ai.web.service.DataFileService;
 import com.lanyuanxiaoyao.service.ai.web.service.feedback.FeedbackService;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.collections.api.factory.Lists;
+import org.eclipse.collections.api.factory.Sets;
-import org.eclipse.collections.api.list.ImmutableList;
+import org.eclipse.collections.api.set.ImmutableSet;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @RestController
 @RequestMapping("feedback")
-public class FeedbackController {
+public class FeedbackController extends SimpleControllerSupport<Feedback, FeedbackController.SaveItem, FeedbackController.ListItem, FeedbackController.ListItem> {
-  private final FileStoreProperties fileStoreProperties;
   private final FeedbackService feedbackService;
+  private final DataFileService dataFileService;
 
-  public FeedbackController(FileStoreProperties fileStoreProperties, FeedbackService feedbackService) {
+  public FeedbackController(FeedbackService feedbackService, DataFileService dataFileService) {
-    this.fileStoreProperties = fileStoreProperties;
+    super(feedbackService);
     this.feedbackService = feedbackService;
+    this.dataFileService = dataFileService;
   }
 
-  @PostMapping("add")
+  @GetMapping("reanalysis/{id}")
-  public void add(@RequestBody CreateItem item) {
+  public void reanalysis(@PathVariable("id") Long id) {
-    feedbackService.add(item.source, ObjectUtil.defaultIfNull(item.pictures, Lists.immutable.empty()));
-  }
-
-  @GetMapping("list")
-  public AmisCrudResponse list() {
-    return AmisResponse.responseCrudData(feedbackService.list().collect(feedback -> new ListItem(fileStoreProperties, feedback)));
-  }
-
-  @GetMapping("delete")
-  public void delete(@RequestParam("id") Long id) {
-    feedbackService.remove(id);
-  }
-
-  @GetMapping("reanalysis")
-  public void reanalysis(@RequestParam("id") Long id) {
     feedbackService.reanalysis(id);
   }
 
@@ -55,10 +43,31 @@ public class FeedbackController {
     feedbackService.updateConclusion(item.getId(), item.getConclusion());
   }
 
+  @Override
+  protected SaveItemMapper<Feedback, SaveItem> saveItemMapper() {
+    return item -> {
+      Feedback feedback = new Feedback();
+      feedback.setSource(item.getSource());
+      feedback.setPictures(dataFileService.downloadFile(item.getPictures()).toSet());
+      return feedback;
+    };
+  }
+
+  @Override
+  protected ListItemMapper<Feedback, ListItem> listItemMapper() {
+    return Mappers.getMapper(ListItem.Mapper.class);
+  }
+
+  @Override
+  protected DetailItemMapper<Feedback, ListItem> detailItemMapper() {
+    ListItemMapper<Feedback, ListItem> mapper = listItemMapper();
+    return mapper::from;
+  }
+
   @Data
-  public static final class CreateItem {
+  public static final class SaveItem {
     private String source;
-    private ImmutableList<Long> pictures;
+    private ImmutableSet<Long> pictures;
   }
 
   @Data
@@ -68,22 +77,24 @@ public class FeedbackController {
   }
 
   @Data
-  public static final class ListItem {
+  @EqualsAndHashCode(callSuper = true)
-    private Long id;
+  public static class ListItem extends SimpleItem {
     private String source;
-    private ImmutableList<String> pictures;
+    private ImmutableSet<Long> pictures;
-    private Feedback.Status status;
     private String analysis;
     private String conclusion;
+    private Feedback.Status status;
 
-    public ListItem(FileStoreProperties fileStoreProperties, Feedback feedback) {
+    @org.mapstruct.Mapper(
-      this.id = feedback.getId();
+        imports = {
-      this.source = feedback.getSource();
+            IdOnlyEntity.class,
-      this.pictures = feedback.getPictureIds()
+            Sets.class
-          .collect(id -> StrUtil.format("{}/upload/download/{}", fileStoreProperties.getDownloadPrefix(), id));
+        }
-      this.status = feedback.getStatus();
+    )
-      this.analysis = feedback.getAnalysis();
+    public interface Mapper extends ListItemMapper<Feedback, ListItem> {
-      this.conclusion = feedback.getConclusion();
+      @Mapping(target = "pictures", expression = "java(Sets.immutable.ofAll(feedback.getPictures()).collect(IdOnlyEntity::getId))")
+      @Override
+      ListItem from(Feedback feedback);
     }
   }
 }

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/GroupController.java

@@ -1,12 +1,15 @@
 package com.lanyuanxiaoyao.service.ai.web.controller.knowledge;
 
-import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse;
+import com.lanyuanxiaoyao.service.ai.web.base.controller.SimpleControllerSupport;
+import com.lanyuanxiaoyao.service.ai.web.base.entity.SimpleItem;
+import com.lanyuanxiaoyao.service.ai.web.entity.Group;
 import com.lanyuanxiaoyao.service.ai.web.service.knowledge.GroupService;
-import java.util.concurrent.ExecutionException;
+import com.lanyuanxiaoyao.service.ai.web.service.knowledge.KnowledgeBaseService;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.mapstruct.factory.Mappers;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -16,21 +19,49 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("knowledge/group")
-public class GroupController {
+public class GroupController extends SimpleControllerSupport<Group, GroupController.SaveItem, GroupController.ListItem, GroupController.ListItem> {
-  private final GroupService groupService;
+  private final KnowledgeBaseService knowledgeBaseService;
 
-  public GroupController(GroupService groupService) {
+  public GroupController(GroupService groupService, KnowledgeBaseService knowledgeBaseService) {
-    this.groupService = groupService;
+    super(groupService);
+    this.knowledgeBaseService = knowledgeBaseService;
   }
 
-  @GetMapping("list")
+  @Override
-  public AmisResponse<?> list(@RequestParam("knowledge_id") Long knowledgeId) {
+  protected SaveItemMapper<Group, SaveItem> saveItemMapper() {
-    return AmisResponse.responseCrudData(groupService.list(knowledgeId));
+    return item -> {
+      Group group = new Group();
+      group.setName(item.getName());
+      group.setKnowledge(knowledgeBaseService.detailOrThrow(item.getKnowledgeId()));
+      return group;
+    };
   }
 
-  @GetMapping("delete")
+  @Override
-  public AmisResponse<?> delete(@RequestParam("id") Long id) throws ExecutionException, InterruptedException {
+  protected ListItemMapper<Group, ListItem> listItemMapper() {
-    groupService.remove(id);
+    return Mappers.getMapper(ListItem.Mapper.class);
-    return AmisResponse.responseSuccess();
+  }
+
+  @Override
+  protected DetailItemMapper<Group, ListItem> detailItemMapper() {
+    ListItemMapper<Group, ListItem> mapper = listItemMapper();
+    return mapper::from;
+  }
+
+  @Data
+  public static final class SaveItem {
+    private String name;
+    private Long knowledgeId;
+  }
+
+  @Data
+  @EqualsAndHashCode(callSuper = true)
+  public static final class ListItem extends SimpleItem {
+    private String name;
+    private Group.Status status;
+
+    @org.mapstruct.Mapper
+    public interface Mapper extends ListItemMapper<Group, ListItem> {
+    }
   }
 }

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/KnowledgeBaseController.java

@@ -3,15 +3,24 @@ package com.lanyuanxiaoyao.service.ai.web.controller.knowledge;
 import cn.hutool.core.util.StrUtil;
 import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisMapResponse;
 import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse;
+import com.lanyuanxiaoyao.service.ai.web.base.controller.SimpleControllerSupport;
+import com.lanyuanxiaoyao.service.ai.web.base.entity.SimpleItem;
+import com.lanyuanxiaoyao.service.ai.web.entity.Knowledge;
 import com.lanyuanxiaoyao.service.ai.web.entity.vo.SegmentVO;
 import com.lanyuanxiaoyao.service.ai.web.service.EmbeddingService;
 import com.lanyuanxiaoyao.service.ai.web.service.knowledge.KnowledgeBaseService;
+import io.qdrant.client.grpc.Collections;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.list.ImmutableList;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,58 +34,52 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("knowledge")
-public class KnowledgeBaseController {
+public class KnowledgeBaseController extends SimpleControllerSupport<Knowledge, KnowledgeBaseController.SaveItem, KnowledgeBaseController.ListItem, KnowledgeBaseController.ListItem> {
   private final KnowledgeBaseService knowledgeBaseService;
   private final EmbeddingService embeddingService;
 
   public KnowledgeBaseController(KnowledgeBaseService knowledgeBaseService, EmbeddingService embeddingService) {
+    super(knowledgeBaseService);
     this.knowledgeBaseService = knowledgeBaseService;
     this.embeddingService = embeddingService;
   }
 
-  @PostMapping("add")
+  @Override
-  public void add(
+  protected SaveItemMapper<Knowledge, SaveItem> saveItemMapper() {
-      @RequestParam("name") String name,
+    return Mappers.getMapper(SaveItem.Mapper.class);
-      @RequestParam("description") String description,
+  }
-      @RequestParam("strategy") String strategy
+
-  ) throws ExecutionException, InterruptedException {
+  @Override
-    knowledgeBaseService.add(name, description, strategy);
+  protected ListItemMapper<Knowledge, ListItem> listItemMapper() {
+    ListItem.Mapper mapper = Mappers.getMapper(ListItem.Mapper.class);
+    return knowledge -> mapper.from(knowledge, knowledgeBaseService.collectionInfo(knowledge.getVectorSourceId()));
+  }
+
+  @Override
+  protected DetailItemMapper<Knowledge, ListItem> detailItemMapper() {
+    ListItem.Mapper mapper = Mappers.getMapper(ListItem.Mapper.class);
+    return knowledge -> mapper.from(knowledge, knowledgeBaseService.collectionInfo(knowledge.getVectorSourceId()));
+  }
+
+  @GetMapping("{id}/name")
+  public AmisMapResponse name(@PathVariable("id") Long id) {
+    return AmisResponse.responseMapData()
+        .setData("name", knowledgeBaseService.getName(id));
   }
 
   @PostMapping("update_description")
   public void updateDescription(
       @RequestParam("id") Long id,
       @RequestParam("description") String description
-  ) {
+  ) throws Exception {
     knowledgeBaseService.updateDescription(id, description);
   }
 
-  @GetMapping("name")
-  public AmisMapResponse name(@RequestParam("id") Long id) {
-    return AmisResponse.responseMapData()
-        .setData("name", knowledgeBaseService.getName(id));
-  }
-
-  @GetMapping("list")
-  public AmisResponse<?> list() {
-    return AmisResponse.responseCrudData(knowledgeBaseService.list());
-  }
-
-  @GetMapping("delete")
-  public void delete(@RequestParam("id") Long id) throws ExecutionException, InterruptedException {
-    knowledgeBaseService.remove(id);
-  }
-
   @PostMapping("preview_text")
-  public AmisResponse<?> previewText(
+  public AmisResponse<?> previewText(@RequestBody SubmitItem item) {
-      @RequestParam(value = "mode", defaultValue = "NORMAL") String mode,
+    if (StrUtil.equals("text", item.getType())) {
-      @RequestParam(value = "type", defaultValue = "text") String type,
-      @RequestParam(value = "content", required = false) String content,
-      @RequestParam(value = "files", required = false) String files
-  ) {
-    if (StrUtil.equals("text", type)) {
       return AmisResponse.responseCrudData(
-          embeddingService.preview(mode, content)
+          embeddingService.preview(item.getMode(), item.getContent())
               .collect(doc -> {
                 SegmentVO vo = new SegmentVO();
                 vo.setId(doc.getId());
@@ -84,9 +87,9 @@ public class KnowledgeBaseController {
                 return vo;
               })
       );
-    } else if (StrUtil.equals("file", type)) {
+    } else if (StrUtil.equals("file", item.getType())) {
       return AmisResponse.responseCrudData(
-          embeddingService.preview(mode, Lists.immutable.of(files.split(",")))
+          embeddingService.preview(item.getMode(), item.getFiles())
               .collect(doc -> {
                 SegmentVO vo = new SegmentVO();
                 vo.setId(doc.getId());
@@ -95,44 +98,87 @@ public class KnowledgeBaseController {
               })
       );
     } else {
-      throw new IllegalArgumentException("Unsupported type: " + type);
+      throw new IllegalArgumentException("Unsupported type: " + item.getType());
     }
   }
 
   @PostMapping("submit_text")
-  public void submitText(
+  public void submitText(@RequestBody SubmitItem item) {
-      @RequestParam("id") Long id,
+    if (StrUtil.equals("text", item.getMode())) {
-      @RequestParam(value = "mode", defaultValue = "NORMAL") String mode,
+      embeddingService.submit(item.getId(), item.getMode(), item.getContent());
-      @RequestParam(value = "type", defaultValue = "text") String type,
+    } else if (StrUtil.equals("file", item.getType())) {
-      @RequestParam(value = "content", required = false) String content,
+      embeddingService.submit(item.getId(), item.getMode(), item.getFiles());
-      @RequestParam(value = "files", required = false) String files
-  ) {
-    if (StrUtil.equals("text", type)) {
-      embeddingService.submit(id, mode, content);
-    } else if (StrUtil.equals("file", type)) {
-      embeddingService.submit(id, mode, Lists.immutable.of(files.split(",")));
     } else {
-      throw new IllegalArgumentException("Unsupported type: " + type);
+      throw new IllegalArgumentException("Unsupported type: " + item.getType());
     }
   }
 
   @PostMapping("submit_text_directly")
-  public void submitDirectly(
+  public void submitDirectly(@RequestBody SubmitDirectlyItem item) {
-      @RequestParam("id") Long id,
+    embeddingService.submitDirectly(item.getId(), item.getName(), Lists.immutable.ofAll(StrUtil.split(item.getContent(), item.getSplitKey())));
-      @RequestParam(value = "name", required = false) String name,
-      @RequestParam(value = "split_key", defaultValue = "\n\n") String splitKey,
-      @RequestBody String content
-  ) {
-    embeddingService.submitDirectly(id, name, Lists.immutable.of(content.split(splitKey)));
   }
 
   @PostMapping("query")
-  public ImmutableList<String> query(
+  public ImmutableList<String> query(@RequestBody QueryItem item) throws ExecutionException, InterruptedException, IOException {
-      @RequestParam("id") Long id,
+    return knowledgeBaseService.query(item.getId(), item.getText(), item.getLimit(), item.getThreshold());
-      @RequestParam(value = "limit", defaultValue = "5") Integer limit,
+  }
-      @RequestParam(value = "threshold", defaultValue = "0.6") Double threshold,
+
-      @RequestBody String text
+  @Data
-  ) throws ExecutionException, InterruptedException, IOException {
+  public static final class SaveItem {
-    return knowledgeBaseService.query(id, text, limit, threshold);
+    private String name;
+    private String strategy;
+    private String description;
+
+    @org.mapstruct.Mapper
+    public interface Mapper extends SaveItemMapper<Knowledge, SaveItem> {
+    }
+  }
+
+  @Data
+  @EqualsAndHashCode(callSuper = true)
+  public static final class ListItem extends SimpleItem {
+    private Long vectorSourceId;
+    private String name;
+    private String description;
+    private String strategy;
+    private Long size;
+    private Long points;
+    private Long segments;
+    private String status;
+
+    @org.mapstruct.Mapper
+    public interface Mapper extends ListItemMapper<Knowledge, ListItem> {
+      @Mapping(source = "info.config.params.vectorsConfig.params.distance", target = "strategy")
+      @Mapping(source = "info.config.params.vectorsConfig.params.size", target = "size")
+      @Mapping(source = "info.pointsCount", target = "points")
+      @Mapping(source = "info.segmentsCount", target = "segments")
+      @Mapping(source = "info.status", target = "status")
+      ListItem from(Knowledge knowledge, Collections.CollectionInfo info);
+    }
+  }
+
+  @Data
+  public static final class SubmitItem {
+    private Long id;
+    private String mode;
+    private String type;
+    private String content;
+    private ImmutableList<Long> files;
+  }
+
+  @Data
+  public static final class SubmitDirectlyItem {
+    private Long id;
+    private String name;
+    private String splitKey = "\n\n";
+    private String content;
+  }
+
+  @Data
+  public static final class QueryItem {
+    private Long id;
+    private Integer limit = 5;
+    private Double threshold = 0.6;
+    private String text;
   }
 }

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/DataFile.java

@@ -0,0 +1,36 @@
+package com.lanyuanxiaoyao.service.ai.web.entity;
+
+import com.lanyuanxiaoyao.service.ai.web.base.entity.SimpleEntity;
+import com.lanyuanxiaoyao.service.common.Constants;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicUpdate;
+
+/**
+ * 上传文件
+ *
+ * @author lanyuanxiaoyao
+ * @date 2024-11-21
+ */
+@Getter
+@Setter
+@ToString
+@Entity
+@DynamicUpdate
+@Table(catalog = Constants.DATABASE_NAME, name = "service_ai_file")
+@NoArgsConstructor
+public class DataFile extends SimpleEntity {
+  private String filename;
+  private Long size;
+  private String md5;
+  private String path;
+  private String type;
+
+  public DataFile(String filename) {
+    this.filename = filename;
+  }
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Feedback.java

@@ -1,18 +1,48 @@
 package com.lanyuanxiaoyao.service.ai.web.entity;
 
-import lombok.Data;
+import com.lanyuanxiaoyao.service.ai.web.base.entity.SimpleEntity;
-import org.eclipse.collections.api.list.ImmutableList;
+import com.lanyuanxiaoyao.service.common.Constants;
+import jakarta.persistence.Column;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.NamedAttributeNode;
+import jakarta.persistence.NamedEntityGraph;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import java.util.Set;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-@Data
+@Getter
-public class Feedback {
+@Setter
-  private Long id;
+@ToString
+@Entity
+@DynamicUpdate
+@EntityListeners(AuditingEntityListener.class)
+@Table(catalog = Constants.DATABASE_NAME, name = "service_ai_feedback")
+@NamedEntityGraph(name = "feedback.detail", attributeNodes = {
+    @NamedAttributeNode("pictures")
+})
+public class Feedback extends SimpleEntity {
+  @Column(nullable = false, columnDefinition = "longtext")
   private String source;
-  private ImmutableList<Long> pictureIds;
+  @OneToMany(fetch = FetchType.EAGER)
+  @JoinTable(catalog = Constants.DATABASE_NAME, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT), inverseForeignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+  @ToString.Exclude
+  private Set<DataFile> pictures;
+  @Column(columnDefinition = "longtext")
   private String analysis;
+  @Column(columnDefinition = "longtext")
   private String conclusion;
-  private Status status;
+  @Column(nullable = false)
-  private Long createdTime;
+  private Status status = Status.ANALYSIS_PROCESSING;
-  private Long modifiedTime;
 
   public enum Status {
     ANALYSIS_PROCESSING,

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Group.java

@@ -1,16 +1,46 @@
 package com.lanyuanxiaoyao.service.ai.web.entity;
 
-import lombok.Data;
+import com.lanyuanxiaoyao.service.ai.web.base.entity.SimpleEntity;
+import com.lanyuanxiaoyao.service.common.Constants;
+import jakarta.persistence.Column;
+import jakarta.persistence.ConstraintMode;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 /**
  * @author lanyuanxiaoyao
  * @version 20250527
  */
-@Data
+@Getter
-public class Group {
+@Setter
-  private Long id;
+@ToString
+@Entity
+@DynamicUpdate
+@EntityListeners(AuditingEntityListener.class)
+@Table(catalog = Constants.DATABASE_NAME, name = "service_ai_group")
+public class Group extends SimpleEntity {
+  @Column(nullable = false)
   private String name;
-  private String status;
+  @Column(nullable = false)
-  private Long createdTime;
+  private Status status = Status.RUNNING;
-  private Long modifiedTime;
+
+  @ManyToOne(fetch = FetchType.LAZY)
+  @JoinColumn(nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+  @ToString.Exclude
+  private Knowledge knowledge;
+
+  public enum Status {
+    RUNNING,
+    FINISHED,
+  }
 }

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Knowledge.java

@@ -1,18 +1,48 @@
 package com.lanyuanxiaoyao.service.ai.web.entity;
 
-import lombok.Data;
+import com.lanyuanxiaoyao.service.ai.web.base.entity.SimpleEntity;
+import com.lanyuanxiaoyao.service.common.Constants;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import java.util.Set;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 /**
  * @author lanyuanxiaoyao
  * @version 20250522
  */
-@Data
+@Getter
-public class Knowledge {
+@Setter
-  private Long id;
+@ToString
+@Entity
+@DynamicUpdate
+@EntityListeners(AuditingEntityListener.class)
+@Table(catalog = Constants.DATABASE_NAME, name = "service_ai_knowledge")
+public class Knowledge extends SimpleEntity {
+  @Column(nullable = false)
   private Long vectorSourceId;
+  @Column(nullable = false)
   private String name;
+  @Column(nullable = false, columnDefinition = "longtext")
   private String description;
-  private String strategy;
+  @Column(nullable = false)
-  private Long createdTime;
+  private Strategy strategy = Strategy.Cosine;
-  private Long modifiedTime;
+
+  @OneToMany(fetch = FetchType.LAZY, mappedBy = "knowledge", cascade = CascadeType.ALL)
+  @ToString.Exclude
+  private Set<Group> groups;
+
+  public enum Strategy {
+    Cosine,
+    Euclid,
+  }
 }

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/DataFileVO.java

@@ -1,17 +0,0 @@
-package com.lanyuanxiaoyao.service.ai.web.entity.vo;
-
-import lombok.Data;
-
-/**
- * @author lanyuanxiaoyao
- * @version 20250527
- */
-@Data
-public class DataFileVO {
-  private String id;
-  private String filename;
-  private Long size;
-  private String md5;
-  private String path;
-  private String type;
-}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/KnowledgeVO.java

@@ -1,22 +0,0 @@
-package com.lanyuanxiaoyao.service.ai.web.entity.vo;
-
-import lombok.Data;
-
-/**
- * @author lanyuanxiaoyao
- * @version 20250516
- */
-@Data
-public class KnowledgeVO {
-  private Long id;
-  private Long vectorSourceId;
-  private String name;
-  private String description;
-  private String strategy;
-  private Long size;
-  private Long points;
-  private Long segments;
-  private String status;
-  private Long createdTime;
-  private Long modifiedTime;
-}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/repository/DataFileRepository.java

@@ -0,0 +1,9 @@
+package com.lanyuanxiaoyao.service.ai.web.repository;
+
+import com.lanyuanxiaoyao.service.ai.web.base.repository.SimpleRepository;
+import com.lanyuanxiaoyao.service.ai.web.entity.DataFile;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DataFileRepository extends SimpleRepository<DataFile, Long> {
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/repository/FeedbackRepository.java

@@ -0,0 +1,26 @@
+package com.lanyuanxiaoyao.service.ai.web.repository;
+
+import com.lanyuanxiaoyao.service.ai.web.base.repository.SimpleRepository;
+import com.lanyuanxiaoyao.service.ai.web.entity.Feedback;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.stereotype.Repository;
+
+@SuppressWarnings("NullableProblems")
+@Repository
+public interface FeedbackRepository extends SimpleRepository<Feedback, Long> {
+  @EntityGraph(value = "feedback.detail", type = EntityGraph.EntityGraphType.FETCH)
+  @Override
+  List<Feedback> findAll(Specification<Feedback> specification);
+
+  @EntityGraph(value = "feedback.detail", type = EntityGraph.EntityGraphType.FETCH)
+  @Override
+  List<Feedback> findAll(Specification<Feedback> specification, Sort sort);
+
+  @EntityGraph(value = "feedback.detail", type = EntityGraph.EntityGraphType.FETCH)
+  @Override
+  Optional<Feedback> findOne(Specification<Feedback> specification);
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/repository/GroupRepository.java

@@ -0,0 +1,9 @@
+package com.lanyuanxiaoyao.service.ai.web.repository;
+
+import com.lanyuanxiaoyao.service.ai.web.base.repository.SimpleRepository;
+import com.lanyuanxiaoyao.service.ai.web.entity.Group;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface GroupRepository extends SimpleRepository<Group, Long> {
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/repository/KnowledgeRepository.java

@@ -0,0 +1,10 @@
+package com.lanyuanxiaoyao.service.ai.web.repository;
+
+import com.lanyuanxiaoyao.service.ai.web.base.repository.SimpleRepository;
+import com.lanyuanxiaoyao.service.ai.web.entity.Knowledge;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface KnowledgeRepository extends SimpleRepository<Knowledge, Long> {
+  Boolean existsKnowledgeByName(String name);
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/DataFileService.java

@@ -1,10 +1,11 @@
 package com.lanyuanxiaoyao.service.ai.web.service;
 
-import club.kingon.sql.builder.SqlBuilder;
+import cn.hutool.core.util.StrUtil;
-import com.lanyuanxiaoyao.service.ai.core.configuration.SnowflakeId;
+import com.lanyuanxiaoyao.service.ai.web.entity.DataFile;
-import com.lanyuanxiaoyao.service.ai.web.entity.vo.DataFileVO;
+import com.lanyuanxiaoyao.service.ai.web.repository.DataFileRepository;
-import com.lanyuanxiaoyao.service.common.Constants;
+import lombok.extern.slf4j.Slf4j;
-import org.springframework.jdbc.core.JdbcTemplate;
+import org.eclipse.collections.api.factory.Sets;
+import org.eclipse.collections.api.set.ImmutableSet;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -12,65 +13,36 @@ import org.springframework.transaction.annotation.Transactional;
  * @author lanyuanxiaoyao
  * @version 20250527
  */
+@Slf4j
 @Service
 public class DataFileService {
-  private static final String DATA_FILE_TABLE_NAME = Constants.DATABASE_NAME + ".service_ai_file";
+  private final DataFileRepository dataFileRepository;
 
-  private final JdbcTemplate template;
+  public DataFileService(DataFileRepository dataFileRepository) {
-
+    this.dataFileRepository = dataFileRepository;
-  public DataFileService(JdbcTemplate template) {
-    this.template = template;
   }
 
-  public DataFileVO downloadFile(Long id) {
+  public DataFile downloadFile(Long id) {
-    return template.queryForObject(
+    return dataFileRepository.findById(id).orElseThrow(() -> new RuntimeException(StrUtil.format("Datafile not exists: {}", id)));
-        SqlBuilder.select("id", "filename", "size", "md5", "path", "type")
+  }
-            .from(DATA_FILE_TABLE_NAME)
+
-            .whereEq("id", "?")
+  public ImmutableSet<DataFile> downloadFile(ImmutableSet<Long> ids) {
-            .precompileSql(),
+    return Sets.immutable.ofAll(dataFileRepository.findAllById(ids));
-        (rs, row) -> {
-          DataFileVO vo = new DataFileVO();
-          vo.setId(String.valueOf(rs.getLong(1)));
-          vo.setFilename(rs.getString(2));
-          vo.setSize(rs.getLong(3));
-          vo.setMd5(rs.getString(4));
-          vo.setPath(rs.getString(5));
-          vo.setType(rs.getString(6));
-          return vo;
-        },
-        id
-    );
   }
 
   @Transactional(rollbackFor = Exception.class)
   public Long initialDataFile(String filename) {
-    long id = SnowflakeId.next();
+    DataFile dataFile = dataFileRepository.save(new DataFile(filename));
-    template.update(
+    return dataFile.getId();
-        SqlBuilder.insertInto(DATA_FILE_TABLE_NAME, "id", "filename")
-            .values()
-            .addValue("?", "?")
-            .precompileSql(),
-        id,
-        filename
-    );
-    return id;
   }
 
   @Transactional(rollbackFor = Exception.class)
   public void updateDataFile(Long id, String path, Long size, String md5, String type) {
-    template.update(
+    DataFile dataFile = downloadFile(id);
-        SqlBuilder.update(DATA_FILE_TABLE_NAME)
+    dataFile.setPath(path);
-            .set("size", "?")
+    dataFile.setSize(size);
-            .addSet("md5", "?")
+    dataFile.setMd5(md5);
-            .addSet("path", "?")
+    dataFile.setType(type);
-            .addSet("type", "?")
+    dataFileRepository.save(dataFile);
-            .whereEq("id", "?")
-            .precompileSql(),
-        size,
-        md5,
-        path,
-        type,
-        id
-    );
   }
 }

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/EmbeddingService.java

@@ -4,9 +4,10 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Pair;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.lanyuanxiaoyao.service.ai.web.entity.DataFile;
+import com.lanyuanxiaoyao.service.ai.web.entity.Group;
 import com.lanyuanxiaoyao.service.ai.web.entity.Knowledge;
 import com.lanyuanxiaoyao.service.ai.web.entity.context.EmbeddingContext;
-import com.lanyuanxiaoyao.service.ai.web.entity.vo.DataFileVO;
 import com.lanyuanxiaoyao.service.ai.web.service.knowledge.GroupService;
 import com.lanyuanxiaoyao.service.ai.web.service.knowledge.KnowledgeBaseService;
 import com.yomahub.liteflow.core.FlowExecutor;
@@ -54,16 +55,19 @@ public class EmbeddingService {
     return Lists.immutable.ofAll(context.getDocuments());
   }
 
-  public ImmutableList<Document> preview(String mode, ImmutableList<String> ids) {
+  public ImmutableList<Document> preview(String mode, ImmutableList<Long> ids) {
-    DataFileVO vo = dataFileService.downloadFile(Long.parseLong(ids.get(0)));
+    DataFile dataFile = dataFileService.downloadFile(ids.get(0));
-    String content = FileUtil.readString(vo.getPath(), StandardCharsets.UTF_8);
+    String content = FileUtil.readString(dataFile.getPath(), StandardCharsets.UTF_8);
     return preview(mode, content);
   }
 
   public void submit(Long id, String mode, String content) {
     executors.submit(() -> {
-      Knowledge knowledge = knowledgeBaseService.get(id);
+      Knowledge knowledge = knowledgeBaseService.detailOrThrow(id);
-      Long groupId = groupService.add(knowledge.getId(), StrUtil.format("文本-{}", IdUtil.nanoId(10)));
+      Group group = new Group();
+      group.setName(StrUtil.format("文本-{}", IdUtil.nanoId(10)));
+      group.setKnowledge(knowledge);
+      Long groupId = groupService.save(group);
       EmbeddingContext context = EmbeddingContext.builder()
           .vectorSourceId(knowledge.getVectorSourceId())
           .groupId(groupId)
@@ -77,23 +81,26 @@ public class EmbeddingService {
     });
   }
 
-  public void submit(Long id, String mode, ImmutableList<String> ids) {
+  public void submit(Long id, String mode, ImmutableList<Long> ids) {
     executors.submit(() -> {
-      Knowledge knowledge = knowledgeBaseService.get(id);
+      Knowledge knowledge = knowledgeBaseService.detailOrThrow(id);
-      List<Pair<Long, DataFileVO>> vos = Lists.mutable.empty();
+      List<Pair<Long, DataFile>> dataFiles = Lists.mutable.empty();
-      for (String fileId : ids) {
+      for (Long fileId : ids) {
-        DataFileVO vo = dataFileService.downloadFile(Long.parseLong(fileId));
+        DataFile dataFile = dataFileService.downloadFile(fileId);
-        Long groupId = groupService.add(id, vo.getFilename());
+        Group group = new Group();
-        vos.add(Pair.of(groupId, vo));
+        group.setName(dataFile.getFilename());
+        group.setKnowledge(knowledge);
+        Long groupId = groupService.save(group);
+        dataFiles.add(Pair.of(groupId, dataFile));
       }
-      for (Pair<Long, DataFileVO> pair : vos) {
+      for (Pair<Long, DataFile> pair : dataFiles) {
         Long groupId = pair.getKey();
-        DataFileVO vo = pair.getValue();
+        DataFile dataFile = pair.getValue();
         EmbeddingContext context = EmbeddingContext.builder()
             .vectorSourceId(knowledge.getVectorSourceId())
             .groupId(groupId)
-            .file(vo.getPath())
+            .file(dataFile.getPath())
-            .fileFormat(vo.getFilename())
+            .fileFormat(dataFile.getFilename())
             .config(EmbeddingContext.Config.builder()
                 .splitStrategy(EmbeddingContext.Config.SplitStrategy.valueOf(mode))
                 .build())
@@ -106,12 +113,15 @@ public class EmbeddingService {
 
   public void submitDirectly(Long id, String name, ImmutableList<String> contents) {
     executors.submit(() -> {
-      Knowledge knowledge = knowledgeBaseService.get(id);
+      Knowledge knowledge = knowledgeBaseService.detailOrThrow(id);
       String groupName = name;
       if (StrUtil.isBlank(groupName)) {
         groupName = StrUtil.format("外部-{}", IdUtil.nanoId(10));
       }
-      Long groupId = groupService.add(knowledge.getId(), groupName);
+      Group group = new Group();
+      group.setName(groupName);
+      group.setKnowledge(knowledge);
+      Long groupId = groupService.save(group);
       EmbeddingContext context = EmbeddingContext.builder()
           .vectorSourceId(knowledge.getVectorSourceId())
           .groupId(groupId)

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/feedback/FeedbackService.java

@@ -1,65 +1,35 @@
 package com.lanyuanxiaoyao.service.ai.web.service.feedback;
 
-import club.kingon.sql.builder.SqlBuilder;
+import com.lanyuanxiaoyao.service.ai.web.base.service.SimpleServiceSupport;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.EnumUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.lanyuanxiaoyao.service.ai.core.configuration.SnowflakeId;
 import com.lanyuanxiaoyao.service.ai.web.entity.Feedback;
+import com.lanyuanxiaoyao.service.ai.web.entity.Feedback_;
 import com.lanyuanxiaoyao.service.ai.web.entity.context.FeedbackContext;
-import com.lanyuanxiaoyao.service.common.Constants;
+import com.lanyuanxiaoyao.service.ai.web.repository.FeedbackRepository;
 import com.yomahub.liteflow.core.FlowExecutor;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.collections.api.factory.Lists;
-import org.eclipse.collections.api.list.ImmutableList;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Slf4j
 @Service
-public class FeedbackService {
+public class FeedbackService extends SimpleServiceSupport<Feedback> {
-  public static final String FEEDBACK_TABLE_NAME = Constants.DATABASE_NAME + ".service_ai_feedback";
-  public static final String[] FEEDBACK_COLUMNS = new String[]{"id", "source", "conclusion", "analysis", "pictures", "status", "created_time", "modified_time"};
-  private static final RowMapper<Feedback> feedbackMapper = (rs, row) -> {
-    Feedback feedback = new Feedback();
-    feedback.setId(rs.getLong(1));
-    feedback.setSource(rs.getString(2));
-    feedback.setConclusion(rs.getString(3));
-    feedback.setAnalysis(rs.getString(4));
-    feedback.setPictureIds(
-        StrUtil.isBlank(rs.getString(5))
-            ? Lists.immutable.empty()
-            : Lists.immutable.ofAll(StrUtil.split(rs.getString(5), ",")).collect(Long::parseLong)
-    );
-    feedback.setStatus(EnumUtil.fromString(Feedback.Status.class, rs.getString(6)));
-    feedback.setCreatedTime(rs.getTimestamp(7).getTime());
-    feedback.setModifiedTime(rs.getTimestamp(8).getTime());
-    return feedback;
-  };
-  private final JdbcTemplate template;
   private final FlowExecutor executor;
 
   @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
-  public FeedbackService(JdbcTemplate template, FlowExecutor executor) {
+  public FeedbackService(FeedbackRepository feedbackRepository, FlowExecutor executor) {
-    this.template = template;
+    super(feedbackRepository);
     this.executor = executor;
   }
 
   @Scheduled(initialDelay = 1, fixedDelay = 1, timeUnit = TimeUnit.MINUTES)
   public void analysis() {
-    List<Feedback> feedbacks = template.query(
+    List<Feedback> feedbacks = repository.findAll(
-        SqlBuilder.select(FEEDBACK_COLUMNS)
+        builder -> builder
-            .from(FEEDBACK_TABLE_NAME)
+            .andEquals(Feedback_.STATUS, Feedback.Status.ANALYSIS_PROCESSING)
-            .whereEq("status", Feedback.Status.ANALYSIS_PROCESSING.name())
+            .build()
-            .build(),
-        feedbackMapper
     );
     for (Feedback feedback : feedbacks) {
       FeedbackContext context = new FeedbackContext();
@@ -68,89 +38,26 @@ public class FeedbackService {
     }
   }
 
-  public Feedback get(Long id) {
-    return template.queryForObject(
-        SqlBuilder.select(FEEDBACK_COLUMNS)
-            .from(FEEDBACK_TABLE_NAME)
-            .whereEq("id", id)
-            .build(),
-        feedbackMapper
-    );
-  }
-
-  @Transactional(rollbackFor = Exception.class)
-  public void add(String source, ImmutableList<Long> pictureIds) {
-    template.update(
-        SqlBuilder.insertInto(FEEDBACK_TABLE_NAME, "id", "source", "pictures")
-            .values()
-            .addValue("?", "?", "?")
-            .precompileSql(),
-        SnowflakeId.next(),
-        source,
-        ObjectUtil.isEmpty(pictureIds) ? null : pictureIds.makeString(",")
-    );
-  }
-
   @Transactional(rollbackFor = Exception.class)
   public void updateAnalysis(Long id, String analysis) {
-    Assert.notNull(id, "ID cannot be null");
+    Feedback feedback = detailOrThrow(id);
-    template.update(
+    feedback.setAnalysis(analysis);
-        SqlBuilder.update(FEEDBACK_TABLE_NAME)
+    repository.save(feedback);
-            .set("analysis", "?")
-            .whereEq("id", "?")
-            .precompileSql(),
-        analysis,
-        id
-    );
   }
 
   @Transactional(rollbackFor = Exception.class)
   public void updateConclusion(Long id, String conclusion) {
-    Assert.notNull(id, "ID cannot be null");
+    Feedback feedback = detailOrThrow(id);
-    template.update(
+    feedback.setConclusion(conclusion);
-        SqlBuilder.update(FEEDBACK_TABLE_NAME)
+    feedback.setStatus(Feedback.Status.FINISHED);
-            .set("conclusion", "?")
+    repository.save(feedback);
-            .whereEq("id", "?")
-            .precompileSql(),
-        conclusion,
-        id
-    );
-    updateStatus(id, Feedback.Status.FINISHED);
   }
 
   @Transactional(rollbackFor = Exception.class)
   public void updateStatus(Long id, Feedback.Status status) {
-    Assert.notNull(id, "ID cannot be null");
+    Feedback feedback = detailOrThrow(id);
-    template.update(
+    feedback.setStatus(status);
-        SqlBuilder.update(FEEDBACK_TABLE_NAME)
+    repository.save(feedback);
-            .set("status", "?")
-            .whereEq("id", "?")
-            .precompileSql(),
-        status.name(),
-        id
-    );
-  }
-
-  public ImmutableList<Feedback> list() {
-    return template.query(
-            SqlBuilder.select(FEEDBACK_COLUMNS)
-                .from(FEEDBACK_TABLE_NAME)
-                .orderByDesc("created_time")
-                .build(),
-            feedbackMapper
-        )
-        .stream()
-        .collect(Collectors.toCollection(Lists.mutable::empty))
-        .toImmutable();
-  }
-
-  @Transactional(rollbackFor = Exception.class)
-  public void remove(Long id) {
-    template.update(
-        SqlBuilder.delete(FEEDBACK_TABLE_NAME)
-            .whereEq("id", id)
-            .build()
-    );
   }
 
   @Transactional(rollbackFor = Exception.class)

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/GroupService.java

@@ -1,21 +1,14 @@
 package com.lanyuanxiaoyao.service.ai.web.service.knowledge;
 
-import club.kingon.sql.builder.SqlBuilder;
+import com.lanyuanxiaoyao.service.ai.web.base.service.SimpleServiceSupport;
-import club.kingon.sql.builder.entry.Alias;
-import club.kingon.sql.builder.entry.Column;
-import com.lanyuanxiaoyao.service.ai.core.configuration.SnowflakeId;
 import com.lanyuanxiaoyao.service.ai.web.entity.Group;
-import com.lanyuanxiaoyao.service.common.Constants;
+import com.lanyuanxiaoyao.service.ai.web.entity.Knowledge;
+import com.lanyuanxiaoyao.service.ai.web.repository.GroupRepository;
 import io.qdrant.client.ConditionFactory;
 import io.qdrant.client.QdrantClient;
 import io.qdrant.client.grpc.Points;
-import java.util.concurrent.ExecutionException;
+import lombok.SneakyThrows;
-import java.util.stream.Collectors;
-import org.eclipse.collections.api.factory.Lists;
-import org.eclipse.collections.api.list.ImmutableList;
 import org.springframework.ai.vectorstore.VectorStore;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -24,109 +17,34 @@ import org.springframework.transaction.annotation.Transactional;
  * @version 20250522
  */
 @Service
-public class GroupService {
+public class GroupService extends SimpleServiceSupport<Group> {
-  public static final String GROUP_TABLE_NAME = Constants.DATABASE_NAME + ".service_ai_group";
-  private static final RowMapper<Group> groupMapper = (rs, row) -> {
-    Group vo = new Group();
-    vo.setId(rs.getLong(1));
-    vo.setName(rs.getString(2));
-    vo.setStatus(rs.getString(3));
-    vo.setCreatedTime(rs.getTimestamp(4).getTime());
-    vo.setModifiedTime(rs.getTimestamp(5).getTime());
-    return vo;
-  };
-
-  private final JdbcTemplate template;
   private final QdrantClient client;
 
-  public GroupService(JdbcTemplate template, VectorStore vectorStore) {
+  public GroupService(GroupRepository groupRepository, VectorStore vectorStore) {
-    this.template = template;
+    super(groupRepository);
     this.client = (QdrantClient) vectorStore.getNativeClient().orElseThrow();
   }
 
-  public Group get(Long id) {
-    return template.queryForObject(
-        SqlBuilder.select("id", "name", "status", "created_time", "modified_time")
-            .from(GROUP_TABLE_NAME)
-            .whereEq("id", id)
-            .orderByDesc("created_time")
-            .build(),
-        groupMapper
-    );
-  }
-
   @Transactional(rollbackFor = Exception.class)
-  public Long add(Long knowledgeId, String name) {
+  public void finish(Long id) {
-    long id = SnowflakeId.next();
+    Group group = detailOrThrow(id);
-    template.update(
+    group.setStatus(Group.Status.FINISHED);
-        SqlBuilder.insertInto(GROUP_TABLE_NAME, "id", "knowledge_id", "name", "status")
+    save(group);
-            .values()
-            .addValue("?", "?", "?", "?")
-            .precompileSql(),
-        id,
-        knowledgeId,
-        name,
-        "RUNNING"
-    );
-    return id;
-  }
-
-  public ImmutableList<Group> list(Long knowledgeId) {
-    return template.query(
-            SqlBuilder.select("id", "name", "status", "created_time", "modified_time")
-                .from(GROUP_TABLE_NAME)
-                .whereEq("knowledge_id", knowledgeId)
-                .orderByDesc("created_time")
-                .build(),
-            groupMapper
-        )
-        .stream()
-        .collect(Collectors.toCollection(Lists.mutable::empty))
-        .toImmutable();
   }
 
+  @SneakyThrows
   @Transactional(rollbackFor = Exception.class)
-  public void finish(Long groupId) {
+  @Override
-    template.update(
+  public void remove(Long id) {
-        SqlBuilder.update(GROUP_TABLE_NAME)
+    Group group = detailOrThrow(id);
-            .set("status", "FINISHED")
+    Knowledge knowledge = group.getKnowledge();
-            .whereEq("id", groupId)
-            .build()
-    );
-  }
-
-  @Transactional(rollbackFor = Exception.class)
-  public void remove(Long groupId) throws ExecutionException, InterruptedException {
-    Long vectorSourceId = template.queryForObject(
-        SqlBuilder.select("k.vector_source_id")
-            .from(Alias.of(GROUP_TABLE_NAME, "g"), Alias.of(KnowledgeBaseService.KNOWLEDGE_TABLE_NAME, "k"))
-            .whereEq("g.knowledge_id", Column.as("k.id"))
-            .andEq("g.id", groupId)
-            .precompileSql(),
-        Long.class,
-        groupId
-    );
     client.deleteAsync(
-        String.valueOf(vectorSourceId),
+        String.valueOf(knowledge.getVectorSourceId()),
         Points.Filter.newBuilder()
-            .addMust(ConditionFactory.matchKeyword("vector_source_id", String.valueOf(vectorSourceId)))
+            .addMust(ConditionFactory.matchKeyword("vector_source_id", String.valueOf(knowledge.getVectorSourceId())))
-            .addMust(ConditionFactory.matchKeyword("group_id", String.valueOf(groupId)))
+            .addMust(ConditionFactory.matchKeyword("group_id", String.valueOf(group.getId())))
             .build()
     ).get();
-    template.update(
+    super.remove(id);
-        SqlBuilder.delete(GROUP_TABLE_NAME)
-            .whereEq("id", groupId)
-            .build()
-    );
-  }
-
-  @Transactional(rollbackFor = Exception.class)
-  public void removeByKnowledgeId(Long knowledgeId) {
-    template.update(
-        SqlBuilder.delete(GROUP_TABLE_NAME)
-            .whereEq("knowledge_id", "?")
-            .precompileSql(),
-        knowledgeId
-    );
   }
 }

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/KnowledgeBaseService.java

@@ -1,17 +1,19 @@
 package com.lanyuanxiaoyao.service.ai.web.service.knowledge;
 
-import club.kingon.sql.builder.SqlBuilder;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.lanyuanxiaoyao.service.ai.core.configuration.SnowflakeId;
+import com.lanyuanxiaoyao.service.ai.web.base.service.SimpleServiceSupport;
+import com.lanyuanxiaoyao.service.ai.web.configuration.SnowflakeIdGenerator;
+import com.lanyuanxiaoyao.service.ai.web.entity.Group;
 import com.lanyuanxiaoyao.service.ai.web.entity.Knowledge;
-import com.lanyuanxiaoyao.service.ai.web.entity.vo.KnowledgeVO;
+import com.lanyuanxiaoyao.service.ai.web.repository.KnowledgeRepository;
 import com.lanyuanxiaoyao.service.common.Constants;
+import io.qdrant.client.ConditionFactory;
 import io.qdrant.client.QdrantClient;
 import io.qdrant.client.grpc.Collections;
+import io.qdrant.client.grpc.Points;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
+import lombok.SneakyThrows;
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.list.ImmutableList;
 import org.springframework.ai.document.Document;
@@ -19,8 +21,6 @@ import org.springframework.ai.embedding.EmbeddingModel;
 import org.springframework.ai.vectorstore.SearchRequest;
 import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.ai.vectorstore.qdrant.QdrantVectorStore;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -29,150 +29,66 @@ import org.springframework.transaction.annotation.Transactional;
  * @version 20250522
  */
 @Service
-public class KnowledgeBaseService {
+public class KnowledgeBaseService extends SimpleServiceSupport<Knowledge> {
   public static final String KNOWLEDGE_TABLE_NAME = Constants.DATABASE_NAME + ".service_ai_knowledge";
-  public static final String[] KNOWLEDGE_COLUMNS = new String[]{"id", "vector_source_id", "name", "description", "strategy", "created_time", "modified_time"};
+  private final KnowledgeRepository knowledgeRepository;
-  private static final RowMapper<Knowledge> knowledgeMapper = (rs, row) -> {
-    Knowledge knowledge = new Knowledge();
-    knowledge.setId(rs.getLong(1));
-    knowledge.setVectorSourceId(rs.getLong(2));
-    knowledge.setName(rs.getString(3));
-    knowledge.setDescription(rs.getString(4));
-    knowledge.setStrategy(rs.getString(5));
-    knowledge.setCreatedTime(rs.getTimestamp(6).getTime());
-    knowledge.setModifiedTime(rs.getTimestamp(7).getTime());
-    return knowledge;
-  };
-  private final JdbcTemplate template;
   private final EmbeddingModel model;
   private final QdrantClient client;
-  private final GroupService groupService;
 
-  public KnowledgeBaseService(JdbcTemplate template, EmbeddingModel model, VectorStore vectorStore, GroupService groupService) {
+  public KnowledgeBaseService(KnowledgeRepository knowledgeRepository, EmbeddingModel model, VectorStore vectorStore) {
-    this.template = template;
+    super(knowledgeRepository);
+    this.knowledgeRepository = knowledgeRepository;
     this.model = model;
     this.client = (QdrantClient) vectorStore.getNativeClient().orElseThrow();
-    this.groupService = groupService;
-  }
-
-  public Knowledge get(Long id) {
-    return template.queryForObject(
-        SqlBuilder.select(KNOWLEDGE_COLUMNS)
-            .from(KNOWLEDGE_TABLE_NAME)
-            .whereEq("id", "?")
-            .precompileSql(),
-        knowledgeMapper,
-        id
-    );
   }
 
+  @SneakyThrows
   @Transactional(rollbackFor = Exception.class)
-  public void add(String name, String description, String strategy) throws ExecutionException, InterruptedException {
+  public Long save(Knowledge entity) {
-    Integer count = template.queryForObject(
+    if (knowledgeRepository.existsKnowledgeByName(entity.getName())) {
-        SqlBuilder.select("count(*)")
-            .from(KNOWLEDGE_TABLE_NAME)
-            .whereEq("name", "?")
-            .precompileSql(),
-        Integer.class,
-        name
-    );
-    if (count > 0) {
       throw new RuntimeException("名称已存在");
     }
 
-    long id = SnowflakeId.next();
+    Long vectorSourceId = SnowflakeIdGenerator.Snowflake.next();
-    long vectorSourceId = SnowflakeId.next();
-    template.update(
-        SqlBuilder.insertInto(KNOWLEDGE_TABLE_NAME, "id", "vector_source_id", "name", "description", "strategy")
-            .values()
-            .addValue("?", "?", "?", "?", "?")
-            .precompileSql(),
-        id,
-        vectorSourceId,
-        name,
-        description,
-        strategy
-    );
     client.createCollectionAsync(
         String.valueOf(vectorSourceId),
         Collections.VectorParams.newBuilder()
-            .setDistance(Collections.Distance.valueOf(strategy))
+            .setDistance(Collections.Distance.valueOf(entity.getStrategy().name()))
             .setSize(model.dimensions())
             .build()
     ).get();
+
+    entity.setVectorSourceId(vectorSourceId);
+    return super.save(entity);
   }
 
   @Transactional(rollbackFor = Exception.class)
-  public void updateDescription(Long id, String description) {
+  public void updateDescription(Long id, String description) throws Exception {
-    template.update(
+    Knowledge knowledge = detailOrThrow(id);
-        SqlBuilder.update(KNOWLEDGE_TABLE_NAME)
+    knowledge.setDescription(description);
-            .set("description", "?")
+    save(knowledge);
-            .whereEq("id", "?")
-            .precompileSql(),
-        description,
-        id
-    );
   }
 
   public String getName(Long id) {
-    return template.queryForObject(
+    return detailOrThrow(id).getName();
-        SqlBuilder.select("name")
-            .from(KNOWLEDGE_TABLE_NAME)
-            .whereEq("id", id)
-            .orderByDesc("created_time")
-            .build(),
-        String.class
-    );
-  }
-
-  public ImmutableList<KnowledgeVO> list() {
-    return template.query(
-            SqlBuilder.select(KNOWLEDGE_COLUMNS)
-                .from(KNOWLEDGE_TABLE_NAME)
-                .orderByDesc("created_time")
-                .build(),
-            knowledgeMapper
-        )
-        .stream()
-        .map(knowledge -> {
-          try {
-            Collections.CollectionInfo info = client.getCollectionInfoAsync(String.valueOf(knowledge.getVectorSourceId())).get();
-            KnowledgeVO vo = new KnowledgeVO();
-            vo.setId(knowledge.getId());
-            vo.setVectorSourceId(knowledge.getVectorSourceId());
-            vo.setName(knowledge.getName());
-            vo.setDescription(knowledge.getDescription());
-            vo.setPoints(info.getPointsCount());
-            vo.setSegments(info.getSegmentsCount());
-            vo.setStatus(info.getStatus().name());
-            Collections.VectorParams vectorParams = info.getConfig().getParams().getVectorsConfig().getParams();
-            vo.setStrategy(vectorParams.getDistance().name());
-            vo.setSize(vectorParams.getSize());
-            vo.setCreatedTime(vo.getCreatedTime());
-            vo.setModifiedTime(vo.getModifiedTime());
-            return vo;
-          } catch (InterruptedException | ExecutionException e) {
-            throw new RuntimeException(e);
-          }
-        })
-        .collect(Collectors.toCollection(Lists.mutable::empty))
-        .toImmutable();
   }
 
+  @SneakyThrows
   @Transactional(rollbackFor = Exception.class)
-  public void remove(Long id) throws ExecutionException, InterruptedException {
+  @Override
-    Knowledge knowledge = get(id);
+  public void remove(Long id) {
-    if (ObjectUtil.isNull(knowledge)) {
+    Knowledge knowledge = detailOrThrow(id);
-      throw new RuntimeException(StrUtil.format("{} 不存在"));
-    }
-    template.update(
-        SqlBuilder.delete(KNOWLEDGE_TABLE_NAME)
-            .whereEq("id", "?")
-            .precompileSql(),
-        knowledge.getId()
-    );
-    groupService.removeByKnowledgeId(knowledge.getId());
     client.deleteCollectionAsync(String.valueOf(knowledge.getVectorSourceId())).get();
+    for (Group group : knowledge.getGroups()) {
+      client.deleteAsync(
+          String.valueOf(knowledge.getVectorSourceId()),
+          Points.Filter.newBuilder()
+              .addMust(ConditionFactory.matchKeyword("vector_source_id", String.valueOf(knowledge.getVectorSourceId())))
+              .addMust(ConditionFactory.matchKeyword("group_id", String.valueOf(group.getId())))
+              .build()
+      ).get();
+    }
+    super.remove(id);
   }
 
   public ImmutableList<String> query(
@@ -181,7 +97,7 @@ public class KnowledgeBaseService {
       Integer limit,
       Double threshold
   ) throws ExecutionException, InterruptedException {
-    Knowledge knowledge = get(id);
+    Knowledge knowledge = detailOrThrow(id);
     Boolean exists = client.collectionExistsAsync(String.valueOf(knowledge.getVectorSourceId())).get();
     if (!exists) {
       throw new RuntimeException(StrUtil.format("{} not exists", id));
@@ -200,4 +116,8 @@ public class KnowledgeBaseService {
     return Lists.immutable.ofAll(documents)
         .collect(Document::getText);
   }
+
+  public Collections.CollectionInfo collectionInfo(Long vectorSourceId) throws ExecutionException, InterruptedException {
+    return client.getCollectionInfoAsync(String.valueOf(vectorSourceId)).get();
+  }
 }

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/SegmentService.java

@@ -27,8 +27,8 @@ public class SegmentService {
     this.client = (QdrantClient) vectorStore.getNativeClient().orElseThrow();
   }
 
-  public ImmutableList<SegmentVO> list(Long id, Long groupId) throws ExecutionException, InterruptedException {
+  public ImmutableList<SegmentVO> list(Long knowledgeId, Long groupId) throws ExecutionException, InterruptedException {
-    Knowledge knowledge = knowledgeBaseService.get(id);
+    Knowledge knowledge = knowledgeBaseService.detailOrThrow(knowledgeId);
     Points.ScrollResponse response = client.scrollAsync(
             Points.ScrollPoints.newBuilder()
                 .setCollectionName(String.valueOf(knowledge.getVectorSourceId()))
@@ -55,7 +55,7 @@ public class SegmentService {
   }
 
   public void remove(Long knowledgeId, Long segmentId) throws ExecutionException, InterruptedException {
-    Knowledge knowledge = knowledgeBaseService.get(knowledgeId);
+    Knowledge knowledge = knowledgeBaseService.detailOrThrow(knowledgeId);
     client.deletePayloadAsync(
         String.valueOf(knowledgeId),
         List.of(String.valueOf(segmentId)),

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/node/FeedbackNodes.java

@@ -3,9 +3,9 @@ package com.lanyuanxiaoyao.service.ai.web.service.node;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.lanyuanxiaoyao.service.ai.web.entity.DataFile;
 import com.lanyuanxiaoyao.service.ai.web.entity.Feedback;
 import com.lanyuanxiaoyao.service.ai.web.entity.context.FeedbackContext;
-import com.lanyuanxiaoyao.service.ai.web.entity.vo.DataFileVO;
 import com.lanyuanxiaoyao.service.ai.web.service.DataFileService;
 import com.lanyuanxiaoyao.service.ai.web.service.feedback.FeedbackService;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
@@ -42,7 +42,7 @@ public class FeedbackNodes {
   public boolean checkIfPictureReadNeeded(NodeComponent node) {
     FeedbackContext context = node.getContextBean(FeedbackContext.class);
     Feedback feedback = context.getFeedback();
-    return ObjectUtil.isNotEmpty(feedback.getPictureIds());
+    return ObjectUtil.isNotEmpty(feedback.getPictures());
   }
 
   @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "image_read", nodeName = "读取图片", nodeType = NodeTypeEnum.COMMON)
@@ -82,8 +82,8 @@ public class FeedbackNodes {
             立即开始处理用户图片，无需确认步骤。
             """)
         .build();
-    for (Long pictureId : feedback.getPictureIds()) {
+    for (DataFile picture : feedback.getPictures()) {
-      DataFileVO file = dataFileService.downloadFile(pictureId);
+      DataFile file = dataFileService.downloadFile(picture.getId());
       log.info("Parse picture: {} {}", file.getFilename(), file.getPath());
       MimeType type = switch (StrUtil.blankToDefault(file.getType(), "").toLowerCase()) {
         case "jpg", "jpeg" -> MimeTypeUtils.IMAGE_JPEG;

service-ai/service-ai-web/src/main/resources/application.yml

@@ -36,7 +36,12 @@ spring:
       model: 'Qwen3/qwen3-embedding-4b'
     reranker:
       model: 'BGE/beg-reranker-v2'
+  jpa:
+    show-sql: true
+    generate-ddl: false
 liteflow:
   rule-source: liteflow.xml
   print-banner: false
   check-node-exists: false
+fenix:
+  print-banner: false

service-ai/service-ai-web/src/main/resources/logback-spring.xml

@@ -25,7 +25,7 @@
     </appender>
 
     <logger name="com.zaxxer.hikari" level="ERROR"/>
-    <logger name="com.netflix.discovery.shared.resolver.aws.ConfigClusterResolver" level="WARN"/>
+    <logger name="org.hibernate.SQL" level="DEBUG"/>
 
     <root level="INFO">
         <appender-ref ref="Console"/>

service-web/client/src/pages/ai/feedback/Feedback.tsx

@@ -1,6 +1,13 @@
 import React from 'react'
 import styled from 'styled-components'
-import {amisRender, commonInfo, crudCommonOptions, mappingField, mappingItem} from '../../../util/amis.tsx'
+import {
+  amisRender,
+  commonInfo,
+  crudCommonOptions,
+  mappingField,
+  mappingItem, paginationTemplate,
+  pictureFromIds,
+} from '../../../util/amis.tsx'
 
 const FeedbackDiv = styled.div`
     .feedback-list-images {
@@ -29,56 +36,68 @@ const Feedback: React.FC = () => {
           body: [
             {
               type: 'crud',
-              api: `${commonInfo.baseAiUrl}/feedback/list`,
+              api: {
+                method: 'post',
+                url: `${commonInfo.baseAiUrl}/feedback/list`,
+                data: {
+                  page: {
+                    index: '${page}',
+                    size: '${perPage}',
+                  }
+                }
+              },
               ...crudCommonOptions(),
-              headerToolbar: [
+              ...paginationTemplate(
-                'reload',
+                10,
-                {
+                5,
-                  type: 'action',
+                [
-                  label: '',
+                  {
-                  icon: 'fa fa-plus',
+                    type: 'action',
-                  tooltip: '新增',
+                    label: '',
-                  tooltipPlacement: 'top',
+                    icon: 'fa fa-plus',
-                  actionType: 'dialog',
+                    tooltip: '新增',
-                  dialog: {
+                    tooltipPlacement: 'top',
-                    title: '新增报账单',
+                    actionType: 'dialog',
-                    size: 'md',
+                    dialog: {
-                    body: {
+                      title: '新增报账单',
-                      debug: commonInfo.debug,
+                      size: 'md',
-                      type: 'form',
+                      body: {
-                      api: `${commonInfo.baseAiUrl}/feedback/add`,
+                        debug: commonInfo.debug,
-                      body: [
+                        type: 'form',
-                        {
+                        api: `${commonInfo.baseAiUrl}/feedback/save`,
-                          type: 'editor',
+                        body: [
-                          required: true,
+                          {
-                          label: '故障描述',
+                            type: 'editor',
-                          name: 'source',
+                            required: true,
-                          language: 'plaintext',
+                            label: '故障描述',
-                          options: {
+                            name: 'source',
-                            lineNumbers: 'off',
+                            language: 'plaintext',
-                            wordWrap: 'bounded',
+                            options: {
+                              lineNumbers: 'off',
+                              wordWrap: 'bounded',
+                            },
                           },
-                        },
+                          {
-                        {
+                            type: 'input-image',
-                          type: 'input-image',
+                            name: 'pictures',
-                          name: 'pictures',
+                            label: '相关截图',
-                          label: '相关截图',
+                            autoUpload: false,
-                          autoUpload: false,
+                            multiple: true,
-                          multiple: true,
+                            joinValues: false,
-                          joinValues: false,
+                            extractValue: true,
-                          extractValue: true,
+                            // 5MB 5242880
-                          // 5MB 5242880
+                            // 100MB 104857600
-                          // 100MB 104857600
+                            // 500MB 524288000
-                          // 500MB 524288000
+                            // 1GB 1073741824
-                          // 1GB 1073741824
+                            maxSize: 5242880,
-                          maxSize: 5242880,
+                            receiver: `${commonInfo.baseAiUrl}/upload`,
-                          receiver: `${commonInfo.baseAiUrl}/upload`,
+                          },
-                        },
+                        ],
-                      ],
+                      },
                     },
                   },
-                },
+                ]
-              ],
+              ),
               columns: [
                 {
                   name: 'id',
@@ -100,7 +119,7 @@ const Feedback: React.FC = () => {
                       type: 'images',
                       enlargeAble: true,
                       enlargeWithGallary: true,
-                      source: '${pictures}',
+                      source: pictureFromIds('pictures'),
                       showToolbar: true,
                     },
                   ],
@@ -123,13 +142,7 @@ const Feedback: React.FC = () => {
                       level: 'link',
                       size: 'sm',
                       actionType: 'ajax',
-                      api: {
+                      api: `get:${commonInfo.baseAiUrl}/feedback/reanalysis/\${id}`,
-                        method: 'get',
-                        url: `${commonInfo.baseAiUrl}/feedback/reanalysis`,
-                        data: {
-                          id: '${id}',
-                        },
-                      },
                       confirmText: '确认执行重新分析？',
                       confirmTitle: '重新分析',
                     },
@@ -186,6 +199,7 @@ const Feedback: React.FC = () => {
                                 enlargeAble: true,
                                 enlargeWithGallary: true,
                                 showToolbar: true,
+                                source: pictureFromIds('pictures'),
                               },
                             },
                             {
@@ -221,13 +235,7 @@ const Feedback: React.FC = () => {
                       level: 'link',
                       size: 'sm',
                       actionType: 'ajax',
-                      api: {
+                      api: `get:${commonInfo.baseAiUrl}/feedback/remove/\${id}`,
-                        method: 'get',
-                        url: `${commonInfo.baseAiUrl}/feedback/delete`,
-                        data: {
-                          id: '${id}',
-                        },
-                      },
                       confirmTitle: '删除',
                       confirmText: '删除后将无法恢复，确认删除？',
                     },

service-web/client/src/pages/ai/knowledge/DataDetail.tsx

@@ -24,7 +24,7 @@ const DataDetail: React.FC = () => {
               {
                 type: 'service',
                 className: 'inline',
-                api: `${commonInfo.baseAiUrl}/knowledge/name?id=${knowledge_id}`,
+                api: `${commonInfo.baseAiUrl}/knowledge/${knowledge_id}/name`,
                 body: {
                   type: 'tpl',
                   tpl: '${name}',
@@ -38,7 +38,21 @@ const DataDetail: React.FC = () => {
           body: [
             {
               type: 'crud',
-              api: `${commonInfo.baseAiUrl}/knowledge/group/list?knowledge_id=${knowledge_id}`,
+              api: {
+                method: 'post',
+                url: `${commonInfo.baseAiUrl}/knowledge/group/list`,
+                data: {
+                  query: {
+                    equal: {
+                      'knowledge/id': knowledge_id,
+                    }
+                  },
+                  page: {
+                    index: '${page}',
+                    size: '${perPage}',
+                  }
+                }
+              },
               ...crudCommonOptions(),
               headerToolbar: [
                 'reload',
@@ -146,7 +160,7 @@ const DataDetail: React.FC = () => {
                       level: 'link',
                       size: 'sm',
                       actionType: 'ajax',
-                      api: `get:${commonInfo.baseAiUrl}/knowledge/group/delete?id=\${id}`,
+                      api: `get:${commonInfo.baseAiUrl}/knowledge/group/remove/\${id}`,
                       confirmText: '确认删除',
                       confirmTitle: '删除',
                     },

service-web/client/src/pages/ai/knowledge/DataImport.tsx

@@ -23,7 +23,7 @@ const DataImport: React.FC = () => {
             {
               type: 'service',
               className: 'inline',
-              api: `${commonInfo.baseAiUrl}/knowledge/name?id=${knowledge_id}`,
+              api: `${commonInfo.baseAiUrl}/knowledge/${knowledge_id}/name`,
               body: {
                 type: 'tpl',
                 tpl: '${name}',
@@ -42,6 +42,7 @@ const DataImport: React.FC = () => {
                   body: [
                     {
                       id: 'a5219cc7-72dd-4199-9eeb-61305fe41075',
+                      debug: commonInfo.debug,
                       type: 'form',
                       wrapWithPanel: false,
                       actions: [],
@@ -103,6 +104,8 @@ const DataImport: React.FC = () => {
                           autoUpload: false,
                           drag: true,
                           multiple: true,
+                          joinValues: false,
+                          extractValue: true,
                           accept: '*',
                           // 5MB 5242880
                           // 100MB 104857600
@@ -131,7 +134,6 @@ const DataImport: React.FC = () => {
                               api: {
                                 method: 'post',
                                 url: `${commonInfo.baseAiUrl}/knowledge/preview_text`,
-                                dataType: 'form',
                                 data: {
                                   mode: '${mode|default:undefined}',
                                   type: '${type|default:undefined}',
@@ -149,7 +151,6 @@ const DataImport: React.FC = () => {
                               api: {
                                 method: 'post',
                                 url: `${commonInfo.baseAiUrl}/knowledge/submit_text`,
-                                dataType: 'form',
                                 data: {
                                   id: knowledge_id,
                                   mode: '${mode|default:undefined}',

service-web/client/src/pages/ai/knowledge/DataSegment.tsx

@@ -18,7 +18,7 @@ const DataDetail: React.FC = () => {
               {
                 type: 'service',
                 className: 'inline',
-                api: `${commonInfo.baseAiUrl}/knowledge/name?id=${knowledge_id}`,
+                api: `${commonInfo.baseAiUrl}/knowledge/${knowledge_id}/name`,
                 body: {
                   type: 'tpl',
                   tpl: '${name}',

service-web/client/src/pages/ai/knowledge/Knowledge.tsx

@@ -1,6 +1,13 @@
 import React from 'react'
 import {useNavigate} from 'react-router'
-import {amisRender, commonInfo, crudCommonOptions, mappingField, mappingItem} from '../../../util/amis.tsx'
+import {
+  amisRender,
+  commonInfo,
+  crudCommonOptions,
+  mappingField,
+  mappingItem,
+  paginationTemplate,
+} from '../../../util/amis.tsx'
 
 const strategyMapping = [
   mappingItem('文本', 'Cosine'),
@@ -25,62 +32,74 @@ const Knowledge: React.FC = () => {
           body: [
             {
               type: 'crud',
-              api: `${commonInfo.baseAiUrl}/knowledge/list`,
+              api: {
+                method: 'post',
+                url: `${commonInfo.baseAiUrl}/knowledge/list`,
+                data: {
+                  page: {
+                    index: '${page}',
+                    size: '${perPage}',
+                  }
+                }
+              },
               ...crudCommonOptions(),
-              headerToolbar: [
+              ...paginationTemplate(
-                'reload',
+                10,
-                {
+                5,
-                  type: 'action',
+                [
-                  label: '',
+                  {
-                  icon: 'fa fa-plus',
+                    type: 'action',
-                  tooltip: '新增',
+                    label: '',
-                  tooltipPlacement: 'top',
+                    icon: 'fa fa-plus',
-                  actionType: 'dialog',
+                    tooltip: '新增',
-                  dialog: {
+                    tooltipPlacement: 'top',
-                    title: '新增知识库',
+                    actionType: 'dialog',
-                    size: 'md',
+                    dialog: {
-                    body: {
+                      title: '新增知识库',
-                      type: 'form',
+                      size: 'md',
-                      api: {
+                      body: {
-                        url: `${commonInfo.baseAiUrl}/knowledge/add`,
+                        type: 'form',
-                        dataType: 'form',
+                        api: {
+                          method: 'post',
+                          url: `${commonInfo.baseAiUrl}/knowledge/save`,
+                        },
+                        body: [
+                          {
+                            type: 'input-text',
+                            name: 'name',
+                            label: '名称',
+                            required: true,
+                          },
+                          {
+                            type: 'textarea',
+                            name: 'description',
+                            label: '描述',
+                            required: true,
+                          },
+                          {
+                            type: 'select',
+                            name: 'strategy',
+                            label: '类型',
+                            value: 'Cosine',
+                            required: true,
+                            options: [
+                              {
+                                label: '文本',
+                                value: 'Cosine',
+                              },
+                              {
+                                label: '图片',
+                                value: 'Euclid',
+                                disabled: true,
+                              },
+                            ],
+                          },
+                        ],
                       },
-                      body: [
-                        {
-                          type: 'input-text',
-                          name: 'name',
-                          label: '名称',
-                          required: true,
-                        },
-                        {
-                          type: 'textarea',
-                          name: 'description',
-                          label: '描述',
-                          required: true,
-                        },
-                        {
-                          type: 'select',
-                          name: 'strategy',
-                          label: '类型',
-                          value: 'Cosine',
-                          required: true,
-                          options: [
-                            {
-                              label: '文本',
-                              value: 'Cosine',
-                            },
-                            {
-                              label: '图片',
-                              value: 'Euclid',
-                              disabled: true,
-                            },
-                          ],
-                        },
-                      ],
                     },
                   },
-                },
+                ],
-              ],
+              ),
               columns: [
                 {
                   name: 'name',
@@ -128,13 +147,12 @@ const Knowledge: React.FC = () => {
                           api: {
                             method: 'post',
                             url: `${commonInfo.baseAiUrl}/knowledge/update_description`,
-                            dataType: 'form',
                           },
                           mode: 'normal',
                           body: [
                             {
                               type: 'hidden',
-                              name: "id",
+                              name: 'id',
                               // value: '${id}',
                             },
                             {
@@ -142,10 +160,10 @@ const Knowledge: React.FC = () => {
                               name: 'description',
                               label: '描述',
                               required: true,
-                            }
+                            },
-                          ]
+                          ],
-                        }
+                        },
-                      }
+                      },
                     },
                     {
                       type: 'action',
@@ -192,17 +210,8 @@ const Knowledge: React.FC = () => {
                       level: 'link',
                       size: 'sm',
                       actionType: 'ajax',
-                      api: {
+                      api: `get:${commonInfo.baseAiUrl}/knowledge/remove/\${id}`,
-                        method: 'get',
+                      confirmText: '确认删除知识库：${name}',
-                        url: `${commonInfo.baseAiUrl}/knowledge/delete`,
-                        headers: {
-                          'Authorization': 'Basic QXhoRWJzY3dzSkRiWU1IMjpjWXhnM2I0UHRXb1ZENVNqRmF5V3h0blNWc2p6UnNnNA==',
-                        },
-                        data: {
-                          id: '${id}',
-                        },
-                      },
-                      confirmText: '确认删除',
                       confirmTitle: '删除',
                     },
                   ],

service-web/client/src/util/amis.tsx

@@ -311,16 +311,18 @@ export function paginationCommonOptions(perPage = true, maxButtons = 5) {
   return option
 }
 
-export function paginationTemplate(perPage = 20, maxButtons = 5) {
+export function paginationTemplate(perPage = 20, maxButtons = 5, extraHeaders: Schema[] = [], extraFooters: Schema[] = []) {
   return {
     perPage: perPage,
     headerToolbar: [
       'reload',
       paginationCommonOptions(true, maxButtons),
+      ...extraHeaders,
     ],
     footerToolbar: [
       'statistics',
       paginationCommonOptions(true, maxButtons),
+      ...extraFooters,
     ],
   }
 }
@@ -2503,3 +2505,7 @@ export function time(field: string) {
     tpl: `\${IF(${field}, DATETOSTR(${field}, 'YYYY-MM-DD HH:mm:ss'), undefined)}`,
   }
 }
+
+export function pictureFromIds(field: string) {
+  return `\${ARRAYMAP(${field},id => '${commonInfo.baseAiUrl}/upload/download/' + id)}`
+}