From e46bfa3ff94a8a1b4daf37c7fcb79c2fab22a72c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 29 五月 2026 17:10:00 +0800
Subject: [PATCH] 新增智能电表、空调管理
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwElectricalDataCloudController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwElectricalDataCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwElectricalDataCloudController.java
index 5c06865..13df3ec 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwElectricalDataCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwElectricalDataCloudController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dto.YwElectricalDataSyncDTO;
import com.doumee.dao.business.model.Device;
import com.doumee.dao.business.model.YwElectricalData;
import com.doumee.service.business.YwElectricalDataService;
@@ -14,6 +15,7 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -80,7 +82,7 @@
@CloudRequiredPermission("business:ywelectricaldata:exportExcel")
public void exportExcel (@RequestBody PageWrap<YwElectricalData> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
- ExcelExporter.build(YwElectricalData.class).export(ywElectricalDataService.findPage(pageWrap).getRecords(), "鐢佃〃鎶勮〃鏁版嵁", response);
+ ExcelExporter.build(YwElectricalData.class).export(ywElectricalDataService.findPage(pageWrap).getRecords(), "鎶勮〃璁板綍", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -89,4 +91,16 @@
public ApiResponse findById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(ywElectricalDataService.findById(id));
}
+
+ @PreventRepeat
+ @ApiOperation("绔嬪嵆鎶勮〃锛堝悓姝ョ涓夋柟鎶勮〃鏁版嵁锛�")
+ @PostMapping("/syncAll")
+ @CloudRequiredPermission("business:ywelectricaldata:sync")
+ public ApiResponse<String> syncAll(@RequestBody(required = false) YwElectricalDataSyncDTO dto,
+ @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ if (dto == null || (StringUtils.isBlank(dto.getReadTimeBegin()) && StringUtils.isBlank(dto.getReadTimeEnd()))) {
+ return ApiResponse.success(ywElectricalDataService.syncFromPlatform());
+ }
+ return ApiResponse.success(ywElectricalDataService.syncFromPlatform(dto.getReadTimeBegin(), dto.getReadTimeEnd()));
+ }
}
--
Gitblit v1.9.3