Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
New MineTRS_java
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
kiritoausna
New MineTRS_java
Commits
c32fdc09
Commit
c32fdc09
authored
Apr 04, 2023
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2023-04.04 降雨量统计判断修改 新增报警状态统计
parent
56555de0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
13 deletions
+12
-13
MpDataController.java
...a/me/zhengjie/gemho/controller/data/MpDataController.java
+1
-0
RealDataController.java
...me/zhengjie/gemho/controller/data/RealDataController.java
+10
-10
RgDataMapper.xml
...in-system/src/main/resources/mapper/data/RgDataMapper.xml
+0
-1
DrybeachequipinforMapper.xml
...rc/main/resources/mapper/tab/DrybeachequipinforMapper.xml
+1
-2
No files found.
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/MpDataController.java
View file @
c32fdc09
...
@@ -172,5 +172,6 @@ public class MpDataController {
...
@@ -172,5 +172,6 @@ public class MpDataController {
public
void
download
(
HttpServletResponse
response
,
DataQueryCriteria
dataQueryCriteria
,
HttpServletRequest
request
)
{
public
void
download
(
HttpServletResponse
response
,
DataQueryCriteria
dataQueryCriteria
,
HttpServletRequest
request
)
{
mpDataService
.
download
(
response
,
dataQueryCriteria
,
request
);
mpDataService
.
download
(
response
,
dataQueryCriteria
,
request
);
}
}
}
}
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/RealDataController.java
View file @
c32fdc09
...
@@ -133,7 +133,7 @@ public class RealDataController {
...
@@ -133,7 +133,7 @@ public class RealDataController {
@GetMapping
(
"dimensional"
)
@GetMapping
(
"dimensional"
)
public
ResponseEntity
<
Object
>
dimensionalReal
(
HttpServletRequest
request
,
String
tailInfoNo
)
{
public
ResponseEntity
<
Object
>
dimensionalReal
(
HttpServletRequest
request
,
String
tailInfoNo
)
{
if
(
ObjectUtils
.
isEmpty
(
tailInfoNo
))
{
if
(
ObjectUtils
.
isEmpty
(
tailInfoNo
))
{
return
n
ull
;
return
n
ew
ResponseEntity
<>(
PageResult
.
failed
(),
HttpStatus
.
INTERNAL_SERVER_ERROR
)
;
}
}
//创建返回对象
//创建返回对象
ArrayList
<
RealDataVo
>
realDataVos
=
new
ArrayList
<>();
ArrayList
<
RealDataVo
>
realDataVos
=
new
ArrayList
<>();
...
@@ -150,39 +150,39 @@ public class RealDataController {
...
@@ -150,39 +150,39 @@ public class RealDataController {
for
(
SysType
sysType
:
list
)
{
for
(
SysType
sysType
:
list
)
{
switch
(
sysType
.
getCode
())
{
switch
(
sysType
.
getCode
())
{
case
"1"
:
case
"1"
:
List
<
RealDataVo
>
dbdatas
=
dbDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
List
<
RealDataVo
>
dbdatas
=
dbDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
realDataVos
.
addAll
(
dbdatas
);
realDataVos
.
addAll
(
dbdatas
);
break
;
break
;
case
"2"
:
case
"2"
:
List
<
RealDataVo
>
wtdatas
=
wtDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
List
<
RealDataVo
>
wtdatas
=
wtDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
realDataVos
.
addAll
(
wtdatas
);
realDataVos
.
addAll
(
wtdatas
);
break
;
break
;
case
"3"
:
case
"3"
:
List
<
RealDataVo
>
mpdatas
=
mpDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
List
<
RealDataVo
>
mpdatas
=
mpDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
realDataVos
.
addAll
(
mpdatas
);
realDataVos
.
addAll
(
mpdatas
);
break
;
break
;
case
"4"
:
case
"4"
:
List
<
RealDataVo
>
dmdatas
=
dmDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
List
<
RealDataVo
>
dmdatas
=
dmDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
realDataVos
.
addAll
(
dmdatas
);
realDataVos
.
addAll
(
dmdatas
);
break
;
break
;
case
"5"
:
case
"5"
:
List
<
RealDataVo
>
stdatas
=
stDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
List
<
RealDataVo
>
stdatas
=
stDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
realDataVos
.
addAll
(
stdatas
);
realDataVos
.
addAll
(
stdatas
);
break
;
break
;
case
"6"
:
case
"6"
:
List
<
RealDataVo
>
rgdatas
=
rgDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
List
<
RealDataVo
>
rgdatas
=
rgDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
realDataVos
.
addAll
(
rgdatas
);
realDataVos
.
addAll
(
rgdatas
);
break
;
break
;
case
"7"
:
case
"7"
:
List
<
RealDataVo
>
psldatas
=
pslDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
List
<
RealDataVo
>
psldatas
=
pslDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
realDataVos
.
addAll
(
psldatas
);
realDataVos
.
addAll
(
psldatas
);
break
;
break
;
case
"9"
:
case
"9"
:
List
<
RealDataVo
>
sldatas
=
slDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
List
<
RealDataVo
>
sldatas
=
slDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
realDataVos
.
addAll
(
sldatas
);
realDataVos
.
addAll
(
sldatas
);
break
;
break
;
case
"16"
:
case
"16"
:
List
<
RealDataVo
>
wpbdatas
=
wpbDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
List
<
RealDataVo
>
wpbdatas
=
wpbDataService
.
real
(
sysType
.
getTypeno
(),
request
,
tailInfoNo
);
realDataVos
.
addAll
(
wpbdatas
);
realDataVos
.
addAll
(
wpbdatas
);
break
;
break
;
}
}
...
...
eladmin-system/src/main/resources/mapper/data/RgDataMapper.xml
View file @
c32fdc09
...
@@ -35,7 +35,6 @@
...
@@ -35,7 +35,6 @@
time
>
= #{start}
time
>
= #{start}
AND time
<
= #{end}
AND time
<
= #{end}
and sensorid=#{sensorid}
and sensorid=#{sensorid}
and state = 0
GROUP BY
GROUP BY
DATE_FORMAT( time, '%Y-%m-%d' )
DATE_FORMAT( time, '%Y-%m-%d' )
</select>
</select>
...
...
eladmin-system/src/main/resources/mapper/tab/DrybeachequipinforMapper.xml
View file @
c32fdc09
...
@@ -27,8 +27,7 @@
...
@@ -27,8 +27,7 @@
SELECT COUNT(id) as unloin
SELECT COUNT(id) as unloin
FROM tb_drybeachequipinfor
FROM tb_drybeachequipinfor
where tailingid = #{tailingid}
where tailingid = #{tailingid}
and (DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s')
<
= DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 30 MINUTE), '%Y-%m-%d
and (DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s')
<
= DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 30 MINUTE), '%Y-%m-%d %H:%i:%s')
%H:%m:%s')
or datarealtime is Null) and equipname !='基准点'
or datarealtime is Null) and equipname !='基准点'
</select>
</select>
<update
id=
"enforceOnline"
>
<update
id=
"enforceOnline"
>
...
...
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