退化评估

als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/AlgorithmBo.java

@@ -29,6 +29,10 @@ public class AlgorithmBo extends BaseEntity {
      * 数据Id
      */
     private Long ossId;
+    /**
+     * 数据Id集合
+     */
+    private Long[] ossIds;
 
     /**
      * 机号Id

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/AlgorithmService.java

@@ -11,7 +11,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.eco.als.domain.*;
 import org.eco.als.domain.bo.*;
 import org.eco.als.domain.vo.AirConfigurationVo;
-import org.eco.als.domain.vo.DataImportVo;
 import org.eco.als.domain.vo.ModelHttpVo;
 import org.eco.als.domain.vo.ModelVo;
 import org.eco.als.service.*;
@@ -62,8 +61,6 @@ public class AlgorithmService implements IAlgorithmService {
     @Resource
     private IFaultDiagnosisResultService faultDiagnosisResultService;
     @Resource
-    private IDataImportService dataImportService;
-    @Resource
     private IAirConfigurationService airConfigurationService;
     @Resource
     private ILifePredictionService lifePredictionService;
@@ -264,9 +261,6 @@ public class AlgorithmService implements IAlgorithmService {
     @Transactional
     public String executeEvaluation(AlgorithmBo algorithmBo) {
         AirConfigurationVo airConfigurationVo = airConfigurationService.selectById(Long.valueOf(algorithmBo.getPartId()));
-        DataImportBo dataImportBo = new DataImportBo();
-        dataImportBo.setAircraftId(algorithmBo.getAircraftId());
-        List<DataImportVo> dataImportVos = dataImportService.selectList(dataImportBo);
         // 模型相关信息
         ModelBo modelBo = new ModelBo();
         modelBo.setPartId(algorithmBo.getPartId());
@@ -276,18 +270,14 @@ public class AlgorithmService implements IAlgorithmService {
         if (ObjectUtil.isNull(modelVo)) {
             throw new BusinessException("模型信息为空，请检查！");
         }
-        if (StrUtil.isBlank(modelVo.getColumnData())) {
-            throw new BusinessException("参数列不能为空，请检查！");
-        }
-        algorithmBo.setColumnData(modelVo.getColumnData().split(","));
+
         List<String> urls = new ArrayList<>();
-        dataImportVos.forEach(el -> {
-            algorithmBo.setOssId(el.getOssId());
-            SysOssVo sysOssVo = getSysOssVo(algorithmBo);
-            if (ObjectUtil.isNotNull(sysOssVo)) {
-                urls.add(sysOssVo.getUrl());
+        for (Long ossId : algorithmBo.getOssIds()) {
+            SysOssVo sysOss = ossService.getById(ossId);
+            if (ObjectUtil.isNotNull(sysOss)) {
+                urls.add(sysOss.getUrl());
             }
-        });
+        }
         // 插入退化评估记录
         LifePredictionBo lifePredictionBo = LifePredictionBo.builder()
             .name(airConfigurationVo.getName())
@@ -301,7 +291,7 @@ public class AlgorithmService implements IAlgorithmService {
 
         // 参数
         Map<String, Object> map = StrUtil.isBlank(algorithmBo.getParam()) ? new HashMap<>() : new HashMap<>(JSONUtil.parseObj(algorithmBo.getParam()));
-        map.put("url", urls.getFirst());
+        map.put("urls", urls);
         // 请求
         ModelHttpVo httpVo = sendHttp(modelVo, map);
         if (httpVo != null && httpVo.getStatus() == 200) {

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/DataImportServiceImpl.java

@@ -2,6 +2,7 @@ package org.eco.als.service.impl;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
@@ -136,17 +137,23 @@ public class DataImportServiceImpl extends BaseServiceImpl<DataImportMapper, Dat
      */
     @Override
     public boolean insert(DataImportBo dataImportBo) {
-        SysOssVo ossVo = ossService.getById(dataImportBo.getOssId());
-        String path = StringUtils.substringAfter(ossVo.getFileName(), Constants.RESOURCE_PREFIX);
-        String pathCsv = EcoConfig.getTempPath() + "/" + CsvUtils.getName(FileUtils.getNameNotSuffix(ossVo.getOriginalName()));
-        File file = CsvUtils.excelToFileCsv(EcoConfig.getProfile() + path, pathCsv);
-        ossVo = ossService.upload(file);
-        FileUtil.del(pathCsv);
-        dataImportBo.setOssId(ossVo.getOssId());
+        excelToFileCsv(dataImportBo);
         DataImport dataImport = MapstructUtils.convert(dataImportBo, DataImport.class);
         return this.save(dataImport);//使用全局配置的雪花算法主键生成器生成ID值
     }
 
+    private void excelToFileCsv(DataImportBo dataImportBo) {
+        SysOssVo ossVo = ossService.getById(dataImportBo.getOssId());
+        if (!StrUtil.equals(".csv", ossVo.getFileSuffix())) {
+            String path = StringUtils.substringAfter(ossVo.getFileName(), Constants.RESOURCE_PREFIX);
+            String pathCsv = EcoConfig.getTempPath() + "/" + CsvUtils.getName(FileUtils.getNameNotSuffix(ossVo.getOriginalName()));
+            File file = CsvUtils.excelToFileCsv(EcoConfig.getProfile() + path, pathCsv);
+            ossVo = ossService.upload(file);
+            FileUtil.del(pathCsv);
+            dataImportBo.setOssId(ossVo.getOssId());
+        }
+    }
+
     /**
      * 新增数据导入信息，前台提供主键值，一般用于导入的场合
      *
@@ -169,13 +176,7 @@ public class DataImportServiceImpl extends BaseServiceImpl<DataImportMapper, Dat
     public boolean update(DataImportBo dataImportBo) {
         DataImportVo dataImportVo = this.selectById(dataImportBo.getId());
         if (!ObjectUtil.equals(dataImportVo.getOssId(), dataImportBo.getOssId())) {
-            SysOssVo ossVo = ossService.getById(dataImportBo.getOssId());
-            String path = StringUtils.substringAfter(ossVo.getFileName(), Constants.RESOURCE_PREFIX);
-            String pathCsv = EcoConfig.getTempPath() + "/" + CsvUtils.getName(FileUtils.getNameNotSuffix(ossVo.getOriginalName()));
-            File file = CsvUtils.excelToFileCsv(EcoConfig.getProfile() + path, pathCsv);
-            ossVo = ossService.upload(file);
-            FileUtil.del(pathCsv);
-            dataImportBo.setOssId(ossVo.getOssId());
+            excelToFileCsv(dataImportBo);
         }
         DataImport dataImport = MapstructUtils.convert(dataImportBo, DataImport.class);
         if (ObjectUtil.isNotNull(dataImport) && ObjectUtil.isNotNull(dataImport.getId())) {

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultStatisticsServiceImpl.java

@@ -20,10 +20,8 @@ import org.eco.als.service.IFaultStatisticsService;
 import org.eco.common.core.core.page.PageResult;
 import org.eco.common.core.utils.HttpUtils;
 import org.eco.common.core.utils.MapstructUtils;
-import org.eco.common.excel.service.IExcelService;
 import org.eco.common.orm.core.page.PageQuery;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
-import org.eco.system.service.IImportExportService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

als-start/src/main/resources/application-dev.yml

@@ -173,10 +173,10 @@ easy-es:
   password: #es密码,若无则删去此行配置
 ## 知识图谱
 kgqa:
-  ask-url: http://192.168.95.89:8000/kgqa/ask # kgqa问答接口
-  clause-url: http://192.168.95.89:8100/kgqa/split_sentence # kgqa分句接口
-  extract-url: http://192.168.95.89:8100/kgqa/extract # kgqa抽取接口
-  storage-url: http://192.168.95.89:8000/kgqa/storage # kgqa存储接口
+  ask-url: http://192.168.2.120:7074/kgqa/ask # kgqa问答接口
+  clause-url: http://192.168.2.120.89:7070/kgqa/split_sentence # kgqa分句接口
+  extract-url: http://192.168.2.120:7071/kgqa/extract # kgqa抽取接口
+  storage-url: http://192.168.2.120:7072/kgqa/storage # kgqa存储接口
 ## 空军航空装备维修保障支持系统
 extra:
   wcjw-gztj-url: http://127.0.0.1:8081/wcjw-web/select_list

als-start/src/main/resources/application-local.yml

@@ -169,10 +169,10 @@ easy-es:
   password: #es密码,若无则删去此行配置
 ## 知识图谱
 kgqa:
-  ask-url: http://192.168.95.89:8000/kgqa/ask # kgqa问答接口
-  clause-url: http://192.168.95.89:8100/kgqa/split_sentence # kgqa分句接口
-  extract-url: http://192.168.95.89:8100/kgqa/extract # kgqa抽取接口
-  storage-url: http://192.168.95.89:8000/kgqa/storage # kgqa存储接口
+  ask-url: http://192.168.2.120:7074/kgqa/ask # kgqa问答接口
+  clause-url: http://192.168.2.120.89:7070/kgqa/split_sentence # kgqa分句接口
+  extract-url: http://192.168.2.120:7071/kgqa/extract # kgqa抽取接口
+  storage-url: http://192.168.2.120:7072/kgqa/storage # kgqa存储接口
 ## 空军航空装备维修保障支持系统
 extra:
   wcjw-gztj-url: http://127.0.0.1:8081/wcjw-web/select_list

als-start/src/main/resources/application-prod.yml

@@ -39,13 +39,10 @@ mybatis-flex:
       type: ${spring.datasource.type}
       #DM8数据库
       driver-class-name: dm.jdbc.driver.DmDriver
-      #      url: jdbc:dm://192.168.0.103:5236?schema=lqbz&useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
-      url: jdbc:dm://101.126.133.7:11000?schema=lqbz&useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
       #      url: jdbc:dm://127.0.0.1:5236?schema=als&useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
-      #      url: jdbc:dm://127.0.0.1:5236?schema=lqbz&useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+      url: jdbc:dm://127.0.0.1:5236?schema=lqbz&useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
       username: SYSDBA
-      #      password: SYSDBA123
-      password: GIUgeTfer3FD3216F
+      password: SYSdba123
 #    # 数据源-2
 #    ds2:
 #      # 指定为HikariDataSource
@@ -65,14 +62,13 @@ mybatis-flex:
 spring.data:
   redis:
     # 地址
-    host: 101.126.133.7
-    #    host: localhost
+    host: localhost
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码(如没有密码请注释掉)
-    password: Z;G4AS:Vor'YF#p?
+    #    password: Z;G4AS:Vor'YF#p?
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -167,9 +163,16 @@ sms:
       sdk-app-id: 您的sdkAppId
 
 easy-es:
-  address: 101.126.133.7:9007
+  address: 127.0.0.1:9007
   banner: false # 默认为true 打印banner 若您不期望打印banner,可配置为false
   username: #es用户名,若无则删去此行配置
   password: #es密码,若无则删去此行配置
+## 知识图谱
 kgqa:
-  ask-url: http://192.168.0.103:8000/kgqa/ask/
+  ask-url: http://192.168.2.120:7074/kgqa/ask # kgqa问答接口
+  clause-url: http://192.168.2.120.89:7070/kgqa/split_sentence # kgqa分句接口
+  extract-url: http://192.168.2.120:7071/kgqa/extract # kgqa抽取接口
+  storage-url: http://192.168.2.120:7072/kgqa/storage # kgqa存储接口
+## 空军航空装备维修保障支持系统
+extra:
+  wcjw-gztj-url: http://192.168.2.111:8081/wcjw-web/select_list

als-start/src/main/resources/db/dm/V1_0_0_6__lqbz-250109-ddl.sql

@@ -1,3 +1,4 @@
+drop table if exists "lqbz"."T_CALCULATION_MODEL";
 CREATE TABLE "lqbz"."T_CALCULATION_MODEL" (
                                               "CALCULATION_MODEL_ID" VARCHAR(32) NOT NULL,
                                               "FORMULA_NAME" VARCHAR(255) NULL,
@@ -12,6 +13,7 @@ CREATE TABLE "lqbz"."T_CALCULATION_MODEL" (
                                               "IS_EDIT" VARCHAR(50) DEFAULT 1 NULL
 );
 
+drop table if exists "lqbz"."T_CALCULATION_MODEL_DICT";
 CREATE TABLE "lqbz"."T_CALCULATION_MODEL_DICT" (
                                                    "DICT_CODE" BIGINT IDENTITY (20, 1) NOT NULL,
                                                    "DICT_SORT" INT DEFAULT 0 NULL,
@@ -29,6 +31,7 @@ CREATE TABLE "lqbz"."T_CALCULATION_MODEL_DICT" (
                                                    "REMARK" VARCHAR(500) NULL
 );
 
+drop table if exists "lqbz"."T_CALCULATION_MODEL_VERSION";
 CREATE TABLE "lqbz"."T_CALCULATION_MODEL_VERSION" (
                                                       "CALCULATION_MODEL_VERSION_ID" VARCHAR(32) NOT NULL,
                                                       "CALCULATION_MODEL_ID" VARCHAR(32) NOT NULL,

bin/run.sh

@@ -3,7 +3,7 @@
 AppName=als-start.jar
 
 # JVM参数
-JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC"
+JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms1024m -Xmx2048m -XX:MetaspaceSize=512m -XX:MaxMetaspaceSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC"
 APP_HOME=`pwd`
 LOG_PATH=$APP_HOME/logs/$AppName.log