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

高级算法代码修改，管理员功能代码移植

Browse Source
This commit is contained in:
雨木c
2023-08-14 10:40:49 +08:00
parent 7716708aef
commit 4d4f1f8344
16 changed files with 428 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/EventRelevantAnalysisController.java
View File

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.netflix.ribbon.proxy.annotation.Http;
import com.njcn.advance.pojo.dto.BalanceInfo;
import com.njcn.advance.pojo.param.AdvanceBaseParam;
import com.njcn.advance.pojo.po.PqsRelevanceLog;
import com.njcn.advance.service.EventRelevantAnalysisService;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
@@ -11,6 +12,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.common.utils.PubUtils;
import com.njcn.event.pojo.po.RmpEventDetailAssPO;
import com.njcn.event.pojo.vo.AdvanceEventDetailVO;
import com.njcn.web.controller.BaseController;
import com.njcn.web.pojo.annotation.DateTimeStrValid;
@@ -50,7 +52,7 @@ public class EventRelevantAnalysisController extends BaseController {
@ApiOperation("启动关联分析")
public HttpResult<Object> processEvents(@RequestParam("startTime") String startTime, @RequestParam("endTime")String endTime) {
String methodDescribe = getMethodDescribe("processEvents");
List<LocalDateTime> timeVal = PubUtils.checkLocalDateTime(startTime,endTime);
List<LocalDateTime> timeVal = PubUtils.checkLocalDate(startTime,endTime);
eventRelevantAnalysisService.processEvents(timeVal.get(0),timeVal.get(1));
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@@ -65,10 +67,66 @@ public class EventRelevantAnalysisController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/querySagEventsPage")
@ApiOperation("高级算法-暂降事件关联分析主列表")
public HttpResult<Page<AdvanceEventDetailVO>> querySagEventsPage(BaseParam baseParam){
public HttpResult<Page<AdvanceEventDetailVO>> querySagEventsPage(@RequestBody BaseParam baseParam){
String methodDescribe = getMethodDescribe("querySagEventsPage");
Page<AdvanceEventDetailVO> list = eventRelevantAnalysisService.querySagEventsPage(baseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
/**
* 事件查看
* @author cdf
* @date 2023/8/11
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryEventsAssPage")
@ApiOperation("事件波形分析主列表")
public HttpResult<Page<RmpEventDetailAssPO>> queryEventsAssPage(@RequestBody BaseParam baseParam){
String methodDescribe = getMethodDescribe("queryEventsAssPage");
Page<RmpEventDetailAssPO> page = eventRelevantAnalysisService.queryEventsAssPage(baseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
}
/**
* 事件详情
* @author cdf
* @date 2023/8/11
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/queryEventDetailByAssId")
@ApiOperation("事件详情查看")
public HttpResult<Page<AdvanceEventDetailVO>> queryEventDetailByAssId(@RequestParam("id")String id,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize){
String methodDescribe = getMethodDescribe("queryEventDetailByAssId");
Page<AdvanceEventDetailVO> page = eventRelevantAnalysisService.queryEventDetailByAssId(id,pageNum,pageSize);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
}
/**
* 操作记录查看
* @author cdf
* @date 2023/8/11
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryRelevantLogPage")
@ApiOperation("事件分析操作记录查看")
public HttpResult<Page<PqsRelevanceLog>> queryRelevantLogPage(@RequestBody BaseParam baseParam){
String methodDescribe = getMethodDescribe("queryRelevantLogPage");
Page<PqsRelevanceLog> page = eventRelevantAnalysisService.queryRelevantLogPage(baseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
}
/**
* 操作记录删除
* @author cdf
* @date 2023/8/11
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/delRelevantLog")
@ApiOperation("操作记录删除")
public HttpResult<Boolean> delRelevantLog(@RequestParam("id")String id){
String methodDescribe = getMethodDescribe("delRelevantLog");
boolean flag = eventRelevantAnalysisService.delRelevantLog(id);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
}

5
pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/RelevantMapper.java → pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/RelevantLogMapper.java
View File

@@ -12,7 +12,7 @@ import java.util.List;
* @author cdf
* @date 2023/6/19
*/
public interface RelevantMapper extends BaseMapper<PqsRelevanceLog> {
public interface RelevantLogMapper extends BaseMapper<PqsRelevanceLog> {
@@ -23,4 +23,7 @@ public interface RelevantMapper extends BaseMapper<PqsRelevanceLog> {
*/
List<EntityLogic> getLogic();
}

2
pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/EventWaveAnalysisMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.advance.mapper.RelevantMapper">
<mapper namespace="com.njcn.advance.mapper.RelevantLogMapper">
<select id="updateCause" resultType="EntityLogic">

2
pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/RelevantMapper.xml → pqs-advance/advance-boot/src/main/java/com/njcn/advance/mapper/mapping/RelevantLogMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.advance.mapper.RelevantMapper">
<mapper namespace="com.njcn.advance.mapper.RelevantLogMapper">
<select id="getLogic" resultType="EntityLogic">
SELECT

31
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/EventRelevantAnalysisService.java
View File

@@ -3,6 +3,8 @@ package com.njcn.advance.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.advance.mapper.RmpEventAdvanceMapper;
import com.njcn.advance.pojo.po.PqsRelevanceLog;
import com.njcn.event.pojo.po.RmpEventDetailAssPO;
import com.njcn.event.pojo.po.RmpEventDetailPO;
import com.njcn.event.pojo.vo.AdvanceEventDetailVO;
import com.njcn.web.pojo.param.BaseParam;
@@ -27,4 +29,33 @@ public interface EventRelevantAnalysisService extends IService<RmpEventDetailPO>
Page<AdvanceEventDetailVO> querySagEventsPage(BaseParam baseParam);
/**
*
* @author cdf
* @date 2023/8/11
*/
Page<RmpEventDetailAssPO> queryEventsAssPage(BaseParam baseParam);
/**
*
* @author cdf
* @date 2023/8/11
*/
Page<AdvanceEventDetailVO> queryEventDetailByAssId(String assId,Integer pageNum,Integer pageSize);
/**
*
* @author cdf
* @date 2023/8/11
*/
Page<PqsRelevanceLog> queryRelevantLogPage(BaseParam baseParam);
/**
* 删除关联操作记录
* @author cdf
* @date 2023/8/11
*/
boolean delRelevantLog(String id);
}

175
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java
View File

@@ -3,16 +3,15 @@ package com.njcn.advance.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.date.TimeInterval;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.advance.enums.AdvanceResponseEnum;
import com.njcn.advance.mapper.RelevantMapper;
import com.njcn.advance.mapper.RelevantLogMapper;
import com.njcn.advance.mapper.RmpEventAdvanceMapper;
import com.njcn.advance.mapper.RmpEventDetailAssMapper;
import com.njcn.advance.pojo.dto.SagEvent;
@@ -28,20 +27,24 @@ import com.njcn.device.pq.api.GeneralDeviceInfoClient;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
import com.njcn.event.api.RmpEventDetailFeignClient;
import com.njcn.event.pojo.po.RmpEventDetailAssPO;
import com.njcn.event.pojo.po.RmpEventDetailPO;
import com.njcn.event.pojo.vo.AdvanceEventDetailVO;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.enums.SystemResponseEnum;
import com.njcn.system.pojo.po.Area;
import com.njcn.system.pojo.po.DictData;
import com.njcn.user.api.UserFeignClient;
import com.njcn.user.pojo.po.User;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.pojo.param.BaseParam;
import com.njcn.web.utils.RequestUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
@@ -66,7 +69,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
private final DicDataFeignClient dicDataFeignClient;
private final RelevantMapper relevantMapper;
private final RelevantLogMapper relevantLogMapper;
private final GeneralDeviceInfoClient generalDeviceInfoClient;
@@ -76,10 +79,12 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
private final RmpEventDetailAssMapper rmpEventDetailAssMapper;
private final UserFeignClient userFeignClient;
@Override
@Transactional(rollbackFor = Exception.class)
public void processEvents(LocalDateTime startTime,LocalDateTime endTime) {
public void processEvents(LocalDateTime startTime, LocalDateTime endTime) {
TimeInterval timeInterval = new TimeInterval();
@@ -92,11 +97,11 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
LocalDateTime date = LocalDateTime.now();
HandleEvent handleEvent = new HandleEvent();
// 分析的事件进行处理
List<EntityGroupEvtData> baseList = handleEvent.getData(generalDeviceInfoClient,startTime,endTime);
List<EntityGroupEvtData> baseList = handleEvent.getData(generalDeviceInfoClient, startTime, endTime);
// 传入的处理事件根据物理隔绝进行分组
List<EntityLogic> strategyList = relevantMapper.getLogic();
List<EntityLogic> strategyList = relevantLogMapper.getLogic();
if (CollectionUtil.isNotEmpty(strategyList)) {
List<SagEvent> listSagEvent = new ArrayList<>();
@@ -120,7 +125,6 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
mapRedis.put(key, entityMtrans);
});
//TODO 是否要处理排序
strategyToBusBarMap.forEach((lastKey, lastVal) -> {
int index = 1;
@@ -211,7 +215,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
entityPqsRelevance.setContentDes(describe);
entityPqsRelevance.setState(DataStateEnum.ENABLE.getCode());
entityPqsRelevance.setTimeId(date);
relevantMapper.insert(entityPqsRelevance);
relevantLogMapper.insert(entityPqsRelevance);
}
@@ -220,7 +224,147 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
@Override
public Page<AdvanceEventDetailVO> querySagEventsPage(BaseParam baseParam) {
return null;
List<String> lineIds = generalDeviceInfoClient.deptGetRunLineEvent(RequestUtil.getDeptIndex()).getData();
if (CollUtil.isEmpty(lineIds)) {
throw new BusinessException("当前部门下不存在监测点");
}
List<LocalDateTime> vTime = PubUtils.checkLocalDate(baseParam.getSearchBeginTime(), baseParam.getSearchEndTime());
LambdaQueryWrapper<RmpEventDetailPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.and(i -> i.isNull(RmpEventDetailPO::getEventassIndex).or().eq(RmpEventDetailPO::getEventassIndex, ""))
.between(RmpEventDetailPO::getStartTime, vTime.get(0), vTime.get(1)).orderByAsc(RmpEventDetailPO::getStartTime)
;
Page<RmpEventDetailPO> poPage = eventAdvanceMapper.selectPage(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
List<RmpEventDetailPO> rmpEventDetailPOList = poPage.getRecords();
if (CollectionUtil.isEmpty(rmpEventDetailPOList)) {
return new Page<>();
}
List<String> tempLineIds = rmpEventDetailPOList.stream().map(RmpEventDetailPO::getLineId).distinct().collect(Collectors.toList());
List<AreaLineInfoVO> temLine = lineFeignClient.getBaseLineAreaInfo(tempLineIds).getData();
Map<String, AreaLineInfoVO> map = temLine.stream().collect(Collectors.toMap(AreaLineInfoVO::getLineId, Function.identity()));
List<AdvanceEventDetailVO> advanceEventDetailVOList = BeanUtil.copyToList(rmpEventDetailPOList, AdvanceEventDetailVO.class);
advanceEventDetailVOList = advanceEventDetailVOList.stream().peek(item -> {
if (map.containsKey(item.getLineId())) {
AreaLineInfoVO areaLineInfoVO = map.get(item.getLineId());
item.setGdName(areaLineInfoVO.getGdName());
item.setSubName(areaLineInfoVO.getSubName());
item.setLineName(areaLineInfoVO.getLineName());
item.setNum(areaLineInfoVO.getNum());
item.setVoltageId(areaLineInfoVO.getVoltageId());
}
}).collect(Collectors.toList());
Page<AdvanceEventDetailVO> page = new Page<>(poPage.getCurrent(), poPage.getSize());
page.setTotal(poPage.getTotal());
page.setRecords(advanceEventDetailVOList);
return page;
}
@Override
public Page<RmpEventDetailAssPO> queryEventsAssPage(BaseParam baseParam) {
List<LocalDateTime> timeV = PubUtils.checkLocalDate(baseParam.getSearchBeginTime(), baseParam.getSearchEndTime());
LambdaQueryWrapper<RmpEventDetailAssPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.between(RmpEventDetailAssPO::getTimeId, timeV.get(0), timeV.get(1))
.orderByAsc(RmpEventDetailAssPO::getTimeId);
Page<RmpEventDetailAssPO> page = rmpEventDetailAssMapper.selectPage(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
return page;
}
@Override
public Page<AdvanceEventDetailVO> queryEventDetailByAssId(String assId,Integer pageNum,Integer pageSize) {
Page<AdvanceEventDetailVO> pageResult = new Page<>(pageNum,pageSize);
LambdaQueryWrapper<RmpEventDetailPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(RmpEventDetailPO::getEventassIndex,assId)
.orderByAsc(RmpEventDetailPO::getStartTime);
Page<RmpEventDetailPO> page = eventAdvanceMapper.selectPage(new Page<>(pageNum,pageSize),lambdaQueryWrapper);
List<RmpEventDetailPO> pos = page.getRecords();
if(CollectionUtil.isEmpty(pos)){
return pageResult;
}
List<String> lineIds = pos.stream().map(RmpEventDetailPO::getMeasurementPointId).distinct().collect(Collectors.toList());
List<AreaLineInfoVO> lineAres = lineFeignClient.getBaseLineAreaInfo(lineIds).getData();
Map<String, AreaLineInfoVO> map = lineAres.stream().collect(Collectors.toMap(AreaLineInfoVO::getLineId,Function.identity()));
List<AdvanceEventDetailVO> advanceEventDetailVOList = BeanUtil.copyToList(pos,AdvanceEventDetailVO.class);
advanceEventDetailVOList = advanceEventDetailVOList.stream().peek(item->{
if(map.containsKey(item.getMeasurementPointId())){
AreaLineInfoVO areaLineInfoVO = map.get(item.getMeasurementPointId());
item.setGdName(areaLineInfoVO.getGdName());
item.setSubName(areaLineInfoVO.getSubName());
item.setLineName(areaLineInfoVO.getLineName());
item.setVoltageId(areaLineInfoVO.getVoltageScale());
}
}).collect(Collectors.toList());
pageResult.setRecords(advanceEventDetailVOList);
pageResult.setTotal(page.getTotal());
return pageResult;
}
@Override
public Page<PqsRelevanceLog> queryRelevantLogPage(BaseParam baseParam) {
LambdaQueryWrapper<PqsRelevanceLog> logLambdaQueryWrapper = new LambdaQueryWrapper<>();
logLambdaQueryWrapper.orderByAsc(PqsRelevanceLog::getTimeId);
Page<PqsRelevanceLog> page = relevantLogMapper.selectPage(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), logLambdaQueryWrapper);
List<PqsRelevanceLog> temList = page.getRecords();
if (CollectionUtil.isEmpty(temList)) {
return page;
}
List<String> userIds = temList.stream().map(PqsRelevanceLog::getCreateBy).distinct().collect(Collectors.toList());
List<User> userTem = userFeignClient.getUserByIdList(userIds).getData();
Map<String, User> map = userTem.stream().collect(Collectors.toMap(User::getId, Function.identity()));
temList = temList.stream().peek(item -> {
if (map.containsKey(item.getCreateBy())) {
item.setCreateName(map.get(item.getCreateBy()).getName());
}
}).collect(Collectors.toList());
page.setRecords(temList);
return page;
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean delRelevantLog(String id) {
PqsRelevanceLog pqsRelevanceLog = relevantLogMapper.selectById(id);
if (Objects.nonNull(pqsRelevanceLog)) {
LambdaQueryWrapper<RmpEventDetailAssPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(RmpEventDetailAssPO::getCreateTime, pqsRelevanceLog.getTimeId()).select(RmpEventDetailAssPO::getEventAssId);
List<RmpEventDetailAssPO> rmpEventDetailAssPOList = rmpEventDetailAssMapper.selectList(lambdaQueryWrapper);
List<String> temAssIds = rmpEventDetailAssPOList.stream().map(RmpEventDetailAssPO::getEventAssId).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(temAssIds)) {
rmpEventDetailAssMapper.deleteBatchIds(temAssIds);
LambdaUpdateWrapper<RmpEventDetailPO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(RmpEventDetailPO::getEventassIndex, temAssIds);
RmpEventDetailPO update = new RmpEventDetailPO();
update.setEventassIndex("");
eventAdvanceMapper.update(update, updateWrapper);
}
}
relevantLogMapper.deleteById(id);
return true;
}
@@ -263,13 +407,13 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
return group_buf;
}
public List<EntityGroupEvtData> getData(GeneralDeviceInfoClient generalDeviceInfoClient,LocalDateTime startTime,LocalDateTime endTime) {
public List<EntityGroupEvtData> getData(GeneralDeviceInfoClient generalDeviceInfoClient, LocalDateTime startTime, LocalDateTime endTime) {
List<EntityGroupEvtData> entityGroupEvtDataList = new ArrayList<>();
List<DictData> advanceType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_TYPE.getCode()).getData();
Map<String, DictData> advanceMap = advanceType.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
List<AdvanceEventDetailVO> advanceEventDetailVOLsit = querySagEventsAll(startTime,endTime);
List<AdvanceEventDetailVO> advanceEventDetailVOLsit = querySagEventsAll(startTime, endTime);
for (int i = 0; i < advanceEventDetailVOLsit.size(); i++) { // 获取监测点线路序号
@@ -412,7 +556,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
* 获取变压器信息并生成矩阵
*************************************************************************************/
public void getNodeInfo(HandleEvent handleEvent) {
List<EntityLogic> list = relevantMapper.getLogic();
List<EntityLogic> list = relevantLogMapper.getLogic();
if (CollectionUtil.isNotEmpty(list)) {
Map<String, List<EntityLogic>> tfMap = list.stream().collect(Collectors.groupingBy(EntityLogic::getTPIndex));
@@ -438,8 +582,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl<RmpEventAdvanc
}
public List<AdvanceEventDetailVO> querySagEventsAll(LocalDateTime startTime,LocalDateTime endTime) {
public List<AdvanceEventDetailVO> querySagEventsAll(LocalDateTime startTime, LocalDateTime endTime) {
List<String> lineIds = generalDeviceInfoClient.deptGetRunLineEvent(RequestUtil.getDeptIndex()).getData();
if (CollUtil.isNotEmpty(lineIds)) {

12
pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventWaveAnalysisServiceImpl.java
View File

@@ -219,19 +219,11 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
}
log.info("高级算法波形计算" + timeInterval.interval());
return null;
return entityAdvancedData;
}
// 1-值调用暂降类型dll 2-两个dll都调用
private void judgeEvt(int type, String eventIndex, WaveData waveData, Rect rect, EntityAdvancedData entityAdvancedData) {
try {
//getDataFromDLL(type, eventIndex, waveData, rect, entityAdvancedData);
} catch (Exception e) {
//eventDetailMapper.updateDealFlag(3, eventIndex); //计算失败
log.error(e.getMessage());
}
}
/**
* @return