测点时序趋势图API优化

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -989,10 +989,10 @@ public class CommonServiceImpl {
         List<IndicatorData> result = new ArrayList<>();
         if ("FD".equals(stationType)) {
             IdxBizFanPointProcessVariableClassification idxBizFanPointProcessVariableClassification = idxBizFanPointProcessVariableClassificationMapper.selectOne(new QueryWrapper<IdxBizFanPointProcessVariableClassification>().eq("INDEX_ADDRESS", pointId).eq("TAG_CODE", "分析变量"));
-            result = indicatorDataMapper.selectDataByAddressAndtimeTs(idxBizFanPointProcessVariableClassification.getIndexAddress(), startTime, endTime, idxBizFanPointProcessVariableClassification.getGatewayId());
+            result = indicatorDataMapper.getDataByTsAndAddress(idxBizFanPointProcessVariableClassification.getIndexAddress(), startTime, endTime, idxBizFanPointProcessVariableClassification.getGatewayId());
         } else {
             IdxBizPvPointProcessVariableClassification idxBizPvPointProcessVariableClassification = idxBizPvPointProcessVariableClassificationMapper.selectOne(new QueryWrapper<IdxBizPvPointProcessVariableClassification>().eq("INDEX_ADDRESS", pointId).eq("TAG_CODE", "分析变量"));
-            result = indicatorDataMapper.selectDataByAddressAndtimeTs(idxBizPvPointProcessVariableClassification.getIndexAddress(), startTime, endTime, idxBizPvPointProcessVariableClassification.getGatewayId());
+            result = indicatorDataMapper.getDataByTsAndAddress(idxBizPvPointProcessVariableClassification.getIndexAddress(), startTime, endTime, idxBizPvPointProcessVariableClassification.getGatewayId());
         }
         List<String> seriesData_valuse = new ArrayList<>();
         List<String> axisData_valuse = new ArrayList<>();

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdmapper/IndicatorDataMapper.java

@@ -18,6 +18,10 @@ public interface IndicatorDataMapper extends BaseMapper<IndicatorData> {
     @Select("select `value`, created_time as createdTime, `value_f` as valueF from iot_data.indicator_data where address=#{address} and  ts >= #{startTime} and ts <= #{endTime} and gateway_id =#{gatewayId}")
     List<IndicatorData>   selectDataByAddressAndtimeTs(@Param("address")String address,@Param("startTime") String startTime, @Param("endTime")String endTime, @Param("gatewayId")String gatewayId);
 
+    @Select("select  ts as createdTime, `value_f` as valueF from iot_data.indicator_data where address=#{address} and  ts between #{startTime} and #{endTime} and gateway_id =#{gatewayId}")
+    List<IndicatorData> getDataByTsAndAddress(@Param("address")String address,@Param("startTime") String startTime, @Param("endTime")String endTime, @Param("gatewayId")String gatewayId);
+
+
     @Select("select `unit` from iot_data.indicator_data where address=#{address} and gateway_id =#{gatewayId} limit 1")
     IndicatorData selectUnitByAddressAndGatewayId(@Param("address")String address, @Param("gatewayId")String gatewayId);