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
14663fb4
Commit
14663fb4
authored
Sep 07, 2023
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
ba107156
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
MonitorFanIdxController.java
.../module/jxiop/biz/controller/MonitorFanIdxController.java
+3
-3
ESEquipments.java
...eejoin/amos/boot/module/jxiop/biz/ESDto/ESEquipments.java
+4
-4
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java
View file @
14663fb4
...
@@ -1204,13 +1204,13 @@ public class MonitorFanIdxController extends BaseController {
...
@@ -1204,13 +1204,13 @@ public class MonitorFanIdxController extends BaseController {
sum
+=
Integer
.
parseInt
(
indexDto
.
getCountString
());
sum
+=
Integer
.
parseInt
(
indexDto
.
getCountString
());
}
}
Map
<
String
,
Object
>
hashMap
=
new
HashMap
<>()
;
Map
<
String
,
Object
>
hashMap
=
new
HashMap
<>()
;
hashMap
.
put
(
"title"
,
healthNum
+
"/"
+
sum
);
double
percent
=
(
double
)
healthNum
/
sum
*
100
;
double
percent
=
(
double
)
healthNum
/
sum
*
100
;
int
value
=
(
int
)
percent
;
int
value
=
(
int
)
percent
;
String
[]
values
=
new
String
[]{
String
.
valueOf
(
value
)};
String
[]
values
=
new
String
[]{
String
.
valueOf
(
value
)};
hashMap
.
put
(
"seriesData"
,
values
);
hashMap
.
put
(
"seriesData"
,
values
);
hashMap
.
put
(
"title"
,
healthNum
+
"/"
+
sum
);
return
ResponseHelper
.
buildResponse
(
hashMap
);
return
ResponseHelper
.
buildResponse
(
hashMap
);
}
}
...
@@ -1227,7 +1227,7 @@ public class MonitorFanIdxController extends BaseController {
...
@@ -1227,7 +1227,7 @@ public class MonitorFanIdxController extends BaseController {
status
=
indexDto
.
getState
();
status
=
indexDto
.
getState
();
}
}
}
}
hashMap
.
put
(
"
status
"
,
status
);
hashMap
.
put
(
"
title
"
,
status
);
return
ResponseHelper
.
buildResponse
(
hashMap
);
return
ResponseHelper
.
buildResponse
(
hashMap
);
}
}
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/ESDto/ESEquipments.java
View file @
14663fb4
...
@@ -25,7 +25,7 @@ public class ESEquipments {
...
@@ -25,7 +25,7 @@ public class ESEquipments {
@Field
(
type
=
FieldType
.
Text
,
index
=
false
)
@Field
(
type
=
FieldType
.
Text
,
index
=
false
)
private
String
address
;
private
String
address
;
@Field
(
type
=
FieldType
.
Text
,
index
=
false
)
@Field
(
type
=
FieldType
.
Text
)
private
String
dataType
;
private
String
dataType
;
@Field
(
type
=
FieldType
.
Text
)
@Field
(
type
=
FieldType
.
Text
)
private
String
equipmentSpecificName
;
private
String
equipmentSpecificName
;
...
@@ -37,11 +37,11 @@ public class ESEquipments {
...
@@ -37,11 +37,11 @@ public class ESEquipments {
private
Date
createdTime
;
private
Date
createdTime
;
@Field
(
type
=
FieldType
.
Text
,
index
=
false
)
@Field
(
type
=
FieldType
.
Text
,
index
=
false
)
private
String
unit
;
private
String
unit
;
@Field
(
type
=
FieldType
.
Text
,
index
=
false
)
@Field
(
type
=
FieldType
.
Text
)
private
String
value
;
private
String
value
;
@Field
(
type
=
FieldType
.
Float
,
index
=
false
)
@Field
(
type
=
FieldType
.
Float
,
index
=
false
)
private
Float
valueDouble
;
private
Float
valueDouble
;
@Field
(
type
=
FieldType
.
Text
,
index
=
false
)
@Field
(
type
=
FieldType
.
Text
)
private
String
valueLabel
;
private
String
valueLabel
;
@Field
(
type
=
FieldType
.
Text
,
index
=
false
)
@Field
(
type
=
FieldType
.
Text
,
index
=
false
)
private
String
traceId
;
private
String
traceId
;
...
@@ -55,7 +55,7 @@ public class ESEquipments {
...
@@ -55,7 +55,7 @@ public class ESEquipments {
private
String
systemType
;
private
String
systemType
;
@Field
(
type
=
FieldType
.
Text
,
index
=
false
)
@Field
(
type
=
FieldType
.
Text
,
index
=
false
)
private
String
pictureName
;
private
String
pictureName
;
@Field
(
type
=
FieldType
.
Text
,
index
=
false
)
@Field
(
type
=
FieldType
.
Text
)
private
String
displayName
;
private
String
displayName
;
...
...
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