From f1f6596d9f28c17ea2e742f83de35291106d936a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 10 Dec 2024 14:32:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HeatanalysisController.java | 52 +++ .../modules/heating/entity/Heatanalysis.java | 5 +- .../heating/mapper/HeatanalysisMapper.java | 5 +- .../heating/mapper/xml/HeatanalysisMapper.xml | 427 ++++++++++++++---- .../heating/service/HeatanalysisService.java | 5 + .../service/impl/HeatanalysisServiceImpl.java | 36 +- 6 files changed, 424 insertions(+), 106 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisController.java index 8e99950..04696de 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/HeatanalysisController.java @@ -127,4 +127,56 @@ public class HeatanalysisController extends JeecgController> onePage(Heatanalysis object, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = heatanalysisService.findOnePage(page, object); + return Result.OK(pageList); + } + + /** + * 分页列表查询抽取二次网 + */ + @GetMapping(value = "/twoPage") + public Result> twoPage(Heatanalysis object, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = heatanalysisService.findTwoPage(page, object); + return Result.OK(pageList); + } + + /** + * 分页列表查询抽取一次网 + */ + @GetMapping(value = "/extractedOnePage") + public Result> extractedOnePage(Heatanalysis object, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = heatanalysisService.findExtractedOnePage(page, object); + return Result.OK(pageList); + } + + /** + * 分页列表查询抽取一次网 + */ + @GetMapping(value = "/extractedTwoPage") + public Result> extractedTwoPage(Heatanalysis object, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = heatanalysisService.findExtractedTwoPage(page, object); + return Result.OK(pageList); + } + } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java index 9b352e1..4c8e19b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatanalysis.java @@ -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;//开始时间 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java index 906ac57..00bc932 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java @@ -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 { List findSimulateList(Heatanalysis heatanalysis); void exeProc(Heatanalysis heatanalysis); List lowest(Heatanalysis heatanalysis); + Page findOnePage(Page page, @Param("params") Heatanalysis heatanalysis); + Page findTwoPage(Page page, @Param("params") Heatanalysis heatanalysis); + Page findExtractedOnePage(Page page, @Param("params") Heatanalysis heatanalysis); + Page findExtractedTwoPage(Page page, @Param("params") Heatanalysis heatanalysis); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml index 223b03f..d7276ff 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml @@ -2,59 +2,6 @@ - - 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" - - - - 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 - - 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 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 @@ -244,4 +307,184 @@ ORDER BY DATATIME + + + + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java index da5177c..7884ae7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java @@ -16,4 +16,9 @@ public interface HeatanalysisService extends JeecgService { List findSimulateList(Heatanalysis heatanalysis); void exeProc(Heatanalysis heatanalysis); List lowest(Heatanalysis heatanalysis); + + IPage findOnePage(Page page, Heatanalysis heatanalysis); + IPage findTwoPage(Page page, Heatanalysis heatanalysis); + IPage findExtractedOnePage(Page page, Heatanalysis heatanalysis); + IPage findExtractedTwoPage(Page page, Heatanalysis heatanalysis); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java index b3106e6..1b772cd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java @@ -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 implements HeatanalysisService { - @Autowired - HeatanalysisMapper mapper; - public Heatanalysis getHeatOne(Heatanalysis heatanalysis) { - return mapper.getHeatOne(heatanalysis); + return baseMapper.getHeatOne(heatanalysis); } public IPage findPage(Page page,Heatanalysis heatanalysis){ - return mapper.findPage(page,heatanalysis); + return baseMapper.findPage(page,heatanalysis); } public List findList(Heatanalysis heatanalysis){ - return mapper.findList(heatanalysis); + return baseMapper.findList(heatanalysis); } public List findSourceList(Heatanalysis heatanalysis){ - return mapper.findSourceList(heatanalysis); + return baseMapper.findSourceList(heatanalysis); } public List findStaticList(Heatanalysis heatanalysis){ - return mapper.findStaticList(heatanalysis); + return baseMapper.findStaticList(heatanalysis); } public List findSimulateList(Heatanalysis heatanalysis){ - return mapper.findSimulateList(heatanalysis); + return baseMapper.findSimulateList(heatanalysis); } public void exeProc(Heatanalysis heatanalysis){ - mapper.exeProc(heatanalysis); + baseMapper.exeProc(heatanalysis); } public List lowest(Heatanalysis heatanalysis){ @@ -58,7 +54,7 @@ public class HeatanalysisServiceImpl extends JeecgServiceImpl findOnePage(Page page, Heatanalysis heatanalysis){ + return baseMapper.findOnePage(page,heatanalysis); + } + + public IPage findTwoPage(Page page, Heatanalysis heatanalysis){ + return baseMapper.findTwoPage(page,heatanalysis); + } + + public IPage findExtractedOnePage(Page page, Heatanalysis heatanalysis){ + return baseMapper.findExtractedOnePage(page,heatanalysis); + } + + public IPage findExtractedTwoPage(Page page, Heatanalysis heatanalysis){ + return baseMapper.findExtractedTwoPage(page,heatanalysis); + } + }