1013

src/main/java/io/renren/modules/job/controller/ScheduleJobController.java

@@ -18,6 +18,7 @@ import io.renren.modules.job.entity.ScheduleJobEntity;
 import io.renren.modules.job.service.ScheduleJobService;
 import io.renren.modules.sys.entity.dataset.DataSetDy;
 import io.renren.modules.sys.service.DataSetDyService;
+import io.renren.modules.sys.service.DataSetService;
 import io.renren.modules.sys.service.impl.DataSetDyServiceImpl;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.checkerframework.checker.units.qual.A;
@@ -79,7 +80,8 @@ public class ScheduleJobController {
 		
 		return R.ok();
 	}
-	
+	@Autowired
+	DataSetService dataSetService;
 	/**
 	 * 修改定时任务
 	 */
@@ -95,6 +97,7 @@ public class ScheduleJobController {
 		String cronExpression = (String) map.get("cronExpression");
 		String remark = (String) map.get("remark");
 		DataSetDy dataSetDy = dataSetDyService.getById(datasetId);
+		String oldName = dataSetDy.getDatasetName();
 		dataSetDy.setDatasetName(datasetName);
 		dataSetDy.setCategoryId(categoryId);
 		dataSetDy.setRemark(remark);
@@ -105,6 +108,13 @@ public class ScheduleJobController {
 		scheduleJobEntity.setCronExpression((String) map.get("cronExpression"));
 		scheduleJobService.update(scheduleJobEntity);
 
+
+		String res = dataSetService.renameMino("dydataset", datasetName+".csv", "dydataset", oldName+".csv");
+		if ("200".equals(res)){
+			return R.ok();
+		}else {
+			return R.error(res);
+		}
 //
 //		// 这里的 scheduleJob.getJobId 实际上是数据集的ID
 //		DataSetDy dataSetDy = dataSetDyService.getById(scheduleJob.getJobId());
@@ -127,7 +137,7 @@ public class ScheduleJobController {
 ////		scheduleJob.setStatus();
 //		scheduleJobService.update(scheduleJob);
 		
-		return R.ok();
+//		return R.ok();
 	}
 	
 	/**

src/main/java/io/renren/modules/sys/controller/dataset/DataSetDyController.java

@@ -5,6 +5,7 @@ import io.renren.common.utils.Constant;
 import io.renren.common.utils.MinIoUtils;
 import io.renren.common.utils.PageUtils;
 import io.renren.common.utils.R;
+import io.renren.modules.sys.entity.algs.FileTest;
 import io.renren.modules.sys.service.DataSetDyService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import static io.renren.common.utils.ShiroUtils.getUserId;
@@ -50,6 +53,17 @@ public class DataSetDyController {
      */
     @RequestMapping("/downloadDataset")
     public R downloadStaticDataset(String datasetName){
+
+        List<FileTest> dataset = new ArrayList<>();
+        try {
+            dataset = MinIoUtils.listFiles("dydataset", datasetName.split("\\.")[0]);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (dataset.size() ==0){
+            return R.error(404,"文件不存在");
+        }
         //从minio获得数据集的url，直接返回给前端
         String downloadUrl= MinIoUtils.getFileUrl("dydataset",datasetName);
         return R.ok().put("downloadUrl",downloadUrl);