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/reportFlood/controller/ReportFloodRecordController.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
index 80ec17f..843b5e6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
@@ -4,6 +4,7 @@
import cn.gistack.sm.reportFlood.entity.ReportFloodRecord;
import cn.gistack.sm.reportFlood.service.IReportFloodRecordService;
import cn.gistack.sm.reportFlood.vo.ReportFloodRecordVO;
+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;
@@ -33,6 +34,15 @@
private IReportFloodRecordService reportFloodRecordService;
private IFlowClient flowClient;
+
+ @GetMapping(value = "/isExistByTime")
+ public R isExistByTime(String reservoirId,String time) {
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("reservoir_id" ,reservoirId);
+ queryWrapper.eq("report_time" ,time);
+ return R.data(reportFloodRecordService.count(queryWrapper) > 0);
+ }
+
/**
* 分页列表查询
*/
@@ -40,14 +50,14 @@
@GetMapping(value = "/list")
public R<IPage<ReportFloodRecordVO>> queryPageList(ReportFloodRecordVO reportFloodRecord, Query query) {
- String code = reportFloodRecord.getAdCode();
- if (StringUtil.isNoneBlank(code)){
- if (code.substring(0,4).indexOf("00") > -1) {
- reportFloodRecord.setAdCode(code.substring(0,2));
- } else if (code.substring(0,6).indexOf("00") > -1) {
- reportFloodRecord.setAdCode(code.substring(0,4));
- }
- }
+// String code = reportFloodRecord.getAdCode();
+// if (StringUtil.isNoneBlank(code)){
+// if (code.substring(0,4).indexOf("00") > -1) {
+// reportFloodRecord.setAdCode(code.substring(0,2));
+// } else if (code.substring(0,6).indexOf("00") > -1) {
+// reportFloodRecord.setAdCode(code.substring(0,4));
+// }
+// }
IPage<ReportFloodRecordVO> pageList = reportFloodRecordService.selectReportFloodRecordPages(Condition.getPage(query), reportFloodRecord);
return R.data(pageList);
}
--
Gitblit v1.9.3