恢复余额（未完成）

smart-switch-service/src/main/java/com/ruoyi/iot/constants/ReceiveConstants.java

@@ -30,4 +30,6 @@ public class ReceiveConstants {
     // 数据点ID：SSID的值：创特
     public static final String DSV_SSID_CT = "ChuangteA";
 
+    // 数据点ID：CSQ
+    public static final String DS_CSQ = "CSQ";
 }

smart-switch-service/src/main/java/com/ruoyi/iot/service/IotReceiveServiceImpl.java

@@ -53,15 +53,13 @@ public class IotReceiveServiceImpl implements IotReceiveService{
         }
         // 数据点推送
         if (ReceiveType.DATA_POINT.getType().equals(msg.getType())) {
-            // 更新设备信息
+            // 若推送数据点:CSQ,则恢复余额
-//            deviceService.updateByIot(this.parseToDevice(msg));
+            if (ReceiveConstants.DS_CSQ.equals(msg.getDsId())) {
+//                this.recoverBalance(msg);
+            }
         }
         // 生命周期
         else if (ReceiveType.DEVICE_STATUS.getType().equals(msg.getType())) {
-//            deviceService.updateByIot(this.parseToDeviceByLife(msg));
-            if (msg.getStatus().equals(ReceiveStatus.ONLINE.getStatus())) {
-                this.recoverBalance(msg);
-            }
         }
     }
 

smart-switch-service/src/main/java/com/ruoyi/ss/channelWithdraw/domain/ChannelWithdraw.java

@@ -34,6 +34,7 @@ public class ChannelWithdraw extends BaseEntity
 
     @Excel(name = "对应账户类型")
     @ApiModelProperty("对应账户类型")
+    @JsonView(JsonViewProfile.App.class)
     private String accountType;
 
     @Excel(name = "服务费收取类型")

smart-switch-service/src/main/java/com/ruoyi/ss/deviceSuit/service/impl/DeviceSuitConverterImpl.java

@@ -29,6 +29,9 @@ public class DeviceSuitConverterImpl implements DeviceSuitConverter {
         List<DeviceSuit> result = new ArrayList<>();
 
         for (Long deviceId : suit.getDeviceIds()) {
+            if (deviceId == null) {
+                continue;
+            }
             DeviceSuit deviceSuit = new DeviceSuit();
             deviceSuit.setDeviceId(deviceId);
             deviceSuit.setSuitId(suit.getSuitId());