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
bd9b0b9b
Commit
bd9b0b9b
authored
Nov 22, 2023
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改sql问题
parent
64cf7b57
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
TdHygfJpInverterWarnMapper.xml
.../resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml
+2
-2
TdHygfJpInverterWarnController.java
...e/hygf/biz/controller/TdHygfJpInverterWarnController.java
+8
-2
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml
View file @
bd9b0b9b
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
AND start_time >= #{startTime}
AND start_time >= #{startTime}
</if>
</if>
<if
test=
"endTime != null and endTime != ''"
>
<if
test=
"endTime != null and endTime != ''"
>
AND start_time
[
<![CDATA[<=]]>
]
#{endTime}
AND start_time
<![CDATA[<=]]>
#{endTime}
</if>
</if>
<if
test=
"content != null and content != ''"
>
<if
test=
"content != null and content != ''"
>
AND content like #{content}
AND content like #{content}
...
@@ -129,7 +129,7 @@
...
@@ -129,7 +129,7 @@
AND start_time >= #{startTime}
AND start_time >= #{startTime}
</if>
</if>
<if
test=
"endTime != null and endTime != ''"
>
<if
test=
"endTime != null and endTime != ''"
>
AND start_time
[
<![CDATA[<=]]>
]
#{endTime}
AND start_time
<![CDATA[<=]]>
#{endTime}
</if>
</if>
<if
test=
"content != null and content != ''"
>
<if
test=
"content != null and content != ''"
>
AND content like #{content}
AND content like #{content}
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java
View file @
bd9b0b9b
...
@@ -244,8 +244,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
...
@@ -244,8 +244,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
@RequestParam
(
required
=
false
)
String
maxValue
,
@RequestParam
(
required
=
false
)
String
maxValue
,
@RequestParam
(
required
=
false
)
String
snCode
,
@RequestParam
(
required
=
false
)
String
snCode
,
@RequestParam
(
required
=
false
)
List
<
String
>
stationId
,
@RequestParam
(
required
=
false
)
List
<
String
>
stationId
,
@RequestParam
(
required
=
false
)
String
startTime
,
@RequestParam
(
required
=
false
)
List
<
String
>
time
,
@RequestParam
(
required
=
false
)
String
endTime
,
@RequestParam
(
required
=
false
)
Integer
current
,
@RequestParam
(
required
=
false
)
Integer
current
,
@RequestParam
(
required
=
false
)
Integer
size
,
@RequestParam
(
required
=
false
)
Integer
size
,
@RequestParam
(
required
=
false
)
String
content
)
{
@RequestParam
(
required
=
false
)
String
content
)
{
...
@@ -262,6 +261,13 @@ public class TdHygfJpInverterWarnController extends BaseController {
...
@@ -262,6 +261,13 @@ public class TdHygfJpInverterWarnController extends BaseController {
if
(
null
==
stationId
){
if
(
null
==
stationId
){
stationId
=
jpStation
.
stream
().
map
(
JpStation:
:
getThirdStationId
).
collect
(
Collectors
.
toList
());
stationId
=
jpStation
.
stream
().
map
(
JpStation:
:
getThirdStationId
).
collect
(
Collectors
.
toList
());
}
}
String
startTime
=
""
;
String
endTime
=
""
;
if
(
null
!=
time
){
startTime
=
time
.
get
(
0
);
endTime
=
time
.
get
(
1
);
}
List
<
TdHygfJpInverterWarnDto
>
maps
=
tdHygfJpInverterWarnServiceImpl
.
selectWarnList
(
state
,
level
,
minvalue
,
maxValue
,
snCode
,
stationId
,
startTime
,
endTime
,
content
,
current
,
size
);
List
<
TdHygfJpInverterWarnDto
>
maps
=
tdHygfJpInverterWarnServiceImpl
.
selectWarnList
(
state
,
level
,
minvalue
,
maxValue
,
snCode
,
stationId
,
startTime
,
endTime
,
content
,
current
,
size
);
for
(
TdHygfJpInverterWarnDto
map
:
maps
)
{
for
(
TdHygfJpInverterWarnDto
map
:
maps
)
{
...
...
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