分钟数据转日数据bug提交
This commit is contained in:
@@ -564,9 +564,11 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
public void dataToDayHandler(List<String> indexLists, String startTime, String endTime, Integer calType) {
|
public void dataToDayHandler(List<String> indexLists, String startTime, String endTime, Integer calType) {
|
||||||
log.info(LocalDateTime.now() + "data表转day开始=====》");
|
log.info(LocalDateTime.now() + "data表转day开始=====》");
|
||||||
Date time = null;
|
Date time = null;
|
||||||
|
Instant timeInfluxdb = null;
|
||||||
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
try {
|
try {
|
||||||
time = simpleDateFormat.parse(startTime);
|
time = simpleDateFormat.parse(startTime);
|
||||||
|
timeInfluxdb = time.toInstant();
|
||||||
} catch (ParseException e) {
|
} catch (ParseException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
@@ -617,6 +619,7 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayV dayV = new DayV();
|
DayV dayV = new DayV();
|
||||||
BeanUtils.copyProperties(item, dayV);
|
BeanUtils.copyProperties(item, dayV);
|
||||||
|
dayV.setTime(timeInfluxdb);
|
||||||
dayVList.add(dayV);
|
dayVList.add(dayV);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -636,6 +639,8 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayI dayI = new DayI();
|
DayI dayI = new DayI();
|
||||||
BeanUtils.copyProperties(item, dayI);
|
BeanUtils.copyProperties(item, dayI);
|
||||||
|
dayI.setTime(timeInfluxdb);
|
||||||
|
|
||||||
dayIList.add(dayI);
|
dayIList.add(dayI);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -651,6 +656,7 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayFlicker dayFlicker = new DayFlicker();
|
DayFlicker dayFlicker = new DayFlicker();
|
||||||
BeanUtils.copyProperties(item, dayFlicker);
|
BeanUtils.copyProperties(item, dayFlicker);
|
||||||
|
dayFlicker.setTime(timeInfluxdb);
|
||||||
dayFlickerList.add(dayFlicker);
|
dayFlickerList.add(dayFlicker);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -666,6 +672,7 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayFluc dayFluc = new DayFluc();
|
DayFluc dayFluc = new DayFluc();
|
||||||
BeanUtils.copyProperties(item, dayFluc);
|
BeanUtils.copyProperties(item, dayFluc);
|
||||||
|
dayFluc.setTime(timeInfluxdb);
|
||||||
dayFlucList.add(dayFluc);
|
dayFlucList.add(dayFluc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -681,6 +688,7 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayHarmPhasicI dayHarmPhasicI = new DayHarmPhasicI();
|
DayHarmPhasicI dayHarmPhasicI = new DayHarmPhasicI();
|
||||||
BeanUtils.copyProperties(item, dayHarmPhasicI);
|
BeanUtils.copyProperties(item, dayHarmPhasicI);
|
||||||
|
dayHarmPhasicI.setTime(timeInfluxdb);
|
||||||
dayHarmPhasicIList.add(dayHarmPhasicI);
|
dayHarmPhasicIList.add(dayHarmPhasicI);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -696,6 +704,7 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayHarmPhasicV dayHarmPhasicV = new DayHarmPhasicV();
|
DayHarmPhasicV dayHarmPhasicV = new DayHarmPhasicV();
|
||||||
BeanUtils.copyProperties(item, dayHarmPhasicV);
|
BeanUtils.copyProperties(item, dayHarmPhasicV);
|
||||||
|
dayHarmPhasicV.setTime(timeInfluxdb);
|
||||||
dayHarmPhasicVList.add(dayHarmPhasicV);
|
dayHarmPhasicVList.add(dayHarmPhasicV);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -711,6 +720,7 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayHarmPowerP dayHarmPowerP = new DayHarmPowerP();
|
DayHarmPowerP dayHarmPowerP = new DayHarmPowerP();
|
||||||
BeanUtils.copyProperties(item, dayHarmPowerP);
|
BeanUtils.copyProperties(item, dayHarmPowerP);
|
||||||
|
dayHarmPowerP.setTime(timeInfluxdb);
|
||||||
dayHarmPowerPList.add(dayHarmPowerP);
|
dayHarmPowerPList.add(dayHarmPowerP);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -726,6 +736,7 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayHarmPowerQ dayHarmPowerQ = new DayHarmPowerQ();
|
DayHarmPowerQ dayHarmPowerQ = new DayHarmPowerQ();
|
||||||
BeanUtils.copyProperties(item, dayHarmPowerQ);
|
BeanUtils.copyProperties(item, dayHarmPowerQ);
|
||||||
|
dayHarmPowerQ.setTime(timeInfluxdb);
|
||||||
dayHarmPowerQList.add(dayHarmPowerQ);
|
dayHarmPowerQList.add(dayHarmPowerQ);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -741,6 +752,7 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayHarmPowerS dayHarmPowerS = new DayHarmPowerS();
|
DayHarmPowerS dayHarmPowerS = new DayHarmPowerS();
|
||||||
BeanUtils.copyProperties(item, dayHarmPowerS);
|
BeanUtils.copyProperties(item, dayHarmPowerS);
|
||||||
|
dayHarmPowerS.setTime(timeInfluxdb);
|
||||||
dayHarmPowerSList.add(dayHarmPowerS);
|
dayHarmPowerSList.add(dayHarmPowerS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -756,6 +768,7 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayHarmRateI dayHarmRateI = new DayHarmRateI();
|
DayHarmRateI dayHarmRateI = new DayHarmRateI();
|
||||||
BeanUtils.copyProperties(item, dayHarmRateI);
|
BeanUtils.copyProperties(item, dayHarmRateI);
|
||||||
|
dayHarmRateI.setTime(timeInfluxdb);
|
||||||
dayHarmRateIList.add(dayHarmRateI);
|
dayHarmRateIList.add(dayHarmRateI);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -771,6 +784,7 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayHarmRateV dayHarmRateV = new DayHarmRateV();
|
DayHarmRateV dayHarmRateV = new DayHarmRateV();
|
||||||
BeanUtils.copyProperties(item, dayHarmRateV);
|
BeanUtils.copyProperties(item, dayHarmRateV);
|
||||||
|
dayHarmRateV.setTime(timeInfluxdb);
|
||||||
dayHarmRateVList.add(dayHarmRateV);
|
dayHarmRateVList.add(dayHarmRateV);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -786,6 +800,7 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayInHarmI dayInHarmI = new DayInHarmI();
|
DayInHarmI dayInHarmI = new DayInHarmI();
|
||||||
BeanUtils.copyProperties(item, dayInHarmI);
|
BeanUtils.copyProperties(item, dayInHarmI);
|
||||||
|
dayInHarmI.setTime(timeInfluxdb);
|
||||||
dayInHarmIList.add(dayInHarmI);
|
dayInHarmIList.add(dayInHarmI);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -801,6 +816,7 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayInHarmV dayInHarmV = new DayInHarmV();
|
DayInHarmV dayInHarmV = new DayInHarmV();
|
||||||
BeanUtils.copyProperties(item, dayInHarmV);
|
BeanUtils.copyProperties(item, dayInHarmV);
|
||||||
|
dayInHarmV.setTime(timeInfluxdb);
|
||||||
dayInHarmVList.add(dayInHarmV);
|
dayInHarmVList.add(dayInHarmV);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -816,6 +832,7 @@ public class DayDataServiceImpl implements DayDataService {
|
|||||||
|
|
||||||
DayPlt dayPlt = new DayPlt();
|
DayPlt dayPlt = new DayPlt();
|
||||||
BeanUtils.copyProperties(item, dayPlt);
|
BeanUtils.copyProperties(item, dayPlt);
|
||||||
|
dayPlt.setTime(timeInfluxdb);
|
||||||
dayPltList.add(dayPlt);
|
dayPltList.add(dayPlt);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user