测点表修改

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceAlarmRuleMapper.xml

@@ -177,23 +177,21 @@ a.update_date,a. update_by,a. rule_desc, a.value1,a. value2,a. measuring_data_ty
     </select>
     <select id="getRuleMeasuringList" resultType="com.zcxk.rmcp.api.dto.alarm.RuleMeasuringDto">
          SELECT
-            stmd.measuring_id,
+            id measuring_id,
             stmd.measuring_name as measuring_point_name,
             stmd.measuring_code as code_name ,
             stmd.measuring_unit as data_unit,
             stmd.measuring_data_type
-        FROM rmcp_tpl_measuring_desc stmd
-        WHERE stmd.device_type = #{alarmTypeId} and stmd.status = 1
+        FROM rmcp_product_measuring_point stmd
+        WHERE stmd.product_id = #{alarmTypeId} and stmd.status = 1
     </select>
     <select id="getMeasuringOptionList" resultType="com.zcxk.rmcp.api.dto.alarm.ConfigDataDto">
         SELECT
             stmdd.data_name as `name`,
             stmdd.data_value as `value`
-        from rmcp_tpl_measuring_data_def stmdd
-        WHERE `status`=1 and measuring_desc in(
-            SELECT id from rmcp_tpl_measuring_desc stmd
-            WHERE stmd.device_type = #{deviceTypeId} and measuring_id=#{measuringId}
-        )
+        from rmcp_product_measuring_dict stmdd
+        where stmdd.point_id=#{measuringId}
+
     </select>
     <select id="findByNameUnique" resultType="java.lang.Integer">
         select count(1) from rmcp_device_alarm_rule
@@ -210,9 +208,11 @@ a.update_date,a. update_by,a. rule_desc, a.value1,a. value2,a. measuring_data_ty
 
     </select>
     <select id="findTplMeasuringDataDef" resultType="com.zcxk.rmcp.core.entity.TplMeasuringDataDef">
-        select stmdd.* from rmcp_tpl_measuring_desc stmd
-                                left join rmcp_tpl_measuring_data_def stmdd on (stmdd.measuring_desc = stmd.id and stmdd.data_value = #{value} and stmdd.status = 1)
-        where stmd.status = 1 and stmd.device_type = #{deviceType} and stmd.measuring_code = #{measuringCode}
+        select stmdd.* from rmcp_product_measuring_point stmd
+          left join rmcp_product_measuring_dict stmdd on (stmdd.point_id = stmd.id
+           and stmdd.data_value = #{value} and stmdd.status = 1)
+        where stmd.status = 1 and stmd.product_id = #{deviceType}
+          and stmd.measuring_code = #{measuringCode}
 
     </select>