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
4dc55a00
Commit
4dc55a00
authored
Jun 25, 2023
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2023-6.25 导出修改从只导出当前页改成 导出所有的查询结果
parent
c32fdc09
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
13 additions
and
4 deletions
+13
-4
DmDataController.java
...a/me/zhengjie/gemho/controller/data/DmDataController.java
+1
-1
Drybeachequipinfor.java
...java/me/zhengjie/gemho/entity/tab/Drybeachequipinfor.java
+1
-1
DbDataServiceImpl.java
...e/zhengjie/gemho/service/data/impl/DbDataServiceImpl.java
+1
-0
DmDataServiceImpl.java
...e/zhengjie/gemho/service/data/impl/DmDataServiceImpl.java
+1
-0
MpDataServiceImpl.java
...e/zhengjie/gemho/service/data/impl/MpDataServiceImpl.java
+1
-0
PslDataServiceImpl.java
.../zhengjie/gemho/service/data/impl/PslDataServiceImpl.java
+1
-0
RgDataServiceImpl.java
...e/zhengjie/gemho/service/data/impl/RgDataServiceImpl.java
+1
-0
SlDataServiceImpl.java
...e/zhengjie/gemho/service/data/impl/SlDataServiceImpl.java
+1
-0
StDataServiceImpl.java
...e/zhengjie/gemho/service/data/impl/StDataServiceImpl.java
+1
-0
WpbDataServiceImpl.java
.../zhengjie/gemho/service/data/impl/WpbDataServiceImpl.java
+1
-0
WtDataServiceImpl.java
...e/zhengjie/gemho/service/data/impl/WtDataServiceImpl.java
+1
-0
DrybeachequipinforMapper.xml
...rc/main/resources/mapper/tab/DrybeachequipinforMapper.xml
+2
-2
No files found.
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/DmDataController.java
View file @
4dc55a00
...
...
@@ -30,7 +30,7 @@ import java.util.HashMap;
* @author llj
* @since 2022-01-05
*/
@Api
(
tags
=
"数据管理:
内部位移
"
)
@Api
(
tags
=
"数据管理:
e.getMessage()
"
)
@RestController
@RequestMapping
(
"data/dm"
)
public
class
DmDataController
{
...
...
eladmin-system/src/main/java/me/zhengjie/gemho/entity/tab/Drybeachequipinfor.java
View file @
4dc55a00
...
...
@@ -149,7 +149,7 @@ public class Drybeachequipinfor implements Serializable {
* 同步状态 默认为0,交换平台抽取后数值修改为1.如果数据修改后需重新抽取需将数据重新置为0.
*/
@ApiModelProperty
(
value
=
"同步状态 默认为0,交换平台抽取后数值修改为1.如果数据修改后需重新抽取需将数据重新置为0."
)
private
int
is_sync
;
private
String
is_sync
;
/**
* 所属尾矿库id或者编码
...
...
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/DbDataServiceImpl.java
View file @
4dc55a00
...
...
@@ -468,6 +468,7 @@ public class DbDataServiceImpl extends ServiceImpl<DbDataMapper, DbData> impleme
@Override
public
void
download
(
DataQueryCriteria
dataQueryCriteria
,
HttpServletResponse
response
,
HttpServletRequest
request
)
throws
IOException
{
dataQueryCriteria
.
setSize
(
9999999999L
);
//获取数据
HashMap
<
String
,
Object
>
pageall
=
pageall
(
dataQueryCriteria
,
request
);
List
<
DbData
>
dbdatas
=
(
List
<
DbData
>)
pageall
.
get
(
"list"
);
...
...
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/DmDataServiceImpl.java
View file @
4dc55a00
...
...
@@ -493,6 +493,7 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme
@SneakyThrows
@Override
public
void
download
(
HttpServletResponse
response
,
DataQueryCriteria
dataQueryCriteria
,
HttpServletRequest
request
)
{
dataQueryCriteria
.
setSize
(
9999999999L
);
//获取数据
List
<
DmData
>
list
=
(
List
<
DmData
>)
pageall
(
dataQueryCriteria
,
request
).
get
(
"list"
);
String
checkArtificial
=
ServiceUtil
.
checkArtificial
(
dataQueryCriteria
);
...
...
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/MpDataServiceImpl.java
View file @
4dc55a00
...
...
@@ -495,6 +495,7 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme
@SneakyThrows
@Override
public
void
download
(
HttpServletResponse
response
,
DataQueryCriteria
dataQueryCriteria
,
HttpServletRequest
request
)
{
dataQueryCriteria
.
setSize
(
9999999999L
);
List
<
MpData
>
mpData
=
(
List
<
MpData
>)
pageall
(
dataQueryCriteria
,
request
).
get
(
"list"
);
//判断是否需要人工
boolean
result
=
false
;
...
...
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/PslDataServiceImpl.java
View file @
4dc55a00
...
...
@@ -372,6 +372,7 @@ public class PslDataServiceImpl extends ServiceImpl<PslDataMapper, PslData> impl
@SneakyThrows
@Override
public
void
download
(
HttpServletResponse
response
,
DataQueryCriteria
dataQueryCriteria
,
HttpServletRequest
request
)
{
dataQueryCriteria
.
setSize
(
9999999999L
);
List
<
PslData
>
wtData
=
(
List
<
PslData
>)
pageall
(
dataQueryCriteria
,
request
).
get
(
"list"
);
boolean
result
=
false
;
String
checkArtificial
=
ServiceUtil
.
checkArtificial
(
dataQueryCriteria
);
...
...
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/RgDataServiceImpl.java
View file @
4dc55a00
...
...
@@ -383,6 +383,7 @@ public class RgDataServiceImpl extends ServiceImpl<RgDataMapper, RgData> impleme
@Override
public
void
download
(
HttpServletResponse
response
,
DataQueryCriteria
dataQueryCriteria
,
HttpServletRequest
request
)
{
dataQueryCriteria
.
setSize
(
9999999999L
);
List
<
RgData
>
rgData
=
(
List
<
RgData
>)
pageall
(
dataQueryCriteria
,
request
).
get
(
"list"
);
boolean
result
=
false
;
String
checkArtificial
=
ServiceUtil
.
checkArtificial
(
dataQueryCriteria
);
...
...
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/SlDataServiceImpl.java
View file @
4dc55a00
...
...
@@ -413,6 +413,7 @@ public class SlDataServiceImpl extends ServiceImpl<SlDataMapper, SlData> impleme
@SneakyThrows
@Override
public
void
download
(
HttpServletResponse
response
,
DataQueryCriteria
dataQueryCriteria
,
HttpServletRequest
request
)
{
dataQueryCriteria
.
setSize
(
9999999999L
);
List
<
SlData
>
slData
=
(
List
<
SlData
>)
pageall
(
dataQueryCriteria
,
request
).
get
(
"list"
);
boolean
result
=
false
;
String
checkArtificial
=
ServiceUtil
.
checkArtificial
(
dataQueryCriteria
);
...
...
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/StDataServiceImpl.java
View file @
4dc55a00
...
...
@@ -452,6 +452,7 @@ public class StDataServiceImpl extends ServiceImpl<StDataMapper, StData> impleme
@SneakyThrows
@Override
public
void
download
(
HttpServletResponse
response
,
DataQueryCriteria
dataQueryCriteria
,
HttpServletRequest
request
)
{
dataQueryCriteria
.
setSize
(
9999999999L
);
List
<
StData
>
stData
=
(
List
<
StData
>)
pageall
(
dataQueryCriteria
,
request
).
get
(
"list"
);
//判断是否需要人工
boolean
result
=
false
;
...
...
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/WpbDataServiceImpl.java
View file @
4dc55a00
...
...
@@ -385,6 +385,7 @@ public class WpbDataServiceImpl extends ServiceImpl<WpbDataMapper, WpbData> impl
@SneakyThrows
@Override
public
void
download
(
HttpServletResponse
response
,
DataQueryCriteria
dataQueryCriteria
,
HttpServletRequest
request
)
{
dataQueryCriteria
.
setSize
(
9999999999L
);
List
<
WpbData
>
wpbData
=
(
List
<
WpbData
>)
pageall
(
dataQueryCriteria
,
request
).
get
(
"list"
);
boolean
result
=
false
;
String
checkArtificial
=
ServiceUtil
.
checkArtificial
(
dataQueryCriteria
);
...
...
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/WtDataServiceImpl.java
View file @
4dc55a00
...
...
@@ -394,6 +394,7 @@ public class WtDataServiceImpl extends ServiceImpl<WtDataMapper, WtData> impleme
@SneakyThrows
@Override
public
void
download
(
HttpServletResponse
response
,
DataQueryCriteria
dataQueryCriteria
,
HttpServletRequest
request
)
{
dataQueryCriteria
.
setSize
(
9999999999L
);
List
<
WtData
>
wtData
=
(
List
<
WtData
>)
pageall
(
dataQueryCriteria
,
request
).
get
(
"list"
);
boolean
result
=
false
;
String
checkArtificial
=
ServiceUtil
.
checkArtificial
(
dataQueryCriteria
);
...
...
eladmin-system/src/main/resources/mapper/tab/DrybeachequipinforMapper.xml
View file @
4dc55a00
...
...
@@ -18,7 +18,7 @@
SELECT equipno,
case
when DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s')
>
=
DATE_FORMAT(DATE_SUB(NOW(), INTERVAL
30 MINUTE
), '%Y-%m-%d %H:%i:%s') then 0
DATE_FORMAT(DATE_SUB(NOW(), INTERVAL
2 Hour
), '%Y-%m-%d %H:%i:%s') then 0
else 1 end as `state`
FROM `tb_drybeachequipinfor`
where tailingid = #{tailingid}
...
...
@@ -27,7 +27,7 @@
SELECT COUNT(id) as unloin
FROM tb_drybeachequipinfor
where tailingid = #{tailingid}
and (DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s')
<
= DATE_FORMAT(DATE_SUB(NOW(), INTERVAL
30 MINUTE
), '%Y-%m-%d %H:%i:%s')
and (DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s')
<
= DATE_FORMAT(DATE_SUB(NOW(), INTERVAL
2 Hour
), '%Y-%m-%d %H:%i:%s')
or datarealtime is Null) and equipname !='基准点'
</select>
<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