From 92cd2a4474d33cee339f5da9d2ea51fd32b3f74a Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 10 三月 2026 16:01:21 +0800
Subject: [PATCH] 新增智能电表、空调管理

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

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceCloudController.java
index 43cf1d2..8cf21fe 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/DeviceCloudController.java
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
 /**
  * @author 姹熻箘韫�
  * @date 2023/11/30 15:33
@@ -36,25 +37,55 @@
     @PostMapping("/create")
     @CloudRequiredPermission("business:device:create")
     public ApiResponse create(@RequestBody Device device,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        device.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(deviceService.create(device));
     }
 
     @ApiOperation("鏍规嵁ID鍒犻櫎")
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:device:delete")
-    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
-        deviceService.deleteById(id);
+    public ApiResponse deleteById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        deviceService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
     @ApiOperation("淇敼鏄惁闂ㄧ鍏ュ彛")
     @PostMapping("/updateEntranceById")
-    @CloudRequiredPermission("business:company:update")
+    @CloudRequiredPermission("business:device:update")
     public ApiResponse updateStatusById(@RequestBody Device param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         Device d = new Device();
         d.setId(param.getId());
         d.setEditDate(new Date());
         d.setIsEntrance(Constants.formatIntegerNum(param.getIsEntrance()));
+        d.setLoginUserInfo(this.getLoginUser(token));
         deviceService.updateById(d);
+        return ApiResponse.success(null);
+    }
+    @ApiOperation("淇敼鏄惁绯荤粺浣跨敤")
+    @PostMapping("/updateUsedById")
+    @CloudRequiredPermission("business:device:update")
+    public ApiResponse updateUsedById(@RequestBody Device param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        Device d = new Device();
+        d.setId(param.getId());
+        d.setEditDate(new Date());
+        d.setLoginUserInfo(this.getLoginUser(token));
+        d.setIsUsed(Constants.formatIntegerNum(param.getIsUsed()));
+        deviceService.updateUsedById(d);
+        return ApiResponse.success(null);
+    }
+    @ApiOperation("鎵ц鐢佃〃寮�鍏抽椄鎿嶄綔")
+    @PostMapping("/dianbaoCmd")
+    @CloudRequiredPermission("business:device:update")
+    public ApiResponse dianbaoCmd(@RequestBody Device param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        param.setLoginUserInfo(this.getLoginUser(token));
+        deviceService.dianbaoCmd(param);
+        return ApiResponse.success(null);
+    }
+    @ApiOperation("璇诲彇鐢佃〃鏁版嵁锛堢數鑳姐�佹椂闂村拰鐘舵�侊級")
+    @PostMapping("/dianbiaoData")
+    @CloudRequiredPermission("business:device:update")
+    public ApiResponse dianbiaoData(@RequestBody Device param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        param.setLoginUserInfo(this.getLoginUser(token));
+        deviceService.dianbiaoData(param);
         return ApiResponse.success(null);
     }
 
@@ -67,7 +98,7 @@
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        deviceService.deleteByIdInBatch(idList);
+        deviceService.deleteByIdInBatch(idList,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -75,6 +106,8 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:device:update")
     public ApiResponse updateById(@RequestBody Device device,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+
+        device.setLoginUserInfo(this.getLoginUser(token));
         deviceService.updateById(device);
         return ApiResponse.success(null);
     }
@@ -82,9 +115,15 @@
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @CloudRequiredPermission("business:device:query")
-    public ApiResponse<PageData<Device>> findPage (@RequestBody PageWrap<Device> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+    public ApiResponse<PageData<Device>> findPage (@RequestBody PageWrap<Device> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(deviceService.findPage(pageWrap));
     }
+    @ApiOperation("鏌ヨ鍏ㄩ儴")
+    @PostMapping("/list")
+    @CloudRequiredPermission("business:device:query")
+    public ApiResponse<List<Device>> findPage (@RequestBody   Device model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        return ApiResponse.success(deviceService.findList(model));
+    }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")

--
Gitblit v1.9.3