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

1.解决mysql语句关键字问题

Browse Source 
2.mysql台账同步oracle
This commit is contained in:
wr
2024-10-11 16:42:02 +08:00
parent f291c85e27
commit 08c5e44755
27 changed files with 887 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java
View File

@@ -27,6 +27,9 @@ public enum SupervisionResponseEnum {
DELETE_TO_BE_SUBMITTED("A00550","流程删除失败，只有待提交信息可删除!"),
EXISTENCE_OR_NOT("A00550","信息查询为空,请检查信息是否存在!"),
NAME_EXISTS("A00550","名称重复"),
PROJECT_OR_NOT("A00550","项目名称为空，请检查信息是否存在!"),
PROVINCE_OR_NOT("A00550","省级名称为空，请检查信息是否存在!"),
GD_OR_NOT("A00550","供电名称为空，请检查信息是否存在!"),
;
private final String code;

86
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/oracle/PqDevice.java Normal file
View File

@@ -0,0 +1,86 @@
package com.njcn.supervision.pojo.param.oracle;
import lombok.Data;
import java.io.Serializable;
/**
*
* @TableName PQ_DEVICE
*/
@Data
public class PqDevice implements Serializable {
/**
* 装置名称（唯一性判断）
*/
private String name;
/**
* 装置通讯状态（0：中断；1：正常）
*/
private Integer status;
/**
* （关联表PQS_Dicdata）装置型号Guid
*/
private String devtype;
/**
* 登录时间
*/
private String logontime;
/**
* 数据更新时间
*/
private String updatetime;
/**
* （关联表NodeInformation）服务器表序号，表明这台设备运行在哪台服务器上
*/
private String nodeName;
/**
* 端口ID，用于端口映射
*/
private Integer portid;
/**
* 装置状态（0：投运；1：热备用；2：停运）
*/
private Integer devflag;
/**
* 装置识别码，采用3ds加密
*/
private String devSeries;
/**
* 装置秘钥，采用3ds加密
*/
private String devKey;
/**
* IP地址
*/
private String ip;
/**
* 装置模型（0：虚拟设备；1：实际设备；2：离线设备；）默认是实际设备
*/
private Integer devmodel;
/**
* 已召唤标志
*/
private Integer callflag;
/**
* 数据类型（0：暂态系统；1：稳态系统；2：两个系统）
*/
private Integer datatype;
}

90
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/oracle/PqDevicedetail.java Normal file
View File

@@ -0,0 +1,90 @@
package com.njcn.supervision.pojo.param.oracle;
import lombok.Data;
import java.io.Serializable;
/**
*
* @TableName PQ_DEVICEDETAIL
*/
@Data
public class PqDevicedetail implements Serializable {
/**
* （关联PQS_Dicdata）设备制造商Guid
*/
private String manufacturer;
/**
* 定检状态（0：已检 1：未检）
*/
private Integer checkflag;
/**
* 本次定检时间
*/
private String thistimecheck;
/**
* 下次定检时间（假如跟当前时间比少于3个月则定检状态界面显示为待检）
*/
private String nexttimecheck;
/**
* 统计在线率总数
*/
private Integer onlineratetj;
/**
* 总套餐流量
*/
private Integer dataplan;
/**
* 新增流量套餐
*/
private Integer newtraffic;
/**
* 电度功能
*/
private Integer electroplate;
/**
* 对时功能
*/
private Integer ontime;
/**
* 合同号
*/
private String contract;
/**
* SIM卡号
*/
private String sim;
/**
* 装置系列
*/
private String devCatena;
/**
* 监测装置安装位置
*/
private String devLocation;
/**
* 监测厂家设备编号
*/
private String devNo;
/**
* 告警功能
*/
private Integer isAlarm;
}

36
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/oracle/PqDevtypeicd.java Normal file
View File

@@ -0,0 +1,36 @@
package com.njcn.supervision.pojo.param.oracle;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
/**
*
* @TableName PQ_DEVTYPEICD
*/
@TableName(value ="PQ_DEVTYPEICD")
@Data
public class PqDevtypeicd implements Serializable {
/**
*
*/
@TableField(value = "DEVTYPE")
private String devtype;
/**
*
*/
@TableField(value = "ICDTEMPLATEBLOB")
private byte[] icdtemplateblob;
/**
*
*/
@TableField(value = "ICDTEMPLATECLOB")
private String icdtemplateclob;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}

20
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/oracle/PqGdinformation.java Normal file
View File

@@ -0,0 +1,20 @@
package com.njcn.supervision.pojo.param.oracle;
import lombok.Data;
import java.io.Serializable;
/**
*
* @TableName PQ_GDINFORMATION 供电公司信息表
*/
@Data
public class PqGdinformation implements Serializable {
/**
* (关联表PQS_DICDATA外键)省份Guid
*/
private String name;
}

72
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/oracle/PqLine.java Normal file
View File

@@ -0,0 +1,72 @@
package com.njcn.supervision.pojo.param.oracle;
import lombok.Data;
import java.io.Serializable;
/**
*
* @TableName PQ_LINE
*/
@Data
public class PqLine implements Serializable {
/**
* 线路名称
*/
private String name;
/**
* PT一次变比
*/
private Double pt1;
/**
* PT二次变比
*/
private Double pt2;
/**
* CT一次变比
*/
private Double ct1;
/**
* CT二次变比
*/
private Double ct2;
/**
* 设备容量
*/
private Double devcmp;
/**
* 短路容量
*/
private Double dlcmp;
/**
* 基准容量
*/
private Double jzcmp;
/**
* 协议容量
*/
private Double xycmp;
/**
*
*/
private String scale;
/**
* 0投运 1.热备用 2.停运
*/
private Integer status;
}

121
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/oracle/PqLinedetail.java Normal file
View File

@@ -0,0 +1,121 @@
package com.njcn.supervision.pojo.param.oracle;
import lombok.Data;
import java.io.Serializable;
/**
*
* @TableName PQ_LINEDETAIL
*/
@Data
public class PqLinedetail implements Serializable {
/**
* 线路名称
*/
private String lineName;
/**
* 接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)
*/
private Integer pttype;
/**
* 上次数据更新时间
*/
private String lastTime;
/**
* 测量间隔（1~10）
*/
private Integer tinterval;
/**
* （关联PQS_Dicdata表）负荷类型Guid
*/
private String loadtype;
/**
* （关联PQS_Dicdata表）行业类型Guid
*/
private String businesstype;
/**
* 备注
*/
private String remark;
/**
* 国网谐波监测平台监测点号
*/
private String monitorId;
/**
* 0-电网侧，1-非电网侧
*/
private Integer powerid;
/**
* 监测点对象名称
*/
private String objname;
/**
* 统计类型
*/
private Integer statflag;
/**
* 监测点等级
*/
private String lineGrade;
/**
* 电网侧变电站名称
*/
private String powerSubstationName;
/**
* 挂接线路
*/
private String hangLine;
/**
* 监测点拥有者
*/
private String owner;
/**
* 拥有者职务
*/
private String ownerDuty;
/**
* 拥有者联系方式
*/
private String ownerTel;
/**
* 接线图
*/
private String wiringDiagram;
/**
* 上级电站
*/
private String superiorsSubstation;
/**
* 分类等级 内容为Ⅰ、Ⅱ、Ⅲ、Ⅳ
*/
private String classificationGrade;
/**
* 是否并网点
*/
private Integer isGridPoint;
}

22
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/oracle/PqProject.java Normal file
View File

@@ -0,0 +1,22 @@
package com.njcn.supervision.pojo.param.oracle;
import lombok.Data;
import java.io.Serializable;
/**
*
* @author web2023
* @TableName PQ_PROJECT 项目信息表
*/
@Data
public class PqProject implements Serializable {
/**
* 项目名称（唯一性判断）
*/
private String name;
}

22
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/oracle/PqProvince.java Normal file
View File

@@ -0,0 +1,22 @@
package com.njcn.supervision.pojo.param.oracle;
import lombok.Data;
import java.io.Serializable;
/**
*
* @author web2023
* @TableName PQ_PROVINCE 省级信息表
*/
@Data
public class PqProvince implements Serializable {
/**
* 省级名称（唯一性判断）
*/
private String name;
}

24
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/oracle/PqSubstation.java Normal file
View File

@@ -0,0 +1,24 @@
package com.njcn.supervision.pojo.param.oracle;
import lombok.Data;
import java.io.Serializable;
/**
*
* @TableName PQ_SUBSTATION
*/
@Data
public class PqSubstation implements Serializable {
/**
*
*/
private String name;
/**
* （关联PQS_Dictionary表）电压等级Guid
*/
private String scale;
}

37
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/oracle/PqSubvoltage.java Normal file
View File

@@ -0,0 +1,37 @@
package com.njcn.supervision.pojo.param.oracle;
import lombok.Data;
import java.io.Serializable;
/**
*
* @TableName PQ_SUBVOLTAGE
*/
@Data
public class PqSubvoltage implements Serializable {
/**
* 母线名称
*/
private String name;
/**
* 母线号（在同一台设备中的电压通道号）
*/
private Integer subvNum;
/**
* （关联表PQS_Dicdata）电压等级Guid
*/
private String scale;
/**
* 母线模型（0：虚拟母线；1：实际母线）
* 默认是实际母线
*/
private Integer subvmodel;
}

31
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/oracle/PqsMap.java Normal file
View File

@@ -0,0 +1,31 @@
package com.njcn.supervision.pojo.param.oracle;
import lombok.Data;
import java.io.Serializable;
/**
*
* @TableName PQS_MAP 变电站经纬度
*/
@Data
public class PqsMap implements Serializable {
/**
* 经度
*/
private Double longitude;
/**
* 纬度
*/
private Double latitude;
/**
* 数据状态（0：删除；1：正常）
*/
private Integer state;
}

69
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/oracle/SyncLedger.java Normal file
View File

@@ -0,0 +1,69 @@
package com.njcn.supervision.pojo.param.oracle;
import lombok.Data;
import java.io.Serializable;
/**
* @author wr
* @description
* @date 2024/10/9 16:37
*/
@Data
public class SyncLedger implements Serializable {
/**
* 线路信息表
*/
private PqLine pqLine;
/**
* 线路参数附加定义表
*/
private PqLinedetail pqLinedetail;
/**
* 母线信息表
*/
private PqSubvoltage pqSubvoltage;
/**
* 装置信息表
*/
private PqDevice pqDevice;
/**
* 装置详细信息表
*/
private PqDevicedetail pqDevicedetail;
/**
* 变电站信息表
*/
private PqSubstation pqSubstation;
/**
* 变电站经纬度
*/
private PqsMap pqsMap;
/**
* 供电公司信息表
*/
private PqGdinformation pqGdinformation;
/**
* 省级信息表，层次高于供电公司
*/
private PqProvince pqProvince;
/**
* 项目信息表，层次高于省级
*/
private PqProject pqProject;
/**
* 线路号（在同一台设备中的监测点号）
*/
private Integer lineNum;
}

184
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
View File

@@ -21,17 +21,22 @@ import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.pq.api.DeptLineFeignClient;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.api.NodeClient;
import com.njcn.device.pq.api.TerminalBaseClient;
import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
import com.njcn.device.pq.pojo.param.*;
import com.njcn.device.pq.pojo.po.Line;
import com.njcn.device.pq.pojo.po.Node;
import com.njcn.supervision.enums.SupervisionKeyEnum;
import com.njcn.supervision.enums.SupervisionResponseEnum;
import com.njcn.supervision.enums.UserNatureEnum;
import com.njcn.supervision.mapper.device.SupervisionTempLineDebugPOMapper;
import com.njcn.supervision.mapper.user.UserReportNormalMapper;
import com.njcn.supervision.pojo.param.device.SupervisionTempLineDebugParam;
import com.njcn.supervision.pojo.param.oracle.*;
import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO;
import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
@@ -47,17 +52,22 @@ import com.njcn.supervision.service.user.UserReportProjectPOService;
import com.njcn.supervision.service.user.UserReportSensitivePOService;
import com.njcn.supervision.service.user.UserReportSubstationPOService;
import com.njcn.supervision.utils.InstanceUtil;
import com.njcn.system.api.AreaFeignClient;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.api.DictTreeFeignClient;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.po.Area;
import com.njcn.system.pojo.po.DictData;
import com.njcn.system.pojo.po.SysDicTreePO;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.api.UserFeignClient;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.utils.RequestUtil;
import com.njcn.web.utils.RestTemplateUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -91,6 +101,15 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
private final UserReportSensitivePOService userReportSensitivePOService;
private final UserReportNormalMapper userReportNormalMapper;
private final TerminalBaseClient terminalBaseClient;
private final AreaFeignClient areaFeignClient;
private final NodeClient nodeClient;
@Value("${oracle.isSync}")
private Boolean isSync;
@Value("${oracle.syncLedgerLineUrl}")
private String url;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -403,7 +422,15 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
syncTerminalParam.setSubVoltageParam(subVoltageParam);
syncTerminalParam.setLineParam(lineParam);
if(isSync){
/***
* oracle http远程调用接口
*/
SyncLedger syncLedger = oracleSyncLedger(syncTerminalParam);
ResponseEntity<String> userEntity = RestTemplateUtil.post(url, syncLedger, String.class);
}
String substation = terminalBaseClient.terminalSync(syncTerminalParam).getData();
this.updateProcessStatus(id, 5);
tempDevice.setSubstation(substation);
supervisionTempDeviceReportService.updateById(tempDevice);
@@ -438,8 +465,165 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
.in(SupervisionTempLineDebugPO::getId, supervisionId));
}
private SyncLedger oracleSyncLedger(SyncTerminalParam param) {
SyncLedger ledger = new SyncLedger();
List<Line> data = lineFeignClient.getBaseLineList(Arrays.asList(param.getProjectIndex(),
param.getProvinceIndex(),
param.getGdIndex()
)).getData();
//项目信息表
PqProject pqProject=new PqProject();
List<Line> project = data.stream().filter(x -> x.getId().equals(param.getProjectIndex())).collect(Collectors.toList());
if(CollUtil.isNotEmpty(project)){
pqProject.setName(project.get(0).getName());
}else{
throw new BusinessException(SupervisionResponseEnum.PROJECT_OR_NOT);
}
ledger.setPqProject(pqProject);
//省级项目表
PqProvince pqProvince=new PqProvince();
List<Line> province = data.stream().filter(x -> x.getId().equals(param.getProvinceIndex())).collect(Collectors.toList());
if(CollUtil.isNotEmpty(province)){
Area area = areaFeignClient.selectIdArea(province.get(0).getName()).getData();
pqProvince.setName(area.getName());
}else {
throw new BusinessException(SupervisionResponseEnum.PROVINCE_OR_NOT);
}
ledger.setPqProvince(pqProvince);
//供电公司表
PqGdinformation pqGdinformation=new PqGdinformation();
List<Line> gd = data.stream().filter(x -> x.getId().equals(param.getGdIndex())).collect(Collectors.toList());
if(CollUtil.isNotEmpty(gd)){
pqGdinformation.setName(gd.get(0).getName());
}else{
throw new BusinessException(SupervisionResponseEnum.GD_OR_NOT);
}
ledger.setPqGdinformation(pqGdinformation);
//变电站
PqSubstation pqSubstation=new PqSubstation();
SubStationParam subStation = param.getSubStationParam();
if(ObjectUtil.isNull(subStation)){
PollutionSubstationDTO sub = lineFeignClient.getSubstationInfo(param.getSubIndex()).getData();
subStation =new SubStationParam();
subStation.setName(sub.getName());
subStation.setScale(sub.getVoltageLevel());
subStation.setLng(sub.getLng());
subStation.setLat(sub.getLat());
}
pqSubstation.setName(subStation.getName());
pqSubstation.setScale(subStation.getScale());
ledger.setPqSubstation(pqSubstation);
PqsMap pqsMap=new PqsMap();
pqsMap.setLongitude(subStation.getLng().doubleValue());
pqsMap.setLatitude(subStation.getLat().doubleValue());
pqsMap.setState(1);
ledger.setPqsMap(pqsMap);
//终端
PqDevice pqDevice=new PqDevice();
DeviceParam device = param.getDeviceParam();
pqDevice.setName(device.getName());
pqDevice.setStatus(1);
pqDevice.setDevtype(dictName(device.getDevType()));
pqDevice.setLogontime(device.getLoginTime());
pqDevice.setUpdatetime(device.getLoginTime());
Node node = nodeClient.getNodeById(device.getNodeId()).getData();
if(ObjectUtil.isNotNull(node)){
pqDevice.setNodeName(node.getName());
}
pqDevice.setPortid(device.getPort());
pqDevice.setDevflag(0);
pqDevice.setDevSeries(device.getSeries());
pqDevice.setDevKey(device.getDevKey());
pqDevice.setIp(device.getIp());
pqDevice.setDevmodel(device.getDevModel());
pqDevice.setCallflag(device.getCallFlag());
pqDevice.setDatatype(device.getDevDataType());
ledger.setPqDevice(pqDevice);
PqDevicedetail pqDevicedetail=new PqDevicedetail();
pqDevicedetail.setManufacturer(dictName(device.getManufacturer()));
pqDevicedetail.setThistimecheck(device.getThisTimeCheck());
pqDevicedetail.setNexttimecheck(device.getNextTimeCheck());
pqDevicedetail.setElectroplate(device.getElectroplate());
pqDevicedetail.setContract(device.getContract());
pqDevicedetail.setSim(device.getSim());
pqDevicedetail.setDevCatena(device.getDevSeries());
pqDevicedetail.setDevLocation(device.getDevLocation());
pqDevicedetail.setDevNo(device.getDevNo());
pqDevicedetail.setIsAlarm(device.getIsAlarm());
// pqDevicedetail.setOnlineratetj();
// pqDevicedetail.setDataplan();
// pqDevicedetail.setNewtraffic();
// pqDevicedetail.setOntime();
// pqDevicedetail.setCheckflag();
ledger.setPqDevicedetail(pqDevicedetail);
//母线
PqSubvoltage pqSubvoltage=new PqSubvoltage();
SubVoltageParam subVoltage = param.getSubVoltageParam();
pqSubvoltage.setName(subVoltage.getName());
pqSubvoltage.setSubvNum(subVoltage.getNum());
pqSubvoltage.setScale(dictName(subVoltage.getScale()));
pqSubvoltage.setSubvmodel(subVoltage.getModel());
ledger.setPqSubvoltage(pqSubvoltage);
//监测点
PqLine pqLine=new PqLine();
LineParam line = param.getLineParam();
pqLine.setName(line.getName());
pqLine.setPt1(line.getPt1().doubleValue());
pqLine.setPt2(line.getPt2().doubleValue());
pqLine.setCt1(line.getCt1().doubleValue());
pqLine.setCt2(line.getCt2().doubleValue());
pqLine.setDevcmp(line.getDevCapacity().doubleValue());
pqLine.setDlcmp(line.getShortCapacity().doubleValue());
pqLine.setJzcmp(line.getStandardCapacity().doubleValue());
pqLine.setXycmp(line.getDealCapacity().doubleValue());
pqLine.setScale(dictName(subVoltage.getScale()));
pqLine.setStatus(1);
ledger.setPqLine(pqLine);
PqLinedetail pqLinedetail=new PqLinedetail();
pqLinedetail.setLineName(line.getName());
pqLinedetail.setPttype(line.getPtType());
pqLinedetail.setLastTime(device.getLoginTime());
pqLinedetail.setTinterval(line.getTimeInterval());
pqLinedetail.setLoadtype(dictName(line.getLoadType()));
pqLinedetail.setBusinesstype(dictName(line.getBusinessType()));
pqLinedetail.setRemark(line.getRemark());
pqLinedetail.setMonitorId(line.getMonitorId());
pqLinedetail.setPowerid(line.getPowerFlag());
pqLinedetail.setObjname(line.getObjName());
pqLinedetail.setStatflag(line.getStatFlag());
pqLinedetail.setPowerSubstationName(line.getPowerSubstationName());
pqLinedetail.setHangLine(line.getHangLine());
pqLinedetail.setOwner(line.getOwner());
pqLinedetail.setOwnerDuty(line.getOwnerDuty());
pqLinedetail.setOwnerTel(line.getOwnerTel());
pqLinedetail.setSuperiorsSubstation(line.getSuperiorsSubstation());
pqLinedetail.setClassificationGrade(line.getCalssificationGrade());
pqLinedetail.setIsGridPoint(1);
// pqLinedetail.setLineGrade();
// pqLinedetail.setWiringDiagram();
ledger.setPqLinedetail(pqLinedetail);
ledger.setLineNum(line.getNum());
return ledger;
}
private String dictName(String dicId) {
try {
DictData data = dicDataFeignClient.getDicDataById(dicId).getData();
return data.getName();
} catch (Exception e) {
throw new BusinessException("字典转换异常");
}
}
private void assembleSyncTerminalParam(DeviceParam deviceParam, SupervisionTempDeviceReport tempDevice, SubVoltageParam subVoltageParam, LineParam lineParam, SupervisionTempLineReport tempLine) {
//包装device
deviceParam.setDevIndex(tempDevice.getId());