mongoDB抄表

smart-city-platform/src/main/java/com/bz/smart_city/controller/DeviceController.java

@@ -402,7 +402,7 @@ public class DeviceController {
             @ApiParam(value = "查询日期,YYYYMMDD格式", required = true) @RequestParam Integer startDate,
             @ApiParam(value = "查询日期,YYYYMMDD格式", required = true) @RequestParam Integer endDate
     ) {
-        List<DeviceMeasuringDataDTO> list = deviceDataDimService.getDataV2(deviceId,startDate,endDate) ;
+        List<DeviceMeasuringDataDTO> list = deviceDataDimService.getData(deviceId,startDate,endDate) ;
         return new AjaxMessage<>(ResultStatus.OK,list);
     }
 

smart-city-platform/src/main/java/com/bz/smart_city/repository/MeterReadRecord.java

@@ -0,0 +1,195 @@
+package com.bz.smart_city.repository;
+
+import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * <p>抄表记录</p>
+ * sh.enableSharding("meter-reading-database");
+ * sh.shardCollection("meter-reading-database.sc_meter_read_record",{"readDate":1,"deviceId":1});
+ * db.sc_meter_read_record.createIndex({readDate:1,customerId:1,buildingId:1,siteId:1,sysId:1,readStatus:1,concentratorId:1},{background: true,name:'idx_1'})
+ * @Author wilian.peng
+ * @Date 2020/12/22 16:59
+ * @Version 1.0
+ */
+@Data
+@Document(collection = "sc_meter_read_record")
+public class MeterReadRecord implements Serializable {
+    /**
+    * 主键
+    */
+    private Long id;
+
+    /**
+    * 读表日期
+    */
+    private Integer readDate;
+
+    /**
+     * 站点
+     */
+    private Integer siteId;
+
+    /**
+     * 场景
+     */
+    private Integer sysId;
+
+    /**
+    * 省
+    */
+    private Integer province;
+
+    /**
+    * 市
+    */
+    private Integer city;
+
+    /**
+    * 区
+    */
+    private Integer region;
+
+    /**
+    * 小区
+    */
+    private Integer community;
+
+    /**
+    * 客户
+    */
+    private Integer customerId;
+
+    /**
+    * 集中器
+    */
+    private Integer concentratorId;
+
+    /**
+    * 采集器
+    */
+    private Integer collectorId;
+
+    /**
+    * 建筑
+    */
+    private Integer buildingId;
+
+    /**
+    * 安装地址
+    */
+    private String location;
+
+    /**
+    * 设备类型
+    */
+    private Integer deviceTypeId;
+
+    /**
+    * 设备id
+    */
+    private Long deviceId;
+
+    /**
+    * 节点编号
+    */
+    private String deviceNo;
+
+    /**
+    * 电子号
+    */
+    private String meterNo;
+
+    /**
+    * 档案号
+    */
+    private String meterFileNo;
+
+    /**
+    * 读表时间
+    */
+    private Date readTime;
+
+    /**
+    * 读表状态
+    */
+    private String readStatus;
+
+    /**
+    * 读表数据
+    */
+    private String readData;
+
+    /**
+    * 最近有效数据
+    */
+    private String lastValid;
+
+    /**
+    * 距离上次的消耗
+    */
+    private BigDecimal lastCost;
+
+    /**
+    * 状态
+    */
+    private Integer status;
+
+    /**
+    * 创建时间
+    */
+    private Date dateCreate;
+
+    /**
+    * 更新时间
+    */
+    private Date dateUpdate;
+
+    /**
+    * 创建人
+    */
+    private String createBy;
+
+    /**
+    * 更新人
+    */
+    private String updateBy;
+
+    /***********************************以下字段将存入MongoDB中**************************************/
+    private String communityName;
+
+    private String buildingName ;
+
+    private String customerName ;
+
+    private String provinceName ;
+
+    private String cityName ;
+
+    private String regionName ;
+
+    private String deviceTypeName ;
+
+    private String concentratorNo ;
+
+    private String collectorNo ;
+
+    private Integer manufacturerId ;
+
+    private String manufacturerName ;
+
+    private Integer channelNumberId;
+
+    private String channelName ;
+
+    /**
+     * 最后上送数据,格式如下：
+     * {"数据ID"：11111，data:{"WSV":"1","VOL":"2.5"}}
+     */
+    private Map<String, String> lastSendData ;
+}

smart-city-platform/src/main/java/com/bz/smart_city/repository/MeterReadRecordRepository.java

@@ -0,0 +1,8 @@
+package com.bz.smart_city.repository;
+
+import com.bz.smart_city.dto.DeviceData;
+import org.springframework.data.mongodb.repository.MongoRepository;
+
+public interface MeterReadRecordRepository extends MongoRepository<MeterReadRecord, Long> {
+    MeterReadRecord findByDeviceIdAndReadDate(Long deviceId,Integer date);
+}

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceDataDimServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -97,6 +98,7 @@ public class DeviceDataDimServiceImpl implements DeviceDataDimService {
     @Override
     public List<DeviceMeasuringDataDTO> getData(Long deviceId, Integer startDate, Integer endDate) {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMdd");
+        SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if(startDate == 0){
             LocalDateTime startDateTime =  LocalDateTime.now().with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN);
             startDate = Integer.valueOf(startDateTime.format(df));
@@ -116,7 +118,11 @@ public class DeviceDataDimServiceImpl implements DeviceDataDimService {
         for(String key:map.keySet()){
             List<MeasuringDataDTO> listTemp = map.get(key);
             DeviceMeasuringDataDTO deviceMeasuringDataDTO = new DeviceMeasuringDataDTO();
-            //deviceMeasuringDataDTO.setDateTime(key);
+            try {
+                deviceMeasuringDataDTO.setDateTime(dateformat.parse(key));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
             //list按测点code转map
             Map<String, String> mapTemp = listTemp.stream().collect(Collectors.toMap(MeasuringDataDTO::getMeasuringCode, MeasuringDataDTO::getMeasuringData, (key1, key2) -> key2));
             deviceMeasuringDataDTO.setMeasuringData(mapTemp);
@@ -160,7 +166,7 @@ public class DeviceDataDimServiceImpl implements DeviceDataDimService {
     @Override
     public void getDataExcel(Long deviceId, Integer startDate, Integer endDate, HttpServletResponse httpServletResponse) {
         String title = "历史数据";
-        List<DeviceMeasuringDataDTO> list =  getDataV2(deviceId,startDate,endDate);
+        List<DeviceMeasuringDataDTO> list =  getData(deviceId,startDate,endDate);
         Device device = deviceMapper.findByDeviceId(deviceId);
         List<DeviceMeasuringPointDto> measuringList = deviceMeasuringPointService.getDeviceMeasuringPoint(device.getDeviceType());