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

1.国网上送相关功能上送

Browse Source
This commit is contained in:
cdf
2024-04-03 11:30:06 +08:00
parent e0d508c7d8
commit a79e468d7d
12 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java
View File

@@ -134,7 +134,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
//(预防之前送上过,修改数据后需要再次上送)
if (CollectionUtil.isNotEmpty(uploadParam.getList())){
list = this.lambdaQuery()
.eq(PqTypicalSourceCreatePO::getStatisticalDate,uploadParam.getTime())
.eq(PqTypicalSourceCreatePO::getComputeDate,uploadParam.getTime())
.in(PqTypicalSourceCreatePO::getId,uploadParam.getList())
.isNotNull(PqTypicalSourceCreatePO::getComputeDate)
.in(PqTypicalSourceCreatePO::getStatisticalLevel,Stream.of("3","4").collect(Collectors.toList()))
@@ -143,7 +143,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
//未指定数据上送,则将所有未上送的数据,上送上去
else {
list = this.lambdaQuery()
.eq(PqTypicalSourceCreatePO::getStatisticalDate,uploadParam.getTime())
.eq(PqTypicalSourceCreatePO::getComputeDate,uploadParam.getTime())
.eq(PqTypicalSourceCreatePO::getIsUploadHead,0)
.isNotNull(PqTypicalSourceCreatePO::getComputeDate)
.in(PqTypicalSourceCreatePO::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))

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

@@ -80,17 +80,15 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl<RUploadPointSta
//(预防之前上送过,修改数据后需要再次上送)
if (CollUtil.isNotEmpty(param.getList())){
list = this.lambdaQuery()
.eq(RUploadPointStatisticalDataD::getStatisticalDate,param.getTime())
.eq(RUploadPointStatisticalDataD::getComputeDate,param.getTime())
.in(RUploadPointStatisticalDataD::getId,param.getList())
.isNotNull(RUploadPointStatisticalDataD::getComputeDate)
.list();
}
//未指定数据上送,则上送省级数据
else {
list = this.lambdaQuery()
.eq(RUploadPointStatisticalDataD::getStatisticalDate,param.getTime())
.eq(RUploadPointStatisticalDataD::getComputeDate,param.getTime())
.eq(RUploadPointStatisticalDataD::getUploadStatus,0)
.isNotNull(RUploadPointStatisticalDataD::getComputeDate)
.in(RUploadPointStatisticalDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
.list();
}

7
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
View File

@@ -95,17 +95,14 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
//(预防之前上送过,修改数据后需要再次上送)
if (CollUtil.isNotEmpty(param.getList())){
list = this.lambdaQuery()
.eq(RUploadEvaluationDataD::getStatisticalDate,param.getTime())
.eq(RUploadEvaluationDataD::getComputeDate,param.getTime())
.in(RUploadEvaluationDataD::getId,param.getList())
.isNotNull(RUploadEvaluationDataD::getComputeDate)
.list();
}
//未指定数据上送,则上送省级数据(包含日、月数据)
else {
list = this.lambdaQuery()
.eq(RUploadEvaluationDataD::getStatisticalDate,param.getTime())
.eq(RUploadEvaluationDataD::getUploadStatus,0)
.isNotNull(RUploadEvaluationDataD::getComputeDate)
.eq(RUploadEvaluationDataD::getComputeDate,param.getTime())
.in(RUploadEvaluationDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
.list();
}

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
View File

@@ -82,10 +82,9 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl<RUploadSu
else {
list = this.lambdaQuery()
.eq(RUploadSubstationStatisticalDataD::getStatisticalDate,param.getTime())
.eq(RUploadSubstationStatisticalDataD::getUploadStatus,0)
.eq(RUploadSubstationStatisticalDataD::getCityId,"")
//.eq(RUploadSubstationStatisticalDataD::getCityId,"")
.isNotNull(RUploadSubstationStatisticalDataD::getComputeDate)
//.eq(RUploadSubstationStatisticalDataD::getCountyId,"")
.eq(RUploadSubstationStatisticalDataD::getCountyId,"")
.list();
}
//以尺寸100分片

3
pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskMRunner.java
View File

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Component;
*/
@Component
@RequiredArgsConstructor
@Deprecated
public class PqTypicalSourceTaskMRunner implements TimerTaskRunner {
private final PqTypicalSourceFeignClient pqTypicalSourceFeignClient;
@@ -22,6 +23,8 @@ public class PqTypicalSourceTaskMRunner implements TimerTaskRunner {
@Override
public void action(String date) {
//月
UploadParam param=new UploadParam();
param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN));

14
pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java
View File

@@ -29,5 +29,19 @@ public class PqTypicalSourceTaskRunner implements TimerTaskRunner {
if(code.equals("A0002")){
throw new BusinessException("失败");
}
//月
param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN));
String codeM = pqTypicalSourceFeignClient.send(param).getCode();
if(codeM.equals("A0002")){
throw new BusinessException("失败");
}
//年
param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_YEAR_PATTERN));
String code2 = pqTypicalSourceFeignClient.send(param).getCode();
if(code2.equals("A0002")){
throw new BusinessException("失败");
}
}
}

1
pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationMRunner.java
View File

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
*/
@Component
@RequiredArgsConstructor
@Deprecated
public class UploadGwTaskEvaluationMRunner implements TimerTaskRunner {
private final UploadGwDataFeignClient uploadGwDataFeignClient;

14
pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationRunner.java
View File

@@ -30,5 +30,19 @@ public class UploadGwTaskEvaluationRunner implements TimerTaskRunner {
if(code.equals("A0002")){
throw new BusinessException("失败");
}
//月
param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN));
String codeM = uploadGwDataFeignClient.uploadEvaluationData(param).getCode();
if(codeM.equals("A0002")){
throw new BusinessException("失败");
}
//年
param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_YEAR_PATTERN));
String code2 = uploadGwDataFeignClient.uploadEvaluationData(param).getCode();
if(code2.equals("A0002")){
throw new BusinessException("失败");
}
}
}

1
pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskMRunner.java
View File

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
*/
@Component
@RequiredArgsConstructor
@Deprecated
public class UploadGwTaskMRunner implements TimerTaskRunner {
private final UploadGwDataFeignClient uploadGwDataFeignClient;

12
pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskRunner.java
View File

@@ -30,5 +30,17 @@ public class UploadGwTaskRunner implements TimerTaskRunner {
if(code.equals("A0002")){
throw new BusinessException("失败");
}
param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN));
String codeM = uploadGwDataFeignClient.uploadPointStatisticalData(param).getCode();
if(codeM.equals("A0002")){
throw new BusinessException("失败");
}
//年
param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_YEAR_PATTERN));
String codeY = uploadGwDataFeignClient.uploadPointStatisticalData(param).getCode();
if(codeY.equals("A0002")){
throw new BusinessException("失败");
}
}
}

1
pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationMRunner.java
View File

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
*/
@Component
@RequiredArgsConstructor
@Deprecated
public class UploadGwTaskSubstationMRunner implements TimerTaskRunner {
private final UploadGwDataFeignClient uploadGwDataFeignClient;

14
pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java
View File

@@ -25,10 +25,22 @@ public class UploadGwTaskSubstationRunner implements TimerTaskRunner {
@Override
public void action(String date) {
UploadParam param = new UploadParam();
param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
/*param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
String code = uploadGwDataFeignClient.uploadSubstationStatisticalData(param).getCode();
if(code.equals("A0002")){
throw new BusinessException("失败");
}
*/
param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN));
String codeM = uploadGwDataFeignClient.uploadSubstationStatisticalData(param).getCode();
if(codeM.equals("A0002")){
throw new BusinessException("失败");
}
//年
param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_YEAR_PATTERN));
String code2 = uploadGwDataFeignClient.uploadSubstationStatisticalData(param).getCode();
if(code2.equals("A0002")){
throw new BusinessException("失败");
}
}
}