fix bugs

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

@@ -5,16 +5,13 @@ import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
-import com.alibaba.fastjson2.JSON;
+
 import com.cirs.biz.domain.*;
 import com.cirs.biz.service.ITElectronComponentService;
 import com.cirs.common.utils.DictUtils;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.springframework.boot.json.GsonJsonParser;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -144,18 +141,14 @@ public class TVerificationTaskDetailController extends BaseController
     }
 
 //    @GetMapping("/componentIds/{taskid}")
-    public AjaxResult getComponentIds(Long taskid)
-    {
-
+    public AjaxResult getComponentIds(Long taskid) {
         List<TVerificationTaskDetail> dataset = tVerificationTaskDetailService.alldata(taskid);
 
-        int idx = 0;
-        for(;idx < dataset.size(); idx++){
+
+        for (int idx = 0; idx < dataset.size(); idx++) {
             TVerificationTaskDetail data = dataset.get(idx);
-//            System.out.println(data.getResult1());
-            if(data.getResult1Id()==null){//不改动元器件id时可行
+            if (data.getResult1Id() == null) {//不改动元器件id时可行
                 Long component_id1 = tVerificationTaskDetailService.setComponentId(data.getResult1());
-//                System.out.println(component_id1);
                 Long component_id2 = tVerificationTaskDetailService.setComponentId(data.getResult2());
                 Long component_id3 = tVerificationTaskDetailService.setComponentId(data.getResult3());
                 Long component_id4 = tVerificationTaskDetailService.setComponentId(data.getResult4());
@@ -167,9 +160,7 @@ public class TVerificationTaskDetailController extends BaseController
                 data.setResult5Id(component_id5);
                 edit(data);//更新数据库
             }
-
         }
-
         return success();
     }
 
@@ -186,7 +177,7 @@ public class TVerificationTaskDetailController extends BaseController
             logger.info(taskid.toString());
 //            System.out.println(taskid);
 
-            getComponentIds(taskid);
+//            getComponentIds(taskid);
             Map<String, Object> objectMap=new HashMap<>();
             List<VerificationData> dataset = tVerificationTaskDetailService.getComponentids(taskid);//id就是taskdetail的id，由此更新相应的taskdetail
 //            for(int i=0;i<dataset.size();i++){
@@ -195,7 +186,12 @@ public class TVerificationTaskDetailController extends BaseController
 
             objectMap.put("dataSet", dataset);
             objectMap.put("modelPath", model_path);
+            // 创建一个 ObjectMapper 实例
+            ObjectMapper objectMapper = new ObjectMapper();
 
+// 将对象转换为 JSON 字符串
+            String json = objectMapper.writeValueAsString(objectMap);
+            logger.info("post json: {}", json);
             // 发送请求
             Mono<String> mono = webClient
                     .post() // POST 请求
@@ -223,7 +219,7 @@ public class TVerificationTaskDetailController extends BaseController
 
 //            return success("任务"+taskid+"验证算法调用成功");
         } catch (Exception e) {
-
+            logger.error("任务"+taskid+"验证算法调用失败", e);
             return error("任务"+taskid+"验证算法调用失败");
         }
     }

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

@@ -145,7 +145,11 @@ public class TVerificationTaskDetail extends BaseEntity
     }
 
     public Long getResult2Id() {
-        return result2Id;
+        if(result2Id != null){
+            return result2Id;
+        } else {
+            return result1Id;
+        }
     }
 
     public void setResult2Id(Long result2Id) {
@@ -161,7 +165,13 @@ public class TVerificationTaskDetail extends BaseEntity
     }
 
     public Long getResult3Id() {
-        return result3Id;
+        if (result3Id != null) {
+            return result3Id;
+        } else if (result2Id != null) {
+            return result2Id;
+        } else {
+            return result1Id;
+        }
     }
 
     public void setResult3Id(Long result3Id) {
@@ -177,7 +187,15 @@ public class TVerificationTaskDetail 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) {
@@ -193,7 +211,17 @@ public class TVerificationTaskDetail 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) {

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

@@ -50,7 +50,11 @@ public class VerificationData {
     }
 
     public Long getResult2Id() {
-        return result2Id;
+        if(result2Id != null){
+            return result2Id;
+        } else {
+            return result1Id;
+        }
     }
 
     public void setResult2Id(Long result2Id) {
@@ -58,7 +62,13 @@ public class VerificationData {
     }
 
     public Long getResult3Id() {
-        return result3Id;
+        if (result3Id != null) {
+            return result3Id;
+        } else if (result2Id != null) {
+            return result2Id;
+        } else {
+            return result1Id;
+        }
     }
 
     public void setResult3Id(Long result3Id) {
@@ -66,7 +76,15 @@ public class VerificationData {
     }
 
     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) {
@@ -74,7 +92,17 @@ public class VerificationData {
     }
 
     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) {

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

@@ -146,6 +146,7 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
                 taskDetail.setCreateBy(operName);
 
                 taskDetail.setTaskId(task.getId());//任务标识
+                getComponentIds(taskDetail);
 
                 tVerificationTaskDetailMapper.insertTVerificationTaskDetail(taskDetail);
                 successNum++;
@@ -175,6 +176,29 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
         return successMsg.toString();
     }
 
+    private void getComponentIds(TVerificationTaskDetail taskDetail) {
+        if(StringUtils.isNotEmpty(taskDetail.getResult1())){
+            Long component_id1 = this.setComponentId(taskDetail.getResult1());
+            taskDetail.setResult1Id(component_id1);
+        }
+        if(StringUtils.isNotEmpty(taskDetail.getResult2())){
+            Long component_id2 = this.setComponentId(taskDetail.getResult2());
+            taskDetail.setResult2Id(component_id2);
+        }
+        if(StringUtils.isNotEmpty(taskDetail.getResult3())){
+            Long component_id3 = this.setComponentId(taskDetail.getResult3());
+            taskDetail.setResult3Id(component_id3);
+        }
+        if(StringUtils.isNotEmpty(taskDetail.getResult4())){
+            Long component_id4 = this.setComponentId(taskDetail.getResult4());
+            taskDetail.setResult4Id(component_id4);
+        }
+        if(StringUtils.isNotEmpty(taskDetail.getResult5())){
+            Long component_id5 = this.setComponentId(taskDetail.getResult5());
+            taskDetail.setResult5Id(component_id5);
+        }
+    }
+
     @Override
     public List<TVerificationTaskDetail> selectTVerificationTaskDetailByTaskIds(List<Long> taskids) {
         return tVerificationTaskDetailMapper.selectTVerificationTaskDetailByTaskIds(taskids);
@@ -189,7 +213,7 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
     @Override
     public Long setComponentId(String result) {
         String[] attrs = result.split("-");//切割不同属性
-        return tVerificationTaskDetailMapper.getComponentId(attrs[0],attrs[1],attrs[2]);
+        return tVerificationTaskDetailMapper.getComponentId(attrs[0], attrs.length >= 2 ? attrs[1] : null, attrs.length >= 3 ? attrs[2] : null);
     }
 
     @Override

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

@@ -109,9 +109,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             where task_id=#{taskid}
     </select>
     <select id="getComponentId" resultType="java.lang.Long">
-        select id from t_electron_component where t_electron_component.component_name=#{attr}
-                                              AND t_electron_component.component_model=#{attr1}
-                                              AND t_electron_component.quality_grade=#{attr2}
+        select id from t_electron_component where t_electron_component.component_model=#{attr}
+        <if test="attr1 != null  and attr1 != ''"> AND t_electron_component.quality_grade=#{attr1}</if>
+        <if test="attr2 != null  and attr2 != ''"> AND t_electron_component.component_name=#{attr2}</if>
+        LIMIT 1
     </select>
     <select id="getComponentids" resultMap="VerificationData">
         select id,use_scene, search_condition, result1_id, result2_id, result3_id, result4_id, result5_id,calculate1_id,calculate2_id,calculate3_id,calculate4_id,calculate5_id,trained,tested from t_verification_task_detail
@@ -125,10 +126,15 @@ 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="result1Id != null">result1_id,</if>
             <if test="result2 != null">result2,</if>
+            <if test="result2Id != null">result2_id,</if>
             <if test="result3 != null">result3,</if>
+            <if test="result3Id != null">result3_id,</if>
             <if test="result4 != null">result4,</if>
+            <if test="result4Id != null">result4_id,</if>
             <if test="result5 != null">result5,</if>
+            <if test="result5Id != null">result5_id,</if>
             <if test="calculate1 != null">calculate1,</if>
             <if test="calculate2 != null">calculate2,</if>
             <if test="calculate3 != null">calculate3,</if>
@@ -145,10 +151,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useScene != null">#{useScene},</if>
             <if test="searchCondition != null">#{searchCondition},</if>
             <if test="result1 != null">#{result1},</if>
+            <if test="result1Id != null">#{result1Id},</if>
             <if test="result2 != null">#{result2},</if>
+            <if test="result2Id != null">#{result2Id},</if>
             <if test="result3 != null">#{result3},</if>
+            <if test="result3Id != null">#{result3Id},</if>
             <if test="result4 != null">#{result4},</if>
+            <if test="result4Id != null">#{result4Id},</if>
             <if test="result5 != null">#{result5},</if>
+            <if test="result5Id != null">#{result5Id},</if>
             <if test="calculate1 != null">#{calculate1},</if>
             <if test="calculate2 != null">#{calculate2},</if>
             <if test="calculate3 != null">#{calculate3},</if>