解决冲突

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

@@ -54,11 +54,11 @@ import java.net.InetAddress;
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class})
 //@SpringBootApplication
 public class AmosJxiopAnalyseApplication {
-//	@Autowired
-//	private EmqKeeper emqKeeper;
-//
-//    @Autowired
-//	private SyncESDataToTdengineMqttListener syncESDataToTdengineMqttListener;
+	@Autowired
+	private EmqKeeper emqKeeper;
+
+    @Autowired
+	private SyncESDataToTdengineMqttListener syncESDataToTdengineMqttListener;
 
 	private static final Logger logger = LoggerFactory.getLogger(AmosJxiopAnalyseApplication.class);
 
@@ -74,8 +74,9 @@ public class AmosJxiopAnalyseApplication {
 				+ path + "/doc.html\n" + "----------------------------------------------------------");
 	}
 
-//	@Bean
-//	public void initMqtt() throws Exception {
-//		emqKeeper.subscript("sync_esdata_to_tdengine_notice", 2,syncESDataToTdengineMqttListener );
-//	}
+	@Bean
+	public void initMqtt() throws Exception {
+		//订阅固化周期性数据成功的消息
+		emqKeeper.subscript("sync_esdata_to_tdengine_notice", 1,syncESDataToTdengineMqttListener );
+	}
 }

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

@@ -47,7 +47,7 @@ public interface IndicatorDataMapper extends BaseMapper<IndicatorData> {
     @Select("select `value`, created_time from iot_data.indicator_data where id =#{id}  and  ts >= #{startTime} and ts <= #{endTime} ")
     List<IndicatorData> selectDataByequipmentIndexNameAndtimeAndEquipmentNumber(@Param("id") String id, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    @Select("select `value`,`value_f`, address, gateway_id from iot_data.indicator_data where ts >=NOW()-10m and gateway_id = #{gatewayId} and address in(#{addressIds})")
-    List<IndicatorData> selectDataByGatewayIdAndAddress(@Param("gatewayId") String gatewayId,@Param("addressIds") String addressIds);
+    @Select("select `value`,`value_f`, address, gateway_id from iot_data.indicator_data where ts > NOW()-10m and gateway_id = #{gatewayId}")
+    List<IndicatorData> selectDataByGatewayIdAndAddress(@Param("gatewayId") String gatewayId);
 
 }