From 18f682f736914e427070b9bb769df538ad9f6d1c Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 02 十二月 2024 08:42:38 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java | 61 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 12 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 4378f00..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,16 +47,14 @@
@Autowired
AssessItemDao assessItemDao;
+ @Autowired
+ TaskService taskService;
- @GetMapping("page")
+ @PostMapping("page")
@ApiOperation("鍒嗛〉")
- @ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- })
- public Result<List<ReliabilityAssess>> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
-
- return Result.ok(null);
+ public Result<List<ReliabilityAssess>> page(@RequestBody AssessResult assessResult) {
+ List<ReliabilityAssess> list = reliabilityAssessService.page(assessResult);
+ return Result.ok(list);
}
@PostMapping("importProductExcel")
@@ -62,11 +65,15 @@
StringBuilder str = new StringBuilder();
ImportUtil.importResult(result, importResults, str);
ImportUtil.ImportErrResult(result, importResults, str);
-
} catch (Exception e) {
e.printStackTrace();
}
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")
@@ -79,14 +86,34 @@
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")
@ApiOperation("璇勫畾")
@LogOperation("璇勫畾")
- public Result assess(@RequestBody AssessResult assessResult){
- Result result = reliabilityAssessService.assess(assessResult);
+ public Result<List<ReliabilityAssess>> assess(@RequestBody AssessResult assessResult){
+ List<ReliabilityAssess> list = reliabilityAssessService.assess(assessResult);
- return result;
+ return Result.ok(list);
}
@GetMapping("getAssessDataList")
@@ -96,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