设备计费

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

@@ -1,8 +1,5 @@
 package com.xy.entity;
 
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 设备计费表
@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="DeviceCharging对象", description="设备计费表")
+@ApiModel(value = "DeviceCharging对象", description = "设备计费表")
 public class DeviceCharging implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -36,9 +36,6 @@ public class DeviceCharging implements Serializable {
     @ApiModelProperty(value = "管理费剩余天数,权重最高")
     private Integer chargingX;
 
-    @ApiModelProperty(value = "算法识别剩余笔数,权重最高")
-    private Integer algorithmX;
-
     @ApiModelProperty(value = "过期时间")
     private LocalDateTime timeout;
 

device-api-service/src/main/java/com/xy/service/DeviceChargingServiceImpl.java

@@ -71,12 +71,6 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
                 if (sysDictRedis != null) {
                     record.setChargingMoney(Integer.valueOf(sysDictRedis.getValue()));
                 }
-                //封装缴费状态
-                DeviceChargingDto.Vo deviceCharging = record.getDeviceCharging();
-                if (deviceCharging != null) {
-                    int contrast = DataTime.stringContrast(DataTime.toString(page.getThisTime()), DataTime.toString(deviceCharging.getTimeout()));
-                    record.setChargingStatus(contrast < 0);
-                }
             }
         }
         return R.ok(toPageBean(iPage));

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

@@ -44,9 +44,6 @@ public class DeviceChargingDto {
         @ApiModelProperty("设备id")
         private Long deviceId;
 
-        @ApiModelProperty("缴费状态 true=已缴费 false=欠费")
-        private Boolean chargingStatus;
-
         @ApiModelProperty(value = "当前系统时间", hidden = true)
         private LocalDateTime thisTime = LocalDateTime.now();
     }
@@ -104,9 +101,12 @@ public class DeviceChargingDto {
         @ApiModelProperty(value = "累计续费金额")
         private Integer chargingSumMoney;
 
-        @ApiModelProperty(value = "试用剩余天")
+        @ApiModelProperty(value = "管理费剩余天数,权重最高")
         private Integer chargingX;
 
+        @ApiModelProperty(value = "是否需要定时计费")
+        private Boolean isJob;
+
         @ApiModelProperty(value = "过期时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime timeout;
@@ -132,9 +132,6 @@ public class DeviceChargingDto {
 
         @ApiModelProperty(value = "计费标准金额/年")
         private Integer chargingMoney;
-
-        @ApiModelProperty("缴费状态 true=已缴费 false=欠费")
-        private Boolean chargingStatus;
     }
 
 }