ThbTech/JavaProjectRepo
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css

Browse Source
This commit is contained in:
limengnan 2026-04-15 10:55:35 +08:00
commit 28438fc0fa
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
business-css/src/main/java/com/yfd/business/css/controller/ModelTrainController.java
View File

@ -156,7 +156,7 @@ public class ModelTrainController {
* 删除训练任务 * 删除训练任务
*/ */
@Log(value = "删除训练任务", module = "模型训练") @Log(value = "删除训练任务", module = "模型训练")
@PreAuthorize("hasAuthority('modelTrain:delete')") // @PreAuthorize("hasAuthority('modelTrain:delete')")
//删除训练任务 //删除训练任务
@DeleteMapping("/{taskId}") @DeleteMapping("/{taskId}")
public ResponseResult delete(@PathVariable String taskId) { public ResponseResult delete(@PathVariable String taskId) {

5
business-css/src/main/java/com/yfd/business/css/controller/SimController.java
View File

@ -59,7 +59,10 @@ public class SimController {
if ("1".equals(st)) { if ("1".equals(st)) {
return ResponseResult.error("情景正在运行中，请稍后重试"); return ResponseResult.error("情景正在运行中，请稍后重试");
} }
if (("2".equals(st) || "3".equals(st)) && !clearResult) { if ("3".equals(st)) {
clearResult = true;
}
if ("2".equals(st) && !clearResult) {
return ResponseResult.error("请先清空历史结果后再重新模拟"); return ResponseResult.error("请先清空历史结果后再重新模拟");
} }
} }