From dd5053d395583591a198a91be62f04b660afc184 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Wed, 4 Jun 2025 17:40:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E5=B1=8F=E6=9C=BA=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BD=99=E9=A2=9D=E7=AD=89=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=81=E6=9B=B4=E6=96=B0=E8=AE=BE=E5=A4=87=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BD=8D=E7=BD=AE=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/android/controller/DeviceController.java | 15 ++++++++++++++-
 .../device/controller/DeviceInfoController.java   | 12 ++----------
 .../main/resources/mapper/android/UserMapper.xml  |  4 ++--
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/DeviceController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/DeviceController.java
index 3d5d389..41956a8 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/DeviceController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/DeviceController.java
@@ -5,6 +5,8 @@ import com.bonus.canteen.core.android.dto.AppDTO;
 import com.bonus.canteen.core.android.service.DeviceService;
 import com.bonus.canteen.core.android.vo.CookRecipeCompressVO;
 import com.bonus.canteen.core.android.vo.DeviceTimeIntervalVO;
+import com.bonus.canteen.core.device.domain.DeviceSearchDTO;
+import com.bonus.canteen.core.device.service.IDeviceInfoService;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
@@ -26,7 +28,8 @@ import java.util.Map;
 public class DeviceController extends BaseController {
     @Resource
     private DeviceService deviceService;
-
+    @Resource
+    private IDeviceInfoService deviceInfoService;
 
 
     @ApiOperation("获取设备信息")
@@ -69,4 +72,14 @@ public class DeviceController extends BaseController {
         return this.deviceService.intervalConfig(HeaderFetchUtil.getMachineSn(headers));
     }
 
+    @ApiOperation(value = "更新设备在线状态")
+    @PostMapping({"/updateTimeBySn"})
+    public AjaxResult updateTimeBySn(@RequestBody DeviceSearchDTO dto) {
+        if (ObjectUtil.isEmpty(dto.getDeviceSn())) {
+            throw new ServiceException("设备sn不能为空");
+        }
+        this.deviceInfoService.updateTimeBySn(dto.getDeviceSn());
+        return AjaxResult.success();
+    }
+
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/controller/DeviceInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/controller/DeviceInfoController.java
index 5b9366d..fd0f762 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/controller/DeviceInfoController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/device/controller/DeviceInfoController.java
@@ -1,6 +1,7 @@
 package com.bonus.canteen.core.device.controller;
 
 import java.util.List;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.util.ObjectUtil;
@@ -34,7 +35,7 @@ import com.bonus.common.core.web.page.TableDataInfo;
 @RestController
 @RequestMapping("/device_info")
 public class DeviceInfoController extends BaseController {
-    @Autowired
+    @Resource
     private IDeviceInfoService deviceInfoService;
 
     /**
@@ -107,14 +108,5 @@ public class DeviceInfoController extends BaseController {
         return toAjax(deviceInfoService.deleteDeviceInfoByDeviceIds(deviceIds));
     }
 
-    @ApiOperation(value = "更新设备在线状态")
-    @PostMapping({"/updateTimeBySn"})
-    public AjaxResult updateTimeBySn(@RequestBody DeviceSearchDTO dto) {
-        if (ObjectUtil.isEmpty(dto.getDeviceSn())) {
-            throw new ServiceException("设备sn不能为空");
-        }
-        this.deviceInfoService.updateTimeBySn(dto.getDeviceSn());
-        return AjaxResult.success();
-    }
 
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
index 7c24576..611efc3 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
@@ -39,8 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             r.user_id as userId
         from( select
                   user_id,
-                  IF(wallet_id = 1,wallet_bal,0) as personalWalletBalance,
-                  IF(wallet_id = 2,wallet_bal,0) as subsidiesBalance,
+                  IF(wallet_type = 1,wallet_bal,0) as personalWalletBalance,
+                  IF(wallet_type = 2,wallet_bal,0) as subsidiesBalance,
                   wallet_bal
               from account_wallet_info)r
         GROUP BY r.user_id