From f3b72160c57a41e97058317c16de2dc4968d1079 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Wed, 10 Jan 2024 10:55:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E5=8C=97=E8=B6=85=E9=AB=98=E5=8E=8B?= =?UTF-8?q?=E4=B8=8A=E9=80=81=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4-?= =?UTF-8?q?=E5=8F=AA=E4=B8=8A=E9=80=81=E7=9C=81=E7=BA=A7=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upload/impl/PointStatisticalDataServiceImpl.java | 7 +++++-- .../service/upload/impl/REvaluationDataServiceImpl.java | 6 ++++-- .../upload/impl/RSubstationStatisticalDataServiceImpl.java | 6 +++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java index b305f8d97..8703f06ce 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java @@ -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 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 dtoList = BeanUtil.copyToList(list, MonitorStatisticalDTO.class); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java index e163f9f52..f39565069 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java @@ -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 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 dtoList = BeanUtil.copyToList(list, PqEvaluationCreateDTO.class); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java index 6fda2e89c..7af78a642 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java @@ -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 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