Browse Source

将结算水量同步接口读数字段改为current_period_data

hym 4 years ago
parent
commit
3869d7c131

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

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

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

@@ -46,7 +46,7 @@ public class SyncDataServiceImpl implements SyncDataService {
         sycnClearing.forEach(clearingDataDTO -> {
             ClearDataDto clearDataDto=new ClearDataDto();
             clearDataDto.setFileNo(idMatchFileNo.get(clearingDataDTO.getDeviceId()));
-            clearDataDto.setReading(clearingDataDTO.getWsvCost());
+            clearDataDto.setReading(clearingDataDTO.getCurrentPeriodData());
             result.add(clearDataDto);
         });
         return new ListObjectWrapper<ClearDataDto>(result);

+ 1 - 1
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,
-        water_cost as wsvCost
+        current_period_data
         FROM
         sc_clearing_record_item it
         LEFT JOIN sc_clearing_record r ON ( it.record_id = r.id )