Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

河北pms两级文档需求开发

Browse Source
This commit is contained in:
cdf
2024-05-13 20:23:50 +08:00
parent cc24fc3124
commit ecf53c9bbb
17 changed files with 352 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticMServiceImpl.java
View File

@@ -110,11 +110,8 @@ public class PmsRunStatisticMServiceImpl extends MppServiceImpl<PmsRunStatisticM
pmsRunStatisticM.setRunBusIds(String.join(StrUtil.COMMA,busRunSet));
pmsRunStatisticM.setRunStationNum(temStation);
pmsRunStatisticM.setStatDate(LocalDate.parse(date));
poList.add(pmsRunStatisticM);
});
this.saveOrUpdateBatchByMultiId(poList);
}
@@ -123,8 +120,7 @@ public class PmsRunStatisticMServiceImpl extends MppServiceImpl<PmsRunStatisticM
public List<PmsRunStatisticM> selectListByDate(String startTime, String endTime, String dataDate) {
return this.list(new LambdaQueryWrapper<PmsRunStatisticM>()
.ge(StrUtil.isNotBlank(startTime), PmsRunStatisticM::getStatisticDate, DateUtil.beginOfDay(DateUtil.parse(startTime)))
.le(StrUtil.isNotBlank(endTime), PmsRunStatisticM::getStatisticDate, DateUtil.endOfDay(DateUtil.parse(endTime)))
.eq(PmsRunStatisticM::getStatDate, dataDate));
.le(StrUtil.isNotBlank(endTime), PmsRunStatisticM::getStatisticDate, DateUtil.endOfDay(DateUtil.parse(endTime))));
}

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticYServiceImpl.java
View File

@@ -112,7 +112,6 @@ public class PmsRunStatisticYServiceImpl extends MppServiceImpl<PmsRunStatisticY
pmsRunStatisticY.setRunBusIds(String.join(StrUtil.COMMA,busRunSet));
pmsRunStatisticY.setRunStationNum(temStation);
pmsRunStatisticY.setStatDate(LocalDate.parse(date));
poList.add(pmsRunStatisticY);
});
@@ -126,8 +125,7 @@ public class PmsRunStatisticYServiceImpl extends MppServiceImpl<PmsRunStatisticY
public List<PmsRunStatisticY> selectListByDate(String startTime, String endTime, String dataDate) {
return this.list(new LambdaQueryWrapper<PmsRunStatisticY>()
.ge(StrUtil.isNotBlank(startTime), PmsRunStatisticY::getStatisticDate, DateUtil.beginOfDay(DateUtil.parse(startTime)))
.le(StrUtil.isNotBlank(endTime), PmsRunStatisticY::getStatisticDate, DateUtil.endOfDay(DateUtil.parse(endTime)))
.eq(PmsRunStatisticY::getStatDate, dataDate));
.le(StrUtil.isNotBlank(endTime), PmsRunStatisticY::getStatisticDate, DateUtil.endOfDay(DateUtil.parse(endTime))));
}
}

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpMServiceImpl.java
View File

@@ -69,7 +69,6 @@ public class RDimBusUpMServiceImpl extends MppServiceImpl<RDimBusUpMMapper, RDim
@Override
public void handMonth(String date) {
TimeInterval timeInterval = new TimeInterval();
LocalDate localDate = LocalDate.parse(date);
DateTime start = DateUtil.beginOfMonth(DateUtil.parse(date,DatePattern.NORM_DATE_PATTERN));
DateTime end = DateUtil.parse(date);
LocalDate statDate = LocalDate.parse(DateUtil.format(start, DatePattern.NORM_DATE_PATTERN));
@@ -136,7 +135,6 @@ public class RDimBusUpMServiceImpl extends MppServiceImpl<RDimBusUpMMapper, RDim
rDimBusUpM.setBusId(key);
rDimBusUpM.setMidBusId(generatrixWire.getMidBusId());
rDimBusUpM.setStatisticDate(statDate);
rDimBusUpM.setStatDate(localDate);
rDimBusUpM.setEffectId(maxR.getLineIndex());
rDimBusUpM.setEffectIds(effectIds);
rDimBusUpM.setVoltageLevel(generatrixWire.getScale());

1
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpYServiceImpl.java
View File

@@ -135,7 +135,6 @@ public class RDimBusUpYServiceImpl extends MppServiceImpl<RDimBusUpYMapper, RDim
RDimBusUpY.setBusId(key);
RDimBusUpY.setMidBusId(generatrixWire.getMidBusId());
RDimBusUpY.setStatisticDate(statDate);
RDimBusUpY.setStatDate(localDate);
RDimBusUpY.setEffectId(maxR.getLineIndex());
RDimBusUpY.setEffectIds(effectIds);
RDimBusUpY.setVoltageLevel(generatrixWire.getScale());