feat(device): 更新设备响应字段

- 将 deviceNo 和 channelNo 字段替换为 previewUrl 和 previewCoverUrl
- 修改 DeviceRespVO 类中的字段定义- 在 AppScenicServiceImpl 中更新设备配置信息的设置逻辑

src/main/java/com/ycwl/basic/model/pc/device/resp/DeviceRespVO.java

@@ -38,6 +38,6 @@ public class DeviceRespVO {
     private String scenicName;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date keepaliveAt;
-    private String deviceNo;
+    private String previewUrl;
-    private String channelNo;
+    private String previewCoverUrl;
 }

src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java

@@ -285,8 +285,8 @@ public class AppScenicServiceImpl implements AppScenicService {
             deviceRespVO.setNo(device.getNo());
 
             DeviceConfigManager config = deviceRepository.getDeviceConfigManager(device.getId());
-            deviceRespVO.setDeviceNo(device.getNo());
+            deviceRespVO.setPreviewUrl(config.getString("preview_url"));
-            deviceRespVO.setChannelNo(config.getString("channel_no"));
+            deviceRespVO.setPreviewCoverUrl(config.getString("preview_cover_url"));
             return deviceRespVO;
         }).collect(Collectors.toList());
         for (DeviceRespVO deviceRespVO : deviceRespVOList) {

src/main/java/com/ycwl/basic/utils/NotificationAuthUtils.java

@@ -92,23 +92,21 @@ public class NotificationAuthUtils {
      * @return 是否检查并消费成功
      */
     public boolean checkAndConsumeAuthorization(Long memberId, String templateId, Long scenicId) {
-        // 测试
+        try {
-        return true;
+            // 先检查剩余次数
-//        try {
+            Integer remainingCount = userNotificationAuthorizationService.getRemainingCount(memberId, templateId, scenicId);
-//            // 先检查剩余次数
+            if (remainingCount == null || remainingCount <= 0) {
-//            Integer remainingCount = userNotificationAuthorizationService.getRemainingCount(memberId, templateId, scenicId);
+                log.debug("用户剩余授权次数不足: memberId={}, templateId={}, scenicId={}, remainingCount={}", 
-//            if (remainingCount == null || remainingCount <= 0) {
+                        memberId, templateId, scenicId, remainingCount);
-//                log.debug("用户剩余授权次数不足: memberId={}, templateId={}, scenicId={}, remainingCount={}",
+                return false;
-//                        memberId, templateId, scenicId, remainingCount);
+            }
-//                return false;
+            
-//            }
+            // 尝试消费
-//
+            return consumeAuthorization(memberId, templateId, scenicId);
-//            // 尝试消费
+        } catch (Exception e) {
-//            return consumeAuthorization(memberId, templateId, scenicId);
+            log.error("检查并消费授权异常: memberId={}, templateId={}, scenicId={}", memberId, templateId, scenicId, e);
-//        } catch (Exception e) {
+            return false;
-//            log.error("检查并消费授权异常: memberId={}, templateId={}, scenicId={}", memberId, templateId, scenicId, e);
+        }
-//            return false;
-//        }
     }
     
     /**