11

src/main/java/cn/cslg/pas/common/dto/business/PatentProjectDTO.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -15,22 +16,18 @@ import java.util.List;
 public class PatentProjectDTO {
     @Schema(description = "名称")
     private String name;
-    @Schema(description = "委托类型1客户，2部门")
-    private Integer entrustType;
     @Schema(description = "委托方id")
-    private Integer entrustId;
+    private String entrustId;
     @Schema(description = "负责人id")
-    private Integer headId;
+    private String headId;
     @Schema(description = "负责部门id")
-    private Integer departmentId;
-    @Schema(description = "项目类型（1专题库 2报告 3专利挖掘项目）")
-    private Integer type;
+    private String departmentId;
     @Schema(description = "合同号")
     private String contractNo;
     @Schema(description = "内部卷号")
     private String volumeNumber;
     @Schema(description = "委案日")
-    private DateTime commissionCaseDay;
+    private Date commissionCaseDay;
     @Schema(description = "描述")
     private String description;
     @Schema(description = "应用场景")

src/main/java/cn/cslg/pas/common/dto/business/ProductDTO.java

@@ -40,5 +40,4 @@ public class ProductDTO {
     @Schema(description = "公司名称")
     private String companyName;
 
-
 }

src/main/java/cn/cslg/pas/common/dto/business/ProjectEventDTO.java

@@ -19,6 +19,8 @@ import java.util.Date;
 /*数据库中的表对应的类
  */
 public class ProjectEventDTO {
+    @Schema(description = "应用场景")
+    private Integer scenarioId;
     @Schema(description = "事件id")
     private Integer eventId;
     @Schema(description = "处理事项id")

src/main/java/cn/cslg/pas/common/vo/ReTreeNodeVO.java

@@ -42,7 +42,8 @@ public class ReTreeNodeVO {
     private String createId;
     @Schema(description = "创建时间")
     private DateTime createTime;
-
+    @Schema(description = "描述")
+    private String description;
     @Schema(description = "文件信息")
     private List<SystemFile> systemFileList;
 }

src/main/java/cn/cslg/pas/common/vo/business/PatentProjectVO.java

@@ -110,7 +110,7 @@ public class PatentProjectVO {
     /**
      * 是否更新
      */
-    @TableField(value = "if_update")
+    @Schema(description = "是否更新")
     private Boolean ifUpdate;
 
     /**

src/main/java/cn/cslg/pas/common/vo/business/TreeNodeVO.java

@@ -25,6 +25,7 @@ public class TreeNodeVO {
      */
     @Schema(description = "类型")
     private Integer type;
+
     @Schema(description = "父id")
     private Integer parentId;
     /**
@@ -32,19 +33,28 @@ public class TreeNodeVO {
      */
     @Schema(description = "抽象id")
     private Integer typeId;
+
     @Schema(description = "路径")
     private String path;
+
     @Schema(description = "路径")
     private String pathName;
+
     @Schema(description = "层级")
     private Integer level;
+
     @Schema(description = "创建人id")
     private String createId;
+
     @Schema(description = "创建人")
     private String createName;
+
     @Schema(description = "创建时间")
     private Date createTime;
 
+    @Schema(description = "描述")
+    private String description;
+
     @Schema(description = "文件信息")
     private List<SystemFile> systemFileList;
 }

src/main/java/cn/cslg/pas/domain/business/AssoProject.java

@@ -0,0 +1,38 @@
+package cn.cslg.pas.domain.business;
+
+import cn.cslg.pas.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.joda.time.DateTime;
+
+/**
+ * <p>
+ * 专题库或报告关联表
+ * </p>
+ *
+ * @author xx
+ * @since 2022-10-20
+ */
+@Data
+@TableName("asso_project")
+/*数据库中的表对应的类
+ */
+public class AssoProject extends BaseEntity<AssoProject> {
+    @TableField(value = "project_id")
+    private Integer projectId;
+    /**
+     * 0专题库/1报告类型
+     */
+    @TableField(value = "project_type")
+    private Integer projectType;
+
+    @TableField(value = "asso_project_id")
+    private Integer assoProjectId;
+    /**
+     * 0专题库/1报告类型
+     */
+    @TableField(value = "asso_project_type")
+    private Integer assoProjectType;
+
+}

src/main/java/cn/cslg/pas/domain/business/Project.java

@@ -34,19 +34,19 @@ public class Project extends BaseEntity<Project> {
      * 委托方id
      */
     @TableField(value = "entrust_id")
-    private Integer entrust_id;
+    private String entrust_id;
 
     /**
      * 负责人id
      */
     @TableField(value = "head_id")
-    private Integer headId;
+    private String headId;
 
     /**
      * 负责部门id
      */
     @TableField(value = "department_id")
-    private Integer departmentId;
+    private String departmentId;
 
     /**
      * 项目类型（1专题库 2报告 3专利挖掘项目）

src/main/java/cn/cslg/pas/mapper/AssoProjectMapper.java

@@ -0,0 +1,16 @@
+package cn.cslg.pas.mapper;
+
+import cn.cslg.pas.domain.business.AssoEventFile;
+import cn.cslg.pas.domain.business.AssoProject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 专题库或报告关联表
+ *
+ * @author lirj
+ * @date 2023/11/6
+ */
+@Repository
+public interface AssoProjectMapper extends BaseMapper<AssoProject> {
+}

src/main/java/cn/cslg/pas/mapper/PatentProjectMapper.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.mapper;
 
 import cn.cslg.pas.common.vo.business.EventVO;
+import cn.cslg.pas.common.vo.business.PatentProjectVO;
 import cn.cslg.pas.domain.business.Event;
 import cn.cslg.pas.domain.business.PatentProject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,4 +18,5 @@ import java.util.List;
 @Repository
 public interface PatentProjectMapper extends BaseMapper<PatentProject> {
 
+    public List<PatentProjectVO> getPatentProject(String sql1,String sql2,String sql3);
 }

src/main/java/cn/cslg/pas/service/CustomFieldService.java

@@ -0,0 +1,40 @@
+package cn.cslg.pas.service;
+
+
+import cn.cslg.pas.common.core.base.RedisConf;
+import cn.cslg.pas.common.utils.JsonUtils;
+import cn.cslg.pas.common.utils.RedisUtil;
+import cn.cslg.pas.common.utils.StringUtils;
+import cn.cslg.pas.domain.business.AssoProject;
+import cn.cslg.pas.mapper.AssoProjectMapper;
+import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class CustomFieldService {
+    @Autowired
+    private RedisUtil redisUtil;
+
+    public List<Integer> getCustomField(String type){
+//        String key = SecureUtil.md5(RedisConf.SYMBOL_COLON + type + RedisConf.SYMBOL_COLON +  + RedisConf.SYMBOL_COLON //+ userId+createId);
+//        String json = redisUtil.get(RedisConf.USER_FIELD + RedisConf.SYMBOL_COLON + key);
+//        if (StringUtils.isNotEmpty(json)) {
+//            return JsonUtils.jsonToList(json, PatentField.class);
+//        }
+        //根据登录人id和type查询
+
+        //如果没查询到，则获取所有栏位添加到redis里
+
+        //如果查到则返回
+        return null;
+    }
+
+    public List<Integer> setCustomField(){
+
+        return null;
+    }
+}

src/main/java/cn/cslg/pas/service/business/AssoProjectService.java

@@ -0,0 +1,14 @@
+package cn.cslg.pas.service.business;
+
+
+import cn.cslg.pas.domain.business.AssoEventFile;
+import cn.cslg.pas.domain.business.AssoProject;
+import cn.cslg.pas.mapper.AssoEventFileMapper;
+import cn.cslg.pas.mapper.AssoProjectMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AssoProjectService extends ServiceImpl<AssoProjectMapper, AssoProject> {
+
+}

src/main/java/cn/cslg/pas/service/business/EventService.java

@@ -71,10 +71,6 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
     @Autowired
     private LoginUtils loginUtils;
 
-    public String getEvent(String sql) {
-//        eventMapper.getEvent(sql);
-        return "";
-    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)

src/main/java/cn/cslg/pas/service/business/PatentProjectService.java

@@ -9,6 +9,7 @@ import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.LoginUtils;
 import cn.cslg.pas.common.vo.business.EventCountVO;
 import cn.cslg.pas.common.vo.business.EventVO;
+import cn.cslg.pas.common.vo.business.PatentProjectVO;
 import cn.cslg.pas.domain.business.*;
 
 import cn.cslg.pas.exception.UnLoginException;
@@ -46,25 +47,14 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
     private EventMapper eventMapper;
 
     @Autowired
-    private FormatQueryService formatQueryService;
-
+    private PatentProjectMapper patentProjectMapper;
     @Autowired
-    private FileManagerService fileManagerService;
+    private FormatQueryService formatQueryService;
 
-    @Autowired
-    private AssoEventFileService assoEventFileService;
 
     @Autowired
     private QueryGroupFactory queryGroupFactory;
 
-    @Autowired
-    private PermissionService permissionService;
-
-    @Autowired
-    private SystemDictService systemDictService;
-
-    @Autowired
-    private AssoProjectEventMapper assoProjectEventMapper;
 
     @Autowired
     private CacheUtils cacheUtils;
@@ -89,18 +79,13 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
 
        List<String> sqls = formatQueryService.reSqls(queryRequest,"patentProject");
         //根据sql查询事件信息
-        List<EventVO> eventVOS = eventMapper.getEvent(sqls.get(0),sqls.get(1),sqls.get(2));
-
-        //查询总数
-        Long total = eventMapper.getEventCount(sqls.get(0));
+        List<PatentProjectVO> patentProjectVOS = patentProjectMapper.getPatentProject(sqls.get(0),sqls.get(1),sqls.get(2));
 
         //装载事件信息
-
         Records records = new Records();
         records.setCurrent(queryRequest.getCurrent());
         records.setSize(queryRequest.getSize());
-        records.setData(eventVOS);
-        records.setTotal(total);
+        records.setData(patentProjectVOS);
         return records;
     }
 
@@ -122,26 +107,40 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
     @Transactional(rollbackFor = Exception.class)
     public Object updateMessage(Object object, List<MultipartFile> files) {
 
+
+
         return null;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteMessage(List<Integer> ids) throws IOException {
-        //根据事件id删除事件和文件关联
-        LambdaQueryWrapper<AssoEventFile> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(AssoEventFile::getEventId, ids);
-        List<AssoEventFile> assoEventFiles = assoEventFileService.list(queryWrapper);
-        List<String> guids = assoEventFiles.stream().map(AssoEventFile::getFileGuid).collect(Collectors.toList());
-        // 根据guid删除文件
-        if (guids.size() != 0) {
-            fileManagerService.deleteFileFromFMS(guids);
-        }
-        //删除事件和文件关联表
-        assoEventFiles.remove(queryWrapper);
-        //根据事件id删除事件
-        this.removeBatchByIds(ids);
-        return ids;
+        //TODO 检查是否有关联报告，如果有则提示不允许删除
+
+     //TODO 根据id删除专利数据库和文件关联表
+
+        //TODO 根据id删除专利数据库和事件的关联表
+
+        //TODO 根据id删除专利数据库的自定义字段的标引（es部分，暂时不做）
+
+        //TODO 根据id删除专利数据库的自定义字段（自定义字段模块未完成，暂时不做)
+
+        //TODO 根据id删除专利数据库和事件的关联
+
+        //TODO 根据id删除专利数据库和应用场景关联
+
+        //TODO 根据id删除专利数据库和报告的关联
+
+        //TODO 根据id删除任务信息（任务模块未完成，暂时不做）
+
+        //TODO 根据id删除任专利关联信息（es部分，暂时不做）
+
+        //TODO 根据id删除导入任务信息（导入任务模块未完成，暂时不做）
+
+        //
+
+
+        return  null;
     }
 
     /**
@@ -315,6 +314,12 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
 
     @Override
     public Object updateMessage(Object object) {
+        //TODO 更新基本信息
+        //TODO 更新场景
+        //TODO 更新事件
+        //TODO 若产品或产品类别技术类别有更新，则删除产品或产品类别技术类别和专利的标引（只需判断，删除部分，待es完成）
+       //TODO 更新关联附件
+
         return null;
     }
 
@@ -324,134 +329,6 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
      * @param eventVOs
      */
     private void loadPatentProject(List<EventVO> eventVOs) throws IOException {
-        List<String> createIds = new ArrayList<>();
-        List<Integer> clientIds = new ArrayList<>();
-        List<Integer> ids = new ArrayList<>();
-        List<EventCountVO> eventCountVOS = new ArrayList<>();
-        //获得所有文件的guid
-        eventVOs.forEach(
-                item -> {
-                    if (item.getClientId() != null) {
-                        clientIds.add(item.getClientId());
-                    }
-
-                    if (item.getCreateId() != null) {
-                        createIds.add(item.getCreateId());
-                    }
-                    if (item.getId() != null) {
-                        ids.add(item.getId());
-                    }
-                }
-        );
-
-        List<Personnel> personnels = new ArrayList<>();
-        List<Client> clients = new ArrayList<>();
-        List<String> guids = new ArrayList<>();
-        List<SystemFile> systemFiles = new ArrayList<>();
-        List<AssoEventFile> assoEventFiles = new ArrayList<>();
-
-        if (ids.size() != 0) {
-            //根据事件id获得事件文件关联表
-            LambdaQueryWrapper<AssoEventFile> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.in(AssoEventFile::getEventId, ids);
-            assoEventFiles = assoEventFileService.list(queryWrapper);
-            guids = assoEventFiles.stream().map(AssoEventFile::getFileGuid).collect(Collectors.toList());
-
-
-            //根据事件id分组查询事件关联专题库或报告数量
-            eventCountVOS = assoProjectEventMapper.getEventProjectCount(ids);
-        }
-
-        //查询创建人名称
-        if (createIds.size() != 0) {
-            String res = permissionService.getPersonnelByIdsFromPCS(createIds);
-            JSONObject jsonObject = JSONObject.parseObject(res);
-            personnels = JSONObject.parseArray(jsonObject.getString("data"), Personnel.class);
-        }
-
-        //查询客户名称
-        if (clientIds.size() != 0) {
-            String res = permissionService.getClientByIdsFromPCS(clientIds);
-            JSONObject jsonObject = JSONObject.parseObject(res);
-            clients = JSONObject.parseArray(jsonObject.getString("data"), Client.class);
-        }
-
-        //查询文件
-        if (guids.size() != 0) {
-            String res = fileManagerService.getSystemFileFromFMS(guids);
-            JSONObject jsonObject = JSONObject.parseObject(res);
-            systemFiles = JSONObject.parseArray(jsonObject.getString("data"), SystemFile.class);
-        }
-
-        //查询关联报告或专题库
-
-        //查询应用场景
-        List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(Arrays.asList("ENTERPRISE_APPLICATION_SCENARIO"));
-
-        //查询专题库数量
-
-        //装载信息
-        for (EventVO eventVO : eventVOs) {
-            //装载人员信息
-            Personnel personnel = personnels.stream().filter(item -> item.getId().equals(eventVO.getCreateId())).findFirst().orElse(null);
-            if (personnel != null) {
-                eventVO.setCreateName(personnel.getPersonnelName());
-            }
-
-            //装载客户信息
-            Client client = clients.stream().filter(item -> item.getId().equals(eventVO.getClientId())).findFirst().orElse(null);
-            if (client != null) {
-                eventVO.setClientName(client.getName());
-            }
-
-            //装载场景
-            SystemDict systemDict = systemDictList.stream().filter(item -> item.getValue().equals(eventVO.getScenarioId().toString())).findFirst().orElse(null);
-            if (systemDict != null) {
-                eventVO.setScenarioName(systemDict.getLabel());
-            }
-
-            //装载文件信息
-            List<AssoEventFile> assoEventFileTemp = assoEventFiles.stream().filter(item -> item.getEventId().equals(eventVO.getId())).collect(Collectors.toList());
-            if (assoEventFileTemp.size() != 0) {
-                List<String> guidTemp = assoEventFileTemp.stream().map(AssoEventFile::getFileGuid).collect(Collectors.toList());
-                if (guidTemp.size() != 0) {
-                    List<SystemFile> systemFileTemp = systemFiles.stream().filter(item -> guidTemp.contains(item.getGuid())).collect(Collectors.toList());
-                    if (systemFileTemp.size() != 0) {
-                        eventVO.setSystemFileList(systemFileTemp);
-                    }
-                }
-            }
-
-
-            //装载专题库或报告数量
-            if (eventCountVOS.size() != 0) {
-                //专题库数量
-                EventCountVO eventCountVO1 = eventCountVOS.stream().filter(item ->
-                        item.getEventId().equals(eventVO.getId()) && item.getProjectType().equals(1)).findFirst().orElse(null);
-
-                //报告数量
-                EventCountVO eventCountVO2 = eventCountVOS.stream().filter(item ->
-                        item.getEventId().equals(eventVO.getId()) && item.getProjectType().equals(2)).findFirst().orElse(null);
-
-                //设置专题库数量
-                if (eventCountVO1 != null) {
-                    eventVO.setPatentProjectNum(eventCountVO1.getProjectCount());
-                } else {
-                    eventVO.setPatentProjectNum(0);
-                }
-
-                //设置报告数量
-                if (eventCountVO2 != null) {
-                    eventVO.setReportProjectNum(eventCountVO2.getProjectCount());
-                } else {
-                    eventVO.setReportProjectNum(0);
-                }
-
-            } else {
-                eventVO.setReportProjectNum(0);
-                eventVO.setPatentProjectNum(0);
-            }
-        }
 
 
     }

src/main/java/cn/cslg/pas/service/business/TreeNodeService.java

@@ -115,7 +115,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         List<TreeNodeVO> treeNodes = treeNodeMapper.getTreeNode(queryTreeNodeDTO);
 
         //如果根据名称查询
-        if (queryTreeNodeDTO.getName() != null&&!queryTreeNodeDTO.getName().trim().equals("")) {
+        if (queryTreeNodeDTO.getName() != null && !queryTreeNodeDTO.getName().trim().equals("")) {
             List<Integer> ids = new ArrayList<>();
 
             //当根据名称查出了节点
@@ -125,7 +125,11 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
                 ids.addAll(nameIds);
                 pathStrs.forEach(item -> {
                     if (item != null && !item.trim().equals("")) {
-                        List<Integer> paths = Arrays.stream(item.split("/")).map(s -> Integer.parseInt(s.trim())).collect(Collectors.toList());
+                        List<Integer> paths = Arrays.stream(item.split("/")).map(s -> {
+                            if (!s.equals("")) {
+                                return Integer.parseInt(s.trim());
+                            } else return null;
+                        }).collect(Collectors.toList());
                         ids.addAll(paths);
                     }
                 });
@@ -279,9 +283,24 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object deleteMessage(List<Integer> ids) throws IOException {
+        //检验参数
+        if (ids == null || ids.size() == 0) {
+            throw new XiaoShiException("参数错误");
+        }
+        //查询节点下的子节点以及自身id
+        List<Integer> trueIds = new ArrayList<>();
+        ids.forEach(item -> {
+            QueryTreeNodeDTO queryTreeNodeDTO = new QueryTreeNodeDTO();
+            queryTreeNodeDTO.setId(item);
+            List<TreeNodeVO> treeNodes = treeNodeMapper.getTreeNode(queryTreeNodeDTO);
+            List<Integer> tmpIds = treeNodes.stream().map(TreeNodeVO::getId).collect(Collectors.toList());
+            trueIds.addAll(tmpIds);
+        });
+
+
         //根据架构id删除架构和文件关联
         LambdaQueryWrapper<AssoTreeNodeFile> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(AssoTreeNodeFile::getTreeNodeId, ids);
+        queryWrapper.in(AssoTreeNodeFile::getTreeNodeId, trueIds);
         List<AssoTreeNodeFile> assoTreeNodeFiles = assoTreeNodeFileService.list(queryWrapper);
         List<String> guids = assoTreeNodeFiles.stream().map(AssoTreeNodeFile::getFileGuid).collect(Collectors.toList());
         //TODO 根据guids删除文件
@@ -291,7 +310,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         //删除架构和文件关联表
         assoTreeNodeFiles.remove(queryWrapper);
         //根据架构id删除架构数据
-        this.removeBatchByIds(ids);
+        this.removeBatchByIds(trueIds);
         return ids;
     }
 
@@ -466,7 +485,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         //装载信息
         for (TreeNodeVO treeNodeVO : treeNodeVOS) {
             //装载人员信息
-            Personnel personnel = personnels.stream().filter(item -> item.getId().equals(treeNodeVO.getCreateId())).findFirst().orElse(null);
+            Personnel personnel = personnels.stream().filter(item -> item.getId().toString().equals(treeNodeVO.getCreateId())).findFirst().orElse(null);
             if (personnel != null) {
                 treeNodeVO.setCreateName(personnel.getPersonnelName());
             }
@@ -629,15 +648,19 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
 
         LambdaQueryWrapper<TreeNode> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TreeNode::getType, queryTreeNodeDTO.getType())
-                .eq(TreeNode::getTypeId, queryTreeNodeDTO.getTypeId()).orderByDesc(TreeNode::getLevel);
+                .eq(TreeNode::getTypeId, queryTreeNodeDTO.getTypeId()).orderByAsc(TreeNode::getLevel);
         List<TreeNode> treeNodes = this.list(queryWrapper);
         List<TreePathVO> treeNodeVOS = new ArrayList<>();
-
+        TreePathVO treePathFirst = new TreePathVO();
+        treePathFirst.setId(0);
+        treePathFirst.setPath("/");
+        treePathFirst.setPathName("/");
+        treeNodeVOS.add(treePathFirst);
         //装载路径
         for (TreeNode treeNode : treeNodes) {
-            TreePathVO treePathVO=new TreePathVO();
+            TreePathVO treePathVO = new TreePathVO();
             treePathVO.setId(treeNode.getId());
-            treePathVO.setPath(treeNode.getPath()+treeNode.getId()+"/");
+            treePathVO.setPath(treeNode.getPath() + treeNode.getId() + "/");
             List<String> pathNames = new ArrayList<>();
             if (treeNode.getPath() != null && !treeNode.getPath().trim().equals("")) {
                 List<Integer> paths = Arrays.stream(treeNode.getPath().split("/")).map(s -> {
@@ -652,11 +675,10 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
                     }
                 }
                 if (pathNames.size() != 0) {
-                    treePathVO.setPathName( StringUtils.join(pathNames, "/")+"/"+treeNode.getName()+"/");
+                    treePathVO.setPathName("/" + StringUtils.join(pathNames, "/") + "/" + treeNode.getName() + "/");
                 }
-            }
-            else {
-                treePathVO.setPathName("/"+treeNode.getName()+"/");
+            } else {
+                treePathVO.setPathName("/" + treeNode.getName() + "/");
             }
             treeNodeVOS.add(treePathVO);
         }

src/main/resources/jsons/patentProject.json

@@ -3,7 +3,7 @@
     "type":"Integer",
     "value":"id",
     "field":"id",
-    "sqlField": "id",
+    "sqlField": "p.id",
     "sqlClass": "getComSql",
     "orderClass": "",
     "groupClass":"",
@@ -11,11 +11,11 @@
     "ifGroup": "false",
     "ifShow":"true"
   },
-  {"name":"事件名称",
+  {"name":"专利数据库名称",
   "type":"String",
   "value":"name",
   "field": "name",
-  "sqlField": "name",
+  "sqlField": "p.name",
   "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
     "groupClass":"getComGroup",
@@ -27,7 +27,7 @@
     "type":"String",
     "value":"createName",
     "field": "createName",
-    "sqlField": "create_id",
+    "sqlField": "p.create_id",
     "sqlClass": "getCreateNameSql",
     "orderClass": "getCreateNameOrder",
     "groupClass":"getComGroup",
@@ -36,21 +36,11 @@
     "ifShow":"true"
 
   },
-  {"name":"客户",
-    "type":"String",
-    "value":"clientName",
-    "field": "clientName",
-    "sqlField": "client_id",
-    "orderClass": "getClientNameOrder",
-    "ifSearch":"true",
-    "ifGroup": "false",
-    "ifShow":"true"
-  },
   {"name":"创建时间",
     "type":"DateTime",
     "value":"createTime",
     "field": "createTime",
-    "sqlField": "create_time",
+    "sqlField": "p.create_time",
     "sqlClass": "getDateTimeSql",
     "orderClass": "getComOrder",
     "groupClass":"getTimeGroup",
@@ -62,7 +52,7 @@
     "type":"DateTime",
     "value":"createTimeMonth",
     "field": "createTimeMonth",
-    "sqlField": "create_time",
+    "sqlField": "p.create_time",
     "sqlClass": "getDateTimeMonthSql",
     "orderClass": "getComOrder",
     "groupClass":"getTimeGroup",
@@ -82,23 +72,11 @@
     "ifGroup": "false",
     "ifShow":"true"
   },
-  {"name":"发生月份",
-    "type":"DateTime",
-    "value":"eventDateMonth",
-    "field": "eventDateMonth",
-    "sqlField": "event_Date",
-    "sqlClass": "getDateTimeMonthSql",
-    "orderClass": "getComOrder",
-    "groupClass":"getTimeGroup",
-    "ifSearch":"false",
-    "ifGroup": "true",
-    "ifShow":"false"
-  },
   {"name":"描述",
     "type":"String",
     "value":"description",
     "field": "description",
-    "sqlField": "description",
+    "sqlField": "p.description",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
     "ifSearch":"true",
@@ -117,28 +95,5 @@
     "ifSearch":"true",
     "ifGroup": "true",
     "ifShow":"true"
-  },
-  {
-    "name":"报告数量",
-    "type":"Integer",
-    "value":"reportProjectNum",
-    "field":"reportProjectNum",
-    "sqlField": "event_id",
-    "orderClass": "getEventReportNumOrder",
-    "ifSearch":"false",
-    "ifGroup": "false",
-    "ifShow":"true"
-
-  },
-  {
-    "name":"专题库数量",
-    "type":"Integer",
-    "value":"patentProjectNum",
-    "field":"patentProjectNum",
-    "sqlField": "event_id",
-    "orderClass": "getEventProjectNumOrder",
-    "ifSearch":"false",
-    "ifGroup": "false",
-    "ifShow":"true"
   }
 ]

src/main/resources/mapper/PatentProjectMapper.xml

@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.cslg.pas.mapper.PatentProjectMapper">
+    <select id="getPatentProject" resultType="cn.cslg.pas.common.vo.business.PatentProjectVO">
+        select p.id as id,p.name as name ,p.contract_no as contract_no,p.volume_number as
+        volumeNumber,p.commission_case_day as commissionCaseDay,p.description as description,p.create_id as
+        createId,p.create_time as createTime,pp.if_update as ifUpdate,pp.crons as crons from patent_project as pp left join project as p
+        on pp.project_id =p.id
+        <if test="sql1!=''">
+            where ${sql1}
+        </if>
+
+
+        ${sql2} ${sql3}
+    </select>
 
 </mapper>

src/main/resources/mapper/TreeNodeMapper.xml

@@ -35,7 +35,7 @@
 
 
     <select id="getTreeNodes"  resultType="cn.cslg.pas.common.vo.business.TreeNodeVO">
-        select id,name,description,path,level ,create_id as createId,create_time as createTime from tree_node
+        select id,name,description,path,level ,create_id as createId,create_time as createTime,parent_id as parentId from tree_node
 
         <if test="sql1!=''">
 

src/test/java/cn/cslg/pas/service/EsServiceTests.java

@@ -1,5 +1,6 @@
 package cn.cslg.pas.service;
 
+import cn.cslg.pas.common.utils.RedisUtil;
 import cn.cslg.pas.controller.CommonController;
 import cn.cslg.pas.controller.EventController;
 import cn.cslg.pas.service.business.es.EsService;
@@ -20,6 +21,8 @@ public class EsServiceTests {
     @Autowired
     private EsService esService;
 
+    @Autowired
+    private RedisUtil redisUtil;
     @Test
     void addIoc() throws Exception {
         List<String> list =new ArrayList<>();
@@ -27,4 +30,9 @@ public class EsServiceTests {
         esService.addDoc();
     }
 
+    @Test
+    void add() throws  Exception{
+        redisUtil.set("1","1");
+    }
+
 }

src/test/java/cn/cslg/pas/service/PatentProjectTests.java

@@ -1,5 +1,10 @@
 package cn.cslg.pas.service;
 
+import cn.cslg.pas.common.dto.business.PatentProjectDTO;
+import cn.cslg.pas.common.model.cronModel.Records;
+import cn.cslg.pas.common.model.request.OrderDTO;
+import cn.cslg.pas.common.model.request.StringRequest;
+import cn.cslg.pas.service.business.PatentProjectService;
 import cn.cslg.pas.service.business.es.EsService;
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
@@ -16,15 +21,42 @@ import java.util.List;
 @SpringBootTest
 public class PatentProjectTests {
     @Autowired
-    private EsService esService;
+    private PatentProjectService patentProjectService;
 
     @Test
-    void addIoc() throws Exception {
-//        List<String> list =new ArrayList<>();
-//        list.add("event");
-//        esService.addDoc();
-        Assert.assertEquals(1,1);
-         Assert.assertEquals(12,1);
+    void queryPatentProject() throws Exception {
+        StringRequest queryRequest = new StringRequest();
+        queryRequest.setSearchQuery("");
+        List<OrderDTO> dtos = new ArrayList<>();
+        OrderDTO orderDTO1 = new OrderDTO();
+        orderDTO1.setOrderBy("name");
+        orderDTO1.setOrderType(0);
+        OrderDTO orderDTO2 = new OrderDTO();
+        orderDTO2.setOrderBy("createName");
+        orderDTO2.setOrderType(1);
+        dtos.add(orderDTO1);
+//        dtos.add(orderDTO2);
+        queryRequest.setOrderDTOList(dtos);
+        queryRequest.setCurrent(Long.parseLong("1"));
+        queryRequest.setSize(Long.parseLong("10"));
+        Records records = (Records)patentProjectService.queryMessage(queryRequest);
+
+        Assert.assertEquals(Integer.parseInt(records.getTotal().toString()),1);
     }
 
+    @Test
+    void addPatentProject() throws Exception {
+//        PatentProjectDTO patentProjectDTO =new PatentProjectDTO();
+//        patentProjectDTO.setName("专题库1");
+//        patentProjectDTO.setEntrustType(1);
+//        patentProjectDTO.setEntrustId("1");
+//        patentProjectDTO.setHeadId("328");
+//        patentProjectDTO.setDepartmentId("1");
+//        patentProjectDTO.setContractNo("12314");
+//        patentProjectDTO.setVolumeNumber("junhao125456");
+//        patentProjectDTO.setDescription("描述");
+//        patentProjectDTO.s
+    }
+
+
 }