From 4bff52e938ae2c260fe54d32ef680908868bb27e Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 07 六月 2024 09:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/OperatConditModelController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/OperatConditModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/OperatConditModelController.java
index 8db79eb..506f016 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/OperatConditModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/OperatConditModelController.java
@@ -12,6 +12,7 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
+import com.zt.life.modules.mainPart.taskReliability.model.ModelNodes;
import com.zt.life.modules.mainPart.taskReliability.model.OperatConditModel;
import com.zt.life.modules.mainPart.taskReliability.service.OperatConditModelService;
import io.swagger.annotations.Api;
@@ -24,6 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.Map;
/**
@@ -52,11 +54,17 @@
return Result.ok(operatConditModelService.page(queryFilter));
}
+ @GetMapping("getModelNodes")
+ @ApiOperation("妯″瀷")
+ public Result<Map> getModelNodes(Long shipId) {
+ Map data = operatConditModelService.getModelNodes(shipId);
+ return Result.ok(data);
+ }
+
@GetMapping("{id}")
@ApiOperation("淇℃伅")
public Result<OperatConditModel> get(@PathVariable("id") Long id){
OperatConditModel data = operatConditModelService.get(id);
-
return Result.ok(data);
}
@@ -65,9 +73,8 @@
@LogOperation("鏂板")
public Result insert(@RequestBody OperatConditModel operatConditModel){
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(operatConditModel, AddGroup.class, DefaultGroup.class);
- operatConditModelService.insert(operatConditModel);
-
+ //ValidatorUtils.validateEntity(operatConditModel, AddGroup.class, DefaultGroup.class);
+ operatConditModelService.save(operatConditModel);
return Result.ok();
}
--
Gitblit v1.9.1