From 90decda9851e9d8814c674fe95dcbedcd7c3ec31 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Thu, 29 May 2025 15:19:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E5=A0=82-=E5=8F=8C=E5=B1=8F=E6=9C=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/controller/DeviceController.java | 52 +++++++++ .../android/controller/FaceController.java | 33 ++++++ .../android/controller/UserController.java | 34 ++++++ .../canteen/core/android/dto/AppDTO.java | 22 ++++ .../core/android/mapper/DeviceMapper.java | 43 ++++++++ .../core/android/mapper/FaceMapper.java | 19 ++++ .../core/android/mapper/UserMapper.java | 25 +++++ .../core/android/service/DeviceService.java | 33 ++++++ .../core/android/service/FaceService.java | 17 +++ .../core/android/service/UserService.java | 17 +++ .../service/impl/DeviceServiceImpl.java | 103 ++++++++++++++++++ .../android/service/impl/FaceServiceImpl.java | 26 +++++ .../android/service/impl/UserServiceImpl.java | 49 +++++++++ .../canteen/core/android/vo/AppVersionVo.java | 28 +++++ .../canteen/core/android/vo/DeviceInfoVo.java | 27 +++++ .../core/android/vo/ParamSettingVO.java | 40 +++++++ .../canteen/core/android/vo/ParamVO.java | 12 ++ .../canteen/core/android/vo/UserInfoVo.java | 52 +++++++++ .../resources/mapper/android/DeviceMapper.xml | 63 +++++++++++ .../resources/mapper/android/FaceMapper.xml | 19 ++++ .../resources/mapper/android/UserMapper.xml | 48 ++++++++ 21 files changed, 762 insertions(+) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/DeviceController.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/FaceController.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/UserController.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/dto/AppDTO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/DeviceMapper.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/FaceMapper.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/UserMapper.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/DeviceService.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/FaceService.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/UserService.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/FaceServiceImpl.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/UserServiceImpl.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/AppVersionVo.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/DeviceInfoVo.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/ParamSettingVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/ParamVO.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/UserInfoVo.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/DeviceMapper.xml create mode 100644 bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/FaceMapper.xml create mode 100644 bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml 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 new file mode 100644 index 0000000..e2232a1 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/DeviceController.java @@ -0,0 +1,52 @@ +package com.bonus.canteen.core.android.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.bonus.canteen.core.android.dto.AppDTO; +import com.bonus.canteen.core.android.service.DeviceService; +import com.bonus.common.core.exception.ServiceException; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * @author 19814 + */ +@Api(tags = "android-双屏消费机-设备信息") +@RestController +@RequestMapping("/api/android/device") +public class DeviceController extends BaseController { + @Autowired + private DeviceService deviceService; + + + + @ApiOperation("获取设备信息") + @RequestMapping("/getDeviceInfo") + public AjaxResult getDeviceInfo(@RequestBody AppDTO dto) { + if (ObjectUtil.isEmpty(dto.getDeviceSn())) { + throw new ServiceException("设备sn不能为空"); + } + 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); + } + + @ApiOperation(value = "获取参数") + @PostMapping(value = "/getParamInfo") + public AjaxResult getInfo() { + return success(deviceService.getParamInfo()); + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/FaceController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/FaceController.java new file mode 100644 index 0000000..04a2d64 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/FaceController.java @@ -0,0 +1,33 @@ +package com.bonus.canteen.core.android.controller; + +import com.bonus.canteen.core.android.dto.AppDTO; +import com.bonus.canteen.core.android.service.FaceService; +import com.bonus.common.core.exception.ServiceException; +import com.bonus.common.core.web.domain.AjaxResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author 19814 + */ +@Api(tags = "android-双屏消费机-人脸特征值") +@RestController +@RequestMapping("/api/android/face") +public class FaceController { + @Autowired + private FaceService faceService; + + @ApiOperation("获取人脸特征值") + @RequestMapping("/getFaceFeatureList") + public AjaxResult getFaceFeatureList(@RequestBody AppDTO dto) { + try { + return faceService.getFaceFeatureList(dto); + }catch (ServiceException e){ + return AjaxResult.error("获取人脸特征值失败！"); + } + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/UserController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/UserController.java new file mode 100644 index 0000000..c3f74da --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/controller/UserController.java @@ -0,0 +1,34 @@ +package com.bonus.canteen.core.android.controller; + +import com.bonus.canteen.core.android.dto.AppDTO; +import com.bonus.canteen.core.android.service.UserService; +import com.bonus.common.core.exception.ServiceException; +import com.bonus.common.core.web.domain.AjaxResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author 19814 + */ +@Api(tags = "android-双屏消费机-用户信息") +@RestController +@RequestMapping("/api/android/user") +public class UserController { + @Autowired + private UserService userService; + + @ApiOperation("获取人员信息") + @RequestMapping("/getUserInfo") + public AjaxResult getUserInfo(@RequestBody AppDTO dto) { + try { + return userService.getUserInfo(dto); + }catch (ServiceException e){ + return AjaxResult.error("获取人员信息失败！"); + } + } + +} 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 new file mode 100644 index 0000000..617e689 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/dto/AppDTO.java @@ -0,0 +1,22 @@ +package com.bonus.canteen.core.android.dto; + +import lombok.Data; + +/** + * @author 19814 + */ +@Data +public class AppDTO { + + /** + * 设备sn码 + */ + private String deviceSn; + + private String time; + + 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 new file mode 100644 index 0000000..de2beda --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/DeviceMapper.java @@ -0,0 +1,43 @@ +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.android.vo.ParamSettingVO; +import com.bonus.canteen.core.android.vo.ParamVO; +import org.apache.ibatis.annotations.MapKey; + +import java.util.List; +import java.util.Map; + +/** + * 设备绑定多档口子Mapper接口 + * + * @author xsheng + * @date 2025-04-03 + */ +public interface DeviceMapper { + /** + * 查询设备信息 + * + * @param dto + * @return 设备绑定多档口子 + */ + DeviceInfoVo getDeviceInfo(AppDTO dto); + + /** + * 查询设备版本信息 + * + * @param dto 入参 + * @return 设备绑定多档口子 + */ + AppVersionVo getAppVersion(AppDTO dto); + + + /** + * 查询参数 + * + * @return 参数 + */ + List getParamInfo(); +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/FaceMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/FaceMapper.java new file mode 100644 index 0000000..e460220 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/FaceMapper.java @@ -0,0 +1,19 @@ +package com.bonus.canteen.core.android.mapper; + +import com.bonus.canteen.core.android.dto.AppDTO; +import com.bonus.canteen.core.user.domain.UserFace; + +import java.util.List; + +/** + * @author 19814 + */ +public interface FaceMapper { + /** + * 获取人脸特征值 + * + * @param dto 请求参数 + * @return 人脸特征值集合 + */ + List getFaceFeatureList(AppDTO dto); +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/UserMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/UserMapper.java new file mode 100644 index 0000000..6d55710 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/mapper/UserMapper.java @@ -0,0 +1,25 @@ +package com.bonus.canteen.core.android.mapper; + +import com.bonus.canteen.core.android.dto.AppDTO; +import com.bonus.canteen.core.android.vo.UserInfoVo; + +import java.util.List; + +/** + * @author 19814 + */ +public interface UserMapper { + /** + * 获取人员信息 + * + * @param dto + * @return + */ + List getUserInfo(AppDTO dto); + /** + * 获取人员钱包余额 + * + * @return + */ + List getMoneyList(); +} 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 new file mode 100644 index 0000000..394fd82 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/DeviceService.java @@ -0,0 +1,33 @@ +package com.bonus.canteen.core.android.service; + +import com.bonus.canteen.core.android.dto.AppDTO; +import com.bonus.canteen.core.android.vo.ParamSettingVO; +import com.bonus.common.core.web.domain.AjaxResult; + +/** + * @author 19814 + */ +public interface DeviceService { + /** + * 获取设备信息 + * + * @param dto 请求参数 + * @return 设备信息 + */ + AjaxResult getDeviceInfo(AppDTO dto); + + /** + * 获取设备版本信息 + * + * @param dto 请求参数 + * @return 设备版本信息 + */ + AjaxResult getAppVersion(AppDTO dto); + + /** + * 获取参数信息 + * + * @return 参数信息 + */ + ParamSettingVO getParamInfo(); +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/FaceService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/FaceService.java new file mode 100644 index 0000000..28c3f64 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/FaceService.java @@ -0,0 +1,17 @@ +package com.bonus.canteen.core.android.service; + +import com.bonus.canteen.core.android.dto.AppDTO; +import com.bonus.common.core.web.domain.AjaxResult; + +/** + * @author 19814 + */ +public interface FaceService { + /** + * 获取人脸特征值 + * + * @param dto 请求参数 + * @return AjaxResult + */ + AjaxResult getFaceFeatureList(AppDTO dto); +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/UserService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/UserService.java new file mode 100644 index 0000000..245f7ef --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/UserService.java @@ -0,0 +1,17 @@ +package com.bonus.canteen.core.android.service; + +import com.bonus.canteen.core.android.dto.AppDTO; +import com.bonus.common.core.web.domain.AjaxResult; + +/** + * @author 19814 + */ +public interface UserService { + /** + * 获取人员信息 + * + * @param dto + * @return + */ + AjaxResult getUserInfo(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 new file mode 100644 index 0000000..87e87f8 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java @@ -0,0 +1,103 @@ +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.canteen.core.android.vo.ParamSettingVO; +import com.bonus.canteen.core.android.vo.ParamVO; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.houqin.constant.GlobalConstants; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +/** + * @author 19814 + */ +@Service +public class DeviceServiceImpl implements DeviceService { + @Autowired + private DeviceMapper mapper; + + + @Value("${face.android.appId}") + private String appId; + @Value("${face.android.sdkKey}") + private String appKey; + + @Override + public AjaxResult getDeviceInfo(AppDTO dto) { + //判断设备是否存在 + DeviceInfoVo deviceInfoVo = mapper.getDeviceInfo(dto); + if (deviceInfoVo == null) { + return AjaxResult.error("设备不存在"); + } + deviceInfoVo.setAppId(appId); + deviceInfoVo.setAppKey(appKey); + 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); + } + + @Override + public ParamSettingVO getParamInfo() { + List list = mapper.getParamInfo(); + ParamSettingVO paramSettingVO = new ParamSettingVO(); + if (list != null && !list.isEmpty()) { + for (ParamVO vo : list) { + String key = vo.getParamKey(); + String value = vo.getParamValue(); + if (key == null) { + continue; + } + switch (vo.getParamKey()) { + case "site_url": + paramSettingVO.setIpAddress(value); + break; + case "face_pass_rate": + paramSettingVO.setFacePassRate(value); + break; + case "mqtt_address": + paramSettingVO.setMqttAddress(value); + break; + case "mqtt_user_name": + paramSettingVO.setMqttUserName(value); + break; + case "mqtt_pass_word": + paramSettingVO.setMqttPassword(value); + break; + case "app_id": + paramSettingVO.setAppId(value); + break; + case "app_key": + paramSettingVO.setAppKey(value); + break; + case "face_prefix": + paramSettingVO.setPhotoPrefixes(value); + break; + case "version": + paramSettingVO.setVersion(value); + break; + default: + break; + } + } + } + return paramSettingVO; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/FaceServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/FaceServiceImpl.java new file mode 100644 index 0000000..369b0f9 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/FaceServiceImpl.java @@ -0,0 +1,26 @@ +package com.bonus.canteen.core.android.service.impl; + +import com.bonus.canteen.core.android.dto.AppDTO; +import com.bonus.canteen.core.android.mapper.FaceMapper; +import com.bonus.canteen.core.android.service.FaceService; +import com.bonus.canteen.core.user.domain.UserFace; +import com.bonus.common.core.web.domain.AjaxResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + * @author 19814 + */ +@Service +public class FaceServiceImpl implements FaceService { + @Autowired + private FaceMapper mapper; + @Override + public AjaxResult getFaceFeatureList(AppDTO dto) { + List list = mapper.getFaceFeatureList(dto); + return AjaxResult.success(list); + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/UserServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..72ccc16 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/UserServiceImpl.java @@ -0,0 +1,49 @@ +package com.bonus.canteen.core.android.service.impl; + +import com.bonus.canteen.core.android.dto.AppDTO; +import com.bonus.canteen.core.android.mapper.UserMapper; +import com.bonus.canteen.core.android.service.UserService; +import com.bonus.canteen.core.android.vo.UserInfoVo; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.houqin.utils.SM4EncryptUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author 19814 + */ +@Service +public class UserServiceImpl implements UserService { + @Autowired + private UserMapper mapper; + + private static final int PHONE_LENGTH = 11; + + @Override + public AjaxResult getUserInfo(AppDTO dto) { + List list = mapper.getUserInfo(dto); + if (list.isEmpty()) { + return AjaxResult.success(new ArrayList<>()); + } + List moneyList = mapper.getMoneyList(); + // 构建 userId 到 moneyVo 的映射，提升查找效率 + Map moneyMap = moneyList.stream().collect(Collectors.toMap(UserInfoVo::getUserId, vo -> vo, (a, b) -> a)); + list.forEach(userInfoVo -> { + if (userInfoVo.getPhone().length() > PHONE_LENGTH) { + userInfoVo.setPhone(SM4EncryptUtils.sm4Decrypt(userInfoVo.getPhone())); + } + UserInfoVo money = moneyMap.get(userInfoVo.getUserId()); + if (money != null) { + userInfoVo.setPersonalWalletBalance(money.getPersonalWalletBalance()); + userInfoVo.setSubsidiesBalance(money.getSubsidiesBalance()); + } + }); + return AjaxResult.success(list); + } + +} 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..26f0ad3 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/AppVersionVo.java @@ -0,0 +1,28 @@ +package com.bonus.canteen.core.android.vo; + +import lombok.Data; + +/** + * @author 19814 + */ +@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/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 new file mode 100644 index 0000000..bb0e47c --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/DeviceInfoVo.java @@ -0,0 +1,27 @@ +package com.bonus.canteen.core.android.vo; + +import lombok.Data; + +/** + * @author 19814 + */ +@Data +public class DeviceInfoVo { + + private String tenantId; + + private String appId; + + private String appKey; + + private String areaId; + private String areaName; + private String canteenId; + private String stallId; + private String canteenName; + private String stallName; + private String recipeId; + private String deviceNum; + private String deviceName; + private String devicePwd; +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/ParamSettingVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/ParamSettingVO.java new file mode 100644 index 0000000..48dac53 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/ParamSettingVO.java @@ -0,0 +1,40 @@ +package com.bonus.canteen.core.android.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.NotBlank; + +/** + * @author 19814 + */ +@Data +public class ParamSettingVO { + @ApiModelProperty("参数id") + private Integer id; + @ApiModelProperty("IP地址") + @NotBlank(message = "IP地址不能为空") + private String ipAddress; + @ApiModelProperty("人脸识别通过率") + @NotBlank(message = "人脸识别通过率不能为空") + private String facePassRate; + @ApiModelProperty("MQTT地址") + @NotBlank(message = "MQTT地址不能为空") + private String mqttAddress; + @ApiModelProperty("MQTT用户名") + @NotBlank(message = "MQTT用户名不能为空") + private String mqttUserName; + @ApiModelProperty("MQTT密码") + @NotBlank(message = "MQTT密码不能为空") + private String mqttPassword; + @ApiModelProperty("APP_ID") + @NotBlank(message = "人脸引擎APP_ID不能为空") + private String appId; + @ApiModelProperty("APP_KEY") + @NotBlank(message = "人脸引擎APP_KEY不能为空") + private String appKey; + @ApiModelProperty("PHOTO_PREFIXES") + @NotBlank(message = "照片前缀不能为空") + private String photoPrefixes; + @ApiModelProperty("version") + private String version; +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/ParamVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/ParamVO.java new file mode 100644 index 0000000..5d40ca8 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/ParamVO.java @@ -0,0 +1,12 @@ +package com.bonus.canteen.core.android.vo; + +import lombok.Data; + +/** + * @author 19814 + */ +@Data +public class ParamVO { + private String paramKey; + private String paramValue; +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/UserInfoVo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/UserInfoVo.java new file mode 100644 index 0000000..ce3f1f2 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/UserInfoVo.java @@ -0,0 +1,52 @@ +package com.bonus.canteen.core.android.vo; + +import lombok.Data; +import lombok.ToString; + +import java.math.BigDecimal; + +/** + * @author 19814 + */ +@Data +@ToString +public class UserInfoVo { + + private String userId; + + private String userName; + private String nickName; + + private String phone; + + private String loginType; + + private String accId; + /** + * 卡号 + */ + private String cardNum; + + /** + * 序列号 物理卡号 + */ + private String serialNum; + + /** + * 个人钱包余额 + */ + private BigDecimal personalWalletBalance; + + /** + * 补贴余额 + */ + private BigDecimal subsidiesBalance; + + /** + * 账户状态 1正常 2冻结 3销户 + */ + private String accStatus; + + + +} 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 new file mode 100644 index 0000000..03c803e --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/DeviceMapper.xml @@ -0,0 +1,63 @@ + + + + + + + \ No newline at end of file diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/FaceMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/FaceMapper.xml new file mode 100644 index 0000000..488c57b --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/FaceMapper.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..4fc638a --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml @@ -0,0 +1,48 @@ + + + + + + \ No newline at end of file