Microservice/system-jibei
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.概览-区域暂降评估-区域暂降评估->添加等级范围值

Browse Source 
2.区域-终端状态统计->增加国网统计
3.台账管理-台账模板->导入信息增加（导入台账的模板：）加终端字段：监测装置安装位置、监测厂家设备编号、SIM卡号；监测点字段：行业类型、监测点性质，电网侧变电站、是否并网点、监测点运行状态。
4.运行管理-监测点台账信息->增加变电站名称+母线+监测点名称
This commit is contained in:
wr
2024-04-02 14:31:00 +08:00
parent fefd704e6e
commit 542cdbc9b3
20 changed files with 346 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
comService/src/main/java/com/njcn/pojo/commons/DevList.java
View File

@@ -27,6 +27,12 @@ public class DevList implements Serializable {
private String devtype;
private String nodename;
private int portid;
private String sim;
private String devLocation;
private String devNo;
private String series;
private String key;
private String monitorid;
@@ -38,6 +44,23 @@ public class DevList implements Serializable {
private String objName;
private String statFlag;
//行业类型
private String businessType;
//监测点性质
private String powerId;
//电网侧变电站
private String powerSubstationName;
//是否并网点
private String isGridPoint;
//监测运行状态
private String status;
public String getFileName() {
return fileName;
}
@@ -238,6 +261,30 @@ public class DevList implements Serializable {
this.portid = portid;
}
public String getSim() {
return sim;
}
public void setSim(String sim) {
this.sim = sim;
}
public String getDevLocation() {
return devLocation;
}
public void setDevLocation(String devLocation) {
this.devLocation = devLocation;
}
public String getDevNo() {
return devNo;
}
public void setDevNo(String devNo) {
this.devNo = devNo;
}
public String getSeries() {
return series;
}
@@ -307,4 +354,44 @@ public String getProjectName() {
public void setStatFlag(String statFlag) {
this.statFlag = statFlag;
}
public String getBusinessType() {
return businessType;
}
public void setBusinessType(String businessType) {
this.businessType = businessType;
}
public String getPowerId() {
return powerId;
}
public void setPowerId(String powerId) {
this.powerId = powerId;
}
public String getPowerSubstationName() {
return powerSubstationName;
}
public void setPowerSubstationName(String powerSubstationName) {
this.powerSubstationName = powerSubstationName;
}
public String getIsGridPoint() {
return isGridPoint;
}
public void setIsGridPoint(String isGridPoint) {
this.isGridPoint = isGridPoint;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
}

10
comService/src/main/java/com/njcn/pojo/pointInfo/LineLedger.java
View File

@@ -11,6 +11,8 @@ public class LineLedger {
private String lineIndex;
private String lineName;
private String electricityQualityName;
private Long devIndex;
private String objName;
@@ -645,4 +647,12 @@ public class LineLedger {
public void setNodeName(String nodeName) {
this.nodeName = nodeName;
}
public String getElectricityQualityName() {
return electricityQualityName;
}
public void setElectricityQualityName(String electricityQualityName) {
this.electricityQualityName = electricityQualityName;
}
}

2
comService/src/main/java/com/njcn/service/configuration/DeviceService.java
View File

@@ -152,7 +152,7 @@ public interface DeviceService {
List<Tree> getDeviceMainTree();
List<DeviceDetail> getDeviceDetails(String status, String devflag, String gdName, String
manufacturer, String area);
manufacturer, String area, String type);
List<DeviceDetail> getGdname();

5
comService/src/main/java/com/njcn/serviceimpl/configuration/DeviceServiceImpl.java
View File

@@ -3273,10 +3273,13 @@ public class DeviceServiceImpl implements DeviceService {
@Override
public List<DeviceDetail> getDeviceDetails(String status, String devflag, String gdName, String
manufacturer, String area) {
manufacturer, String area, String type) {
List<DeviceDetail> result = new ArrayList<>();
List<Integer> listline = userUtil.listLineDepts(area);
if("1".equals(type)){
listline =getGwLine(listline);
}
if (listline.size() == 0) {
return null;
} else {

64
comService/src/main/java/com/njcn/utils/ImportExl.java
View File

@@ -171,44 +171,50 @@ public class ImportExl {
} else if (c == 13) {
user.setNodename(cell.getStringCellValue());//所属前置机
} else if (c == 14) {
user.setPortid((int) cell.getNumericCellValue());//端口号
} else if (c == 15) {
user.setPortid((int) cell.getNumericCellValue());//SIM卡号
} else if (c == 15) {
user.setSim( cell.getStringCellValue());//监测装置安装位置
} else if (c == 16) {
user.setDevLocation( cell.getStringCellValue());//监测厂家设备编号
}else if (c == 17) {
user.setDevNo( cell.getStringCellValue());//监测厂家设备编号
} else if (c == 18) {
if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) {
user.setSeries(String.valueOf((long)cell.getNumericCellValue()));//识别码
} else {
user.setSeries(cell.getStringCellValue());//识别码
}
} else if (c == 16) {
} else if (c == 19) {
if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) {
user.setKey(String.valueOf((long)cell.getNumericCellValue()));//秘钥
} else {
user.setKey(cell.getStringCellValue());//秘钥
}
} else if (c == 17) {
} else if (c == 20) {
if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) {
user.setSubvName(String.valueOf((long) cell.getNumericCellValue()));//母线名称
} else {
user.setSubvName(cell.getStringCellValue());
}
} else if (c == 18) {
} else if (c == 21) {
user.setSubvnum((int) cell.getNumericCellValue());//母线号
} else if (c == 19) {
} else if (c == 22) {
user.setScale(cell.getStringCellValue());
} else if (c == 20) {
} else if (c == 23) {
if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) {
user.setLineName(String.valueOf((long) cell.getNumericCellValue()));//监测点名称
} else {
user.setLineName(cell.getStringCellValue());
}
} else if (c == 21) {
user.setLineNum((int) cell.getNumericCellValue());//监测点号
} else if (c == 22) {
user.setPt(cell.getStringCellValue());//pt
} else if (c == 23) {
user.setCt(cell.getStringCellValue());//ct
} else if (c == 24) {
user.setLineNum((int) cell.getNumericCellValue());//监测点号
} else if (c == 25) {
user.setPt(cell.getStringCellValue());//pt
} else if (c == 26) {
user.setCt(cell.getStringCellValue());//ct
} else if (c == 27) {
if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) {
Float dlrl = Float.valueOf((float) cell.getNumericCellValue());
user.setDlrl(dlrl);//短路容量
@@ -216,7 +222,7 @@ public class ImportExl {
} else {
//判断失败
}
} else if (c == 25) {
} else if (c == 28) {
if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) {
Float sbrl = Float.valueOf((float) cell.getNumericCellValue());
user.setSbrl(sbrl);//设备容量
@@ -224,7 +230,7 @@ public class ImportExl {
} else {
//判断失败
}
} else if (c == 26) {
} else if (c == 29) {
if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) {
Float xyrl = Float.valueOf((float) cell.getNumericCellValue());
user.setXyrl(xyrl);//协议容量
@@ -232,19 +238,29 @@ public class ImportExl {
} else {
//判断失败
}
} else if (c == 27) {
user.setPttype(cell.getStringCellValue());//接线方式
} else if (c == 28) {
user.setInterval((int) cell.getNumericCellValue());//间隔时间
} else if (c == 29) {
user.setLoadType(cell.getStringCellValue());//干扰源类型终
} else if (c == 30) {
user.setMonitorid(cell.getStringCellValue());//国网ID
user.setPttype(cell.getStringCellValue());//接线方式
} else if (c == 31) {
user.setInterval((int) cell.getNumericCellValue());//间隔时间
} else if (c == 32) {
user.setLoadType(cell.getStringCellValue());//干扰源类型
} else if (c == 33) {
user.setBusinessType(cell.getStringCellValue());//行业类型
} else if (c == 34) {
user.setPowerId(cell.getStringCellValue());//监测点性质
} else if (c == 35) {
user.setPowerSubstationName(cell.getStringCellValue());//电网侧变电站
} else if (c == 36) {
user.setIsGridPoint(cell.getStringCellValue());//是否并网点
} else if (c == 37) {
user.setStatus(cell.getStringCellValue());//监测点运行状态
} else if (c == 38) {
user.setMonitorid(cell.getStringCellValue());//国网ID
} else if (c == 39) {
user.setObjName(cell.getStringCellValue()); //监测点对象名称
}else if (c == 32) {
}else if (c == 40) {
user.setStatFlag(cell.getStringCellValue()); //统计类型
}else if (c == 33) { //add by sw
}else if (c == 41) { //add by sw
user.setFileName(cell.getStringCellValue()); //文件名
}
}