Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
AmosBankRoot
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
1
Merge Requests
1
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
bank
AmosBankRoot
Commits
67dfa82a
Commit
67dfa82a
authored
Jul 09, 2020
by
zhengjiangtao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改三维点坐标问题
parent
ddfa8bf0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
EquipmentListener.java
.../java/com/yeejoin/amos/bank/config/EquipmentListener.java
+1
-1
SelfSupportListener.java
...ava/com/yeejoin/amos/bank/config/SelfSupportListener.java
+2
-2
application-dev.properties
AmosBankStart/src/main/resources/application-dev.properties
+1
-0
No files found.
AmosBankService/src/main/java/com/yeejoin/amos/bank/config/EquipmentListener.java
View file @
67dfa82a
...
@@ -157,7 +157,7 @@ public class EquipmentListener extends EmqxListener implements InitializingBean
...
@@ -157,7 +157,7 @@ public class EquipmentListener extends EmqxListener implements InitializingBean
// 所属楼层
// 所属楼层
String
lou
=
getEqpConfigMapValueByKey
(
eqpConfigMap
,
"所属楼层"
);
String
lou
=
getEqpConfigMapValueByKey
(
eqpConfigMap
,
"所属楼层"
);
// 三维位置
// 三维位置
String
sanwei
=
getEqpConfigMapValueByKey
(
eqpConfigMap
,
"三维
位置
"
);
String
sanwei
=
getEqpConfigMapValueByKey
(
eqpConfigMap
,
"三维"
);
// 资源ID
// 资源ID
String
sourceId
=
getEqpConfigMapValueByKey
(
eqpConfigMap
,
"设备ID"
);
String
sourceId
=
getEqpConfigMapValueByKey
(
eqpConfigMap
,
"设备ID"
);
String
eqpName
=
parseObject
.
getString
(
"eqpName"
);
String
eqpName
=
parseObject
.
getString
(
"eqpName"
);
...
...
AmosBankService/src/main/java/com/yeejoin/amos/bank/config/SelfSupportListener.java
View file @
67dfa82a
...
@@ -118,7 +118,7 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
...
@@ -118,7 +118,7 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
//楼层
//楼层
String
lou
=
getIpAddress1
(
eqpConfigMap
,
"所属楼层"
);
String
lou
=
getIpAddress1
(
eqpConfigMap
,
"所属楼层"
);
//3为坐标
//3为坐标
String
sanwei
=
getIpAddress1
(
eqpConfigMap
,
"三维
位置
"
);
String
sanwei
=
getIpAddress1
(
eqpConfigMap
,
"三维"
);
String
eqpName
=
parseObject
.
getString
(
"eqpName"
);
String
eqpName
=
parseObject
.
getString
(
"eqpName"
);
//orgcode
//orgcode
...
@@ -240,7 +240,7 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
...
@@ -240,7 +240,7 @@ public class SelfSupportListener extends EmqxListener implements InitializingBea
//增建告警记录表
//增建告警记录表
//告警记录
//告警记录
List
<
Alarm
>
curAlarmList
=
alarmService
.
findByQueryColumn
(
eqpId
+
metricKey
);
List
<
Alarm
>
curAlarmList
=
alarmService
.
findByQueryColumn
(
eqpId
+
metricKey
);
if
(
curAlarmList
!=
null
&&
curAlarmList
.
size
()
>
0
)
{
if
(
curAlarmList
!=
null
&&
curAlarmList
.
size
()
>
0
)
{
Alarm
alarm
=
curAlarmList
.
get
(
0
);
Alarm
alarm
=
curAlarmList
.
get
(
0
);
alarm
.
setUpdateDate
(
DateTimeKit
.
now
());
alarm
.
setUpdateDate
(
DateTimeKit
.
now
());
if
(!
ObjectUtils
.
isEmpty
(
alarm
.
getHappenDate
()))
{
if
(!
ObjectUtils
.
isEmpty
(
alarm
.
getHappenDate
()))
{
...
...
AmosBankStart/src/main/resources/application-dev.properties
View file @
67dfa82a
#\u7aef\u53e3
#\u7aef\u53e3
server.port
=
7000
server.port
=
7000
server.connection-timeout
=
20
#eureka
#eureka
eureka.client.serviceUrl.defaultZone
=
http://172.16.10.72:10001/eureka/
eureka.client.serviceUrl.defaultZone
=
http://172.16.10.72:10001/eureka/
eureka.client.register-with-eureka
=
true
eureka.client.register-with-eureka
=
true
...
...
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