将限制条件放入配置文件中

smart-city-platform/src/main/java/com/bz/smart_city/dto/ClearingDataDTO.java

@@ -2,6 +2,8 @@ package com.bz.smart_city.dto;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class ClearingDataDTO {
 	private String electronicNo ; 
@@ -13,4 +15,5 @@ public class ClearingDataDTO {
 	private String  meterReadDate; 
 	private Double  wsvCost ;
 	private Long deviceId;
+	private Date currentPeriodDate;
 }

smart-city-platform/src/main/java/com/bz/smart_city/dto/syncdata/ClearDataDto.java

@@ -6,7 +6,8 @@ import lombok.Data;
 
 @Data
 public class ClearDataDto {
- private String fileNo;
+    private String fileNo;
     private Double reading;
+    private String currentPeriodDate;
 
 }

smart-city-platform/src/main/java/com/bz/smart_city/service/sync/SyncDataServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -47,11 +48,12 @@ public class SyncDataServiceImpl implements SyncDataService {
 
         List<ClearingDataDTO> sycnClearing = clearingRecordItemMapper.findSycnClearing(deviceIds, yyyymm);
         Map<Long,String>idMatchFileNo= (Map<Long, String>) deviceInfo.get("matchs");
-
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sycnClearing.forEach(clearingDataDTO -> {
             ClearDataDto clearDataDto=new ClearDataDto();
             clearDataDto.setFileNo(idMatchFileNo.get(clearingDataDTO.getDeviceId()));
             clearDataDto.setReading(clearingDataDTO.getCurrentPeriodData());
+            clearDataDto.setCurrentPeriodDate(sdf.format(clearingDataDTO.getCurrentPeriodDate()));
             result.add(clearDataDto);
         });
         return new ListObjectWrapper<ClearDataDto>(result);

smart-city-platform/src/main/resources/mapper/ClearingRecordItemMapper.xml

@@ -393,7 +393,7 @@
     <select id="findSycnClearing" resultType="com.bz.smart_city.dto.ClearingDataDTO">
         SELECT
         device_id as deviceId,
-        current_period_data
+        current_period_data,current_period_date
         FROM
         sc_clearing_record_item it
         LEFT JOIN sc_clearing_record r ON ( it.record_id = r.id )