Merge branch 'master' of https://git.enterlo.com/YuanJiFeng/emoon_ai

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/QualityControlRule.java

@@ -1,5 +1,6 @@
 package org.ruoyi.domain;
 
+import cn.hutool.core.thread.NamedThreadFactory;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.Data;
@@ -7,7 +8,13 @@ import lombok.EqualsAndHashCode;
 import org.ruoyi.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 质控规则对象 quality_control_rule
@@ -24,7 +31,7 @@ public class QualityControlRule extends TenantEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Long id;
@@ -45,10 +52,21 @@ public class QualityControlRule extends TenantEntity {
     private String ruleContent;
 
     /**
-     * 
+     * 规则描述
+     */
+    private String ruleDesc;
+
+    /**
+     * 备注字段
      */
     private String remark;
 
+    /**
+     * 质控行为：common-分开质控，specific-同时质控
+     */
+    @TableField(value = "qc_behavior")
+    private String qcBehavior;
+
     @TableField(value = "qc_type_list", typeHandler = JacksonTypeHandler.class)
     private List<Integer> qcTypeList;
 

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/bo/QualityControlRuleBo.java

@@ -45,11 +45,21 @@ public class QualityControlRuleBo extends BaseEntity {
     @NotBlank(message = "规则详情不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ruleContent;
 
+    /**
+     * 规则描述
+     */
+    private String ruleDesc;
+
     /**
      * 
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    /**
+     * 质控行为：common-分开质控，specific-同时质控
+     */
+    private String qcBehavior;
+
     private List<Integer> qcTypeList;
 }

ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/vo/QualityControlRuleVo.java

@@ -50,12 +50,24 @@ public class QualityControlRuleVo implements Serializable {
     @ExcelProperty(value = "规则详情")
     private String ruleContent;
 
+    /**
+     * 规则描述
+     */
+    @ExcelProperty(value = "规则描述")
+    private String ruleDesc;
+
     /**
      * 
      */
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 质控行为：common-分开质控，specific-同时质控
+     */
+    @ExcelProperty(value = "质控行为")
+    private String qcBehavior;
+
     @ExcelProperty(value = "质控类型")
     private List<Integer> qcTypeList;
 }