From b672cafe6a447c9b19691b583df9542ad84bce2c Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 26 Nov 2024 16:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
index 20f5ce4..9f1be3e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
@@ -136,7 +136,7 @@
@PostMapping("add")
public R add(@RequestBody SgProjectInfoDO sgProjectInfoDO) {
sgProjectInfoService.save(sgProjectInfoDO);
- return R.success("新增成功");
+ return R.data(sgProjectInfoDO);
}
/**
@@ -156,4 +156,23 @@
List<SgProjectTreeVO> tree = sgProjectInfoService.projectTree(dto);
return R.data(tree);
}
+
+
+ /**
+ * 水库列表
+ */
+ @GetMapping("res_list")
+ public R resList(ProjectSearchDTO dto,Query query) {
+ IPage<ResVO> page= sgProjectInfoService.resList(Condition.getPage(query),dto);
+ return R.data(page);
+ }
+
+ /**
+ * 删除项目
+ */
+ @PostMapping("delete")
+ public R delete(@RequestParam(name="ids",required=true) String ids) {
+ sgProjectInfoService.delete(ids);
+ return R.success("删除成功");
+ }
}
--
Gitblit v1.9.3