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

监测点、终端的状态修改

Browse Source
This commit is contained in:
xy
2024-04-23 11:40:04 +08:00
parent 7fb4df66ef
commit ac39b8c0ce
60 changed files with 263 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs9900/src/main/java/com/pqs9900/controller/business/DeviceController.java
View File

@@ -2051,7 +2051,7 @@ public class DeviceController {
case "投运":
line.setStatus(0);
break;
case "热备用":
case "检修":
line.setStatus(1);
break;
default:

4
pqs9900/src/main/java/com/pqs9900/controller/linedata/LineMarkController.java
View File

@@ -339,7 +339,7 @@ public class LineMarkController {
/**
* 批量修改停运监测点评级为空
* 批量修改退运监测点评级为空
* @author cdf
* @date 2023/7/6
*/
@@ -349,7 +349,7 @@ public class LineMarkController {
if(flag){
return PubUtils.assignmentResult(null, 200, "操作成功");
}
return PubUtils.assignmentResult(null, 500, "不存在停运评级的监测点");
return PubUtils.assignmentResult(null, 500, "不存在退运评级的监测点");
}
}

2
pqs9900/src/main/java/com/pqs9900/pojo/terminal/TerminalRVO.java
View File

@@ -16,7 +16,7 @@ public class TerminalRVO {
private String bdName;//变电站名称
private String edName;//版本号
private String ip;
private Integer devFlag;//装置状态（0：投运；1：热备用；2：停运）
private Integer devFlag;//装置状态（0：投运；1：检修；2：退运）
private BigDecimal flowSum;//套餐流量总数
private BigDecimal useFlow;//已使用流量百分比
private BigDecimal actualflow;

2
pqs9900/src/main/java/com/pqs9900/serviceImpl/configuration/ManaDeviceServiceImpl.java
View File

@@ -2285,7 +2285,7 @@ public class ManaDeviceServiceImpl implements ManaDeviceService {
sheet.addValidationData(setDataValidation(sheet, xzs, 2, 1002, 34, 34));
String[] isLine = {"否", "是"};
sheet.addValidationData(setDataValidation(sheet, isLine, 2, 1002, 36, 36));
String[] isRunLine = {"投运", "热备用","停运"};
String[] isRunLine = {"投运", "检修","退运"};
sheet.addValidationData(setDataValidation(sheet, isRunLine, 2, 1002, 37, 37));
for (int x = 0; x < 41; x++) {

4
pqs9900/src/main/java/com/pqs9900/serviceImpl/terminal/TerminalStateServiceImpl.java
View File

@@ -133,8 +133,8 @@ public class TerminalStateServiceImpl implements TerminalStateService {
String devFlag(Integer devFlag){
switch (devFlag){
case 0 : return "投运";
case 1 : return "热备用";
case 2 : return "停运";
case 1 : return "检修";
case 2 : return "退运";
default:return "";
}
}

4
pqs9900/src/main/resources/mybatis/mappers/configuration/DeviceDetailMapper.xml
View File

@@ -17,7 +17,7 @@
DevType,
a.ip,
a.PORTID,
decode(a.DEVFLAG, 0, '投运', 1, '热备用', '停运') as devflag,
decode(a.DEVFLAG, 0, '投运', 1, '检修', '退运') as devflag,
decode(a.status, 0, '中断', 1, '正常') as status,
to_char(a.UpdateTime, 'yyyy-MM-dd hh24:mi:ss') as updatetime,
t2.OnlineRateTj as evaluate
@@ -152,7 +152,7 @@
DevType,
a.ip,
a.PORTID,
decode(a.DEVFLAG, 0, '正常', 1, '热备用', '停运') as devflag,
decode(a.DEVFLAG, 0, '正常', 1, '检修', '退运') as devflag,
decode(a.status, 0, '中断', 1, '正常') as status,
to_char(a.UpdateTime, 'yyyy-MM-dd hh24:mm:ss') as updatetime,
t2.OnlineRateTj as evaluate

4
pqs9900/src/main/resources/mybatis/mappers/configuration/ExportDevMapper.xml
View File

@@ -45,7 +45,7 @@
and state = 1) as devtype,
k.node_name as nodename,
e.portid as portid,
decode(e.devflag,0,'投运',1,'热备用','停运') as devFlag,
decode(e.devflag,0,'投运',1,'检修','退运') as devFlag,
decode(i.POWERID,0,'电网侧',1,'非电网侧',2,'电网侧(新能源)',3,'非电网侧(新能源)',4,'上送国网',5,'PCC','') as powerid,
decode(i.IS_GRID_POINT,0,'否',1,'是','') as isGridPoint,
nvl(e.dev_series, '') as series,
@@ -122,7 +122,7 @@
h.dlcMp as dlrl,
h.devcMp as sbrl,
h.xycMp as xyrl,
decode(e.devflag,0,'投运',1,'热备用','停运') as devFlag,
decode(e.devflag,0,'投运',1,'检修','退运') as devFlag,
(case e.devmodel
when 0 then
'虚拟终端'

4
pqs9900/src/main/webapp/WEB-INF/views/business/device/deviceUnit.jsp
View File

@@ -42,8 +42,8 @@
<label class="form-group">装置状态：</label>
<select id="devFlag" class="form-control">
<option value="0">投运</option>
<option value="1">热备用</option>
<option value="2">停运</option>
<option value="1">检修</option>
<option value="2">退运</option>
</select>

2
pqs9900/src/main/webapp/WEB-INF/views/business/device/devmanage.jsp
View File

@@ -374,7 +374,7 @@
<td align="left" class="width2">
<select class="width3" id="lineStatus">
<option value="0" selected>投运</option>
<option value="1">热备用</option>
<option value="1">检修</option>
<option value="2">退运</option>
</select>
</td>

8
pqs9900/src/main/webapp/WEB-INF/views/business/device/termainState.jsp
View File

@@ -60,10 +60,10 @@
<input type="radio" name="optionsRadiosinline" id="yes" value="0" checked>投运
</label>
<label class="radio-inline">
<input type="radio" name="optionsRadiosinline" id="stop" value="2">停运
<input type="radio" name="optionsRadiosinline" id="stop" value="2">退运
</label>
<label class="radio-inline">
<input type="radio" name="optionsRadiosinline" id="wait" value="1">热备用
<input type="radio" name="optionsRadiosinline" id="wait" value="1">检修
</label>
</div>
</div>
@@ -239,9 +239,9 @@ function initTransactionTable(tableData) {
if (da == 0) {
info = '<font style="color:#20B2AA">投运</font>'
}else if(da == 1){
info = '<font style="color:#F4A460">热备用</font>'
info = '<font style="color:#F4A460">检修</font>'
}else {
info = '<font style="color:#A52a2a">停运</font>'
info = '<font style="color:#A52a2a">退运</font>'
}
return info;
}

16
pqs9900/src/main/webapp/WEB-INF/views/business/linedata/areaOnlineRate.jsp
View File

@@ -120,8 +120,8 @@
<th>区域</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -136,8 +136,8 @@
<th>厂家</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -152,8 +152,8 @@
<th>电压等级</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -168,8 +168,8 @@
<th>干扰源类型</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>

4
pqs9900/src/main/webapp/WEB-INF/views/business/linedata/halfReport.jsp
View File

@@ -44,8 +44,8 @@
<select id="devFlag" class="form-control">
<option value="">全部</option>
<option value="0">投运</option>
<option value="1">热备用</option>
<option value="2">停运</option>
<option value="1">检修</option>
<option value="2">退运</option>
</select>

2
pqs9900/src/main/webapp/WEB-INF/views/business/linedata/lineMark.jsp
View File

@@ -55,7 +55,7 @@
</button>
<div class="form-group fr mr10" id="fliteData">
<button type="button" style="margin-right: 50px" class="btn-primary btn" id="stopLineMark" >停运点评级清空</button>
<button type="button" style="margin-right: 50px" class="btn-primary btn" id="stopLineMark" >退运点评级清空</button>
<button type="button" class="btn-primary btn mr15" id="templateExport" >模板导出</button>
<button type="button" class="btn-primary btn mr15" id="batchImport" >批量导入监测点评级</button>

4
pqs9900/src/main/webapp/WEB-INF/views/business/linedata/lineMarkWeight.jsp
View File

@@ -48,8 +48,8 @@
<select style="width: 100px" id="devFlag" class="form-control mr10">
<option value="">全部</option>
<option value="0" selected>投运</option>
<option value="1">热备用</option>
<option value="2">停运</option>
<option value="1">检修</option>
<option value="2">退运</option>
</select>

6
pqs9900/src/main/webapp/WEB-INF/views/business/overview/overview.jsp
View File

@@ -186,7 +186,7 @@
color: [green, yellow, grey],
legend: {
x: 'left',
data: ['投运', '热备用', '停运'],
data: ['投运', '检修', '退运'],
},
tooltip: {
trigger: 'axis',
@@ -234,13 +234,13 @@
barMaxWidth: barMax,
data: normal
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,

4
pqs9900/src/main/webapp/js/basic.js
View File

@@ -250,5 +250,5 @@ var middNames = /^[\w\u4E00-\u9FA5()（）/、_ \\\-]+\.?[\w\u4E00-\u9FA5()（
var barspaclength = 20;
var runColor="#20B2AA";/*投运*/
var breaksColor="#F4A460";/*热备用*/
var grey="#696969";/*灰色 暂降触发点、停运状态*/
var breaksColor="#F4A460";/*检修*/
var grey="#696969";/*灰色 暂降触发点、退运状态*/

4
pqs9900/src/main/webapp/js/color.js
View File

@@ -2,7 +2,7 @@
var yellow="#DAA520";/*A相*/
var green="#2E8B57";/*B相*/
var red="#A52a2a";/*C相*/
var grey="#696969";/*灰色 暂降触发点、停运状态*/
var grey="#696969";/*灰色 暂降触发点、退运状态*/
var blue="#87CEEB";/*在线率*/
var orange="#FF7E50";/*单柱状图*/
var canvasBG="#F9F9F9";//画布背景色
@@ -16,6 +16,6 @@ var ITICBottom='#00E3E3';/*ITIC曲线的下限*/
var noMonitor="#CCC";
var noData="#808080";
var runColor="#20B2AA";/*投运*/
var breaksColor="#F4A460";/*热备用*/
var breaksColor="#F4A460";/*检修*/
var barMax="30";/*柱状图最大宽度*/

4
pqs9900/src/main/webapp/jspJS/device/deviceUnit.js
View File

@@ -106,9 +106,9 @@ function initTable(data) {
if (data == 0) {
return "投运"
} else if (data == 1) {
return "热备用"
return "检修"
} else {
return "停运"
return "退运"
}
}
},

34
pqs9900/src/main/webapp/jspJS/linedata/areaOnlineRate.js
View File

@@ -93,7 +93,7 @@ function addTab(url, label) {
//获取告警策略
function queryListForRun(lineGrade){
let title = ' <span class=\' font12 fontBold\'>终端状态(左柱) <span class=\'run\'><span class=\'inB bg-run smallBlock\'></span> 投运 </span><span class=\'breaks\'><span class=\'inB bg-breaks smallBlock\'></span> 热备用 </span><span class=\'grey\'><span class=\'inB bg-grey smallBlock\'></span> 停运 &nbsp;</span></span>\n' +
let title = ' <span class=\' font12 fontBold\'>终端状态(左柱) <span class=\'run\'><span class=\'inB bg-run smallBlock\'></span> 投运 </span><span class=\'breaks\'><span class=\'inB bg-breaks smallBlock\'></span> 检修 </span><span class=\'grey\'><span class=\'inB bg-grey smallBlock\'></span> 退运 &nbsp;</span></span>\n' +
' <span class=\' font12 fontBold\' > 终端在线率(右柱) <span class=\'info\'><span class=\'inB bg-info smallBlock\'></span> 在线率≥{{1}}</span><span class=\'warn\'> <span class=\'inB bg-warn smallBlock\'></span> 60%≤在线率<{{2}}</span><span class=\'error\'> <span class=\'inB bg-error smallBlock\'></span> 在线率<60%</span> </span>'
let html = title.replace("{{1}}",'90%').replace("{{2}}",'90')
$.ajax({
@@ -329,8 +329,8 @@ function drawAreaPic(area, lineFeed,route) {
tips +='<br/><font style="font-size: 12px">终端状态(%)</font>';
if (color === noMonitor) {
tips += '<br/><font style="font-size: 10px">投运 : /</font>';
tips += '<br/><font style="font-size: 10px">热备用 : /</font>';
tips += '<br/><font style="font-size: 10px">停运 : /</font>';
tips += '<br/><font style="font-size: 10px">检修 : /</font>';
tips += '<br/><font style="font-size: 10px">退运 : /</font>';
tips += '<br/><font style="font-size: 12px">终端在线率(%)</font>';
tips+='<br/><font style="font-size: 10px">/</font>';
}else{
@@ -384,13 +384,13 @@ function drawAreaPic(area, lineFeed,route) {
barMaxWidth: barMax,
data: normal
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -584,8 +584,8 @@ function drawCompanyPic(companys, lineFeed,route) {
tips +='<br/><font style="font-size: 12px">终端状态(%)</font>';
if (color === noMonitor) {
tips += '<br/><font style="font-size: 10px">投运 : /</font>';
tips += '<br/><font style="font-size: 10px">热备用 : /</font>';
tips += '<br/><font style="font-size: 10px">停运 : /</font>';
tips += '<br/><font style="font-size: 10px">检修 : /</font>';
tips += '<br/><font style="font-size: 10px">退运 : /</font>';
tips += '<br/><font style="font-size: 12px">终端在线率(%)</font>';
tips+='<br/><font style="font-size: 10px">/</font>';
}else{
@@ -640,13 +640,13 @@ function drawCompanyPic(companys, lineFeed,route) {
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -836,8 +836,8 @@ function drawVolPic(companys, lineFeed,route) {
tips +='<br/><font style="font-size: 12px">终端状态(%)</font>';
if (color === noMonitor) {
tips += '<br/><font style="font-size: 10px">投运 : /</font>';
tips += '<br/><font style="font-size: 10px">热备用 : /</font>';
tips += '<br/><font style="font-size: 10px">停运 : /</font>';
tips += '<br/><font style="font-size: 10px">检修 : /</font>';
tips += '<br/><font style="font-size: 10px">退运 : /</font>';
tips += '<br/><font style="font-size: 12px">终端在线率(%)</font>';
tips+='<br/><font style="font-size: 10px">/</font>';
}else{
@@ -892,13 +892,13 @@ function drawVolPic(companys, lineFeed,route) {
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -1088,8 +1088,8 @@ function drawloadtypePic(companys, lineFeed,route) {
tips +='<br/><font style="font-size: 12px">终端状态(%)</font>';
if (color === noMonitor) {
tips += '<br/><font style="font-size: 10px">投运 : /</font>';
tips += '<br/><font style="font-size: 10px">热备用 : /</font>';
tips += '<br/><font style="font-size: 10px">停运 : /</font>';
tips += '<br/><font style="font-size: 10px">检修 : /</font>';
tips += '<br/><font style="font-size: 10px">退运 : /</font>';
tips += '<br/><font style="font-size: 12px">终端在线率(%)</font>';
tips+='<br/><font style="font-size: 10px">/</font>';
}else{
@@ -1144,13 +1144,13 @@ function drawloadtypePic(companys, lineFeed,route) {
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,

4
pqs9900/src/main/webapp/jspJS/linedata/halfReport.js
View File

@@ -121,9 +121,9 @@ function initTable(data) {
if (data == 0) {
return "投运"
} else if(data == 1) {
return "热备用"
return "检修"
} else {
return "停运"
return "退运"
}
}
},

4
pqs9900/src/main/webapp/jspJS/linedata/lineMark.js
View File

@@ -118,9 +118,9 @@ function initTable(data) {
if (data == 0) {
return "投运"
} else if (data == 1) {
return "热备用"
return "检修"
} else {
return "停运"
return "退运"
}
}
},

4
pqs9900/src/main/webapp/jspJS/linedata/lineMarkWeight.js
View File

@@ -109,9 +109,9 @@ function initTable(data) {
if (data == 0) {
return "投运"
} else if (data == 1) {
return "热备用"
return "检修"
} else {
return "停运"
return "退运"
}
}
},