微调

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/OfflineDataUploadController.java

@@ -82,7 +82,7 @@ public class OfflineDataUploadController extends BaseController {
         if (result) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "文件补召中,请稍后", methodDescribe);
         } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "文件补召中失败", methodDescribe);
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "文件补召失败", methodDescribe);
         }
     }
 

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java

@@ -220,8 +220,7 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
 
     @Override
     public boolean startMakeUpData(MakeUpParam param) {
-        boolean result = true;
-        try {
+        boolean result = false;
         List<String> fileList = new ArrayList<>();
         //fixme 这边补召暂不支持多工程补召，防止下载文件时间过长，会出问题。
         String s = param.getProList().get(0);
@@ -279,12 +278,10 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
             redisUtil.saveByKey(AppRedisKey.MAKE_UP_FILES + param.getNDid(),downloadMakeUpDto);
             publisher.send("/makeUpData/" + param.getNDid() +"/" + param.getLineId(), "makeUpData", 1, false);
             log.info("下载的文件列表,{}",fileList);
+            result = true;
         } else {
             throw new BusinessException("装置内未找到原始文件!");
         }
-        } catch (Exception e) {
-            result = false;
-        }
         return result;
     }