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

河北超高压上送接口调整-只上送省级数据

Browse Source
This commit is contained in:
xuyang
2024-01-10 10:55:53 +08:00
parent 17dc9c86fc
commit f3b72160c5
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package com.njcn.harmonic.service.upload.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,6 +13,7 @@ import com.njcn.harmonic.mapper.upload.RUploadPointStatisticalDataDMapper;
import com.njcn.harmonic.pojo.dto.upload.MonitorStatisticalDTO;
import com.njcn.harmonic.pojo.param.UploadDataParam;
import com.njcn.harmonic.pojo.param.UploadParam;
import com.njcn.harmonic.pojo.po.upload.RUploadEvaluationDataD;
import com.njcn.harmonic.pojo.po.upload.RUploadPointStatisticalDataD;
import com.njcn.harmonic.pojo.vo.upload.UploadPointStatisticalDataVo;
import com.njcn.harmonic.service.upload.IPointStatisticalDataService;
@@ -64,17 +66,18 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl<RUploadPointSta
List<RUploadPointStatisticalDataD> list;
//指定数据上送,不管之前有没有上送,都重新上送一次
//(预防之前上送过,修改数据后需要再次上送)
if (CollectionUtil.isNotEmpty(param.getList())){
if (CollUtil.isNotEmpty(param.getList())){
list = this.lambdaQuery()
.eq(RUploadPointStatisticalDataD::getStatisticalDate,param.getTime())
.in(RUploadPointStatisticalDataD::getId,param.getList())
.list();
}
//未指定数据上送,则将所有未上送的数据,上送上去
//未指定数据上送,则上送省级数据
else {
list = this.lambdaQuery()
.eq(RUploadPointStatisticalDataD::getStatisticalDate,param.getTime())
.eq(RUploadPointStatisticalDataD::getUploadStatus,0)
.eq(RUploadPointStatisticalDataD::getStatisticalLevel,3)
.list();
}
List<MonitorStatisticalDTO> dtoList = BeanUtil.copyToList(list, MonitorStatisticalDTO.class);

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

@@ -1,6 +1,7 @@
package com.njcn.harmonic.service.upload.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -89,17 +90,18 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
List<RUploadEvaluationDataD> list;
//指定数据上送,不管之前有没有上送,都重新上送一次
//(预防之前上送过,修改数据后需要再次上送)
if (CollectionUtil.isNotEmpty(param.getList())){
if (CollUtil.isNotEmpty(param.getList())){
list = this.lambdaQuery()
.eq(RUploadEvaluationDataD::getStatisticalDate,param.getTime())
.in(RUploadEvaluationDataD::getId,param.getList())
.list();
}
//未指定数据上送,则将所有未上送的数据,上送上去
//未指定数据上送,则上送省级数据
else {
list = this.lambdaQuery()
.eq(RUploadEvaluationDataD::getStatisticalDate,param.getTime())
.eq(RUploadEvaluationDataD::getUploadStatus,0)
.eq(RUploadEvaluationDataD::getStatisticalLevel,3)
.list();
}
List<PqEvaluationCreateDTO> dtoList = BeanUtil.copyToList(list, PqEvaluationCreateDTO.class);

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

@@ -1,6 +1,7 @@
package com.njcn.harmonic.service.upload.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,6 +13,7 @@ import com.njcn.harmonic.mapper.upload.RUploadSubstationStatisticalDataDMapper;
import com.njcn.harmonic.pojo.dto.upload.SubstationQualityStatisticsDTO;
import com.njcn.harmonic.pojo.param.UploadDataParam;
import com.njcn.harmonic.pojo.param.UploadParam;
import com.njcn.harmonic.pojo.po.upload.RUploadPointStatisticalDataD;
import com.njcn.harmonic.pojo.po.upload.RUploadSubstationStatisticalDataD;
import com.njcn.harmonic.pojo.vo.upload.UploadSubstationStatisticalDataVo;
import com.njcn.harmonic.service.upload.ISubstationStatisticalDataService;
@@ -69,7 +71,7 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl<RUploadSu
List<RUploadSubstationStatisticalDataD> list;
//指定数据上送,不管之前有没有上送,都重新上送一次
//(预防之前上送过,修改数据后需要再次上送)
if (CollectionUtil.isNotEmpty(param.getList())){
if (CollUtil.isNotEmpty(param.getList())){
list = this.lambdaQuery()
.eq(RUploadSubstationStatisticalDataD::getStatisticalDate,param.getTime())
.in(RUploadSubstationStatisticalDataD::getId,param.getList())
@@ -80,6 +82,8 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl<RUploadSu
list = this.lambdaQuery()
.eq(RUploadSubstationStatisticalDataD::getStatisticalDate,param.getTime())
.eq(RUploadSubstationStatisticalDataD::getUploadStatus,0)
.eq(RUploadSubstationStatisticalDataD::getCityId,"")
.eq(RUploadSubstationStatisticalDataD::getCountyId,"")
.list();
}
//处理时间