2023/12/22 修改bug

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

@@ -124,7 +124,7 @@ public class FactoryScoreServiceImpl implements IFactoryScoreService
                 score.setCreateBy(operName);
                 factoryScoreMapper.insertFactoryScore(score);
                 successNum++;
-                successMsg.append("<br/>" + successNum + "、训练数据 " + score.getId() + " 导入成功");
+//                successMsg.append("<br/>" + successNum + "、训练数据 " + score.getId() + " 导入成功");
 
             }
             catch (Exception e)
@@ -142,7 +142,7 @@ public class FactoryScoreServiceImpl implements IFactoryScoreService
         }
         else
         {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条");
         }
         return successMsg.toString();
     }

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

@@ -130,7 +130,7 @@ public class SysTrainServiceImpl implements ISysTrainService
                 train.setCreateBy(operName);
                 sysTrainMapper.insertSysTrain(train);
                 successNum++;
-                successMsg.append("<br/>" + successNum + "、训练数据 " + train.getId() + " 导入成功");
+//                successMsg.append("<br/>" + successNum + "、训练数据 " + train.getId() + " 导入成功");
 
             }
             catch (Exception e)
@@ -148,7 +148,7 @@ public class SysTrainServiceImpl implements ISysTrainService
         }
         else
         {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条");
         }
         return successMsg.toString();
     }
@@ -159,22 +159,30 @@ public class SysTrainServiceImpl implements ISysTrainService
         }
         if(StringUtils.isNotEmpty(train.getResult2())){
             train.setResult2Id(getComponentId(train.getResult2()));
+        } else {
+            train.setResult2Id(train.getResult1Id());
         }
         if(StringUtils.isNotEmpty(train.getResult3())){
             train.setResult3Id(getComponentId(train.getResult3()));
+        } else {
+            train.setResult3Id(train.getResult2Id());
         }
         if(StringUtils.isNotEmpty(train.getResult4())){
             train.setResult4Id(getComponentId(train.getResult4()));
+        } else {
+            train.setResult4Id(train.getResult3Id());
         }
         if(StringUtils.isNotEmpty(train.getResult5())){
             train.setResult5Id(getComponentId(train.getResult5()));
+        } else {
+            train.setResult5Id(train.getResult4Id());
         }
     }
 
     @Override
     public Long getComponentId(String result) {//型号规格-质量等级-元器件名称
-        String[] attrs = result.split("-");//切割不同属性
-        return sysTrainMapper.getComponentId(attrs[0], attrs.length >= 2 ? attrs[1] : null, attrs.length >= 3 ? attrs[2] : null);
+//        String[] attrs = result.split("-");//切割不同属性
+        return sysTrainMapper.getComponentId(result, null, null);
     }
 
     @Override

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

@@ -136,7 +136,7 @@ public class TElecCompRecordServiceImpl implements ITElecCompRecordService
                 record.setCreateBy(operName);
                 tElecCompRecordMapper.insertTElecCompRecord(record);
                 successNum++;
-                successMsg.append("<br/>" + successNum + "、元器件记录 " + record.getId() + " 导入成功");
+//                successMsg.append("<br/>" + successNum + "、元器件记录 " + record.getId() + " 导入成功");
 
             }
             catch (Exception e)
@@ -154,7 +154,7 @@ public class TElecCompRecordServiceImpl implements ITElecCompRecordService
         }
         else
         {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条");
         }
         return successMsg.toString();
     }

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

@@ -134,7 +134,7 @@ public class TElectronComponentServiceImpl implements ITElectronComponentService
                 component.setCreateBy(operName);
                 tElectronComponentMapper.insertTElectronComponent(component);
                 successNum++;
-                successMsg.append("<br/>" + successNum + "、元器件 " + component.getComponentName() + " 导入成功");
+//                successMsg.append("<br/>" + successNum + "、元器件 " + component.getComponentName() + " 导入成功");
 
             }
             catch (Exception e)
@@ -152,7 +152,7 @@ public class TElectronComponentServiceImpl implements ITElectronComponentService
         }
         else
         {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条");
         }
         return successMsg.toString();
     }

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

@@ -143,7 +143,7 @@ public class TVerificationScoretaskDetailServiceImpl implements ITVerificationSc
 
                 tVerificationScoretaskDetailMapper.insertTVerificationScoretaskDetail(taskDetail);
                 successNum++;
-                successMsg.append("<br/>" + successNum + "、任务 " + taskDetail.getTaskId() + "详情导入成功");
+//                successMsg.append("<br/>" + successNum + "、任务 " + taskDetail.getTaskId() + "详情导入成功");
 
             }
             catch (Exception e)
@@ -161,7 +161,7 @@ public class TVerificationScoretaskDetailServiceImpl implements ITVerificationSc
         }
         else
         {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条");
         }
         task.setSubtaskNum((long) successNum);
         tVerificationScoretaskMapper.updateTVerificationScoretask(task);

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

@@ -150,7 +150,7 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
 
                 tVerificationTaskDetailMapper.insertTVerificationTaskDetail(taskDetail);
                 successNum++;
-                successMsg.append("<br/>" + successNum + "、任务 " + taskDetail.getTaskId() + "详情导入成功");
+//                successMsg.append("<br/>" + successNum + "、任务 " + taskDetail.getTaskId() + "详情导入成功");
 
             }
             catch (Exception e)
@@ -168,7 +168,7 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
         }
         else
         {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条");
         }
         task.setSubtaskNum((long) successNum);
         tVerificationTaskMapper.updateTVerificationTask(task);

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

@@ -127,7 +127,7 @@ public class TVerificationTaskServiceImpl implements ITVerificationTaskService
                 task.setCreateBy(operName);
                 tVerificationTaskMapper.insertTVerificationTask(task);
                 successNum++;
-                successMsg.append("<br/>" + successNum + "、任务 " + task.getTaskName() + " 导入成功");
+//                successMsg.append("<br/>" + successNum + "、任务 " + task.getTaskName() + " 导入成功");
 
             }
             catch (Exception e)
@@ -145,7 +145,7 @@ public class TVerificationTaskServiceImpl implements ITVerificationTaskService
         }
         else
         {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条");
         }
         return successMsg.toString();
     }

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

@@ -303,7 +303,7 @@ export default {
 
     mytrain() {
 
-      getComponentIds().then(response=>{
+      // getComponentIds().then(response=>{
         let result;
         train().then(res=>{
           result = res
@@ -321,13 +321,13 @@ export default {
             this.dialogVisible = false
 
             if(result.code===200&&JSON.parse(result.data).code===200)
-              this.$modal.msgSuccess(result.msg);
+              this.$modal.msgSuccess("训练成功");
             else {
               this.$modal.msgError("训练失败");
             }
           }
         }, 100);
-      })
+      // })
 
     },
     /** 查询训练集数据列列表 */