设备计费

device-api-service/src/main/java/com/xy/entity/DeviceCharging.java

@@ -33,13 +33,18 @@ public class DeviceCharging implements Serializable {
     @ApiModelProperty(value = "累计续费金额")
     private Integer chargingSumMoney;
 
-    @ApiModelProperty(value = "试用剩余天")
+    @ApiModelProperty(value = "管理费剩余天数,权重最高")
     private Integer chargingX;
 
+    @ApiModelProperty(value = "算法识别剩余笔数,权重最高")
+    private Integer algorithmX;
+
     @ApiModelProperty(value = "过期时间")
     private LocalDateTime timeout;
 
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
 
+    @ApiModelProperty(value = "是否需要定时计费")
+    private Boolean isJob;
 }

device-api/src/main/java/com/xy/dto/DeviceChargingDto.java

@@ -8,6 +8,7 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -62,6 +63,7 @@ public class DeviceChargingDto {
         @ApiModelProperty("续费信息")
         private List<DeviceCharging> deviceChargings;
 
+        @NotNull(message = "payType不能为空")
         @ApiModelProperty(value = "支付类型 2=支付宝 3=微信 100=赠送")
         private Integer payType;