24.03.28 修改配置文件等

src/main/java/com/pavis/backend/slim/project/system/domain/front/FileKey.java

@@ -63,4 +63,7 @@ public class FileKey extends SysFile {
     @ApiModelProperty("终点实体")
     private String end;
 
+    @ApiModelProperty("图谱名字")
+    private String name;
+
 }

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

@@ -77,10 +77,19 @@ public class SysKbServiceImpl extends ServiceImpl<SysKbMapper, SysKb> implements
 
     @Override
     public List<SysKb> selectByUser(Long userId) {
-        return query()
-                .eq("user_id", userId)
-                .orderByDesc("create_time")
-                .list();
+        // todo 需要前端配合，需传入一个名字字段
+        // if (name != null && !"".equals(name)) {
+        //     return query()
+        //             .like("name", name)
+        //             .eq("user_id", userId)
+        //             .orderByDesc("create_time")
+        //             .list();
+        // } else {
+            return query()
+                    .eq("user_id", userId)
+                    .orderByDesc("create_time")
+                    .list();
+        // }
     }
 
 

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

@@ -197,10 +197,15 @@ public class SysKgServiceImpl extends ServiceImpl<SysKgMapper, SysKg> implements
     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>()
+        QueryWrapper<SysKg> queryWrap=new QueryWrapper<>();
+        queryWrap
                 .eq("user_id", SecurityUtils.getUserId())
-                .orderByDesc("create_time")
-        );
+                .orderByDesc("create_time");
+        // 根据名字进行列表搜索
+        if(kgKey.getName() != null&&!"".equals(kgKey.getName())){
+            queryWrap.like("name",kgKey.getName());
+        }
+        List<SysKg> sysKgs = baseMapper.selectList(queryWrap);
         PageInfo page = new PageInfo(sysKgs);
         return page;
 
@@ -838,7 +843,7 @@ public class SysKgServiceImpl extends ServiceImpl<SysKgMapper, SysKg> implements
         if (null != sysEntityAll) {
             CreateEntityKg sysEntity = new CreateEntityKg();
             BeanUtils.copyProperties(sysEntityAll, sysEntity);
-            // // 处理前端存储的实体和关系数据。
+            // 处理前端存储的实体和关系数据。
             ExportSysEntity exportSysEntity = new ExportSysEntity();
             BeanUtils.copyProperties(sysEntityAll, exportSysEntity);
             exportSysEntity.setEntityAll(JSONArray.parseArray(sysEntityAll.getEntityAll()));
@@ -869,6 +874,7 @@ public class SysKgServiceImpl extends ServiceImpl<SysKgMapper, SysKg> implements
     @Override
     public SysEntityInstance insOrUpdEnIce(SysEntityInstance sysEntityInstance) {
         log.info("******接口(insOrUpdEnIce)--->入参(sysEntityInstance):{}", JSON.toJSONString(sysEntityInstance));
+        // 检查一下库里有没有数据，没有返回“false”
         String s = md5Check(MD5.create().digestHex16(sysEntityInstance.getName()), sysEntityInstance.getKgId());
         Long userId = SecurityUtils.getUserId();
         if ("false".equals(s)) {
@@ -894,7 +900,7 @@ public class SysKgServiceImpl extends ServiceImpl<SysKgMapper, SysKg> implements
         log.info("*****接口(delEnIce)--->入参(fileKey):{}", JSON.toJSONString(fileKey));
         if (fileKey.getEnIceIds().size() > 0 && fileKey.getKgId() != null) {
             for (String id : fileKey.getEnIceIds()) {
-                //删除关于此点的所有关系 根据起点和终点去进行删除
+                // 删除关于此点的所有关系 根据起点和终点去进行删除
                 sysEntityRelationMapper.delete(new QueryWrapper<SysEntityRelation>()
                         .eq("kg_id", fileKey.getKgId())
                         .eq("start_id", id)
@@ -960,6 +966,7 @@ public class SysKgServiceImpl extends ServiceImpl<SysKgMapper, SysKg> implements
                 .eq("relation", sysEntityRelation.getRelation())
                 .eq("kg_id", sysEntityRelation.getKgId())
         );
+        // 判断是否是零
         if (sysEntityRelations.size() == 0) {
             if (sysEntityRelation.getId() != null && !"".equals(sysEntityRelation.getId())) {
                 sysEntityRelation.setUpdateBy(String.valueOf(userId));
@@ -977,4 +984,38 @@ public class SysKgServiceImpl extends ServiceImpl<SysKgMapper, SysKg> implements
             throw new RuntimeException("数据库中已存在该关系，请重新填写！");
         }
     }
+
+    public SysKg createKg(SysKg kg) {
+        kg.setCreateBy(SecurityUtils.getUsername());
+        kg.setUserId(SecurityUtils.getUserId());
+        kg.setCreateTime(DateUtil.date());
+        // 设置图谱状态、标注状态、生成图谱状态默认未0.
+        kg.setGraphStatus(0);
+        kg.setAnnotationStatus(0);
+        kg.setGenerateGraphStatus(0);
+        kg.setCancelStatus(0);
+        // 存储kg信息
+        baseMapper.insert(kg);
+        // 处理前端传过来的文件字段--fileIds
+        List<String> li = new ArrayList();
+        if (kg.getFileIds().indexOf(",") < 1) {
+            li.add(kg.getFileIds());
+        } else {
+            String[] split = kg.getFileIds().split(",");
+            for (int i = 0; i < split.length; i++) {
+                li.add(split[i]);
+            }
+        }
+        // 1. 获取文档列表
+        List<SysFile> listFile = kgCom(li);
+        log.info("json:{}", listFile);
+        log.info("--->url:{}", JSON.toJSONString(url));
+        // 将处理好的map，传给算法，调用算法接口
+        Map map = new HashMap();
+        map.put("id", kg.getKgId());
+        map.put("files", listFile);
+        log.info("map:{}", JSON.toJSONString(map));
+        HttpClientUtil.doPost(url, JSON.toJSONString(map), null);
+        return kg;
+    }
 }

src/main/resources/application-local.yml

@@ -76,15 +76,19 @@ feign:
 
 #调用算法接口
 algorithm:
-  creat:
+  create:
     # 将所需要生成图谱的文件，传给算法的接口
-    url: http://192.168.1.150:8900/data_access
+#    url: http://192.168.1.150:8900/data_access
+    url: http://192.168.1.202:12000/
     # 文档转换为txt文本内容接口。
   convert:
-    url: http://192.168.1.150:12000
+#    url: http://192.168.1.150:12000
+    url: http://192.168.1.202:12000
     # 通用图谱调用算法接口。即未创建实体和关系。
   universalGraph:
     url: http://192.168.1.127:8068
+  test:
+    url: http://192.168.1.202:19003
 
 #PageHelper 分页插件配置
 pagehelper:

src/main/resources/application-prod.yml

@@ -1 +1,98 @@
+server:
+  port: 8080
+# 通用配置
+pavis:
+  # 需要换成自己开发环境本地的地址
+  profile: D:\privacy\pavis\uploadPath\
+#minio配置
+minio:
+  #  #对象存储服务的URL
+  #  url: http://localhost:9000/
+  #  #Access key账户
+  #  accessKey: minioadmin
+  #  #Secret key密码
+  #  secretKey: minioadmin
+  #  bucketName: default
+  #  #Access key账户
+  #  accessKey: 2TlzVcrX1jH2oWhz
+  #  #Secret key密码
+  #  secretKey: ZfmZgtZO4g1L8iMmVB8DeARCSdyxzI8G
 
+  url: http://192.168.1.202:8899/
+  #  #Access key账户
+  #  accessKey: upHc9rOpkgBknGOmR9jt
+  #  #Secret key密码
+  #  secretKey: UAlOMz7KeihAStEimUoFo8h13xmO9ITXFqWDEXFn
+  #Access key账户
+  accessKey: kbwu4eqtywwSHUTqlvhO
+  #Secret key密码
+  secretKey: mP2yo9SH3PMCMFudFq82ntVTSOSDrTZhuELeDCCA
+  bucketName: default
+spring:
+  datasource:
+    dynamic:
+      primary: master #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+      datasource:
+        #        master:
+        #          url: jdbc:mysql://192.168.1.166:3306/slim
+        #          username: root
+        #          password: 123456
+        #          driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+        master:
+          url: jdbc:mysql://192.168.1.202:3310/slim
+          username: root
+          password: atlas@123,
+          driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+        slave_1:
+          url: jdbc:mysql://192.168.1.202:3311/slim
+          username: root
+          password: atlas@123,
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        slave_2:
+          url: jdbc:mysql://192.168.1.202:3312/slim
+          username: root
+          password: atlas@123,
+          driver-class-name: com.mysql.cj.jdbc.Driver
+  # redis 配置
+  redis:
+    #    # 地址
+    host: 192.168.1.202
+    #    # 端口，默认为6379
+    port: 6378
+# feign 配置
+feign:
+  client:
+    config:
+      default:
+        logger-level: full
+  httpclient:
+    # 开启feign对httpclient的支持
+    enabled: true
+    # 最大连接数
+    max-connections: 200
+    # 每个路径的最大连接数
+    max-connections-per-route: 50
+
+#调用算法接口
+algorithm:
+  create:
+    # 将所需要生成图谱的文件，传给算法的接口
+    #    url: http://192.168.1.150:8900/data_access
+    url: http://192.168.1.202:12000/
+    # 文档转换为txt文本内容接口。
+  convert:
+    #    url: http://192.168.1.150:12000
+    url: http://192.168.1.202:12000
+    # 通用图谱调用算法接口。即未创建实体和关系。
+  universalGraph:
+    url: http://192.168.1.127:8068
+  test:
+    url: http://192.168.1.202:19003
+
+#PageHelper 分页插件配置
+pagehelper:
+  helperDialect: mysql
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql

src/main/resources/application.yml

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