Commit 4dc55a00 authored by Administrator's avatar Administrator

2023-6.25 导出修改从只导出当前页改成 导出所有的查询结果

parent c32fdc09
...@@ -30,7 +30,7 @@ import java.util.HashMap; ...@@ -30,7 +30,7 @@ import java.util.HashMap;
* @author llj * @author llj
* @since 2022-01-05 * @since 2022-01-05
*/ */
@Api(tags = "数据管理: 内部位移") @Api(tags = "数据管理: e.getMessage()")
@RestController @RestController
@RequestMapping("data/dm") @RequestMapping("data/dm")
public class DmDataController { public class DmDataController {
......
...@@ -149,7 +149,7 @@ public class Drybeachequipinfor implements Serializable { ...@@ -149,7 +149,7 @@ public class Drybeachequipinfor implements Serializable {
* 同步状态 默认为0,交换平台抽取后数值修改为1.如果数据修改后需重新抽取需将数据重新置为0. * 同步状态 默认为0,交换平台抽取后数值修改为1.如果数据修改后需重新抽取需将数据重新置为0.
*/ */
@ApiModelProperty(value = "同步状态 默认为0,交换平台抽取后数值修改为1.如果数据修改后需重新抽取需将数据重新置为0.") @ApiModelProperty(value = "同步状态 默认为0,交换平台抽取后数值修改为1.如果数据修改后需重新抽取需将数据重新置为0.")
private int is_sync; private String is_sync;
/** /**
* 所属尾矿库id或者编码 * 所属尾矿库id或者编码
......
...@@ -468,6 +468,7 @@ public class DbDataServiceImpl extends ServiceImpl<DbDataMapper, DbData> impleme ...@@ -468,6 +468,7 @@ public class DbDataServiceImpl extends ServiceImpl<DbDataMapper, DbData> impleme
@Override @Override
public void download(DataQueryCriteria dataQueryCriteria, HttpServletResponse response, HttpServletRequest request) throws IOException { public void download(DataQueryCriteria dataQueryCriteria, HttpServletResponse response, HttpServletRequest request) throws IOException {
dataQueryCriteria.setSize(9999999999L);
//获取数据 //获取数据
HashMap<String, Object> pageall = pageall(dataQueryCriteria, request); HashMap<String, Object> pageall = pageall(dataQueryCriteria, request);
List<DbData> dbdatas = (List<DbData>) pageall.get("list"); List<DbData> dbdatas = (List<DbData>) pageall.get("list");
......
...@@ -493,6 +493,7 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme ...@@ -493,6 +493,7 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme
@SneakyThrows @SneakyThrows
@Override @Override
public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) { public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
dataQueryCriteria.setSize(9999999999L);
//获取数据 //获取数据
List<DmData> list = (List<DmData>) pageall(dataQueryCriteria, request).get("list"); List<DmData> list = (List<DmData>) pageall(dataQueryCriteria, request).get("list");
String checkArtificial = ServiceUtil.checkArtificial(dataQueryCriteria); String checkArtificial = ServiceUtil.checkArtificial(dataQueryCriteria);
......
...@@ -495,6 +495,7 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme ...@@ -495,6 +495,7 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme
@SneakyThrows @SneakyThrows
@Override @Override
public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) { public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
dataQueryCriteria.setSize(9999999999L);
List<MpData> mpData = (List<MpData>) pageall(dataQueryCriteria, request).get("list"); List<MpData> mpData = (List<MpData>) pageall(dataQueryCriteria, request).get("list");
//判断是否需要人工 //判断是否需要人工
boolean result = false; boolean result = false;
......
...@@ -372,6 +372,7 @@ public class PslDataServiceImpl extends ServiceImpl<PslDataMapper, PslData> impl ...@@ -372,6 +372,7 @@ public class PslDataServiceImpl extends ServiceImpl<PslDataMapper, PslData> impl
@SneakyThrows @SneakyThrows
@Override @Override
public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) { public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
dataQueryCriteria.setSize(9999999999L);
List<PslData> wtData = (List<PslData>) pageall(dataQueryCriteria, request).get("list"); List<PslData> wtData = (List<PslData>) pageall(dataQueryCriteria, request).get("list");
boolean result = false; boolean result = false;
String checkArtificial = ServiceUtil.checkArtificial(dataQueryCriteria); String checkArtificial = ServiceUtil.checkArtificial(dataQueryCriteria);
......
...@@ -383,6 +383,7 @@ public class RgDataServiceImpl extends ServiceImpl<RgDataMapper, RgData> impleme ...@@ -383,6 +383,7 @@ public class RgDataServiceImpl extends ServiceImpl<RgDataMapper, RgData> impleme
@Override @Override
public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest
request) { request) {
dataQueryCriteria.setSize(9999999999L);
List<RgData> rgData = (List<RgData>) pageall(dataQueryCriteria, request).get("list"); List<RgData> rgData = (List<RgData>) pageall(dataQueryCriteria, request).get("list");
boolean result = false; boolean result = false;
String checkArtificial = ServiceUtil.checkArtificial(dataQueryCriteria); String checkArtificial = ServiceUtil.checkArtificial(dataQueryCriteria);
......
...@@ -413,6 +413,7 @@ public class SlDataServiceImpl extends ServiceImpl<SlDataMapper, SlData> impleme ...@@ -413,6 +413,7 @@ public class SlDataServiceImpl extends ServiceImpl<SlDataMapper, SlData> impleme
@SneakyThrows @SneakyThrows
@Override @Override
public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) { public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
dataQueryCriteria.setSize(9999999999L);
List<SlData> slData = (List<SlData>) pageall(dataQueryCriteria, request).get("list"); List<SlData> slData = (List<SlData>) pageall(dataQueryCriteria, request).get("list");
boolean result = false; boolean result = false;
String checkArtificial = ServiceUtil.checkArtificial(dataQueryCriteria); String checkArtificial = ServiceUtil.checkArtificial(dataQueryCriteria);
......
...@@ -452,6 +452,7 @@ public class StDataServiceImpl extends ServiceImpl<StDataMapper, StData> impleme ...@@ -452,6 +452,7 @@ public class StDataServiceImpl extends ServiceImpl<StDataMapper, StData> impleme
@SneakyThrows @SneakyThrows
@Override @Override
public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) { public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
dataQueryCriteria.setSize(9999999999L);
List<StData> stData = (List<StData>) pageall(dataQueryCriteria, request).get("list"); List<StData> stData = (List<StData>) pageall(dataQueryCriteria, request).get("list");
//判断是否需要人工 //判断是否需要人工
boolean result = false; boolean result = false;
......
...@@ -385,6 +385,7 @@ public class WpbDataServiceImpl extends ServiceImpl<WpbDataMapper, WpbData> impl ...@@ -385,6 +385,7 @@ public class WpbDataServiceImpl extends ServiceImpl<WpbDataMapper, WpbData> impl
@SneakyThrows @SneakyThrows
@Override @Override
public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) { public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
dataQueryCriteria.setSize(9999999999L);
List<WpbData> wpbData = (List<WpbData>) pageall(dataQueryCriteria, request).get("list"); List<WpbData> wpbData = (List<WpbData>) pageall(dataQueryCriteria, request).get("list");
boolean result = false; boolean result = false;
String checkArtificial = ServiceUtil.checkArtificial(dataQueryCriteria); String checkArtificial = ServiceUtil.checkArtificial(dataQueryCriteria);
......
...@@ -394,6 +394,7 @@ public class WtDataServiceImpl extends ServiceImpl<WtDataMapper, WtData> impleme ...@@ -394,6 +394,7 @@ public class WtDataServiceImpl extends ServiceImpl<WtDataMapper, WtData> impleme
@SneakyThrows @SneakyThrows
@Override @Override
public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) { public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
dataQueryCriteria.setSize(9999999999L);
List<WtData> wtData = (List<WtData>) pageall(dataQueryCriteria, request).get("list"); List<WtData> wtData = (List<WtData>) pageall(dataQueryCriteria, request).get("list");
boolean result = false; boolean result = false;
String checkArtificial = ServiceUtil.checkArtificial(dataQueryCriteria); String checkArtificial = ServiceUtil.checkArtificial(dataQueryCriteria);
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
SELECT equipno, SELECT equipno,
case case
when DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s') &gt;= when DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s') &gt;=
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` else 1 end as `state`
FROM `tb_drybeachequipinfor` FROM `tb_drybeachequipinfor`
where tailingid = #{tailingid} where tailingid = #{tailingid}
...@@ -27,7 +27,7 @@ ...@@ -27,7 +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') &lt;= DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 30 MINUTE), '%Y-%m-%d %H:%i:%s') and (DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 2 Hour), '%Y-%m-%d %H:%i:%s')
or datarealtime is Null) and equipname !='基准点' or datarealtime is Null) and equipname !='基准点'
</select> </select>
<update id="enforceOnline"> <update id="enforceOnline">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment