From 364d3221b9a8e6dd3a19701d30c4dc4239ef8abf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 07 二月 2025 11:48:49 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwDeviceCloudController.java |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwDeviceCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwDeviceCloudController.java
index a181393..db601da 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwDeviceCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwDeviceCloudController.java
@@ -8,6 +8,9 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.dao.business.model.YwDevice;
+import com.doumee.dao.business.vo.YwDeviceCateDataVO;
+import com.doumee.dao.business.vo.YwDeviceParentCateDataVO;
+import com.doumee.dao.business.vo.YwDeviceStatusDataVO;
 import com.doumee.service.business.YwDeviceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,6 +21,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author 姹熻箘韫�
@@ -36,6 +40,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("business:ywdevice:create")
     public ApiResponse create(@RequestBody YwDevice ywDevice,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywDevice.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywDeviceService.create(ywDevice));
     }
 
@@ -43,7 +48,7 @@
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:ywdevice:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-        ywDeviceService.deleteById(id);
+        ywDeviceService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -56,7 +61,7 @@
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        ywDeviceService.deleteByIdInBatch(idList);
+        ywDeviceService.deleteByIdInBatch(idList,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -64,6 +69,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:ywdevice:update")
     public ApiResponse updateById(@RequestBody YwDevice ywDevice,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywDevice.setLoginUserInfo(this.getLoginUser(token));
         ywDeviceService.updateById(ywDevice);
         return ApiResponse.success(null);
     }
@@ -72,6 +78,7 @@
     @PostMapping("/page")
     @CloudRequiredPermission("business:ywdevice:query")
     public ApiResponse<PageData<YwDevice>> findPage (@RequestBody PageWrap<YwDevice> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywDeviceService.findPage(pageWrap));
     }
 
@@ -79,6 +86,7 @@
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:ywdevice:exportExcel")
     public void exportExcel (@RequestBody PageWrap<YwDevice> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         ExcelExporter.build(YwDevice.class).export(ywDeviceService.findPage(pageWrap).getRecords(), "杩愮淮璁惧淇℃伅琛�", response);
     }
 
@@ -86,6 +94,27 @@
     @GetMapping("/{id}")
     @CloudRequiredPermission("business:ywdevice:query")
     public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-        return ApiResponse.success(ywDeviceService.findById(id));
+        return ApiResponse.success(ywDeviceService.getDetail(id));
+    }
+
+    @ApiOperation("鏍规嵁缂栫爜鏌ヨ璁惧")
+    @GetMapping("/findByCode")
+    @CloudRequiredPermission("business:ywdevice:query")
+    public ApiResponse findByCode(@RequestParam String deviceCode,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        return ApiResponse.success(ywDeviceService.findByCode(deviceCode));
+    }
+
+    @ApiOperation("璁惧鏁伴噺鍒嗙被缁熻")
+    @PostMapping("/getDeviceCateData")
+    @CloudRequiredPermission("business:ywdevice:query")
+    public ApiResponse<Set<YwDeviceParentCateDataVO>> getDeviceCateData (@RequestBody YwDevice ywDevice, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        return ApiResponse.success(ywDeviceService.getDeviceCateData(ywDevice));
+    }
+
+    @ApiOperation("璁惧鐘舵�佺粺璁�")
+    @PostMapping("/getDeviceStatus")
+    @CloudRequiredPermission("business:ywdevice:query")
+    public ApiResponse<YwDeviceStatusDataVO> getDeviceStatus (@RequestBody YwDevice ywDevice,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        return ApiResponse.success(ywDeviceService.getDeviceStatus(ywDevice));
     }
 }

--
Gitblit v1.9.3