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
b302eb44
Commit
b302eb44
authored
Mar 29, 2024
by
zhangsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
23659关键数据----液位数值根据现场采集的单位设置灵活转换
parent
fa58127e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
UnitTransformUtil.java
...m/yeejoin/equipmanage/common/utils/UnitTransformUtil.java
+1
-0
SupervisionConfigureController.java
...quipmanage/controller/SupervisionConfigureController.java
+3
-1
FireFightingSystemMapper.xml
...ip/src/main/resources/mapper/FireFightingSystemMapper.xml
+1
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/UnitTransformUtil.java
View file @
b302eb44
...
...
@@ -149,6 +149,7 @@ public class UnitTransformUtil {
map
.
put
(
"abs"
,
"--"
);
}
}
map
.
put
(
"unit"
,
"M"
);
return
map
;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java
View file @
b302eb44
...
...
@@ -149,7 +149,9 @@ public class SupervisionConfigureController extends AbstractBaseController {
m
.
put
(
"levelStatus"
,
"--"
);
}
m
.
put
(
"levelAbs"
,
transResult
.
get
(
"abs"
));
if
(
transResult
.
containsKey
(
"unit"
))
{
m
.
put
(
"unit"
,
transResult
.
get
(
"unit"
));
}
// 计算可使用时间:储水量(L) / 出口流量(L/s), 单位为小时
BigDecimal
levelAbsLiter
=
new
BigDecimal
(
0
);
// 储水量(升)
BigDecimal
volume
=
new
BigDecimal
(
0
);
...
...
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @
b302eb44
...
...
@@ -5067,7 +5067,7 @@
a.id,
a.name,
IFNULL( a.image, '' ) AS image,
'M'
AS unit,
a.unit
AS unit,
IFNULL( a.nowLevel, '--' ) AS nowLevel,
a.minLevel AS minLevel,
a.maxLevel AS maxLevel,
...
...
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