国网上送

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterDetailStatisticsController.java

@@ -8,6 +8,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.harmonic.pojo.param.SendQueryParam;
+import com.njcn.harmonic.pojo.param.UploadParam;
 import com.njcn.harmonic.pojo.po.send.ConverterDetailStatisticsPO;
 import com.njcn.harmonic.service.send.ConverterDetailStatisticsPOService;
 import com.njcn.web.controller.BaseController;
@@ -22,8 +23,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  *需求：
  *  * FWJK-PMS3.0-TC0013-电能质量管理两级贯通接口V1.10
@@ -58,10 +57,10 @@ public class ConverterDetailStatisticsController extends BaseController {
     @PostMapping("send")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("上报")
-    @ApiImplicitParam(name = "ids",value = "请求体",required = true)
+    @ApiImplicitParam(name = "uploadParam",value = "请求体",required = true)
-    public HttpResult<String> send(@RequestBody List<String> ids){
+    public HttpResult<String> send(@RequestBody UploadParam uploadParam){
         String methodDescribe = getMethodDescribe("send");
-        String s = converterDetailStatisticsPOService.send(ids);
+        String s = converterDetailStatisticsPOService.send(uploadParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
     }
 

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterIndexStatisticsController.java

@@ -8,6 +8,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.harmonic.pojo.param.SendQueryParam;
+import com.njcn.harmonic.pojo.param.UploadParam;
 import com.njcn.harmonic.pojo.po.send.ConverterIndexStatisticsPO;
 import com.njcn.harmonic.service.send.ConverterIndexStatisticsPOService;
 import com.njcn.web.controller.BaseController;
@@ -22,8 +23,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * Description:河北国网上送接口
  *      *2.4.1.18	接收电能质量换流站指标汇总统计数据接口
@@ -54,10 +53,10 @@ public class ConverterIndexStatisticsController extends BaseController {
     @PostMapping("send")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("上报")
-    @ApiImplicitParam(name = "ids",value = "请求体",required = true)
+    @ApiImplicitParam(name = "uploadParam",value = "请求体",required = true)
-    public HttpResult<String> send(@RequestBody List<String> ids){
+    public HttpResult<String> send( @RequestBody UploadParam uploadParam){
         String methodDescribe = getMethodDescribe("send");
-        String s = converterIndexStatisticsPOService.send(ids);
+        String s = converterIndexStatisticsPOService.send(uploadParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
     }
 

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/PqTypicalSourceCreateController.java

@@ -8,6 +8,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.harmonic.pojo.param.SendQueryParam;
+import com.njcn.harmonic.pojo.param.UploadParam;
 import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO;
 import com.njcn.harmonic.service.send.PqTypicalSourceCreatePOService;
 import com.njcn.web.controller.BaseController;
@@ -54,10 +55,10 @@ public class PqTypicalSourceCreateController extends BaseController {
     @PostMapping("send")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("上报")
-    @ApiImplicitParam(name = "ids",value = "请求体",required = true)
+    @ApiImplicitParam(name = "uploadParam",value = "请求体",required = true)
-    public HttpResult<String> send(@RequestBody List<String> ids){
+    public HttpResult<String> send(@RequestBody UploadParam uploadParam){
         String methodDescribe = getMethodDescribe("send");
-        String s = pqTypicalSourceCreatePOService.send(ids);
+        String s = pqTypicalSourceCreatePOService.send(uploadParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
     }
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterDetailStatisticsPOService.java

@@ -3,10 +3,9 @@ package com.njcn.harmonic.service.send;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.harmonic.pojo.param.SendQueryParam;
+import com.njcn.harmonic.pojo.param.UploadParam;
 import com.njcn.harmonic.pojo.po.send.ConverterDetailStatisticsPO;
 
-import java.util.List;
-
 /**
  * 
  * Description:
@@ -20,5 +19,5 @@ public interface ConverterDetailStatisticsPOService extends IService<ConverterDe
 
     Page<ConverterDetailStatisticsPO> queryPage(SendQueryParam.SendPageParam param);
 
-    String send(List<String> ids);
+    String send(UploadParam uploadParam);
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterIndexStatisticsPOService.java

@@ -3,10 +3,9 @@ package com.njcn.harmonic.service.send;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.harmonic.pojo.param.SendQueryParam;
+import com.njcn.harmonic.pojo.param.UploadParam;
 import com.njcn.harmonic.pojo.po.send.ConverterIndexStatisticsPO;
 
-import java.util.List;
-
 /**
  * 
  * Description:
@@ -20,5 +19,5 @@ public interface ConverterIndexStatisticsPOService extends IService<ConverterInd
 
     Page<ConverterIndexStatisticsPO> queryPage(SendQueryParam.SendPageParam param);
 
-    String send(List<String> ids);
+    String send(UploadParam uploadParam);
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/PqTypicalSourceCreatePOService.java

@@ -3,10 +3,9 @@ package com.njcn.harmonic.service.send;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.harmonic.pojo.param.SendQueryParam;
+import com.njcn.harmonic.pojo.param.UploadParam;
 import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO;
 
-import java.util.List;
-
 /**
  * 
  * Description:
@@ -20,5 +19,5 @@ public interface PqTypicalSourceCreatePOService extends IService<PqTypicalSource
 
     Page<PqTypicalSourceCreatePO> queryPage(SendQueryParam.SendPageParam param);
 
-    String send(List<String> ids);
+    String send(UploadParam uploadParam);
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterDetailStatisticsPOServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.harmonic.service.send.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,6 +11,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.harmonic.mapper.send.ConverterDetailStatisticsPOMapper;
 import com.njcn.harmonic.pojo.dto.ConverterDetailStatisticsDTO;
 import com.njcn.harmonic.pojo.param.SendQueryParam;
+import com.njcn.harmonic.pojo.param.UploadParam;
 import com.njcn.harmonic.pojo.po.send.ConverterDetailStatisticsPO;
 import com.njcn.harmonic.service.send.ConverterDetailStatisticsPOService;
 import com.njcn.user.api.DeptFeignClient;
@@ -18,6 +20,7 @@ import com.njcn.web.pojo.param.SendParam;
 import com.njcn.web.utils.GwSendUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.ListUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -55,23 +58,40 @@ public class ConverterDetailStatisticsPOServiceImpl extends ServiceImpl<Converte
     }
 
     @Override
-    public String send(List<String> ids) {
+    public String send(UploadParam param) {
 
-        List<ConverterDetailStatisticsPO> list = this.lambdaQuery().eq(ConverterDetailStatisticsPO::getId, ids).list();
+        List<ConverterDetailStatisticsPO> list;
-
+        //指定数据上送,不管之前有没有上送,都重新上送一次
-        if (list.size() > 100) {
+        //(预防之前送上过,修改数据后需要再次上送)
-            throw new BusinessException("一次最多上送100条数据");
+        if (CollectionUtil.isNotEmpty(param.getList())){
+            list = this.lambdaQuery()
+                    .eq(ConverterDetailStatisticsPO::getStatisticalDate,param.getTime())
+                    .in(ConverterDetailStatisticsPO::getId,param.getList())
+                    .list();
         }
-        List<ConverterDetailStatisticsDTO> converterDetailStatisticsDTOList = BeanUtil.copyToList(list, ConverterDetailStatisticsDTO.class);
+        //未指定数据上送,则将所有未上送的数据,上送上去
-        SendParam param = new SendParam();
+        else {
-        param.setStats(converterDetailStatisticsDTOList);
+            list = this.lambdaQuery()
-        String s = JSONObject.toJSONStringWithDateFormat(param, JSON.DEFFAULT_DATE_FORMAT);
+                    .eq(ConverterDetailStatisticsPO::getStatisticalDate,param.getTime())
-        log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！");
+                    .eq(ConverterDetailStatisticsPO::getIsUploadHead,0)
-        Map<String, String> send = GwSendUtil.send(param, GWSendEnum.SUBSTATION_MONITOR);
+                    .list();
-        log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！");
+        }
+        List<ConverterDetailStatisticsDTO> dtoList = BeanUtil.copyToList(list, ConverterDetailStatisticsDTO.class);
+        //以尺寸100分片
+        List<List<ConverterDetailStatisticsDTO>> pendingIds = ListUtils.partition(dtoList, 100);
+        pendingIds.forEach(temp->{
+            SendParam sendParam = new SendParam();
+            sendParam.setStats(temp);
+            String s = JSONObject.toJSONStringWithDateFormat(param, JSON.DEFFAULT_DATE_FORMAT);
+            log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！");
+            Map<String, String> send = GwSendUtil.send(sendParam, GWSendEnum.SUBSTATION_MONITOR);
+            log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！");
 
-        List<String> trIds = converterDetailStatisticsDTOList.stream().map(ConverterDetailStatisticsDTO::getId).distinct().collect(Collectors.toList());
+            List<String> trIds = temp.stream().map(ConverterDetailStatisticsDTO::getId).distinct().collect(Collectors.toList());
-        return returnInformation(1, trIds, send);
+            returnInformation(1, trIds, send);
+        });
+
+        return "成功";
     }
 
     /**

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterIndexStatisticsPOServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.harmonic.service.send.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,6 +11,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.harmonic.mapper.send.ConverterIndexStatisticsPOMapper;
 import com.njcn.harmonic.pojo.dto.ConverterIndexStatisticsDTO;
 import com.njcn.harmonic.pojo.param.SendQueryParam;
+import com.njcn.harmonic.pojo.param.UploadParam;
 import com.njcn.harmonic.pojo.po.send.ConverterIndexStatisticsPO;
 import com.njcn.harmonic.service.send.ConverterIndexStatisticsPOService;
 import com.njcn.user.api.DeptFeignClient;
@@ -18,6 +20,7 @@ import com.njcn.web.pojo.param.SendParam;
 import com.njcn.web.utils.GwSendUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.ListUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -52,22 +55,40 @@ public class ConverterIndexStatisticsPOServiceImpl extends ServiceImpl<Converter
     }
 
     @Override
-    public String send(List<String> ids) {
+    public String send(UploadParam uploadParam) {
-        List<ConverterIndexStatisticsPO> list = this.lambdaQuery().eq(ConverterIndexStatisticsPO::getId, ids).list();
+        List<ConverterIndexStatisticsPO> list;
-
+        //指定数据上送,不管之前有没有上送,都重新上送一次
-        if (list.size() > 100) {
+        //(预防之前送上过,修改数据后需要再次上送)
-            throw new BusinessException("一次最多上送100条数据");
+        if (CollectionUtil.isNotEmpty(uploadParam.getList())){
+            list = this.lambdaQuery()
+                    .eq(ConverterIndexStatisticsPO::getStatisticalDate,uploadParam.getTime())
+                    .in(ConverterIndexStatisticsPO::getId,uploadParam.getList())
+                    .list();
         }
-        List<ConverterIndexStatisticsDTO> converterIndexStatisticsDTOS = BeanUtil.copyToList(list, ConverterIndexStatisticsDTO.class);
+        //未指定数据上送,则将所有未上送的数据,上送上去
-        SendParam param = new SendParam();
+        else {
-        param.setStats(converterIndexStatisticsDTOS);
+            list = this.lambdaQuery()
-        String s = JSONObject.toJSONStringWithDateFormat(param, JSON.DEFFAULT_DATE_FORMAT);
+                    .eq(ConverterIndexStatisticsPO::getStatisticalDate,uploadParam.getTime())
-        log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！");
+                    .eq(ConverterIndexStatisticsPO::getIsUploadHead,0)
-        Map<String, String> send = GwSendUtil.send(param, GWSendEnum.DETAIL_CREATE);
+                    .list();
-        log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！");
+        }
+        List<ConverterIndexStatisticsDTO> dtoList = BeanUtil.copyToList(list, ConverterIndexStatisticsDTO.class);
+        //以尺寸100分片
+        List<List<ConverterIndexStatisticsDTO>> pendingIds = ListUtils.partition(dtoList, 100);
+        pendingIds.forEach(temp->{
+            SendParam sendParam = new SendParam();
+            sendParam.setStats(temp);
+            String s = JSONObject.toJSONStringWithDateFormat(sendParam, JSON.DEFFAULT_DATE_FORMAT);
+            log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！");
+            Map<String, String> send = GwSendUtil.send(sendParam, GWSendEnum.SUBSTATION_MONITOR);
+            log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！");
+
+            List<String> trIds = temp.stream().map(ConverterIndexStatisticsDTO::getId).distinct().collect(Collectors.toList());
+            returnInformation(1, trIds, send);
+        });
+
+        return "成功";
 
-        List<String> trIds = converterIndexStatisticsDTOS.stream().map(ConverterIndexStatisticsDTO::getId).distinct().collect(Collectors.toList());
-        return returnInformation(1, trIds, send);
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package com.njcn.harmonic.service.send.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -10,6 +11,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.harmonic.mapper.send.PqTypicalSourceCreatePOMapper;
 import com.njcn.harmonic.pojo.dto.PqTypicalSourceCreateDTO;
 import com.njcn.harmonic.pojo.param.SendQueryParam;
+import com.njcn.harmonic.pojo.param.UploadParam;
 import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO;
 import com.njcn.harmonic.service.send.PqTypicalSourceCreatePOService;
 import com.njcn.user.api.DeptFeignClient;
@@ -18,6 +20,7 @@ import com.njcn.web.pojo.param.SendParam;
 import com.njcn.web.utils.GwSendUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.ListUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -53,22 +56,41 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
     }
 
     @Override
-    public String send(List<String> ids) {
+    public String send(UploadParam uploadParam) {
-        List<PqTypicalSourceCreatePO> list = this.lambdaQuery().eq(PqTypicalSourceCreatePO::getId, ids).list();
 
-        if (list.size() > 100) {
+        List<PqTypicalSourceCreatePO> list;
-            throw new BusinessException("一次最多上送100条数据");
+        //指定数据上送,不管之前有没有上送,都重新上送一次
+        //(预防之前送上过,修改数据后需要再次上送)
+        if (CollectionUtil.isNotEmpty(uploadParam.getList())){
+            list = this.lambdaQuery()
+                    .eq(PqTypicalSourceCreatePO::getStatisticalDate,uploadParam.getTime())
+                    .in(PqTypicalSourceCreatePO::getId,uploadParam.getList())
+                    .list();
         }
-        List<PqTypicalSourceCreateDTO> pqTypicalSourceCreateDTOList = BeanUtil.copyToList(list, PqTypicalSourceCreateDTO.class);
+        //未指定数据上送,则将所有未上送的数据,上送上去
-        SendParam param = new SendParam();
+        else {
-        param.setStats(pqTypicalSourceCreateDTOList);
+            list = this.lambdaQuery()
-        String s = JSONObject.toJSONStringWithDateFormat(param, JSON.DEFFAULT_DATE_FORMAT);
+                    .eq(PqTypicalSourceCreatePO::getStatisticalDate,uploadParam.getTime())
-        log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！");
+                    .eq(PqTypicalSourceCreatePO::getIsUploadHead,0)
-        Map<String, String> send = GwSendUtil.send(param, GWSendEnum.TYPICAL_SOURCE);
+                    .list();
-        log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！");
+        }
+        List<PqTypicalSourceCreateDTO> dtoList = BeanUtil.copyToList(list, PqTypicalSourceCreateDTO.class);
+        //以尺寸100分片
+        List<List<PqTypicalSourceCreateDTO>> pendingIds = ListUtils.partition(dtoList, 100);
+        pendingIds.forEach(temp->{
+            SendParam sendParam = new SendParam();
+            sendParam.setStats(temp);
+            String s = JSONObject.toJSONStringWithDateFormat(sendParam, JSON.DEFFAULT_DATE_FORMAT);
+            log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！");
+            Map<String, String> send = GwSendUtil.send(sendParam, GWSendEnum.SUBSTATION_MONITOR);
+            log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！");
+
+            List<String> trIds = temp.stream().map(PqTypicalSourceCreateDTO::getId).distinct().collect(Collectors.toList());
+            returnInformation(1, trIds, send);
+        });
+
+        return "成功";
 
-        List<String> trIds = pqTypicalSourceCreateDTOList.stream().map(PqTypicalSourceCreateDTO::getId).distinct().collect(Collectors.toList());
-        return returnInformation(1, trIds, send);
     }
 
     /**