From 23b57fc7eab3defc741a0e54e3dac939ad49f13f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 22 五月 2026 19:14:04 +0800
Subject: [PATCH] 新增智能电表、空调管理

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwElectricalLogCloudController.java |   49 ++++++++++++++++++++++---------------------------
 1 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwElectricalLogCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwElectricalLogCloudController.java
index 9d2d4df..bd486d7 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwElectricalLogCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwElectricalLogCloudController.java
@@ -1,32 +1,32 @@
 package com.doumee.cloud.admin;
 
-import com.doumee.api.BaseController;
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.annotation.pr.PreventRepeat;
+
+import com.doumee.core.utils.Constants;
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Constants;
 import com.doumee.dao.business.model.YwElectricalLog;
 import com.doumee.service.business.YwElectricalLogService;
+import com.doumee.core.utils.Utils;
+import com.doumee.config.annotation.CloudRequiredPermission;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.doumee.config.annotation.CloudRequiredPermission;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
+import com.doumee.core.model.LoginUserInfo;
 
+import  com.doumee.api.BaseController;
 /**
- * 鐢靛櫒绫绘搷浣滄棩蹇�
- * @author renkang
- * @date 2026/04/03
+ * 鐢靛櫒绫绘搷浣滄棩蹇桟ontroller瀹氫箟
+ * @author doumee
+ * @date 2026-05-20 15:21:44
  */
-@Api(tags = "鐢靛櫒绫绘搷浣滄棩蹇�")
+@Api(tags = "yw_electrical_log鎺ュ彛")
 @RestController
-@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX + "/business/ywElectricalLog")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX +"/business/ywElectricalLog")
 public class YwElectricalLogCloudController extends BaseController {
 
     @Autowired
@@ -37,7 +37,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("business:ywelectricallog:create")
     public ApiResponse create(@RequestBody YwElectricalLog ywElectricalLog, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-        ywElectricalLog.setLoginUserInfo(this.getLoginUser(token));
+          ywElectricalLog.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywElectricalLogService.create(ywElectricalLog));
     }
 
@@ -53,12 +53,7 @@
     @GetMapping("/delete/batch")
     @CloudRequiredPermission("business:ywelectricallog:delete")
     public ApiResponse deleteByIdInBatch(@RequestParam String ids, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-        String[] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        ywElectricalLogService.deleteByIdInBatch(idList, this.getLoginUser(token));
+        ywElectricalLogService.deleteByIdInBatch(this.getIdList(ids), this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -74,9 +69,17 @@
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @CloudRequiredPermission("business:ywelectricallog:query")
-    public ApiResponse<PageData<YwElectricalLog>> findPage(@RequestBody PageWrap<YwElectricalLog> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+    public ApiResponse<PageData<YwElectricalLog>> findPage (@RequestBody PageWrap<YwElectricalLog> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywElectricalLogService.findPage(pageWrap));
+    }
+
+    @ApiOperation("瀵煎嚭Excel")
+    @PostMapping("/exportExcel")
+    @CloudRequiredPermission("business:ywelectricallog:exportExcel")
+    public void exportExcel (@RequestBody PageWrap<YwElectricalLog> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+         pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
+        ExcelExporter.build(YwElectricalLog.class).export(ywElectricalLogService.findPage(pageWrap).getRecords(), "鐢靛櫒绫绘搷浣滄棩蹇�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
@@ -84,13 +87,5 @@
     @CloudRequiredPermission("business:ywelectricallog:query")
     public ApiResponse findById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success(ywElectricalLogService.findById(id));
-    }
-
-    @ApiOperation("瀵煎嚭Excel")
-    @PostMapping("/exportExcel")
-    @CloudRequiredPermission("business:ywelectricallog:exportExcel")
-    public void exportExcel(@RequestBody PageWrap<YwElectricalLog> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
-        ExcelExporter.build(YwElectricalLog.class).export(ywElectricalLogService.findPage(pageWrap).getRecords(), "鐢靛櫒绫绘搷浣滄棩蹇�", response);
     }
 }

--
Gitblit v1.9.3