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
2023-11-27 13:33:48 +08:00
parent 59f425b688
commit 1a3757163b
19 changed files with 509 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java
View File

@@ -11,6 +11,7 @@ import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
import com.njcn.device.biz.pojo.dto.DeptGetBusBarDTO;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
import com.njcn.device.biz.pojo.dto.DeptGetSubStationDTO;
@@ -276,4 +277,48 @@ public class ExecutionCenter extends BaseController {
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("母线算法执行链(主网测点)")
@PostMapping("/generaTrixExecutor")
@Async("asyncExecutor")
public void generaTrixExecutor(@RequestBody BaseParam baseParam) {
String methodDescribe = getMethodDescribe("generaTrixExecutor");
//手动判断参数是否合法,
CalculatedParam calculatedParam = judgeExecuteParam(baseParam);
//母线索引
if (CollectionUtils.isEmpty(calculatedParam.getIdList())) {
Dept dept = deptFeignClient.getRootDept().getData();
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(dept.getId());
deptGetLineParam.setSystemType(0);
List<DeptGetBusBarDTO> busBarList = commTerminalGeneralClient.deptBusBar(deptGetLineParam).getData();
DeptGetBusBarDTO dto = busBarList.stream().filter(u -> Objects.equals(u.getUnitId(),dept.getCode())).findAny().orElse(null);
if (Objects.nonNull(dto)){
calculatedParam.setIdList(dto.getBusBarIds());
}
}
LiteflowResponse liteflowResponse;
if (baseParam.isRepair()) {
//补招时，起始日期、截止日期必填
DateTime startDate = DateUtil.parse(baseParam.getBeginTime(), DatePattern.NORM_DATE_FORMAT);
DateTime endDate = DateUtil.parse(baseParam.getEndTime(), DatePattern.NORM_DATE_FORMAT);
long betweenDay = DateUtil.betweenDay(startDate, endDate, true);
//递增日期执行算法链
for (int i = 0; i < betweenDay; i++) {
if (i != 0) {
startDate = DateUtil.offsetDay(startDate, 1);
}
calculatedParam.setDataDate(DateUtil.format(startDate, DatePattern.NORM_DATE_PATTERN));
liteflowResponse = flowExecutor.execute2Resp("genera_trix", calculatedParam);
dealResponse(calculatedParam,liteflowResponse,methodDescribe);
}
} else {
//非补招
liteflowResponse = flowExecutor.execute2Resp("genera_trix", calculatedParam);
dealResponse(calculatedParam, liteflowResponse, methodDescribe);
}
}
}

52
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/GeneraTrixExecutor.java Normal file
View File

@@ -0,0 +1,52 @@
package com.njcn.prepare.executor;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.service.mysql.dim.IRBusbarVoltageDService;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.annotation.LiteflowMethod;
import com.yomahub.liteflow.core.NodeComponent;
import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
import com.yomahub.liteflow.enums.NodeTypeEnum;
import lombok.RequiredArgsConstructor;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/11/27 10:28
*/
@LiteflowComponent
@RequiredArgsConstructor
public class GeneraTrixExecutor extends BaseExecutor{
private final IRBusbarVoltageDService irBusbarVoltageDService;
@LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rBusbarVoltage", nodeType = NodeTypeEnum.COMMON)
public boolean rBusbarVoltageAccess(NodeComponent bindCmp) {
return isAccess(bindCmp);
}
@LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rBusbarVoltage", nodeType = NodeTypeEnum.COMMON)
public void rBusbarVoltageProcess(NodeComponent bindCmp) {
String tag = bindCmp.getTag();
CalculatedParam calculatedParam = bindCmp.getRequestData();
if (tag.equalsIgnoreCase("r_busbar_voltage_d")) {
//日表
irBusbarVoltageDService.busbarVoltageD(calculatedParam);
} else if (tag.equalsIgnoreCase("r_busbar_voltage_m")) {
//数据补招不执行非日表算法
if (!calculatedParam.isRepair()) {
//月表
}
}else if (tag.equalsIgnoreCase("r_busbar_voltage_y")) {
//数据补招不执行非日表算法
if (!calculatedParam.isRepair()) {
//年表
}
}
}
}

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/MeasurementExecutor.java
View File

@@ -412,7 +412,7 @@ public class MeasurementExecutor extends BaseExecutor {
public void rMpBenchmarkLevelProcess(NodeComponent bindCmp) {
String tag = bindCmp.getTag();
CalculatedParam calculatedParam = bindCmp.getRequestData();
if (Objects.equals(tag,"r_mp_benchmark_level_d")){
if (Objects.equals(tag,"r_mp_benchmark_level_d")){
//日表
irMpBenchmarkLevelDService.benchmarkLevelD(calculatedParam);
} else if (Objects.equals(tag,"r_mp_benchmark_level_m")){

17
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RBusbarVoltageDMapper.java Normal file
View File

@@ -0,0 +1,17 @@
package com.njcn.prepare.harmonic.mapper.mysql.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.harmonic.pojo.po.dim.RBusbarVoltageD;
/**
* <p>
* 母线不同电压等级指标数据-日表 Mapper 接口
* </p>
*
* @author xuyang
* @since 2023-11-27
*/
public interface RBusbarVoltageDMapper extends MppBaseMapper<RBusbarVoltageD> {
}

3
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventDMapper.java
View File

@@ -1,8 +1,7 @@
package com.njcn.prepare.harmonic.mapper.mysql.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.prepare.harmonic.pojo.po.RDimObjEventD;
import com.njcn.harmonic.pojo.po.dim.RDimObjEventD;
/**
* <p>

3
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventMMapper.java
View File

@@ -1,8 +1,7 @@
package com.njcn.prepare.harmonic.mapper.mysql.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.prepare.harmonic.pojo.po.RDimObjEventM;
import com.njcn.harmonic.pojo.po.dim.RDimObjEventM;
/**
* <p>

3
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/dim/RDimObjEventYMapper.java
View File

@@ -1,8 +1,7 @@
package com.njcn.prepare.harmonic.mapper.mysql.dim;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.njcn.prepare.harmonic.pojo.po.RDimObjEventY;
import com.njcn.harmonic.pojo.po.dim.RDimObjEventY;
/**
* <p>

22
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRBusbarVoltageDService.java Normal file
View File

@@ -0,0 +1,22 @@
package com.njcn.prepare.harmonic.service.mysql.dim;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.harmonic.pojo.po.dim.RBusbarVoltageD;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
/**
* <p>
* 母线不同电压等级指标数据-日表 服务类
* </p>
*
* @author xuyang
* @since 2023-11-27
*/
public interface IRBusbarVoltageDService extends IService<RBusbarVoltageD> {
/**
* 插入母线不同电压等级指标数据-日表
*/
void busbarVoltageD(CalculatedParam calculatedParam);
}

5
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventDService.java
View File

@@ -2,11 +2,8 @@ package com.njcn.prepare.harmonic.service.mysql.dim;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.pojo.po.RDimObjEventD;
import java.util.List;
import com.njcn.harmonic.pojo.po.dim.RDimObjEventD;
/**
* <p>

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventMService.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.service.mysql.dim;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.pojo.po.RDimObjEventM;
import com.njcn.harmonic.pojo.po.dim.RDimObjEventM;
/**
* <p>

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/IRDimObjEventYService.java
View File

@@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.service.mysql.dim;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.pojo.po.RDimObjEventY;
import com.njcn.harmonic.pojo.po.dim.RDimObjEventY;
/**
* <p>

38
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RBusbarVoltageDServiceImpl.java Normal file
View File

@@ -0,0 +1,38 @@
package com.njcn.prepare.harmonic.service.mysql.dim.impl;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.LocalDateTimeUtil;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.harmonic.pojo.po.dim.RBusbarVoltageD;
import com.njcn.prepare.harmonic.mapper.mysql.dim.RBusbarVoltageDMapper;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.service.mysql.dim.IRBusbarVoltageDService;
import org.apache.commons.collections4.ListUtils;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.List;
/**
* <p>
* 母线不同电压等级指标数据-日表 服务实现类
* </p>
*
* @author xuyang
* @since 2023-11-27
*/
@Service
public class RBusbarVoltageDServiceImpl extends MppServiceImpl<RBusbarVoltageDMapper, RBusbarVoltageD> implements IRBusbarVoltageDService {
@Override
public void busbarVoltageD(CalculatedParam calculatedParam) {
List<String> busbarList = calculatedParam.getIdList();
System.out.println("母线集合:" + busbarList);
System.out.println("个数:" + busbarList.size());
//以尺寸1000分片
List<List<String>> pendingIds = ListUtils.partition(busbarList,1000);
LocalDateTime beginDay = LocalDateTimeUtil.beginOfDay(LocalDateTimeUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
LocalDateTime endDay = LocalDateTimeUtil.endOfDay(LocalDateTimeUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
}
}

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventDServiceImpl.java
View File

@@ -15,7 +15,7 @@ import com.njcn.prepare.harmonic.mapper.mysql.dim.RDimObjEventDMapper;
import com.njcn.prepare.harmonic.mapper.mysql.line.RMpEventDetailDMapper;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.pojo.param.EventParam;
import com.njcn.prepare.harmonic.pojo.po.RDimObjEventD;
import com.njcn.harmonic.pojo.po.dim.RDimObjEventD;
import com.njcn.prepare.harmonic.service.mysql.dim.IRDimObjEventDService;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;

3
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventMServiceImpl.java
View File

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
@@ -17,7 +16,7 @@ import com.njcn.prepare.harmonic.mapper.mysql.line.ROperatingMonitorMMapper;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorMPO;
import com.njcn.prepare.harmonic.pojo.param.EventParam;
import com.njcn.prepare.harmonic.pojo.po.RDimObjEventM;
import com.njcn.harmonic.pojo.po.dim.RDimObjEventM;
import com.njcn.prepare.harmonic.service.mysql.dim.IRDimObjEventMService;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/dim/impl/RDimObjEventYServiceImpl.java
View File

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
@@ -17,8 +16,7 @@ import com.njcn.prepare.harmonic.mapper.mysql.line.ROperatingMonitorMMapper;
import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam;
import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorMPO;
import com.njcn.prepare.harmonic.pojo.param.EventParam;
import com.njcn.prepare.harmonic.pojo.po.RDimObjEventM;
import com.njcn.prepare.harmonic.pojo.po.RDimObjEventY;
import com.njcn.harmonic.pojo.po.dim.RDimObjEventY;
import com.njcn.prepare.harmonic.service.mysql.dim.IRDimObjEventYService;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;