1.注释长稳验证的完成率

2.验证的部分功能使用了异步操作

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

@@ -187,7 +187,7 @@ public class TVerificationScoretaskDetailController extends BaseController
             task.setRecallRate(jsonObject.getJSONObject("data").getString("recallRate")+"%");
             List<TVerificationScoretaskDetail> dataSet = JSONArray.parseArray(jsonArray.toJSONString(),TVerificationScoretaskDetail.class);
             tVerificationScoretaskService.updateTVerificationScoretask(task);
-            updateDetails(dataSet);
+            tVerificationScoretaskDetailService.updateDetails(dataSet);
             logger.info(result);
 
             if(jsonObject.getIntValue("code")!=200){
@@ -210,12 +210,8 @@ public class TVerificationScoretaskDetailController extends BaseController
     public AjaxResult updateDetails(@RequestBody List<TVerificationScoretaskDetail> dataset){
         try {
             for (TVerificationScoretaskDetail data : dataset) {
-
                 tVerificationScoretaskDetailService.updateTVerificationScoretaskDetail(data);
             }
-
-
-
             return success();
         } catch (Exception e){
             logger.error("加载数据出错", e);

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

@@ -1,7 +1,5 @@
 package com.cirs.biz.controller;
 
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -17,10 +15,8 @@ import com.cirs.biz.service.ITElectronComponentService;
 import com.cirs.biz.service.ITVerificationTaskService;
 import com.cirs.biz.utils.WebClientUtils;
 import com.cirs.common.utils.DictUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import jdk.nashorn.internal.parser.JSONParser;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -218,7 +214,7 @@ public class TVerificationTaskDetailController extends BaseController
             List<VerificationData> dataSet = JSONArray.parseArray(jsonArray.toJSONString(),VerificationData.class);
 
             tVerificationTaskService.updateTVerificationTask(task);
-            updateDetails(dataSet);
+            tVerificationTaskDetailService.updateDetails(dataSet);
 
             logger.info(result);
             if(jsonObject.getIntValue("code")!=200){

cirs-biz/src/main/java/com/cirs/biz/service/ITVerificationScoretaskDetailService.java

@@ -66,4 +66,6 @@ public interface ITVerificationScoretaskDetailService
     public List<TVerificationScoretaskDetail> selectTVerificationScoreaskDetailByTaskIds(List<Long> taskids);
 
     public List<TVerificationScoretaskDetail> selectTrainDetailByTaskIds(List<Long> taskids);
+
+    void updateDetails(List<TVerificationScoretaskDetail> dataset);
 }

cirs-biz/src/main/java/com/cirs/biz/service/ITVerificationTaskDetailService.java

@@ -74,4 +74,6 @@ public interface ITVerificationTaskDetailService
     public List<VerificationData> getComponentids(Long taskid);
 
     public List<TVerificationTaskDetail> selectTrainDetailByTaskIds(List<Long> taskids);
+
+    String updateDetails(List<VerificationData> dataset);
 }

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

@@ -161,7 +161,7 @@ public class TElectronComponentServiceImpl implements ITElectronComponentService
     @Override
     public String getDetailById(Long id) {
         ElectronComponent detail = tElectronComponentMapper.getDetailById(id);
-        return detail.getComponent_model()+"-"+detail.getQuality_grade()+"-"+detail.getComponent_name();
+        return detail.getComponent_model();
     }
 
     @Override

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

@@ -13,6 +13,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.TVerificationScoretaskDetailMapper;
 import com.cirs.biz.domain.TVerificationScoretaskDetail;
@@ -183,4 +184,16 @@ public class TVerificationScoretaskDetailServiceImpl implements ITVerificationSc
     public List<TVerificationScoretaskDetail> selectTrainDetailByTaskIds(List<Long> taskids) {
         return tVerificationScoretaskDetailMapper.selectTrainDetailByTaskIds(taskids);
     }
+
+    @Override
+    @Async
+    public void updateDetails(List<TVerificationScoretaskDetail> dataset) {
+        try {
+            for (TVerificationScoretaskDetail data : dataset) {
+                this.updateTVerificationScoretaskDetail(data);
+            }
+        } catch (Exception e){
+            log.error("加载数据出错", e);
+        }
+    }
 }

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

@@ -6,6 +6,7 @@ import java.util.List;
 import com.cirs.biz.domain.TVerificationTask;
 import com.cirs.biz.domain.VerificationData;
 import com.cirs.biz.mapper.TVerificationTaskMapper;
+import com.cirs.biz.service.ITElectronComponentService;
 import com.cirs.common.exception.ServiceException;
 import com.cirs.common.utils.DateUtils;
 import com.cirs.common.utils.StringUtils;
@@ -13,6 +14,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.TVerificationTaskDetailMapper;
 import com.cirs.biz.domain.TVerificationTaskDetail;
@@ -38,6 +40,9 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
     @Autowired
     private TVerificationTaskMapper tVerificationTaskMapper;
 
+    @Autowired
+    private ITElectronComponentService tElectronComponentService;//之前写在元器件接口不太方便
+
     @Autowired
     protected Validator validator;
 
@@ -226,4 +231,46 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
     public List<TVerificationTaskDetail> selectTrainDetailByTaskIds(List<Long> taskids) {
         return tVerificationTaskDetailMapper.selectTrainDetailByTaskIds(taskids);
     }
+
+    @Override
+    @Async
+    public String updateDetails(List<VerificationData> dataset) {
+        String returnValue = "";
+        try {
+            for (VerificationData verificationData : dataset) {
+
+                TVerificationTaskDetail detail = this.selectTVerificationTaskDetailById(verificationData.getId());
+
+                detail.setCalculate1Id(verificationData.getCalculate1Id());
+                detail.setCalculate2Id(verificationData.getCalculate2Id());
+                detail.setCalculate3Id(verificationData.getCalculate3Id());
+                detail.setCalculate4Id(verificationData.getCalculate4Id());
+                detail.setCalculate5Id(verificationData.getCalculate5Id());
+
+                detail.setCalculate1(getDetailInfoById(detail.getCalculate1Id()));
+                detail.setCalculate2(getDetailInfoById(detail.getCalculate2Id()));
+                detail.setCalculate3(getDetailInfoById(detail.getCalculate3Id()));
+                detail.setCalculate4(getDetailInfoById(detail.getCalculate4Id()));
+                detail.setCalculate5(getDetailInfoById(detail.getCalculate5Id()));
+                detail.setTrained(verificationData.getTrained());
+                detail.setTested(verificationData.getTested());
+
+                this.updateTVerificationTaskDetail(detail);
+            }
+
+            return returnValue;
+        } catch (Exception e){
+            returnValue = "加载数据出错";
+            log.error(returnValue, e);
+            return returnValue;
+        }
+    }
+
+    public String getDetailInfoById(Long id) {
+        if(id==null) {
+            return null;
+        }
+        return tElectronComponentService.getDetailById(id);
+    }
+
 }

cirs-ui/src/views/biz/scoretask/index.vue

@@ -99,9 +99,9 @@
           <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="完成率" align="center" prop="progress" />
+      <!-- <el-table-column label="完成率" align="center" prop="progress" /> -->
       <el-table-column label="准确率" align="center" prop="accuracyRate" />
-      <el-table-column label="召回率" align="center" prop="recallRate" />
+      <!-- <el-table-column label="召回率" align="center" prop="recallRate" /> -->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -187,9 +187,9 @@
             placeholder="请选择结束时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="完成率" prop="progress">
+        <!-- <el-form-item label="完成率" prop="progress">
           <el-input v-model="form.progress" placeholder="请输入完成率" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="准确率" prop="accuracyRate">
           <el-input v-model="form.accuracyRate" placeholder="请输入准确率" />
         </el-form-item>
@@ -340,8 +340,7 @@
         <el-progress
           type="circle"
           :percentage="ProgressMap[taskidToIndexMap.get(ids[0])]"
-          width="80"
-          :status="progressStatus"
+          :width="80"
         ></el-progress>
       </div>
 

cirs-ui/src/views/biz/task/index.vue

@@ -271,9 +271,9 @@
             placeholder="请选择结束时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="完成率" prop="progress">
+        <!-- <el-form-item label="完成率" prop="progress">
           <el-input v-model="form.progress" placeholder="请输入完成率" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="准确率" prop="accuracyRate">
           <el-input v-model="form.accuracyRate" placeholder="请输入准确率" />
         </el-form-item>
@@ -349,8 +349,7 @@
         <el-progress
           type="circle"
           :percentage="ProgressMap[taskidToIndexMap.get(ids[0])]"
-          width="80"
-          :status="progressStatus"
+          :width="80"
         ></el-progress>
       </div>