diff --git a/comService/src/main/java/com/njcn/pojo/commons/device/Tree.java b/comService/src/main/java/com/njcn/pojo/commons/device/Tree.java index cec0910..32aad30 100644 --- a/comService/src/main/java/com/njcn/pojo/commons/device/Tree.java +++ b/comService/src/main/java/com/njcn/pojo/commons/device/Tree.java @@ -20,7 +20,7 @@ public class Tree implements Serializable { private int nodeIndex; private String nodeIndexStr; private int ppId; // 真实的PID值,对照数据库 - private int state; // 终端运行状态 0-正常 1-检修 2-停运 + private int state; // 终端运行状态 0-正常 1-检修 2-退运 private int gd_index; private int status; //终端通讯状态 0-正常 1-中断 private int qualityAss;//综合质量评估 diff --git a/comService/src/main/java/com/njcn/pojo/configuration/Line.java b/comService/src/main/java/com/njcn/pojo/configuration/Line.java index 93eced4..83dd5ea 100644 --- a/comService/src/main/java/com/njcn/pojo/configuration/Line.java +++ b/comService/src/main/java/com/njcn/pojo/configuration/Line.java @@ -81,7 +81,7 @@ public class Line { @Column(name="SUBV_NAME") private String subvName; - //监测点状态(0:投运;1:停运) + //监测点状态(0:投运;1:退运) @Column(name="STATUS") private Integer status; diff --git a/comService/src/main/java/com/njcn/pojo/data/LineMaps.java b/comService/src/main/java/com/njcn/pojo/data/LineMaps.java index f09b7b9..1d8e889 100644 --- a/comService/src/main/java/com/njcn/pojo/data/LineMaps.java +++ b/comService/src/main/java/com/njcn/pojo/data/LineMaps.java @@ -47,7 +47,7 @@ public class LineMaps { @Column(name="SUBV_NAME") private String subvname; - //终端状态(0:正常;1:中断;2:停运) + //终端状态(0:正常;1:中断;2:退运) @Column(name="DEVFLAG") private Integer devflag; diff --git a/comService/src/main/java/com/njcn/pojo/excel/AreaRuntimeExcelBody.java b/comService/src/main/java/com/njcn/pojo/excel/AreaRuntimeExcelBody.java index 6ab7631..0c7658f 100644 --- a/comService/src/main/java/com/njcn/pojo/excel/AreaRuntimeExcelBody.java +++ b/comService/src/main/java/com/njcn/pojo/excel/AreaRuntimeExcelBody.java @@ -20,10 +20,10 @@ public class AreaRuntimeExcelBody extends BaseRowModel implements Serializable { @ExcelProperty(value = "投运" ,index = 2) private String normal; - @ExcelProperty(value = "热备用" ,index = 3) + @ExcelProperty(value = "检修" ,index = 3) private String breaks; - @ExcelProperty(value = "停运" ,index = 4) + @ExcelProperty(value = "退运" ,index = 4) private String shutdown; @ExcelProperty(value = "在线率" ,index = 5) diff --git a/comService/src/main/java/com/njcn/pojo/excel/CompanyRuntimeExcelBody.java b/comService/src/main/java/com/njcn/pojo/excel/CompanyRuntimeExcelBody.java index 4aa8510..1255986 100644 --- a/comService/src/main/java/com/njcn/pojo/excel/CompanyRuntimeExcelBody.java +++ b/comService/src/main/java/com/njcn/pojo/excel/CompanyRuntimeExcelBody.java @@ -20,10 +20,10 @@ public class CompanyRuntimeExcelBody extends BaseRowModel implements Serializabl @ExcelProperty(value = "投运" ,index = 2) private String normal; - @ExcelProperty(value = "热备用" ,index = 3) + @ExcelProperty(value = "检修" ,index = 3) private String breaks; - @ExcelProperty(value = "停运" ,index = 4) + @ExcelProperty(value = "退运" ,index = 4) private String shutdown; @ExcelProperty(value = "在线率" ,index = 5) diff --git a/pqs9000/src/main/resources/mybatis/mappers/configuration/DeviceDetailMapper.xml b/pqs9000/src/main/resources/mybatis/mappers/configuration/DeviceDetailMapper.xml index 6f59a3a..3378e61 100644 --- a/pqs9000/src/main/resources/mybatis/mappers/configuration/DeviceDetailMapper.xml +++ b/pqs9000/src/main/resources/mybatis/mappers/configuration/DeviceDetailMapper.xml @@ -26,8 +26,8 @@ case when a.devflag = 0 then '投运' - when a.devflag = 1 then '热备用' - when a.devflag = 2 then '停运' + when a.devflag = 1 then '检修' + when a.devflag = 2 then '退运' end as devflag, case @@ -37,7 +37,7 @@ as status, - decode(a.devflag, 0, '投运', 1, '热备用', '停运') as devflag, + decode(a.devflag, 0, '投运', 1, '检修', '退运') as devflag, decode(a.status, 0, '中断', 1, '正常') as status, @@ -227,8 +227,8 @@ case when a.devflag = 0 then '投运' - when a.devflag = 1 then '热备用' - when a.devflag = 2 then '停运' + when a.devflag = 1 then '检修' + when a.devflag = 2 then '退运' end as devflag, case @@ -238,7 +238,7 @@ as status, - decode(a.DEVFLAG, 0, '正常', 1, '热备用', '停运') as devflag, + decode(a.DEVFLAG, 0, '正常', 1, '检修', '退运') as devflag, decode(a.status, 0, '中断', 1, '正常') as status, @@ -308,8 +308,8 @@ case when a.devflag = 0 then '投运' - when a.devflag = 1 then '热备用' - when a.devflag = 2 then '停运' + when a.devflag = 1 then '检修' + when a.devflag = 2 then '退运' end as devflag, case @@ -319,11 +319,11 @@ as status, - decode(a.devflag, 0, '投运', 1, '热备用', '停运') as devflag, + decode(a.devflag, 0, '投运', 1, '检修', '退运') as devflag, decode(a.status, 0, '中断', 1, '正常') as status, - decode(d.status, 0, '投运', 1, '热备用', '停运') as lineStatus, + decode(d.status, 0, '投运', 1, '检修', '退运') as lineStatus, to_char(a.updatetime, 'yyyy-MM-dd hh24:mi:ss') as updatetime, diff --git a/pqs9000/src/main/webapp/WEB-INF/views/business/area/deviceStatus.jsp b/pqs9000/src/main/webapp/WEB-INF/views/business/area/deviceStatus.jsp index 8db9b4e..7ca3df9 100644 --- a/pqs9000/src/main/webapp/WEB-INF/views/business/area/deviceStatus.jsp +++ b/pqs9000/src/main/webapp/WEB-INF/views/business/area/deviceStatus.jsp @@ -42,7 +42,7 @@
- 终端状态(左柱) 投运 热备用 停运   + 终端状态(左柱) 投运 检修 退运   终端在线率(右柱) 在线率≥90% 60%≤在线率<90% 在线率<60%
@@ -105,8 +105,8 @@ 区域 终端个数 投运 - 热备用 - 停运 + 检修 + 退运 在线率(%) @@ -121,8 +121,8 @@ 厂家 终端个数 投运 - 热备用 - 停运 + 检修 + 退运 在线率(%) @@ -137,8 +137,8 @@ 电压等级 终端个数 投运 - 热备用 - 停运 + 检修 + 退运 在线率(%) @@ -153,8 +153,8 @@ 干扰源类型 终端个数 投运 - 热备用 - 停运 + 检修 + 退运 在线率(%) @@ -544,8 +544,8 @@ tips +='
终端状态(%)'; if (color === noMonitor) { tips += '
投运 : /'; - tips += '
热备用 : /'; - tips += '
停运 : /'; + tips += '
检修 : /'; + tips += '
退运 : /'; tips += '
终端在线率(%)'; tips+='
/'; }else{ @@ -599,13 +599,13 @@ barMaxWidth: barMax, data: normal }, { - name: '热备用', + name: '检修', type: 'bar', stack: 'sum', barMaxWidth: barMax, data: breaks }, { - name: '停运', + name: '退运', type: 'bar', stack: 'sum', barMaxWidth: barMax, @@ -858,8 +858,8 @@ tips +='
终端状态(%)'; if (color === noMonitor) { tips += '
投运 : /'; - tips += '
热备用 : /'; - tips += '
停运 : /'; + tips += '
检修 : /'; + tips += '
退运 : /'; tips += '
终端在线率(%)'; tips+='
/'; }else{ @@ -914,13 +914,13 @@ barMaxWidth: barMax, data: run }, { - name: '热备用', + name: '检修', type: 'bar', stack: 'sum', barMaxWidth: barMax, data: breaks }, { - name: '停运', + name: '退运', type: 'bar', stack: 'sum', barMaxWidth: barMax, @@ -1171,8 +1171,8 @@ tips +='
终端状态(%)'; if (color === noMonitor) { tips += '
投运 : /'; - tips += '
热备用 : /'; - tips += '
停运 : /'; + tips += '
检修 : /'; + tips += '
退运 : /'; tips += '
终端在线率(%)'; tips+='
/'; }else{ @@ -1227,13 +1227,13 @@ barMaxWidth: barMax, data: run }, { - name: '热备用', + name: '检修', type: 'bar', stack: 'sum', barMaxWidth: barMax, data: breaks }, { - name: '停运', + name: '退运', type: 'bar', stack: 'sum', barMaxWidth: barMax, @@ -1484,8 +1484,8 @@ tips +='
终端状态(%)'; if (color === noMonitor) { tips += '
投运 : /'; - tips += '
热备用 : /'; - tips += '
停运 : /'; + tips += '
检修 : /'; + tips += '
退运 : /'; tips += '
终端在线率(%)'; tips+='
/'; }else{ @@ -1540,13 +1540,13 @@ barMaxWidth: barMax, data: run }, { - name: '热备用', + name: '检修', type: 'bar', stack: 'sum', barMaxWidth: barMax, data: breaks }, { - name: '停运', + name: '退运', type: 'bar', stack: 'sum', barMaxWidth: barMax, diff --git a/pqs9000/src/main/webapp/WEB-INF/views/business/area/monitorScope.jsp b/pqs9000/src/main/webapp/WEB-INF/views/business/area/monitorScope.jsp index 0a7a2fe..0fd7d06 100644 --- a/pqs9000/src/main/webapp/WEB-INF/views/business/area/monitorScope.jsp +++ b/pqs9000/src/main/webapp/WEB-INF/views/business/area/monitorScope.jsp @@ -150,10 +150,10 @@
- +
- +
diff --git a/pqs9000/src/main/webapp/WEB-INF/views/business/manage/integrityTable.jsp b/pqs9000/src/main/webapp/WEB-INF/views/business/manage/integrityTable.jsp index 85912ba..85b3e1a 100644 --- a/pqs9000/src/main/webapp/WEB-INF/views/business/manage/integrityTable.jsp +++ b/pqs9000/src/main/webapp/WEB-INF/views/business/manage/integrityTable.jsp @@ -75,8 +75,8 @@
" @@ -161,10 +161,10 @@ $('#importExl').click(function () { // devTypeBefore = "投运"; // } else if (data.devFlag == 1) { // $("input[name='time'][value='1']").attr("checked", true); -// devTypeBefore = "热备用"; +// devTypeBefore = "检修"; // } else { // $("input[name='time'][value='2']").attr("checked", true); -// devTypeBefore = "停运"; +// devTypeBefore = "退运"; // } // } // }); @@ -182,9 +182,9 @@ $('#importExl').click(function () { // if (devflag == 0) { // devTypeNow = "投运"; // } else if (devflag == 1) { -// devTypeNow = "热备用"; +// devTypeNow = "检修"; // } else { -// devTypeNow = "停运"; +// devTypeNow = "退运"; // } // var terminalDescribe = $("#terminalDescribe").val(); // var str = terminalDescribe.replace(/(^\s*)|(\s*$)/g, '');//去除空格; @@ -267,10 +267,10 @@ function initTable(data) { url: '/pqs9200/json/chine.json' }, "createdRow": function (row, data, index) { - if (data[9] == "停运") { + if (data[9] == "退运") { $('td', row).eq(9).css('color', '#696969') - } else if (data[9] == "热备用") { + } else if (data[9] == "检修") { $('td', row).eq(9).css('color', '#FFD700') } else if (data[9] == "投运") { $('td', row).eq(9).css('color', '#2E8B57') diff --git a/pqs9200/src/main/webapp/jspJS/manage/runtimeStatus.js b/pqs9200/src/main/webapp/jspJS/manage/runtimeStatus.js index 5af475a..5077dca 100644 --- a/pqs9200/src/main/webapp/jspJS/manage/runtimeStatus.js +++ b/pqs9200/src/main/webapp/jspJS/manage/runtimeStatus.js @@ -135,8 +135,8 @@ function drawAreaPic (area,intervals) { var value=params[0].value; if(value===3.1415){ tips+='
投运 : /'; - tips+='
热备用 : /'; - tips+='
停运 : /'; + tips+='
检修 : /'; + tips+='
退运 : /'; tips+='
在线率 : /'; }else{ for (var i = 0; i < params.length; i++) { @@ -179,13 +179,13 @@ function drawAreaPic (area,intervals) { barMaxWidth: barMax, data: run }, { - name: '热备用', + name: '检修', type: 'bar', stack: 'sum', barMaxWidth:barMax, data: breaks },{ - name: '停运', + name: '退运', type: 'bar', stack: 'sum', barMaxWidth: barMax, @@ -342,8 +342,8 @@ function drawCompanyPic(companys,intervals) { var value=params[0].value; if(value===3.1415){ tips+='
投运 : /'; - tips+='
热备用 : /'; - tips+='
停运 : /'; + tips+='
检修 : /'; + tips+='
退运 : /'; tips+='
在线率 : /'; }else{ for (var i = 0; i < params.length; i++) { @@ -384,13 +384,13 @@ function drawCompanyPic(companys,intervals) { barMaxWidth: barMax, data: run }, { - name: '热备用', + name: '检修', type: 'bar', stack: 'sum', barMaxWidth: barMax, data: breaks },{ - name: '停运', + name: '退运', type: 'bar', stack: 'sum', barMaxWidth: barMax, diff --git a/pqs9200/src/main/webapp/jspJS/monitor/showdevicedetail.js b/pqs9200/src/main/webapp/jspJS/monitor/showdevicedetail.js index 4da703f..ec3b5bd 100644 --- a/pqs9200/src/main/webapp/jspJS/monitor/showdevicedetail.js +++ b/pqs9200/src/main/webapp/jspJS/monitor/showdevicedetail.js @@ -59,7 +59,7 @@ var greenIcon = new BMap.Icon("../images/img/pgreen.png", new BMap.Size(25, 25)) var yellowIcon = new BMap.Icon("../images/img/pyellow.png", new BMap.Size(25, 25)); var grayIcon = new BMap.Icon("../images/img/pgray.png", new BMap.Size(25, 25)); var winIcon = new BMap.Icon("../images/img/warning.gif", new BMap.Size(40, 40)); -//终端状态(0:投运;1:中断;2:停运) +//终端状态(0:投运;1:中断;2:退运) var redMarkerOptions = { icon: redIcon, enableDragging: false diff --git a/pqs9200/src/main/webapp/jspJS/overview/glindex.js b/pqs9200/src/main/webapp/jspJS/overview/glindex.js index 99f0a19..6a685fe 100644 --- a/pqs9200/src/main/webapp/jspJS/overview/glindex.js +++ b/pqs9200/src/main/webapp/jspJS/overview/glindex.js @@ -216,7 +216,7 @@ function getTitleInfoDeviceStatus(startTime, endTime) { return " 终端在线率(右柱) 在线率≥90% " + "" + " 60%≤在线率<90% 在线率" + - "<60% 终端状态(左柱) 投运 热备用 停运  统计时间:" + startTime + "-" + endTime + " "; + "<60% 终端状态(左柱) 投运 检修 退运  统计时间:" + startTime + "-" + endTime + " "; } @@ -539,7 +539,7 @@ function initRun(area) { barMaxWidth: barMax, data: breaks }, { - name: '停运', + name: '退运', type: 'bar', stack: 'sum', barMaxWidth: barMax, diff --git a/pqs9200/src/main/webapp/jspJS/overview/sbyxzt.js b/pqs9200/src/main/webapp/jspJS/overview/sbyxzt.js index f749a63..2ad3469 100644 --- a/pqs9200/src/main/webapp/jspJS/overview/sbyxzt.js +++ b/pqs9200/src/main/webapp/jspJS/overview/sbyxzt.js @@ -101,7 +101,7 @@ function drawAreaPic (area,intervals) { color:[green,yellow,grey], legend: { x: 'left', - data: ['投运','热备用','停运'], + data: ['投运','检修','退运'], }, tooltip: { trigger: 'axis', @@ -114,8 +114,8 @@ function drawAreaPic (area,intervals) { var value=params[0].value; if(value===3.1415){ tips+='
投运 : /'; - tips+='
热备用 : /'; - tips+='
停运 : /'; + tips+='
检修 : /'; + tips+='
退运 : /'; tips+='
在线率 : /'; }else{ for (var i = 0; i < params.length; i++) { @@ -156,13 +156,13 @@ function drawAreaPic (area,intervals) { barMaxWidth: barMax, data: run }, { - name: '热备用', + name: '检修', type: 'bar', stack: 'sum', barMaxWidth:barMax, data: breaks },{ - name: '停运', + name: '退运', type: 'bar', stack: 'sum', barMaxWidth: barMax, @@ -310,7 +310,7 @@ function drawCompanyPic(companys,intervals) { color:[green,yellow,grey], legend: { x: 'left', - data: ['投运','热备用','停运'], + data: ['投运','检修','退运'], }, tooltip: { trigger: 'axis', @@ -323,8 +323,8 @@ function drawCompanyPic(companys,intervals) { var value=params[0].value; if(value===3.1415){ tips+='
投运 : /'; - tips+='
热备用 : /'; - tips+='
停运 : /'; + tips+='
检修 : /'; + tips+='
退运 : /'; tips+='
在线率 : /'; }else{ for (var i = 0; i < params.length; i++) { @@ -365,13 +365,13 @@ function drawCompanyPic(companys,intervals) { barMaxWidth: barMax, data: run }, { - name: '热备用', + name: '检修', type: 'bar', stack: 'sum', barMaxWidth: barMax, data: breaks },{ - name: '停运', + name: '退运', type: 'bar', stack: 'sum', barMaxWidth: barMax, diff --git a/pqs9200/src/main/webapp/jspJS/utils/positionOffset.js b/pqs9200/src/main/webapp/jspJS/utils/positionOffset.js index e7ab636..81e323e 100644 --- a/pqs9200/src/main/webapp/jspJS/utils/positionOffset.js +++ b/pqs9200/src/main/webapp/jspJS/utils/positionOffset.js @@ -156,12 +156,12 @@ var dataPoint = 'monitor'; function getPoint(lineMap,map,iFlag) { var point = new BMap.Point(lineMap.longitude, lineMap.latitude); //监测点点位信息;终端状态;终端状态颜色 - var marker,strState = '停运',fontState ='#808080'; + var marker,strState = '退运',fontState ='#808080'; //通讯状态,通讯状态颜色 var strStatus = '中断',fontStatus='#FF0000'; /******************************** - 终端状态: 2停运 灰色 128,128,128 #808080 - 1热备用 金色 255,215,0 #FFD700 + 终端状态: 2退运 灰色 128,128,128 #808080 + 1检修 金色 255,215,0 #FFD700 0投运(正常的则判断通讯状态) 通讯状态: 0正常 绿色 0,128,0 #08CF5A 1中断 红色 255,0,0 #FF0000 @@ -191,7 +191,7 @@ function getPoint(lineMap,map,iFlag) { } break; case 1: - strState = '热备用'; + strState = '检修'; fontState='#FFD700'; if(lineMap.totalcount > 0) marker = new BMap.Marker(point, winyellowMarkerOptions);//假如终端出现了暂降事件 @@ -199,7 +199,7 @@ function getPoint(lineMap,map,iFlag) { marker = new BMap.Marker(point, yellowMarkerOptions); break; case 2: - strState = '停运'; + strState = '退运'; fontState='#808080'; if(lineMap.totalcount > 0) marker = new BMap.Marker(point, wingrayMarkerOptions); diff --git a/pqs9300/src/main/webapp/js/color.js b/pqs9300/src/main/webapp/js/color.js index 36e2995..9f4f817 100644 --- a/pqs9300/src/main/webapp/js/color.js +++ b/pqs9300/src/main/webapp/js/color.js @@ -4,9 +4,9 @@ var green="#2E8B57";/*B相*/ var red="#A52a2a";/*C相*/ // var runColor="#32C5E9";/*投运*/ var runColor="#20B2AA";/*投运*/ -// var breaksColor="#9FE6B8";/*热备用*/ -var breaksColor="#F4A460";/*热备用*/ -var grey="#696969";/*灰色 暂降触发点、停运状态*/ +// var breaksColor="#9FE6B8";/*检修*/ +var breaksColor="#F4A460";/*检修*/ +var grey="#696969";/*灰色 暂降触发点、退运状态*/ var blue="#87CEEB";/*在线率*/ var orange="#FF7E50";/*单柱状图*/ var canvasBG="#F9F9F9";//画布背景色 diff --git a/pqs9300/src/main/webapp/jspJS/utils/positionOffset.js b/pqs9300/src/main/webapp/jspJS/utils/positionOffset.js index 5f73cfd..378de52 100644 --- a/pqs9300/src/main/webapp/jspJS/utils/positionOffset.js +++ b/pqs9300/src/main/webapp/jspJS/utils/positionOffset.js @@ -158,12 +158,12 @@ var dataPoint = 'monitor'; function getPoint(lineMap,map,iFlag) { var point = new BMap.Point(lineMap.longitude, lineMap.latitude); //监测点点位信息;终端状态;终端状态颜色 - var marker,strState = '停运',fontState ='#808080'; + var marker,strState = '退运',fontState ='#808080'; //通讯状态,通讯状态颜色 var strStatus = '中断',fontStatus='#FF0000'; /******************************** - 终端状态: 2停运 灰色 128,128,128 #808080 - 1热备用 金色 255,215,0 #FFD700 + 终端状态: 2退运 灰色 128,128,128 #808080 + 1检修 金色 255,215,0 #FFD700 0投运(正常的则判断通讯状态) 通讯状态: 0正常 绿色 0,128,0 #08CF5A 1中断 红色 255,0,0 #FF0000 @@ -193,7 +193,7 @@ function getPoint(lineMap,map,iFlag) { } break; case 1: - strState = '热备用'; + strState = '检修'; fontState='#FFD700'; if(lineMap.totalcount > 0) marker = new BMap.Marker(point, winyellowMarkerOptions);//假如终端出现了暂降事件 @@ -201,7 +201,7 @@ function getPoint(lineMap,map,iFlag) { marker = new BMap.Marker(point, yellowMarkerOptions); break; case 2: - strState = '停运'; + strState = '退运'; fontState='#808080'; if(lineMap.totalcount > 0) marker = new BMap.Marker(point, wingrayMarkerOptions); diff --git a/pqs9900/src/main/java/com/pqs9900/controller/business/DeviceController.java b/pqs9900/src/main/java/com/pqs9900/controller/business/DeviceController.java index fa197e2..061703d 100644 --- a/pqs9900/src/main/java/com/pqs9900/controller/business/DeviceController.java +++ b/pqs9900/src/main/java/com/pqs9900/controller/business/DeviceController.java @@ -2051,7 +2051,7 @@ public class DeviceController { case "投运": line.setStatus(0); break; - case "热备用": + case "检修": line.setStatus(1); break; default: diff --git a/pqs9900/src/main/java/com/pqs9900/controller/linedata/LineMarkController.java b/pqs9900/src/main/java/com/pqs9900/controller/linedata/LineMarkController.java index b230943..8b480ce 100644 --- a/pqs9900/src/main/java/com/pqs9900/controller/linedata/LineMarkController.java +++ b/pqs9900/src/main/java/com/pqs9900/controller/linedata/LineMarkController.java @@ -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, "不存在退运评级的监测点"); } } diff --git a/pqs9900/src/main/java/com/pqs9900/pojo/terminal/TerminalRVO.java b/pqs9900/src/main/java/com/pqs9900/pojo/terminal/TerminalRVO.java index 1cca4f2..b736e22 100644 --- a/pqs9900/src/main/java/com/pqs9900/pojo/terminal/TerminalRVO.java +++ b/pqs9900/src/main/java/com/pqs9900/pojo/terminal/TerminalRVO.java @@ -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; diff --git a/pqs9900/src/main/java/com/pqs9900/serviceImpl/configuration/ManaDeviceServiceImpl.java b/pqs9900/src/main/java/com/pqs9900/serviceImpl/configuration/ManaDeviceServiceImpl.java index 92dc06e..f8d6d28 100644 --- a/pqs9900/src/main/java/com/pqs9900/serviceImpl/configuration/ManaDeviceServiceImpl.java +++ b/pqs9900/src/main/java/com/pqs9900/serviceImpl/configuration/ManaDeviceServiceImpl.java @@ -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++) { diff --git a/pqs9900/src/main/java/com/pqs9900/serviceImpl/terminal/TerminalStateServiceImpl.java b/pqs9900/src/main/java/com/pqs9900/serviceImpl/terminal/TerminalStateServiceImpl.java index 4e86204..5c81a7d 100644 --- a/pqs9900/src/main/java/com/pqs9900/serviceImpl/terminal/TerminalStateServiceImpl.java +++ b/pqs9900/src/main/java/com/pqs9900/serviceImpl/terminal/TerminalStateServiceImpl.java @@ -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 ""; } } diff --git a/pqs9900/src/main/resources/mybatis/mappers/configuration/DeviceDetailMapper.xml b/pqs9900/src/main/resources/mybatis/mappers/configuration/DeviceDetailMapper.xml index a7a42bc..a85858e 100644 --- a/pqs9900/src/main/resources/mybatis/mappers/configuration/DeviceDetailMapper.xml +++ b/pqs9900/src/main/resources/mybatis/mappers/configuration/DeviceDetailMapper.xml @@ -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 diff --git a/pqs9900/src/main/resources/mybatis/mappers/configuration/ExportDevMapper.xml b/pqs9900/src/main/resources/mybatis/mappers/configuration/ExportDevMapper.xml index b65f9d9..5bba0a4 100644 --- a/pqs9900/src/main/resources/mybatis/mappers/configuration/ExportDevMapper.xml +++ b/pqs9900/src/main/resources/mybatis/mappers/configuration/ExportDevMapper.xml @@ -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 '虚拟终端' diff --git a/pqs9900/src/main/webapp/WEB-INF/views/business/device/deviceUnit.jsp b/pqs9900/src/main/webapp/WEB-INF/views/business/device/deviceUnit.jsp index 370ccb4..7bd230d 100644 --- a/pqs9900/src/main/webapp/WEB-INF/views/business/device/deviceUnit.jsp +++ b/pqs9900/src/main/webapp/WEB-INF/views/business/device/deviceUnit.jsp @@ -42,8 +42,8 @@ diff --git a/pqs9900/src/main/webapp/WEB-INF/views/business/device/devmanage.jsp b/pqs9900/src/main/webapp/WEB-INF/views/business/device/devmanage.jsp index f43e89d..92629c6 100644 --- a/pqs9900/src/main/webapp/WEB-INF/views/business/device/devmanage.jsp +++ b/pqs9900/src/main/webapp/WEB-INF/views/business/device/devmanage.jsp @@ -374,7 +374,7 @@ diff --git a/pqs9900/src/main/webapp/WEB-INF/views/business/device/termainState.jsp b/pqs9900/src/main/webapp/WEB-INF/views/business/device/termainState.jsp index ab317c5..e08fd7e 100644 --- a/pqs9900/src/main/webapp/WEB-INF/views/business/device/termainState.jsp +++ b/pqs9900/src/main/webapp/WEB-INF/views/business/device/termainState.jsp @@ -60,10 +60,10 @@ 投运
@@ -239,9 +239,9 @@ function initTransactionTable(tableData) { if (da == 0) { info = '投运' }else if(da == 1){ - info = '热备用' + info = '检修' }else { - info = '停运' + info = '退运' } return info; } diff --git a/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/areaOnlineRate.jsp b/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/areaOnlineRate.jsp index c5f757c..ca9db00 100644 --- a/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/areaOnlineRate.jsp +++ b/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/areaOnlineRate.jsp @@ -120,8 +120,8 @@ 区域 终端个数 投运 - 热备用 - 停运 + 检修 + 退运 在线率(%) @@ -136,8 +136,8 @@ 厂家 终端个数 投运 - 热备用 - 停运 + 检修 + 退运 在线率(%) @@ -152,8 +152,8 @@ 电压等级 终端个数 投运 - 热备用 - 停运 + 检修 + 退运 在线率(%) @@ -168,8 +168,8 @@ 干扰源类型 终端个数 投运 - 热备用 - 停运 + 检修 + 退运 在线率(%) diff --git a/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/halfReport.jsp b/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/halfReport.jsp index 6cf933f..ac3b8c7 100644 --- a/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/halfReport.jsp +++ b/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/halfReport.jsp @@ -44,8 +44,8 @@ diff --git a/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/lineMark.jsp b/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/lineMark.jsp index ff9ccb2..fd40bbd 100644 --- a/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/lineMark.jsp +++ b/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/lineMark.jsp @@ -55,7 +55,7 @@
- + diff --git a/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/lineMarkWeight.jsp b/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/lineMarkWeight.jsp index 87b2748..e126da6 100644 --- a/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/lineMarkWeight.jsp +++ b/pqs9900/src/main/webapp/WEB-INF/views/business/linedata/lineMarkWeight.jsp @@ -48,8 +48,8 @@ diff --git a/pqs9900/src/main/webapp/WEB-INF/views/business/overview/overview.jsp b/pqs9900/src/main/webapp/WEB-INF/views/business/overview/overview.jsp index 5602b8f..5178bf3 100644 --- a/pqs9900/src/main/webapp/WEB-INF/views/business/overview/overview.jsp +++ b/pqs9900/src/main/webapp/WEB-INF/views/business/overview/overview.jsp @@ -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, diff --git a/pqs9900/src/main/webapp/js/basic.js b/pqs9900/src/main/webapp/js/basic.js index b1505c7..801b01e 100644 --- a/pqs9900/src/main/webapp/js/basic.js +++ b/pqs9900/src/main/webapp/js/basic.js @@ -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";/*灰色 暂降触发点、退运状态*/ diff --git a/pqs9900/src/main/webapp/js/color.js b/pqs9900/src/main/webapp/js/color.js index 45dd82e..d1f20ab 100644 --- a/pqs9900/src/main/webapp/js/color.js +++ b/pqs9900/src/main/webapp/js/color.js @@ -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";/*柱状图最大宽度*/ diff --git a/pqs9900/src/main/webapp/jspJS/device/deviceUnit.js b/pqs9900/src/main/webapp/jspJS/device/deviceUnit.js index b66d6dd..de689f7 100644 --- a/pqs9900/src/main/webapp/jspJS/device/deviceUnit.js +++ b/pqs9900/src/main/webapp/jspJS/device/deviceUnit.js @@ -106,9 +106,9 @@ function initTable(data) { if (data == 0) { return "投运" } else if (data == 1) { - return "热备用" + return "检修" } else { - return "停运" + return "退运" } } }, diff --git a/pqs9900/src/main/webapp/jspJS/linedata/areaOnlineRate.js b/pqs9900/src/main/webapp/jspJS/linedata/areaOnlineRate.js index dee1e09..1904bfe 100644 --- a/pqs9900/src/main/webapp/jspJS/linedata/areaOnlineRate.js +++ b/pqs9900/src/main/webapp/jspJS/linedata/areaOnlineRate.js @@ -93,7 +93,7 @@ function addTab(url, label) { //获取告警策略 function queryListForRun(lineGrade){ - let title = ' 终端状态(左柱) 投运 热备用 停运  \n' + + let title = ' 终端状态(左柱) 投运 检修 退运  \n' + ' 终端在线率(右柱) 在线率≥{{1}} 60%≤在线率<{{2}} 在线率<60% ' let html = title.replace("{{1}}",'90%').replace("{{2}}",'90') $.ajax({ @@ -329,8 +329,8 @@ function drawAreaPic(area, lineFeed,route) { tips +='
终端状态(%)'; if (color === noMonitor) { tips += '
投运 : /'; - tips += '
热备用 : /'; - tips += '
停运 : /'; + tips += '
检修 : /'; + tips += '
退运 : /'; tips += '
终端在线率(%)'; tips+='
/'; }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 +='
终端状态(%)'; if (color === noMonitor) { tips += '
投运 : /'; - tips += '
热备用 : /'; - tips += '
停运 : /'; + tips += '
检修 : /'; + tips += '
退运 : /'; tips += '
终端在线率(%)'; tips+='
/'; }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 +='
终端状态(%)'; if (color === noMonitor) { tips += '
投运 : /'; - tips += '
热备用 : /'; - tips += '
停运 : /'; + tips += '
检修 : /'; + tips += '
退运 : /'; tips += '
终端在线率(%)'; tips+='
/'; }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 +='
终端状态(%)'; if (color === noMonitor) { tips += '
投运 : /'; - tips += '
热备用 : /'; - tips += '
停运 : /'; + tips += '
检修 : /'; + tips += '
退运 : /'; tips += '
终端在线率(%)'; tips+='
/'; }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, diff --git a/pqs9900/src/main/webapp/jspJS/linedata/halfReport.js b/pqs9900/src/main/webapp/jspJS/linedata/halfReport.js index ae3e227..d8f4a95 100644 --- a/pqs9900/src/main/webapp/jspJS/linedata/halfReport.js +++ b/pqs9900/src/main/webapp/jspJS/linedata/halfReport.js @@ -121,9 +121,9 @@ function initTable(data) { if (data == 0) { return "投运" } else if(data == 1) { - return "热备用" + return "检修" } else { - return "停运" + return "退运" } } }, diff --git a/pqs9900/src/main/webapp/jspJS/linedata/lineMark.js b/pqs9900/src/main/webapp/jspJS/linedata/lineMark.js index 1105d76..b273663 100644 --- a/pqs9900/src/main/webapp/jspJS/linedata/lineMark.js +++ b/pqs9900/src/main/webapp/jspJS/linedata/lineMark.js @@ -118,9 +118,9 @@ function initTable(data) { if (data == 0) { return "投运" } else if (data == 1) { - return "热备用" + return "检修" } else { - return "停运" + return "退运" } } }, diff --git a/pqs9900/src/main/webapp/jspJS/linedata/lineMarkWeight.js b/pqs9900/src/main/webapp/jspJS/linedata/lineMarkWeight.js index 926aa11..96e2336 100644 --- a/pqs9900/src/main/webapp/jspJS/linedata/lineMarkWeight.js +++ b/pqs9900/src/main/webapp/jspJS/linedata/lineMarkWeight.js @@ -109,9 +109,9 @@ function initTable(data) { if (data == 0) { return "投运" } else if (data == 1) { - return "热备用" + return "检修" } else { - return "停运" + return "退运" } } }, diff --git a/sso/src/main/webapp/js/color.js b/sso/src/main/webapp/js/color.js index e5dae26..b895aa1 100644 --- a/sso/src/main/webapp/js/color.js +++ b/sso/src/main/webapp/js/color.js @@ -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";//画布背景色