change - 振动传感器维护页面

master
yinq 6 months ago
parent 600fe8bf85
commit 140798bb22

@ -45,9 +45,14 @@ public class T_MonitorController extends BaseController {
@Autowired @Autowired
private ITSetmonitorthresholdvalueService itSetmonitorthresholdvalueService; private ITSetmonitorthresholdvalueService itSetmonitorthresholdvalueService;
@Autowired // @Autowired
private ITempertureMonitorService itempertureMonitorService; // private ITempertureMonitorService itempertureMonitorService;
/**
* 23162030
* @param id
* @return
*/
@RequiresPermissions("system:Monitor:view") @RequiresPermissions("system:Monitor:view")
@GetMapping() @GetMapping()
public String Monitor(@RequestParam("id") int id) { public String Monitor(@RequestParam("id") int id) {
@ -75,6 +80,8 @@ public class T_MonitorController extends BaseController {
url = "/monitor_tw"; url = "/monitor_tw";
case 20: case 20:
url = "/vibrationSensorMonitor"; url = "/vibrationSensorMonitor";
case 30:
url = "/arrayMonitor";
break; break;
} }
@ -147,6 +154,8 @@ public class T_MonitorController extends BaseController {
break; break;
case 20: case 20:
url = "/vibrationSensorAdd"; url = "/vibrationSensorAdd";
case 30:
url = "/arrayAdd";
break; break;
default: default:
break; break;
@ -169,6 +178,17 @@ public class T_MonitorController extends BaseController {
return prefix + url; return prefix + url;
} }
@GetMapping(value = {"/arrayAdd/{objid}", "/arrayAdd/"})
public String arrayAdd(@PathVariable(value = "objid", required = false) Integer objid, ModelMap mmap) {
String url = "";
if (StringUtils.isNotNull(objid)) {
T_Monitor t_monitor = t_MonitorService.selectT_MonitorById(objid);
mmap.put("t_Monitor", t_monitor);
}
url = "/arrayAdd";
return prefix + url;
}
/** /**
* *
*/ */
@ -222,6 +242,9 @@ public class T_MonitorController extends BaseController {
case 20: case 20:
url = "/vibrationSensorEdit"; url = "/vibrationSensorEdit";
break; break;
case 30:
url = "/arrayEdit";
break;
default: default:
break; break;
} }
@ -291,6 +314,9 @@ public class T_MonitorController extends BaseController {
case "20": case "20":
url = "/vibrationSensorTree"; url = "/vibrationSensorTree";
break; break;
case "30":
url = "/arrayTree";
break;
default: default:
T_Monitor t_monitor = new T_Monitor(); T_Monitor t_monitor = new T_Monitor();
t_monitor.setMonitorId(objid); t_monitor.setMonitorId(objid);
@ -318,6 +344,8 @@ public class T_MonitorController extends BaseController {
case 20: case 20:
url = "/vibrationSensorTree"; url = "/vibrationSensorTree";
break; break;
case 30:
url = "/arrayTree";
default: default:
break; break;
} }

@ -2,8 +2,35 @@
<html lang="zh" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro" xmlns:th="http://www.thymeleaf.org"> <html lang="zh" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<th:block th:include="include :: header('温度传感器阵列报列表')"/> <th:block th:include="include :: header('温度传感器阵列报列表')"/>
<th:block th:include="include :: layout-latest-css"/>
<th:block th:include="include :: ztree-css"/>
<th:block th:include="include :: datetimepicker-css"/>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="ui-layout-west">
<div class="box box-main">
<div class="box-header">
<div class="box-title">
<i class="fa icon-grid"></i> 测控点信息
</div>
<div class="box-tools pull-right">
<a type="button" class="btn btn-box-tool" href="#" onclick="dept()" title="测控点信息"><i
class="fa fa-edit"></i></a>
<button type="button" class="btn btn-box-tool" id="btnExpand" title="展开" style="display:none;"><i
class="fa fa-chevron-up"></i></button>
<button type="button" class="btn btn-box-tool" id="btnCollapse" title="折叠"><i
class="fa fa-chevron-down"></i></button>
<button type="button" class="btn btn-box-tool" id="btnRefresh" title="刷新"><i class="fa fa-refresh"></i>
</button>
</div>
</div>
<div class="ui-layout-content">
<div id="tree" class="ztree"></div>
</div>
</div>
</div>
<div class="ui-layout-center">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="centerDiv"> <div class="centerDiv">
@ -15,7 +42,11 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<th:block th:include="include :: layout-latest-js"/>
<th:block th:include="include :: ztree-js"/>
<th:block th:include="include :: datetimepicker-js"/>
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:ArrayTemperatureData:edit')}]]; var editFlag = [[${@permission.hasPermi('system:ArrayTemperatureData:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:ArrayTemperatureData:remove')}]]; var removeFlag = [[${@permission.hasPermi('system:ArrayTemperatureData:remove')}]];
@ -25,6 +56,12 @@
</script> </script>
<script> <script>
$(() => { $(() => {
var panehHidden = false;
if ($(this).width() < 769) {
panehHidden = true;
}
$('body').layout({initClosed: panehHidden, west__size: 245});
queryDeptTree()
let getColorByTemperature = {} let getColorByTemperature = {}
@ -156,6 +193,43 @@
setInterval(getData, 1000 * 2) setInterval(getData, 1000 * 2)
}) })
function queryDeptTree() {
var url = ctx + "system/Monitor/treeData?monitorType=" + 30;
var options = {
url: url,
expandLevel: 1,
onClick: zOnClick
};
$.tree.init(options);
function zOnClick(event, treeId, treeNode) {
$("#sensorId").val(treeNode.id);
/*alert(treeNode.id)*/
$.table.search();
}
}
$('#btnExpand').click(function () {
$._tree.expandAll(true);
$(this).hide();
$('#btnCollapse').show();
});
$('#btnCollapse').click(function () {
$._tree.expandAll(false);
$(this).hide();
$('#btnExpand').show();
});
$('#btnRefresh').click(function () {
queryDeptTree();
});
/* 测控点信息 */
function dept() {
var url = ctx + "system/Monitor?id=30";
$.modal.openTab("测控点信息", url);
}
</script> </script>
</body> </body>
</html> </html>

@ -0,0 +1,192 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head>
<th:block th:include="include :: header('新增测控点信息')"/>
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-Monitor-add">
<div class="form-group">
<label class="col-sm-3 control-label">集中器编号:</label>
<div class="col-sm-6">
<textarea style="height: 32px" id="userids" name="collectDeviceId" class="form-control"></textarea>
</div>
<button type="button" class="btn btn-info" onclick="selectUsersToParent()">选择集中器</button>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">测控点编号:</label>
<div class="col-sm-8">
<textarea style="height: 32px" id="userid" name="monitorId" class="form-control" required></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">父级测控点:</label>
<div class="col-sm-8">
<div class="input-group">
<input id="treeId" name="pMonitorid" type="hidden" th:value="${t_Monitor?.monitorId}"/>
<input class="form-control" type="text" onclick="selectMonitorTree()" id="treeName" readonly="true"
th:value="${t_Monitor?.monitorName}">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">测控点名称:</label>
<div class="col-sm-8">
<input name="monitorName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<input name="monitorType" class="form-control" type="text" value="30" style="display: none;">
<!-- <label class="col-sm-3 control-label">测控点类型:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <select name="monitorType" class="form-control m-b"-->
<!-- th:with="type=${@energyTypeService.getEnergyType()}">-->
<!-- <option value="">所有</option>-->
<!-- <option th:each="dict : ${type}" th:text="${dict.energyName}"-->
<!-- th:value="${dict.energyTypeId}" th:selected="${dict.energyTypeId==16}"></option>-->
<!-- </select>-->
<!-- </div>-->
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">二级类型:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <select name="secondType" class="form-control m-b" th:with="type=${@dict.getType('monitorSecondType')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">测控点位置:</label>
<div class="col-sm-8">
<input name="monitorAddr" class="form-control" type="text">
</div>
</div>
<!--div class="form-group">
<label class="col-sm-3 control-label">传感器仪表:</label>
<div class="col-sm-8">
<input name="sensorMeterTypeId" class="form-control" type="text">
</div>
</div>-->
<div class="form-group">
<label class="col-sm-3 control-label">测量器具:</label>
<div class="col-sm-8">
<select name="meterId" class="form-control m-b" th:with="type=${@meterInfoService.getMeterInfo()}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.meterID}" th:value="${dict.meterID}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">通讯端口:</label>
<div class="col-sm-8">
<input name="meterCommunicationId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否重点:</label>
<div class="col-sm-8">
<select name="isKeyMonitor" class="form-control m-b" th:with="type=${@dict.getType('isKey')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">测控点状态:</label>
<div class="col-sm-8">
<select name="monitorStatus" class="form-control m-b" th:with="type=${@dict.getType('monitorStatus')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<!--<div class="form-group">
<label class="col-sm-3 control-label">最大值:</label>
<div class="col-sm-8">
<input name="pt" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">最小值:</label>
<div class="col-sm-8">
<input name="ct" class="form-control" type="text">
</div>
</div>-->
<!--<div class="form-group">
<label class="col-sm-3 control-label">温度最大值:</label>
<div class="col-sm-8">
<input name="tMax" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">温度最小值:</label>
<div class="col-sm-8">
<input name="tMin" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">湿度最大值:</label>
<div class="col-sm-8">
<input name="hMax" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">湿度最小值:</label>
<div class="col-sm-8">
<input name="hMin" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">照度最大值:</label>
<div class="col-sm-8">
<input name="iMax" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">照度最小值:</label>
<div class="col-sm-8">
<input name="iMin" class="form-control" type="text">
</div>
</div>-->
</form>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var prefix = ctx + "system/Monitor"
var demo = ctx + "demo/modal";
$("#form-Monitor-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-Monitor-add').serialize());
}
}
/*测控点信息-新增-选择父部门树*/
function selectMonitorTree() {
var options = {
title: '测控点信息选择',
width: "380",
url: prefix + "/selectMonitorTree/" + $("#treeId").val(),
callBack: doSubmit
};
$.modal.openOptions(options);
}
function doSubmit(index, layero) {
var body = layer.getChildFrame('body', index);
$("#treeId").val(body.find('#treeId').val());
$("#treeName").val(body.find('#treeName').val());
layer.close(index);
}
function selectUsersToParent() {
$.modal.open("选择集中器", demo + "/collectDevice");
}
</script>
</body>
</html>

@ -0,0 +1,186 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('测控点信息列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<!--<li>
<label>能源类型:</label>
<select name="monitorType" th:with="type=${@energyTypeService.getEnergyType()}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.energyName}" th:value="${dict.energyTypeId}"></option>
</select>
</li>-->
<!-- <li>-->
<!-- <label style="width: auto">是否重点:</label>-->
<!-- <select name="isKeyMonitor" th:with="type=${@dict.getType('isKey')}">-->
<!-- <option value="">所有</option>-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
<!-- </select>-->
<!-- </li>-->
<li>
<label style="width: auto">设备状态:</label>
<select name="monitorStatus" th:with="type=${@dict.getType('monitorStatus')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.treeTable.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:Monitor:add">
<i class="fa fa-plus"></i> 新增
</a>
<a class="btn btn-primary" onclick="$.operate.edit()" shiro:hasPermission="system:Monitor:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-info" id="expandAllBtn">
<i class="fa fa-exchange"></i> 展开/折叠
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-tree-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var addFlag = [[${@permission.hasPermi('system:Monitor:add')}]];
var editFlag = [[${@permission.hasPermi('system:Monitor:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:Monitor:remove')}]];
var isKeyMonitorDatas = [[${@dict.getType('isKey')}]];
var monitorStatusDatas = [[${@dict.getType('monitorStatus')}]];
var prefix = ctx + "system/Monitor";
$(function() {
var options = {
code: "monitorId",
parentCode: "pMonitorid",
expandColumn: "3",
uniqueId: "objid",
url: prefix + "/list?MonitorType=30",
createUrl: prefix + "/arrayAdd/{id}",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove/{id}",
exportUrl: prefix + "/export",
modalName: "测控点信息",
expandAll:false,
columns: [{
field: 'selectItem',
radio: true
},
{
field: 'monitorId',
title: '编号',
align: 'left'
},
{
field: 'pMonitorid',
title: '父级',
align: 'left',
visible: false
},
{
field: 'monitorName',
title: '名称',
align: 'left',
width: '30%'
},
{
field: 'monitorType',
title: '类型',
align: 'left'
},
{
field: 'monitorAddr',
title: '测控点位置',
align: 'left',
width: '20%'
},
{
field: 'collectDeviceId',
title: '集中器',
align: 'left'
},
/*{
field: 'sensorMeterTypeId',
title: '传感器仪表',
align: 'left',
visible: false
},
{
field: 'meterId',
title: '测量器具',
align: 'left',
visible: false
},*/
{
field: 'meterCommunicationId',
title: '通讯端口',
align: 'left'
},
/*{
field: 'isKeyMonitor',
title: '是否重点',
align: 'left',
formatter: function(value, row, index) {
return $.table.selectDictLabel(isKeyMonitorDatas, value);
}
},*/
{
field: 'monitorStatus',
title: '状态',
align: 'left',
formatter: function(value, row, index) {
return $.table.selectDictLabel(monitorStatusDatas, value);
}
},
/*{
field: 'correctValue',
title: '修正值',
align: 'left',
visible: false
},
{
field: 'pt',
title: 'PT值',
align: 'left',
visible: false
},
{
field: 'ct',
title: 'CT值',
align: 'left',
visible: false
},*/
{
title: '操作',
align: 'center',
align: 'left',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-info btn-xs ' + addFlag + '" href="javascript:void(0)" onclick="$.operate.add(\'' + row.objid + '\')"><i class="fa fa-plus"></i>新增</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.treeTable.init(options);
});
</script>
</body>
</html>

@ -0,0 +1,49 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('测控点信息树选择')" />
<th:block th:include="include :: ztree-css" />
</head>
<style>
body{height:auto;font-family: "Microsoft YaHei";}
button{font-family: "SimSun","Helvetica Neue",Helvetica,Arial;}
</style>
<body class="hold-transition box box-main">
<input id="treeId" name="treeId" type="hidden" th:value="${t_Monitor?.monitorId}"/>
<input id="treeName" name="treeName" type="hidden" th:value="${t_Monitor?.monitorName}"/>
<div class="wrapper"><div class="treeShowHideButton" onclick="$.tree.toggleSearch();">
<label id="btnShow" title="显示搜索" style="display:none;"></label>
<label id="btnHide" title="隐藏搜索"></label>
</div>
<div class="treeSearchInput" id="search">
<label for="keyword">关键字:</label><input type="text" class="empty" id="keyword" maxlength="50">
<button class="btn" id="btn" onclick="$.tree.searchNode()"> 搜索 </button>
</div>
<div class="treeExpandCollapse">
<a href="#" onclick="$.tree.expand()">展开</a> /
<a href="#" onclick="$.tree.collapse()">折叠</a>
</div>
<div id="tree" class="ztree treeselect"></div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: ztree-js" />
<script th:inline="javascript">
$(function() {
var url = ctx + "system/Monitor/treeData?monitorType=30";
var options = {
url: url,
expandLevel: 1,
onClick : zOnClick
};
$.tree.init(options);
});
function zOnClick(event, treeId, treeNode) {
var treeId = treeNode.id;
var treeName = treeNode.name;
$("#treeId").val(treeId);
$("#treeName").val(treeName);
}
</script>
</body>
</html>

@ -63,6 +63,12 @@ public class TArraytemperaturedata extends BaseEntity {
@Excel(name = "位置1") @Excel(name = "位置1")
private BigDecimal Site1; private BigDecimal Site1;
/**
*
*/
@Excel(name = "测控点编号")
private String monitorId;
/** /**
* 2 * 2
*/ */

@ -12,6 +12,7 @@
<result property="avgTemperature" column="avgTemperature"/> <result property="avgTemperature" column="avgTemperature"/>
<result property="collectTime" column="collectTime"/> <result property="collectTime" column="collectTime"/>
<result property="recodeTime" column="recodeTime"/> <result property="recodeTime" column="recodeTime"/>
<result property="monitorId" column="monitorId"/>
<result property="Site1" column="Site1"/> <result property="Site1" column="Site1"/>
<result property="Site2" column="Site2"/> <result property="Site2" column="Site2"/>
<result property="Site3" column="Site3"/> <result property="Site3" column="Site3"/>
@ -790,6 +791,7 @@
avgTemperature, avgTemperature,
collectTime, collectTime,
recodeTime, recodeTime,
monitorId,
Site1, Site1,
Site2, Site2,
Site3, Site3,
@ -1567,6 +1569,7 @@
<where> <where>
<if test="probeAddress != null ">and probeAddress = #{probeAddress}</if> <if test="probeAddress != null ">and probeAddress = #{probeAddress}</if>
<if test="maxTemperature != null ">and maxTemperature = #{maxTemperature}</if> <if test="maxTemperature != null ">and maxTemperature = #{maxTemperature}</if>
<if test="monitorId != null ">and monitorId = #{monitorId}</if>
<if test="minTemperature != null ">and minTemperature = #{minTemperature}</if> <if test="minTemperature != null ">and minTemperature = #{minTemperature}</if>
<if test="avgTemperature != null ">and avgTemperature = #{avgTemperature}</if> <if test="avgTemperature != null ">and avgTemperature = #{avgTemperature}</if>
<if test="collectTime != null ">and collectTime = #{collectTime}</if> <if test="collectTime != null ">and collectTime = #{collectTime}</if>
@ -1583,6 +1586,7 @@
resultMap="TArraytemperaturedataResult"> resultMap="TArraytemperaturedataResult">
SELECT TOP 1 * SELECT TOP 1 *
FROM T_ArrayTemperatureData FROM T_ArrayTemperatureData
<if test="monitorId != null ">and monitorId = #{monitorId}</if>
ORDER BY collectTime DESC ORDER BY collectTime DESC
</select> </select>

Loading…
Cancel
Save