Merge branch 'dev2' into Cniprdev2

.idea/encodings.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/PAS/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/PAS/src/main/resources" charset="UTF-8" />
   </component>
 </project>

.idea/jarRepositories.xml

@@ -17,9 +17,19 @@
       <option name="url" value="https://maven.aliyun.com/repository/public/" />
     </remote-repository>
     <remote-repository>
+      <option name="id" value="nexus-aliyun" />
+      <option name="name" value="nexus-aliyun" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
   </component>
 </project>

.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.alibaba:druid:1.1.10">
+  <library name="Maven: com.alibaba:druid:1.1.20">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.10/druid-1.1.10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.20/druid-1.1.20.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.10/druid-1.1.10-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.20/druid-1.1.20-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.10/druid-1.1.10-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.20/druid-1.1.20-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10">
+  <library name="Maven: com.alibaba:druid-spring-boot-starter:1.1.20">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid-spring-boot-starter/1.1.10/druid-spring-boot-starter-1.1.10.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid-spring-boot-starter/1.1.20/druid-spring-boot-starter-1.1.20.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid-spring-boot-starter/1.1.10/druid-spring-boot-starter-1.1.10-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid-spring-boot-starter/1.1.20/druid-spring-boot-starter-1.1.20-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid-spring-boot-starter/1.1.10/druid-spring-boot-starter-1.1.10-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid-spring-boot-starter/1.1.20/druid-spring-boot-starter-1.1.20-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

PAS/pom.xml

@@ -175,7 +175,7 @@
     </dependencies>
 
     <build>
-        <finalName>PAS_TEST</finalName>
+        <finalName>PAS_PROD2.0</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

PAS/src/main/java/cn/cslg/pas/common/config/MybatisPlusConfig.java

@@ -11,7 +11,6 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @MapperScan("cn.cslg.pas.mapper")
 public class MybatisPlusConfig {
-
     @Bean//必须加Bean注解，否则无法拦截器里无法实例化serve
     public LizzMybatisIntercepts lizzMybatisIntercepts(){
         return  new LizzMybatisIntercepts();

PAS/src/main/java/cn/cslg/pas/common/model/dto/AssoProductPatentAddNewDTO.java

@@ -7,17 +7,17 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * 新增专利和多个产品关联的DTO类
+ * 新增多个专利和多个产品关联的DTO类
  */
 @Accessors(chain = true)
 @Data
 public class AssoProductPatentAddNewDTO implements Serializable {
     /**
-     * 专利号
+     * 专利号s
      */
-    private String patentNo;
+    private List<String> patentNos;
     /**
-     * 产品id
+     * 产品ids
      */
     private List<Integer> productIds;
 }

PAS/src/main/java/cn/cslg/pas/common/model/dto/AssoStructurePatentUpdateDTO.java

@@ -33,7 +33,7 @@ public class AssoStructurePatentUpdateDTO implements Serializable {
      */
     private Integer projectId;
     /**
-     * 更新类型(1新增 0删除)
+     * 更新类型(true新增 false删除)
      */
     private Boolean updateType;
 

PAS/src/main/java/cn/cslg/pas/common/model/dto/EventQueryPageDTO.java

@@ -1,6 +1,8 @@
 package cn.cslg.pas.common.model.dto;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
  * 事件的分页查询DTO类
@@ -8,6 +10,8 @@ import lombok.Data;
  * @Author chenyu
  * @Date 2023/4/2
  */
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
 @Data
 public class EventQueryPageDTO extends PageDTO2 {
     /**
@@ -22,5 +26,9 @@ public class EventQueryPageDTO extends PageDTO2 {
      * 租户id
      */
     private Integer tenantId;
+    /**
+     * 应用场景value
+     */
+    private Integer applicationScenario;
 
 }

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductQueryPageDTO.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.common.model.dto;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
@@ -9,6 +10,7 @@ import lombok.experimental.Accessors;
  * @Author chenyu
  * @Date 2023/3/8
  */
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @Data
 public class ProductQueryPageDTO extends PageDTO2 {
@@ -37,8 +39,8 @@ public class ProductQueryPageDTO extends PageDTO2 {
      */
     private String groupBy;
     /**
-     * 租户id
+     * 产品创建人所属租户id
      */
-    private Integer tenantId;
+    private Integer createPersonTenantId;
 
 }

PAS/src/main/java/cn/cslg/pas/common/model/dto/QueryInvestigationTypeProjectNumberDTO.java

@@ -0,0 +1,26 @@
+package cn.cslg.pas.common.model.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 根据应用场景和事件id查询调查类型对应的专题库数量(该事件对应的专题库中该应用场景的专题库数量)
+ *
+ * @Author chenyu
+ * @Date 2023/4/17
+ */
+@Accessors(chain = true)
+@Data
+public class QueryInvestigationTypeProjectNumberDTO implements Serializable {
+    /**
+     * 应用场景value
+     */
+    private Integer applicationScenario;
+    /**
+     * 事件id
+     */
+    private Integer eventId;
+
+}

PAS/src/main/java/cn/cslg/pas/common/model/params/PatentRightParams.java

@@ -1,12 +1,32 @@
 package cn.cslg.pas.common.model.params;
 
 import lombok.Data;
+import lombok.experimental.Accessors;
 
+/**
+ * 权利要求
+ */
+@Accessors(chain = true)
 @Data
 public class PatentRightParams {
+    /**
+     * 专利id
+     */
     private Integer patentId;
+    /**
+     * 专利号
+     */
     private String patentNo;
+    /**
+     * 原文
+     */
     private String content;
+    /**
+     * 译文
+     */
     private String contentOut;
+    /**
+     * 独立权要
+     */
     private String selfContent;
 }

PAS/src/main/java/cn/cslg/pas/common/model/vo/ApplicationScenarioEventNumberVO.java

@@ -0,0 +1,38 @@
+package cn.cslg.pas.common.model.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 应用场景及对应的事件数量
+ *
+ * @Author chenyu
+ * @Date 2023/4/15
+ */
+@Accessors(chain = true)
+@Data
+public class ApplicationScenarioEventNumberVO implements Serializable {
+    /**
+     * 应用场景数值
+     */
+    private Integer applicationScenarioValue;
+    /**
+     * 应用场景名称
+     */
+    private String applicationScenarioName;
+    /**
+     * 应用场景直接对应的事件数量
+     */
+    //private Integer eventNumberFromEvent;
+    /**
+     * 应用场景对应的专题库中事件的数量
+     */
+    //private Integer eventNumberFromProject;
+    /**
+     * 事件数量
+     */
+    private Integer eventNumber;
+
+}

PAS/src/main/java/cn/cslg/pas/common/model/vo/EventListItemVO.java

@@ -36,7 +36,7 @@ public class EventListItemVO implements Serializable {
      */
     private String applicationScenario;
     /**
-     * 应用场景ids
+     * 应用场景values
      */
     private List<Integer> applicationScenarios;
     /**
@@ -52,7 +52,6 @@ public class EventListItemVO implements Serializable {
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "event_date")
     private Date eventDate;
     /**
      * 租户id

PAS/src/main/java/cn/cslg/pas/common/model/vo/InvestigationTypeProjectNumberVO.java

@@ -0,0 +1,28 @@
+package cn.cslg.pas.common.model.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @Author chenyu
+ * @Date 2023/4/17
+ */
+@Accessors(chain = true)
+@Data
+public class InvestigationTypeProjectNumberVO implements Serializable {
+    /**
+     * 调查类型
+     */
+    private Integer investigationType;
+    /**
+     * 调查类型名称
+     */
+    private String investigationTypeName;
+    /**
+     * 专题库数量
+     */
+    private Integer projectNumber;
+
+}

PAS/src/main/java/cn/cslg/pas/common/model/vo/ProductVO.java

@@ -60,9 +60,9 @@ public class ProductVO implements Serializable {
     /**
      * 产品的相关专利和该产品所有架构的相关专利
      */
-    private List<String> relativePatents;
+    //private List<String> relativePatents;
     /**
-     * 相关专利数量
+     * 产品相关专利数量
      */
     private Integer patentNum;
     /**

PAS/src/main/java/cn/cslg/pas/common/model/vo/ProjectImportVO.java

@@ -1,9 +1,15 @@
 package cn.cslg.pas.common.model.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class ProjectImportVO extends BaseVO {
     private Integer projectId;
     private String createName;
+    @Schema(description = "专利号")
+    private String patentNo;
+    private List<Integer> createIds;
 }

PAS/src/main/java/cn/cslg/pas/common/model/vo/ProjectVO.java

@@ -33,6 +33,10 @@ public class ProjectVO extends BaseVO {
    登录人租户Id
     */
     private Integer tenantId;
+    /**
+     * 事件id
+     */
+    private Integer eventId;
 
     @Data
     public static class Sort {

PAS/src/main/java/cn/cslg/pas/common/model/vo/TaskVO.java

@@ -2,12 +2,22 @@ package cn.cslg.pas.common.model.vo;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class TaskVO extends BaseVO {
     private Integer projectId;
     private Integer status;
     private Integer type;
+    /**
+     * 创建人名称
+     */
     private String createName;
+    /**
+     * 创建人ids
+     */
+    private List<Integer> createPersonIds;
     private String projectName;
     private Integer productId;
+
 }

PAS/src/main/java/cn/cslg/pas/common/utils/PatentRightUtils.java

@@ -0,0 +1,269 @@
+package cn.cslg.pas.common.utils;
+
+import cn.cslg.pas.common.model.params.PatentRightParams;
+import cn.cslg.pas.domain.PatentRight;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 拆分权要工具类
+ *
+ * @Author chenyu
+ * @Date 2023/4/25
+ */
+@Component
+public class PatentRightUtils {
+
+    public List<PatentRight> formatPatentRight(PatentRightParams params) {
+        //国家
+        String country = params.getPatentNo().substring(0, 2);
+        //原文
+        String content = params.getContent();
+        //译文
+        String contentOut = params.getContentOut();
+
+        //创建一个权要集合
+        ArrayList<PatentRight> patentRights = new ArrayList<>();
+
+        //若权要原文为空，则直接返回空集合
+        if (content == null || content.equals("")) {
+            return patentRights;
+        }
+
+        //先去掉所有换行符，使原文连成一个长字符串
+        if (content.contains("\r\n")) {
+            content = content.replaceAll("\r\n", "");
+        } else {
+            content = content.replaceAll("\n", "");
+        }
+
+        if (contentOut == null) {
+            contentOut = "";
+        }
+        if (contentOut.contains("\r\n")) {
+            contentOut = contentOut.replaceAll("\r\n", "");
+        } else {
+            contentOut = contentOut.replaceAll("\n", "");
+        }
+        //去掉译文的所有空格
+        contentOut = contentOut.replaceAll(" +", "");
+
+        //中日韩专利↓
+        if (country.equals("CN") || country.equals("JP") || country.equals("KR")) {
+            String regex;
+            if (content.contains("。2.")) {
+                regex = "。[0-9]+\\.";
+            } else if (content.contains("。2、")) {
+                regex = "。[0-9]+、";
+            } else if (content.contains("[001]")) {
+                regex = "\\[[0-9]+]";
+            } else if (content.contains("請求項")) {
+                regex = "。【請求項[0-9]+】";
+            } else if (content.contains(".청구항 2")) {
+                regex = "\\.청구항 [0-9]+";
+            } else {
+                regex = "";
+            }
+            Matcher matcher = Pattern.compile(regex).matcher(content);
+            Matcher matcherOut = Pattern.compile(regex).matcher(contentOut);
+            while (matcher.find()) {
+                if (matcher.group().contains(".청구항")) {
+                    //".청구항 2" -> "\\.청구항 2"
+                    String matcherGroup = matcher.group().replace(".", "\\.");
+                    //".청구항 2" -> ".\n청구항 2"
+                    content = content.replaceFirst(matcherGroup, ".\n" + matcherGroup.substring(matcherGroup.indexOf(".") + 1));
+                } else if (matcher.group().contains(".")) {
+                    //"。2." -> "。2\\."
+                    String matcherGroup = matcher.group().replace(".", "\\.");
+                    //"。2." -> "。\n2."
+                    content = content.replaceFirst(matcherGroup, "。\n" + matcherGroup.substring(matcherGroup.indexOf("。") + 1, matcherGroup.indexOf("\\")) + ".");
+                } else if (matcher.group().contains("、") || matcher.group().contains("請求項")) {
+                    content = content.replaceFirst(matcher.group(), "。\n" + matcher.group().substring(matcher.group().indexOf("。") + 1));
+                }
+            }
+            String[] strs = content.split("\n");
+            while (matcherOut.find()) {
+                if (matcherOut.group().contains(".")) {
+                    String matcherOutGroup = matcherOut.group().replace(".", "\\.");
+                    contentOut = contentOut.replaceFirst(matcherOutGroup, "。\n" + matcherOutGroup.substring(matcherOutGroup.indexOf("。") + 1, matcherOutGroup.indexOf("\\")) + ".");
+                } else if (matcherOut.group().contains("、")) {
+                    contentOut = contentOut.replaceFirst(matcherOut.group(), "。\n" + matcherOut.group().substring(matcherOut.group().indexOf("。") + 1));
+                }
+            }
+            String[] strsOut = contentOut.split("\n");
+
+            //定义父权要排序号
+            String regex1 = "权利要求[0-9]+";
+            String regex2 = "权利要求[0-9]+[至或～-]+[0-9]+";
+            for (int i = 0; i < strs.length; i++) {
+                //之前：if (strs[i].contains("权利要求")) {
+                //现在：if(该权要有逗号，并且它第一句话中有"权利要求"4个字 || 该权要没有逗号，并且它有"权利要求"4个字) {
+                if ((strs[i].contains("，") && strs[i].substring(0, strs[i].indexOf("，")).contains("权利要求")) || (!strs[i].contains("，") && strs[i].contains("权利要求"))) {
+                    Matcher matcher1 = Pattern.compile(regex1).matcher(strs[i]);
+                    Matcher matcher2 = Pattern.compile(regex2).matcher(strs[i]);
+                    if (matcher2.find()) {
+                        String parentNum = matcher2.group().substring(matcher2.group().indexOf("求") + 1);
+                        String[] parentNums;
+                        if (parentNum.contains("～")) {
+                            parentNums = parentNum.split("～");
+                        } else if (parentNum.contains("-")) {
+                            parentNums = parentNum.split("-");
+                        } else if (parentNum.contains("至")) {
+                            parentNums = parentNum.split("至");
+                        } else if (parentNum.contains("或")) {
+                            parentNums = parentNum.split("或");
+                        } else {
+                            parentNums = new String[0];
+                        }
+                        StringBuilder builder = new StringBuilder();
+                        for (int j = Integer.parseInt(parentNums[0]) - 1; j < Integer.parseInt(parentNums[parentNums.length - 1]); j++) {
+                            if ((builder + "").equals("")) {
+                                builder.append(j);
+                            } else {
+                                builder.append(",").append(j);
+                            }
+                        }
+                        PatentRight patentRight = new PatentRight()
+                                .setPatentId(params.getPatentId())
+                                .setType(0)
+                                .setContent(strs[i])
+                                .setSort(i)
+                                .setParentSort(builder + "");
+                        if (strsOut.length - 1 >= i) {
+                            patentRight.setContentOut(strsOut[i]);
+                        }
+                        patentRights.add(patentRight);
+                    } else if (matcher1.find()) {
+                        String parentNum = matcher1.group().substring(matcher1.group().indexOf("求") + 1);
+                        PatentRight patentRight = new PatentRight()
+                                .setPatentId(params.getPatentId())
+                                .setType(0)
+                                .setContent(strs[i])
+                                .setSort(i)
+                                .setParentSort((Integer.parseInt(parentNum) - 1) + "");
+                        if (strsOut.length - 1 >= i) {
+                            patentRight.setContentOut(strsOut[i]);
+                        }
+                        patentRights.add(patentRight);
+                    }
+
+                } else {
+                    PatentRight patentRight = new PatentRight()
+                            .setPatentId(params.getPatentId())
+                            .setType(1)
+                            .setContent(strs[i])
+                            .setSort(i)
+                            .setParentSort("-1");
+                    if (strsOut.length - 1 >= i) {
+                        patentRight.setContentOut(strsOut[i]);
+                    }
+                    patentRights.add(patentRight);
+                }
+            }
+
+            //英文专利的权要拆分 ↓
+        } else {
+            content = content.substring(content.indexOf("1."));
+            if (contentOut.contains("1.")) {
+                contentOut = contentOut.substring(contentOut.indexOf("1."));
+            } else {
+                contentOut = contentOut.substring(contentOut.indexOf("1、"));
+            }
+            String regex;
+            if (content.contains("1.")) {
+                regex = "\\.[0-9]+\\. ";
+            } else if (content.contains("1、")) {
+                regex = "\\.[0-9]+\\. ";
+            } else if (content.contains("[001]")) {
+                regex = "\\[[0-9]+]";
+            } else {
+                regex = "";
+            }
+            Matcher matcher = Pattern.compile(regex).matcher(content);
+            Matcher matcherOut = Pattern.compile("。[0-9]+\\.").matcher(contentOut);
+            while (matcher.find()) {
+                String matcherGroup = matcher.group().replace(".", "\\.");
+                content = content.replaceFirst(matcherGroup, ".\n" + matcherGroup.substring(matcherGroup.indexOf(".") + 1, matcherGroup.lastIndexOf("\\")) + ". ");
+            }
+            String[] strs = content.split("\n");
+            while (matcherOut.find()) {
+                String matcherOutGroup = matcherOut.group().replace(".", "\\.");
+                contentOut = contentOut.replaceFirst(matcherOutGroup, "。\n" + matcherOutGroup.substring(matcherOutGroup.indexOf("。") + 1, matcherOutGroup.indexOf("\\")) + ".");
+            }
+            String[] strsOut = contentOut.split("\n");
+            //定义父权要排序号
+            String regex1 = "claim [0-9]+";
+            String regex2 = "claims [0-9]+ or [0-9]+";
+            for (int i = 0; i < strs.length; i++) {
+                if (strs[i].contains("claim")) {
+                    Matcher matcher1 = Pattern.compile(regex1).matcher(strs[i]);
+                    Matcher matcher2 = Pattern.compile(regex2).matcher(strs[i]);
+                    if (matcher2.find()) {
+                        String parentNum = matcher2.group().substring(matcher2.group().indexOf("s") + 2);
+                        String[] parentNums;
+                        if (parentNum.contains(" or ")) {
+                            parentNums = parentNum.split(" or ");
+                        } else if (parentNum.contains(" - ")) {
+                            parentNums = parentNum.split(" - ");
+                        } else if (parentNum.contains(" to ")) {
+                            parentNums = parentNum.split(" to ");
+                        } else if (parentNum.contains("或")) {
+                            parentNums = parentNum.split("或");
+                        } else {
+                            parentNums = new String[0];
+                        }
+                        StringBuilder builder = new StringBuilder();
+                        for (int j = Integer.parseInt(parentNums[0]) - 1; j < Integer.parseInt(parentNums[parentNums.length - 1]); j++) {
+                            if ((builder + "").equals("")) {
+                                builder.append(j);
+                            } else {
+                                builder.append(",").append(j);
+                            }
+                        }
+                        PatentRight patentRight = new PatentRight()
+                                .setPatentId(params.getPatentId())
+                                .setType(0)
+                                .setContent(strs[i])
+                                .setSort(i)
+                                .setParentSort(builder + "");
+                        if (strsOut.length - 1 >= i) {
+                            patentRight.setContentOut(strsOut[i]);
+                        }
+                        patentRights.add(patentRight);
+                    } else if (matcher1.find()) {
+                        String parentNum = matcher1.group().substring(matcher1.group().indexOf("m") + 2);
+                        PatentRight patentRight = new PatentRight()
+                                .setPatentId(params.getPatentId())
+                                .setType(0)
+                                .setContent(strs[i])
+                                .setSort(i)
+                                .setParentSort((Integer.parseInt(parentNum) - 1) + "");
+                        if (strsOut.length - 1 >= i) {
+                            patentRight.setContentOut(strsOut[i]);
+                        }
+                        patentRights.add(patentRight);
+                    }
+
+                } else {
+                    PatentRight patentRight = new PatentRight()
+                            .setPatentId(params.getPatentId())
+                            .setType(1)
+                            .setContent(strs[i])
+                            .setSort(i)
+                            .setParentSort("-1");
+                    if (strsOut.length - 1 >= i) {
+                        patentRight.setContentOut(strsOut[i]);
+                    }
+                    patentRights.add(patentRight);
+                }
+            }
+        }
+
+        return patentRights;
+    }
+
+}

PAS/src/main/java/cn/cslg/pas/controller/EventController.java

@@ -1,10 +1,10 @@
 package cn.cslg.pas.controller;
 
+import cn.cslg.pas.common.JsonPage;
 import cn.cslg.pas.common.core.base.Constants;
-import cn.cslg.pas.common.model.dto.EventAddNewDTO;
-import cn.cslg.pas.common.model.dto.EventQueryPageDTO;
-import cn.cslg.pas.common.model.dto.EventUpdateDTO;
-import cn.cslg.pas.common.model.dto.ProjectEventAddNewDTO;
+import cn.cslg.pas.common.model.dto.*;
+import cn.cslg.pas.common.model.vo.ApplicationScenarioEventNumberVO;
+import cn.cslg.pas.common.model.vo.InvestigationTypeProjectNumberVO;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.service.IEventService;
@@ -14,7 +14,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -64,6 +63,30 @@ public class EventController {
 
     }
 
+    @Operation(summary = "查询9大应用场景分别对应的事件数量")
+    @GetMapping("/queryApplicationScenarioEventNumber")
+    public String queryApplicationScenarioEventNumber() {
+        log.info("开始处理【查询9大应用场景分别对应的事件数量】的请求");
+        List<ApplicationScenarioEventNumberVO> queryResults = eventService.queryApplicationScenarioEventNumber();
+        return Response.success(queryResults);
+    }
+
+    @Operation(summary = "根据应用场景value和事件名称分页查询事件清单")
+    @PostMapping("/queryEvents")
+    public String queryEvents(@RequestBody EventQueryPageDTO eventQueryPageDTO) {
+        log.info("开始处理【根据应用场景value和事件名称分页查询事件清单】的请求，请求参数为：{}", eventQueryPageDTO);
+        JsonPage jsonPage = eventService.queryEvents(eventQueryPageDTO);
+        return Response.success(jsonPage);
+    }
+
+    @Operation(summary = "根据应用场景和事件id查询调查类型对应的专题库数量")
+    @PostMapping("/queryInvestigationTypeProjectNumber")
+    public String queryInvestigationTypeProjectNumber(@RequestBody QueryInvestigationTypeProjectNumberDTO queryInvestigationTypeProjectNumberDTO) {
+        List<InvestigationTypeProjectNumberVO> queryResults = eventService.queryInvestigationTypeProjectNumber(queryInvestigationTypeProjectNumberDTO);
+        return Response.success(queryResults);
+    }
+
+
     @Operation(summary = "修改事件")
     @PostMapping("/update")
     public String update(@RequestBody EventUpdateDTO eventUpdateDTO) {

PAS/src/main/java/cn/cslg/pas/controller/PatentAnnotationController.java

@@ -31,7 +31,7 @@ public class PatentAnnotationController {
     private final PatentAnnotationService patentAnnotationService;
 
     @checkAuth(FunId = "/workspace/details/notes/list")
-    @Permission(roles = {2})
+    @Permission(roles = {1,2,3,4})
     @GetMapping("list")
     @Operation(summary = "注释列表")
     public String getPageList(PatentAnnotationVO params) {
@@ -39,7 +39,7 @@ public class PatentAnnotationController {
     }
 
     @checkAuth(FunId = "/workspace/details/notes/add")
-    @Permission(roles = {2})
+    @Permission(roles = {1,2})
     @PostMapping("add")
     @Operation(summary = "选择注释")
     public String add(@RequestBody PatentAnnotation patentAnnotation) {
@@ -47,7 +47,7 @@ public class PatentAnnotationController {
     }
 
     @checkAuth(FunId = "/workspace/details/notes/modify")
-    @Permission(roles = {2})
+    @Permission(roles = {1,2})
     @PostMapping("edit")
     @Operation(summary = "编辑注释")
     public String edit(@RequestBody PatentAnnotation patentAnnotation) {
@@ -55,7 +55,7 @@ public class PatentAnnotationController {
     }
 
     @checkAuth(FunId = "/workspace/details/notes/delete")
-    @Permission(roles = {2})
+    @Permission(roles = {1,2})
     @PostMapping("delete")
     @Operation(summary = "删除注释")
     public String delete(Integer id) {

PAS/src/main/java/cn/cslg/pas/controller/ProductCategoryController.java

@@ -44,7 +44,7 @@ public class ProductCategoryController {
             }
             return Response.success("新增产品类别完成");
         }
-        return Response.error("请求参数为null");
+        return Response.error("无请求参数");
     }
 
     @Operation(summary = "分页查询产品类别")

PAS/src/main/java/cn/cslg/pas/controller/ProductController.java

@@ -103,12 +103,12 @@ public class ProductController {
         return Response.success("删除产品完成");
     }
 
-    @Operation(summary = "新增专利和多个产品关联")
+    @Operation(summary = "新增多个专利和多个产品关联")
     @PostMapping("/addNewAssoProductPatent")
     public String addNewAssoProductPatent(@RequestBody AssoProductPatentAddNewDTO assoProductPatentAddNewDTO) {
-        log.info("开始处理【新增专利和产品关联】的请求，请求参数为：{}", assoProductPatentAddNewDTO);
+        log.info("开始处理【新增多个专利和多个产品关联】的请求，请求参数为：{}", assoProductPatentAddNewDTO);
         assoProductPatentService.addNewAssoProductPatent(assoProductPatentAddNewDTO);
-        return Response.success("新增专利和产品关联完成");
+        return Response.success("新增多个专利和多个产品关联完成");
     }
 
 

PAS/src/main/java/cn/cslg/pas/controller/ProductPatentController.java

@@ -8,7 +8,6 @@ import cn.cslg.pas.common.model.vo.TaskVO;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.common.utils.auth.checkAuth;
-import cn.cslg.pas.domain.Task;
 import cn.cslg.pas.service.ProjectService;
 import cn.cslg.pas.service.TaskService;
 import cn.cslg.pas.service.UploadPatentBatchService;

PAS/src/main/java/cn/cslg/pas/controller/ProjectController.java

@@ -149,7 +149,7 @@ public class ProjectController {
     @PostMapping("copy")
     @Operation(summary = "复制专题库")
     public String copy(@RequestBody ProjectCopyDTO projectCopyDTO) throws IOException {
-          Integer  projectId = projectService.copy(projectCopyDTO);
+        Integer projectId = projectService.copy(projectCopyDTO);
         return Response.success(projectId);
     }
 }

PAS/src/main/java/cn/cslg/pas/controller/ProjectFieldController.java

@@ -38,7 +38,7 @@ public class ProjectFieldController {
     private final ProjectFieldService projectFieldService;
     private final CacheUtils cacheUtils;
     private final LoginUtils loginUtils;
-    @Permission(roles = {2})
+    @Permission(roles = {1,2,3,4})
     @checkAuth(FunId = "/workspace/common/customField/check")
     @GetMapping("list")
     @Operation(summary = "自定义字段列表")
@@ -46,7 +46,7 @@ public class ProjectFieldController {
         return Response.success(projectFieldService.getPageList(params));
     }
 
-    @Permission(roles = {2})
+    @Permission(roles = {1,2})
     @checkAuth(FunId = "/workspace/common/customField/add")
     @PostMapping("add")
     @Operation(summary = "新增自定义字段")
@@ -54,7 +54,7 @@ public class ProjectFieldController {
         return projectFieldService.add(projectField);
     }
 
-    @Permission(roles = {2})
+    @Permission(roles = {1,2})
     @checkAuth(FunId = "/workspace/common/customField/modify")
     @PostMapping("edit")
     @Operation(summary = "编辑自定义字段")
@@ -62,7 +62,7 @@ public class ProjectFieldController {
         return projectFieldService.edit(projectField);
     }
 
-    @Permission(roles = {2})
+    @Permission(roles = {1,2})
     @checkAuth(FunId = "/workspace/common/customField/delete")
     @PostMapping("delete")
     @Operation(summary = "删除自定义字段")
@@ -96,7 +96,7 @@ public class ProjectFieldController {
         return Response.success(true);
     }
 
-    @Permission(roles = {2})
+    @Permission(roles = {1,2})
     @checkAuth(FunId = "/workspace/common/customField/copy")
     @PostMapping("copy")
     @Operation(summary = "将自定义字段复制到一个专题库中")

PAS/src/main/java/cn/cslg/pas/controller/ProjectImportController.java

@@ -21,6 +21,9 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.util.List;
+
 /**
  * <p>
  * 专题库导入 前端控制器
@@ -41,7 +44,6 @@ public class ProjectImportController {
     private final LoginUtils loginUtils;
     private final UploadPatentBatchService uploadPatentBatchService;
 
-
     @Permission(roles = {2})
     @PostMapping("patent")
     @Operation(summary = "为专题库导入专利")
@@ -65,11 +67,11 @@ public class ProjectImportController {
 
     @GetMapping("list")
     @Operation(summary = "导入任务列表")
-    public String getPageList(ProjectImportVO params) {
+    public String getPageList(ProjectImportVO params) throws IOException {
         return Response.success(projectImportService.getPageList(params));
     }
 
-    @checkAuth(FunId = "/project/import/delete")
+    @checkAuth(FunId = "/workspace/common/taskDelete")
     @PostMapping("delete")
     @Operation(summary = "删除导入任务")
     public String delete(Integer id) {
@@ -107,4 +109,14 @@ public class ProjectImportController {
         }
         return Response.success(false);
     }
+
+    @PostMapping("importByNos")
+    @Operation(summary = "根据专利号导入专利到专题库")
+    public String importByNos(@RequestBody ProjectImportVO patentDTO) {
+        List<String> notQuery = projectImportService.importByNos(patentDTO);
+        if (notQuery.size() > 0) {
+            return Response.successBut(notQuery);
+        }
+        return Response.success(true);
+    }
 }

PAS/src/main/java/cn/cslg/pas/controller/ReportController.java

@@ -27,7 +27,6 @@ import java.util.List;
 @RequestMapping(Constants.API_VERSION_V2 + "/report")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class ReportController {
-
     private final ReportService reportService;
     private final CacheUtils cacheUtils;
     private final LoginUtils loginUtils;

PAS/src/main/java/cn/cslg/pas/controller/TaskController.java

@@ -11,6 +11,8 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
+
 /**
  * <p>
  * 任务 前端控制器
@@ -29,7 +31,7 @@ public class TaskController {
 
     @GetMapping("list")
     @Operation(summary = "任务列表")
-    public String getPageList(TaskVO params) {
+    public String getPageList(TaskVO params) throws IOException {
       return Response.success(taskService.getPageList(params));
     }
 

PAS/src/main/java/cn/cslg/pas/domain/ApplicationScenario.java

@@ -0,0 +1,26 @@
+package cn.cslg.pas.domain;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 应用场景实体类
+ *
+ * @Author chenyu
+ * @Date 2023/4/20
+ */
+@Accessors(chain = true)
+@Data
+public class ApplicationScenario implements Serializable {
+    /**
+     * 应用场景数值
+     */
+    private Integer applicationScenarioValue;
+    /**
+     * 应用场景名称
+     */
+    private String applicationScenarioName;
+
+}

PAS/src/main/java/cn/cslg/pas/domain/PatentApplicant.java

@@ -18,7 +18,6 @@ import java.util.List;
 @Data
 @TableName("os_patent_applicant")
 public class PatentApplicant extends BaseEntity<PatentApplicant> {
-
     /**
      * 申请人名称
      */

PAS/src/main/java/cn/cslg/pas/domain/PermissionRecord.java

@@ -56,6 +56,10 @@ public class PermissionRecord implements Serializable {
      */
     private Integer licenseType;
     /**
+     * 租户id
+     */
+    private Integer tenantId;
+    /**
      * 创建人id
      */
     private Integer createPersonId;

PAS/src/main/java/cn/cslg/pas/domain/Product.java

@@ -39,6 +39,10 @@ public class Product implements Serializable {
      */
     private Integer tenantId;
     /**
+     * 产品创建人所属租户id
+     */
+    private Integer createPersonTenantId;
+    /**
      * 产品说明
      */
     private String productExplain;

PAS/src/main/java/cn/cslg/pas/domain/ProjectImport.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,16 +15,21 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 专题库数据导入记录
+ *
  * @TableName os_thematic_import
  */
 @Data
-@TableName(value ="os_thematic_import")
+@TableName(value = "os_thematic_import")
 public class ProjectImport extends BaseEntity<ProjectImport> {
-
     /**
-     * 创建者
+     * 创建人id
      */
     private Integer createBy;
+    /**
+     * 创建人名称
+     */
+    @TableField(exist = false)
+    private String createName;
 
     /**
      * 创建时间
@@ -38,20 +44,18 @@ public class ProjectImport extends BaseEntity<ProjectImport> {
     private Long fileSize;
 
     /**
-     * 
+     *
      */
     private String url;
 
     /**
-     * 
+     *
      */
     private String fileName;
 
     /**
-     * 
+     *
      */
     private String oldName;
 
-    @TableField(exist = false)
-    private String createName;
 }

PAS/src/main/java/cn/cslg/pas/domain/Type.java

@@ -0,0 +1,26 @@
+package cn.cslg.pas.domain;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 调查类型实体类
+ *
+ * @Author chenyu
+ * @Date 2023/4/17
+ */
+@Accessors(chain = true)
+@Data
+public class Type implements Serializable {
+    /**
+     * 调查类型数值
+     */
+    private Integer typeId;
+    /**
+     * 调查类型名称
+     */
+    private String typeName;
+
+}

PAS/src/main/java/cn/cslg/pas/domain/asso/AssoStructurePatent.java

@@ -33,5 +33,9 @@ public class AssoStructurePatent implements Serializable {
      * 专题库id
      */
     private Integer projectId;
+    /**
+     * 架构路径
+     */
+    private String path;
 
 }

PAS/src/main/java/cn/cslg/pas/mapper/EventMapper.java

@@ -1,8 +1,15 @@
 package cn.cslg.pas.mapper;
 
+import cn.cslg.pas.Application;
 import cn.cslg.pas.common.model.dto.EventQueryPageDTO;
+import cn.cslg.pas.common.model.dto.QueryInvestigationTypeProjectNumberDTO;
+import cn.cslg.pas.common.model.vo.ApplicationScenarioEventNumberVO;
 import cn.cslg.pas.common.model.vo.EventListItemVO;
+import cn.cslg.pas.common.model.vo.InvestigationTypeProjectNumberVO;
+import cn.cslg.pas.domain.ApplicationScenario;
 import cn.cslg.pas.domain.Event;
+import cn.cslg.pas.domain.Project;
+import cn.cslg.pas.domain.Type;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 
@@ -33,5 +40,61 @@ public interface EventMapper extends BaseMapper<Event> {
      */
     List<EventListItemVO> queryList(EventQueryPageDTO eventQueryPageDTO);
 
+    /**
+     * 根据应用场景value和事件名称分页查询事件清单
+     *
+     * @param eventQueryPageDTO 查询参数
+     * @return 返回查询到的列表
+     */
+    List<EventListItemVO> queryEvents(EventQueryPageDTO eventQueryPageDTO);
+
+    /**
+     * 查询9大应用场景及分别对应的事件数量
+     *
+     * @param tenantId 租户id
+     * @return 返回查询到的数据
+     */
+    //List<ApplicationScenarioEventNumberVO> queryApplicationScenarioEventNumber(Integer tenantId);
+
+    /**
+     * 查询所有应用场景
+     *
+     * @return 返回查询到的数据
+     */
+    List<ApplicationScenario> queryApplicationScenarios();
+
+    /**
+     * 查询所有应用场景不是null的事件
+     *
+     * @param tenantId 租户id
+     * @return 返回查询到的数据
+     */
+    List<EventListItemVO> queryEventsDirectApplicationScenario(Integer tenantId);
+
+    /**
+     * 查询所有应用场景是null的事件(去关联专题库表查询出应用场景，就作为事件的应用场景)
+     *
+     * @param tenantId 租户id
+     * @return 返回查询到的数据
+     */
+    List<EventListItemVO> queryEventsInDirectApplicationScenario(Integer tenantId);
+
+
+    /**
+     * 根据应用场景查询调查类型
+     *
+     * @param applicationScenario 应用场景value
+     * @return 返回查询到的数据
+     */
+    List<Type> queryTypeid(Integer applicationScenario);
+
+    /**
+     * 根据应用场景和事件id查询专题库
+     *
+     * @param applicationScenario 应用场景
+     * @param eventId             事件id
+     * @return 返回查询到的数据
+     */
+    List<Project> queryProjects(Integer applicationScenario, Integer eventId);
 
 }

PAS/src/main/java/cn/cslg/pas/mapper/PermissionRecordMapper.java

@@ -43,9 +43,10 @@ public interface PermissionRecordMapper {
      * 根据专利号patentNo分页查询许可记录表数据
      *
      * @param patentNo 专利号
+     * @param tenantId 租户id
      * @return 返回查询到的数据
      */
-    List<PermissionRecordVO> queryAllInfo(String patentNo);
+    List<PermissionRecordVO> queryAllInfo(String patentNo, Integer tenantId);
 
 
     /**

PAS/src/main/java/cn/cslg/pas/mapper/ProductCategoryMapper.java

@@ -48,14 +48,14 @@ public interface ProductCategoryMapper {
      * @param productCategoryName 产品类别名称
      * @return 返回受影响的行数
      */
-    int countByProductCategoryName(String productCategoryName);
+    int countByProductCategoryName(String productCategoryName, Integer tenantId);
 
     /**
      * 根据id和名称统计数量
      *
      * @param id                  id
      * @param productCategoryName 名称
-     * @return
+     * @return 返回统计到的数量
      */
     int countByIdAndName(Integer id, String productCategoryName);
 

PAS/src/main/java/cn/cslg/pas/mapper/ProjectMapper.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Repository
 public interface ProjectMapper extends BaseMapper<Project> {
 
-    IPage<Project> getPageList(Page<Project> page, ProjectVO params);
+    IPage<Project>  getPageList(Page<Project> page, ProjectVO params);
 
     List<Project> getListForCount(@Param("params") ProjectVO params);
 

PAS/src/main/java/cn/cslg/pas/mapper/StructureMapper.java

@@ -78,11 +78,22 @@ public interface StructureMapper extends BaseMapper<Structure> {
      *
      * @param parentId  父级id
      * @param productId 产品id
+     * @param ids       架构ids(此为根据名称模糊查询架构树单一分支)
      * @return 返回查询到的数据
      */
     List<StructureVO> selectByParentIdAndProductId(Integer parentId, Integer productId, List<Integer> ids);
 
     /**
+     * 根据父级id和产品id查询数据
+     *
+     * @param parentId  父级id
+     * @param productId 产品id
+     * @param ids       架构ids(此为根据名称模糊查询架构树单一分支)
+     * @return 返回查询到的数据
+     */
+    List<StructureVO> selectTree(Integer parentId, Integer productId, List<Integer> ids);
+
+    /**
      * 根据模糊路径查询数据
      *
      * @param findInSetPath 模糊路径

PAS/src/main/java/cn/cslg/pas/service/IAssoProductPatentService.java

@@ -12,9 +12,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IAssoProductPatentService extends IService<AssoProductPatent> {
     /**
-     * 新增专利和产品关联
+     * 新增多个专利和多个产品关联
      *
-     * @param assoProductPatentAddNewDTO 新增专利和多个产品关联的DTO类
+     * @param assoProductPatentAddNewDTO 新增多个专利和多个产品关联的DTO类
      */
     void addNewAssoProductPatent(AssoProductPatentAddNewDTO assoProductPatentAddNewDTO);
 

PAS/src/main/java/cn/cslg/pas/service/IEventService.java

@@ -1,10 +1,9 @@
 package cn.cslg.pas.service;
 
 import cn.cslg.pas.common.JsonPage;
-import cn.cslg.pas.common.model.dto.EventAddNewDTO;
-import cn.cslg.pas.common.model.dto.EventQueryPageDTO;
-import cn.cslg.pas.common.model.dto.EventUpdateDTO;
-import cn.cslg.pas.common.model.dto.ProjectEventAddNewDTO;
+import cn.cslg.pas.common.model.dto.*;
+import cn.cslg.pas.common.model.vo.ApplicationScenarioEventNumberVO;
+import cn.cslg.pas.common.model.vo.InvestigationTypeProjectNumberVO;
 import cn.cslg.pas.domain.Event;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +42,30 @@ public interface IEventService extends IService<Event> {
     JsonPage query(EventQueryPageDTO eventQueryPageDTO);
 
     /**
+     * 查询9大应用场景分别对应的事件数量
+     *
+     * @return 返回查询到的数据
+     */
+    List<ApplicationScenarioEventNumberVO> queryApplicationScenarioEventNumber();
+
+    /**
+     * 根据应用场景value和事件名称分页查询事件清单
+     *
+     * @param eventQueryPageDTO 查询参数
+     * @return 返回查询到的数据
+     */
+    JsonPage queryEvents(EventQueryPageDTO eventQueryPageDTO);
+
+    /**
+     * 根据应用场景和事件id查询调查类型对应的专题库数量
+     *
+     * @param queryInvestigationTypeProjectNumberDTO 查询参数
+     * @return 返回查询到的数据
+     */
+    List<InvestigationTypeProjectNumberVO> queryInvestigationTypeProjectNumber(QueryInvestigationTypeProjectNumberDTO queryInvestigationTypeProjectNumberDTO);
+
+
+    /**
      * 修改事件
      *
      * @param eventUpdateDTO 修改事件的DTO类对象

PAS/src/main/java/cn/cslg/pas/service/OutInterfaceService.java

@@ -0,0 +1,35 @@
+package cn.cslg.pas.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.util.Objects;
+
+/**
+ * 调用外部接口的Service类 PCS:权限系统
+ *
+ * @Author chenyu
+ * @Date 2023/4/25
+ */
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class OutInterfaceService {
+    @Value("${PCSUrl}")
+    private String PCSUrl;
+
+    public String getPersonIdByNamePCS(String personName) throws IOException {
+        OkHttpClient okHttpClient = new OkHttpClient();
+        Request request = new Request.Builder()
+                .url(PCSUrl + "/permission/api/system/getPersonIdByName?personName=" + personName)
+                .get()
+                .build();
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+    }
+
+}

PAS/src/main/java/cn/cslg/pas/service/PatentAffairService.java

@@ -13,7 +13,6 @@ import cn.cslg.pas.mapper.PatentAffairMapper;
 import cn.cslg.pas.common.model.params.PatentAffairParams;
 import cn.cslg.pas.common.utils.PatentUtils;
 import cn.hutool.json.JSONObject;
-import com.alibaba.druid.support.json.JSONUtils;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

PAS/src/main/java/cn/cslg/pas/service/PatentApplicantService.java

@@ -90,7 +90,6 @@ public class PatentApplicantService extends ServiceImpl<PatentApplicantMapper, P
         });
         return dataList;
     }
-
     public IPage<PatentApplicant> getPageList(PatentApplicantVO params) {
         IPage<PatentApplicant> pageList = baseMapper.getPageList(new Page<>(params.getCurrent(), params.getSize()), params);
         List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Collections.singletonList("COUNTRIES"));

PAS/src/main/java/cn/cslg/pas/service/PatentInstructionService.java

@@ -168,6 +168,7 @@ public class PatentInstructionService extends ServiceImpl<PatentInstructionMappe
         patentInstruction.setFileName(pdf.getFileName());
         patentInstruction.setSize(pdf.getFileSize());
         patentInstruction.setPatentNo(patentNo);
+        patentInstruction.setType(1);
         patentInstruction.insert();
         return Response.success(true);
     }

PAS/src/main/java/cn/cslg/pas/service/PatentRightService.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.service;
 
 import cn.cslg.pas.common.model.params.PatentRightParams;
+import cn.cslg.pas.common.utils.PatentRightUtils;
 import cn.cslg.pas.common.utils.PatentUtils;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.StringUtils;
@@ -30,8 +31,8 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRight> {
-
     private final PatentService patentService;
+    private final PatentRightUtils patentRightUtils;
 
     public List<PatentRight> getPatentRightByPatentNo(String patentNo) {
         Patent patent = patentService.getByPatentNo(patentNo);
@@ -430,179 +431,300 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
 
     }
 
+    /**
+     * 格式化权要、拆分并理清父子级，insert/update DB
+     *
+     * @param params 权利要求
+     */
     public void updatePatentRight(PatentRightParams params) {
-//        List<PatentRight> patentRightList = new ArrayList<>();
-//        获取国家 公开号前两位
+        //调用拆分权要工具类格式化并拆分权要理清父子级
+        List<PatentRight> patentRights = patentRightUtils.formatPatentRight(params);
+        //删除库表中原有该权要
+        this.deleteByPatentId(params.getPatentId());
+        this.saveOrUpdateBatch(patentRights);
+
+////        获取国家 公开号前两位
 //        String country = PatentUtils.getPatentCountry(params.getPatentNo());
-//        String code;
-
-        //权利要求原文
-        String content = params.getContent();
-        //权利要求译文
-        String contentOut = params.getContentOut();
-        //独立权利要求
-        String selfContent = params.getSelfContent();
-        if (StringUtils.isNotEmpty(content)) {
-             this.deleteByPatentId(params.getPatentId());
-//            String[] contentArray = null;
-//            String[] contentOutArray = null;
-//            String[] selfContentArray = null;
-//            switch (country) {
-//                case "JP":
-//                case "CN":
-//                    code = "。";
-//                    if (StringUtils.isNotEmpty(contentOut)) {
-//                        contentOut = contentOut.replaceAll("\n", "");
-//                        contentOutArray = StringUtils.split(contentOut, code);
-//                    }
-//                    if (StringUtils.isNotEmpty(selfContent)) {
-//                        selfContent = selfContent.replaceAll("\n", "");
-//                        selfContentArray = StringUtils.split(selfContent, code);
+//        //权利要求原文
+//        String content = params.getContent();
+//        //权利要求译文
+//        String contentOut = params.getContentOut();
+//        if (StringUtils.isNotEmpty(content)) {
+//            //先删除库表中原有该权要
+//            this.deleteByPatentId(params.getPatentId());
+////            String[] contentArray = null;
+////            String[] contentOutArray = null;
+////            String[] selfContentArray = null;
+////            switch (country) {
+////                case "JP":
+////                case "CN":
+////                    code = "。";
+////                    if (StringUtils.isNotEmpty(contentOut)) {
+////                        contentOut = contentOut.replaceAll("\n", "");
+////                        contentOutArray = StringUtils.split(contentOut, code);
+////                    }
+////                    if (StringUtils.isNotEmpty(selfContent)) {
+////                        selfContent = selfContent.replaceAll("\n", "");
+////                        selfContentArray = StringUtils.split(selfContent, code);
+////                    }
+////                    content = content.replaceAll("\n", "");
+////                    contentArray = StringUtils.split(content, code);
+////                    break;
+////                default:
+////                    code = "\n";
+////                    if (StringUtils.isNotEmpty(contentOut)) {
+////                        contentOutArray = StringUtils.split(contentOut, code);
+////                    }
+////                    if (StringUtils.isNotEmpty(selfContent)) {
+////                        selfContentArray = StringUtils.split(selfContent, code);
+////                    }
+////                    contentArray = StringUtils.split(content, code);
+////            }
+////            for (int i = 0; i < contentArray.length; i++) {
+////                if (StringUtils.isEmpty(contentArray[i])) {
+////                    continue;
+////                }
+////                PatentRight patentRight = new PatentRight();
+////                patentRight.setPatentId(params.getPatentId());
+////                patentRight.setContent(contentArray[i]);
+////                patentRight.setType(0);
+////                patentRight.setSort(i);
+////                if (contentOutArray != null && i < contentOutArray.length) {
+////                    patentRight.setContentOut(contentOutArray[i]);
+////                }
+////                if (selfContentArray != null) {
+////                    String temp = Arrays.stream(selfContentArray).filter(item -> item.equals(patentRight.getContent())).findFirst().orElse(null);
+////                    if (temp != null) {
+////                        patentRight.setType(1);
+////                    }
+////                }
+//            ArrayList<PatentRight> patentRights = new ArrayList<>();
+//            //先去掉所有换行符，使所有内容连起来
+//            if (content.contains("\r\n")) {
+//                content = content.replaceAll("\r\n", "");
+//            } else {
+//                content = content.replaceAll("\n", "");
+//            }
+//            if (contentOut == null) {
+//                contentOut = "";
+//            }
+//            if (contentOut.contains("\r\n")) {
+//                contentOut = contentOut.replaceAll("\r\n", "");
+//            } else {
+//                contentOut = contentOut.replaceAll("\n", "");
+//            }
+//            //去掉译文的所有空格
+//            contentOut = contentOut.replaceAll(" +", "");
+//
+//            //中文专利的权要拆分 ↓
+//            if (country.equals("CN") || country.equals("JP") || country.equals("KR")) {
+//                String regex;
+//                if (content.contains("。2.")) {
+//                    regex = "。[0-9]+\\.";
+//                } else if (content.contains("。2、")) {
+//                    regex = "。[0-9]+[、]";
+//                } else if (content.contains("[001]")) {
+//                    regex = "\\[[0-9]+]";
+//                } else if (content.contains("請求項")) {
+//                    regex = "。【請求項[0-9]+】";
+//                } else if (content.contains("청구항")) {
+//                    regex = "\\.청구항 [0-9]+";
+//                } else {
+//                    regex = "";
+//                }
+//                Matcher matcher = Pattern.compile(regex).matcher(content);
+//                Matcher matcherOut = Pattern.compile(regex).matcher(contentOut);
+//                while (matcher.find()) {
+//                    if (matcher.group().contains("청구항")) {
+//                        String matcherGroup = matcher.group().replace(".", "\\.");
+//                        content = content.replaceFirst(matcherGroup, ".\n" + matcherGroup.substring(matcherGroup.indexOf(".") + 1));
+//                    } else if (matcher.group().contains(".")) {
+//                        String matcherGroup = matcher.group().replace(".", "\\.");
+//                        content = content.replaceFirst(matcherGroup, "。\n" + matcherGroup.substring(matcherGroup.indexOf("。") + 1, matcherGroup.indexOf("\\")) + ".");
+//                    } else if (matcher.group().contains("、") || matcher.group().contains("請求項")) {
+//                        content = content.replaceFirst(matcher.group(), "。\n" + matcher.group().substring(matcher.group().indexOf("。") + 1));
 //                    }
-//                    content = content.replaceAll("\n", "");
-//                    contentArray = StringUtils.split(content, code);
-//                    break;
-//                default:
-//                    code = "\n";
-//                    if (StringUtils.isNotEmpty(contentOut)) {
-//                        contentOutArray = StringUtils.split(contentOut, code);
+//                }
+//                String[] strs = content.split("\n");
+//                while (matcherOut.find()) {
+//                    if (matcherOut.group().contains(".")) {
+//                        String matcherOutGroup = matcherOut.group().replace(".", "\\.");
+//                        contentOut = contentOut.replaceFirst(matcherOutGroup, "。\n" + matcherOutGroup.substring(matcherOutGroup.indexOf("。") + 1, matcherOutGroup.indexOf("\\")) + ".");
+//                    } else if (matcherOut.group().contains("、")) {
+//                        contentOut = contentOut.replaceFirst(matcherOut.group(), "。\n" + matcherOut.group().substring(matcherOut.group().indexOf("。") + 1));
 //                    }
-//                    if (StringUtils.isNotEmpty(selfContent)) {
-//                        selfContentArray = StringUtils.split(selfContent, code);
+//                }
+//                String[] strsOut = contentOut.split("\n");
+//
+//                //定义父权要排序号
+//                String regex1 = "权利要求[0-9]+";
+//                String regex2 = "权利要求[0-9]+[至或～-]+[0-9]+";
+//                for (int i = 0; i < strs.length; i++) {
+//                    //之前：if (strs[i].contains("权利要求")) {
+//                    //现在：if(该权要有逗号，并且它第一句话中有"权利要求"4个字 || 该权要没有逗号，并且它有"权利要求"4个字) {
+//                    if ((strs[i].contains("，") && strs[i].substring(0, strs[i].indexOf("，")).contains("权利要求")) || (!strs[i].contains("，") && strs[i].contains("权利要求"))) {
+//                        Matcher matcher1 = Pattern.compile(regex1).matcher(strs[i]);
+//                        Matcher matcher2 = Pattern.compile(regex2).matcher(strs[i]);
+//                        if (matcher2.find()) {
+//                            String parentNum = matcher2.group().substring(matcher2.group().indexOf("求") + 1);
+//                            String[] parentNums;
+//                            if (parentNum.contains("～")) {
+//                                parentNums = parentNum.split("～");
+//                            } else if (parentNum.contains("-")) {
+//                                parentNums = parentNum.split("-");
+//                            } else if (parentNum.contains("至")) {
+//                                parentNums = parentNum.split("至");
+//                            } else if (parentNum.contains("或")) {
+//                                parentNums = parentNum.split("或");
+//                            } else {
+//                                parentNums = new String[0];
+//                            }
+//                            StringBuilder builder = new StringBuilder();
+//                            for (int j = Integer.parseInt(parentNums[0]) - 1; j < Integer.parseInt(parentNums[parentNums.length - 1]); j++) {
+//                                if ((builder + "").equals("")) {
+//                                    builder.append(j);
+//                                } else {
+//                                    builder.append(",").append(j);
+//                                }
+//                            }
+//                            PatentRight patentRight = new PatentRight()
+//                                    .setPatentId(params.getPatentId())
+//                                    .setType(0)
+//                                    .setContent(strs[i])
+//                                    .setSort(i)
+//                                    .setParentSort(builder + "");
+//                            if (strsOut.length - 1 >= i) {
+//                                patentRight.setContentOut(strsOut[i]);
+//                            }
+//                            patentRights.add(patentRight);
+//                        } else if (matcher1.find()) {
+//                            String parentNum = matcher1.group().substring(matcher1.group().indexOf("求") + 1);
+//                            PatentRight patentRight = new PatentRight()
+//                                    .setPatentId(params.getPatentId())
+//                                    .setType(0)
+//                                    .setContent(strs[i])
+//                                    .setSort(i)
+//                                    .setParentSort((Integer.parseInt(parentNum) - 1) + "");
+//                            if (strsOut.length - 1 >= i) {
+//                                patentRight.setContentOut(strsOut[i]);
+//                            }
+//                            patentRights.add(patentRight);
+//                        }
+//
+//                    } else {
+//                        PatentRight patentRight = new PatentRight()
+//                                .setPatentId(params.getPatentId())
+//                                .setType(1)
+//                                .setContent(strs[i])
+//                                .setSort(i)
+//                                .setParentSort("-1");
+//                        if (strsOut.length - 1 >= i) {
+//                            patentRight.setContentOut(strsOut[i]);
+//                        }
+//                        patentRights.add(patentRight);
 //                    }
-//                    contentArray = StringUtils.split(content, code);
-//            }
-//            for (int i = 0; i < contentArray.length; i++) {
-//                if (StringUtils.isEmpty(contentArray[i])) {
-//                    continue;
 //                }
-//                PatentRight patentRight = new PatentRight();
-//                patentRight.setPatentId(params.getPatentId());
-//                patentRight.setContent(contentArray[i]);
-//                patentRight.setType(0);
-//                patentRight.setSort(i);
-//                if (contentOutArray != null && i < contentOutArray.length) {
-//                    patentRight.setContentOut(contentOutArray[i]);
+//
+//                //英文专利的权要拆分 ↓
+//            } else {
+//                content = content.substring(content.indexOf("1."));
+//                if (contentOut.contains("1.")) {
+//                    contentOut = contentOut.substring(contentOut.indexOf("1."));
+//                } else {
+//                    contentOut = contentOut.substring(contentOut.indexOf("1、"));
+//                }
+//                String regex;
+//                if (content.contains("1.")) {
+//                    regex = "\\.[0-9]+\\. ";
+//                } else if (content.contains("1、")) {
+//                    regex = "\\.[0-9]+\\. ";
+//                } else if (content.contains("[001]")) {
+//                    regex = "\\[[0-9]+]";
+//                } else {
+//                    regex = "";
+//                }
+//                Matcher matcher = Pattern.compile(regex).matcher(content);
+//                Matcher matcherOut = Pattern.compile("。[0-9]+\\.").matcher(contentOut);
+//                while (matcher.find()) {
+//                    String matcherGroup = matcher.group().replace(".", "\\.");
+//                    content = content.replaceFirst(matcherGroup, ".\n" + matcherGroup.substring(matcherGroup.indexOf(".") + 1, matcherGroup.lastIndexOf("\\")) + ". ");
+//                }
+//                String[] strs = content.split("\n");
+//                while (matcherOut.find()) {
+//                    String matcherOutGroup = matcherOut.group().replace(".", "\\.");
+//                    contentOut = contentOut.replaceFirst(matcherOutGroup, "。\n" + matcherOutGroup.substring(matcherOutGroup.indexOf("。") + 1, matcherOutGroup.indexOf("\\")) + ".");
 //                }
-//                if (selfContentArray != null) {
-//                    String temp = Arrays.stream(selfContentArray).filter(item -> item.equals(patentRight.getContent())).findFirst().orElse(null);
-//                    if (temp != null) {
-//                        patentRight.setType(1);
+//                String[] strsOut = contentOut.split("\n");
+//                //定义父权要排序号
+//                String regex1 = "claim [0-9]+";
+//                String regex2 = "claims [0-9]+ or [0-9]+";
+//                for (int i = 0; i < strs.length; i++) {
+//                    if (strs[i].contains("claim")) {
+//                        Matcher matcher1 = Pattern.compile(regex1).matcher(strs[i]);
+//                        Matcher matcher2 = Pattern.compile(regex2).matcher(strs[i]);
+//                        if (matcher2.find()) {
+//                            String parentNum = matcher2.group().substring(matcher2.group().indexOf("s") + 2);
+//                            String[] parentNums;
+//                            if (parentNum.contains(" or ")) {
+//                                parentNums = parentNum.split(" or ");
+//                            } else if (parentNum.contains(" - ")) {
+//                                parentNums = parentNum.split(" - ");
+//                            } else if (parentNum.contains(" to ")) {
+//                                parentNums = parentNum.split(" to ");
+//                            } else if (parentNum.contains("或")) {
+//                                parentNums = parentNum.split("或");
+//                            } else {
+//                                parentNums = new String[0];
+//                            }
+//                            StringBuilder builder = new StringBuilder();
+//                            for (int j = Integer.parseInt(parentNums[0]) - 1; j < Integer.parseInt(parentNums[parentNums.length - 1]); j++) {
+//                                if ((builder + "").equals("")) {
+//                                    builder.append(j);
+//                                } else {
+//                                    builder.append(",").append(j);
+//                                }
+//                            }
+//                            PatentRight patentRight = new PatentRight()
+//                                    .setPatentId(params.getPatentId())
+//                                    .setType(0)
+//                                    .setContent(strs[i])
+//                                    .setSort(i)
+//                                    .setParentSort(builder + "");
+//                            if (strsOut.length - 1 >= i) {
+//                                patentRight.setContentOut(strsOut[i]);
+//                            }
+//                            patentRights.add(patentRight);
+//                        } else if (matcher1.find()) {
+//                            String parentNum = matcher1.group().substring(matcher1.group().indexOf("m") + 2);
+//                            PatentRight patentRight = new PatentRight()
+//                                    .setPatentId(params.getPatentId())
+//                                    .setType(0)
+//                                    .setContent(strs[i])
+//                                    .setSort(i)
+//                                    .setParentSort((Integer.parseInt(parentNum) - 1) + "");
+//                            if (strsOut.length - 1 >= i) {
+//                                patentRight.setContentOut(strsOut[i]);
+//                            }
+//                            patentRights.add(patentRight);
+//                        }
+//
+//                    } else {
+//                        PatentRight patentRight = new PatentRight()
+//                                .setPatentId(params.getPatentId())
+//                                .setType(1)
+//                                .setContent(strs[i])
+//                                .setSort(i)
+//                                .setParentSort("-1");
+//                        if (strsOut.length - 1 >= i) {
+//                            patentRight.setContentOut(strsOut[i]);
+//                        }
+//                        patentRights.add(patentRight);
 //                    }
 //                }
-//                patentRightList.add(patentRight);
-            ArrayList<PatentRight> patentRights = new ArrayList<>();
-            //先去掉所有换行符，使原文连起来
-            if (content.contains("\r\n")) {
-                content = content.replaceAll("\r\n", "");
-            } else {
-                content = content.replaceAll("\n", "");
-            }
-            if (contentOut == null) {
-                contentOut = "";
-            }
-            if (contentOut.contains("\r\n")) {
-                contentOut = contentOut.replaceAll("\r\n", "");
-            } else {
-                contentOut = contentOut.replaceAll("\n", "");
-            }
-
-            //根据专利所属国家，定义序号规则
-            String regex;
-            if (content.contains("1.")) {
-                regex = "[0-9]+[.]";
-            } else if (content.contains("1、")) {
-                regex = "[0-9]+[、]";
-            } else if (content.contains("[001]")) {
-                regex = "\\[[0-9]+]";
-            } else {
-                regex = "";
-            }
-            Pattern compile = Pattern.compile(regex);
-            Matcher matcher = compile.matcher(content);
-            Matcher matcherOut = compile.matcher(contentOut);
-            while (matcher.find()) {
-                if (!matcher.group().equals("1.") && !matcher.group().equals("1、") && !matcher.group().equals("[001]")) {
-                    content = content.replaceFirst(matcher.group(), "\n" + matcher.group());
-                }
-            }
-            String[] strs = content.split("\n");
-            while (matcherOut.find()) {
-                if (!matcherOut.group().equals("1.") && !matcherOut.group().equals("1、") && !matcherOut.group().equals("[001]")) {
-                    contentOut = contentOut.replaceFirst(matcherOut.group(), "\n" + matcherOut.group());
-                }
-            }
-            String[] strsOut = contentOut.split("\n");
-            //定义父权要排序号
-            String regex1 = "权利要求[0-9]+";
-            String regex2 = "权利要求[0-9]+[至或～-]+[0-9]+";
-            for (int i = 0; i < strs.length; i++) {
-                if (strs[i].contains("权利要求")) {
-                    Pattern compile1 = Pattern.compile(regex1);
-                    Matcher matcher1 = compile1.matcher(strs[i]);
-                    Pattern compile2 = Pattern.compile(regex2);
-                    Matcher matcher2 = compile2.matcher(strs[i]);
-                    if (matcher2.find()) {
-                        String parentNum = matcher2.group().substring(matcher2.group().indexOf("求") + 1);
-                        String[] parentNums;
-                        if (parentNum.contains("～")) {
-                            parentNums = parentNum.split("～");
-                        } else if (parentNum.contains("-")) {
-                            parentNums = parentNum.split("-");
-                        } else if (parentNum.contains("至")) {
-                            parentNums = parentNum.split("至");
-                        } else if (parentNum.contains("或")) {
-                            parentNums = parentNum.split("或");
-                        } else {
-                            parentNums = new String[0];
-                        }
-                        StringBuilder builder = new StringBuilder();
-                        for (int j = Integer.parseInt(parentNums[0]) - 1; j < Integer.parseInt(parentNums[parentNums.length - 1]); j++) {
-                            if ((builder + "").equals("")) {
-                                builder.append(j);
-                            } else {
-                                builder.append(",").append(j);
-                            }
-                        }
-                        PatentRight patentRight = new PatentRight()
-                                .setPatentId(params.getPatentId())
-                                .setType(1)
-                                .setContent(strs[i])
-                                .setSort(i)
-                                .setParentSort(builder + "");
-                        if (strsOut.length - 1 >= i) {
-                            patentRight.setContentOut(strsOut[i]);
-                        }
-                        patentRights.add(patentRight);
-                    } else if (matcher1.find()) {
-                        String parentNum = matcher1.group().substring(matcher1.group().indexOf("求") + 1);
-                        PatentRight patentRight = new PatentRight()
-                                .setPatentId(params.getPatentId())
-                                .setType(1)
-                                .setContent(strs[i])
-                                .setSort(i)
-                                .setParentSort((Integer.parseInt(parentNum) - 1) + "");
-                        if (strsOut.length - 1 >= i) {
-                            patentRight.setContentOut(strsOut[i]);
-                        }
-                        patentRights.add(patentRight);
-                    }
-
-                } else {
-                    PatentRight patentRight = new PatentRight()
-                            .setPatentId(params.getPatentId())
-                            .setType(0)
-                            .setContent(strs[i])
-                            .setSort(i)
-                            .setParentSort("-1");
-                    if (strsOut.length - 1 >= i) {
-                        patentRight.setContentOut(strsOut[i]);
-                    }
-                    patentRights.add(patentRight);
-                }
-            }
-            this.saveOrUpdateBatch(patentRights);
-        }
+//            }
+//
+//            this.saveOrUpdateBatch(patentRights);
+//        }
     }
 
 

PAS/src/main/java/cn/cslg/pas/service/ProjectFieldService.java

@@ -82,11 +82,14 @@ public class ProjectFieldService extends ServiceImpl<ProjectFieldMapper, Project
     }
     public Map<Integer,List<PatentDTO.Field>> getPatentFieldByPatentIdAndProjectId2(Integer projectId, List<Integer> patentIds) {
         Map<Integer,List<PatentDTO.Field>> map =new HashMap<>();
+        List<ProjectFieldPatentLink> linkList =new ArrayList<>();
         //根据专利号和专题库id获得所有自定义字段关联数据
-        LambdaQueryWrapper<ProjectFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(ProjectFieldPatentLink::getPatentId, patentIds);
-        queryWrapper.eq(ProjectFieldPatentLink::getProjectId, projectId);
-        List<ProjectFieldPatentLink> linkList=projectFieldPatentLinkService.list(queryWrapper);
+        if(patentIds.size()>0) {
+            LambdaQueryWrapper<ProjectFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(ProjectFieldPatentLink::getPatentId, patentIds);
+            queryWrapper.eq(ProjectFieldPatentLink::getProjectId, projectId);
+            linkList = projectFieldPatentLinkService.list(queryWrapper);
+        }
         List<Integer> fieldIds = linkList.stream().map(ProjectFieldPatentLink::getFieldId).distinct().collect(Collectors.toList());
         List<ProjectField> fieldList = this.getFieldListByIds(fieldIds);
         List<ProjectFieldText> textList = projectFieldTextService.getProjectFieldTextByFieldIds(fieldIds);

PAS/src/main/java/cn/cslg/pas/service/ProjectFileService.java

@@ -43,6 +43,7 @@ public class ProjectFileService extends ServiceImpl<ProjectFileMapper, ProjectFi
 
     private final FileUtils fileUtils;
     private final LoginUtils loginUtils;
+
     public IPage<ProjectFile> getPageList(ProjectFileVO params) {
         IPage<ProjectFile> pageList = baseMapper.getPageList(new Page<>(params.getCurrent(), params.getSize()), params);
 

PAS/src/main/java/cn/cslg/pas/service/ProjectImportService.java

@@ -1,15 +1,21 @@
 package cn.cslg.pas.service;
 
+import cn.cslg.pas.common.model.QueryPatentVO;
+import cn.cslg.pas.common.model.dto.ProductPatentDTO;
 import cn.cslg.pas.common.model.vo.ProjectImportVO;
+import cn.cslg.pas.common.model.vo.ProjectVO;
 import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.FileUtils;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.StringUtils;
-import cn.cslg.pas.domain.Project;
-import cn.cslg.pas.domain.ProjectImport;
+import cn.cslg.pas.domain.*;
+import cn.cslg.pas.mapper.PatentMapper;
 import cn.cslg.pas.mapper.ProjectImportMapper;
 import cn.hutool.core.io.FileUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,22 +25,39 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
-import java.util.Date;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
-* @author Administrator
-* @description 针对表【os_thematic_import(专题库数据导入记录)】的数据库操作Service
-* @createDate 2022-05-19 10:55:10
-*/
+ * @author Administrator
+ * @description 针对表【os_thematic_import(专题库数据导入记录)】的数据库操作Service
+ * @createDate 2022-05-19 10:55:10
+ */
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class ProjectImportService extends ServiceImpl<ProjectImportMapper, ProjectImport> {
 
     private final FileUtils fileUtils;
     private final ProjectImportStatusService projectImportStatusService;
+    private final PatentMapper patentMapper;
+    private final ProjectPatentLinkService projectPatentLinkService;
+    private final RequestService requestService;
 
-    public IPage<ProjectImport> getPageList(ProjectImportVO params) {
+    public IPage<ProjectImport> getPageList(ProjectImportVO params) throws IOException {
+        //当查询使用发起人名称时
+        if (params.getCreateName() != null && !params.getCreateName().equals("")) {
+            String res = requestService.getPersonIdByNamePCS(params.getCreateName());
+            List<Integer> createIds = JSONArray.parseArray(res, Integer.class);
+            params.setCreateIds(createIds);
+            //当未查询到时直接返回空页
+            if (createIds == null || createIds.size() == 0) {
+                //params.setCreateIds(Arrays.asList(-1));
+                params.setCreateIds(Collections.singletonList(-1));
+            }
+        }
         IPage<ProjectImport> pageList = baseMapper.getPageList(new Page<>(params.getCurrent(), params.getSize()), params);
+        this.setDataList(pageList.getRecords());
         return pageList;
     }
 
@@ -60,4 +83,61 @@ public class ProjectImportService extends ServiceImpl<ProjectImportMapper, Proje
         projectImport.insert();
         return projectImport.getId();
     }
+
+    /**
+     * 给产品添加相关专利
+     */
+    @Transactional
+    public List<String> importByNos(ProjectImportVO patentDTO) {
+        List<String> orgPatentNos = new ArrayList<>();
+        if (patentDTO.getPatentNo() != null) {
+            patentDTO.setPatentNo(patentDTO.getPatentNo().replace(" ", ""));
+            if (!patentDTO.getPatentNo().equals("")) {
+                String[] strs = patentDTO.getPatentNo().split("\\|");
+                orgPatentNos = new ArrayList<>(Arrays.asList(strs));
+                QueryPatentVO params = new QueryPatentVO();
+                params.setPatentNo(patentDTO.getPatentNo());
+                params.setPatentNos(orgPatentNos);
+                List<Patent> patents = patentMapper.getConPantents(params);
+                List<String> patentNos = patents.stream().map(Patent::getPatentNo).collect(Collectors.toList());
+                orgPatentNos.removeAll(patentNos);
+                if (patents.size() > 0) {
+                    List<ProjectPatentLink> projectPatentLinkList = new ArrayList<>();
+                    patents.forEach(item -> {
+                        ProjectPatentLink projectPatentLink = new ProjectPatentLink();
+                        projectPatentLink.setProjectId(patentDTO.getProjectId());
+                        projectPatentLink.setPatentId(item.getId());
+                        projectPatentLinkList.add(projectPatentLink);
+                    });
+                    projectPatentLinkService.saveBatch(projectPatentLinkList);
+                }
+            }
+        }
+        return orgPatentNos;
+    }
+
+    private void setDataList(List<ProjectImport> importList) throws IOException {
+        //获得创建人的id集合
+        //List<Integer> createIds = importList.stream().map(ProjectImport::getCreateBy).collect(Collectors.toList());
+        ArrayList<Integer> createPersonIds = new ArrayList<>();
+        for (ProjectImport projectImport : importList) {
+            createPersonIds.add(projectImport.getCreateBy());
+        }
+
+        //获取专题库负责人对应信息
+        String jsonObject1 = requestService.getPersonnelFromPCS(createPersonIds);
+        JSONArray jsonArray = JSON.parseArray(jsonObject1);
+        List<ProjectVO.Personnel> personnelList = jsonArray.toJavaList(ProjectVO.Personnel.class);
+        for (ProjectImport projectImport : importList) {
+            for (ProjectVO.Personnel personnel : personnelList) {
+                //装载创建人名
+                if (projectImport.getCreateBy() != null) {
+                    if (projectImport.getCreateBy().equals(personnel.getId())) {
+                        projectImport.setCreateName(personnel.getPersonnelName());
+                    }
+                }
+
+            }
+        }
+    }
 }

PAS/src/main/java/cn/cslg/pas/service/ProjectService.java

@@ -326,7 +326,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
     public Map<String, Object> getProjectTypeTotal(String scenario) throws IOException {
         Map<String, Object> map = new HashMap<>();
         List<Project> projectList = this.getAllProjectByMySelf();
-        projectList = projectList.stream().filter(item -> item.getScenarioName().contains(scenario)).collect(Collectors.toList());
+        projectList = projectList.stream().filter(item -> item.getScenarioName() != null &&item.getScenarioName().contains(scenario)).collect(Collectors.toList());
         List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Collections.singletonList(Constants.INVESTIGATION_TYPE));
         for (SystemDict systemDict : systemDictList) {
             map.put(systemDict.getLabel(), projectList.stream().filter(item -> item.getTypeList().contains(Integer.parseInt(systemDict.getValue()))).count());
@@ -359,7 +359,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
                     break;
             }
         });
-        clientList.forEach(item -> client.put(item.getName(), projectList.stream().filter(project -> project.getClientId().equals(item.getId())).count()));
+        clientList.forEach(item -> client.put(item.getName(), projectList.stream().filter(project -> item.getId().equals(project.getClientId())).count()));
         Date date = DateUtil.date();
         for (int i = 0; i < 6; i++) {
             Date finalDate = date;

PAS/src/main/java/cn/cslg/pas/service/ProjectUserService.java

@@ -37,6 +37,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUser> {
     private final OAuth2Service oAuth2Service;
+
     public ProjectUser getProjectUserByProjectIdAndUserId(Integer projectId, Integer userId) {
         LambdaQueryWrapper<ProjectUser> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ProjectUser::getProjectId, projectId);
@@ -53,6 +54,7 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
     public List<Integer> getProIdByUserId(Integer userId) {
         return this.getProjectUserByUserId(userId).stream().map(ProjectUser::getProjectId).collect(Collectors.toList());
     }
+
     public List<Integer> getProjectUserIdByProjectId(Integer projectId) {
         LambdaQueryWrapper<ProjectUser> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ProjectUser::getProjectId, projectId);
@@ -68,42 +70,42 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
 
     public IPage<ProjectUser> getPageList(ProjectUserVO params) throws IOException {
         //根据专题库id和类型获得人员id
-        LambdaQueryWrapper<ProjectUser> wrapper =new LambdaQueryWrapper<>();
-        wrapper.eq(ProjectUser::getProjectId,params.getProjectId());
-        if(params.getType()!=null){
-            wrapper.eq(ProjectUser::getType,params.getType());
+        LambdaQueryWrapper<ProjectUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ProjectUser::getProjectId, params.getProjectId());
+        if (params.getType() != null) {
+            wrapper.eq(ProjectUser::getType, params.getType());
         }
-        List<ProjectUser> projectUserList =this.list(wrapper);
+        List<ProjectUser> projectUserList = this.list(wrapper);
 
-        List<Integer> userIds =projectUserList.stream().map(ProjectUser::getUserId).collect(Collectors.toList());
-        if(userIds.size()==0)
-        {IPage<ProjectUser> tem =new Page<>();
+        List<Integer> userIds = projectUserList.stream().map(ProjectUser::getUserId).collect(Collectors.toList());
+        if (userIds.size() == 0) {
+            IPage<ProjectUser> tem = new Page<>();
             tem.setSize(10);
             tem.setTotal(0);
             return tem;
         }
-        PasUserDTO pasUserDTO =new PasUserDTO();
+        PasUserDTO pasUserDTO = new PasUserDTO();
         pasUserDTO.setUserIds(userIds);
         pasUserDTO.setUsername(params.getUsername());
         pasUserDTO.setName(params.getName());
         pasUserDTO.setCurrent(params.getCurrent());
         pasUserDTO.setSize(params.getSize());
         String res = oAuth2Service.getPASAssignedUser(pasUserDTO);
-        JSONObject jsonObject =JSONObject.parseObject(res);
+        JSONObject jsonObject = JSONObject.parseObject(res);
         IPage<ProjectUser> pageList = new Page<>();
         pageList.setTotal(Integer.parseInt(jsonObject.get("total").toString()));
         pageList.setSize(Integer.parseInt(jsonObject.get("size").toString()));
-        List<PasUserVO>  records = JSONArray.parseArray(jsonObject.get("records").toString(),PasUserVO.class);
-       List<ProjectUser> list =new ArrayList<>();
-        for (PasUserVO item:records){
-            ProjectUser projectUser =  projectUserList.stream().filter(tem->tem.getUserId().equals(item.getId())).findFirst().orElse(new ProjectUser());
+        List<PasUserVO> records = JSONArray.parseArray(jsonObject.get("records").toString(), PasUserVO.class);
+        List<ProjectUser> list = new ArrayList<>();
+        for (PasUserVO item : records) {
+            ProjectUser projectUser = projectUserList.stream().filter(tem -> tem.getUserId().equals(item.getId())).findFirst().orElse(new ProjectUser());
             projectUser.setName(item.getName());
             projectUser.setUsername(item.getUsername());
             list.add(projectUser);
         }
         //根据
         //根据人员姓名，id，账号，分页信息查询人员
-       pageList.setRecords(list);
+        pageList.setRecords(list);
         return pageList;
     }
 

PAS/src/main/java/cn/cslg/pas/service/RequestService.java

@@ -164,4 +164,14 @@ public class RequestService {
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
     }
+
+    public String getPersonIdByNamePCS(String personName) throws IOException {
+        OkHttpClient okHttpClient = new OkHttpClient();
+        Request request = new Request.Builder()
+                .url(url + "/permission/api/system/getPersonIdByName?personName=" + personName)
+                .get()
+                .build();
+
+        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
+    }
 }

PAS/src/main/java/cn/cslg/pas/service/TaskService.java

@@ -1,7 +1,13 @@
 package cn.cslg.pas.service;
 
+import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.model.dto.ClientDTO;
+import cn.cslg.pas.common.model.vo.ProductVO;
+import cn.cslg.pas.common.model.vo.ProjectVO;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
+import cn.cslg.pas.domain.Project;
+import cn.cslg.pas.domain.SystemDict;
 import cn.cslg.pas.domain.Task;
 import cn.cslg.pas.common.model.vo.TaskVO;
 import cn.cslg.pas.mapper.TaskMapper;
@@ -11,6 +17,9 @@ import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.model.dto.UploadFileDTO;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.io.FileUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,8 +28,12 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -33,23 +46,24 @@ import java.util.List;
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class TaskService extends ServiceImpl<TaskMapper, Task> {
-
     private final FileUtils fileUtils;
     private final LoginUtils loginUtils;
+    private final RequestService requestService;
+    private final OutInterfaceService outInterfaceService;
 
     public String getFileUrl(Integer id) {
         Task task = this.getById(id);
         return fileUtils.getSystemPath() + task.getUrl();
     }
 
-    public Integer add(UploadFileDTO fileDTO, Integer projectId,Integer productId, Integer total, Integer type, Integer fieldNum, String oldName) {
+    public Integer add(UploadFileDTO fileDTO, Integer projectId, Integer productId, Integer total, Integer type, Integer fieldNum, String oldName) {
         Task task = new Task();
         task.setStartTime(DateUtils.getDateTime());
         task.setStatus(0);
-        if(projectId!=null) {
+        if (projectId != null) {
             task.setProjectId(projectId);
         }
-        if(productId!=null){
+        if (productId != null) {
             task.setProductId(productId);
         }
         task.setFileName(fileDTO.getFileName());
@@ -81,20 +95,37 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         return Response.success(true);
     }
 
-    public IPage<Task> getPageList(TaskVO params) {
+    public IPage<Task> getPageList(TaskVO params) throws IOException {
+        String createName = params.getCreateName();
+        //如果此次查询是要根据创建人名称查询则👇
+        if (createName != null && !createName.equals("")) {
+            //远程调用权限系统的根据创建人名称模糊查询创建人ids的接口
+            String res = outInterfaceService.getPersonIdByNamePCS(createName);
+            List<Integer> createPersonIds = JSONArray.parseArray(res, Integer.class);
+            //当未查询到时给创建人ids集合赋值唯一元素id=-1，即查空页返回
+            if (createPersonIds == null || createPersonIds.size() == 0) {
+                createPersonIds = new ArrayList<>(Collections.singletonList(-1));
+            }
+            params.setCreatePersonIds(createPersonIds);
+        }
         IPage<Task> pageList = baseMapper.getPageList(new Page<>(params.getCurrent(), params.getSize()), params);
+        this.setDataList(pageList.getRecords());
         return pageList;
     }
 
-    public List<Task> getQueueList(Integer type, Integer projectId,Integer productId) {
+    public List<Task> getQueueList(Integer type, Integer projectId, Integer productId) {
         LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Task::getCreateBy, loginUtils.getId());
         queryWrapper.eq(Task::getType, type);
-        queryWrapper.in(Task::getStatus, new ArrayList<Integer>() {{ add(0); add(1);}});
-        if(projectId!=null){
-        queryWrapper.eq(Task::getProjectId, projectId);}
-        if(productId!=null){
-            queryWrapper.eq(Task::getProductId,productId);
+        queryWrapper.in(Task::getStatus, new ArrayList<Integer>() {{
+            add(0);
+            add(1);
+        }});
+        if (projectId != null) {
+            queryWrapper.eq(Task::getProjectId, projectId);
+        }
+        if (productId != null) {
+            queryWrapper.eq(Task::getProductId, productId);
         }
         queryWrapper.orderByAsc(Task::getStartTime);
         return this.list(queryWrapper);
@@ -131,4 +162,24 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         task.updateById();
     }
 
+    private void setDataList(List<Task> taskList) throws IOException {
+        //获得创建人的id集合
+        List<Integer> createIds = taskList.stream().map(Task::getCreateBy).collect(Collectors.toList());
+        //获取专题库负责人对应信息
+        String jsonObject1 = requestService.getPersonnelFromPCS(createIds);
+        JSONArray jsonArray = JSON.parseArray(jsonObject1);
+        List<ProjectVO.Personnel> personnelList = jsonArray.toJavaList(ProjectVO.Personnel.class);
+        for (Task task : taskList) {
+            for (ProjectVO.Personnel personnel : personnelList) {
+                //装载创建人名
+                if (task.getCreateBy() != null) {
+                    if (task.getCreateBy().equals(personnel.getId())) {
+                        task.setCreateName(personnel.getPersonnelName());
+                    }
+                }
+
+            }
+        }
+    }
+
 }

PAS/src/main/java/cn/cslg/pas/service/UploadPatentBatchService.java

@@ -656,6 +656,7 @@ public class UploadPatentBatchService {
         }
     }
 
+
     /**
      * @date 2022-7-11
      * @name 数据库交互
@@ -672,7 +673,7 @@ public class UploadPatentBatchService {
         //设置标题
         patent.setName(patentCell.getTitle());
         //设置公开日
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         if (patentCell.getPubilcDate() != null) {
             Date date = simpleDateFormat.parse(patentCell.getPubilcDate());
             Integer ts = (int) date.getTime();

PAS/src/main/java/cn/cslg/pas/service/asso/AssoProductPatentService.java

@@ -128,16 +128,16 @@ public class AssoProductPatentService extends ServiceImpl<AssoProductPatentMappe
     public IPage<PatentDTO> getPageList(QueryPatentVO params) {
         IPage<PatentDTO> pageList = new Page<>();
         //当产品Id为null
-        if (params.getProductId() == null) {
-            //当架构id不为null时
-            if (params.getStructureId() != null) {
-                Structure structure = structureService.getById(params.getStructureId());
-                params.setProductId(structure.getProductId());
-            } else {
-                return pageList;
-            }
-
-        }
+//        if (params.getProductId() == null) {
+//            //当架构id不为null时
+//            if (params.getStructureId() != null) {
+//                Structure structure = structureService.getById(params.getStructureId());
+//                params.setProductId(structure.getProductId());
+//            } else {
+//                return pageList;
+//            }
+//
+//        }
         IPage<Patent> dataPage = baseMapper.getPageList(new Page<>(params.getCurrent(), params.getSize()), params);
 
         List<PatentDTO> records = new ArrayList<>();

PAS/src/main/java/cn/cslg/pas/service/impl/AssoProductPatentServiceImpl.java

@@ -21,42 +21,46 @@ import java.util.List;
 @Service
 public class AssoProductPatentServiceImpl extends ServiceImpl<AssoProductPatentMapper, AssoProductPatent> implements IAssoProductPatentService {
     /**
-     * 新增专利和产品关联
+     * 新增多个专利和多个产品关联
      *
-     * @param assoProductPatentAddNewDTO 新增专利和多个产品关联的DTO类
+     * @param assoProductPatentAddNewDTO 新增多个专利和多个产品关联的DTO类
      */
     @Override
     public void addNewAssoProductPatent(AssoProductPatentAddNewDTO assoProductPatentAddNewDTO) {
         log.info("开始处理【新增专利和产品关联】的业务，参数为：{}", assoProductPatentAddNewDTO);
 
-        //从DTO中获取要新增关联的专利号和产品ids
-        String patentNo = assoProductPatentAddNewDTO.getPatentNo();
+        //从DTO中获取要新增关联的多个专利号和产品ids
+        List<String> patentNos = assoProductPatentAddNewDTO.getPatentNos();
         List<Integer> newProductIds = assoProductPatentAddNewDTO.getProductIds();
 
-        //先查库中已有的该专利号和产品关联数据
-        LambdaQueryWrapper<AssoProductPatent> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(AssoProductPatent::getPatentNo, patentNo);
-        List<AssoProductPatent> assoProductPatents = this.list(wrapper);
-        if (assoProductPatents != null && assoProductPatents.size() > 0) {
-            ArrayList<Integer> oldProductIds = new ArrayList<>();
-            for (AssoProductPatent assoProductPatent : assoProductPatents) {
-                oldProductIds.add(assoProductPatent.getProductId());
-            }
-            //产品ids去重
-            newProductIds.removeAll(oldProductIds);
-        }
-
-        if (newProductIds.size() > 0) {
-            assoProductPatents = new ArrayList<>();
+        ArrayList<AssoProductPatent> newAssoProductPatents = new ArrayList<>();
+        for (String patentNo : patentNos) {
             for (Integer newProductId : newProductIds) {
                 AssoProductPatent assoProductPatent = new AssoProductPatent()
                         .setPatentNo(patentNo)
                         .setProductId(newProductId);
-                assoProductPatents.add(assoProductPatent);
+                newAssoProductPatents.add(assoProductPatent);
             }
+        }
+
+        //先查库中已有的这些专利和产品的关联数据
+        LambdaQueryWrapper<AssoProductPatent> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(AssoProductPatent::getPatentNo, patentNos);
+        List<AssoProductPatent> oldAssoProductPatents = this.list(wrapper);
+        if (oldAssoProductPatents != null && oldAssoProductPatents.size() > 0) {
+            for (AssoProductPatent assoProductPatent : oldAssoProductPatents) {
+                assoProductPatent.setId(null);
+            }
+        }
+
+        //去重
+        newAssoProductPatents.removeAll(oldAssoProductPatents);
+
+        //去重后若还有，则为新的关联数据，入库
+        if (newAssoProductPatents.size() > 0) {
             //产品和专利关联表插入数据
             log.info("数据入产品和专利关联表");
-            this.saveBatch(assoProductPatents);
+            this.saveBatch(newAssoProductPatents);
         }
 
         log.info("新增专利和产品关联完成");

PAS/src/main/java/cn/cslg/pas/service/impl/EventServiceImpl.java

@@ -2,17 +2,17 @@ package cn.cslg.pas.service.impl;
 
 import cn.cslg.pas.common.JsonPage;
 import cn.cslg.pas.common.model.PersonnelVO;
-import cn.cslg.pas.common.model.dto.EventAddNewDTO;
-import cn.cslg.pas.common.model.dto.EventQueryPageDTO;
-import cn.cslg.pas.common.model.dto.EventUpdateDTO;
-import cn.cslg.pas.common.model.dto.ProjectEventAddNewDTO;
+import cn.cslg.pas.common.model.dto.*;
+import cn.cslg.pas.common.model.vo.ApplicationScenarioEventNumberVO;
 import cn.cslg.pas.common.model.vo.EventListItemVO;
+import cn.cslg.pas.common.model.vo.InvestigationTypeProjectNumberVO;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.ThrowException;
+import cn.cslg.pas.domain.ApplicationScenario;
 import cn.cslg.pas.domain.Event;
 import cn.cslg.pas.domain.Project;
-import cn.cslg.pas.domain.asso.AssoEventProject;
+import cn.cslg.pas.domain.Type;
 import cn.cslg.pas.mapper.EventMapper;
 import cn.cslg.pas.mapper.asso.AssoEventProjectMapper;
 import cn.cslg.pas.service.IAssoEventProjectService;
@@ -126,7 +126,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
         List<EventAddNewDTO> oldEventAddNewDTOs = eventAddNewDTOs.stream().filter(item -> item.getId() != null).collect(Collectors.toList());
         eventAddNewDTOs.removeAll(oldEventAddNewDTOs);
 
-        //过滤后为新事件↓，新事件需要先去新增事件，拿到事件ids后再做关联
+        //过滤后为新事件↓，新事件需要先新增事件，拿到事件ids后再和专题库做关联
         if (eventAddNewDTOs.size() > 0) {
             List<Integer> newEventIds = this.addNew(eventAddNewDTOs);
             eventIds.addAll(newEventIds);
@@ -154,10 +154,10 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
         Integer current = eventQueryPageDTO.getCurrent();
         Integer size = eventQueryPageDTO.getSize();
         String orderBy = eventQueryPageDTO.getOrderBy();
+        //将前端传来的需要排序的字段做映射转换(如：xxxAxxBxx -> xxx_axx_bxx)
         if (orderBy != null && !orderBy.equals("")) {
             String regex = "[A-Z]+";
-            Pattern compile = Pattern.compile(regex);
-            Matcher matcher = compile.matcher(orderBy);
+            Matcher matcher = Pattern.compile(regex).matcher(orderBy);
             while (matcher.find()) {
                 orderBy = orderBy.replaceFirst(matcher.group(), "_" + matcher.group().toLowerCase());
             }
@@ -168,17 +168,154 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
             PageHelper.startPage(current, size);
         }
         List<EventListItemVO> queryResults = eventMapper.queryList(eventQueryPageDTO);
+        //将以逗号拼接的字符串应用场景applicationScenario转化为应用场景value集合
         for (EventListItemVO queryResult : queryResults) {
             String applicationScenario = queryResult.getApplicationScenario();
             if (applicationScenario != null && !applicationScenario.equals("")) {
-                List<Integer> applicationScenarioIds = Arrays.stream(applicationScenario.split(",")).map(Integer::parseInt).collect(Collectors.toList());
-                queryResult.setApplicationScenarios(applicationScenarioIds);
+                String[] applicationScenarioArr = applicationScenario.split(",");
+                ArrayList<Integer> applicationScenarioValues = new ArrayList<>();
+                for (String n : applicationScenarioArr) {
+                    applicationScenarioValues.add(Integer.parseInt(n));
+                }
+                //List<Integer> applicationScenarioIds = Arrays.stream(applicationScenario.split(",")).map(Integer::parseInt).collect(Collectors.toList());
+                queryResult.setApplicationScenarios(applicationScenarioValues);
             }
         }
         return JsonPage.restPage(new PageInfo<>(queryResults));
     }
 
     /**
+     * 查询9大应用场景分别对应的事件数量
+     */
+    @Override
+    public List<ApplicationScenarioEventNumberVO> queryApplicationScenarioEventNumber() {
+        log.info("开始处理【查询9大应用场景分别对应的事件数量】的业务");
+
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer tenantId = personnelVO.getTenantId();
+        /*
+         * 原先学到的野方法直接在sql中装载好，只需以下几行代码返回给前台(但是杰哥说这样访问数据库效率降到最低，故舍弃)
+         *         List<ApplicationScenarioEventNumberVO> applicationScenarioEventNumberVOS = eventMapper.queryApplicationScenarioEventNumber(tenantId);
+         *         //遍历给事件数量属性赋上值 (事件数量=应用场景直接对应的事件数量+应用场景对应的专题库对应的事件数量(且该部分事件没有直接应用场景))
+         *         for (ApplicationScenarioEventNumberVO n : applicationScenarioEventNumberVOS) {
+         *             n.setEventNumber(n.getEventNumberFromEvent() + n.getEventNumberFromProject());
+         *         }
+         */
+
+        //查询所有应用场景(目前为9个应用场景)
+        List<ApplicationScenario> applicationScenarios = eventMapper.queryApplicationScenarios();
+
+        //查询所有事件(分为两类：1.有应用场景的事件；2.没有应用场景的事件(该部分事件使用它们所属的专题库的应用场景))
+        List<EventListItemVO> eventsDirectApplicationScenario = eventMapper.queryEventsDirectApplicationScenario(tenantId);
+        List<EventListItemVO> eventsInDirectApplicationScenario = eventMapper.queryEventsInDirectApplicationScenario(tenantId);
+        //装载上述两类事件的应用场景
+        ArrayList<String> applicationScenarioStrs = new ArrayList<>();
+        if (eventsDirectApplicationScenario != null) {
+            for (EventListItemVO n : eventsDirectApplicationScenario) {
+                applicationScenarioStrs.add(n.getApplicationScenario());
+            }
+        }
+        if (eventsInDirectApplicationScenario != null) {
+            for (EventListItemVO n : eventsInDirectApplicationScenario) {
+                applicationScenarioStrs.add(n.getApplicationScenario());
+            }
+        }
+
+        //开始装载9大应用场景分别对应的事件数量
+        ArrayList<ApplicationScenarioEventNumberVO> results = new ArrayList<>();
+        //遍历所有9大应用场景
+        for (ApplicationScenario applicationScenario : applicationScenarios) {
+            Integer applicationScenarioValue = applicationScenario.getApplicationScenarioValue();
+            String applicationScenarioName = applicationScenario.getApplicationScenarioName();
+            //定义当前应用场景对应的事件数量为0
+            int eventNumber = 0;
+            if (applicationScenarioStrs.size() > 0) {
+                //遍历所有事件的应用场景
+                for (String n : applicationScenarioStrs) {
+                    ArrayList<String> applicationScenarioValues = new ArrayList<>(Arrays.asList(n.split(",")));
+                    //若当前事件的应用场景集合包含当前正在遍历的应用场景，则当前正在遍历的应用场景对应事件数量 +1
+                    if (applicationScenarioValues.contains(applicationScenarioValue + "")) {
+                        eventNumber++;
+                    }
+                }
+            }
+            ApplicationScenarioEventNumberVO applicationScenarioEventNumberVO = new ApplicationScenarioEventNumberVO()
+                    .setApplicationScenarioValue(applicationScenarioValue)
+                    .setApplicationScenarioName(applicationScenarioName)
+                    .setEventNumber(eventNumber);
+            results.add(applicationScenarioEventNumberVO);
+        }
+
+        return results;
+    }
+
+    /**
+     * 根据应用场景value和事件名称分页查询事件清单
+     *
+     * @param eventQueryPageDTO 查询参数
+     */
+    @Override
+    public JsonPage queryEvents(EventQueryPageDTO eventQueryPageDTO) {
+        log.info("开始处理【根据应用场景value和事件名称分页查询事件清单】的业务，参数为：{}", eventQueryPageDTO);
+
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        eventQueryPageDTO.setTenantId(personnelVO.getTenantId());
+        Integer current = eventQueryPageDTO.getCurrent();
+        Integer size = eventQueryPageDTO.getSize();
+
+        if (current != null && size != null) {
+            PageHelper.startPage(current, size);
+        }
+
+        //根据应用场景value和事件名称分页查询事件清单
+        List<EventListItemVO> events = eventMapper.queryEvents(eventQueryPageDTO);
+        return JsonPage.restPage(new PageInfo<>(events));
+    }
+
+    /**
+     * 根据应用场景和事件id查询调查类型对应的专题库数量
+     *
+     * @param queryInvestigationTypeProjectNumberDTO 查询参数
+     * @return 返回查询到的数据
+     */
+    @Override
+    public List<InvestigationTypeProjectNumberVO> queryInvestigationTypeProjectNumber(QueryInvestigationTypeProjectNumberDTO queryInvestigationTypeProjectNumberDTO) {
+        log.info("开始处理【根据应用场景和事件id查询调查类型对应的专题库数量】的业务，参数为：{}", queryInvestigationTypeProjectNumberDTO);
+
+        Integer applicationScenario = queryInvestigationTypeProjectNumberDTO.getApplicationScenario();
+        Integer eventId = queryInvestigationTypeProjectNumberDTO.getEventId();
+        //1.根据应用场景查询出所有调查类型
+        List<Type> types = eventMapper.queryTypeid(applicationScenario);
+        //2.根据应用场景和事件id查询出所有专题库
+        List<Project> projects = eventMapper.queryProjects(applicationScenario, eventId);
+
+        //3.遍历调查类型，在每一个调查类型中遍历专题库，装载调查类型对应的专题库数量
+        ArrayList<InvestigationTypeProjectNumberVO> results = new ArrayList<>();
+        for (Type type : types) {
+            InvestigationTypeProjectNumberVO result = new InvestigationTypeProjectNumberVO();
+            result.setInvestigationType(type.getTypeId());
+            result.setInvestigationTypeName(type.getTypeName());
+            int projectNumber = 0;
+            if (projects != null && projects.size() > 0) {
+                for (Project project : projects) {
+                    if (project.getType() != null) {
+                        String[] typeArr = project.getType().split(",");
+                        if (new ArrayList<>(Arrays.asList(typeArr)).contains(type.getTypeId() + "")) {
+                            projectNumber++;
+                        }
+                    }
+                }
+            }
+            result.setProjectNumber(projectNumber);
+            results.add(result);
+        }
+
+        return results;
+
+    }
+
+
+    /**
      * 修改事件
      *
      * @param eventUpdateDTO 修改事件的DTO类对象

PAS/src/main/java/cn/cslg/pas/service/impl/PermissionRecordServiceImpl.java

@@ -51,6 +51,7 @@ public class PermissionRecordServiceImpl implements IPermissionRecordService {
         //给实体类赋值登陆人id和姓名
         permissionRecord.setCreatePersonId(personnelVO.getId());
         permissionRecord.setCreatePersonName(personnelVO.getName());
+        permissionRecord.setTenantId(personnelVO.getTenantId());
         //数据入表
         log.info("数据入表");
         int rows = permissionRecordMapper.add(permissionRecord);
@@ -92,7 +93,9 @@ public class PermissionRecordServiceImpl implements IPermissionRecordService {
      */
     @Override
     public List<PermissionRecordVO> queryAllInfo(String patentNo) {
-        return permissionRecordMapper.queryAllInfo(patentNo);
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer tenantId = personnelVO.getTenantId();
+        return permissionRecordMapper.queryAllInfo(patentNo, tenantId);
     }
 
     /**
@@ -100,8 +103,10 @@ public class PermissionRecordServiceImpl implements IPermissionRecordService {
      */
     @Override
     public List<PermissionRecordVO> findAllByPage(QueryPREntity queryPREntity) {
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer tenantId = personnelVO.getTenantId();
         PageHelper.startPage(queryPREntity.getCurrent(), queryPREntity.getSize());
-        List<PermissionRecordVO> lists = permissionRecordMapper.queryAllInfo(queryPREntity.getPatentNo());
+        List<PermissionRecordVO> lists = permissionRecordMapper.queryAllInfo(queryPREntity.getPatentNo(), tenantId);
         return lists;
     }
 

PAS/src/main/java/cn/cslg/pas/service/impl/ProductCategoryServiceImpl.java

@@ -7,6 +7,7 @@ import cn.cslg.pas.common.model.vo.*;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.FileUtils;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
+import cn.cslg.pas.common.utils.ThrowException;
 import cn.cslg.pas.domain.Product;
 import cn.cslg.pas.domain.ProductCategory;
 import cn.cslg.pas.domain.asso.AssoProductCategoryPicture;
@@ -53,43 +54,42 @@ public class ProductCategoryServiceImpl implements IProductCategoryService {
     public void addNew(ProductCategoryAddNewDTO productCategoryAddNewDTO, List<MultipartFile> files) {
         log.info("开始处理【新增产品类别】的业务，参数为：{}, {}", productCategoryAddNewDTO, files);
 
-        //检查产品类别名称是否被占用
+        //获取当前登陆人信息
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer tenantId = personnelVO.getTenantId();
+        Integer createPersonId = personnelVO.getId();
+        String createPersonName = personnelVO.getName();
+
+        //1.检查当前租户下该产品类别名称是否被占用
         String productCategoryName = productCategoryAddNewDTO.getProductCategoryName();
-        log.info("检查产品类别名称是否被占用");
-        int count = productCategoryMapper.countByProductCategoryName(productCategoryName);
+        log.info("检查当前租户下该产品类别名称是否被占用");
+        int count = productCategoryMapper.countByProductCategoryName(productCategoryName, tenantId);
         if (count > 0) {
-            String message = "新增产品类别失败，产品类别名称【" + productCategoryName + "】已存在，请尝试更换名称";
-            log.info("{}", message);
-            throw new XiaoShiException(message);
+            ThrowException.throwXiaoShiException("新增产品类别失败，当前租户下产品类别名称【" + productCategoryName + "】已存在，请尝试更换名称");
         }
 
-        //检查许可费率数值是否合法
+        //2.检查许可费率数值是否合法
         Double licenseRate = productCategoryAddNewDTO.getLicenseRate();
         if (licenseRate != null && (licenseRate < 0 || licenseRate > 1)) {
-            String message = "新增产品失败，许可费率不合法，请填写正确数值";
-            log.info("{}", message);
-            throw new XiaoShiException(message);
+            ThrowException.throwXiaoShiException("新增产品类别失败，许可费率不合法，请填写正确数值");
         }
 
-        //新增产品类别DTO对象赋值给产品类别表实体类
+        //DTO对象赋值给实体类
         ProductCategory productCategory = new ProductCategory();
         BeanUtils.copyProperties(productCategoryAddNewDTO, productCategory);
-        //获取当前登陆人信息
-        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         productCategory
-                .setCreatePersonId(personnelVO.getId())
-                .setCreatePersonName(personnelVO.getName())
-                .setTenantId(personnelVO.getTenantId());
+                .setTenantId(tenantId)
+                .setCreatePersonId(createPersonId)
+                .setCreatePersonName(createPersonName);
+
         //数据入产品类别表
         log.info("数据入产品类别表");
         int rows = productCategoryMapper.insert(productCategory);
         if (rows != 1) {
-            String message = "新增产品类别失败，数据入产品类别表失败，服务器忙请稍后再次尝试";
-            log.info("{}", message);
-            throw new XiaoShiException(message);
+            ThrowException.throwXiaoShiException("新增产品类别失败，数据入产品类别表失败，服务器忙请稍后再次尝试");
         }
 
-        //如果有图片，图片文件上传至服务器，后获取图片文件的名称、后缀名、url地址，赋值给产品类别图片关联表实体类
+        //如果有图片，图片文件上传至本地，获取图片文件的名称、后缀名、url地址，赋值给产品类别图片关联表实体类
         if (files != null && files.size() != 0) {
             ArrayList<AssoProductCategoryPicture> assoProductCategoryPictures = new ArrayList<>();
             for (MultipartFile file : files) {
@@ -107,9 +107,7 @@ public class ProductCategoryServiceImpl implements IProductCategoryService {
             log.info("数据入产品类别图片关联表");
             rows = assoProductCategoryPictureMapper.insertBatch(assoProductCategoryPictures);
             if (rows != assoProductCategoryPictures.size()) {
-                String message = "新增产品类别失败，数据入产品类别图片关联表失败，服务器忙请稍后再次尝试";
-                log.info("{}", message);
-                throw new XiaoShiException(message);
+                ThrowException.throwXiaoShiException("新增产品类别失败，数据入产品类别图片关联表失败，服务器忙请稍后再次尝试");
             }
         }
 
@@ -226,9 +224,7 @@ public class ProductCategoryServiceImpl implements IProductCategoryService {
         log.info("检查尝试删除的数据是否存在");
         int count = productCategoryMapper.countById(id);
         if (count == 0) {
-            String message = "删除产品类别失败，尝试访问的数据不存在";
-            log.info("{}", message);
-            throw new XiaoShiException(message);
+            ThrowException.throwXiaoShiException("删除产品类别失败，访问的数据不存在，请尝试刷新页面");
         }
 
         //检查该产品类别是否有图片
@@ -260,7 +256,7 @@ public class ProductCategoryServiceImpl implements IProductCategoryService {
     @Override
     public List<ProductCategoryTrendVO> showTrend(ProductCategoryDTO dto) {
         //判断架构id是否有内容，没有的话直接返回null
-        if (dto.getCategoryId() == null && dto.getCategoryId() == 0) {
+        if (dto.getCategoryId() == null || dto.getCategoryId() == 0) {
             return null;
         }
         //存储各个产品信息和营销数据
@@ -311,8 +307,7 @@ public class ProductCategoryServiceImpl implements IProductCategoryService {
 
     @Override
     public List<String> getAreaList(GetAreaListDTO dto) {
-        List<String> areaList = new ArrayList<>();
-        areaList = productCategoryMapper.getAreaList(dto);
+        List<String> areaList = productCategoryMapper.getAreaList(dto);
         return areaList;
 
     }

PAS/src/main/java/cn/cslg/pas/service/impl/ProductServiceImpl.java

@@ -7,6 +7,7 @@ import cn.cslg.pas.common.model.vo.*;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.FileUtils;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
+import cn.cslg.pas.common.utils.ThrowException;
 import cn.cslg.pas.domain.Product;
 import cn.cslg.pas.domain.ProductMarketData;
 import cn.cslg.pas.domain.Structure;
@@ -97,7 +98,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         product
                 .setCreatePersonId(personnelVO.getId())
-                .setCreatePersonName(personnelVO.getName());
+                .setCreatePersonName(personnelVO.getName())
+                .setCreatePersonTenantId(personnelVO.getTenantId());
         //数据入产品表
         log.info("数据入产品表");
         int rows = productMapper.insert(product);
@@ -227,7 +229,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         log.info("开始处理【查询产品】的业务，参数为：{}", productQueryPageDTO);
 
         PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        productQueryPageDTO.setTenantId(personnelVO.getTenantId());
+        productQueryPageDTO.setCreatePersonTenantId(personnelVO.getTenantId());
 
         Integer current = productQueryPageDTO.getCurrent();
         Integer size = productQueryPageDTO.getSize();
@@ -243,7 +245,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             productQueryPageDTO.setOrderBy(orderBy);
         }
 
-        //根据产品类别或公司分组查询产品
+        //根据 产品类别/公司 分组查询产品
         if (groupBy != null && !groupBy.equals("")) {
             if (current != null && size != null) {
                 PageHelper.startPage(current, size);
@@ -254,14 +256,6 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             } else {
                 productGroupVOS = productMapper.queryByGroupCompanyName(productQueryPageDTO);
             }
-
-            for (ProductGroupVO productGroupVO : productGroupVOS) {
-                List<ProductVO> products = productGroupVO.getProducts();
-                for (ProductVO product : products) {
-                    List<String> relativePatents = product.getRelativePatents();
-                    product.setPatentNum(relativePatents.size());
-                }
-            }
             return JsonPage.restPage(new PageInfo<>(productGroupVOS));
         }
 
@@ -270,34 +264,31 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             PageHelper.startPage(current, size);
         }
         List<ProductVO> productVOs = productMapper.query(productQueryPageDTO);
-        //遍历产品数据，获得每一个产品的相关专利数量，赋值给patentNum
-        for (ProductVO productVO : productVOs) {
-            List<String> relativePatents = productVO.getRelativePatents();
-            productVO.setPatentNum(relativePatents.size());
-        }
         return JsonPage.restPage(new PageInfo<>(productVOs));
 
     }
 
+    /**
+     * 删除产品
+     *
+     * @param id 产品id
+     */
     @Override
     public void delete(Integer id) {
         log.info("开始处理【删除产品】的业务，参数为：{}", id);
 
         //检查尝试访问的数据是否存在
+        log.info("检查尝试访问的数据是否存在");
         int count = productMapper.countById(id);
         if (count == 0) {
-            String message = "删除产品失败，尝试访问的数据已不存在";
-            log.info("{}", message);
-            throw new XiaoShiException(message);
+            ThrowException.throwXiaoShiException("删除产品失败，尝试访问的数据已不存在，请尝试刷新页面");
         }
 
         //检查专题库表中是否有该产品数据，若有则不允许删除
         log.info("检查专题库表中是否有该产品数据，若有则不允许删除");
         count = projectMapper.countByProductId(id);
         if (count > 0) {
-            String message = "删除产品失败，该产品已被专题库使用，请尝试先修改专题库";
-            log.info("{}", message);
-            throw new XiaoShiException(message);
+            ThrowException.throwXiaoShiException("删除产品失败，该产品被专题库使用中，无法删除");
         }
 
         //删除产品架构专利专题库关联表数据
@@ -319,16 +310,21 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         wrapper.eq(Structure::getProductId, id);
         ArrayList<Integer> structureIds = new ArrayList<>();
         List<Structure> structures = structureService.list(wrapper);
-        for (Structure structure : structures) {
-            structureIds.add(structure.getId());
+        if (structures != null && structures.size() > 0) {
+            for (Structure structure : structures) {
+                structureIds.add(structure.getId());
+            }
+            LambdaQueryWrapper<AssoStructurePicture> assoStructurePictureWrapper = new LambdaQueryWrapper<>();
+            assoStructurePictureWrapper.in(AssoStructurePicture::getStructureId, structureIds);
+            List<AssoStructurePicture> assoStructurePictures = assoStructurePictureService.list(assoStructurePictureWrapper);
+            if (assoStructurePictures != null && assoStructurePictures.size() > 0) {
+                log.info("架构图片关联表删除数据");
+                //删除架构图片关联表数据
+                assoStructurePictureService.remove(assoStructurePictureWrapper);
+            }
+            log.info("产品的架构表删除数据");
+            structureService.remove(wrapper);
         }
-        LambdaQueryWrapper<AssoStructurePicture> assoStructurePictureWrapper = new LambdaQueryWrapper<>();
-        assoStructurePictureWrapper.in(AssoStructurePicture::getStructureId, structureIds);
-        log.info("架构图片关联表删除数据");
-        //删除架构图片关联表数据
-        assoStructurePictureService.remove(assoStructurePictureWrapper);
-        log.info("产品的架构表删除数据");
-        structureService.remove(wrapper);
 
         //删除产品营销数据
         LambdaQueryWrapper<ProductMarketData> wrapper2 = new LambdaQueryWrapper<>();
@@ -340,9 +336,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         log.info("产品表删除数据");
         int rows = productMapper.deleteById(id);
         if (rows != 1) {
-            String message = "删除产品失败，服务器忙请稍后再次尝试!";
-            log.info("{}", message);
-            throw new XiaoShiException(message);
+            ThrowException.throwXiaoShiException("删除产品失败，服务器忙请稍后再次尝试!");
         }
 
         log.info("删除产品完成");

PAS/src/main/java/cn/cslg/pas/service/impl/StructurePatentServiceImpl.java

@@ -5,8 +5,10 @@ import cn.cslg.pas.common.model.dto.AssoStructurePatentQueryDTO;
 import cn.cslg.pas.common.model.dto.AssoStructurePatentUpdateDTO;
 import cn.cslg.pas.common.model.dto.StructureAndProductIds;
 import cn.cslg.pas.common.model.vo.AssoStructurePatentVO;
+import cn.cslg.pas.domain.Structure;
 import cn.cslg.pas.domain.asso.AssoStructurePatent;
 import cn.cslg.pas.exception.XiaoShiException;
+import cn.cslg.pas.mapper.StructureMapper;
 import cn.cslg.pas.mapper.asso.AssoStructurePatentMapper;
 import cn.cslg.pas.service.IStructurePatentService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -30,6 +32,7 @@ import java.util.List;
 @Service
 public class StructurePatentServiceImpl extends ServiceImpl<AssoStructurePatentMapper, AssoStructurePatent> implements IStructurePatentService {
     private final AssoStructurePatentMapper assoStructurePatentMapper;
+    private final StructureMapper structureMapper;
 
     /**
      * 更新标引(新增或删除)
@@ -41,10 +44,15 @@ public class StructurePatentServiceImpl extends ServiceImpl<AssoStructurePatentM
         log.info("开始处理【更新标引】的业务，参数为：{}", assoStructurePatentUpdateDTO);
 
         //获取DTO中的updateType类型，true则为新增标引，false则为删除标引
+        Integer structureId = assoStructurePatentUpdateDTO.getStructureId();
         Boolean updateType = assoStructurePatentUpdateDTO.getUpdateType();
         //DTO对象赋值给实体类
         AssoStructurePatent assoStructurePatent = new AssoStructurePatent();
         BeanUtils.copyProperties(assoStructurePatentUpdateDTO, assoStructurePatent);
+        //获取架构路径path，赋值给实体类
+        Structure structure = structureMapper.getStandardById(structureId);
+        assoStructurePatent.setPath(structure.getPath());
+
         //true则新增标引，false则删除标引
         if (updateType) {
             log.info("架构专利关联表新增数据");
@@ -85,36 +93,37 @@ public class StructurePatentServiceImpl extends ServiceImpl<AssoStructurePatentM
         List<StructureAndProductIds> structureAndProductIds = assoStructurePatentAddNewBatchDTO.getStructureAndProductIds();
 
         //DTO赋值给实体类
-        ArrayList<AssoStructurePatent> assoStructurePatents = new ArrayList<>();
+        ArrayList<AssoStructurePatent> newAssoStructurePatents = new ArrayList<>();
         for (String patentNo : patentNos) {
             for (StructureAndProductIds structureAndProductId : structureAndProductIds) {
                 AssoStructurePatent assoStructurePatent = new AssoStructurePatent()
                         .setProjectId(projectId)
                         .setPatentNo(patentNo)
                         .setStructureId(structureAndProductId.getStructureId())
-                        .setProductId(structureAndProductId.getProductId());
-                assoStructurePatents.add(assoStructurePatent);
+                        .setProductId(structureAndProductId.getProductId())
+                        .setPath(structureMapper.getStandardById(structureAndProductId.getStructureId()).getPath());
+                newAssoStructurePatents.add(assoStructurePatent);
             }
         }
 
         //根据专题库id从库中查询数据
         LambdaQueryWrapper<AssoStructurePatent> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(AssoStructurePatent::getProjectId, projectId);
-        List<AssoStructurePatent> assoStructurePatents2 = this.list(wrapper);
-        if (assoStructurePatents2 != null && assoStructurePatents2.size() > 0) {
+        List<AssoStructurePatent> oldAssoStructurePatents = this.list(wrapper);
+        if (oldAssoStructurePatents != null && oldAssoStructurePatents.size() > 0) {
             //遍历查询出来的所有数据，将id改为Null
-            for (AssoStructurePatent assoStructurePatent2 : assoStructurePatents2) {
+            for (AssoStructurePatent assoStructurePatent2 : oldAssoStructurePatents) {
                 assoStructurePatent2.setId(null);
             }
         }
 
         //集合去重，去重后留下来的数据即为新增的标引就可以直接入库了
-        boolean flag = assoStructurePatents.removeAll(assoStructurePatents2);
+        boolean flag = newAssoStructurePatents.removeAll(oldAssoStructurePatents);
         //若有新增的标引则入库
         if (flag) {
             //数据批量插入架构和专利关联表
             log.info("数据批量插入架构和专利关联表");
-            this.saveBatch(assoStructurePatents);
+            this.saveBatch(newAssoStructurePatents);
         }
 
     }

PAS/src/main/java/cn/cslg/pas/service/impl/StructureServiceImpl.java

@@ -151,18 +151,17 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
             throw new XiaoShiException(message);
         }
 
-        //获取该架构原父级id和原路径
+        //获取该架构原名称、父级id和原路径
         Integer oldParentId = queryResult.getParentId();
         String oldPath = queryResult.getPath();
-        //获取DTO中该架构当前父级id和父路径
+        //获取DTO中架构现名称、父级id和父路径
         Integer newParentId = structureUpdateDTO.getParentId();
-        String parentPath = structureUpdateDTO.getParentPath();
-        String newPath = parentPath + "," + structureId;
+        String newPath = structureUpdateDTO.getParentPath() + "," + structureId;
         //获取DTO中该架构当前名称
         String newStructureName = structureUpdateDTO.getStructureName();
 
         //检查名称是否被占用(检查当前尝试修改的架构父级下是否有同名架构)
-        log.info("检查名称是否被占用(检查当前尝试修改的架构父级下是否有同名架构)");
+        log.info("检查名称是否被占用(检查当前尝试修改的架构的新父级下是否有同名架构)");
         int count = structureMapper.countByparentIdAndStructureName(newParentId, newStructureName, structureId);
         if (count > 0) {
             String message = "修改架构失败，当前尝试修改的架构父级下已存在【" + newStructureName + "】，请尝试更换名称";
@@ -275,17 +274,20 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
     @Override
     public StructureVO query(StructureQueryPageDTO structureQueryPageDTO) {
         log.info("开始处理【查询架构树】的业务，参数为：{}", structureQueryPageDTO);
+
         //从DTO中取出产品id、架构id
         Integer productId = structureQueryPageDTO.getProductId();
         Integer structureId = structureQueryPageDTO.getStructureId();
         String structureName = structureQueryPageDTO.getStructureName();
 
         //查询出当前架构信息
-        StructureVO structureVO = null;
+        StructureVO structureVO;
         if (structureId == 0) {
             structureVO = new StructureVO();
         } else {
             structureVO = structureMapper.getStandardAndPictureById(structureId);
+            List<StructurePictureVO> pictures = assoStructurePictureMapper.selectByStructureId(structureId);
+            structureVO.setPictures(pictures);
         }
 
         //以下代码表示查询所有架构的路径和路径拼接成的架构名称并封装成map集合，从map集合中取值为后面给每一个架构的pathName中文路径赋值
@@ -293,6 +295,7 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
 
         //以下代码表示若架构名称structureName有值则要根据架构名称模糊查询树，若架构名称structureName为null则表示查询了所有架构(不受影响)
         LambdaQueryWrapper<Structure> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(Structure::getProductId, productId);
         if (structureName != null) {
             wrapper.like(Structure::getStructureName, structureName);
         }
@@ -314,9 +317,9 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
                 }
         );
         //若ids.size == 0，则表示根据名称模糊查询不到数据，则直接返回空structureVO
-        if (structureVO != null && ids.size() != 0) {
-            diGui(structureVO, map, structureId, productId, ids);
-        }
+        //if (structureVO != null) {
+        diGui(structureVO, map, structureId, productId, ids);
+        //}
         return structureVO;
     }
 
@@ -329,6 +332,7 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
     @Override
     public List<PathStructureNameVO> queryPathStructureName(QueryPathStructureNameDTO queryPathStructureNameDTO) {
         log.info("开始处理【查询所有架构路径和路径架构名称】的业务，参数为：{}", queryPathStructureNameDTO);
+
         Integer productId = queryPathStructureNameDTO.getProductId();
         Integer structureId = queryPathStructureNameDTO.getStructureId();
 
@@ -346,13 +350,11 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
         for (StructureVO structure : structures) {
             Integer id = structure.getId();
             String path = structure.getPath();
-            //path = path.substring(path.indexOf(",") + 1);
             String[] pathSplit = path.split(",");
             //String pathStructureName = "";
             StringBuilder builder = new StringBuilder();
             for (int i = 1; i < pathSplit.length; i++) {
                 String structureName = map.get(pathSplit[i]);
-                //pathStructureName = pathStructureName + structureName + "/";
                 builder.append(structureName).append("/");
             }
             PathStructureNameVO pathStructureNameVO = new PathStructureNameVO()
@@ -377,9 +379,7 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
         //检查尝试删除的数据是否存在
         Structure queryResult = structureMapper.getStandardById(id);
         if (queryResult == null) {
-            String message = "删除架构失败，尝试访问的数据已不存在";
-            log.info("{}", message);
-            throw new XiaoShiException(message);
+            ThrowException.throwXiaoShiException("删除架构失败，尝试访问的数据已不存在");
         }
 
         ArrayList<Integer> structureIds = new ArrayList<>();
@@ -396,7 +396,7 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
         wrapper.in(Project::getStructureId, structureIds);
         long count = projectService.count(wrapper);
         if (count > 0) {
-            ThrowException.throwXiaoShiException("删除架构失败，该架构或其子级架构正在被专题库使用，请尝试先删除其他关联数据");
+            ThrowException.throwXiaoShiException("删除架构失败，该架构或其子级架构正在被专题库使用，无法删除");
         }
 
         //架构专利产品专题库标引表删除数据
@@ -430,7 +430,8 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
 
     //递归组装架构树集合
     private void diGui(StructureVO structureVO, HashMap<String, String> map, Integer structureId, Integer productId, List<Integer> ids) {
-        List<StructureVO> structureVOs = structureMapper.selectByParentIdAndProductId(structureId, productId, ids);
+//        List<StructureVO> structureVOs = structureMapper.selectByParentIdAndProductId(structureId, productId, ids);
+        List<StructureVO> structureVOs = structureMapper.selectTree(structureId, productId, ids);
         if (structureVOs != null) {
             structureVO.setChildren(structureVOs);
             //给架构的路径名称pathName进行拼接赋值
@@ -446,6 +447,8 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
             }
             for (StructureVO n : structureVOs) {
                 structureId = n.getId();
+                List<StructurePictureVO> pictures = assoStructurePictureMapper.selectByStructureId(structureId);
+                n.setPictures(pictures);
                 diGui(n, map, structureId, productId, ids);
             }
         }
@@ -453,11 +456,10 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
 
     private HashMap<String, String> getStructureIdAndStructureNameMap(Integer productId) {
         List<StructureVO> structures = structureMapper.selectAllByProductId(productId);
-        //map存储所有架构id(key)和架构名称(value)
+        //map存储所有架构id(key)和架构名称(value)的键值对
         HashMap<String, String> map = new HashMap<>();
         for (StructureVO structure : structures) {
-            Integer structureId = structure.getId();
-            String structureStrId = structureId + "";
+            String structureStrId = structure.getId() + "";
             String structureName = structure.getStructureName();
             map.put(structureStrId, structureName);
         }

PAS/src/main/resources/application-dev.yml

@@ -20,7 +20,8 @@ spring:
     druid:
       stat-view-servlet:
         login-username: admin
-        login-password: 123456
+        login-password: Cslg2022+
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-authorUrl: http://localhost:8871
+authorUrl: http://localhost:8871
+PCSUrl: http://localhost:8871

PAS/src/main/resources/application.yml

@@ -20,7 +20,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: prodNetOut
   jackson:
     default-property-inclusion: non_null
     serialization:

PAS/src/main/resources/mapper/AssoProductPatentMapper.xml

@@ -25,8 +25,13 @@
         a.agencyid as agency_id, a.num2 as right_num, a.quoteno as quote_num, a.quotedno as quoted_num,
         a.patsnap_family as patSnapFamily, a.patsnapfamilynum as patSnapFamilyNum
         from os_patent a
-        left join asso_product_patent i on i.patent_no=a.patentno
-        left join asso_structure_patent t on t.patent_no =a.patentno
+        <if test="params.productId !=null">
+            left join asso_product_patent i on i.patent_no=a.patentno
+        </if>
+        <if test="params.structureId !=null and params.structureId !=''">
+            left join asso_structure_patent t on t.patent_no =a.patentno
+        </if>
+
         <if test="params.applicationName !=null ">
             left join os_applicant_attr b on a.id=b.pid and b.type =1
             left join os_patent_applicant c on c.id=b.applicantid
@@ -45,8 +50,10 @@
             left join os_patent_typeno h on h.pid =a.id and h.type =3
         </if>
         <where>
-            ( i.product_id =#{params.productId}
-            or t.product_id =#{params.productId} )
+
+            <if test="params.productId !=null">
+                and i.product_id =#{params.productId}
+            </if>
             <if test="params.applicationName !=null and params.applicationName !=''  ">
                 and c.name REGEXP #{params.applicationName}
             </if>
@@ -75,7 +82,7 @@
                 and a.`name` like concat("%", #{params.patentName}, "%")
             </if>
             <if test="params.structureId !=null and params.structureId !=''">
-                and t.structure_id = #{params.structureId}
+                and find_in_set(#{params.structureId}, t.path)
             </if>
             <if test="params.orderItem!=null and params.orderItem!='SysOrder'">
                 order by #{params.orderItem}
@@ -136,7 +143,7 @@
                 and h.code like concat("%", #{params.numberUpc}, "%")
             </if>
             <if test="params.patentNo !=null and params.patentNo !=''">
-                and a.patentNo REGEXP  #{params.patentNo}
+                and a.patentNo REGEXP #{params.patentNo}
             </if>
             <if test="params.applicationNo !=null and params.applicationNo !=''">
                 and a.applicationNo like concat("%", #{params.applicationNo}, "%")

PAS/src/main/resources/mapper/AssoStructurePatentMapper.xml

@@ -5,8 +5,8 @@
     <!--插入数据-->
     <!--int insert(AssoStructurePatent assoStructurePatent);-->
     <insert id="insert" useGeneratedKeys="true" keyProperty="id">
-        insert into asso_structure_patent (structure_id, patent_no, product_Id, project_id)
-        values (#{structureId}, #{patentNo}, #{productId}, #{projectId});
+        insert into asso_structure_patent (structure_id, patent_no, product_Id, project_id, path)
+        values (#{structureId}, #{patentNo}, #{productId}, #{projectId}, #{path});
     </insert>
 
     <!--删除标引数据-->
@@ -14,20 +14,11 @@
     <delete id="delete">
         delete
         from asso_structure_patent
-        <where>
-            <if test="projectId != null">
-                and project_id = #{projectId}
-            </if>
-            <if test="patentNo != null">
-                and patent_no = #{patentNo}
-            </if>
-            <if test="structureId != null">
-                and structure_id = #{structureId}
-            </if>
-            <if test="productId != null">
-                and product_Id = #{productId}
-            </if>
-        </where>
+        where project_id = #{projectId}
+          and patent_no = #{patentNo}
+          and structure_id = #{structureId}
+          and product_Id = #{productId}
+          and path = #{path}
     </delete>
 
     <!--根据产品id统计数量-->

PAS/src/main/resources/mapper/EventMapper.xml

@@ -87,4 +87,161 @@
         order by id
     </select>
 
+    <!--根据应用场景value和事件名称分页查询事件清单-->
+    <!--List<EventListItemVO> queryEvents(EventQueryPageDTO eventQueryPageDTO);-->
+    <select id="queryEvents" resultMap="queryByApplicationScenarioMap">
+        select id,
+        question_name,
+        description,
+        application_scenario,
+        event_date,
+        tenant_id,
+        create_person_id,
+        create_person_name,
+        create_time,
+        modified_time
+        from event
+        <where>
+            <if test="applicationScenario != null and applicationScenario != ''">
+                and id in(select id from event where find_in_set(#{applicationScenario}, application_scenario)
+                union select even.id
+                from os_thematic proj
+                join asso_event_project asso on proj.id = asso.project_id
+                join event even on asso.event_id = even.id
+                where find_in_set(#{applicationScenario}, proj.scenarioid)
+                and even.application_scenario is null
+                )
+            </if>
+            <if test="questionName != null and questionName != ''">
+                and question_name like '%${questionName}%'
+            </if>
+            <if test="true">
+                and tenant_id = #{tenantId}
+            </if>
+        </where>
+        order by create_time
+    </select>
+
+    <resultMap id="queryByApplicationScenarioMap" type="cn.cslg.pas.common.model.vo.EventListItemVO">
+        <id column="id" property="id"/>
+        <result column="question_name" property="questionName"/>
+        <result column="description" property="description"/>
+        <result column="application_scenario" property="applicationScenario"/>
+        <result column="event_date" property="eventDate"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_person_id" property="createPersonId"/>
+        <result column="create_person_name" property="createPersonName"/>
+        <result column="create_time" property="createTime"/>
+        <result column="modified_time" property="modifiedTime"/>
+    </resultMap>
+
+    <!--查询9大应用场景及分别对应的事件数量-->
+    <!--List<ApplicationScenarioEventNumber> queryApplicationScenarioEventNumber(Integer tenantId);-->
+    <!--        <select id="queryApplicationScenarioEventNumber" resultMap="queryApplicationScenarioEventNumberMap">-->
+    <!--            select label,-->
+    <!--                   value       as applicationScenarioValue,-->
+    <!--                   #{tenantId} as tenantId-->
+    <!--            from os_system_dict-->
+    <!--            where type = "ENTERPRISE_APPLICATION_SCENARIO"-->
+    <!--        </select>-->
+
+    <!--        <resultMap id="queryApplicationScenarioEventNumberMap"-->
+    <!--                   type="cn.cslg.pas.common.model.vo.ApplicationScenarioEventNumberVO">-->
+    <!--            <result column="label" property="applicationScenarioName"/>-->
+    <!--            <result column="value" property="applicationScenarioName"/>-->
+    <!--            <collection property="eventNumberFromEvent" ofType="integer"-->
+    <!--                        select="selectEventCount1"-->
+    <!--                        column="{applicationScenarioValue=applicationScenarioValue, tenantId=tenantId}">-->
+    <!--            </collection>-->
+    <!--            <collection property="eventNumberFromProject" ofType="integer"-->
+    <!--                        select="selectEventCount2"-->
+    <!--                        column="{applicationScenarioValue=applicationScenarioValue, tenantId=tenantId}">-->
+    <!--            </collection>-->
+    <!--        </resultMap>-->
+
+    <!--        <select id="selectEventCount1" resultType="integer">-->
+    <!--            select count(*)-->
+    <!--            from event-->
+    <!--            where find_in_set(#{applicationScenarioValue}, application_scenario)-->
+    <!--              and tenant_id = #{tenantId}-->
+    <!--        </select>-->
+
+    <!--        <select id="selectEventCount2" resultType="integer">-->
+    <!--            select count(*)-->
+    <!--            from os_thematic proj-->
+    <!--                     join asso_event_project asso on proj.id = asso.project_id-->
+    <!--                     join event even on asso.event_id = even.id-->
+    <!--            where find_in_set(#{applicationScenarioValue}, proj.scenarioid)-->
+    <!--              and even.application_scenario is null-->
+    <!--              and tenant_id = #{tenantId}-->
+    <!--        </select>-->
+
+    <!--查询所有应用场景-->
+    <!--List<ApplicationScenario> queryApplicationScenarios();-->
+    <select id="queryApplicationScenarios" resultMap="queryApplicationScenariosMap">
+        select label, value
+        from os_system_dict
+        where type = "ENTERPRISE_APPLICATION_SCENARIO"
+    </select>
+
+    <resultMap id="queryApplicationScenariosMap" type="cn.cslg.pas.domain.ApplicationScenario">
+        <result column="label" property="applicationScenarioName"/>
+        <result column="value" property="applicationScenarioValue"/>
+    </resultMap>
+
+    <!--查询所有应用场景不是null的事件-->
+    <!--List<EventListItemVO> queryEventsDirectApplicationScenario(Integer tenantId);-->
+    <select id="queryEventsDirectApplicationScenario" resultMap="queryEventsHaveApplicationScenarioMap">
+        select application_scenario
+        from event
+        where application_scenario is not null
+          and tenant_id = #{tenantId}
+    </select>
+
+    <resultMap id="queryEventsHaveApplicationScenarioMap" type="cn.cslg.pas.common.model.vo.EventListItemVO">
+        <result column="application_scenario" property="applicationScenario"/>
+    </resultMap>
+
+    <!--查询所有应用场景是null的事件(去关联专题库表查询出应用场景，就作为事件的应用场景)-->
+    <!--List<EventListItemVO> queryEventsInDirectApplicationScenario(Integer tenantId);-->
+    <select id="queryEventsInDirectApplicationScenario" resultMap="queryEventsInDirectApplicationScenarioMap">
+        select even.application_scenario, proj.scenarioid
+        from event even
+                 join asso_event_project asso on even.id = asso.event_id
+                 join os_thematic proj on asso.project_id = proj.id
+        where even.application_scenario is null
+          and proj.scenarioid is not null
+          and even.tenant_id = #{tenantId}
+    </select>
+
+    <resultMap id="queryEventsInDirectApplicationScenarioMap" type="cn.cslg.pas.common.model.vo.EventListItemVO">
+        <result column="scenarioid" property="applicationScenario"/>
+    </resultMap>
+
+    <!--根据应用场景查询调查类型-->
+    <!--List<Type> queryTypeid(Integer applicationScenario);-->
+    <select id="queryTypeid" resultMap="queryTypeidMap">
+        select DICT_CHILD_VALUE, DICT_CHILD_LABEL
+        from os_system_dict_associate
+        where DICT_PARENT_VALUE = #{applicationScenario}
+    </select>
+
+    <resultMap id="queryTypeidMap" type="cn.cslg.pas.domain.Type">
+        <result column="DICT_CHILD_VALUE" property="typeId"/>
+        <result column="DICT_CHILD_LABEL" property="typeName"/>
+    </resultMap>
+
+    <!--根据应用场景和事件id查询专题库-->
+    <!--List<Project> queryProjects(Integer applicationScenario, Integer eventId);-->
+    <select id="queryProjects" resultMap="queryProjectsMap">
+        select id, typeid
+        from os_thematic
+        where find_in_set(#{applicationScenario}, scenarioid)
+          and id in (select project_id from asso_event_project where event_id = #{eventId})
+    </select>
+
+    <resultMap id="queryProjectsMap" type="cn.cslg.pas.domain.Project">
+        <result column="typeid" property="type"/>
+    </resultMap>
+
 </mapper>

PAS/src/main/resources/mapper/PatentApplicantMapper.xml

@@ -9,6 +9,9 @@
             <if test="params.name != '' and params.name != null">
                 and a.name like concat('%', #{params.name}, '%')
             </if>
+            <if test="params.country != '' and params.country != null">
+                and a.country =  #{params.country}
+            </if>
             <if test="params.shortName != '' and params.shortName != null">
                 and a.bname like concat('%', #{params.shortName}, '%')
             </if>

PAS/src/main/resources/mapper/PatentMapper.xml

@@ -1305,12 +1305,11 @@
                             #{item}
                         </foreach>
                     </if>
-
                     <if test="params.applicationName !=null and params.applicationName !=''  ">
-                        and c.name like concat("%",#{params.applicationName}, "%")
+                        and c.name REGEXP #{params.applicationName}
                     </if>
                     <if test="params.obligeeName !=null and params.obligeeName!=''">
-                        and e.name like concat("%", #{params.obligeeName}, "%")
+                        and e.name REGEXP #{params.obligeeName}
                     </if>
                     <if test="params.numberIpc !=null and params.numberIpc!=''">
                         and f.code like concat("%", #{params.numberIpc}, "%")
@@ -1322,7 +1321,7 @@
                         and h.code like concat("%", #{params.numberUpc}, "%")
                     </if>
                     <if test="params.patentNo !=null and params.patentNo !=''">
-                        and a.patentNo like concat("%",#{params.patentNo}, "%")
+                        and a.patentNo REGEXP #{params.patentNo}
                     </if>
                     <if test="params.applicationNo !=null and params.applicationNo !=''">
                         and a.applicationNo like concat("%", #{params.applicationNo}, "%")
@@ -1806,8 +1805,6 @@
                         </foreach>
                         )
                     </if>
-
-
                     <if test="params.orderItem!=null and params.orderItem!='SysOrder'">
                         order by #{params.orderItem}
                         <if test="params.orderType!=null">

PAS/src/main/resources/mapper/PatentMarkerDataMapper.xml

@@ -16,11 +16,7 @@
             CAST(sum(custom_license_rate * sale_money) AS DECIMAL (19, 2)) AS custom_license_money
         FROM  product_market_data
         WHERE product_id IN
-                (SELECT product_id FROM asso_structure_patent WHERE patent_no IN
-                <foreach collection="patentNoList" item="patentNo" index="index" open="(" close=")" separator=",">
-                    #{patentNo}
-                </foreach>
-                UNION
+                (
                 SELECT product_id FROM asso_product_patent WHERE patent_no IN
                 <foreach collection="patentNoList" item="patentNo" index="index" open="(" close=")" separator=",">
                     #{patentNo}
@@ -39,11 +35,7 @@
             CAST(sum(custom_license_rate * sale_money) AS DECIMAL (19, 2)) AS custom_license_money
         FROM  product_market_data
         WHERE product_id IN
-                (SELECT product_id FROM asso_structure_patent WHERE patent_no IN
-                <foreach collection="patentNoList" item="patentNo" index="index" open="(" close=")" separator=",">
-                    #{patentNo}
-                </foreach>
-                UNION
+                (
                 SELECT product_id FROM asso_product_patent WHERE patent_no IN
                 <foreach collection="patentNoList" item="patentNo" index="index" open="(" close=")" separator=",">
                     #{patentNo}
@@ -62,11 +54,7 @@
             CAST(sum(custom_license_rate * sale_money) AS DECIMAL (19, 2)) AS custom_license_money
         FROM product_market_data
         WHERE product_id IN
-                (SELECT product_id FROM asso_structure_patent WHERE patent_no IN
-                <foreach collection="patentNoList" item="patentNo" index="index" open="(" close=")" separator=",">
-                    #{patentNo}
-                </foreach>
-                UNION
+                (
                 SELECT product_id FROM asso_product_patent WHERE patent_no IN
                 <foreach collection="patentNoList" item="patentNo" index="index" open="(" close=")" separator=",">
                     #{patentNo}

PAS/src/main/resources/mapper/PermissionRecordMapper.xml

@@ -6,10 +6,10 @@
     <!--int add(PermissionRecord permissionRecord);-->
     <insert id="add" useGeneratedKeys="true" keyProperty="id">
         insert into permission_record(id, patent_no, licensor, licensee, licensee_country, license_time,
-                                      license_fee, license_dead_line, license_type, create_person_id,
+                                      license_fee, license_dead_line, license_type, tenant_id, create_person_id,
                                       create_person_name, create_time, modified_time)
         values (#{id}, #{patentNo}, #{licensor}, #{licensee}, #{licenseeCountry},
-                #{licenseTime}, #{licenseFee}, #{licenseDeadLine}, #{licenseType}, #{createPersonId},
+                #{licenseTime}, #{licenseFee}, #{licenseDeadLine}, #{licenseType}, #{tenantId}, #{createPersonId},
                 #{createPersonName}, #{createTime}, #{modifiedTime})
     </insert>
 
@@ -86,9 +86,11 @@
                license_time,
                license_fee,
                license_dead_line,
-               license_type
+               license_type,
+               tenant_id
         from permission_record
         where patent_no = #{patentNo}
+          and tenant_id = #{tenantId}
     </select>
 
     <!--根据专利号统计许可记录数量-->

PAS/src/main/resources/mapper/ProductCategoryMapper.xml

@@ -43,6 +43,7 @@
         select count(*)
         from product_category
         where product_category_name = #{productCategoryName}
+          and tenant_id = #{tenantId}
     </select>
 
     <!--根据id和名称统计数量-->

PAS/src/main/resources/mapper/ProductMapper.xml

@@ -5,10 +5,10 @@
     <!--插入数据-->
     <!--int insert(Product product);-->
     <insert id="insert" useGeneratedKeys="true" keyProperty="id">
-        insert into product (product_name, market_time, company_name, tenant_id, product_explain,
-                             product_category_id, license_rate, create_person_id, create_person_name)
-        values (#{productName}, #{marketTime}, #{companyName}, #{tenantId}, #{productExplain}, #{productCategoryId},
-                #{licenseRate}, #{createPersonId}, #{createPersonName});
+        insert into product (product_name, market_time, company_name, tenant_id, create_person_tenant_id,
+                             product_explain, product_category_id, license_rate, create_person_id, create_person_name)
+        values (#{productName}, #{marketTime}, #{companyName}, #{tenantId}, #{createPersonTenantId}, #{productExplain},
+                #{productCategoryId}, #{licenseRate}, #{createPersonId}, #{createPersonName});
     </insert>
 
     <!--根据id删除产品-->
@@ -24,13 +24,15 @@
     <update id="updateById">
         update product
         <set>
-
             product_name = #{productName},
             market_time = #{marketTime},
             company_name = #{companyName},
             <if test="tenantId != null">
                 tenant_id = #{tenantId},
             </if>
+            <if test="createPersonTenantId != null">
+                create_person_tenant_id = #{createPersonTenantId},
+            </if>
             product_explain = #{productExplain},
             product_category_id = #{productCategoryId},
             license_rate = #{licenseRate},
@@ -76,7 +78,7 @@
     <!--根据id查询数据-->
     <!--ProductVO getStandardById(Integer id);-->
     <select id="getStandardById" resultMap="queryMap">
-        select id,
+        select id as p_id,
                product_name,
                market_time,
                company_name,
@@ -97,6 +99,7 @@
         market_time,
         company_name,
         p.tenant_id,
+        create_person_tenant_id,
         product_explain,
         product_category_id,
         p.license_rate,
@@ -113,8 +116,7 @@
             </if>
             <if test="patentNo != null and patentNo != ''">
                 and p.id in
-                (select product_id from asso_product_patent where patent_no = #{patentNo}
-                union select product_id from asso_structure_patent where patent_no = #{patentNo})
+                (select product_id from asso_product_patent where patent_no = #{patentNo})
             </if>
             <if test="productCategoryId != null and productCategoryId != ''">
                 and product_category_id = #{productCategoryId}
@@ -124,7 +126,7 @@
                 '%${productCategoryName}%')
             </if>
             <if test="true">
-                and p.tenant_id = #{tenantId}
+                and create_person_tenant_id = #{createPersonTenantId}
             </if>
         </where>
         order by
@@ -149,10 +151,10 @@
         <result column="license_rate" property="licenseRate"/>
         <result column="create_person_name" property="createPersonName"/>
         <collection property="pictures" ofType="cn.cslg.pas.common.model.vo.ProductPictureVO"
-                    select="query2" column="p_id">
+                    select="query2" column="{p_id=p_id}">
         </collection>
-        <collection property="relativePatents" ofType="string"
-                    select="query3" column="p_id">
+        <collection property="patentNum" ofType="Integer"
+                    select="query3" column="{p_id=p_id}">
         </collection>
         <collection property="productCategory" ofType="cn.cslg.pas.common.model.vo.ProductCategoryVO"
                     select="query4" column="{pc_id=product_category_id}">
@@ -173,14 +175,10 @@
         <result column="url" property="url"/>
     </resultMap>
 
-    <select id="query3" resultType="string">
-        select patent_no
+    <select id="query3" resultType="Integer">
+        select count(distinct patent_no)
         from asso_product_patent
         where product_id = #{p_id}
-        union
-        select patent_no
-        from asso_structure_patent
-        where product_id = #{p_id}
     </select>
 
     <select id="query4" resultMap="query4Map">
@@ -223,6 +221,7 @@
     <select id="queryByGroupProductCategoryId" resultMap="queryByGroupProductCategoryIdMap">
         select product_category_id pci,
         product_category_name,
+        create_person_tenant_id as createPersonTenantId,
         ifnull(#{orderBy}, '') orderBy,
         ifnull(#{orderType}, '') orderType,
         ifnull(#{productName}, '') productName,
@@ -241,8 +240,7 @@
             </if>
             <if test="patentNo != null and patentNo != ''">
                 and p.id in
-                (select product_id from asso_product_patent where patent_no = #{patentNo}
-                union select product_id from asso_structure_patent where patent_no = #{patentNo})
+                (select product_id from asso_product_patent where patent_no = #{patentNo})
             </if>
             <if test="productCategoryId != null and productCategoryId != ''">
                 and product_category_id = #{productCategoryId}
@@ -252,7 +250,7 @@
                 '%${productCategoryName}%')
             </if>
             <if test="true">
-                and p.tenant_id = #{tenantId}
+                and p.create_person_tenant_id = #{createPersonTenantId}
             </if>
         </where>
         group by product_category_id
@@ -265,7 +263,7 @@
         <collection property="products" ofType="cn.cslg.pas.common.model.vo.ProductVO"
                     select="queryByGroupProductCategoryId2"
                     column="{pci=pci, orderBy=orderBy, orderType=orderType, productName=productName, companyName=companyName,
-                             patentNo=patentNo, productCategoryId=productCategoryId, productCategoryName=productCategoryName}">
+                             patentNo=patentNo, productCategoryId=productCategoryId, productCategoryName=productCategoryName, createPersonTenantId=createPersonTenantId}">
         </collection>
     </resultMap>
 
@@ -305,7 +303,7 @@
                 and product_category_id = #{pci}
             </if>
             <if test="true">
-                and p.tenant_id = #{tenantId}
+                and p.create_person_tenant_id = #{createPersonTenantId}
             </if>
         </where>
         order by
@@ -323,6 +321,7 @@
     <!--List<ProductGroupVO> queryByGroupCompanyName(ProductQueryPageDTO productQueryPageDTO);-->
     <select id="queryByGroupCompanyName" resultMap="queryByGroupCompanyNameMap">
         select company_name cn,
+        create_person_tenant_id as createPersonTenantId,
         ifnull(#{orderBy}, '') orderBy,
         ifnull(#{orderType}, '') orderType,
         ifnull(#{productName}, '') productName,
@@ -340,8 +339,7 @@
             </if>
             <if test="patentNo != null and patentNo != ''">
                 and id in
-                (select product_id from asso_product_patent where patent_no = #{patentNo}
-                union select product_id from asso_structure_patent where patent_no = #{patentNo})
+                (select product_id from asso_product_patent where patent_no = #{patentNo})
             </if>
             <if test="productCategoryId != null and productCategoryId != ''">
                 and product_category_id = #{productCategoryId}
@@ -354,7 +352,7 @@
                 and company_name is not null
             </if>
             <if test="true">
-                and tenant_id = #{tenantId}
+                and create_person_tenant_id = #{createPersonTenantId}
             </if>
         </where>
         group by company_name
@@ -364,13 +362,13 @@
     <resultMap id="queryByGroupCompanyNameMap" type="cn.cslg.pas.common.model.vo.ProductGroupVO">
         <result column="cn" property="companyName"/>
         <collection property="products" ofType="cn.cslg.pas.common.model.vo.ProductVO"
-                    select="queryByGroupCompanyNameMap2"
+                    select="queryByGroupCompanyName2"
                     column="{cn=cn, orderBy=orderBy, orderType=orderType, productName=productName, companyName=companyName,
-                             patentNo=patentNo, productCategoryId=productCategoryId, productCategoryName=productCategoryName}">
+                             patentNo=patentNo, productCategoryId=productCategoryId, productCategoryName=productCategoryName, createPersonTenantId=createPersonTenantId}">
         </collection>
     </resultMap>
 
-    <select id="queryByGroupCompanyNameMap2" resultMap="queryMap">
+    <select id="queryByGroupCompanyName2" resultMap="queryMap">
         select p.id p_id,
         product_name,
         market_time,
@@ -406,7 +404,7 @@
                 and company_name = #{cn}
             </if>
             <if test="true">
-                and p.tenant_id = #{tenantId}
+                and p.create_person_tenant_id = #{createPersonTenantId}
             </if>
         </where>
         order by

PAS/src/main/resources/mapper/ProjectImportMapper.xml

@@ -4,12 +4,14 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.cslg.pas.mapper.ProjectImportMapper">
     <select id="getPageList" parameterType="cn.cslg.pas.common.model.vo.ProjectImportVO" resultType="cn.cslg.pas.domain.ProjectImport">
-        select a.*, b.name as create_name
+        select a.*
         from os_thematic_import a
-        left join os_distribution b on b.id = a.create_by
         <where>
-            <if test="params.createName != '' and params.createName != null">
-                and b.name like concat('%', #{params.createName}, '%')
+            <if test="params.createIds !=null and params.createIds.size()!=0 ">
+                and a.create_by in
+                <foreach collection="params.createIds" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
             </if>
         </where>
         order by a.create_time desc

PAS/src/main/resources/mapper/ProjectMapper.xml

@@ -48,7 +48,10 @@
                 <if test="params.tenantId!=null">
                     or a.tenantId = #{params.tenantId}
                 </if>
-                    )
+                )
+            </if>
+            <if test="params.eventId != null and params.eventId != ''">
+                and a.id in (select project_id from asso_event_project where event_id = #{params.eventId})
             </if>
         </where>
         order by a.`${params.sort.prop}` ${params.sort.order}

PAS/src/main/resources/mapper/StructureMapper.xml

@@ -60,7 +60,8 @@
     <select id="countByparentIdAndStructureName" resultType="int">
         select count(*)
         from structure
-        where parent_id = #{parentId}
+        where
+        parent_id = #{parentId}
         and structure_name = #{structureName}
         <if test="structureId != null">
             and id != #{structureId}
@@ -95,17 +96,31 @@
 
     <!--根据id查询数据和图片-->
     <!--StructureVO getStandAndPictureById(Integer id);-->
-    <select id="getStandardAndPictureById" resultMap="selectByParentIdMap">
-        select id s_id,
-               parent_id,
-               structure_name,
-               path,
-               remark,
-               product_id,
-               create_person_name,
-               create_time
-        from structure
-        where id = #{id}
+    <!--    <select id="getStandardAndPictureById" resultMap="selectByParentIdMap">-->
+    <!--        select id s_id,-->
+    <!--               parent_id,-->
+    <!--               structure_name,-->
+    <!--               path,-->
+    <!--               remark,-->
+    <!--               product_id,-->
+    <!--               create_person_name,-->
+    <!--               create_time-->
+    <!--        from structure-->
+    <!--        where id = #{id}-->
+    <!--    </select>-->
+    <select id="getStandardAndPictureById" resultMap="selectTreeMap">
+        select stru.id as stru_id,
+               stru.parent_id,
+               stru.structure_name,
+               stru.path,
+               stru.remark,
+               stru.product_id,
+               stru.create_person_name,
+               stru.create_time,
+               count(distinct struP.patent_no) as patent_num
+        from structure stru
+                 left join asso_structure_patent struP on find_in_set(stru.id, struP.path)
+        where stru.id = #{id}
     </select>
 
     <!--根据父级id和产品id查询数据-->
@@ -167,17 +182,51 @@
         <result column="url" property="url"/>
     </resultMap>
 
-    <!--    <select id="selectByParentId3" resultType="integer">-->
-    <!--        select count(*)-->
-    <!--        from asso_structure_patent-->
-    <!--        where structure_id = #{s_id}-->
-    <!--    </select>-->
     <select id="selectByParentId3" resultType="integer">
         select count(*)
         from asso_structure_patent
         where structure_id in (select id from structure where find_in_set(#{s_id}, path))
     </select>
 
+    <!--根据父级id和产品id查询数据-->
+    <!--List<StructureVO> selectTree(Integer parentId, Integer productId, List<Integer> ids);-->
+    <select id="selectTree" resultMap="selectTreeMap">
+        select stru.id as stru_id,
+        stru.parent_id,
+        stru.structure_name,
+        stru.path,
+        stru.remark,
+        stru.product_id,
+        stru.create_person_name,
+        stru.create_time,
+        count(distinct struP.patent_no) as patent_num
+        from structure stru
+        left join asso_structure_patent struP on find_in_set(stru.id, struP.path)
+        where stru.parent_id = #{parentId}
+        and stru.product_id = #{productId}
+        <if test="ids != null and ids.size > 0">
+            and stru.id in (
+            <foreach collection="ids" item="item" separator=",">
+                #{item}
+            </foreach>
+            )
+        </if>
+        group by stru.id
+        order by stru.id
+    </select>
+
+    <resultMap id="selectTreeMap" type="cn.cslg.pas.common.model.vo.StructureVO">
+        <id column="stru_id" property="id"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="structure_name" property="structureName"/>
+        <result column="path" property="path"/>
+        <result column="remark" property="remark"/>
+        <result column="product_id" property="productId"/>
+        <result column="create_person_name" property="createPersonName"/>
+        <result column="create_time" property="createTime"/>
+        <result column="patent_num" property="patentNum"/>
+    </resultMap>
+
     <!--根据模糊路径查询数据-->
     <!--List<StructureVO> selectByFindInSetPath(String findInSetPath);-->
     <select id="selectByFindInSetPath" resultMap="selectByFindInSetPathMap">

PAS/src/main/resources/mapper/TaskMapper.xml

@@ -4,14 +4,10 @@
     <select id="getPageList" parameterType="cn.cslg.pas.common.model.vo.TaskVO" resultType="cn.cslg.pas.domain.Task">
         select a.id, a.type, a.uid as create_by, a.ctime as start_time, a.tid as project_id,
         a.mfields as field_num, a.mun as total, a.endtime as end_time, a.status, a.filename as file_name,
-        a.filesize as file_size, a.downexcel as url, b.name as create_name, c.name as project_name, a.old_name
+        a.filesize as file_size, a.downexcel as url, c.name as project_name, a.old_name
         from os_task a
-        left join os_distribution b on a.uid = b.id
         left join os_thematic c on c.id = a.tid
         <where>
-            <if test="params.createName != '' and params.createName != null">
-                and b.name like concat('%', #{params.createName}, '%')
-            </if>
             <if test="params.status != null">
                 and a.status = #{params.status}
             </if>
@@ -27,6 +23,12 @@
             <if test="params.projectName != '' and params.projectName != null">
                 and c.name like concat('%', #{params.projectName}, '%')
             </if>
+            <if test="params.createPersonIds != null and params.createPersonIds.size > 0">
+                and a.uid in
+                <foreach collection="params.createPersonIds" item="n" separator="," open="(" close=")">
+                    #{n}
+                </foreach>
+            </if>
         </where>
         order by a.ctime ${params.order}
     </select>

logs/pas/pas-debug.2023-03-14.0.log

@@ -1,744 +0,0 @@
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.573 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.595 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 0(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.615 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.615 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 1(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.617 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 2
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.618 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.618 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 5(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.619 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.619 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 2
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.620 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.621 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 1(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.622 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.622 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 2(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.622 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.623 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.623 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 3(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.624 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.624 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.625 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 4(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.625 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.625 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.626 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.626 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 2(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.627 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.627 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.628 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 3(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.629 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.630 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.630 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 4(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.630 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.631 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.631 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 5(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.633 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.633 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 6(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.634 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.634 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.634 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 7(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.635 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.636 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.636 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.636 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.637 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.637 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.637 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 6(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.638 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.639 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.639 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 7(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.640 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.641 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.642 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.643 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.643 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.644 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.644 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.645 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.645 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.645 DEBUG 6764 [http-nio-8877-exec-8] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.843 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.843 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 0(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.844 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.845 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 1(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.845 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 2
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.846 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.846 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 5(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.846 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.847 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 2
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.847 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.847 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 1(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.848 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.848 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 2(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.849 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.849 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.850 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 3(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.850 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.850 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.851 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 4(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.851 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.851 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.852 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.852 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 2(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.853 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.853 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.854 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 3(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.856 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.857 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.857 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 4(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.858 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.860 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.860 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 5(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.862 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.862 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 6(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.863 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.865 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.865 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 7(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.866 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.868 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.868 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.869 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.869 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.869 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.869 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 6(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.870 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.870 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.870 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 7(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.871 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.871 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.871 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.872 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.872 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.873 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.873 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.873 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.874 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.874 DEBUG 6764 [http-nio-8877-exec-9] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.588 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.608 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 0(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.628 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.629 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 1(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.629 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 2
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.630 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.630 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 5(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.630 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.631 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 2
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.632 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.633 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 1(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.634 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.634 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 2(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.635 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.636 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.636 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 3(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.636 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.637 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.637 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 4(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.638 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.638 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.638 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.638 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 2(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.639 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.639 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.639 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 3(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.640 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.640 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.641 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 4(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.641 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.641 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.642 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 5(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.643 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.643 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 6(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.643 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.644 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.644 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 7(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.644 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.645 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.645 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.645 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.645 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.646 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.646 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 6(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.646 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.647 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.648 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 7(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.650 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.651 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.651 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.652 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.653 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.653 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.653 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.654 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where parent_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.654 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId ==> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.655 DEBUG 10668 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.893 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByProductId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.913 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByProductId ==> Parameters: 22(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.933 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.933 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 1(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.934 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 2
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.934 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.935 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 2(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.935 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.936 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.936 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 3(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.937 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.938 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.938 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 4(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.939 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.939 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.939 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 5(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.940 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.940 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.940 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 6(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.941 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.941 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.941 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 7(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.942 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.943 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.943 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.943 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.944 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.944 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.944 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.945 DEBUG 9720 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByProductId <==      Total: 9
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.739 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByProductId ==>  Preparing: select id s_id, parent_id, structure_name, path, remark, product_id from structure where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.759 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByProductId ==> Parameters: 22(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.779 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.780 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 1(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.781 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 2
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.781 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.782 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 2(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.782 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.783 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.783 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 3(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.783 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.784 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.784 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 4(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.785 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.785 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.786 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 5(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.786 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.787 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.787 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 6(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.788 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.788 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.789 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 7(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.790 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.790 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.790 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.791 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.791 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====>  Preparing: select id, structure_id, name, suffix, url from asso_structure_picture where structure_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.791 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 ====> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.792 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByParentId2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.792 DEBUG 3888 [http-nio-8877-exec-4] cn.cslg.pas.mapper.StructureMapper.selectByProductId <==      Total: 9
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:16.821 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:16.841 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:16.871 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:16.881 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:16.881 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:16.881 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.139 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.139 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.146 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.148 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.148 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.150 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.345 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductCategoryMapper.query_COUNT ==>  Preparing: SELECT count(0) FROM product_category
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.345 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductCategoryMapper.query_COUNT ==> Parameters: 
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.347 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductCategoryMapper.query_COUNT <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.349 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductCategoryMapper.query ==>  Preparing: select id pc_id, product_category_name, remark, license_rate, create_person_name from product_category order by pc_id LIMIT ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.349 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductCategoryMapper.query ==> Parameters: 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.352 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductCategoryMapper.query2 ====>  Preparing: select id, product_category_id, name, suffix, url from asso_product_category_picture where product_category_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.352 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductCategoryMapper.query2 ====> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.355 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductCategoryMapper.query2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.356 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductCategoryMapper.query <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.620 DEBUG 10648 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.620 DEBUG 10648 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.620 DEBUG 10648 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.630 DEBUG 10648 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.630 DEBUG 10648 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.630 DEBUG 10648 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.640 DEBUG 10648 [http-nio-8877-exec-3] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.650 DEBUG 10648 [http-nio-8877-exec-3] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.650 DEBUG 10648 [http-nio-8877-exec-3] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.650 DEBUG 10648 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.650 DEBUG 10648 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.650 DEBUG 10648 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.730 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.730 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.740 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.740 DEBUG 10648 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.740 DEBUG 10648 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.740 DEBUG 10648 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.740 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.740 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.740 DEBUG 10648 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.740 DEBUG 10648 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.740 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.750 DEBUG 10648 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.820 DEBUG 10648 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.820 DEBUG 10648 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.830 DEBUG 10648 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.827 DEBUG 10648 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.827 DEBUG 10648 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.827 DEBUG 10648 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.827 DEBUG 10648 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.827 DEBUG 10648 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.827 DEBUG 10648 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.847 DEBUG 10648 [http-nio-8877-exec-7] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.847 DEBUG 10648 [http-nio-8877-exec-7] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.847 DEBUG 10648 [http-nio-8877-exec-7] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.847 DEBUG 10648 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.847 DEBUG 10648 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.847 DEBUG 10648 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.907 DEBUG 10648 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.907 DEBUG 10648 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.907 DEBUG 10648 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.907 DEBUG 10648 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.907 DEBUG 10648 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.907 DEBUG 10648 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.907 DEBUG 10648 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.907 DEBUG 10648 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.907 DEBUG 10648 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.907 DEBUG 10648 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.907 DEBUG 10648 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.917 DEBUG 10648 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:34.025 DEBUG 10648 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:34.026 DEBUG 10648 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:34.030 DEBUG 10648 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.250 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query_COUNT ==>  Preparing: SELECT count(0) FROM product WHERE product_category_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.250 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query_COUNT ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.250 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query_COUNT <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.250 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query ==>  Preparing: select id p_id, product_name, market_time, company_name, tenant_id, product_explain, product_category_id, license_rate, create_person_name from product WHERE product_category_id = ? order by p_id LIMIT ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.260 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query ==> Parameters: 11(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.260 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.260 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.260 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.260 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.260 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.260 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.260 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.260 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.260 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.260 DEBUG 10648 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.471 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.471 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.471 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.471 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.471 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.471 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.491 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.491 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.491 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.491 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.491 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.491 DEBUG 10648 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.551 DEBUG 10648 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.551 DEBUG 10648 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.551 DEBUG 10648 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 2
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:00.991 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:00.991 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:00.993 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:00.995 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:00.995 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:00.997 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:01.008 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:01.009 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:01.012 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:01.013 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:01.013 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:01.015 DEBUG 10648 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:01.067 DEBUG 10648 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:01.067 DEBUG 10648 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:01.069 DEBUG 10648 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 2
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.746 DEBUG 1428 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.766 DEBUG 1428 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.786 DEBUG 1428 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.797 DEBUG 1428 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.797 DEBUG 1428 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.800 DEBUG 1428 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.981 DEBUG 1428 [http-nio-8877-exec-1] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.982 DEBUG 1428 [http-nio-8877-exec-1] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.988 DEBUG 1428 [http-nio-8877-exec-1] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.990 DEBUG 1428 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.991 DEBUG 1428 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.993 DEBUG 1428 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.887 DEBUG 1428 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.query ==>  Preparing: select id p_id, product_name, market_time, company_name, tenant_id, product_explain, product_category_id, license_rate, create_person_name from product WHERE product_category_id = ? order by p_id
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.887 DEBUG 1428 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.query ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.892 DEBUG 1428 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.893 DEBUG 1428 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.894 DEBUG 1428 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.894 DEBUG 1428 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.895 DEBUG 1428 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.897 DEBUG 1428 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.897 DEBUG 1428 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.898 DEBUG 1428 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.900 DEBUG 1428 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.900 DEBUG 1428 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.query <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.874 DEBUG 1428 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.875 DEBUG 1428 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.876 DEBUG 1428 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.878 DEBUG 1428 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.879 DEBUG 1428 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.880 DEBUG 1428 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.890 DEBUG 1428 [http-nio-8877-exec-3] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.890 DEBUG 1428 [http-nio-8877-exec-3] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.895 DEBUG 1428 [http-nio-8877-exec-3] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.896 DEBUG 1428 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.897 DEBUG 1428 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.898 DEBUG 1428 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.097 DEBUG 1428 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.query ==>  Preparing: select id p_id, product_name, market_time, company_name, tenant_id, product_explain, product_category_id, license_rate, create_person_name from product WHERE product_category_id = ? order by p_id
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.098 DEBUG 1428 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.query ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.101 DEBUG 1428 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.101 DEBUG 1428 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.102 DEBUG 1428 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.102 DEBUG 1428 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.102 DEBUG 1428 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.104 DEBUG 1428 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.105 DEBUG 1428 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.106 DEBUG 1428 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.107 DEBUG 1428 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.108 DEBUG 1428 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.query <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.560 DEBUG 1428 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.561 DEBUG 1428 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.563 DEBUG 1428 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.564 DEBUG 1428 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.565 DEBUG 1428 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.567 DEBUG 1428 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.576 DEBUG 1428 [http-nio-8877-exec-5] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.577 DEBUG 1428 [http-nio-8877-exec-5] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.581 DEBUG 1428 [http-nio-8877-exec-5] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.582 DEBUG 1428 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.582 DEBUG 1428 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.584 DEBUG 1428 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.458 DEBUG 1428 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.query ==>  Preparing: select id p_id, product_name, market_time, company_name, tenant_id, product_explain, product_category_id, license_rate, create_person_name from product WHERE product_category_id = ? order by p_id
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.458 DEBUG 1428 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.query ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.461 DEBUG 1428 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.461 DEBUG 1428 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.463 DEBUG 1428 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.463 DEBUG 1428 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.463 DEBUG 1428 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.465 DEBUG 1428 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.465 DEBUG 1428 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.465 DEBUG 1428 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.467 DEBUG 1428 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.467 DEBUG 1428 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.query <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.274 DEBUG 1428 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.275 DEBUG 1428 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.276 DEBUG 1428 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.277 DEBUG 1428 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.278 DEBUG 1428 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.280 DEBUG 1428 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.290 DEBUG 1428 [http-nio-8877-exec-7] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.290 DEBUG 1428 [http-nio-8877-exec-7] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.293 DEBUG 1428 [http-nio-8877-exec-7] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.295 DEBUG 1428 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.295 DEBUG 1428 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.297 DEBUG 1428 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.367 DEBUG 1428 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.367 DEBUG 1428 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.369 DEBUG 1428 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.369 DEBUG 1428 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.370 DEBUG 1428 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.371 DEBUG 1428 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.374 DEBUG 1428 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.374 DEBUG 1428 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.375 DEBUG 1428 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.375 DEBUG 1428 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.377 DEBUG 1428 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.377 DEBUG 1428 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.485 DEBUG 1428 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.485 DEBUG 1428 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.487 DEBUG 1428 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:46.813 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:46.833 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:46.854 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:46.865 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:46.866 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:46.868 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:47.039 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:47.040 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:47.046 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:47.048 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:47.049 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:47.051 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.110 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.111 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.113 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.114 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.115 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.117 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.130 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.130 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.134 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.136 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.136 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.139 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.168 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.169 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.171 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.173 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.174 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.175 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.185 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.185 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.189 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.190 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.190 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.192 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.801 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.801 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.804 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.806 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.807 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.809 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.819 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.819 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.823 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.826 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.827 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.830 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.883 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.883 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.885 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.886 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.887 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.889 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.899 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.899 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.902 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.903 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.903 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.905 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.660 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.661 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.662 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.663 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.664 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.665 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.674 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.674 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.677 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.678 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.679 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.680 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.730 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.730 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.732 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.733 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.733 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.735 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.744 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.745 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.748 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.749 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.749 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.752 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.258 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.query ==>  Preparing: select id p_id, product_name, market_time, company_name, tenant_id, product_explain, product_category_id, license_rate, create_person_name from product WHERE product_category_id = ? order by p_id
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.259 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.query ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.263 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.263 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.265 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.265 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.265 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.268 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.269 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.269 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.270 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.271 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.query <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:51.999 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:52.000 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:52.002 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:52.003 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:52.004 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:52.005 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:52.014 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:52.015 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:52.018 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:52.019 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:52.019 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:52.021 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.096 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.096 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.098 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.100 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.100 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.102 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.112 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.112 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.115 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.116 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.116 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.118 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.958 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query ==>  Preparing: select id p_id, product_name, market_time, company_name, tenant_id, product_explain, product_category_id, license_rate, create_person_name from product WHERE product_category_id = ? order by p_id
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.958 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.960 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.960 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.962 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.962 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.962 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.964 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.964 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.964 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.967 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.967 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.query <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.920 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.920 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.922 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.923 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.924 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.925 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.934 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.935 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.937 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.938 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.938 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.940 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.895 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.query ==>  Preparing: select id p_id, product_name, market_time, company_name, tenant_id, product_explain, product_category_id, license_rate, create_person_name from product WHERE product_category_id = ? order by p_id
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.896 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.query ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.898 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.898 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.900 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.900 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.900 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.902 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.902 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.902 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.904 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.904 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.query <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.693 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.693 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.695 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.696 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.697 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.698 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.709 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.709 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.711 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.713 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.713 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.715 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.849 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.query ==>  Preparing: select id p_id, product_name, market_time, company_name, tenant_id, product_explain, product_category_id, license_rate, create_person_name from product WHERE product_category_id = ? order by p_id
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.850 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.query ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.852 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.852 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 8(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.854 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.855 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.855 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.857 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.857 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.query2 ====>  Preparing: select id, product_id, name, suffix, url from asso_product_picture where product_id = ?
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.858 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.query2 ====> Parameters: 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.859 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.query2 <====      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.859 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProductMapper.query <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.105 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.105 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.107 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.108 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.109 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.110 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.118 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.119 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.121 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.122 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.123 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.124 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.189 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.189 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.191 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.192 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.192 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.195 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.196 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.196 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.196 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.196 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.198 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.198 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.284 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.285 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.286 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:01.568 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:01.569 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:01.571 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:01.572 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:01.572 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:01.574 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:04.573 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:04.574 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:04.576 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:04.578 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:04.578 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:04.582 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:07.350 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:07.351 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:07.353 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:07.354 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:07.354 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:07.357 DEBUG 11144 [http-nio-8877-exec-2] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:10.415 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:10.416 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:10.417 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:10.419 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:10.419 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:10.420 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:11.672 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ? AND company_name = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:11.672 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer), 深圳威世博知识产权代理事务所(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:11.675 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 2
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:11.675 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:11.676 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:11.677 DEBUG 11144 [http-nio-8877-exec-4] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 2
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.968 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.969 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.970 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.971 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.972 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.973 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.985 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.986 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.987 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.988 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.989 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.991 DEBUG 11144 [http-nio-8877-exec-5] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.043 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.043 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.045 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.045 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.045 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.046 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.046 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.048 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.048 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.049 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.049 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.049 DEBUG 11144 [http-nio-8877-exec-8] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.139 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.139 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:00.141 DEBUG 11144 [http-nio-8877-exec-7] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:01.732 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:01.733 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:01.734 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:01.735 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:01.735 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:01.736 DEBUG 11144 [http-nio-8877-exec-9] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:02.755 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:02.756 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 11(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:02.758 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 3
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:02.759 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?,?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:02.759 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 8(Integer), 9(Integer), 10(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:02.761 DEBUG 11144 [http-nio-8877-exec-10] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 4
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.869 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==>  Preparing: SELECT id,uid AS userId,tenantId,tid AS projectId,addtime AS createTime,remark,type FROM os_distribution_doing WHERE (uid = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.869 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectUserMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.871 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectUserMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.871 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.872 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 197(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.873 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 1
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.881 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.SystemDictMapper.selectList ==>  Preparing: SELECT id,label,value,type FROM os_system_dict WHERE (type IN (?,?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.881 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.SystemDictMapper.selectList ==> Parameters: ENTERPRISE_APPLICATION_SCENARIO(String), INVESTIGATION_TYPE(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.883 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.SystemDictMapper.selectList <==      Total: 46
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.884 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==>  Preparing: SELECT id,name,creat_id AS createBy,technical_theme,innerfile,`update`,status,contract_no,`case` AS caseDate,update_time,sort,clientid,scenarioid AS scenario,typeid AS type,remark,department_id,personnel_id,tenantId,create_time FROM os_thematic WHERE (creat_id = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.884 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList ==> Parameters: 328(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.885 DEBUG 11144 [http-nio-8877-exec-1] cn.cslg.pas.mapper.ProjectMapper.selectList <==      Total: 0
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.945 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==>  Preparing: SELECT id,product_id,sale_time,sale_area,sale_count,sale_money,custom_license_rate,create_person_id,create_person_name,create_time,modified_time FROM product_market_data WHERE (product_id IN (?))
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.945 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList ==> Parameters: 9(Integer)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.947 DEBUG 11144 [http-nio-8877-exec-3] cn.cslg.pas.mapper.ProductMarketDataMapper.selectList <==      Total: 2
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:21:53.194 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.selectList ==>  Preparing: SELECT id,product_name,market_time,company_name,tenant_id,product_explain,product_category_id,license_rate,create_person_id,create_person_name,create_time,modified_time FROM product WHERE (product_category_id = ? AND company_name = ?)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:21:53.194 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.selectList ==> Parameters: 0(Integer), string(String)
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:21:53.196 DEBUG 11144 [http-nio-8877-exec-6] cn.cslg.pas.mapper.ProductMapper.selectList <==      Total: 0

logs/pas/pas-info.2023-03-14.0.log

@@ -1,356 +0,0 @@
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:45.051 INFO 6764 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_312 on 陈宇的杂牌电脑呀 with PID 6764 (E:\WorkSpace\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by Administrator in E:\WorkSpace\Wispro-CodeWarehouse-BackEnd)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:45.052 INFO 6764 [main] cn.cslg.pas.Application The following profiles are active: dev
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:45.774 INFO 6764 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:45.777 INFO 6764 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:45.807 INFO 6764 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 17 ms. Found 0 Redis repository interfaces.
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:46.468 INFO 6764 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:46.476 INFO 6764 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:46.477 INFO 6764 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:46.477 INFO 6764 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:46.561 INFO 6764 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:46.561 INFO 6764 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1478 ms
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:46.751 INFO 6764 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:46.953 INFO 6764 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:51.712 INFO 6764 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:51.728 INFO 6764 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:24:51.736 INFO 6764 [main] cn.cslg.pas.Application Started Application in 7.147 seconds (JVM running for 8.265)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:25:57.997 INFO 6764 [http-nio-8877-exec-1] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring DispatcherServlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:25:57.997 INFO 6764 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Initializing Servlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:25:57.998 INFO 6764 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Completed initialization in 1 ms
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:25:59.097 INFO 6764 [http-nio-8877-exec-7] org.springdoc.api.AbstractOpenApiResource Init duration for springdoc-openapi is: 878 ms
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.460 INFO 6764 [http-nio-8877-exec-8] cn.cslg.pas.controller.StructureController 开始处理【分页查询架构】的请求，请求参数为：StructureQueryPageDTO(productId=0, structureId=0, structureName=string)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:13.463 INFO 6764 [http-nio-8877-exec-8] cn.cslg.pas.service.impl.StructureServiceImpl 开始处理【分页查询架构】的业务，参数为：StructureQueryPageDTO(productId=0, structureId=0, structureName=string)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.842 INFO 6764 [http-nio-8877-exec-9] cn.cslg.pas.controller.StructureController 开始处理【分页查询架构】的请求，请求参数为：StructureQueryPageDTO(productId=22, structureId=0, structureName=string)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:26:53.843 INFO 6764 [http-nio-8877-exec-9] cn.cslg.pas.service.impl.StructureServiceImpl 开始处理【分页查询架构】的业务，参数为：StructureQueryPageDTO(productId=22, structureId=0, structureName=string)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:29:14.185 INFO 6764 [SpringApplicationShutdownHook] com.alibaba.druid.pool.DruidDataSource {dataSource-1} closed
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:19.160 INFO 10668 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_312 on 陈宇的杂牌电脑呀 with PID 10668 (E:\WorkSpace\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by Administrator in E:\WorkSpace\Wispro-CodeWarehouse-BackEnd)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:19.162 INFO 10668 [main] cn.cslg.pas.Application The following profiles are active: dev
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:19.890 INFO 10668 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:19.892 INFO 10668 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:19.920 INFO 10668 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 17 ms. Found 0 Redis repository interfaces.
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:20.540 INFO 10668 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:20.547 INFO 10668 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:20.547 INFO 10668 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:20.547 INFO 10668 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:20.621 INFO 10668 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:20.622 INFO 10668 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1414 ms
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:20.804 INFO 10668 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:21.010 INFO 10668 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:25.424 INFO 10668 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:25.439 INFO 10668 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:25.447 INFO 10668 [main] cn.cslg.pas.Application Started Application in 6.695 seconds (JVM running for 7.358)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:29.143 INFO 10668 [http-nio-8877-exec-1] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring DispatcherServlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:29.143 INFO 10668 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Initializing Servlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:29.144 INFO 10668 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Completed initialization in 1 ms
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:30.214 INFO 10668 [http-nio-8877-exec-3] org.springdoc.api.AbstractOpenApiResource Init duration for springdoc-openapi is: 829 ms
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.474 INFO 10668 [http-nio-8877-exec-4] cn.cslg.pas.controller.StructureController 开始处理【分页查询架构】的请求，请求参数为：StructureQueryPageDTO(productId=22, structureId=0, structureName=string)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:30:41.476 INFO 10668 [http-nio-8877-exec-4] cn.cslg.pas.service.impl.StructureServiceImpl 开始处理【分页查询架构】的业务，参数为：StructureQueryPageDTO(productId=22, structureId=0, structureName=string)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:31:37.599 INFO 10668 [SpringApplicationShutdownHook] com.alibaba.druid.pool.DruidDataSource {dataSource-1} closed
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:11.894 INFO 9720 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_312 on 陈宇的杂牌电脑呀 with PID 9720 (E:\WorkSpace\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by Administrator in E:\WorkSpace\Wispro-CodeWarehouse-BackEnd)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:11.896 INFO 9720 [main] cn.cslg.pas.Application The following profiles are active: dev
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:12.653 INFO 9720 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:12.655 INFO 9720 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:12.684 INFO 9720 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 17 ms. Found 0 Redis repository interfaces.
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:13.325 INFO 9720 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:13.333 INFO 9720 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:13.333 INFO 9720 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:13.333 INFO 9720 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:13.412 INFO 9720 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:13.413 INFO 9720 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1471 ms
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:13.603 INFO 9720 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:13.822 INFO 9720 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:18.368 INFO 9720 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:18.383 INFO 9720 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:18.392 INFO 9720 [main] cn.cslg.pas.Application Started Application in 6.925 seconds (JVM running for 7.574)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:27.355 INFO 9720 [http-nio-8877-exec-1] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring DispatcherServlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:27.356 INFO 9720 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Initializing Servlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:27.357 INFO 9720 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Completed initialization in 1 ms
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:28.381 INFO 9720 [http-nio-8877-exec-3] org.springdoc.api.AbstractOpenApiResource Init duration for springdoc-openapi is: 809 ms
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.784 INFO 9720 [http-nio-8877-exec-4] cn.cslg.pas.controller.StructureController 开始处理【分页查询架构】的请求，请求参数为：StructureQueryPageDTO(productId=22, structureId=0, structureName=string)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:50:45.786 INFO 9720 [http-nio-8877-exec-4] cn.cslg.pas.service.impl.StructureServiceImpl 开始处理【分页查询架构】的业务2，参数为：StructureQueryPageDTO(productId=22, structureId=0, structureName=string)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:12.387 INFO 9720 [SpringApplicationShutdownHook] com.alibaba.druid.pool.DruidDataSource {dataSource-1} closed
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:16.132 INFO 3888 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_312 on 陈宇的杂牌电脑呀 with PID 3888 (E:\WorkSpace\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by Administrator in E:\WorkSpace\Wispro-CodeWarehouse-BackEnd)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:16.134 INFO 3888 [main] cn.cslg.pas.Application The following profiles are active: dev
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:16.875 INFO 3888 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:16.877 INFO 3888 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:16.905 INFO 3888 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 17 ms. Found 0 Redis repository interfaces.
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:17.556 INFO 3888 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:17.563 INFO 3888 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:17.563 INFO 3888 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:17.564 INFO 3888 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:17.642 INFO 3888 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:17.643 INFO 3888 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1467 ms
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:17.830 INFO 3888 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:18.045 INFO 3888 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:22.516 INFO 3888 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:22.530 INFO 3888 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:22.538 INFO 3888 [main] cn.cslg.pas.Application Started Application in 6.812 seconds (JVM running for 7.51)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:24.928 INFO 3888 [http-nio-8877-exec-1] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring DispatcherServlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:24.928 INFO 3888 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Initializing Servlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:24.929 INFO 3888 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Completed initialization in 1 ms
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:26.036 INFO 3888 [http-nio-8877-exec-3] org.springdoc.api.AbstractOpenApiResource Init duration for springdoc-openapi is: 861 ms
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.608 INFO 3888 [http-nio-8877-exec-4] cn.cslg.pas.controller.StructureController 开始处理【分页查询架构】的请求，请求参数为：StructureQueryPageDTO(productId=22, structureId=0, structureName=string)
-[pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.610 INFO 3888 [http-nio-8877-exec-4] cn.cslg.pas.service.impl.StructureServiceImpl 开始处理【分页查询架构】的业务2，参数为：StructureQueryPageDTO(productId=22, structureId=0, structureName=string)
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:42.421 INFO 22908 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_342 on DESKTOP-69B64D5 with PID 22908 (D:\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by admin in D:\Wispro-CodeWarehouse-BackEnd)
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:42.421 INFO 22908 [main] cn.cslg.pas.Application The following profiles are active: dev
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:43.371 INFO 22908 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:43.371 INFO 22908 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:43.441 INFO 22908 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 46 ms. Found 0 Redis repository interfaces.
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:44.210 INFO 22908 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:44.220 INFO 22908 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:44.220 INFO 22908 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:44.220 INFO 22908 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:44.310 INFO 22908 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:44.310 INFO 22908 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1839 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:44.520 INFO 22908 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:44.740 INFO 22908 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:50.052 INFO 22908 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:50.072 INFO 22908 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:50.082 INFO 22908 [main] cn.cslg.pas.Application Started Application in 8.139 seconds (JVM running for 9.89)
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:11:50.650 INFO 22908 [SpringApplicationShutdownHook] com.alibaba.druid.pool.DruidDataSource {dataSource-1} closed
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:37.536 INFO 13252 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_342 on DESKTOP-69B64D5 with PID 13252 (D:\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by admin in D:\Wispro-CodeWarehouse-BackEnd)
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:37.546 INFO 13252 [main] cn.cslg.pas.Application The following profiles are active: dev
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:38.376 INFO 13252 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:38.376 INFO 13252 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:38.446 INFO 13252 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 51 ms. Found 0 Redis repository interfaces.
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:39.226 INFO 13252 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:39.236 INFO 13252 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:39.236 INFO 13252 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:39.236 INFO 13252 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:39.316 INFO 13252 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:39.316 INFO 13252 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1730 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:39.516 INFO 13252 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:39.736 INFO 13252 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:44.660 INFO 13252 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:44.680 INFO 13252 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
-[pas:0.0.0.0:8877] [,] 2023-03-14 11:20:44.690 INFO 13252 [main] cn.cslg.pas.Application Started Application in 7.639 seconds (JVM running for 8.479)
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:35.463 INFO 13252 [SpringApplicationShutdownHook] com.alibaba.druid.pool.DruidDataSource {dataSource-1} closed
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:41.530 INFO 8076 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_342 on DESKTOP-69B64D5 with PID 8076 (D:\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by admin in D:\Wispro-CodeWarehouse-BackEnd)
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:41.533 INFO 8076 [main] cn.cslg.pas.Application The following profiles are active: dev
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:42.442 INFO 8076 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:42.444 INFO 8076 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:42.507 INFO 8076 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 51 ms. Found 0 Redis repository interfaces.
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:43.194 INFO 8076 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:43.202 INFO 8076 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:43.202 INFO 8076 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:43.203 INFO 8076 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:43.286 INFO 8076 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:43.286 INFO 8076 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1703 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:43.493 INFO 8076 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:43.703 INFO 8076 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:49.008 INFO 8076 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:49.026 INFO 8076 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:11:49.034 INFO 8076 [main] cn.cslg.pas.Application Started Application in 7.993 seconds (JVM running for 8.783)
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:44.386 INFO 8076 [SpringApplicationShutdownHook] com.alibaba.druid.pool.DruidDataSource {dataSource-1} closed
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:52.901 INFO 17596 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_342 on DESKTOP-69B64D5 with PID 17596 (D:\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by admin in D:\Wispro-CodeWarehouse-BackEnd)
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:52.904 INFO 17596 [main] cn.cslg.pas.Application The following profiles are active: dev
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:53.781 INFO 17596 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:53.783 INFO 17596 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:53.850 INFO 17596 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 53 ms. Found 0 Redis repository interfaces.
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:54.534 INFO 17596 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:54.542 INFO 17596 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:54.543 INFO 17596 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:54.544 INFO 17596 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:54.626 INFO 17596 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:54.626 INFO 17596 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1672 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:54.827 INFO 17596 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:14:55.037 INFO 17596 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:15:00.158 INFO 17596 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:15:00.174 INFO 17596 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:15:00.184 INFO 17596 [main] cn.cslg.pas.Application Started Application in 7.778 seconds (JVM running for 8.514)
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:36:51.472 INFO 17596 [http-nio-8877-exec-1] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring DispatcherServlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:36:51.472 INFO 17596 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Initializing Servlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:36:51.474 INFO 17596 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Completed initialization in 2 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:36:52.740 INFO 17596 [http-nio-8877-exec-4] org.springdoc.api.AbstractOpenApiResource Init duration for springdoc-openapi is: 953 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:31.032 INFO 17596 [SpringApplicationShutdownHook] com.alibaba.druid.pool.DruidDataSource {dataSource-1} closed
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:37.808 INFO 8508 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_342 on DESKTOP-69B64D5 with PID 8508 (D:\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by admin in D:\Wispro-CodeWarehouse-BackEnd)
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:37.810 INFO 8508 [main] cn.cslg.pas.Application The following profiles are active: dev
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:38.696 INFO 8508 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:38.698 INFO 8508 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:38.762 INFO 8508 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 51 ms. Found 0 Redis repository interfaces.
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:39.450 INFO 8508 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:39.457 INFO 8508 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:39.458 INFO 8508 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:39.458 INFO 8508 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:39.540 INFO 8508 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:39.540 INFO 8508 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1682 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:39.730 INFO 8508 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:39.944 INFO 8508 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:45.103 INFO 8508 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:45.118 INFO 8508 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:44:45.127 INFO 8508 [main] cn.cslg.pas.Application Started Application in 7.822 seconds (JVM running for 8.717)
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:47:46.958 INFO 8508 [http-nio-8877-exec-1] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring DispatcherServlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:47:46.959 INFO 8508 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Initializing Servlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:47:46.960 INFO 8508 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Completed initialization in 1 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 14:47:48.038 INFO 8508 [http-nio-8877-exec-2] org.springdoc.api.AbstractOpenApiResource Init duration for springdoc-openapi is: 948 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:29.376 INFO 8508 [SpringApplicationShutdownHook] com.alibaba.druid.pool.DruidDataSource {dataSource-1} closed
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:34.286 INFO 10648 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_342 on DESKTOP-69B64D5 with PID 10648 (D:\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by admin in D:\Wispro-CodeWarehouse-BackEnd)
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:34.286 INFO 10648 [main] cn.cslg.pas.Application The following profiles are active: dev
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:35.166 INFO 10648 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:35.166 INFO 10648 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:35.226 INFO 10648 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 51 ms. Found 0 Redis repository interfaces.
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:35.896 INFO 10648 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:35.906 INFO 10648 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:35.906 INFO 10648 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:35.906 INFO 10648 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:35.986 INFO 10648 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:35.986 INFO 10648 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1649 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:36.176 INFO 10648 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:36.386 INFO 10648 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:41.130 INFO 10648 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:41.150 INFO 10648 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
-[pas:0.0.0.0:8877] [,] 2023-03-14 15:29:41.161 INFO 10648 [main] cn.cslg.pas.Application Started Application in 7.361 seconds (JVM running for 8.346)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:16.190 INFO 10648 [http-nio-8877-exec-1] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring DispatcherServlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:16.190 INFO 10648 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Initializing Servlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:16.190 INFO 10648 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Completed initialization in 0 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:16.230 INFO 10648 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:16.681 INFO 10648 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:16.681 INFO 10648 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:16.872 INFO 10648 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.309 INFO 10648 [http-nio-8877-exec-2] cn.cslg.pas.controller.ProductCategoryController 开始处理【分页查询产品类别】的请求，请求参数为：ProductCategoryQueryPageDTO(productCategoryName=null, productName=null, createPersonName=null)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:17.311 INFO 10648 [http-nio-8877-exec-2] cn.cslg.pas.service.impl.ProductCategoryServiceImpl 开始处理【分页查询产品类别】的业务，参数为：ProductCategoryQueryPageDTO(productCategoryName=null, productName=null, createPersonName=null)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.620 INFO 10648 [http-nio-8877-exec-3] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.620 INFO 10648 [http-nio-8877-exec-3] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.620 INFO 10648 [http-nio-8877-exec-3] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:25.620 INFO 10648 [http-nio-8877-exec-3] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.817 INFO 10648 [http-nio-8877-exec-7] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.817 INFO 10648 [http-nio-8877-exec-7] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.827 INFO 10648 [http-nio-8877-exec-7] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:32:33.827 INFO 10648 [http-nio-8877-exec-7] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.240 INFO 10648 [http-nio-8877-exec-1] cn.cslg.pas.controller.ProductController 开始处理【查询产品】的请求，请求参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:49.240 INFO 10648 [http-nio-8877-exec-1] cn.cslg.pas.service.impl.ProductServiceImpl 开始处理【查询产品】的业务，参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.461 INFO 10648 [http-nio-8877-exec-2] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.471 INFO 10648 [http-nio-8877-exec-2] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.471 INFO 10648 [http-nio-8877-exec-2] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:33:54.471 INFO 10648 [http-nio-8877-exec-2] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:00.986 INFO 10648 [http-nio-8877-exec-4] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:00.990 INFO 10648 [http-nio-8877-exec-4] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:00.990 INFO 10648 [http-nio-8877-exec-4] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:34:00.994 INFO 10648 [http-nio-8877-exec-4] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:38:58.903 INFO 10648 [SpringApplicationShutdownHook] com.alibaba.druid.pool.DruidDataSource {dataSource-1} closed
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:04.174 INFO 1428 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_342 on DESKTOP-69B64D5 with PID 1428 (D:\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by admin in D:\Wispro-CodeWarehouse-BackEnd)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:04.176 INFO 1428 [main] cn.cslg.pas.Application The following profiles are active: dev
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:05.094 INFO 1428 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:05.097 INFO 1428 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:05.164 INFO 1428 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 52 ms. Found 0 Redis repository interfaces.
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:05.835 INFO 1428 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:05.842 INFO 1428 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:05.843 INFO 1428 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:05.843 INFO 1428 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:05.924 INFO 1428 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:05.924 INFO 1428 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1693 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:06.122 INFO 1428 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:06.326 INFO 1428 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:11.290 INFO 1428 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:11.305 INFO 1428 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:39:11.314 INFO 1428 [main] cn.cslg.pas.Application Started Application in 7.617 seconds (JVM running for 8.327)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.150 INFO 1428 [http-nio-8877-exec-1] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring DispatcherServlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.150 INFO 1428 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Initializing Servlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.151 INFO 1428 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Completed initialization in 1 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.179 INFO 1428 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.601 INFO 1428 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.601 INFO 1428 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:37.788 INFO 1428 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.882 INFO 1428 [http-nio-8877-exec-2] cn.cslg.pas.controller.ProductController 开始处理【查询产品】的请求，请求参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:41:38.885 INFO 1428 [http-nio-8877-exec-2] cn.cslg.pas.service.impl.ProductServiceImpl 开始处理【查询产品】的业务，参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.865 INFO 1428 [http-nio-8877-exec-3] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.868 INFO 1428 [http-nio-8877-exec-3] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.869 INFO 1428 [http-nio-8877-exec-3] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:45.877 INFO 1428 [http-nio-8877-exec-3] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.097 INFO 1428 [http-nio-8877-exec-4] cn.cslg.pas.controller.ProductController 开始处理【查询产品】的请求，请求参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:43:48.097 INFO 1428 [http-nio-8877-exec-4] cn.cslg.pas.service.impl.ProductServiceImpl 开始处理【查询产品】的业务，参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.553 INFO 1428 [http-nio-8877-exec-5] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.556 INFO 1428 [http-nio-8877-exec-5] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.556 INFO 1428 [http-nio-8877-exec-5] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:55.563 INFO 1428 [http-nio-8877-exec-5] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.457 INFO 1428 [http-nio-8877-exec-6] cn.cslg.pas.controller.ProductController 开始处理【查询产品】的请求，请求参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:45:57.458 INFO 1428 [http-nio-8877-exec-6] cn.cslg.pas.service.impl.ProductServiceImpl 开始处理【查询产品】的业务，参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.267 INFO 1428 [http-nio-8877-exec-7] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.270 INFO 1428 [http-nio-8877-exec-7] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.270 INFO 1428 [http-nio-8877-exec-7] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:48:20.276 INFO 1428 [http-nio-8877-exec-7] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:44.447 INFO 1428 [SpringApplicationShutdownHook] com.alibaba.druid.pool.DruidDataSource {dataSource-1} closed
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:50.147 INFO 11144 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_342 on DESKTOP-69B64D5 with PID 11144 (D:\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by admin in D:\Wispro-CodeWarehouse-BackEnd)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:50.157 INFO 11144 [main] cn.cslg.pas.Application The following profiles are active: dev
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:51.019 INFO 11144 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:51.021 INFO 11144 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:51.083 INFO 11144 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 49 ms. Found 0 Redis repository interfaces.
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:51.747 INFO 11144 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:51.754 INFO 11144 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:51.755 INFO 11144 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:51.755 INFO 11144 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:51.835 INFO 11144 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:51.835 INFO 11144 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1638 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:52.036 INFO 11144 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:52.240 INFO 11144 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:57.046 INFO 11144 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:57.061 INFO 11144 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:49:57.070 INFO 11144 [main] cn.cslg.pas.Application Started Application in 7.372 seconds (JVM running for 8.111)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:46.221 INFO 11144 [http-nio-8877-exec-1] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring DispatcherServlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:46.222 INFO 11144 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Initializing Servlet 'dispatcherServlet'
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:46.223 INFO 11144 [http-nio-8877-exec-1] org.springframework.web.servlet.DispatcherServlet Completed initialization in 1 ms
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:46.251 INFO 11144 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:46.669 INFO 11144 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:46.669 INFO 11144 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:46.856 INFO 11144 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.104 INFO 11144 [http-nio-8877-exec-2] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.109 INFO 11144 [http-nio-8877-exec-2] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.109 INFO 11144 [http-nio-8877-exec-2] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:51:52.113 INFO 11144 [http-nio-8877-exec-2] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.164 INFO 11144 [http-nio-8877-exec-3] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.167 INFO 11144 [http-nio-8877-exec-3] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.167 INFO 11144 [http-nio-8877-exec-3] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:00.172 INFO 11144 [http-nio-8877-exec-3] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.795 INFO 11144 [http-nio-8877-exec-4] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.799 INFO 11144 [http-nio-8877-exec-4] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.799 INFO 11144 [http-nio-8877-exec-4] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:07.804 INFO 11144 [http-nio-8877-exec-4] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.878 INFO 11144 [http-nio-8877-exec-5] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.881 INFO 11144 [http-nio-8877-exec-5] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.881 INFO 11144 [http-nio-8877-exec-5] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:19.885 INFO 11144 [http-nio-8877-exec-5] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.656 INFO 11144 [http-nio-8877-exec-6] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.659 INFO 11144 [http-nio-8877-exec-6] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.659 INFO 11144 [http-nio-8877-exec-6] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:52:46.662 INFO 11144 [http-nio-8877-exec-6] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.726 INFO 11144 [http-nio-8877-exec-7] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.729 INFO 11144 [http-nio-8877-exec-7] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.729 INFO 11144 [http-nio-8877-exec-7] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:16.732 INFO 11144 [http-nio-8877-exec-7] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.252 INFO 11144 [http-nio-8877-exec-8] cn.cslg.pas.controller.ProductController 开始处理【查询产品】的请求，请求参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:18.256 INFO 11144 [http-nio-8877-exec-8] cn.cslg.pas.service.impl.ProductServiceImpl 开始处理【查询产品】的业务，参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:51.995 INFO 11144 [http-nio-8877-exec-9] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:51.998 INFO 11144 [http-nio-8877-exec-9] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:51.998 INFO 11144 [http-nio-8877-exec-9] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:53:52.002 INFO 11144 [http-nio-8877-exec-9] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.087 INFO 11144 [http-nio-8877-exec-10] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.090 INFO 11144 [http-nio-8877-exec-10] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.091 INFO 11144 [http-nio-8877-exec-10] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.098 INFO 11144 [http-nio-8877-exec-10] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.955 INFO 11144 [http-nio-8877-exec-1] cn.cslg.pas.controller.ProductController 开始处理【查询产品】的请求，请求参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:55:23.956 INFO 11144 [http-nio-8877-exec-1] cn.cslg.pas.service.impl.ProductServiceImpl 开始处理【查询产品】的业务，参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.910 INFO 11144 [http-nio-8877-exec-2] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.916 INFO 11144 [http-nio-8877-exec-2] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.916 INFO 11144 [http-nio-8877-exec-2] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:43.922 INFO 11144 [http-nio-8877-exec-2] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.894 INFO 11144 [http-nio-8877-exec-3] cn.cslg.pas.controller.ProductController 开始处理【查询产品】的请求，请求参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:56:44.895 INFO 11144 [http-nio-8877-exec-3] cn.cslg.pas.service.impl.ProductServiceImpl 开始处理【查询产品】的业务，参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.689 INFO 11144 [http-nio-8877-exec-4] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.692 INFO 11144 [http-nio-8877-exec-4] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.692 INFO 11144 [http-nio-8877-exec-4] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:20.695 INFO 11144 [http-nio-8877-exec-4] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.848 INFO 11144 [http-nio-8877-exec-5] cn.cslg.pas.controller.ProductController 开始处理【查询产品】的请求，请求参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:57:22.849 INFO 11144 [http-nio-8877-exec-5] cn.cslg.pas.service.impl.ProductServiceImpl 开始处理【查询产品】的业务，参数为：ProductQueryPageDTO(productName=null, patentNo=null, companyName=null, productCategoryId=11)
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.098 INFO 11144 [http-nio-8877-exec-6] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.101 INFO 11144 [http-nio-8877-exec-6] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.101 INFO 11144 [http-nio-8877-exec-6] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:58:52.107 INFO 11144 [http-nio-8877-exec-6] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.965 INFO 11144 [http-nio-8877-exec-5] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.968 INFO 11144 [http-nio-8877-exec-5] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.968 INFO 11144 [http-nio-8877-exec-5] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 16:59:59.971 INFO 11144 [http-nio-8877-exec-5] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.865 INFO 11144 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 开始获得权限
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.868 INFO 11144 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 获得用户信息朱豪328
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.868 INFO 11144 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 开始查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:00:25.871 INFO 11144 [http-nio-8877-exec-1] cn.cslg.pas.service.OAuth2Service 查询专题库信息
-[pas:0.0.0.0:8877] [,] 2023-03-14 17:21:33.563 INFO 11144 [http-nio-8877-exec-5] org.springdoc.api.AbstractOpenApiResource Init duration for springdoc-openapi is: 3492 ms