From 5a4e4f0ac1e40f45ce4e78b1ae57637c84a64fc7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:34:46 +0800
Subject: [PATCH] 添加统计日志

---
 server/src/main/java/doumeemes/api/ext/DeviceExtController.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
index 39931c4..1338c29 100644
--- a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java
@@ -3,6 +3,7 @@
 import doumeemes.api.BaseController;
 import doumeemes.core.annotation.excel.ExcelExporter;
 import doumeemes.core.annotation.pr.PreventRepeat;
+import doumeemes.core.annotation.trace.Trace;
 import doumeemes.core.model.ApiResponse;
 import doumeemes.core.model.PageWrap;
 import doumeemes.core.model.PageData;
@@ -40,6 +41,7 @@
 @RestController
 @RequestMapping("/ext/deviceExt")
 @Api(tags = "鐢熶骇璁惧淇℃伅鎺ュ彛")
+@Trace(withRequestResult = false,withRequestParameters = false)
 public class DeviceExtController extends BaseController {
 
     @Autowired
@@ -128,11 +130,11 @@
 
         }
 
-        QueryDeviceExtDTO queryDeviceExtDTO=new QueryDeviceExtDTO();
+        Device queryDeviceExtDTO=new Device();
         queryDeviceExtDTO.setDeleted(Constants.ZERO);
         queryDeviceExtDTO.setCode(device.getCode());
         queryDeviceExtDTO.setRootDepartId(getLoginUser().getRootDepartment().getId());
-        List<DeviceExtListVO> list= deviceExtService.getListByCondition(queryDeviceExtDTO);
+        List<Device> list= deviceService.findList(queryDeviceExtDTO);
         if(list.size()>0){
             if(!Constants.equalsInteger(list.get(0).getId(),device.getId())){
                 return ApiResponse.failed("璁惧缂栫爜锛屼笉鍏佽娣诲姞");
@@ -166,6 +168,10 @@
         deviceService.updateById(find);
         if(StringUtils.isNotBlank(device.getUserIds())){
             deviceService.dealDeviceUserId(Constants.ONE,device.getUserIds(),device.getId(),getLoginUser());
+        }else {
+            UserDevice userDevice = new UserDevice();
+            userDevice.setDeviceId(device.getId());
+            userDeviceService.delete(userDevice);
         }
 
         return ApiResponse.success(null);

--
Gitblit v1.9.3