From 3d622f6da82dac4866f71a1aa05f95bb7ff207bc Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Mon, 4 Mar 2024 18:20:26 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=85=B8=E5=9E=8B=E6=BA=90?= =?UTF-8?q?=E8=8D=B7=E6=8C=87=E6=A0=87=E6=9C=88=E7=BB=9F=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=B3=95=202.=E5=A2=9E=E5=8A=A0=E5=9B=BD=E7=BD=91=E4=B8=8A?= =?UTF-8?q?=E9=80=81=E6=9C=88=E7=BB=9F=E8=AE=A1=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gwPush/impl/MonitorSendServiceImpl.java | 1 + .../majornetwork/Impl/ReportServiceImpl.java | 1 + .../harmonic/pojo/param/SendQueryParam.java | 4 + .../pojo/po/send/PqTypicalSourceCreatePO.java | 8 +- .../PqTypicalSourceCreatePOServiceImpl.java | 57 ++++++--- .../prepare/executor/OrgPointExecutor.java | 12 +- .../send/PqTypicalSourceCreatePOMapper.java | 5 + .../mapping/PqTypicalSourceCreatePOMapper.xml | 90 +++++++++++++++ .../send/PqTypicalSourceCreatePOService.java | 8 +- .../PqTypicalSourceCreatePOServiceImpl.java | 109 ++++++++++++++++++ .../tasks/PqTypicalSourceTaskMRunner.java | 32 +++++ .../tasks/UploadGwTaskEvaluationMRunner.java | 34 ++++++ .../timer/tasks/UploadGwTaskMRunner.java | 34 ++++++ .../tasks/UploadGwTaskSubstationMRunner.java | 34 ++++++ 14 files changed, 407 insertions(+), 22 deletions(-) create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/mapping/PqTypicalSourceCreatePOMapper.xml create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskMRunner.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationMRunner.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskMRunner.java create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationMRunner.java diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java index 042301bdc..7fb6e79f1 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java @@ -485,6 +485,7 @@ public class MonitorSendServiceImpl implements MonitorSendService { sendVO.setTractionName(traction.getName()); sendVO.setRailwayName(traction.getRailwayLineName()); sendVO.setRailwayType(traction.getRailwayType()); + sendVO.setRailwayNumber(traction.getRailwayLineId()); sendVO.setTractionCode(traction.getId()); sendVO.setTractionSubstationCapacity(traction.getRatedCapacity()); sendVO.setTractionSubstationId(monitor.getPowerrId()); diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java index ec1454ff9..6d186ec4e 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java @@ -2025,6 +2025,7 @@ public class ReportServiceImpl implements ReportService { .eq(StrUtil.isNotBlank(deviceInfoParam.getWaveType()), RmpEventDetailPO::getEventType, deviceInfoParam.getWaveType()) .ge(StringUtils.isNotBlank(deviceInfoParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime()))) .le(StringUtils.isNotBlank(deviceInfoParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime()))) + .orderByDesc(RmpEventDetailPO::getStartTime) ); //集合拷贝 List eventDetailList = BeanUtil.copyToList(pageInfo.getRecords(), WaveTypeVO.class); diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/SendQueryParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/SendQueryParam.java index 01ef60fee..379a0ec8a 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/SendQueryParam.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/SendQueryParam.java @@ -40,5 +40,9 @@ public class SendQueryParam extends BaseParam { @NotNull(message="显示条数不能为空！") @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) private Integer pageSize; + + @ApiModelProperty("时间维度") + @NotBlank(message = "时间维度不可为空") + private String dataType; } } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java index e7f49df67..c5eeff95c 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java @@ -19,18 +19,24 @@ import java.math.BigDecimal; @Data @TableName(value = "pq_typical_source_create") public class PqTypicalSourceCreatePO { + + private static final long serialVersionUID = 1L; + @TableId(value = "id", type = IdType.INPUT) private String id; + //统计日期 @TableField(value = "statisticalDate") private String statisticalDate; + //统计层级 @TableField(value = "statisticalLevel") private String statisticalLevel; - + //统计类型 01年 02月 03日 @TableField(value = "statisticalType") private String statisticalType; + //典型源荷用户 @TableField(value = "indexType") private String indexType; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java index c252acbbb..05ff4ce4f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java @@ -2,17 +2,22 @@ package com.njcn.harmonic.service.send.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.UploadDataParam; import com.njcn.harmonic.pojo.param.UploadParam; import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO; +import com.njcn.harmonic.pojo.po.upload.RUploadEvaluationDataD; import com.njcn.harmonic.service.send.PqTypicalSourceCreatePOService; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.po.Dept; @@ -65,32 +70,24 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl list = Arrays.stream(dept.getPids().split(",")).map(String::trim).collect(Collectors.toList()); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - + String beginMonth = formatBeginMonth(param.getSearchBeginTime(), param.getDataType()); switch (list.size()) { - //国、省 + //国 case 1: - List l1 = deptFeignClient.getDirectSonSelf(dept.getId()).getData(); - String orgId = l1.stream().filter(o->!Objects.equals(o.getId(),dept.getId())).findFirst().orElse(null).getCode(); - lambdaQueryWrapper.eq(PqTypicalSourceCreatePO::getProvinceId,orgId) - .between(PqTypicalSourceCreatePO::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime()) - .eq(!Objects.isNull(param.getSearchState()),PqTypicalSourceCreatePO::getIsUploadHead,param.getSearchState()); + String orgId = getOrgIdForProvince(dept); + addFiltersForProvince(lambdaQueryWrapper, orgId, beginMonth, param.getSearchState()); break; + //省 case 2: - lambdaQueryWrapper.eq(PqTypicalSourceCreatePO::getProvinceId,param.getDeptIndex()) - .between(PqTypicalSourceCreatePO::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime()) - .eq(!Objects.isNull(param.getSearchState()),PqTypicalSourceCreatePO::getIsUploadHead,param.getSearchState()); + addFilters(lambdaQueryWrapper, PqTypicalSourceCreatePO::getProvinceId, param.getDeptIndex(), beginMonth, param.getSearchState()); break; //市 case 3: - lambdaQueryWrapper.eq(PqTypicalSourceCreatePO::getCityId, param.getDeptIndex()) - .between(PqTypicalSourceCreatePO::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime()) - .eq(!Objects.isNull(param.getSearchState()),PqTypicalSourceCreatePO::getIsUploadHead,param.getSearchState()); + addFilters(lambdaQueryWrapper, PqTypicalSourceCreatePO::getCityId, param.getDeptIndex(), beginMonth, param.getSearchState()); break; //县 case 4: - lambdaQueryWrapper.eq(PqTypicalSourceCreatePO::getCountyId, param.getDeptIndex()) - .between(PqTypicalSourceCreatePO::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime()) - .eq(!Objects.isNull(param.getSearchState()),PqTypicalSourceCreatePO::getIsUploadHead,param.getSearchState()); + addFilters(lambdaQueryWrapper, PqTypicalSourceCreatePO::getCountyId, param.getDeptIndex(), beginMonth, param.getSearchState()); break; default: break; @@ -98,6 +95,34 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl lambdaQueryWrapper, String orgId, String beginMonth, Integer searchState) { + lambdaQueryWrapper.eq(PqTypicalSourceCreatePO::getProvinceId, orgId) + .eq(PqTypicalSourceCreatePO::getStatisticalDate, beginMonth) + .eq(!Objects.isNull(searchState), PqTypicalSourceCreatePO::getIsUploadHead, searchState); + } + + private void addFilters(LambdaQueryWrapper lambdaQueryWrapper, SFunction idFunction, String orgId, String beginMonth, Integer searchState) { + lambdaQueryWrapper.eq(idFunction, orgId) + .eq(PqTypicalSourceCreatePO::getStatisticalDate, beginMonth) + .eq(!Objects.isNull(searchState), PqTypicalSourceCreatePO::getIsUploadHead, searchState); + } + + private String getOrgIdForProvince(Dept dept) { + List l1 = deptFeignClient.getDirectSonSelf(dept.getId()).getData(); + return l1.stream() + .filter(o -> !Objects.equals(o.getId(), dept.getId())) + .findFirst() + .map(Dept::getCode) + .orElse(null); + } + @Override public String send(UploadParam uploadParam) { diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java index 28bb330ec..a91834329 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java @@ -658,8 +658,18 @@ public class OrgPointExecutor extends BaseExecutor{ } @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "pqTypicalSourceCreatePOService", nodeType = NodeTypeEnum.COMMON) public void pqTypicalSourceCreatePOServiceProcess(NodeComponent bindCmp) { + String tag = bindCmp.getTag(); CalculatedParam calculatedParam = bindCmp.getRequestData(); - pqTypicalSourceCreatePOService.handlerDay(calculatedParam); + if (tag.equalsIgnoreCase("pq_typical_source_create_d")) { + //日表 + pqTypicalSourceCreatePOService.handlerDay(calculatedParam); + } else if (tag.equalsIgnoreCase("pq_typical_source_create_m")) { + //数据补招不执行非日表算法 + if (!calculatedParam.isRepair()) { + //月表 + pqTypicalSourceCreatePOService.handlerMonth(calculatedParam); + } + } } /** * 河北国网上送接口 diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/PqTypicalSourceCreatePOMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/PqTypicalSourceCreatePOMapper.java index aa7bf4657..3b71bf544 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/PqTypicalSourceCreatePOMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/PqTypicalSourceCreatePOMapper.java @@ -2,6 +2,7 @@ package com.njcn.prepare.harmonic.mapper.mysql.send; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO; +import org.apache.ibatis.annotations.Param; /** * @@ -12,4 +13,8 @@ import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO; * @version V1.0.0 */ public interface PqTypicalSourceCreatePOMapper extends BaseMapper { + + PqTypicalSourceCreatePO selectAvg(@Param("param") PqTypicalSourceCreatePO param, + @Param("startTime")String begin, + @Param("endTime")String end); } \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/mapping/PqTypicalSourceCreatePOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/mapping/PqTypicalSourceCreatePOMapper.xml new file mode 100644 index 000000000..e03906da8 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/mapping/PqTypicalSourceCreatePOMapper.xml @@ -0,0 +1,90 @@ + + + + + + \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/PqTypicalSourceCreatePOService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/PqTypicalSourceCreatePOService.java index 91e5d3aa1..eb1577375 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/PqTypicalSourceCreatePOService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/PqTypicalSourceCreatePOService.java @@ -6,15 +6,15 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; /** - * * Description: * Date: 2023/12/12 15:16【需求编号】 * * @author clam * @version V1.0.0 */ -public interface PqTypicalSourceCreatePOService extends IService{ +public interface PqTypicalSourceCreatePOService extends IService { + void handlerDay(CalculatedParam calculatedParam); - void handlerDay(CalculatedParam calculatedParam); - } + void handlerMonth(CalculatedParam calculatedParam); +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java index 138ba02b9..c9d01683e 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java @@ -1,7 +1,11 @@ package com.njcn.prepare.harmonic.service.mysql.send.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -31,6 +35,7 @@ import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.vo.PvTerminalTreeVO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; @@ -273,6 +278,110 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl calculatedParam) { + List pqTypicalSourceCreatePOList = new ArrayList<>(); + //查询时间范围 + String begin = DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toString(); + String end = DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)).toString(); + String date = begin.substring(0, 7); + + /*3.45 典型源荷用户类型*/ + List collect = Stream.of(DicDataEnum.TRACTIONSTATION.getCode(), + DicDataEnum.WINDFARM_USER.getCode(), + DicDataEnum.PHOTOVOLTAICSIT_EUSERS.getCode(), + DicDataEnum.OTHER_INTERFERENCESOURCE_USERS.getCode()).collect(Collectors.toList()); + + + List deptList = deptFeignClient.allDeptList().getData(); + Map mapCode = deptList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getCode, Function.identity())); + Map mapList = deptList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, Function.identity())); + + for (DeptGetChildrenMoreDTO deptGetChildrenMoreDTO : calculatedParam.getIdList()) { + + collect.stream().forEach(temp->{ + PqTypicalSourceCreatePO pqTypicalSourceCreatePO = new PqTypicalSourceCreatePO(); + if (temp.equals(DicDataEnum.TRACTIONSTATION.getCode())){ + pqTypicalSourceCreatePO.setIndustryType("99"); + + } else if (temp.equals(DicDataEnum.WINDFARM_USER.getCode())) { + pqTypicalSourceCreatePO.setIndustryType("99"); + + }else if(temp.equals(DicDataEnum.PHOTOVOLTAICSIT_EUSERS.getCode())) { + pqTypicalSourceCreatePO.setIndustryType("99"); + }else if(temp.equals(DicDataEnum.OTHER_INTERFERENCESOURCE_USERS.getCode())) { + pqTypicalSourceCreatePO.setIndustryType("00"); + + } + if (mapCode.containsKey(deptGetChildrenMoreDTO.getUnitId())) { + PvTerminalTreeVO pvTerminalTreeVO = mapCode.get(deptGetChildrenMoreDTO.getUnitId()); + String[] split = (pvTerminalTreeVO.getPids() + StrUtil.COMMA + pvTerminalTreeVO.getId()) + .split(StrUtil.COMMA); + if (split.length <3) { + return; + } + + for (int i = 2; i < split.length; i++) { + //省 + if (i == 2) { + if (mapList.containsKey(split[i])) { + pvTerminalTreeVO = mapList.get(split[i]); + pqTypicalSourceCreatePO.setProvinceName(pvTerminalTreeVO.getName()); + pqTypicalSourceCreatePO.setProvinceId(pvTerminalTreeVO.getCode()); + pqTypicalSourceCreatePO.setStatisticalLevel("3"); + } + } + //市 + if (i == 3) { + if (mapList.containsKey(split[i])) { + pvTerminalTreeVO = mapList.get(split[i]); + pqTypicalSourceCreatePO.setCityName(pvTerminalTreeVO.getName()); + pqTypicalSourceCreatePO.setCityId(pvTerminalTreeVO.getCode()); + pqTypicalSourceCreatePO.setStatisticalLevel("4"); + + } + } + //县 + if (i == 4) { + if (mapList.containsKey(split[i])) { + pvTerminalTreeVO = mapList.get(split[i]); + pqTypicalSourceCreatePO.setCountyName(pvTerminalTreeVO.getName()); + pqTypicalSourceCreatePO.setCountyId(pvTerminalTreeVO.getCode()); + pqTypicalSourceCreatePO.setStatisticalLevel("5"); + + } + } + } + } + pqTypicalSourceCreatePO.setIndexType(temp); + pqTypicalSourceCreatePO.setStatisticalDate(date); + pqTypicalSourceCreatePO.setStatisticalType("03"); + PqTypicalSourceCreatePO po= this.baseMapper.selectAvg(pqTypicalSourceCreatePO, begin, end); + if(ObjectUtil.isNotNull(po)){ + po.setId(deptGetChildrenMoreDTO.getUnitId()+"-"+pqTypicalSourceCreatePO.getIndexType()+"-"+pqTypicalSourceCreatePO.getStatisticalType()+"-"+calculatedParam.getDataDate()); + po.setStatisticalType("02"); + po.setIndexType(temp); + po.setStatisticalDate(date); + po.setProvinceName(pqTypicalSourceCreatePO.getProvinceName()); + po.setProvinceId(pqTypicalSourceCreatePO.getProvinceId()); + po.setCityName(pqTypicalSourceCreatePO.getCityName()); + po.setCityId(pqTypicalSourceCreatePO.getCityId()); + po.setCountyName(pqTypicalSourceCreatePO.getCountyName()); + po.setCountyId(pqTypicalSourceCreatePO.getCountyId()); + po.setStatisticalLevel(pqTypicalSourceCreatePO.getStatisticalLevel()); + po.setIndustryType(pqTypicalSourceCreatePO.getIndustryType()); + pqTypicalSourceCreatePOList.add(po); + } + }); + + + } + if(!CollectionUtils.isEmpty(pqTypicalSourceCreatePOList)){ + this.saveOrUpdateBatch(pqTypicalSourceCreatePOList); + } + } + private PqTypicalSourceCreatePO initPqTypicalSourceCreatePO(PqTypicalSourceCreatePO pqTypicalSourceCreatePO, // String code, diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskMRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskMRunner.java new file mode 100644 index 000000000..1acc88140 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskMRunner.java @@ -0,0 +1,32 @@ +package com.njcn.system.timer.tasks; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.harmonic.api.PqTypicalSourceFeignClient; +import com.njcn.harmonic.pojo.param.UploadParam; +import com.njcn.system.timer.TimerTaskRunner; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + + +/** + * 典型源荷指标统计数据 + */ +@Component +@RequiredArgsConstructor +public class PqTypicalSourceTaskMRunner implements TimerTaskRunner { + + private final PqTypicalSourceFeignClient pqTypicalSourceFeignClient; + + + @Override + public void action(String date) { + UploadParam param=new UploadParam(); + param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN)); + String code = pqTypicalSourceFeignClient.send(param).getCode(); + if(code.equals("A0002")){ + throw new BusinessException("失败"); + } + } +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationMRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationMRunner.java new file mode 100644 index 000000000..05de7d306 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationMRunner.java @@ -0,0 +1,34 @@ +package com.njcn.system.timer.tasks; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.harmonic.api.UploadGwDataFeignClient; +import com.njcn.harmonic.pojo.param.UploadParam; +import com.njcn.system.timer.TimerTaskRunner; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * 类的介绍：国网数据每日上送定时任务 + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/12/15 13:45 + */ +@Component +@RequiredArgsConstructor +public class UploadGwTaskEvaluationMRunner implements TimerTaskRunner { + + private final UploadGwDataFeignClient uploadGwDataFeignClient; + + @Override + public void action(String date) { + UploadParam param = new UploadParam(); + param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN)); + String code = uploadGwDataFeignClient.uploadEvaluationData(param).getCode(); + if(code.equals("A0002")){ + throw new BusinessException("失败"); + } + } +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskMRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskMRunner.java new file mode 100644 index 000000000..583858bd7 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskMRunner.java @@ -0,0 +1,34 @@ +package com.njcn.system.timer.tasks; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.harmonic.api.UploadGwDataFeignClient; +import com.njcn.harmonic.pojo.param.UploadParam; +import com.njcn.system.timer.TimerTaskRunner; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * 类的介绍：国网数据每日上送定时任务 + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/12/15 13:45 + */ +@Component +@RequiredArgsConstructor +public class UploadGwTaskMRunner implements TimerTaskRunner { + + private final UploadGwDataFeignClient uploadGwDataFeignClient; + + @Override + public void action(String date) { + UploadParam param = new UploadParam(); + param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN)); + String code = uploadGwDataFeignClient.uploadPointStatisticalData(param).getCode(); + if(code.equals("A0002")){ + throw new BusinessException("失败"); + } + } +} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationMRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationMRunner.java new file mode 100644 index 000000000..7ce921c72 --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationMRunner.java @@ -0,0 +1,34 @@ +package com.njcn.system.timer.tasks; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.harmonic.api.UploadGwDataFeignClient; +import com.njcn.harmonic.pojo.param.UploadParam; +import com.njcn.system.timer.TimerTaskRunner; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * 类的介绍：国网数据每日上送定时任务 + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/12/15 13:45 + */ +@Component +@RequiredArgsConstructor +public class UploadGwTaskSubstationMRunner implements TimerTaskRunner { + + private final UploadGwDataFeignClient uploadGwDataFeignClient; + + @Override + public void action(String date) { + UploadParam param = new UploadParam(); + param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN)); + String code = uploadGwDataFeignClient.uploadSubstationStatisticalData(param).getCode(); + if(code.equals("A0002")){ + throw new BusinessException("失败"); + } + } +}