From 6df987540393b4a341fb4846a82da6a78e8b8039 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 14 Aug 2023 16:17:31 +0800
Subject: [PATCH] 增加云密码服务平台对接
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java
index c1dcd82..433d4ad 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java
@@ -38,10 +38,9 @@
@GetMapping("/page")
@ApiOperation(value = "列表", notes = "传入实体类参数")
- public R<IPage<DangerReport>> pageList(@RequestParam Map<String, Object> dr, Query query) {
- QueryWrapper<DangerReport> queryWrapper = Condition.getQueryWrapper(dr,DangerReport.class);
- IPage<DangerReport> pagelist = dangerReportService.page(Condition.getPage(query),queryWrapper);
- return R.data(pagelist);
+ public R<IPage<DangerReportVO>> pageList(DangerReportVO dangerReportVO, Query query) {
+ IPage<DangerReportVO> page = dangerReportService.selectPage(Condition.getPage(query),dangerReportVO);
+ return R.data(page);
}
@GetMapping("/all")
@@ -66,7 +65,7 @@
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入实体类参数")
public R save(@RequestBody DangerReport dangerReport) {
- return R.data(dangerReportService.save(dangerReport));
+ return R.data(dangerReportService.saveUp(dangerReport));
}
/**
@@ -96,4 +95,14 @@
return R.data(dangerReportService.removeBatchByIds(Func.toLongList(ids)));
}
+ /**
+ * 获取水库巡查次数和险情问题数量
+ * @param resGuid
+ * @return
+ */
+ @GetMapping("/getStatistics")
+ public R getStatistics(String resGuid){
+ return R.data(dangerReportService.getStatistics(resGuid));
+ }
+
}
--
Gitblit v1.9.3