数据抽取配置

This commit is contained in:
曹磊 2024-12-10 14:32:14 +08:00
parent b3496bf0a5
commit f1f6596d9f
6 changed files with 424 additions and 106 deletions

View File

@ -127,4 +127,56 @@ public class HeatanalysisController extends JeecgController<Heatanalysis, Heatan
return mv;
}
/**
* 分页列表查询抽取一次网
*/
@GetMapping(value = "/onePage")
public Result<IPage<Heatanalysis>> onePage(Heatanalysis object,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Page<Heatanalysis> page = new Page<Heatanalysis>(pageNo, pageSize);
IPage<Heatanalysis> pageList = heatanalysisService.findOnePage(page, object);
return Result.OK(pageList);
}
/**
* 分页列表查询抽取二次网
*/
@GetMapping(value = "/twoPage")
public Result<IPage<Heatanalysis>> twoPage(Heatanalysis object,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Page<Heatanalysis> page = new Page<Heatanalysis>(pageNo, pageSize);
IPage<Heatanalysis> pageList = heatanalysisService.findTwoPage(page, object);
return Result.OK(pageList);
}
/**
* 分页列表查询抽取一次网
*/
@GetMapping(value = "/extractedOnePage")
public Result<IPage<Heatanalysis>> extractedOnePage(Heatanalysis object,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Page<Heatanalysis> page = new Page<Heatanalysis>(pageNo, pageSize);
IPage<Heatanalysis> pageList = heatanalysisService.findExtractedOnePage(page, object);
return Result.OK(pageList);
}
/**
* 分页列表查询抽取一次网
*/
@GetMapping(value = "/extractedTwoPage")
public Result<IPage<Heatanalysis>> extractedTwoPage(Heatanalysis object,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Page<Heatanalysis> page = new Page<Heatanalysis>(pageNo, pageSize);
IPage<Heatanalysis> pageList = heatanalysisService.findExtractedTwoPage(page, object);
return Result.OK(pageList);
}
}

View File

@ -77,7 +77,10 @@ public class Heatanalysis extends JeecgEntity {
private String view030; // view030
private String sim; // sim
private String code; // code
private Integer reportType;//上报类型
private Integer reportType;//数据采集类型 1设备自动上报 2定时模拟
private Integer isExtract;//是否抽取 0否 1是
@TableField(exist = false)
private Integer isExtracted;//是否被抽取 0否 1是
@TableField(exist = false)
private String SDate;//开始时间

View File

@ -1,7 +1,6 @@
package org.jeecg.modules.heating.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.heating.entity.Heatanalysis;
@ -17,4 +16,8 @@ public interface HeatanalysisMapper extends BaseMapper<Heatanalysis> {
List<Heatanalysis> findSimulateList(Heatanalysis heatanalysis);
void exeProc(Heatanalysis heatanalysis);
List<Heatanalysis> lowest(Heatanalysis heatanalysis);
Page<Heatanalysis> findOnePage(Page<Heatanalysis> page, @Param("params") Heatanalysis heatanalysis);
Page<Heatanalysis> findTwoPage(Page<Heatanalysis> page, @Param("params") Heatanalysis heatanalysis);
Page<Heatanalysis> findExtractedOnePage(Page<Heatanalysis> page, @Param("params") Heatanalysis heatanalysis);
Page<Heatanalysis> findExtractedTwoPage(Page<Heatanalysis> page, @Param("params") Heatanalysis heatanalysis);
}

View File

@ -2,59 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.heating.mapper.HeatanalysisMapper">
<sql id="heatanalysisColumns">
a.id AS "id",
a.view001 AS "view001",
a.view002 AS "view002",
a.view003 AS "view003",
a.view004 AS "view004",
a.datatime AS "datatime",
a.caveat AS "caveat",
a.view005 AS "view005",
a.view006 AS "view006",
a.view007 AS "view007",
a.view008 AS "view008",
a.view009 AS "view009",
a.view010 AS "view010",
a.view011 AS "view011",
a.view012 AS "view012",
a.view013 AS "view013",
a.view014 AS "view014",
a.view015 AS "view015",
a.view016 AS "view016",
a.view017 AS "view017",
a.view018 AS "view018",
a.view019 AS "view019",
a.view020 AS "view020",
a.view021 AS "view021",
a.view022 AS "view022",
a.view023 AS "view023",
a.view024 AS "view024",
a.view025 AS "view025",
a.view026 AS "view026",
a.view027 AS "view027",
a.view028 AS "view028",
a.view029 AS "view029",
a.view030 AS "view030",
a.sim AS "sim",
a.create_by AS "createBy.id",
a.create_date AS "createDate",
a.update_by AS "updateBy.id",
a.update_date AS "updateDate",
a.del_flag AS "delFlag",
b.company_name AS "view001Name",
c.source_name AS "view002Name",
d.name AS "view003Name",
e.station_name AS "view004Name"
</sql>
<sql id="heatanalysisJoins">
LEFT JOIN thermalcompany b ON b.id=a.view001
LEFT JOIN heatsource c ON c.id=a.view002
LEFT JOIN substation d ON d.id=a.view003
LEFT JOIN heatsourcestation e ON e.id=a.view004
</sql>
<select id="getHeatOne" resultType="org.jeecg.modules.heating.entity.Heatanalysis">
SELECT
id,
@ -72,50 +19,118 @@
</select>
<select id="findPage" resultType="org.jeecg.modules.heating.entity.Heatanalysis">
SELECT
<include refid="heatanalysisColumns"/>
FROM HEATANALYSIS a
<include refid="heatanalysisJoins"/>
select * from (
SELECT
a.id AS "id",
a.view001 AS "view001",
a.view002 AS "view002",
a.view003 AS "view003",
a.view004 AS "view004",
a.datatime AS "datatime",
a.caveat AS "caveat",
a.view005 AS "view005",
a.view006 AS "view006",
a.view007 AS "view007",
a.view008 AS "view008",
a.view009 AS "view009",
a.view010 AS "view010",
a.view011 AS "view011",
a.view012 AS "view012",
a.view013 AS "view013",
a.view014 AS "view014",
a.view015 AS "view015",
a.view016 AS "view016",
a.view017 AS "view017",
a.view018 AS "view018",
a.view019 AS "view019",
a.view020 AS "view020",
a.view021 AS "view021",
a.view022 AS "view022",
a.view023 AS "view023",
a.view024 AS "view024",
a.view025 AS "view025",
a.view026 AS "view026",
a.view027 AS "view001Name",
a.view028 AS "view002Name",
a.view029 AS "view003Name",
a.view030 AS "view004Name",
a.sim AS "sim",
a.create_by AS "createBy.id",
a.create_date AS "createDate",
a.update_by AS "updateBy.id",
a.update_date AS "updateDate",
a.del_flag AS "delFlag",
a.report_type AS "reportType",
a.is_extract AS "isExtract",
-- b.company_name AS "view001Name",
-- c.source_name AS "view002Name",
-- d.name AS "view003Name",
-- e.station_name AS "view004Name",
(select count(*) from bl_data_extract_config bl where bl.one_pipe_sim = a.sim or bl.two_pipe_sim = a.sim) as isExtracted
FROM HEATANALYSIS a
-- LEFT JOIN thermalcompany b ON b.id=a.view001
-- LEFT JOIN heatsource c ON c.id=a.view002
-- LEFT JOIN substation d ON d.id=a.view003
-- LEFT JOIN heatsourcestation e ON e.id=a.view004
<where>
a.del_flag = #{params.DEL_FLAG_NORMAL}
<if test="params.view001 != null and params.view001 != ''">
AND a.view001 = #{params.view001}
</if>
<if test="params.view002 != null and params.view002 != ''">
AND a.view002 = #{params.view002}
</if>
<if test="params.view003 != null and params.view003 != ''">
AND a.view003 = #{params.view003}
</if>
<if test="params.view004 != null and params.view004 != ''">
AND a.view004 = #{params.view004}
</if>
<if test="params.view005 != null and params.view005 != ''">
AND a.view005 &lt;= #{params.view005}
</if>
<if test="params.view006 != null and params.view006 != ''">
AND a.view006 &lt;#{params.view006}
</if>
<if test="params.view009 != null and params.view009 != ''">
AND a.view009 &lt;#{params.view009}
</if>
<if test="params.view010 != null and params.view010 != ''">
AND a.view010 &lt;#{params.view010}
</if>
<if test="params.caveat != null">
AND a.caveat = #{params.caveat}
</if>
<if test="params.reportType != null">
AND a.report_type = #{params.reportType}
</if>
<if test="params.isExtract != null">
AND a.is_extract = #{params.isExtract}
</if>
</where>
) t
<where>
a.del_flag = #{params.DEL_FLAG_NORMAL}
<if test="params.view001 != null and params.view001 != ''">
AND a.view001 = #{params.view001}
</if>
<if test="params.view002 != null and params.view002 != ''">
AND a.view002 = #{params.view002}
</if>
<if test="params.view003 != null and params.view003 != ''">
AND a.view003 = #{params.view003}
</if>
<if test="params.view004 != null and params.view004 != ''">
AND a.view004 = #{params.view004}
</if>
<if test="params.view005 != null and params.view005 != ''">
AND a.view005 &lt;= #{params.view005}
</if>
<if test="params.view006 != null and params.view006 != ''">
AND a.view006 &lt;#{params.view006}
</if>
<if test="params.view009 != null and params.view009 != ''">
AND a.view009 &lt;#{params.view009}
</if>
<if test="params.view010 != null and params.view010 != ''">
AND a.view010 &lt;#{params.view010}
</if>
<if test="params.caveat != null">
AND a.caveat = #{params.caveat}
<if test="params.isExtracted != null">
<if test="params.isExtracted == 0">
AND isExtracted = 0
</if>
<if test="params.isExtracted > 0">
AND isExtracted > 0
</if>
</if>
</where>
ORDER BY a.view001 asc ,a.view002 asc,a.view004 asc,A.DATATIME DESC
ORDER BY view001 asc ,view002 asc,view004 asc,DATATIME DESC
</select>
<select id="findSourceList" resultType="org.jeecg.modules.heating.entity.Heatanalysis">
SELECT
a.id AS "id",
a.view001 AS "view001",
b.company_name AS "view001Name",
-- b.company_name AS "view001Name",
a.view027 AS "view001Name",
a.view002 AS "view002",
c.source_name AS "view002Name",
-- c.source_name AS "view002Name",
a.view028 AS "view002Name",
a.datatime AS "datatime",
a.caveat AS "caveat",
a.view005 AS "view005",
@ -125,8 +140,8 @@
a.sim AS "sim",
a.code
FROM HEATANALYSIS a
INNER JOIN thermalcompany b ON b.id=a.view001
INNER JOIN heatsource c ON c.id=a.view002
-- INNER JOIN thermalcompany b ON b.id=a.view001
-- INNER JOIN heatsource c ON c.id=a.view002
WHERE
a.del_flag = #{DEL_FLAG_NORMAL}
and b.del_flag = #{DEL_FLAG_NORMAL}
@ -139,9 +154,57 @@
<select id="findList" resultType="org.jeecg.modules.heating.entity.Heatanalysis">
SELECT
<include refid="heatanalysisColumns"/>
a.id AS "id",
a.view001 AS "view001",
a.view002 AS "view002",
a.view003 AS "view003",
a.view004 AS "view004",
a.datatime AS "datatime",
a.caveat AS "caveat",
a.view005 AS "view005",
a.view006 AS "view006",
a.view007 AS "view007",
a.view008 AS "view008",
a.view009 AS "view009",
a.view010 AS "view010",
a.view011 AS "view011",
a.view012 AS "view012",
a.view013 AS "view013",
a.view014 AS "view014",
a.view015 AS "view015",
a.view016 AS "view016",
a.view017 AS "view017",
a.view018 AS "view018",
a.view019 AS "view019",
a.view020 AS "view020",
a.view021 AS "view021",
a.view022 AS "view022",
a.view023 AS "view023",
a.view024 AS "view024",
a.view025 AS "view025",
a.view026 AS "view026",
a.view027 AS "view001Name",
a.view028 AS "view002Name",
a.view029 AS "view003Name",
a.view030 AS "view004Name",
a.sim AS "sim",
a.create_by AS "createBy.id",
a.create_date AS "createDate",
a.update_by AS "updateBy.id",
a.update_date AS "updateDate",
a.del_flag AS "delFlag",
a.report_type AS "reportType",
a.is_extract AS "isExtract",
-- b.company_name AS "view001Name",
-- c.source_name AS "view002Name",
-- d.name AS "view003Name",
-- e.station_name AS "view004Name",
(select count(*) from bl_data_extract_config bl where bl.one_pipe_sim = a.sim or bl.two_pipe_sim = a.sim) as isExtracted
FROM HEATANALYSIS a
<include refid="heatanalysisJoins"/>
-- LEFT JOIN thermalcompany b ON b.id=a.view001
-- LEFT JOIN heatsource c ON c.id=a.view002
-- LEFT JOIN substation d ON d.id=a.view003
-- LEFT JOIN heatsourcestation e ON e.id=a.view004
<where>
a.del_flag = #{DEL_FLAG_NORMAL}
and ifnull(a.view001,'') != ''
@ -185,7 +248,7 @@
FROM HEATANALYSIS a
LEFT JOIN thermalcompany b ON b.id=a.view001
LEFT JOIN heatsourcestation e ON e.id=a.view004 and e.id != 20
where a.del_flag = 0
where a.del_flag = #{DEL_FLAG_NORMAL}
group by view001,view001Name
ORDER BY A.view001 DESC
</select>
@ -244,4 +307,184 @@
ORDER BY DATATIME
</select>
<select id="findOnePage" resultType="org.jeecg.modules.heating.entity.Heatanalysis">
SELECT
a.id AS "id",
a.view001 AS "view001",
a.view002 AS "view002",
a.view003 AS "view003",
a.view004 AS "view004",
a.datatime AS "datatime",
a.caveat AS "caveat",
a.view005 AS "view005",
a.view006 AS "view006",
a.view007 AS "view007",
a.view008 AS "view008",
a.view009 AS "view009",
a.view010 AS "view010",
a.view011 AS "view011",
a.view012 AS "view012",
a.view013 AS "view013",
a.view014 AS "view014",
a.view015 AS "view015",
a.view016 AS "view016",
a.view017 AS "view017",
a.view018 AS "view018",
a.view019 AS "view019",
a.view020 AS "view020",
a.view021 AS "view021",
a.view022 AS "view022",
a.view023 AS "view023",
a.view024 AS "view024",
a.view025 AS "view025",
a.view026 AS "view026",
a.view027 AS "view001Name",
a.view028 AS "view002Name",
a.view029 AS "view003Name",
a.view030 AS "view004Name",
a.sim AS "sim",
a.report_type AS "reportType"
FROM HEATANALYSIS a
INNER JOIN bl_data_extract_config bl on a.sim = bl.one_pipe_sim and bl.sim = #{params.sim}
<where>
a.del_flag = #{params.DEL_FLAG_NORMAL}
</where>
ORDER BY view001 asc ,view002 asc,view004 asc,DATATIME DESC
</select>
<select id="findTwoPage" resultType="org.jeecg.modules.heating.entity.Heatanalysis">
SELECT
a.id AS "id",
a.view001 AS "view001",
a.view002 AS "view002",
a.view003 AS "view003",
a.view004 AS "view004",
a.datatime AS "datatime",
a.caveat AS "caveat",
a.view005 AS "view005",
a.view006 AS "view006",
a.view007 AS "view007",
a.view008 AS "view008",
a.view009 AS "view009",
a.view010 AS "view010",
a.view011 AS "view011",
a.view012 AS "view012",
a.view013 AS "view013",
a.view014 AS "view014",
a.view015 AS "view015",
a.view016 AS "view016",
a.view017 AS "view017",
a.view018 AS "view018",
a.view019 AS "view019",
a.view020 AS "view020",
a.view021 AS "view021",
a.view022 AS "view022",
a.view023 AS "view023",
a.view024 AS "view024",
a.view025 AS "view025",
a.view026 AS "view026",
a.view027 AS "view001Name",
a.view028 AS "view002Name",
a.view029 AS "view003Name",
a.view030 AS "view004Name",
a.sim AS "sim",
a.report_type AS "reportType"
FROM HEATANALYSIS a
INNER JOIN bl_data_extract_config bl on a.sim = bl.two_pipe_sim and bl.sim = #{params.sim}
<where>
a.del_flag = #{params.DEL_FLAG_NORMAL}
</where>
ORDER BY view001 asc ,view002 asc,view004 asc,DATATIME DESC
</select>
<select id="findExtractedOnePage" resultType="org.jeecg.modules.heating.entity.Heatanalysis">
SELECT
a.id AS "id",
a.view001 AS "view001",
a.view002 AS "view002",
a.view003 AS "view003",
a.view004 AS "view004",
a.datatime AS "datatime",
a.caveat AS "caveat",
a.view005 AS "view005",
a.view006 AS "view006",
a.view007 AS "view007",
a.view008 AS "view008",
a.view009 AS "view009",
a.view010 AS "view010",
a.view011 AS "view011",
a.view012 AS "view012",
a.view013 AS "view013",
a.view014 AS "view014",
a.view015 AS "view015",
a.view016 AS "view016",
a.view017 AS "view017",
a.view018 AS "view018",
a.view019 AS "view019",
a.view020 AS "view020",
a.view021 AS "view021",
a.view022 AS "view022",
a.view023 AS "view023",
a.view024 AS "view024",
a.view025 AS "view025",
a.view026 AS "view026",
a.view027 AS "view001Name",
a.view028 AS "view002Name",
a.view029 AS "view003Name",
a.view030 AS "view004Name",
a.sim AS "sim",
a.report_type AS "reportType"
FROM HEATANALYSIS a
INNER JOIN bl_data_extract_config bl on a.sim = bl.sim and bl.one_pipe_sim = #{params.sim}
<where>
a.del_flag = #{params.DEL_FLAG_NORMAL}
</where>
ORDER BY view001 asc ,view002 asc,view004 asc,DATATIME DESC
</select>
<select id="findExtractedTwoPage" resultType="org.jeecg.modules.heating.entity.Heatanalysis">
SELECT
a.id AS "id",
a.view001 AS "view001",
a.view002 AS "view002",
a.view003 AS "view003",
a.view004 AS "view004",
a.datatime AS "datatime",
a.caveat AS "caveat",
a.view005 AS "view005",
a.view006 AS "view006",
a.view007 AS "view007",
a.view008 AS "view008",
a.view009 AS "view009",
a.view010 AS "view010",
a.view011 AS "view011",
a.view012 AS "view012",
a.view013 AS "view013",
a.view014 AS "view014",
a.view015 AS "view015",
a.view016 AS "view016",
a.view017 AS "view017",
a.view018 AS "view018",
a.view019 AS "view019",
a.view020 AS "view020",
a.view021 AS "view021",
a.view022 AS "view022",
a.view023 AS "view023",
a.view024 AS "view024",
a.view025 AS "view025",
a.view026 AS "view026",
a.view027 AS "view001Name",
a.view028 AS "view002Name",
a.view029 AS "view003Name",
a.view030 AS "view004Name",
a.sim AS "sim",
a.report_type AS "reportType"
FROM HEATANALYSIS a
INNER JOIN bl_data_extract_config bl on a.sim = bl.sim and bl.two_pipe_sim = #{params.sim}
<where>
a.del_flag = #{params.DEL_FLAG_NORMAL}
</where>
ORDER BY view001 asc ,view002 asc,view004 asc,DATATIME DESC
</select>
</mapper>

View File

@ -16,4 +16,9 @@ public interface HeatanalysisService extends JeecgService<Heatanalysis> {
List<Heatanalysis> findSimulateList(Heatanalysis heatanalysis);
void exeProc(Heatanalysis heatanalysis);
List<Heatanalysis> lowest(Heatanalysis heatanalysis);
IPage<Heatanalysis> findOnePage(Page<Heatanalysis> page, Heatanalysis heatanalysis);
IPage<Heatanalysis> findTwoPage(Page<Heatanalysis> page, Heatanalysis heatanalysis);
IPage<Heatanalysis> findExtractedOnePage(Page<Heatanalysis> page, Heatanalysis heatanalysis);
IPage<Heatanalysis> findExtractedTwoPage(Page<Heatanalysis> page, Heatanalysis heatanalysis);
}

View File

@ -8,7 +8,6 @@ import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.heating.entity.Heatanalysis;
import org.jeecg.modules.heating.mapper.HeatanalysisMapper;
import org.jeecg.modules.heating.service.HeatanalysisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
@ -19,35 +18,32 @@ import java.util.List;
@DS("multi-datasource1")
public class HeatanalysisServiceImpl extends JeecgServiceImpl<HeatanalysisMapper, Heatanalysis> implements HeatanalysisService {
@Autowired
HeatanalysisMapper mapper;
public Heatanalysis getHeatOne(Heatanalysis heatanalysis) {
return mapper.getHeatOne(heatanalysis);
return baseMapper.getHeatOne(heatanalysis);
}
public IPage<Heatanalysis> findPage(Page<Heatanalysis> page,Heatanalysis heatanalysis){
return mapper.findPage(page,heatanalysis);
return baseMapper.findPage(page,heatanalysis);
}
public List<Heatanalysis> findList(Heatanalysis heatanalysis){
return mapper.findList(heatanalysis);
return baseMapper.findList(heatanalysis);
}
public List<Heatanalysis> findSourceList(Heatanalysis heatanalysis){
return mapper.findSourceList(heatanalysis);
return baseMapper.findSourceList(heatanalysis);
}
public List<Heatanalysis> findStaticList(Heatanalysis heatanalysis){
return mapper.findStaticList(heatanalysis);
return baseMapper.findStaticList(heatanalysis);
}
public List<Heatanalysis> findSimulateList(Heatanalysis heatanalysis){
return mapper.findSimulateList(heatanalysis);
return baseMapper.findSimulateList(heatanalysis);
}
public void exeProc(Heatanalysis heatanalysis){
mapper.exeProc(heatanalysis);
baseMapper.exeProc(heatanalysis);
}
public List<Heatanalysis> lowest(Heatanalysis heatanalysis){
@ -58,7 +54,7 @@ public class HeatanalysisServiceImpl extends JeecgServiceImpl<HeatanalysisMapper
}catch (Exception e){
e.printStackTrace();
}
return mapper.lowest(heatanalysis);
return baseMapper.lowest(heatanalysis);
}
private String getTableName(){
@ -68,4 +64,20 @@ public class HeatanalysisServiceImpl extends JeecgServiceImpl<HeatanalysisMapper
return tableName;
}
public IPage<Heatanalysis> findOnePage(Page<Heatanalysis> page, Heatanalysis heatanalysis){
return baseMapper.findOnePage(page,heatanalysis);
}
public IPage<Heatanalysis> findTwoPage(Page<Heatanalysis> page, Heatanalysis heatanalysis){
return baseMapper.findTwoPage(page,heatanalysis);
}
public IPage<Heatanalysis> findExtractedOnePage(Page<Heatanalysis> page, Heatanalysis heatanalysis){
return baseMapper.findExtractedOnePage(page,heatanalysis);
}
public IPage<Heatanalysis> findExtractedTwoPage(Page<Heatanalysis> page, Heatanalysis heatanalysis){
return baseMapper.findExtractedTwoPage(page,heatanalysis);
}
}