From 5e972eb9928c39b5abbdfd35e2a0aeff40876e7d Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 07 May 2024 17:23:16 +0800
Subject: [PATCH] 修改不成功问题

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DangerReportController.java |   75 ++++++++++++++++++++++++++++++++-----
 1 files changed, 64 insertions(+), 11 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 80fcf89..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
@@ -3,22 +3,23 @@
 import cn.gistack.sm.jcsb.entity.DangerReport;
 import cn.gistack.sm.jcsb.entity.DeviceReport;
 import cn.gistack.sm.jcsb.service.IDangerReportService;
+import cn.gistack.sm.jcsb.vo.DangerReportVO;
 import cn.gistack.sm.jcsb.vo.DeviceReportVO;
 import cn.gistack.system.user.entity.User;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -37,19 +38,71 @@
 
 	@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")
+	@ApiOperation(value = "列表", notes = "传入实体类参数")
+	public R getAll(DangerReport dangerReport) {
+		List<DangerReportVO> list = dangerReportService.getAll(dangerReport);
+		return R.data(list);
 	}
 
 	/**
 	 * 详情
 	 */
 	@GetMapping("/detail")
-	@ApiOperation(value = "详情", notes = "传入notice")
-	public R<DangerReport> detail(@RequestParam(name="id",required=true) String id) {
-		return R.data(dangerReportService.getById(id));
+	@ApiOperation(value = "详情", notes = "传入实体类参数")
+	public R<DangerReportVO> detail(@RequestParam(name="id",required=true) String id) {
+		return R.data(dangerReportService.getVODetail(id));
+	}
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入实体类参数")
+	public R save(@RequestBody DangerReport dangerReport) {
+		return R.data(dangerReportService.saveUp(dangerReport));
+	}
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入实体类参数")
+	public R update(@RequestBody DangerReport dangerReport) {
+		return R.data(dangerReportService.updateById(dangerReport));
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperation(value = "新增或修改", notes = "传入实体类参数")
+	public R submit(@RequestBody DangerReport dangerReport) {
+		return R.data(dangerReportService.saveOrUpdate(dangerReport));
+	}
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入实体类参数")
+	public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+		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