فهرست منبع

算法校验、保存bug修改

WXF 3 سال پیش
والد
کامیت
8dc58e2480

+ 7 - 14
simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/serviceImpl/AlgorithmServiceImpl.java

@@ -65,24 +65,17 @@ public class AlgorithmServiceImpl implements AlgorithmService {
             if(DictConstants.FILE.equals(uploadMode)){
                 String minioPath = param.getMinioPath();
                 ResponseBodyVO<String> checkRes = schedulerService.check(minioPath);
-                if(checkRes.isStatus()){
-                    return doAddOrUpdate(param);
-                }else {
+                if(ObjectUtil.isNull(checkRes)){
+                    return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE,"算法校验服务异常,请联系管理人员!");
+                }
+                if(!checkRes.isStatus()){//校验失败
                     MinioParameter minioParameter = new MinioParameter();
                     minioParameter.setObjectName(minioPath);
-                    Response remove =fileDownService.remove(minioParameter);
-                    if(remove.status() == 200){
-                        if(StringUtil.isNotEmpty(param.getId())){
-                            int i = algorithmMapper.deleteByid(param);//编辑时-算法不可用-删除记录
-                        }
-                        return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE,"该算法经校验不可用,无法保存,算法文件已删除!");
-                    }else {
-                        return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE,"该算法经校验不可用,无法保存,算法文件删除失败!");
-                    }
+                    fileDownService.remove(minioParameter);
+                    return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE,"该算法经校验不可用,无法保存!");
                 }
-            }else {
-                 return doAddOrUpdate(param);
             }
+            return doAddOrUpdate(param);
         }
     }