From 96905176e38f8ebfbc44da1dd9adc650357bfc4f Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期二, 14 十一月 2023 12:10:37 +0800 Subject: [PATCH] Changes --- modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java index 897ab38..68a39b7 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java @@ -32,12 +32,12 @@ /** * project * - * @author zt generator + * @author zt generator * @since 1.0.0 2023-11-07 */ @RestController @RequestMapping("/project/Project/") -@Api(tags="project") +@Api(tags = "project") public class ProjectController { @Autowired private ProjectService projectService; @@ -47,24 +47,26 @@ @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 = "softwareName", value = "杞欢鍚嶇О", dataType = Constant.QT.STRING, format = "software_name^LK"), - @ApiImplicitParam(name = "secretClass", value = "瀵嗙骇", dataType = Constant.QT.STRING, format = "secret_class^EQ"), - @ApiImplicitParam(name = "criticalLevel", value = "鍏抽敭绛夌骇", dataType = Constant.QT.STRING, format = "critical_level^EQ"), - @ApiImplicitParam(name = "testLevel", value = "娴嬭瘯绾у埆", dataType = Constant.QT.STRING, format = "test_level^EQ"), - @ApiImplicitParam(name = "softwareType", value = "杞欢绫诲瀷", dataType = Constant.QT.STRING, format = "software_type^EQ"), - @ApiImplicitParam(name = "isContract", value = "鏄惁绛剧讲鍚堝悓", dataType = Constant.QT.STRING, format = "is_contract^EQ") }) - public PageResult<Project> page(@ApiIgnore @QueryParam QueryFilter 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 = "softwareName", value = "杞欢鍚嶇О", dataType = Constant.QT.STRING, format = "software_name^LK"), + @ApiImplicitParam(name = "secretClass", value = "瀵嗙骇", dataType = Constant.QT.STRING, format = "secret_class^EQ"), + @ApiImplicitParam(name = "criticalLevel", value = "鍏抽敭绛夌骇", dataType = Constant.QT.STRING, format = "critical_level^EQ"), + @ApiImplicitParam(name = "testLevel", value = "娴嬭瘯绾у埆", dataType = Constant.QT.STRING, format = "test_level^EQ"), + @ApiImplicitParam(name = "softwareType", value = "杞欢绫诲瀷", dataType = Constant.QT.STRING, format = "software_type^EQ"), + @ApiImplicitParam(name = "isContract", value = "鏄惁绛剧讲鍚堝悓", dataType = Constant.QT.STRING, format = "is_contract^EQ"), + @ApiImplicitParam(name = "tableName", value = "鍔熻兘琛�", dataType = Constant.QT.STRING) + }) + public PageResult<Project> page(@ApiIgnore @QueryParam QueryFilter queryFilter) { return PageResult.ok(projectService.page(queryFilter)); } @GetMapping("{id}") @ApiOperation("淇℃伅") - public Result<Project> get(@PathVariable("id") Long id){ + public Result<Project> get(@PathVariable("id") Long id) { Project data = projectService.get(id); return Result.ok(data); } @@ -72,11 +74,11 @@ @PostMapping @ApiOperation("鏂板") @LogOperation("鏂板") - public Result insert(@RequestBody Project project){ + public Result insert(@RequestBody Project project) { //鏁堥獙鏁版嵁 ValidatorUtils.validateEntity(project, AddGroup.class, DefaultGroup.class); - Map<String,String> map = new HashMap<>(); - map.put("funCode","project"); + Map<String, String> map = new HashMap<>(); + map.put("funCode", "project"); project.setCode(sysCodeRuleService.getNewCode(map)); projectService.insert(project); return Result.ok(); @@ -85,7 +87,7 @@ @PutMapping @ApiOperation("淇敼") @LogOperation("淇敼") - public Result update(@RequestBody Project project){ + public Result update(@RequestBody Project project) { //鏁堥獙鏁版嵁 ValidatorUtils.validateEntity(project, UpdateGroup.class, DefaultGroup.class); projectService.update(project); @@ -96,7 +98,7 @@ @DeleteMapping @ApiOperation("鍒犻櫎") @LogOperation("鍒犻櫎") - public Result delete(@RequestBody Long[] ids){ + public Result delete(@RequestBody Long[] ids) { //鏁堥獙鏁版嵁 AssertUtils.isArrayEmpty(ids, "id"); projectService.delete(ids); -- Gitblit v1.9.1