From 781fcfa061c36940a1160fadb589e6d6f53ff90f Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 15 Oct 2024 14:11:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=B0=B4=E5=BA=93=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E4=B8=8E?= =?UTF-8?q?=E7=89=B9=E5=BE=81=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sk/controller/AttResBaseController.java | 73 +++---------------- .../sk/controller/AttResRsppController.java | 51 ++----------- .../java/com/kms/yg/sk/domain/AttResBase.java | 14 +--- .../java/com/kms/yg/sk/domain/AttResRspp.java | 14 +--- 4 files changed, 23 insertions(+), 129 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java index 2d423bb2..5b781387 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java @@ -1,7 +1,6 @@ package com.kms.yg.sk.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.kms.common.utils.BaseEntityUtils; import com.kms.yg.sk.domain.AttResBase; import com.kms.yg.sk.service.AttResBaseService; import com.shuili.common.annotation.Log; @@ -15,90 +14,42 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; import java.util.List; - /** - * 【请填写功能名称】Controller + * 水库基础信息Controller * * @author kms * @date 2024-04-24 */ @RestController -@RequestMapping("/system/base") -@Api(tags = "【请填写功能名称】") -public class AttResBaseController extends BaseController -{ +@RequestMapping("/sk/base") +@Api(tags = "水库基础信息") +public class AttResBaseController extends BaseController { @Autowired private AttResBaseService attResBaseService; - - /** - * 查询【请填写功能名称】列表 - */ @PostMapping("/list") - @ApiOperation("【请填写功能名称】列表") - public IPage list(@RequestBody SearchParam sp) - { + @ApiOperation("水库基础信息列表") + public IPage list(@RequestBody SearchParam sp) { return attResBaseService.selectPage(sp); } - /** - * 导出【请填写功能名称】列表 - */ - @Log(title = "【请填写功能名称】导出", businessType = BusinessType.EXPORT) + + @Log(title = "水库基础信息导出", businessType = BusinessType.EXPORT) @PostMapping("/export") - @ApiOperation("【请填写功能名称】导出") - public AjaxResult export(@RequestBody AttResBase attResBase) - { + @ApiOperation("水库基础信息导出") + public AjaxResult export(@RequestBody AttResBase attResBase) { List list = attResBaseService.listByIds(attResBase.getIds()); ExcelUtil util = new ExcelUtil<>(AttResBase.class); return util.exportExcel(list, "base"); } - /** - * 获取【请填写功能名称】详细信息 - */ - @ApiOperation(" 【请填写功能名称】详情") + @ApiOperation("水库基础信息详情") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") String id) - { + public AjaxResult getInfo(@PathVariable("id") String id) { return AjaxResult.success(attResBaseService.getById(id)); } - /** - * 新增【请填写功能名称】 - */ - @Log(title = "【请填写功能名称】新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("【请填写功能名称】新增") - public AjaxResult add(@RequestBody AttResBase attResBase) - { - BaseEntityUtils.preInsert(attResBase); - return toAjax(attResBaseService.save(attResBase)); - } - - /** - * 修改【请填写功能名称】 - */ - @ApiOperation("【请填写功能名称】修改") - @Log(title = "【请填写功能名称】修改", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody AttResBase attResBase) - { - return toAjax(attResBaseService.updateById(attResBase)); - } - - /** - * 删除【请填写功能名称】 - */ - @ApiOperation("【请填写功能名称】删除") - @Log(title = "【请填写功能名称】删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable String[] ids) - { - return toAjax(attResBaseService.removeByIds(Arrays.asList(ids))); - } } diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java index 1efde695..28c9f9bb 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java @@ -20,14 +20,14 @@ import java.util.List; /** - * 【请填写功能名称】Controller + * 水库特征信息Controller * * @author kms * @date 2024-04-24 */ @RestController -@RequestMapping("/system/rspp") -@Api(tags = "【请填写功能名称】") +@RequestMapping("/sk/rspp") +@Api(tags = "水库特征信息") public class AttResRsppController extends BaseController { @Autowired @@ -38,7 +38,7 @@ public class AttResRsppController extends BaseController * 查询【请填写功能名称】列表 */ @PostMapping("/list") - @ApiOperation("【请填写功能名称】列表") + @ApiOperation("水库特征信息列表") public IPage list(@RequestBody SearchParam sp) { return attResRsppService.selectPage(sp); @@ -47,9 +47,9 @@ public class AttResRsppController extends BaseController /** * 导出【请填写功能名称】列表 */ - @Log(title = "【请填写功能名称】导出", businessType = BusinessType.EXPORT) + @Log(title = "水库特征信息导出", businessType = BusinessType.EXPORT) @PostMapping("/export") - @ApiOperation("【请填写功能名称】导出") + @ApiOperation("水库特征信息导出") public AjaxResult export(@RequestBody AttResRspp attResRspp) { List list = attResRsppService.listByIds(attResRspp.getIds()); @@ -57,47 +57,10 @@ public class AttResRsppController extends BaseController return util.exportExcel(list, "rspp"); } - /** - * 获取【请填写功能名称】详细信息 - */ - @ApiOperation(" 【请填写功能名称】详情") + @ApiOperation("水库特征信息详情") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { return AjaxResult.success(attResRsppService.getById(id)); } - - /** - * 新增【请填写功能名称】 - */ - @Log(title = "【请填写功能名称】新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("【请填写功能名称】新增") - public AjaxResult add(@RequestBody AttResRspp attResRspp) - { - BaseEntityUtils.preInsert(attResRspp); - return toAjax(attResRsppService.save(attResRspp)); - } - - /** - * 修改【请填写功能名称】 - */ - @ApiOperation("【请填写功能名称】修改") - @Log(title = "【请填写功能名称】修改", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody AttResRspp attResRspp) - { - return toAjax(attResRsppService.updateById(attResRspp)); - } - - /** - * 删除【请填写功能名称】 - */ - @ApiOperation("【请填写功能名称】删除") - @Log(title = "【请填写功能名称】删除", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable String[] ids) - { - return toAjax(attResRsppService.removeByIds(Arrays.asList(ids))); - } } diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBase.java b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBase.java index f9071e40..0f54f33f 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBase.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBase.java @@ -20,23 +20,13 @@ import java.util.Date; */ @TableName("att_res_base") @Data -@ApiModel("【请填写功能名称】") +@ApiModel("水库基础信息") public class AttResBase extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @ApiModelProperty("${comment}") - private String createUid; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @ApiModelProperty("${comment}") - private String updateUid; - /** 水库代码 */ - @ApiModelProperty("${comment}") + @ApiModelProperty("水库编码") private String resCode; /** 水库名称 */ diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java index 618aa7ac..1c1e5a27 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java +++ b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java @@ -21,23 +21,13 @@ import java.util.Date; */ @TableName("att_res_rspp") @Data -@ApiModel("【请填写功能名称】") +@ApiModel("水库主要特征") public class AttResRspp extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @ApiModelProperty("${comment}") - private String createUid; - - /** $column.columnComment */ - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - @ApiModelProperty("${comment}") - private String updateUid; - /** 水库代码 */ - @ApiModelProperty("${comment}") + @ApiModelProperty("水库编码") private String resCode; /** 死水位 */