change - 振动阈值页面、阈值设置存储逻辑优化

master
yinq 4 days ago
parent 1998c69773
commit bc439749a1

@ -25,14 +25,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
/**
* Controller
*
*
* @author wenjy
* @date 2021-01-28
*/
@Controller
@RequestMapping("/system/SetMonitorThresholdValue")
public class TSetmonitorthresholdvalueController extends BaseController
{
public class TSetmonitorthresholdvalueController extends BaseController {
private String prefix = "system/SetMonitorThresholdValue";
@Autowired
@ -43,10 +42,9 @@ public class TSetmonitorthresholdvalueController extends BaseController
@RequiresPermissions("system:SetMonitorThresholdValue:view")
@GetMapping()
public String SetMonitorThresholdValue(@RequestParam("id") int id)
{
public String SetMonitorThresholdValue(@RequestParam("id") int id) {
String url = "";
switch (id){
switch (id) {
case 2:
url = "/SetMonitorThresholdValueDnb";
break;
@ -78,30 +76,43 @@ public class TSetmonitorthresholdvalueController extends BaseController
@RequiresPermissions("system:SetMonitorThresholdValue:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(TSetmonitorthresholdvalue tSetmonitorthresholdvalue)
{
public TableDataInfo list(TSetmonitorthresholdvalue tSetmonitorthresholdvalue) {
startPage();
List<TSetmonitorthresholdvalueDTO> list = new ArrayList<>();
if(StringUtils.isNotEmpty(tSetmonitorthresholdvalue.getMonitorId())){
if (StringUtils.isNotEmpty(tSetmonitorthresholdvalue.getMonitorId())) {
T_Monitor t_monitor = new T_Monitor();
t_monitor.setMonitorId(tSetmonitorthresholdvalue.getMonitorId());
T_Monitor monitor = monitorService.selectT_MonitorList(t_monitor).get(0);
switch (monitor.getGrade()){
switch (monitor.getGrade()) {
case 2:
list = tSetmonitorthresholdvalueService.selectTSetmonitorthresholdvalueDTOList(new TSetmonitorthresholdvalueDTO(null,tSetmonitorthresholdvalue.getMonitorId(),tSetmonitorthresholdvalue.getDeleted()));
list = tSetmonitorthresholdvalueService.selectTSetmonitorthresholdvalueDTOList(new TSetmonitorthresholdvalueDTO(null, tSetmonitorthresholdvalue.getMonitorId(), tSetmonitorthresholdvalue.getDeleted()));
break;
case 3:
list = tSetmonitorthresholdvalueService.selectTSetmonitorthresholdvalueDTOList(new TSetmonitorthresholdvalueDTO(tSetmonitorthresholdvalue.getMonitorId(),null,tSetmonitorthresholdvalue.getDeleted()));
list = tSetmonitorthresholdvalueService.selectTSetmonitorthresholdvalueDTOList(new TSetmonitorthresholdvalueDTO(tSetmonitorthresholdvalue.getMonitorId(), null, tSetmonitorthresholdvalue.getDeleted()));
break;
default:
break;
}
return getDataTable(list);
} else {
TSetmonitorthresholdvalueDTO tSetmonitorthresholdvalueDTO = new TSetmonitorthresholdvalueDTO();
tSetmonitorthresholdvalueDTO.setMonitorType(tSetmonitorthresholdvalue.getMonitorType());
tSetmonitorthresholdvalueDTO.setDeleted(tSetmonitorthresholdvalue.getDeleted());
list = tSetmonitorthresholdvalueService.selectTSetmonitorthresholdvalueDTOList(tSetmonitorthresholdvalueDTO);
}
TSetmonitorthresholdvalueDTO tSetmonitorthresholdvalueDTO = new TSetmonitorthresholdvalueDTO();
tSetmonitorthresholdvalueDTO.setMonitorType(tSetmonitorthresholdvalue.getMonitorType());
tSetmonitorthresholdvalueDTO.setDeleted(tSetmonitorthresholdvalue.getDeleted());
return getDataTable(tSetmonitorthresholdvalueService.selectTSetmonitorthresholdvalueDTOList(tSetmonitorthresholdvalueDTO));
for (int i = 0; i < list.size(); i++) {
TSetmonitorthresholdvalueDTO dto = list.get(i);
if (StringUtils.isNull(dto.getObjId())) {
tSetmonitorthresholdvalueService.insertTSetmonitorthresholdvalue(new TSetmonitorthresholdvalue(tSetmonitorthresholdvalue.getMonitorId(), tSetmonitorthresholdvalue.getMonitorType()));
TSetmonitorthresholdvalueDTO selectDto = new TSetmonitorthresholdvalueDTO();
selectDto.setMonitorId(tSetmonitorthresholdvalue.getMonitorId());
selectDto.setMonitorType(tSetmonitorthresholdvalue.getMonitorType());
List<TSetmonitorthresholdvalueDTO> dtoList = tSetmonitorthresholdvalueService.selectTSetmonitorthresholdvalueDTOList(selectDto);
if (!dtoList.isEmpty()) {
list.set(i, dtoList.get(0));
}
}
}
return getDataTable(list);
}
/**
@ -111,8 +122,7 @@ public class TSetmonitorthresholdvalueController extends BaseController
@Log(title = "仪阈值设置信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(TSetmonitorthresholdvalue tSetmonitorthresholdvalue)
{
public AjaxResult export(TSetmonitorthresholdvalue tSetmonitorthresholdvalue) {
List<TSetmonitorthresholdvalue> list = tSetmonitorthresholdvalueService.selectTSetmonitorthresholdvalueList(tSetmonitorthresholdvalue);
ExcelUtil<TSetmonitorthresholdvalue> util = new ExcelUtil<TSetmonitorthresholdvalue>(TSetmonitorthresholdvalue.class);
return util.exportExcel(list, "SetMonitorThresholdValue");
@ -122,8 +132,7 @@ public class TSetmonitorthresholdvalueController extends BaseController
*
*/
@GetMapping("/add")
public String add()
{
public String add() {
return prefix + "/add";
}
@ -134,8 +143,7 @@ public class TSetmonitorthresholdvalueController extends BaseController
@Log(title = "仪阈值设置信息", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(TSetmonitorthresholdvalue tSetmonitorthresholdvalue)
{
public AjaxResult addSave(TSetmonitorthresholdvalue tSetmonitorthresholdvalue) {
return toAjax(tSetmonitorthresholdvalueService.insertTSetmonitorthresholdvalue(tSetmonitorthresholdvalue));
}
@ -143,23 +151,22 @@ public class TSetmonitorthresholdvalueController extends BaseController
*
*/
@GetMapping("/edit/{objId}")
public String edit(@PathVariable("objId") Long objId, ModelMap mmap)
{
public String edit(@PathVariable("objId") Long objId, ModelMap mmap) {
String url = "";
TSetmonitorthresholdvalue tSetmonitorthresholdvalue = tSetmonitorthresholdvalueService.selectTSetmonitorthresholdvalueById(objId);
mmap.put("tSetmonitorthresholdvalue", tSetmonitorthresholdvalue);
switch (tSetmonitorthresholdvalue.getMonitorType()){
switch (tSetmonitorthresholdvalue.getMonitorType()) {
case 2:
url ="/Dnbedit";
url = "/Dnbedit";
break;
case 16:
url ="/Tempedit";
url = "/Tempedit";
break;
case 20:
url ="/VibrationEdit";
url = "/VibrationEdit";
break;
case 30:
url ="/ArrayEdit";
url = "/ArrayEdit";
break;
}
return prefix + url;
@ -172,8 +179,7 @@ public class TSetmonitorthresholdvalueController extends BaseController
@Log(title = "仪阈值设置信息", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(TSetmonitorthresholdvalue tSetmonitorthresholdvalue)
{
public AjaxResult editSave(TSetmonitorthresholdvalue tSetmonitorthresholdvalue) {
tSetmonitorthresholdvalue.setUpdateBy(ShiroUtils.getSysUser().getUserName());
tSetmonitorthresholdvalue.setUpdateTime(new Date());
return toAjax(tSetmonitorthresholdvalueService.updateTSetmonitorthresholdvalue(tSetmonitorthresholdvalue));
@ -184,10 +190,9 @@ public class TSetmonitorthresholdvalueController extends BaseController
*/
@RequiresPermissions("system:SetMonitorThresholdValue:remove")
@Log(title = "仪阈值设置信息", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@PostMapping("/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
public AjaxResult remove(String ids) {
return toAjax(tSetmonitorthresholdvalueService.deleteTSetmonitorthresholdvalueByIds(ids));
}
}

@ -0,0 +1,323 @@
<!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('温度阵列阈值设置')"/>
<th:block th:include="include :: layout-latest-css"/>
<th:block th:include="include :: ztree-css"/>
<th:block th:include="include :: datetimepicker-css"/>
</head>
<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 class="select-list">
<ul>
<li>
能源类型:
<select id="monitorType" style="width: 50%; height: 20px" th:with="type=${@energyTypeService.getEnergyType()}">
&lt;!&ndash;<option value="">所有</option>&ndash;&gt;
<option th:each="dict : ${type}" th:text="${dict.energyName}" th:value="${dict.energyTypeId}"></option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded" onclick="queryDeptTree()" style="width: 60px;height: 23px;padding: 1px 7px"><i class="fa fa-search" ></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded" style="width: 60px;height: 23px;padding: 1px 7px"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</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="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<input type="text" id="monitorType" name="monitorType" hidden="true"/>
<input type="text" id="monitorId" name="monitorId" hidden="true"/>
<div class="select-list">
<ul>
<li>
<label>是否启用:</label>
<select name="deleted" 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>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.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:SetMonitorThresholdValue:add">
<i class="fa fa-plus"></i> 添加
</a>-->
<a class="btn btn-primary single disabled" onclick="$.operate.edit()"
shiro:hasPermission="system:SetMonitorThresholdValue:edit">
<i class="fa fa-edit"></i> 修改
</a>
<!--<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:SetMonitorThresholdValue:remove">
<i class="fa fa-remove"></i> 删除
</a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()"
shiro:hasPermission="system:SetMonitorThresholdValue:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
</div>
<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">
var editFlag = [[${@permission.hasPermi('system:SetMonitorThresholdValue:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:SetMonitorThresholdValue:remove')}]];
var deletedDatas = [[${@dict.getType('isKey')}]];
var prefix = ctx + "system/SetMonitorThresholdValue";
$("#monitorType").val(20);
$(function () {
var panehHidden = false;
if ($(this).width() < 769) {
panehHidden = true;
}
$('body').layout({initClosed: panehHidden, west__size: 245});
queryUserList();
queryDeptTree();
});
function queryUserList() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "仪阈值设置信息",
columns: [{
checkbox: true
},
{
field: 'objId',
title: '标识',
visible: false
},
{
field: 'monitorId',
title: '测控点编号',
visible: false
},
{
field: 'monitorName',
title: '测控点名称',
width: '180'
},
{
field: 'monitorType',
title: '类型',
visible: false
},
{
field: 'temperatureMax',
title: '温度最大值'
},
{
field: 'tMaxIdea',
title: '温度过高意见'
},
{
field: 'temperatureMin',
title: '温度最小值'
},
{
field: 'tMinIdea',
title: '温度过底意见'
},
{
field: 'humidityMax',
title: '速度最大值'
},
{
field: 'hMaxIdea',
title: '速度过高意见'
},
{
field: 'humidityMin',
title: '速度最小值'
},
{
field: 'hMinIdea',
title: '速度过低意见'
},
{
field: 'illuminanceMax',
title: '位移最大值'
},
{
field: 'iMaxIdea',
title: '位移过高意见'
},
{
field: 'illuminanceMin',
title: '位移最小值'
},
{
field: 'iMinIdea',
title: '位移过低意见'
},
/*{
field: 'iAMax',
title: 'A相电流最大值'
},
{
field: 'iAMin',
title: 'A相电流最小值'
},
{
field: 'iBMax',
title: 'B相电流最大值'
},
{
field: 'iBMin',
title: 'B相电流最小值'
},
{
field: 'iCMax',
title: 'C相电流最大值'
},
{
field: 'iCMin',
title: 'C相电流最小值'
},
{
field: 'vAMax',
title: 'A相电压最大值'
},
{
field: 'vAMin',
title: 'A相电压最小值'
},
{
field: 'vBMax',
title: 'B相电压最大值'
},
{
field: 'vBMin',
title: 'B相电压最小值'
},
{
field: 'vCMax',
title: 'C相电压最大值'
},
{
field: 'vCMin',
title: 'C相电压最小值'
},*/
{
field: 'deleted',
title: '是否启用',
formatter: function (value, row, index) {
return $.table.selectDictLabel(deletedDatas, value);
}
},
{
title: '操作',
align: 'center',
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-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
}
function queryDeptTree() {
var url = ctx + "system/Monitor/treeData?monitorType=20";
var options = {
url: url,
expandLevel: 1,
onClick: zOnClick
};
$.tree.init(options);
function zOnClick(event, treeId, treeNode) {
$("#monitorId").val(treeNode.id);
//alert(treeNode.level);
$.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=20";
$.modal.openTab("测控点信息", url);
}
<!-- laydate示例 -->
layui.use('laydate', function () {
var laydate = layui.laydate;
laydate.render({
elem: '#laydate-demo-3',
type: 'datetime',
trigger: 'click'
});
laydate.render({
elem: '#laydate-demo-4',
type: 'datetime',
trigger: 'click'
});
});
</script>
</body>
</html>

@ -0,0 +1,191 @@
<!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-SetMonitorThresholdValue-edit" th:object="${tSetmonitorthresholdvalue}">
<input name="objId" th:field="*{objId}" type="hidden">
<input name="monitorType" th:field="*{monitorType}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">测控点编号:</label>
<div class="col-sm-8">
<input name="monitorId" th:field="*{monitorId}" class="form-control" type="text" readonly="true">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">测控点名称:</label>
<div class="col-sm-8">
<input name="monitorId" th:field="*{monitorName}" class="form-control" type="text" readonly="true">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">温度最大值:</label>
<div class="col-sm-8">
<input name="temperatureMax" th:field="*{temperatureMax}" 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="tMaxIdea" th:field="*{tMaxIdea}" 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="temperatureMin" th:field="*{temperatureMin}" 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="tMinIdea" th:field="*{tMinIdea}" 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="humidityMax" th:field="*{humidityMax}" 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="hMaxIdea" th:field="*{hMaxIdea}" 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="humidityMin" th:field="*{humidityMin}" 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="hMinIdea" th:field="*{hMinIdea}" 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="illuminanceMax" th:field="*{illuminanceMax}" 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="iMaxIdea" th:field="*{iMaxIdea}" 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="illuminanceMin" th:field="*{illuminanceMin}" 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="iMinIdea" th:field="*{iMinIdea}" 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="deleted" class="form-control m-b" th:with="type=${@dict.getType('isKey')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{deleted}"></option>
</select>
</div>
</div>
<!--<div class="form-group">
<label class="col-sm-3 control-label">A相电流最大值</label>
<div class="col-sm-8">
<input name="iAMax" th:field="*{iAMax}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">A相电流最小值</label>
<div class="col-sm-8">
<input name="iAMin" th:field="*{iAMin}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">B相电流最大值</label>
<div class="col-sm-8">
<input name="iBMax" th:field="*{iBMax}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">B相电流最小值</label>
<div class="col-sm-8">
<input name="iBMin" th:field="*{iBMin}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">C相电流最大值</label>
<div class="col-sm-8">
<input name="iCMax" th:field="*{iCMax}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">C相电流最小值</label>
<div class="col-sm-8">
<input name="iCMin" th:field="*{iCMin}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">A相电压最大值</label>
<div class="col-sm-8">
<input name="vAMax" th:field="*{vAMax}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">A相电压最小值</label>
<div class="col-sm-8">
<input name="vAMin" th:field="*{vAMin}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">B相电压最大值</label>
<div class="col-sm-8">
<input name="vBMax" th:field="*{vBMax}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">B相电压最小值</label>
<div class="col-sm-8">
<input name="vBMin" th:field="*{vBMin}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">C相电压最大值</label>
<div class="col-sm-8">
<input name="vCMax" th:field="*{vCMax}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">C相电压最小值</label>
<div class="col-sm-8">
<input name="vCMin" th:field="*{vCMin}" class="form-control" type="text">
</div>
</div>-->
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "system/SetMonitorThresholdValue";
$("#form-SetMonitorThresholdValue-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-SetMonitorThresholdValue-edit').serialize());
}
}
</script>
</body>
</html>

@ -116,7 +116,39 @@
</sql>
<sql id="selectTSetmonitorthresholdvalueDTOVo">
select t2.*, t1.p_monitorId, t1.monitorName
select t2.objId,
t2.temperatureMax,
t2.tMaxIdea,
t2.temperatureMin,
t2.tMinIdea,
t2.humidityMax,
t2.hMaxIdea,
t2.humidityMin,
t2.hMinIdea,
t2.illuminanceMax,
t2.iMaxIdea,
t2.illuminanceMin,
t2.iMinIdea,
t2.iAMax,
t2.iAMin,
t2.iBMax,
t2.iBMin,
t2.iCMax,
t2.iCMin,
t2.vAMax,
t2.vAMin,
t2.vBMax,
t2.vBMin,
t2.vCMax,
t2.vCMin,
t2.create_by,
t2.create_time,
t2.update_by,
t2.update_time,
t2.monitorType,
t2.deleted,
t1.monitorId,
t1.monitorName
from T_Monitor t1
left join T_SetMonitorThresholdValue t2 on t1.monitorId = t2.monitorId
</sql>
@ -138,7 +170,6 @@
<if test="p_monitor != null and p_monitor != ''">and (t1.monitorId = #{p_monitor} or t1.p_monitorId = #{p_monitor})</if>
<if test="monitorType != null and monitorType != ''">and t2.monitorType = #{monitorType}</if>
<if test="deleted != null and deleted != ''">and t2.deleted = #{deleted}</if>
</where>
</select>

Loading…
Cancel
Save