bug修复

zoniot-common/zoniot-core-mysql/src/main/java/com/zcxk/core/mysql/pageing/Pagination.java

@@ -46,4 +46,8 @@ public class Pagination<T> implements Serializable {
         this.list = list ;
         this.total =total ;
     }
+
+    public static void main(String[] args) {
+        System.out.println(System.currentTimeMillis());
+    }
 }

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/community/CommunityAddDto.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 /**
@@ -17,10 +18,9 @@ import java.math.BigDecimal;
 @Data
 public class CommunityAddDto {
 
-    @NotBlank(message = "id")
     private Integer id;
 
-    @NotBlank(message = "请输入公司")
+    @NotNull(message = "请输入公司")
     @ApiModelProperty(value="公司", required = true)
     private Integer companyOrgId;
 

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/meterreadrecord/MeterReadRecordUpdateDto.java

@@ -16,9 +16,8 @@ import javax.validation.constraints.NotNull;
 public class MeterReadRecordUpdateDto  {
 
     @NotNull
-    @NotEmpty
     @ApiModelProperty(value="ID")
-    private String id;
+    private Long id;
 
     @NotNull
     @NotEmpty

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

@@ -2,6 +2,7 @@ package com.zcxk.rmcp.api.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,6 +15,7 @@ import java.util.Date;
  * @date 2021/7/20
  **/
 @Data
+@ApiModel
 public class DeviceCommandVo {
 
     @ApiModelProperty(value="Id")

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

@@ -1,12 +1,13 @@
 package com.zcxk.rmcp.api.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zcxk.core.utils.DateUtil;
 import com.zcxk.rmcp.api.enums.ReadStatusEnum;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @author Andy
@@ -15,6 +16,7 @@ import java.util.Date;
  * @date 2021/7/22
  **/
 @Data
+@ApiModel
 public class MeterReadRecordVo {
 
     @ApiModelProperty(value="id")
@@ -78,8 +80,7 @@ public class MeterReadRecordVo {
         private int readDate;
 
         @ApiModelProperty(value="抄表时间/读表时间")
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
-        private Long readTime;
+        private String readTime;
 
         @ApiModelProperty(value="阀门状态")
         private Integer valveStatus;
@@ -99,7 +100,14 @@ public class MeterReadRecordVo {
         public String getReadStatus(){
             return ReadStatusEnum.getMessage(readStatus);
         }
-    }
 
+        public String getReadTime(){
+            try {
+                return StringUtils.isNotEmpty(readTime) ? DateUtil.format(Long.parseLong(readTime), "yyyy-MM-dd HH:mm:ss") : readTime;
+            } catch (Exception e) {
+                return "";
+            }
+        }
+    }
 
 }

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

@@ -50,7 +50,7 @@ public class MeterReadRecordDao extends BaseDao<MeterReadRecord, String> impleme
     * @param id, readDate
     * @return com.zcxk.rmcp.api.vo.MeterReadRecordVo
     **/
-    public MeterReadRecordVo findMeterReadRecord(String id, String readDate){
+    public MeterReadRecordVo findMeterReadRecord(Long id, String readDate){
         AggregationOptions aggregationOptions = AggregationOptions.builder().allowDiskUse(true).build();
         Aggregation agg = Aggregation.newAggregation(
                 Aggregation.match(Criteria.where("id").is(id)),
@@ -96,7 +96,7 @@ public class MeterReadRecordDao extends BaseDao<MeterReadRecord, String> impleme
         Update update = new Update();
         update.set("data.$.readData",dto.getReadData());
         update.set("data.$.readStatus", ReadStatusEnum.READ.getCode());
-        update.set("data.$.readTime", LocalDateTime.now());
+        update.set("data.$.readTime", System.currentTimeMillis());
         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/MeterReadRecordController.java

@@ -60,7 +60,7 @@ public class MeterReadRecordController extends BaseController {
 
     @RequestMapping(value = "/page", method = RequestMethod.POST)
     @ApiOperation(value = "分页查询抄表记录")
-    public AjaxMessage<PageResult> pageMeterReadRecord(@RequestBody @Valid MeterReadRecordDto dto) {
+    public AjaxMessage<PageResult<MeterReadRecordVo>> pageMeterReadRecord(@RequestBody @Valid MeterReadRecordDto dto) {
         return AjaxMessage.success(meterReadRecordService.pageMeterReadRecord(dto));
     }
 
@@ -82,11 +82,11 @@ public class MeterReadRecordController extends BaseController {
             }
             return;
         }
+        
         List<MeterReadRecordExcelVo> dataList = new ArrayList<>();
         for (MeterReadRecordVo meterReadRecordVo : list) {
             MeterReadRecordExcelVo excelVo = new MeterReadRecordExcelVo();
             BeanCopyUtils.copyProperties(meterReadRecordVo, excelVo,MeterReadRecordExcelVo.class);
-            excelVo.setReadTime(DateUtil.format(meterReadRecordVo.getData().getReadTime(), "yyyy-MM-dd HH:mm:ss"));
             excelVo.setReadStatus(meterReadRecordVo.getData().getReadStatus());
             excelVo.setReadData(meterReadRecordVo.getData().getReadData());
             dataList.add(excelVo);

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

@@ -51,7 +51,7 @@ public class MeterReplaceController  extends BaseController {
     }
 
     @RequestMapping(value="export/excel" , method = RequestMethod.GET)
-    @ApiOperation(value = "excel导出", produces = "application/octet-stream")
+    @ApiOperation(value = "excel导出")
     public void exportExcel(MeterReplacePageDto pageDto, HttpServletResponse response) {
         List<MeterReplaceVo> list = meterReplaceLogService.listMeterReplace(pageDto);
         try {

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/CommunityServiceImpl.java

@@ -67,8 +67,10 @@ public class CommunityServiceImpl implements CommunityService {
         community.setCode(code);
         community.setStatus(StatusEnum.OK.getCode());
         community.setTenantId(loginUser.getTenantId());
-        community.setCreateBy(loginUser.getName());
+        community.setCreateBy(loginUser.getUsername());
         community.setCreateDate(LocalDateTime.now());
+        community.setUpdateBy(loginUser.getUsername());
+        community.setUpdateDate(LocalDateTime.now());
         return communityMapper.insertCommunity(community);
     }