双屏机--设备信息获取根据deviceType分类获取

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<DeviceMealtimeVO> getBasicsTimeIntervals(@Param("stallId")Long stallId);
+    /**
+     * 根据sn获取设备类型
+     *
+     * @param deviceSn 设备SN
+     * @return 设备类型
+     */
+    String getDeviceTypeBySn(String deviceSn);
+
+    /**
+     * 获取超市设备信息
+     *
+     * @param dto 请求参数
+     * @return 超市设备信息
+     */
+    DeviceInfoVo getSupermarketDeviceInfo(AppDTO dto);
 }

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) {
-        //判断设备是否存在
+        String deviceType = mapper.getDeviceTypeBySn(dto.getDeviceSn());
-        DeviceInfoVo deviceInfoVo = mapper.getDeviceInfo(dto);
+        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("设备不存在");
         }

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;
 }

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/DeviceMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getDeviceInfo" resultType="com.bonus.canteen.core.android.vo.DeviceInfoVo">
         SELECT di.device_number                           AS deviceNum,
                di.device_name                           AS deviceName,
+               di.device_type                           AS deviceType,
                dr.recipe_id                             AS recipeId,
                dr.recipe_name                           AS recipeName,
                CONCAT(aaa.area_name, '/', aa.area_name) AS areaName,
@@ -146,5 +147,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM basic_stall_mealtime
         where stall_id = #{stallId}
     </select>
+
+    <select id="getDeviceTypeBySn" resultType="java.lang.String">
+        select device_type
+        from device_info
+        where device_sn = #{deviceSn}
+        limit 1
+    </select>
+
+    <select id="getSupermarketDeviceInfo" resultType="com.bonus.canteen.core.android.vo.DeviceInfoVo">
+        SELECT di.device_number                           AS deviceNum,
+        di.device_name                           AS deviceName,
+        di.device_type                           AS deviceType,
+        CONCAT(aaa.area_name, '/', aa.area_name) AS areaName,
+        aa.area_id                               AS areaId,
+        ac.supermarket_name                          AS canteenName,
+        ac.supermarket_id                            AS canteenId,
+        di.device_pwd                            as devicePwd
+        FROM device_info di
+        LEFT JOIN device_bind db ON di.device_id = db.device_id
+        left join basic_area aa on db.area_id = aa.area_id
+        left join basic_area aaa on aaa.area_id = aa.parent_id
+        LEFT JOIN supermarket_info ac ON db.canteen_id = ac.supermarket_id
+        where di.device_sn = #{deviceSn}
+        GROUP BY di.device_id
+    </select>
 </mapper>