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
49e81c34
Commit
49e81c34
authored
Aug 23, 2023
by
caotao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
集电线返回数据新增风机状态图片url
parent
ecd4db47
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
7 deletions
+1
-7
MonitorFanIndicatorImpl.java
...odule/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
+1
-7
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
View file @
49e81c34
...
@@ -29,12 +29,8 @@ import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
...
@@ -29,12 +29,8 @@ import com.yeejoin.amos.boot.module.jxiop.biz.utils.InfluxDButils;
import
com.yeejoin.amos.boot.module.jxiop.biz.service.IMonitorFanIndicator
;
import
com.yeejoin.amos.boot.module.jxiop.biz.service.IMonitorFanIndicator
;
import
com.yeejoin.amos.component.robot.BadRequest
;
import
com.yeejoin.amos.component.robot.BadRequest
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.io.IOUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.velocity.runtime.directive.Break
;
import
org.eclipse.paho.client.mqttv3.MqttException
;
import
org.eclipse.paho.client.mqttv3.MqttException
;
import
org.elasticsearch.common.recycler.Recycler
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.core.io.Resource
;
import
org.springframework.core.io.Resource
;
...
@@ -46,13 +42,10 @@ import org.typroject.tyboot.component.emq.EmqKeeper;
...
@@ -46,13 +42,10 @@ import org.typroject.tyboot.component.emq.EmqKeeper;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
java.io.File
;
import
java.io.File
;
import
java.io.IOException
;
import
java.nio.charset.StandardCharsets
;
import
java.text.ParseException
;
import
java.text.ParseException
;
import
java.util.*
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
static
com
.
alibaba
.
fastjson
.
JSON
.
parseArray
;
/**
/**
* @description:
* @description:
...
@@ -937,6 +930,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
...
@@ -937,6 +930,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
map
.
put
(
"title"
,
listDatum
.
getEquipmentNumber
());
map
.
put
(
"title"
,
listDatum
.
getEquipmentNumber
());
map
.
put
(
"windSpeed"
,
listDatum
.
getValue
());
map
.
put
(
"windSpeed"
,
listDatum
.
getValue
());
map
.
put
(
"power"
,
listDatum
.
getValueLabel
());
map
.
put
(
"power"
,
listDatum
.
getValueLabel
());
//获取风机状态如果获取到的状态为空-则默认为正常运行状态
String
fantStatus
=
ObjectUtils
.
isEmpty
(
fanstatutsHashMap
.
get
(
num
))?
"正常运行"
:
fanstatutsHashMap
.
get
(
num
);
String
fantStatus
=
ObjectUtils
.
isEmpty
(
fanstatutsHashMap
.
get
(
num
))?
"正常运行"
:
fanstatutsHashMap
.
get
(
num
);
map
.
put
(
"url"
,
fanStatusImagePathPrefix
+
File
.
separator
+
"风机-"
+
fantStatus
+
".gif"
);
map
.
put
(
"url"
,
fanStatusImagePathPrefix
+
File
.
separator
+
"风机-"
+
fantStatus
+
".gif"
);
statusMaps
.
add
(
map
);
statusMaps
.
add
(
map
);
...
...
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