Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-zx-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
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
Jobs
Commits
Open sidebar
项目统一框架
一体化_户用光伏项目代码
amos-boot-zx-biz
Commits
8f3f8ec6
Commit
8f3f8ec6
authored
May 24, 2024
by
wujiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' of
http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz
into developer
parents
f4f3b4bc
fc27a9b4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
4 deletions
+21
-4
JpStationController.java
.../boot/module/hygf/biz/controller/JpStationController.java
+21
-4
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java
View file @
8f3f8ec6
...
@@ -40,10 +40,25 @@ import java.util.stream.Collectors;
...
@@ -40,10 +40,25 @@ import java.util.stream.Collectors;
@RequestMapping
(
value
=
"/jp-station"
)
@RequestMapping
(
value
=
"/jp-station"
)
public
class
JpStationController
extends
BaseController
{
public
class
JpStationController
extends
BaseController
{
private
static
Double
CARBON
=
0.997
*
0.001
;
// //炭
private
static
Double
SULFUR
=
0.03
*
0.001
;
// private static Double CARBON = 0.997 * 0.001;
private
static
Double
DUST
=
0.272
*
0.001
;
// //硫
private
static
Double
COAL
=
0.4
*
0.001
;
// private static Double SULFUR = 0.03 * 0.001;
// //粉尘
// private static Double DUST = 0.272 * 0.001;
// //煤
// private static Double COAL = 0.4 * 0.001;
//炭
private
static
Double
CARBON
=
832
*
0.001
*
0.001
;
//硫
private
static
Double
SULFUR
=
0.16
*
0.001
*
0.001
;
//粉尘
private
static
Double
DUST
=
0.032
*
0.001
*
0.001
;
//煤
private
static
Double
COAL
=
304.9
*
0.001
*
0.001
;
private
static
String
ZX
=
"在线"
;
private
static
String
ZX
=
"在线"
;
private
static
String
LX
=
"离线"
;
private
static
String
LX
=
"离线"
;
private
static
String
BJ
=
"报警"
;
private
static
String
BJ
=
"报警"
;
...
@@ -543,6 +558,8 @@ public class JpStationController extends BaseController {
...
@@ -543,6 +558,8 @@ public class JpStationController extends BaseController {
map
.
put
(
"dust"
,
format2
.
format
(
accumulatedPower
*
FDXSS
*
DUST
));
map
.
put
(
"dust"
,
format2
.
format
(
accumulatedPower
*
FDXSS
*
DUST
));
//煤
//煤
map
.
put
(
"coal"
,
format2
.
format
(
accumulatedPower
*
FDXSS
*
COAL
));
map
.
put
(
"coal"
,
format2
.
format
(
accumulatedPower
*
FDXSS
*
COAL
));
itemList
.
add
(
map
);
itemList
.
add
(
map
);
result
.
setCurrent
(
1
);
result
.
setCurrent
(
1
);
result
.
setTotal
(
1
);
result
.
setTotal
(
1
);
...
...
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