From 9025b9cf7ec8610003d445a31d93e35e7bd73c2e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 31 一月 2024 17:54:52 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java | 67 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
index f643f0d..bbaa391 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java
@@ -14,6 +14,7 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.project.dto.EnvironDto;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
+import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.testCheckOrder.dto.CheckOrderDto;
import com.zt.life.modules.testCheckOrder.model.TestCheckOrder;
import com.zt.life.modules.testCheckOrder.service.TestCheckOrderService;
@@ -36,15 +37,18 @@
/**
* test_check_order
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-12-05
*/
@RestController
@RequestMapping("/testCheckOrder/TestCheckOrder/")
-@Api(tags="test_check_order")
+@Api(tags = "test_check_order")
public class TestCheckOrderController {
@Autowired
private TestCheckOrderService testCheckOrderService;
+
+ @Autowired
+ private ProjectService projectService;
@Autowired
private SysCodeRuleService sysCodeRuleService;
@@ -52,63 +56,68 @@
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
- @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),
- @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "code^LK"), @ApiImplicitParam(name = "softwareidentity", value = "椤圭洰鏍囪瘑", dataType = Constant.QT.STRING, format = "softwareIdentity^LK"), @ApiImplicitParam(name = "softwarename", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "softwareName^LK") })
- public PageResult<TestCheckOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
-
- return PageResult.ok(testCheckOrderService.page(queryFilter));
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @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),
+ @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "a.code^LK"),
+ @ApiImplicitParam(name = "softwareIdentity", value = "椤圭洰鏍囪瘑", dataType = Constant.QT.STRING, format = "p.software_identity^LK"),
+ @ApiImplicitParam(name = "softwareName", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^LK"),
+ @ApiImplicitParam(name = "pageCode", value = "閰嶇疆椤规爣璇�", dataType = Constant.QT.STRING, format = "a.page_code^LK")})
+ public PageResult<TestCheckOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
+ List<TestCheckOrder> testCheckOrder = testCheckOrderService.page(queryFilter);
+ return PageResult.ok(testCheckOrder);
}
@GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<CheckOrderDto> getDto(Long checkId, Long projectId,String itemType) {
- CheckOrderDto data = testCheckOrderService.getDto(checkId, projectId,itemType);
+ public Result<CheckOrderDto> getDto(Long checkId, Long projectId, String pageCode) {
+ CheckOrderDto data = testCheckOrderService.getDto(checkId, projectId, pageCode);
return Result.ok(data);
}
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody CheckOrderDto checkOrderDto){
+ public Result<Long> insert(@RequestBody CheckOrderDto checkOrderDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(checkOrderDto, AddGroup.class, DefaultGroup.class);
- Map<String, String> map = new HashMap<>();
- map.put("funCode", "test_check_order");
- map.put("projectId",checkOrderDto.getProjectId().toString());
- checkOrderDto.getCheckOrder().setCode(sysCodeRuleService.getNewCode(map));
- Boolean result = testCheckOrderService.save(checkOrderDto);
- return Result.ok();
+/* Map<String, String> map = new HashMap<>();
+ String pagecode = checkOrderDto.getPageCode();
+ map.put("funCode", "test_check_order_"+pagecode);
+ map.put("projectId", checkOrderDto.getProjectId().toString());
+ checkOrderDto.getCheckOrder().setCode(sysCodeRuleService.getNewCode(map));*/
+ Long result = testCheckOrderService.save(checkOrderDto);
+ return Result.ok(result);
}
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody CheckOrderDto checkOrderDto){
+ public Result<Long> update(@RequestBody CheckOrderDto checkOrderDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(checkOrderDto, UpdateGroup.class, DefaultGroup.class);
- Boolean result = testCheckOrderService.save(checkOrderDto);
+ Long result = testCheckOrderService.save(checkOrderDto);
- return Result.ok();
+ return Result.ok(result);
}
@DeleteMapping("deleteCheckOrder")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
testCheckOrderService.delete(ids);
+ projectService.deleteItem(ids,"test_check_order_list","check_order_id");
return Result.ok();
}
- /*@GetMapping("exportCheckOrder")
- @ApiOperation("鎵撳嵃娴嬭瘯鐜寤虹珛纭琛�")
- @LogOperation("鎵撳嵃娴嬭瘯鐜寤虹珛纭琛�")
- public void exportEnviron(Long id, HttpServletRequest request, HttpServletResponse response) {
- environService.exportEnviron(id, request, response);
- }*/
+ @GetMapping("exportCheckOrder")
+ @ApiOperation("鎵撳嵃妫�鏌ュ崟")
+ @LogOperation("鎵撳嵃妫�鏌ュ崟")
+ public void exportCheckOrder(Long id, String pageCode, HttpServletRequest request, HttpServletResponse response) {
+ testCheckOrderService.exportCheckOrder(id,pageCode, request, response);
+ }
}
--
Gitblit v1.9.1