|
|
@@ -33,6 +33,7 @@
|
|
|
,d.ADDRESS as "address"
|
|
|
,d.POINT_X as "pointX"
|
|
|
,d.POINT_Y as "pointY"
|
|
|
+ ,ast.id as "alarmSettingId"
|
|
|
,ast.ALARM_CONDITION +" " +ast.ALARM_VALUE as "alermRule"
|
|
|
,concat(ifnull(ast.ALARM_CONDITION,''),ifnull(ast.ALARM_VALUE,'')) as "alermRule"
|
|
|
,att.UNIT as "unit"
|
|
|
@@ -52,8 +53,8 @@
|
|
|
,d.POINT_X as "pointX"
|
|
|
,d.POINT_Y as "pointY"
|
|
|
|
|
|
-
|
|
|
- ,a.ALARM_VALUE as "alarmValue"
|
|
|
+ ,ast.id as "alarmSettingId"
|
|
|
+ ,concat(a.ALARM_VALUE,ifnull(ast.unit,'')) as "alarmValue"
|
|
|
,a.ALARM_CONTENT as "alarmContent"
|
|
|
|
|
|
</sql>
|
|
|
@@ -72,11 +73,12 @@
|
|
|
,d.POINT_X as "pointX"
|
|
|
,d.POINT_Y as "pointY"
|
|
|
|
|
|
- ,a.MIN_VALUE as "minValue"
|
|
|
- ,a.MAX_VALUE as "maxValue"
|
|
|
- ,concat(ifnull(ast.ALARM_CONDITION,''),ifnull(ast.ALARM_VALUE,'')) as "alermRule"
|
|
|
+ ,concat(a.MIN_VALUE,ifnull(ast.unit,'')) as "minValue"
|
|
|
+ ,concat(a.MAX_VALUE,ifnull(ast.unit,''))as "maxValue"
|
|
|
+ ,ast.id as "alarmSettingId"
|
|
|
+ ,concat(ifnull(ast.ALARM_CONDITION,''),ifnull(ast.ALARM_VALUE,''),ifnull(ast.unit,'')) as "alermRule"
|
|
|
,a.ALARM_END_TIME as "alarmEndTime"
|
|
|
- ,timestampdiff(MINUTE,ifnull(a.ALARM_END_TIME,now()),a.ALARM_START_TIME) as "duration"
|
|
|
+ ,concat(timestampdiff(MINUTE,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now())),,'分钟') as "duration"
|
|
|
|
|
|
</sql>
|
|
|
|
|
|
@@ -84,8 +86,8 @@
|
|
|
left join sms_device d on a.DEVICE_ID =d.id and d.`STATUS` = 1
|
|
|
left join sms_scene s on d.SCENE_ID =s.id and s.`STATUS` =1
|
|
|
left join sms_device_type t on d.DEVICE_TYPE_ID =t.ID
|
|
|
- left join sms_alarm_setting ast on ast.id= a.ATTRIBUTE_ID
|
|
|
- left join sms_device_attribute att on att.id=ast.ATTRIBUTE_ID
|
|
|
+ left join sms_alarm_setting ast on ast.id= a.alarm_setting_id
|
|
|
+ left join sms_device_attribute att on att.id=a.ATTRIBUTE_ID
|
|
|
</sql>
|
|
|
<select id="selectById" resultType="com.huaxu.dto.AlarmDetailsDto">
|
|
|
select
|
|
|
@@ -172,16 +174,16 @@
|
|
|
|
|
|
<!-- 新增所有列 -->
|
|
|
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
|
|
|
- INSERT INTO sms_alarm_details ( TENANT_ID , DEVICE_ID , COMPANY_ORG_ID , DEPT_ORG_ID , ALARM_TYPE , ATTRIBUTE_ID , ALARM_VALUE , ALARM_CONTENT , ALARM_START_TIME , ALARM_END_TIME , STATE , OP_STATE , REMARK , STATUS , DATE_CREATE , CREATE_BY , DATE_UPDATE , UPDATE_BY , MIN_VALUE, MAX_VALUE )
|
|
|
- VALUES ( #{tenantId} , #{deviceId} , #{companyOrgId} , #{deptOrgId} , #{alarmType} , #{attributeId} , #{alarmValue} , #{alarmContent} , #{alarmStartTime} , #{alarmEndTime} , #{state} , #{opState} , #{remark} , #{status} , #{dateCreate} , #{createBy} , #{dateUpdate} , #{updateBy},#{minValue} ,#{maxValue} )
|
|
|
+ INSERT INTO sms_alarm_details ( TENANT_ID , DEVICE_ID , COMPANY_ORG_ID , DEPT_ORG_ID , ALARM_TYPE , ATTRIBUTE_ID , ALARM_VALUE , ALARM_CONTENT , ALARM_START_TIME , ALARM_END_TIME , STATE , OP_STATE , REMARK , STATUS , DATE_CREATE , CREATE_BY , DATE_UPDATE , UPDATE_BY , MIN_VALUE, MAX_VALUE, ALARM_SETTING_ID )
|
|
|
+ VALUES ( #{tenantId} , #{deviceId} , #{companyOrgId} , #{deptOrgId} , #{alarmType} , #{attributeId} , #{alarmValue} , #{alarmContent} , #{alarmStartTime} , #{alarmEndTime} , #{state} , #{opState} , #{remark} , #{status} , #{dateCreate} , #{createBy} , #{dateUpdate} , #{updateBy},#{minValue} ,#{maxValue}, #{alarmSettingId} )
|
|
|
</insert>
|
|
|
|
|
|
<!-- 批量新增 -->
|
|
|
<insert id="batchInsert">
|
|
|
- INSERT INTO sms_alarm_details ( TENANT_ID , DEVICE_ID , COMPANY_ORG_ID , DEPT_ORG_ID , ALARM_TYPE , ATTRIBUTE_ID , ALARM_VALUE , ALARM_CONTENT , ALARM_START_TIME , ALARM_END_TIME , STATE , OP_STATE , REMARK , STATUS , DATE_CREATE , CREATE_BY , DATE_UPDATE , UPDATE_BY, MIN_VALUE, MAX_VALUE )
|
|
|
+ INSERT INTO sms_alarm_details ( TENANT_ID , DEVICE_ID , COMPANY_ORG_ID , DEPT_ORG_ID , ALARM_TYPE , ATTRIBUTE_ID , ALARM_VALUE , ALARM_CONTENT , ALARM_START_TIME , ALARM_END_TIME , STATE , OP_STATE , REMARK , STATUS , DATE_CREATE , CREATE_BY , DATE_UPDATE , UPDATE_BY, MIN_VALUE, MAX_VALUE,ALARM_SETTING_ID )
|
|
|
values
|
|
|
<foreach collection="alarmDetails" item="item" index="index" separator=",">
|
|
|
- ( #{item.tenantId} , #{item.deviceId} , #{item.companyOrgId} , #{item.deptOrgId} , #{item.alarmType} , #{item.attributeId} , #{item.alarmValue} , #{item.alarmContent} , #{item.alarmStartTime} , #{item.alarmEndTime} , #{item.state} , #{item.opState} , #{item.remark} , #{item.status} , #{item.dateCreate} , #{item.createBy} , #{item.dateUpdate} , #{item.updateBy} ,#{item.minValue} ,#{item.maxValue})
|
|
|
+ ( #{item.tenantId} , #{item.deviceId} , #{item.companyOrgId} , #{item.deptOrgId} , #{item.alarmType} , #{item.attributeId} , #{item.alarmValue} , #{item.alarmContent} , #{item.alarmStartTime} , #{item.alarmEndTime} , #{item.state} , #{item.opState} , #{item.remark} , #{item.status} , #{item.dateCreate} , #{item.createBy} , #{item.dateUpdate} , #{item.updateBy} ,#{item.minValue} ,#{item.maxValue},#{item.alarmSettingId})
|
|
|
</foreach>
|
|
|
</insert>
|
|
|
|
|
|
@@ -245,7 +247,10 @@
|
|
|
MIN_VALUE = #{minValue},
|
|
|
</if>
|
|
|
<if test="maxValue != null">
|
|
|
- MAX_VALUE = #{maxValue}
|
|
|
+ MAX_VALUE = #{maxValue},
|
|
|
+ </if>
|
|
|
+ <if test="alarmSettingId != null">
|
|
|
+ ALARM_SETTING_ID = #{alarmSettingId}
|
|
|
</if>
|
|
|
</set>
|
|
|
WHERE ID = #{id};
|
|
|
@@ -592,11 +597,12 @@
|
|
|
|
|
|
,a.ALARM_CONDITION as "alarmCondition"
|
|
|
,a.ALARM_VALUE as "alarmValue"
|
|
|
-
|
|
|
+ ,a.id as "alarmSettingId"
|
|
|
<if test="deviceCode != null">
|
|
|
,da.id as "attributeId"
|
|
|
,da.IDENTIFIER as "identifiter"
|
|
|
,da.`NAME` as "attributeName"
|
|
|
+ ,da.unit as "unit"
|
|
|
</if>
|
|
|
from sms_device d
|
|
|
left join sms_alarm_setting a on a.DEVICE_ID =d.ID and a.ALARM_TYPE =#{alarmType} and a.ALARM_VALUE is not null
|
|
|
@@ -619,6 +625,7 @@
|
|
|
,ALARM_START_TIME as "alarmStartTime"
|
|
|
,max_value as "maxValue"
|
|
|
,min_value as "minValue"
|
|
|
+ ,alarm_setting_id as "alarmSettingId"
|
|
|
from sms_alarm_details
|
|
|
where STATE = 1 and status = 1
|
|
|
<if test="alarmType != null and alarmType != ''">
|
wangli