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-06-08 16:33:53 +08:00
parent ec6e27a4eb
commit 91df5cb181
20 changed files with 279 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java
View File

@@ -213,11 +213,14 @@ public class COverlimitUtil {
private static float iHarmCalculate(int nHarm, Float voltageLevel,float protocolCapacity, float devCapacity,float calCap) {
double tag = calCap*getHarmTag(nHarm,voltageLevel);
Double limit = getHarmonicLimit(nHarm,tag,new BigDecimal(String.valueOf(devCapacity)).doubleValue(),new BigDecimal(String.valueOf(protocolCapacity)).doubleValue());
BigDecimal bigDecimal = new BigDecimal(limit).setScale(4,RoundingMode.HALF_UP);
BigDecimal bigDecimal = BigDecimal.valueOf(limit).setScale(4,RoundingMode.HALF_UP);
return bigDecimal.floatValue();
}
//电流谐波限值
/**
* 电流谐波限值
*/
private static Double getHarmTag(Integer iCount, Float voltageLevel) {
int x, y;
if (voltageLevel < DicDataEnum.KV6.getValue()) {

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptLineController.java
View File

@@ -7,7 +7,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.LogUtil;
import com.njcn.device.pms.service.DeptLineService;
import com.njcn.device.pms.service.ledgerManger.DeptLineService;
import com.njcn.web.controller.BaseController;
import com.njcn.web.pojo.param.DeptLineParam;
import io.swagger.annotations.Api;

24
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java
View File

@@ -20,17 +20,17 @@ import com.njcn.device.pms.service.majornetwork.IMonitorService;
import com.njcn.device.biz.pojo.po.Overlimit;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.File;
import java.util.List;
import java.util.Objects;
@@ -283,6 +283,22 @@ public class PmsMonitorController extends BaseController {
}
/**
* oracle系统监测点转mysql主网监测点
* @author cdf
* @date 2023/6/8
*/
@PostMapping("/importOracleLedgerToMysql")
@ApiOperation("获取台账和终端信息(波形专用)")
@ApiImplicitParam(name = "param", value = "主网监测点实体", required = true)
public void importOracleLedgerToMysql(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) {
String methodDescribe = getMethodDescribe("importOracleLedgerToMysql");
monitorService.importOracleLedgerToMysql(file,response);
}
}

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/DeptLineService.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/DeptLineService.java
View File

@@ -1,4 +1,4 @@
package com.njcn.device.pms.service;
package com.njcn.device.pms.service.ledgerManger;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.pq.pojo.po.DeptLine;

3
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java
View File

@@ -1,6 +1,5 @@
package com.njcn.device.pms.service.ledgerManger.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.njcn.common.pojo.enums.common.ServerEnum;
@@ -15,7 +14,7 @@ import com.njcn.device.biz.utils.COverlimitUtil;
import com.njcn.device.pms.mapper.majornetwork.*;
import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
import com.njcn.device.pms.pojo.po.*;
import com.njcn.device.pms.service.DeptLineService;
import com.njcn.device.pms.service.ledgerManger.DeptLineService;
import com.njcn.device.pms.service.ledgerManger.CommTerminalService;
import com.njcn.redis.utils.RedisUtil;
import com.njcn.system.api.DicDataFeignClient;

4
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/DeptLineServiceImpl.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/DeptLineServiceImpl.java
View File

@@ -1,10 +1,10 @@
package com.njcn.device.pms.service.impl;
package com.njcn.device.pms.service.ledgerManger.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.device.pms.mapper.DeptLineMapper;
import com.njcn.device.pq.pojo.po.DeptLine;
import com.njcn.device.pms.service.DeptLineService;
import com.njcn.device.pms.service.ledgerManger.DeptLineService;
import com.njcn.web.pojo.param.DeptLineParam;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

9
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java
View File

@@ -13,8 +13,10 @@ import com.njcn.device.pms.pojo.po.Monitor;
import com.njcn.device.pms.pojo.vo.MonitorVO;
import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
import com.njcn.device.biz.pojo.po.Overlimit;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -144,5 +146,12 @@ public interface IMonitorService extends IService<Monitor> {
List<DeptGetChildrenDTO> deptMonitor(DeptGetLineParam param);
/**
*
* @author cdf
* @date 2023/6/8
*/
void importOracleLedgerToMysql(MultipartFile file, HttpServletResponse response);
}

44
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
View File

@@ -1,5 +1,8 @@
package com.njcn.device.pms.service.majornetwork.impl;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -10,6 +13,7 @@ import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
import com.njcn.device.biz.pojo.param.DeptGetLineParam;
import com.njcn.device.biz.utils.COverlimit;
@@ -25,9 +29,12 @@ import com.njcn.device.pms.pojo.vo.MonitorVO;
import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService;
import com.njcn.device.pms.service.majornetwork.IMonitorService;
import com.njcn.device.pq.pojo.bo.excel.NodeExcel;
import com.njcn.device.pq.pojo.bo.excel.OverLimitExcel;
import com.njcn.device.pq.pojo.po.Line;
import com.njcn.device.pq.pojo.po.LineDetail;
import com.njcn.device.pq.pojo.po.Voltage;
import com.njcn.poi.util.PoiUtil;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.user.api.DeptFeignClient;
@@ -44,7 +51,9 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -369,6 +378,41 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
return deviceInfos;
}
@Override
public void importOracleLedgerToMysql(MultipartFile file, HttpServletResponse response) {
/* ImportParams importParams = new ImportParams();
importParams.setHeadRows(1);
importParams.setTitleRows(1);
importParams.setNeedVerify(true);
try {
ExcelImportResult<OracleTerminalExcel> terminalExcelExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), OracleTerminalExcel.class, importParams);
//如果存在非法数据，将不合格的数据导出
if (terminalExcelExcelImportResult.isVerifyFail()) {
PoiUtil.exportFileByWorkbook(terminalExcelExcelImportResult.getFailWorkbook(), "非法台账信息.xlsx", response);
} else {
//执行台账信息导入（不考虑，存在监测点却不存在限值信息）
}
} catch (Exception e) {
throw new BusinessException(DeviceResponseEnum.IMPORT_ORACLE_EXCEPTION);
}*/
}
/*private void dealData(List<OracleTerminalExcel> oracleTerminalExcelList){
List<DeptDTO> allDept = deptFeignClient.getDeptDescendantIndexes(deptFeignClient.getRootDept().getData().getId(),Stream.of(0,1,2).collect(Collectors.toList())).getData();
Map<String, DeptDTO> mapDept = allDept.stream().collect(Collectors.toMap(DeptDTO::getName,Function.identity()));
for(OracleTerminalExcel oracleTerminalExcel : oracleTerminalExcelList){
//单位
if(oracleTerminalExcel.get)
//电站
}
}*/
/**
* 获取主配网监测点id集合
* @param deptDTO

31
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineParam.java
View File

@@ -152,9 +152,38 @@ public class LineParam {
@NotNull(message = "电压下偏差限值不能为空")
private Float uvoltageDev;
@ApiModelProperty(name = "powerSubstationName",value = "电网侧变电站")
private String powerSubstationName;
/**
* 修改标识
* 分类等级
*/
@ApiModelProperty(name = "calssificationGrade",value = "分类等级")
private String calssificationGrade;
@ApiModelProperty(name = "superiorsSubstation",value = "上级电站")
private String superiorsSubstation;
@ApiModelProperty(name = "hangLine",value = "挂接线路")
private String hangLine;
@ApiModelProperty(name = "owner",value = "监测点拥有者")
private String owner;
@ApiModelProperty(name = "ownerDuty",value = "拥有者职务")
private String ownerDuty;
@ApiModelProperty(name = "ownerTel",value = "拥有者联系方式")
private String ownerTel;
@ApiModelProperty(name = "wiringDiagram",value = "接线图")
private String wiringDiagram;
@ApiModelProperty(name = "updateFlag",value = "修改标识")
private Integer updateFlag;

42
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java
View File

@@ -1,6 +1,7 @@
package com.njcn.device.pq.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -124,4 +125,45 @@ public class LineDetail{
private String remark;
/**
* 电网侧变电站
*/
private String powerSubstationName;
/**
* 分类等级
*/
private String calssificationGrade;
/**
* 上级电站
*/
private String superiorsSubstation;
/**
* 挂接线路
*/
private String hangLine;
/**
* 监测点拥有者
*/
private String owner;
/**
* 拥有者职务
*/
private String ownerDuty;
/**
* 拥有者联系方式
*/
private String ownerTel;
/**
* 接线图
*/
private String wiringDiagram;
}

24
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java
View File

@@ -81,4 +81,28 @@ public class LineDetailDataVO {
@ApiModelProperty(name = "timeInterval",value = "测量间隔（1-10分钟）")
private Integer timeInterval;
/**
* 监测点拥有者
*/
@ApiModelProperty(name = "owner",value = "监测点拥有者")
private String owner;
/**
* 拥有者职务
*/
@ApiModelProperty(name = "ownerDuty",value = "拥有者职务")
private String ownerDuty;
/**
* 拥有者联系方式
*/
@ApiModelProperty(name = "ownerTel",value = "拥有者联系方式")
private String ownerTel;
/**
* 接线图
*/
@ApiModelProperty(name = "wiringDiagram",value = "接线图")
private String wiringDiagram;
}

1
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
View File

@@ -502,6 +502,7 @@
detail.Short_Capacity,
detail.Standard_Capacity,
detail.Deal_Capacity,
detail.Business_Type,
detail.Calssification_Grade,
detail.Superiors_Substation,
detail.Hang_Line,

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
View File

@@ -142,6 +142,10 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
lineDetailDataVO.setShortCapacity(lineDetail.getShortCapacity());
lineDetailDataVO.setStandardCapacity(lineDetail.getStandardCapacity());
lineDetailDataVO.setTimeInterval (lineDetail.getTimeInterval ());
lineDetailDataVO.setOwner(lineDetail.getOwner());
lineDetailDataVO.setOwnerDuty(lineDetail.getOwnerDuty());
lineDetailDataVO.setOwnerTel(lineDetail.getOwnerTel());
lineDetailDataVO.setWiringDiagram(lineDetail.getWiringDiagram());
return lineDetailDataVO;
}