From 7f3210b7ed6730cae9d457b49d650416e4783616 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Sun, 27 Apr 2025 15:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E6=9C=BA=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/controller/DeviceController.java | 8 ++++++ .../canteen/core/android/dto/AppDTO.java | 1 + .../core/android/mapper/DeviceMapper.java | 3 +++ .../core/android/service/DeviceService.java | 2 ++ .../service/impl/DeviceServiceImpl.java | 10 ++++++++ .../canteen/core/android/vo/AppVersionVo.java | 25 +++++++++++++++++++ .../resources/mapper/android/DeviceMapper.xml | 13 ++++++++++ 7 files changed, 62 insertions(+) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/AppVersionVo.java 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 f79646e..410b96a 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 @@ -30,4 +30,12 @@ public class DeviceController { } return deviceService.getDeviceInfo(dto); } + @ApiOperation("获取设备版本信息") + @RequestMapping("/getAppVersion") + public AjaxResult getAppVersion(@RequestBody AppDTO dto) { + if (ObjectUtil.isEmpty(dto.getId())) { + throw new ServiceException("Version不能为空"); + } + return deviceService.getAppVersion(dto); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/dto/AppDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/dto/AppDTO.java index 76bc128..4b58922 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/dto/AppDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/dto/AppDTO.java @@ -15,4 +15,5 @@ public class AppDTO { private String type; private String userId; + private String id; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/DeviceMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/DeviceMapper.java index 21aeac1..b32231b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/DeviceMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/DeviceMapper.java @@ -1,6 +1,7 @@ package com.bonus.canteen.core.android.mapper; import com.bonus.canteen.core.android.dto.AppDTO; +import com.bonus.canteen.core.android.vo.AppVersionVo; import com.bonus.canteen.core.android.vo.DeviceInfoVo; import com.bonus.canteen.core.device.dto.DeviceDTO; import com.bonus.canteen.core.device.dto.DeviceSearchDTO; @@ -23,4 +24,6 @@ public interface DeviceMapper { * @return 设备绑定多档口子 */ DeviceInfoVo getDeviceInfo(AppDTO dto); + + AppVersionVo getAppVersion(AppDTO dto); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/DeviceService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/DeviceService.java index d2aab93..514142c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/DeviceService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/DeviceService.java @@ -5,4 +5,6 @@ import com.bonus.common.core.web.domain.AjaxResult; public interface DeviceService { AjaxResult getDeviceInfo(AppDTO dto); + + AjaxResult getAppVersion(AppDTO dto); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java index 0517625..ecdcb0f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.canteen.core.android.service.impl; import com.bonus.canteen.core.android.dto.AppDTO; import com.bonus.canteen.core.android.mapper.DeviceMapper; import com.bonus.canteen.core.android.service.DeviceService; +import com.bonus.canteen.core.android.vo.AppVersionVo; import com.bonus.canteen.core.android.vo.DeviceInfoVo; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.houqin.constant.GlobalConstants; @@ -33,4 +34,13 @@ public class DeviceServiceImpl implements DeviceService { deviceInfoVo.setTenantId(String.valueOf(GlobalConstants.TENANT_ID)); return AjaxResult.success(deviceInfoVo); } + + @Override + public AjaxResult getAppVersion(AppDTO dto) { + AppVersionVo appVersionVo = mapper.getAppVersion(dto); + if (appVersionVo == null){ + return AjaxResult.success("无需更新"); + } + return AjaxResult.success(appVersionVo); + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/AppVersionVo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/AppVersionVo.java new file mode 100644 index 0000000..3de0b3e --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/AppVersionVo.java @@ -0,0 +1,25 @@ +package com.bonus.canteen.core.android.vo; + +import lombok.Data; + +@Data +public class AppVersionVo { + + private String id; + + private String version; + + private String versionName; + + private String apkName; + + private String apkPath; + + private String updateContent; + + private String deployTime; + + private String deployUser; + + +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/DeviceMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/DeviceMapper.xml index ed95f0b..017987d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/DeviceMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/DeviceMapper.xml @@ -28,4 +28,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where di.device_sn = #{deviceSn} GROUP BY di.device_id + \ No newline at end of file