小修改

application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/TuningRunServiceImpl.java

@@ -184,7 +184,7 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
     }
 
     @SneakyThrows
-    @Transactional(rollbackFor = Exception.class)
+
     @Override
     public boolean publishToModelVersion(RunPublishDto runPublishDto) {
         String targetModelVersionURl;
@@ -239,29 +239,9 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
                 }
                 log.info("发送服务端的消息:" + sendJson.toJSONString());
                 if (receiveMsg.equals("process_completed")) {
-                    log.info("成功啦！");
                     this.close();
                     if (receiveJson.getBoolean("success")){
-                        log.info("成功啦！！");
-                        ModelVersion modelVersionS = new ModelVersion();
-                        modelVersionS.setRunId(tuningRun.getRunId());
-                        modelVersionS.setTaskId(tuningRun.getTaskId());
-                        modelVersionS.setModelUrl(targetModelVersionURl);
-                        ModelManage modelManageS = new ModelManage();
-                        if (runPublishDto.getPublishWay() == 0) {
-                            modelManageS.setModelDescribe(runPublishDto.getModelDescribe());
-                            modelManageS.setModelName(runPublishDto.getModelName());
-                            modelManageS.setModelType(runPublishDto.getModelType());
-                            modelManageS.setIsBaseModel(0);
-                            modelManageService.saveAndCreateVersion(modelManageS, modelVersionS);
-                        } else {
-                            modelManageS = modelManageService.getById(runPublishDto.getModelId());
-                            modelManageS.setModelDescribe(runPublishDto.getModelDescribe());
-                            modelManageS.setIsBaseModel(0);
-                            modelManageService.updateById(modelManageS);
-                            modelVersionS.setModelId(runPublishDto.getModelId());
-                            modelVersionService.saveNew(modelVersionS);
-                        }
+                        saveAll(tuningRun,targetModelVersionURl,runPublishDto);
                         tuningRun.setPublishStatus(1);
                     } else {
                         tuningRun.setPublishStatus(-1);
@@ -279,6 +259,28 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
         }.connect();
         return this.updateById(tuningRun);
     }
+    @Transactional(rollbackFor = Exception.class)
+    public void saveAll(TuningRun tuningRun,String targetModelVersionURl,RunPublishDto runPublishDto){
+        ModelVersion modelVersionS = new ModelVersion();
+        modelVersionS.setRunId(tuningRun.getRunId());
+        modelVersionS.setTaskId(tuningRun.getTaskId());
+        modelVersionS.setModelUrl(targetModelVersionURl);
+        ModelManage modelManageS = new ModelManage();
+        if (runPublishDto.getPublishWay() == 0) {
+            modelManageS.setModelDescribe(runPublishDto.getModelDescribe());
+            modelManageS.setModelName(runPublishDto.getModelName());
+            modelManageS.setModelType(runPublishDto.getModelType());
+            modelManageS.setIsBaseModel(0);
+            modelManageService.saveAndCreateVersion(modelManageS, modelVersionS);
+        } else {
+            modelManageS = modelManageService.getById(runPublishDto.getModelId());
+            modelManageS.setModelDescribe(runPublishDto.getModelDescribe());
+            modelManageS.setIsBaseModel(0);
+            modelManageService.updateById(modelManageS);
+            modelVersionS.setModelId(runPublishDto.getModelId());
+            modelVersionService.saveNew(modelVersionS);
+        }
+    }
 
     /**
      * 根据最新对象和原有对象的数据对比，判断关联的字典数据和多对一主表数据是否都是合法数据。