Merge remote-tracking branch 'origin/taosj_dev' into taosj_dev

forecast-backend-server/src/main/java/com/ufo/project/data/task/DataFileSyncTask.java

@@ -113,12 +113,13 @@ public class DataFileSyncTask
     {
         if (config == null || StringUtils.isBlank(config.getScanFolder()))
         {
+            log.info("配置缺失");
             return;
         }
         Path root = Paths.get(config.getScanFolder());
         if (!Files.isDirectory(root))
         {
-            log.warn("[DataFileSyncTask] 扫描目录不存在, scanFolder={}", config.getScanFolder());
+            log.info("[DataFileSyncTask] 扫描目录不存在, scanFolder={}", config.getScanFolder());
             return;
         }
         long intervalHours = config.getUpdateInterval() == null ? 0L : config.getUpdateInterval();

forecast-backend-server/src/main/java/com/ufo/project/forecast/fileupload/controller/DataReportLogController.java

@@ -29,9 +29,6 @@ import com.ufo.project.forecast.fileupload.service.IDataReportLogService;
 @RequestMapping("/fileupload/reportLog")
 public class DataReportLogController extends BaseController
 {
-    /** 上报文件根目录, content_path为其下的相对路径 */
-    @Value("${project.forecast.reportfile.rootfolder}")
-    private String reportFileRootFolder;
 
     @Autowired
     private IDataReportLogService dataReportLogService;
@@ -65,7 +62,7 @@ public class DataReportLogController extends BaseController
         {
             return AjaxResult.error("该记录无上报名文文件");
         }
-        File file = new File(reportFileRootFolder, path);
+        File file = new File(path);
         if (!file.exists() || !file.isFile())
         {
             return AjaxResult.error("上报文件不存在: " + path);