From 23f360358e078f65655e31b652b9f999c6cbe01b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 15 Aug 2023 10:38:22 +0800
Subject: [PATCH] 险情上报中文转码保存

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 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 69f1f59..27ad0fe 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
@@ -55,8 +55,8 @@
 	 */
 	@GetMapping("/detail")
 	@ApiOperation(value = "详情", notes = "传入实体类参数")
-	public R<DangerReport> detail(@RequestParam(name="id",required=true) String id) {
-		return R.data(dangerReportService.getById(id));
+	public R<DangerReportVO> detail(@RequestParam(name="id",required=true) String id) {
+		return R.data(dangerReportService.getVODetail(id));
 	}
 
 	/**
@@ -65,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));
 	}
 
 	/**
@@ -95,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