Merge remote-tracking branch 'upstream/develop' into develop

rk2b-fenghaolun · Mar 8, 2024 · 95a2111 · 95a2111
2 parents 5249eb5 + dc0381a
commit 95a2111
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/...va/com/primihub/biz/service/data/component/impl/FitTransformComponentTaskServiceImpl.java b/...va/com/primihub/biz/service/data/component/impl/FitTransformComponentTaskServiceImpl.java
@@ -26,6 +26,7 @@
 
 import java.io.File;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service("fitTransformComponentTaskServiceImpl")
@@ -66,12 +67,20 @@ public BaseResultEntity runTask(DataComponentReq req, ComponentTaskReq taskReq)
                 fitTransformEntityMap.remove(modelDerivationDto.getOriginalResourceId());
             }
             log.info("newids:{}", ids);
+            log.info("fitTransform-2:{}", JSONObject.toJSONString(fitTransformEntityMap));
         }
+        Map<String, ModelDerivationDto> oldResourceIdMap = newest.stream().collect(Collectors.toMap(ModelDerivationDto::getOriginalResourceId, Function.identity()));
         try {
             GrpcComponentDto labelDatasetDto = fitTransformEntityMap.get(taskReq.getFreemarkerMap().get(DataConstant.PYTHON_LABEL_DATASET));
+            if (labelDatasetDto == null) {
+                labelDatasetDto = fitTransformEntityMap.get(oldResourceIdMap.get(taskReq.getFreemarkerMap().get(DataConstant.PYTHON_LABEL_DATASET)).getNewResourceId());
+            }
             taskReq.getFreemarkerMap().put("new_"+DataConstant.PYTHON_LABEL_DATASET,labelDatasetDto.getNewDataSetId());
             taskReq.getFreemarkerMap().put("new_"+DataConstant.PYTHON_LABEL_DATASET+"_path",labelDatasetDto.getOutputFilePath());
             GrpcComponentDto guestDatasetDto = fitTransformEntityMap.get(taskReq.getFreemarkerMap().get(DataConstant.PYTHON_GUEST_DATASET));
+            if (guestDatasetDto == null) {
+                guestDatasetDto = fitTransformEntityMap.get(oldResourceIdMap.get(taskReq.getFreemarkerMap().get(DataConstant.PYTHON_GUEST_DATASET)).getNewResourceId());
+            }
             taskReq.getFreemarkerMap().put("new_"+DataConstant.PYTHON_GUEST_DATASET,guestDatasetDto.getNewDataSetId());
             taskReq.getFreemarkerMap().put("new_"+DataConstant.PYTHON_GUEST_DATASET+"_path",guestDatasetDto.getOutputFilePath());
             TaskParam<TaskComponentParam> taskParam = new TaskParam<>(new TaskComponentParam());
@@ -119,10 +128,9 @@ public BaseResultEntity runTask(DataComponentReq req, ComponentTaskReq taskReq)
                     }
                 }
             }
-            HashSet dids = new HashSet(){{
-                add(labelDatasetDto.getNewDataSetId());
-                add(guestDatasetDto.getNewDataSetId());
-            }};
+            HashSet dids = new HashSet();
+            dids.add(labelDatasetDto.getNewDataSetId());
+            dids.add(guestDatasetDto.getNewDataSetId());
             while (true){
                 // 休眠一秒等待数据集同步
                 BaseResultEntity dataSets = fusionResourceService.getDataSets(dids);

diff --git a/primihub-service/biz/src/main/java/com/primihub/biz/service/sys/SysUserService.java b/primihub-service/biz/src/main/java/com/primihub/biz/service/sys/SysUserService.java
@@ -170,10 +170,12 @@ public BaseResultEntity saveOrUpdateUser(SaveOrUpdateUserParam saveOrUpdateUserP
         Long userId=saveOrUpdateUserParam.getUserId();
         SysUser sysUser;
         if(userId==null){
-            if(saveOrUpdateUserParam.getUserAccount()==null|| "".equals(saveOrUpdateUserParam.getUserAccount().trim())) {
+            saveOrUpdateUserParam.setUserAccount(saveOrUpdateUserParam.getUserAccount().trim());
+            saveOrUpdateUserParam.setUserName(saveOrUpdateUserParam.getUserName().trim());
+            if(saveOrUpdateUserParam.getUserAccount()==null|| saveOrUpdateUserParam.getUserAccount().isEmpty()) {
                 return BaseResultEntity.failure(BaseResultEnum.LACK_OF_PARAM,"userAccount");
             }
-            if(saveOrUpdateUserParam.getUserName()==null|| "".equals(saveOrUpdateUserParam.getUserName().trim())) {
+            if(saveOrUpdateUserParam.getUserName()==null|| saveOrUpdateUserParam.getUserName().isEmpty()) {
                 return BaseResultEntity.failure(BaseResultEnum.LACK_OF_PARAM,"userName");
             }
             if(saveOrUpdateUserParam.getIsForbid()==null) {