From f73dbcd6c21d28ab1e98840eee73c6d09bd0f929 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 27 Aug 2024 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/controller/WaterDataTermitesController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/controller/WaterDataTermitesController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/controller/WaterDataTermitesController.java
index 5cb3cc6..46e88b9 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/controller/WaterDataTermitesController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztods/controller/WaterDataTermitesController.java
@@ -33,15 +33,17 @@
@PostMapping(value = "/updateStatus")
public R updateStatus(@RequestBody WaterDataTermitesVO waterDataTermites) {
if (StringUtil.isAllBlank(waterDataTermites.getStartTime(),
- waterDataTermites.getEndTime()) ||
- null == waterDataTermites.getStatus() ||
- null == waterDataTermites.getDeviceId()) {
+ waterDataTermites.getEndTime(),
+ waterDataTermites.getOrder()) ||
+ null == waterDataTermites.getStatus()) {
return R.fail("非法参数");
}
- return R.status(waterDataTermitesService.updateWaterDataTermites(waterDataTermites.getStartTime(),
+
+ boolean ret = waterDataTermitesService.updateWaterDataTermites(waterDataTermites.getStartTime(),
waterDataTermites.getEndTime(),
- waterDataTermites.getStatus().toString(),
- waterDataTermites.getDeviceId().toString()));
+ waterDataTermites.getStatus(),
+ waterDataTermites.getOrder());
+ return R.status(ret);
}
}
--
Gitblit v1.9.3