Merge remote-tracking branch 'origin/enen' into gz-en-base

src/main/java/com/pavis/backend/slim/project/system/controller/SysKgController.java

@@ -67,8 +67,8 @@ public class SysKgController {
      */
     @ApiOperation("获取图谱列表")
     @PostMapping("/list")
-    public AjaxResult list(@RequestBody SysKg kg) {
-        return AjaxResult.success(kgService.list(kg));
+    public AjaxResult list(@RequestBody FileKey kgKey) {
+        return AjaxResult.success(kgService.list(kgKey));
     }
 
     /**

src/main/java/com/pavis/backend/slim/project/system/mapper/SysEntityRelationMapper.java

@@ -2,12 +2,17 @@ package com.pavis.backend.slim.project.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pavis.backend.slim.project.system.domain.SysEntityRelation;
+import com.pavis.backend.slim.project.system.domain.front.FileKey;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @author semi
  * @create 2023-06-07 13:29
  */
 @Mapper
 public interface SysEntityRelationMapper extends BaseMapper<SysEntityRelation> {
+
+    public List<SysEntityRelation> selList(FileKey keyEntityRelation);
 }

src/main/java/com/pavis/backend/slim/project/system/service/SysKgService.java

@@ -40,7 +40,7 @@ public interface SysKgService extends IService<SysKg> {
      * @param
      * @return 返回图谱list
      */
-    List<SysKg> list(SysKg kg);
+    PageInfo list(FileKey kgKey);
 
     /**
      * 所有知识库的树结构

src/main/java/com/pavis/backend/slim/project/system/service/impl/SysKgServiceImpl.java

@@ -188,11 +188,15 @@ public class SysKgServiceImpl extends ServiceImpl<SysKgMapper, SysKg> implements
     }
 
     @Override
-    public List<SysKg> list(SysKg kg) {
-        return baseMapper.selectList(new QueryWrapper<SysKg>()
+    public PageInfo list(FileKey kgKey) {
+        log.info("******接口（list）--->入参(kg):{}",JSON.toJSONString(kgKey));
+        PageHelper.startPage(kgKey.getPageNum(), kgKey.getPageSize());
+        List<SysKg> sysKgs = baseMapper.selectList(new QueryWrapper<SysKg>()
                 .eq("user_id", SecurityUtils.getUserId())
                 .orderByDesc("create_time")
         );
+        PageInfo page = new PageInfo(sysKgs);
+        return page;
 
     }
 
@@ -254,7 +258,7 @@ public class SysKgServiceImpl extends ServiceImpl<SysKgMapper, SysKg> implements
                             .eq("start_id", sCopy)
                             .eq("end_id", oCopy)
                     );
-                    if (list.size() == Hodgepodge.NUMBER) {
+                    if (list.size() == Hodgepodge.NUMBER) { 
                         // 插入实例关系
                         SysEntityRelation sysEntityRelation = new SysEntityRelation();
                         sysEntityRelation.setKgId(algSpO.getKgId());
@@ -629,13 +633,11 @@ public class SysKgServiceImpl extends ServiceImpl<SysKgMapper, SysKg> implements
         QueryWrapper<SysEntityRelation> queryWrap = new QueryWrapper();
 
         if (keyEntityRelation.getKeyWord() != null && !"".equals(keyEntityRelation.getKeyWord())) {
-            queryWrap
-                    .like("start", keyEntityRelation.getKeyWord())
-                    .or()
-                    .like("relation", keyEntityRelation.getKeyWord())
-                    .or()
-                    .like("end", keyEntityRelation.getKeyWord())
-            ;
+            PageHelper.startPage(keyEntityRelation.getPageNum(), keyEntityRelation.getPageSize());
+            List<SysEntityRelation> sysEntityRelations = sysEntityRelationMapper.selList(keyEntityRelation);
+            PageInfo page = new PageInfo(sysEntityRelations);
+            log.info("********接口(selEntityRelation)--->出参(page):{}", JSON.toJSONString(page));
+            return page;
         }
         // zez 根据实体名字模糊查询实例关系
         if (Hodgepodge.ZERO_STR.equals(keyEntityRelation.getEntOrRel())) {
@@ -799,6 +801,7 @@ public class SysKgServiceImpl extends ServiceImpl<SysKgMapper, SysKg> implements
         }
         return null;
     }
+    @Override
     public SysEntityInstance insOrUpdEnIce(SysEntityInstance sysEntityInstance) {
         log.info("******接口(insOrUpdEnIce)--->入参(sysEntityInstance):{}", JSON.toJSONString(sysEntityInstance));
         String s = md5Check(MD5.create().digestHex16(sysEntityInstance.getName()), sysEntityInstance.getKgId());

src/main/resources/application.yml

@@ -1,7 +1,7 @@
 spring:
   profiles:
-    active: ghj
-#    active: local
+#    active: ghj
+    active: local
   # 国际化资源文件路径
   messages:
     basename: i18n/messages

src/main/resources/mapper/system/SysEntityRelationMapper.xml

@@ -0,0 +1,39 @@
+<?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="com.pavis.backend.slim.project.system.mapper.SysEntityRelationMapper">
+
+    <select id="selList" resultType="com.pavis.backend.slim.project.system.domain.SysEntityRelation"
+            parameterType="com.pavis.backend.slim.project.system.domain.front.FileKey">
+
+    SELECT
+	ser.id,
+	ser.relation_id,
+	ser.kg_id,
+	ser.user_id,
+	ser.start,
+	ser.start_id,
+	ser.relation,
+	ser.end,
+	ser.end_id,
+	ser.entity_relation,
+	ser.create_by,
+	ser.create_time,
+	ser.update_by,
+	ser.update_time,
+	ser.remark
+FROM
+	sys_entity_relation ser
+WHERE
+	ser.kg_id = #{kgId}
+	AND
+	ser.relation = #{entityRelation}
+	AND
+	(
+	ser.start LIKE concat ('%',#{keyWord},'%')
+	OR
+	ser.end LIKE concat ('%',#{keyWord},'%')
+	)
+    </select>
+</mapper>