功率曲线只查询合成测点

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdanalysismapper/IndicatorDataNewMapper.java

@@ -25,10 +25,10 @@ public interface IndicatorDataNewMapper extends BaseMapper<IndicatorData> {
     @Select("select sum(valueFs) valueF,xtime  from (select  SUBSTR(`created_time`, 11,6) xtime, `value_f` as valueFs  from iot_data.indicator_data  where equipment_index_name =#{equipmentIndexName}  and  ts >= #{startTime} and ts <= #{endTime} and gateway_id in (#{gatewayId})) group  by  xtime  order by xtime   ")
     List<IndicatorData> selectDataByequipmentIndexNameAndtimeqg(@Param("equipmentIndexName") String equipmentIndexName, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("gatewayId") String gatewayId);
 
-    @Select("select `value`, created_time, `value_f` as valueF from iot_data.indicator_data where point_name =#{pointName} and  ts >= TODAY()-8h")
+    @Select("select `value`, created_time, `value_f` as valueF from iot_data.indicator_data where point_name =#{pointName} and  ts >= TODAY()-8h and point_type ='SYNTHETIC'")
     List<IndicatorData> selectDataByequipmentIndexNameAndtimeqgNew(@Param("equipmentIndexName") String pointName);
 
-    @Select("select `value`, created_time, `value_f` as valueF from iot_data.indicator_data where point_name =#{pointName} and  ts >= TODAY()-8h and gateway_id in (#{gatewayId}))")
+    @Select("select `value`, created_time, `value_f` as valueF from iot_data.indicator_data where point_name =#{pointName} and  ts >= TODAY()-8h and gateway_id in (#{gatewayId})) and point_type ='SYNTHETIC'")
     List<IndicatorData> selectDataByequipmentIndexNameAndtimeqgNew(@Param("equipmentIndexName") String pointName,@Param("gatewayId") String gatewayId);