From 19beea5d5dc165efb0feca7c4c0a296819010178 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 04 十二月 2024 11:16:17 +0800
Subject: [PATCH] 修改bug：传给仿真算法包的modelId重复。（将工况ID改为阶段模型ID）
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java
index d37f069..2ad6b3f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java
@@ -15,21 +15,26 @@
import com.zt.life.modules.mainPart.baseReliability.service.ParamDataBasicService;
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.taskReliability.dao.AssessItemDao;
+import com.zt.life.modules.mainPart.taskReliability.dto.TaskModelCheckResultDto;
import com.zt.life.modules.mainPart.taskReliability.model.AssessItem;
import com.zt.life.modules.mainPart.taskReliability.model.AssessResult;
import com.zt.life.modules.mainPart.taskReliability.model.OperatCondit;
import com.zt.life.modules.mainPart.taskReliability.model.ReliabilityAssess;
import com.zt.life.modules.mainPart.taskReliability.service.ReliabilityAssessService;
+import com.zt.life.modules.mainPart.taskReliability.service.TaskService;
import com.zt.life.util.ImportUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -42,6 +47,8 @@
@Autowired
AssessItemDao assessItemDao;
+ @Autowired
+ TaskService taskService;
@PostMapping("page")
@ApiOperation("鍒嗛〉")
@@ -64,6 +71,11 @@
return result;
}
+ @GetMapping("downloadXml")
+ public void downloadXml(HttpServletRequest request, HttpServletResponse response, Long productId, Long taskId, Long itemId,Integer xml) {
+ reliabilityAssessService.downloadXml(request,response,productId,taskId,itemId,xml);
+ }
+
@PostMapping("add")
@ApiOperation("鏂板")
@LogOperation("鏂板")
@@ -73,6 +85,26 @@
assessItemDao.insert(assessItem);
return Result.ok();
+ }
+ @PostMapping("update")
+ @ApiOperation("淇敼")
+ @LogOperation("淇敼")
+ public Result update(@RequestBody AssessItem assessItem){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(assessItem, AddGroup.class, DefaultGroup.class);
+ assessItemDao.updateById(assessItem);
+ return Result.ok();
+ }
+
+ @PostMapping("assessCheck")
+ @ApiOperation("璇勫畾妯″瀷妫�鏌�")
+ @LogOperation("璇勫畾妯″瀷妫�鏌�")
+ public Result<List<TaskModelCheckResultDto>> assessCheck(@RequestBody AssessResult assessResult){
+ List<TaskModelCheckResultDto> list = taskService.checkTaskModelAssess(assessResult.getProductId(),
+ assessResult.getTaskId(),
+ assessResult.getItemId());
+
+ return Result.ok(list);
}
@PostMapping("assess")
@@ -91,5 +123,15 @@
return Result.ok(dataList);
}
+ @GetMapping("delete")
+ @ApiOperation("鍒犻櫎")
+ @LogOperation("鍒犻櫎")
+ public Result delete(Long id){
+ //鏁堥獙鏁版嵁
+ assessItemDao.deleteById(id);
+
+ return Result.ok();
+ }
+
}
--
Gitblit v1.9.1