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 7bf0e5a..4da0dd9 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 @@ -93,4 +93,19 @@ public interface DeviceMapper { * @return 时间间隔配置 */ List getBasicsTimeIntervals(@Param("stallId")Long stallId); + /** + * 根据sn获取设备类型 + * + * @param deviceSn 设备SN + * @return 设备类型 + */ + String getDeviceTypeBySn(String deviceSn); + + /** + * 获取超市设备信息 + * + * @param dto 请求参数 + * @return 超市设备信息 + */ + DeviceInfoVo getSupermarketDeviceInfo(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 c684a3e..6871888 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 @@ -38,8 +38,17 @@ public class DeviceServiceImpl implements DeviceService { @Override public AjaxResult getDeviceInfo(AppDTO dto) { - //判断设备是否存在 - DeviceInfoVo deviceInfoVo = mapper.getDeviceInfo(dto); + String deviceType = mapper.getDeviceTypeBySn(dto.getDeviceSn()); + if (ObjectUtil.isEmpty(deviceType)) { + return AjaxResult.error("设备类型不存在"); + } + DeviceInfoVo deviceInfoVo = new DeviceInfoVo(); + if ("20".equals(deviceType)) { + deviceInfoVo = mapper.getDeviceInfo(dto); + } + if ("53".equals(deviceType)){ + deviceInfoVo = mapper.getSupermarketDeviceInfo(dto); + } if (deviceInfoVo == null) { return AjaxResult.error("设备不存在"); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/DeviceInfoVo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/DeviceInfoVo.java index f3b82ef..bac3a7f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/DeviceInfoVo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/DeviceInfoVo.java @@ -23,6 +23,7 @@ public class DeviceInfoVo { private String recipeId; private String deviceNum; private String deviceName; + private String deviceType; private String devicePwd; private String recipeName; } 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 0fdfcec..02b7de2 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 @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + +