Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
张雷
/
skboot-zhongye
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
构建
提交
问题看板
文件
提交
网络
比较
分支
标签
4ea7e99a
由
康伟
编写于
2024-10-31 16:00:31 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
kangwei :对外大屏---需要统计瞬时 累计流量方;浊度
1 个父辈
614bfcdf
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
67 行增加
和
0 行删除
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/WaterQualityMonitoringDetailVO.java
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
查看文件 @
4ea7e99
...
...
@@ -124,6 +124,34 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
}
else
{
inVO
.
setPhVal
(
"0"
);
}
if
(
monitorTagMap
.
get
(
"JSLL"
)!=
null
){
if
(
dataMap
.
get
(
monitorTagMap
.
get
(
"JSLL"
).
toString
())!=
null
){
inVO
.
setSsllVal
(
dataMap
.
get
(
monitorTagMap
.
get
(
"JSLL"
).
toString
()).
toString
());
}
else
{
inVO
.
setSsllVal
(
"0"
);
}
}
else
{
inVO
.
setSsllVal
(
"0"
);
}
if
(
monitorTagMap
.
get
(
"JSLJLL"
)!=
null
){
if
(
dataMap
.
get
(
monitorTagMap
.
get
(
"JSLJLL"
).
toString
())!=
null
){
inVO
.
setLjllVal
(
dataMap
.
get
(
monitorTagMap
.
get
(
"JSLJLL"
).
toString
()).
toString
());
}
else
{
inVO
.
setLjllVal
(
"0"
);
}
}
else
{
inVO
.
setLjllVal
(
"0"
);
}
if
(
monitorTagMap
.
get
(
"JSSS"
)!=
null
){
if
(
dataMap
.
get
(
monitorTagMap
.
get
(
"JSSS"
).
toString
())!=
null
){
inVO
.
setZdVal
(
dataMap
.
get
(
monitorTagMap
.
get
(
"JSSS"
).
toString
()).
toString
());
}
else
{
inVO
.
setZdVal
(
"0"
);
}
}
else
{
inVO
.
setZdVal
(
"0"
);
}
list
.
add
(
inVO
);
WaterQualityMonitoringDetailVO
outVO
=
new
WaterQualityMonitoringDetailVO
();
outVO
.
setParmType
(
"out"
);
...
...
@@ -184,6 +212,34 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
}
else
{
outVO
.
setPhVal
(
"0"
);
}
if
(
monitorTagMap
.
get
(
"CSLL"
)!=
null
){
if
(
dataMap
.
get
(
monitorTagMap
.
get
(
"CSLL"
).
toString
())!=
null
){
inVO
.
setSsllVal
(
dataMap
.
get
(
monitorTagMap
.
get
(
"CSLL"
).
toString
()).
toString
());
}
else
{
inVO
.
setSsllVal
(
"0"
);
}
}
else
{
inVO
.
setSsllVal
(
"0"
);
}
if
(
monitorTagMap
.
get
(
"CSLJLL"
)!=
null
){
if
(
dataMap
.
get
(
monitorTagMap
.
get
(
"CSLJLL"
).
toString
())!=
null
){
inVO
.
setLjllVal
(
dataMap
.
get
(
monitorTagMap
.
get
(
"CSLJLL"
).
toString
()).
toString
());
}
else
{
inVO
.
setLjllVal
(
"0"
);
}
}
else
{
inVO
.
setLjllVal
(
"0"
);
}
if
(
monitorTagMap
.
get
(
"CSSS"
)!=
null
){
if
(
dataMap
.
get
(
monitorTagMap
.
get
(
"CSSS"
).
toString
())!=
null
){
inVO
.
setZdVal
(
dataMap
.
get
(
monitorTagMap
.
get
(
"CSSS"
).
toString
()).
toString
());
}
else
{
inVO
.
setZdVal
(
"0"
);
}
}
else
{
inVO
.
setZdVal
(
"0"
);
}
list
.
add
(
outVO
);
return
list
;
}
...
...
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/WaterQualityMonitoringDetailVO.java
查看文件 @
4ea7e99
...
...
@@ -101,6 +101,17 @@ public class WaterQualityMonitoringDetailVO {
private
String
phUpper
;
private
String
phLower
;
private
String
phAbnormal
;
@ApiModelProperty
(
value
=
"浊度"
)
private
String
zdVal
;
@ApiModelProperty
(
value
=
"瞬时流量"
)
private
String
ssllVal
;
@ApiModelProperty
(
value
=
"累计流量"
)
private
String
ljllVal
;
/**
* 摄像头
*/
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论