bug修复

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/readrate/ReadRateCountDto.java

@@ -1,6 +1,5 @@
 package com.zcxk.rmcp.api.dto.readrate;
 
-import com.zcxk.rmcp.api.dto.BasePageDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,7 +15,7 @@ import java.math.BigDecimal;
 public class ReadRateCountDto {
 
     @ApiModelProperty(value = "类型")
-    private Integer statDaysCode;
+    private int statDaysCode;
 
     @ApiModelProperty(value = "分类ID")
     private Integer categoryId;

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/readrate/ReadRateDto.java

@@ -17,7 +17,7 @@ import java.math.BigDecimal;
 public class ReadRateDto extends BasePageDto {
 
     @ApiModelProperty(value = "类型")
-    private Integer statDaysCode;
+    private int statDaysCode;
 
     @ApiModelProperty(value = "分类ID")
     private Integer categoryId;

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/enums/DeviceStatusEnum.java

@@ -24,9 +24,9 @@ public enum DeviceStatusEnum {
     OFFLINE(2 , "离线"),
 
     /**
-     * 报警
+     * 告警
      */
-    ALARM(3, "报警"),
+    ALARM(3, "告警"),
 
     /**
      * 未启用

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/MeterReplaceVo.java

@@ -1,5 +1,6 @@
 package com.zcxk.rmcp.api.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zcxk.rmcp.api.pojo.LocalDateTimeConverter;
@@ -19,6 +20,7 @@ import java.util.Date;
 public class MeterReplaceVo {
 
     @ApiModelProperty(value="Id")
+    @ExcelIgnore
     private Long id;
 
     @ApiModelProperty(value = "新设备编号")
@@ -38,9 +40,11 @@ public class MeterReplaceVo {
     private String oldMeterNo;
 
     @ApiModelProperty(value="新产品类型/新设备型号")
+    @ExcelIgnore
     private String newProductId;
 
     @ApiModelProperty(value="旧产品类型/旧设备型号")
+    @ExcelIgnore
     private String oldProductId;
 
     @ApiModelProperty(value="新产品类型/新设备型号")

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/mongo/MeterReadRecordDao.java

@@ -97,7 +97,12 @@ public class MeterReadRecordDao extends BaseDao<MeterReadRecord, String> impleme
         update.set("data.$.readData",dto.getReadData());
         update.set("data.$.readStatus", ReadStatusEnum.READ.getCode());
         update.set("data.$.readTime", System.currentTimeMillis());
-        update.set("data.$.lastCost", BigDecimalUtils.subtract(meterReadRecordVo.getData().getLastValid(), new BigDecimal(dto.getReadData())));
+        Double lastValid = meterReadRecordVo.getData().getLastValid();
+        if (lastValid == null) {
+            update.set("data.$.lastCost", new BigDecimal(dto.getReadData()));
+        } else {
+            update.set("data.$.lastCost", BigDecimalUtils.subtract(meterReadRecordVo.getData().getLastValid(), new BigDecimal(dto.getReadData())));
+        }
         update.set("data.$.createBy", UserUtil.getCurrentUser().getUsername());
         return upsert(query,update).getModifiedCount();
     }

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/ReadRateController.java

@@ -40,7 +40,7 @@ public class ReadRateController extends BaseController{
 
     @RequestMapping(value = "/statistics", method = RequestMethod.GET)
     @ApiOperation(value = "统计抄表率")
-    public AjaxMessage<List> statistics(@ApiParam(value = "统计天数", required = true) @RequestParam("statDaysCode") Integer statDaysCode) {
+    public AjaxMessage<List> statistics(@ApiParam(value = "统计天数", required = true) @RequestParam("statDaysCode") int statDaysCode) {
         if (ReadRateEnum.getReadRateEnum(statDaysCode) == null) {
             return AjaxMessage.success(null);
         }