Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
5eb668ff
Commit
5eb668ff
authored
Oct 31, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Plain Diff
解决冲突
parents
6e5b6b4e
0729c493
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
11 deletions
+12
-11
AmosJxiopAnalyseApplication.java
...in/java/com/yeejoin/amos/AmosJxiopAnalyseApplication.java
+10
-9
CommonServiceImpl.java
...boot/module/jxiop/biz/service/impl/CommonServiceImpl.java
+0
-0
IndicatorDataMapper.java
...s/boot/module/jxiop/biz/tdmapper/IndicatorDataMapper.java
+2
-2
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/AmosJxiopAnalyseApplication.java
View file @
5eb668ff
...
...
@@ -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/service/impl/CommonServiceImpl.java
View file @
5eb668ff
This diff is collapsed.
Click to expand it.
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdmapper/IndicatorDataMapper.java
View file @
5eb668ff
...
...
@@ -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
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment