fix bugs

cirs-admin/src/main/java/com/cirs/CirsApplication.java

@@ -3,6 +3,7 @@ package com.cirs;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
  * 启动程序
@@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author allen
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@EnableAsync
 public class CirsApplication
 {
     public static void main(String[] args)

cirs-biz/src/main/java/com/cirs/biz/controller/SysTrainController.java

@@ -2,6 +2,7 @@ package com.cirs.biz.controller;
 
 import com.cirs.biz.domain.VerificationData;
 import com.cirs.common.utils.DictUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.http.HttpMethod;
 
 
@@ -185,6 +186,14 @@ public class SysTrainController extends BaseController
             objectMap.put("dataSet", sysTrainService.getComponentids());
 
             objectMap.put("modelPath", model_path);
+
+
+// 创建ObjectMapper实例
+            ObjectMapper mapper = new ObjectMapper();
+
+                // 将对象转换为JSON字符串
+                String json = mapper.writeValueAsString(objectMap);
+                logger.info("json : {}",json);
             // 发送请求
             // todo wangruilin uri 应该是一个全地址+端口，这个地址可以通过数据字典配置和获取
             Mono<String> mono = webClient

cirs-biz/src/main/java/com/cirs/biz/domain/SysTrain.java

@@ -43,7 +43,11 @@ public class SysTrain extends BaseEntity
     private String result3;
 
     public Long getResult2Id() {
-        return result2Id;
+        if (result2Id != null) {
+            return result2Id;
+        } else {
+            return result1Id;
+        }
     }
 
     public void setResult2Id(Long result2Id) {
@@ -51,7 +55,15 @@ public class SysTrain extends BaseEntity
     }
 
     public Long getResult4Id() {
-        return result4Id;
+        if (result4Id != null) {
+            return result4Id;
+        } else if (result3Id != null) {
+            return result3Id;
+        } else if (result2Id != null) {
+            return result2Id;
+        } else {
+            return result1Id;
+        }
     }
 
     public void setResult4Id(Long result4Id) {
@@ -59,7 +71,17 @@ public class SysTrain extends BaseEntity
     }
 
     public Long getResult5Id() {
-        return result5Id;
+        if (result5Id != null) {
+            return result5Id;
+        } else if (result4Id != null) {
+            return result4Id;
+        } else if (result3Id != null) {
+            return result3Id;
+        } else if (result2Id != null) {
+            return result2Id;
+        } else {
+            return result1Id;
+        }
     }
 
     public void setResult5Id(Long result5Id) {
@@ -83,7 +105,13 @@ public class SysTrain extends BaseEntity
     private Long result4Id;
 
     public Long getResult3Id() {
-        return result3Id;
+        if (result3Id != null) {
+            return result3Id;
+        } else if (result2Id != null) {
+            return result2Id;
+        } else {
+            return result1Id;
+        }
     }
 
     public void setResult3Id(Long result3Id) {

cirs-biz/src/main/java/com/cirs/biz/service/impl/SysTrainServiceImpl.java

@@ -11,6 +11,7 @@ import com.cirs.common.utils.bean.BeanValidators;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.cirs.biz.mapper.SysTrainMapper;
 import com.cirs.biz.domain.SysTrain;
@@ -109,6 +110,7 @@ public class SysTrainServiceImpl implements ISysTrainService
     }
 
     @Override
+    @Async
     public String importTrain(List<SysTrain> trainList, boolean updateSupport, String operName) {
         if (StringUtils.isNull(trainList) || trainList.size() == 0)
         {
@@ -123,7 +125,7 @@ public class SysTrainServiceImpl implements ISysTrainService
         {
             try
             {
-
+                BuildComponent(train);
                 BeanValidators.validateWithException(validator, train);
                 train.setCreateBy(operName);
                 sysTrainMapper.insertSysTrain(train);
@@ -151,10 +153,28 @@ public class SysTrainServiceImpl implements ISysTrainService
         return successMsg.toString();
     }
 
+    private void BuildComponent(SysTrain train) {
+        if(StringUtils.isNotEmpty(train.getResult1())){
+            train.setResult1Id(getComponentId(train.getResult1()));
+        }
+        if(StringUtils.isNotEmpty(train.getResult2())){
+            train.setResult2Id(getComponentId(train.getResult2()));
+        }
+        if(StringUtils.isNotEmpty(train.getResult3())){
+            train.setResult3Id(getComponentId(train.getResult3()));
+        }
+        if(StringUtils.isNotEmpty(train.getResult4())){
+            train.setResult4Id(getComponentId(train.getResult4()));
+        }
+        if(StringUtils.isNotEmpty(train.getResult5())){
+            train.setResult5Id(getComponentId(train.getResult5()));
+        }
+    }
+
     @Override
     public Long getComponentId(String result) {//型号规格-质量等级-元器件名称
         String[] attrs = result.split("-");//切割不同属性
-        return sysTrainMapper.getComponentId(attrs[0],attrs[1],attrs[2]);
+        return sysTrainMapper.getComponentId(attrs[0], attrs.length >= 2 ? attrs[1] : null, attrs.length >= 3 ? attrs[2] : null);
     }
 
     @Override

cirs-biz/src/main/resources/mapper/biz/SysTrainMapper.xml

@@ -116,20 +116,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useScene != null">use_scene,</if>
             <if test="searchCondition != null">search_condition,</if>
             <if test="result1 != null">result1,</if>
+            <if test="result1 != null">result1_id,</if>
             <if test="result2 != null">result2,</if>
+            <if test="result2 != null">result2_id,</if>
             <if test="result3 != null">result3,</if>
+            <if test="result3 != null">result3_id,</if>
             <if test="result4 != null">result4,</if>
+            <if test="result4 != null">result4_id,</if>
             <if test="result5 != null">result5,</if>
+            <if test="result5 != null">result5_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="useScene != null">#{useScene},</if>
             <if test="searchCondition != null">#{searchCondition},</if>
             <if test="result1 != null">#{result1},</if>
+            <if test="result1 != null">#{result1Id},</if>
             <if test="result2 != null">#{result2},</if>
+            <if test="result2 != null">#{result2Id},</if>
             <if test="result3 != null">#{result3},</if>
+            <if test="result3 != null">#{result3Id},</if>
             <if test="result4 != null">#{result4},</if>
+            <if test="result4 != null">#{result4Id},</if>
             <if test="result5 != null">#{result5},</if>
+            <if test="result5 != null">#{result5Id},</if>
          </trim>
     </insert>