change - 温度阵列温度补偿配置与显示

master
yinq 1 year ago
parent 2e0fb5d4d4
commit 50154b207d

@ -236,8 +236,9 @@ public class T_MonitorController extends BaseController {
public String edit(@PathVariable("objid") Integer objid, ModelMap mmap) {
String url = "";
T_Monitor t_Monitor = t_MonitorService.selectT_MonitorById(objid);
Integer monitorType = t_Monitor.getMonitorType();
mmap.put("t_Monitor", t_Monitor);
switch (16) {
switch (monitorType) {
case 2:
url = "/DnbEdit";
break;

@ -36,6 +36,12 @@
<input name="monitorName" 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="correctValue" 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>-->

@ -0,0 +1,196 @@
<!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-edit" th:object="${t_Monitor}">
<input name="objid" th:field="*{objid}" type="hidden">
<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">[[*{collectDeviceId}]]</textarea>
</div>
<button type="button" class="btn btn-info" onclick="selectUsersToParent()">选择集中器</button>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">测控点编号:</label>
<div class="col-sm-8">
<textarea style="height: 32px" id="userid" name="monitorId" class="form-control">[[*{monitorId}]]</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:field="*{pMonitorid}" />
<input class="form-control" type="text" onclick="selectMonitorTree()" id="treeName" readonly="true" th:field="*{parentName}">
<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" th:field="*{monitorName}" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="col-sm-3 control-label">测控点类型:</label>-->
<!-- <div class="col-sm-8">-->
<!-- &lt;!&ndash;<select name="monitorType" class="form-control m-b">&ndash;&gt;-->
<!-- <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:field="*{monitorType}"></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}" th:field="*{secondType}"></option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">测控点位置:</label>
<div class="col-sm-8">
<input name="monitorAddr" th:field="*{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" th:field="*{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}" th:field="*{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" th:field="*{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}" th:field="*{isKeyMonitor}"></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}" th:field="*{monitorStatus}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">修正值:</label>
<div class="col-sm-8">
<input name="correctValue" th:field="*{correctValue}" 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="pt" th:field="*{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" th:field="*{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" th:field="*{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" th:field="*{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" th:field="*{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" th:field="*{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" th:field="*{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" th:field="*{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-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-Monitor-edit').serialize());
}
}
/*测控点信息-新增-选择父部门树*/
function selectMonitorTree() {
console.log("节点编号"+$("#treeId").val());
console.log("测控点编号"+$("#userid").val())
var options = {
title: '测控点信息选择',
width: "380",
url: prefix + "/selectMonitorTree/" + $("#userid").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>

@ -102,7 +102,8 @@
{
field: 'monitorType',
title: '类型',
align: 'left'
align: 'left',
visible: false
},
{
field: 'monitorAddr',
@ -115,12 +116,12 @@
title: '集中器',
align: 'left'
},
/*{
field: 'sensorMeterTypeId',
title: '传感器仪表',
align: 'left',
visible: false
{
field: 'correctValue',
title: '修正值',
align: 'left'
},
/*
{
field: 'meterId',
title: '测量器具',
@ -130,7 +131,8 @@
{
field: 'meterCommunicationId',
title: '通讯端口',
align: 'left'
align: 'left',
visible: false
},
/*{
field: 'isKeyMonitor',

@ -1597,7 +1597,7 @@
ROW_NUMBER() OVER (PARTITION BY monitorId ORDER BY collectTime DESC) AS rn
FROM T_ArrayTemperatureData
WHERE collectTime > (GETDATE() - 1)
<!-- <if test="monitorId != null and monitorId != ''">and monitorId like concat(#{monitorId}, '%')</if>-->
<!-- <if test="monitorId != null and monitorId != ''">and monitorId like concat(#{monitorId}, '%')</if>-->
<if test="monitorList != null and monitorList.size > 0">
and monitorId IN
<foreach item="monitorId" collection="monitorList" open="(" separator="," close=")">
@ -1605,9 +1605,785 @@
</foreach>
</if>
)
SELECT m.monitorName,t.*
SELECT m.monitorName,
t.maxTemperature + isnull(m.correctValue, 0) maxTemperature,
t.objId,
t.probeAddress,
t.minTemperature,
t.avgTemperature,
t.collectTime,
t.recodeTime,
t.Site1,
t.Site2,
t.Site3,
t.Site4,
t.Site5,
t.Site6,
t.Site7,
t.Site8,
t.Site9,
t.Site10,
t.Site11,
t.Site12,
t.Site13,
t.Site14,
t.Site15,
t.Site16,
t.Site17,
t.Site18,
t.Site19,
t.Site20,
t.Site21,
t.Site22,
t.Site23,
t.Site24,
t.Site25,
t.Site26,
t.Site27,
t.Site28,
t.Site29,
t.Site30,
t.Site31,
t.Site32,
t.Site33,
t.Site34,
t.Site35,
t.Site36,
t.Site37,
t.Site38,
t.Site39,
t.Site40,
t.Site41,
t.Site42,
t.Site43,
t.Site44,
t.Site45,
t.Site46,
t.Site47,
t.Site48,
t.Site49,
t.Site50,
t.Site51,
t.Site52,
t.Site53,
t.Site54,
t.Site55,
t.Site56,
t.Site57,
t.Site58,
t.Site59,
t.Site60,
t.Site61,
t.Site62,
t.Site63,
t.Site64,
t.Site65,
t.Site66,
t.Site67,
t.Site68,
t.Site69,
t.Site70,
t.Site71,
t.Site72,
t.Site73,
t.Site74,
t.Site75,
t.Site76,
t.Site77,
t.Site78,
t.Site79,
t.Site80,
t.Site81,
t.Site82,
t.Site83,
t.Site84,
t.Site85,
t.Site86,
t.Site87,
t.Site88,
t.Site89,
t.Site90,
t.Site91,
t.Site92,
t.Site93,
t.Site94,
t.Site95,
t.Site96,
t.Site97,
t.Site98,
t.Site99,
t.Site100,
t.Site101,
t.Site102,
t.Site103,
t.Site104,
t.Site105,
t.Site106,
t.Site107,
t.Site108,
t.Site109,
t.Site110,
t.Site111,
t.Site112,
t.Site113,
t.Site114,
t.Site115,
t.Site116,
t.Site117,
t.Site118,
t.Site119,
t.Site120,
t.Site121,
t.Site122,
t.Site123,
t.Site124,
t.Site125,
t.Site126,
t.Site127,
t.Site128,
t.Site129,
t.Site130,
t.Site131,
t.Site132,
t.Site133,
t.Site134,
t.Site135,
t.Site136,
t.Site137,
t.Site138,
t.Site139,
t.Site140,
t.Site141,
t.Site142,
t.Site143,
t.Site144,
t.Site145,
t.Site146,
t.Site147,
t.Site148,
t.Site149,
t.Site150,
t.Site151,
t.Site152,
t.Site153,
t.Site154,
t.Site155,
t.Site156,
t.Site157,
t.Site158,
t.Site159,
t.Site160,
t.Site161,
t.Site162,
t.Site163,
t.Site164,
t.Site165,
t.Site166,
t.Site167,
t.Site168,
t.Site169,
t.Site170,
t.Site171,
t.Site172,
t.Site173,
t.Site174,
t.Site175,
t.Site176,
t.Site177,
t.Site178,
t.Site179,
t.Site180,
t.Site181,
t.Site182,
t.Site183,
t.Site184,
t.Site185,
t.Site186,
t.Site187,
t.Site188,
t.Site189,
t.Site190,
t.Site191,
t.Site192,
t.Site193,
t.Site194,
t.Site195,
t.Site196,
t.Site197,
t.Site198,
t.Site199,
t.Site200,
t.Site201,
t.Site202,
t.Site203,
t.Site204,
t.Site205,
t.Site206,
t.Site207,
t.Site208,
t.Site209,
t.Site210,
t.Site211,
t.Site212,
t.Site213,
t.Site214,
t.Site215,
t.Site216,
t.Site217,
t.Site218,
t.Site219,
t.Site220,
t.Site221,
t.Site222,
t.Site223,
t.Site224,
t.Site225,
t.Site226,
t.Site227,
t.Site228,
t.Site229,
t.Site230,
t.Site231,
t.Site232,
t.Site233,
t.Site234,
t.Site235,
t.Site236,
t.Site237,
t.Site238,
t.Site239,
t.Site240,
t.Site241,
t.Site242,
t.Site243,
t.Site244,
t.Site245,
t.Site246,
t.Site247,
t.Site248,
t.Site249,
t.Site250,
t.Site251,
t.Site252,
t.Site253,
t.Site254,
t.Site255,
t.Site256,
t.Site257,
t.Site258,
t.Site259,
t.Site260,
t.Site261,
t.Site262,
t.Site263,
t.Site264,
t.Site265,
t.Site266,
t.Site267,
t.Site268,
t.Site269,
t.Site270,
t.Site271,
t.Site272,
t.Site273,
t.Site274,
t.Site275,
t.Site276,
t.Site277,
t.Site278,
t.Site279,
t.Site280,
t.Site281,
t.Site282,
t.Site283,
t.Site284,
t.Site285,
t.Site286,
t.Site287,
t.Site288,
t.Site289,
t.Site290,
t.Site291,
t.Site292,
t.Site293,
t.Site294,
t.Site295,
t.Site296,
t.Site297,
t.Site298,
t.Site299,
t.Site300,
t.Site301,
t.Site302,
t.Site303,
t.Site304,
t.Site305,
t.Site306,
t.Site307,
t.Site308,
t.Site309,
t.Site310,
t.Site311,
t.Site312,
t.Site313,
t.Site314,
t.Site315,
t.Site316,
t.Site317,
t.Site318,
t.Site319,
t.Site320,
t.Site321,
t.Site322,
t.Site323,
t.Site324,
t.Site325,
t.Site326,
t.Site327,
t.Site328,
t.Site329,
t.Site330,
t.Site331,
t.Site332,
t.Site333,
t.Site334,
t.Site335,
t.Site336,
t.Site337,
t.Site338,
t.Site339,
t.Site340,
t.Site341,
t.Site342,
t.Site343,
t.Site344,
t.Site345,
t.Site346,
t.Site347,
t.Site348,
t.Site349,
t.Site350,
t.Site351,
t.Site352,
t.Site353,
t.Site354,
t.Site355,
t.Site356,
t.Site357,
t.Site358,
t.Site359,
t.Site360,
t.Site361,
t.Site362,
t.Site363,
t.Site364,
t.Site365,
t.Site366,
t.Site367,
t.Site368,
t.Site369,
t.Site370,
t.Site371,
t.Site372,
t.Site373,
t.Site374,
t.Site375,
t.Site376,
t.Site377,
t.Site378,
t.Site379,
t.Site380,
t.Site381,
t.Site382,
t.Site383,
t.Site384,
t.Site385,
t.Site386,
t.Site387,
t.Site388,
t.Site389,
t.Site390,
t.Site391,
t.Site392,
t.Site393,
t.Site394,
t.Site395,
t.Site396,
t.Site397,
t.Site398,
t.Site399,
t.Site400,
t.Site401,
t.Site402,
t.Site403,
t.Site404,
t.Site405,
t.Site406,
t.Site407,
t.Site408,
t.Site409,
t.Site410,
t.Site411,
t.Site412,
t.Site413,
t.Site414,
t.Site415,
t.Site416,
t.Site417,
t.Site418,
t.Site419,
t.Site420,
t.Site421,
t.Site422,
t.Site423,
t.Site424,
t.Site425,
t.Site426,
t.Site427,
t.Site428,
t.Site429,
t.Site430,
t.Site431,
t.Site432,
t.Site433,
t.Site434,
t.Site435,
t.Site436,
t.Site437,
t.Site438,
t.Site439,
t.Site440,
t.Site441,
t.Site442,
t.Site443,
t.Site444,
t.Site445,
t.Site446,
t.Site447,
t.Site448,
t.Site449,
t.Site450,
t.Site451,
t.Site452,
t.Site453,
t.Site454,
t.Site455,
t.Site456,
t.Site457,
t.Site458,
t.Site459,
t.Site460,
t.Site461,
t.Site462,
t.Site463,
t.Site464,
t.Site465,
t.Site466,
t.Site467,
t.Site468,
t.Site469,
t.Site470,
t.Site471,
t.Site472,
t.Site473,
t.Site474,
t.Site475,
t.Site476,
t.Site477,
t.Site478,
t.Site479,
t.Site480,
t.Site481,
t.Site482,
t.Site483,
t.Site484,
t.Site485,
t.Site486,
t.Site487,
t.Site488,
t.Site489,
t.Site490,
t.Site491,
t.Site492,
t.Site493,
t.Site494,
t.Site495,
t.Site496,
t.Site497,
t.Site498,
t.Site499,
t.Site500,
t.Site501,
t.Site502,
t.Site503,
t.Site504,
t.Site505,
t.Site506,
t.Site507,
t.Site508,
t.Site509,
t.Site510,
t.Site511,
t.Site512,
t.Site513,
t.Site514,
t.Site515,
t.Site516,
t.Site517,
t.Site518,
t.Site519,
t.Site520,
t.Site521,
t.Site522,
t.Site523,
t.Site524,
t.Site525,
t.Site526,
t.Site527,
t.Site528,
t.Site529,
t.Site530,
t.Site531,
t.Site532,
t.Site533,
t.Site534,
t.Site535,
t.Site536,
t.Site537,
t.Site538,
t.Site539,
t.Site540,
t.Site541,
t.Site542,
t.Site543,
t.Site544,
t.Site545,
t.Site546,
t.Site547,
t.Site548,
t.Site549,
t.Site550,
t.Site551,
t.Site552,
t.Site553,
t.Site554,
t.Site555,
t.Site556,
t.Site557,
t.Site558,
t.Site559,
t.Site560,
t.Site561,
t.Site562,
t.Site563,
t.Site564,
t.Site565,
t.Site566,
t.Site567,
t.Site568,
t.Site569,
t.Site570,
t.Site571,
t.Site572,
t.Site573,
t.Site574,
t.Site575,
t.Site576,
t.Site577,
t.Site578,
t.Site579,
t.Site580,
t.Site581,
t.Site582,
t.Site583,
t.Site584,
t.Site585,
t.Site586,
t.Site587,
t.Site588,
t.Site589,
t.Site590,
t.Site591,
t.Site592,
t.Site593,
t.Site594,
t.Site595,
t.Site596,
t.Site597,
t.Site598,
t.Site599,
t.Site600,
t.Site601,
t.Site602,
t.Site603,
t.Site604,
t.Site605,
t.Site606,
t.Site607,
t.Site608,
t.Site609,
t.Site610,
t.Site611,
t.Site612,
t.Site613,
t.Site614,
t.Site615,
t.Site616,
t.Site617,
t.Site618,
t.Site619,
t.Site620,
t.Site621,
t.Site622,
t.Site623,
t.Site624,
t.Site625,
t.Site626,
t.Site627,
t.Site628,
t.Site629,
t.Site630,
t.Site631,
t.Site632,
t.Site633,
t.Site634,
t.Site635,
t.Site636,
t.Site637,
t.Site638,
t.Site639,
t.Site640,
t.Site641,
t.Site642,
t.Site643,
t.Site644,
t.Site645,
t.Site646,
t.Site647,
t.Site648,
t.Site649,
t.Site650,
t.Site651,
t.Site652,
t.Site653,
t.Site654,
t.Site655,
t.Site656,
t.Site657,
t.Site658,
t.Site659,
t.Site660,
t.Site661,
t.Site662,
t.Site663,
t.Site664,
t.Site665,
t.Site666,
t.Site667,
t.Site668,
t.Site669,
t.Site670,
t.Site671,
t.Site672,
t.Site673,
t.Site674,
t.Site675,
t.Site676,
t.Site677,
t.Site678,
t.Site679,
t.Site680,
t.Site681,
t.Site682,
t.Site683,
t.Site684,
t.Site685,
t.Site686,
t.Site687,
t.Site688,
t.Site689,
t.Site690,
t.Site691,
t.Site692,
t.Site693,
t.Site694,
t.Site695,
t.Site696,
t.Site697,
t.Site698,
t.Site699,
t.Site700,
t.Site701,
t.Site702,
t.Site703,
t.Site704,
t.Site705,
t.Site706,
t.Site707,
t.Site708,
t.Site709,
t.Site710,
t.Site711,
t.Site712,
t.Site713,
t.Site714,
t.Site715,
t.Site716,
t.Site717,
t.Site718,
t.Site719,
t.Site720,
t.Site721,
t.Site722,
t.Site723,
t.Site724,
t.Site725,
t.Site726,
t.Site727,
t.Site728,
t.Site729,
t.Site730,
t.Site731,
t.Site732,
t.Site733,
t.Site734,
t.Site735,
t.Site736,
t.Site737,
t.Site738,
t.Site739,
t.Site740,
t.Site741,
t.Site742,
t.Site743,
t.Site744,
t.Site745,
t.Site746,
t.Site747,
t.Site748,
t.Site749,
t.Site750,
t.Site751,
t.Site752,
t.Site753,
t.Site754,
t.Site755,
t.Site756,
t.Site757,
t.Site758,
t.Site759,
t.Site760,
t.Site761,
t.Site762,
t.Site763,
t.Site764,
t.Site765,
t.Site766,
t.Site767,
t.Site768,
t.monitorId
FROM RankedData t
left join T_Monitor m on m.monitorId = t.monitorId
LEFT JOIN T_Monitor m on m.monitorId = t.monitorId
WHERE t.rn = 1
ORDER BY monitorId
</select>
@ -3972,20 +4748,22 @@
</delete>
<select id="getHighestPointTemperature" parameterType="TArraytemperaturedata" resultType="java.util.HashMap">
SELECT monitorId, collectTime, maxTemperature tempreture
FROM T_ArrayTemperatureData
SELECT ta.monitorId, ta.collectTime, ta.maxTemperature + isnull(m.correctValue, 0) tempreture
FROM T_ArrayTemperatureData ta
left join T_Monitor m on ta.monitorId = m.monitorId
<where>
<if test="monitorId != null and monitorId != ''">and monitorId = #{monitorId}</if>
<if test="monitorId != null and monitorId != ''">and ta.monitorId = #{monitorId}</if>
<if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
and collectTime between #{params.beginCollectTime} and #{params.endCollectTime}
and ta.collectTime between #{params.beginCollectTime} and #{params.endCollectTime}
</if>
</where>
order by monitorId, collectTime
order by ta.monitorId, ta.collectTime
</select>
<select id="selectArrayTemperatureSensorAlarmList" parameterType="TArraytemperaturedata"
resultMap="TArraytemperaturedataResult">
select ta.monitorId, ta.collectTime, ta.maxTemperature, ta.minTemperature, ta.recodeTime, st.temperatureMax,st.tMaxIdea
select ta.monitorId, ta.collectTime, ta.maxTemperature, ta.minTemperature, ta.recodeTime,
st.temperatureMax,st.tMaxIdea
from T_ArrayTemperatureData ta
left join T_Monitor m on ta.monitorId = m.monitorId
left join T_SetMonitorThresholdValue st on st.monitorId = m.monitorId

@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="grade != null "> and grade &lt; #{grade}</if>
<if test="secondType != null "> OR secondType = #{secondType}</if>
</where>
order by correctValue
order by grade,monitorId
</select>
<select id="selectT_MonitorDTOList" parameterType="T_MonitorDTO" resultMap="T_MonitorDTOResult">
@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="monitorStatus != null "> and t.monitorStatus = #{monitorStatus}</if>
<if test="grade != null "> and t.grade = #{grade}</if>
</where>
ORDER BY t.grade,t.correctValue
ORDER BY t.grade, t.monitorId
</select>
<select id="selectT_Dnb_MonitorDTOList" parameterType="T_MonitorDTO" resultMap="T_MonitorDTOResult">
@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t.monitorStatus, t.correctValue, t.pt, t.ct,t.secondType
from T_Monitor t
where t.monitorType = 2
ORDER BY t.grade,t.correctValue
ORDER BY t.grade, t.correctValue
</select>
<select id="selectT_MonitorById" parameterType="Integer" resultMap="T_MonitorResult">

Loading…
Cancel
Save