From 49f9819a0b36c534c08344e7bea82a0bd7f9d8b2 Mon Sep 17 00:00:00 2001 From: houwei Date: Wed, 30 Oct 2024 09:17:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=92=8C=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=90=8E=E7=AB=AFapi=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/mapper/SysEquipmentMapper.java | 27 ++++++++++++++----- .../service/impl/SysEquipmentServiceImpl.java | 10 +++++-- .../page/service/WindTurbinesPageService.java | 2 +- .../page/service/impl/HomeServiceImpl.java | 21 +++++++++++---- .../resources/mapper/SysEquipmentMapper.xml | 7 +++-- 5 files changed, 48 insertions(+), 19 deletions(-) diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java index 42464691..1c7f3ce9 100644 --- a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java +++ b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java @@ -5,10 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.das.modules.auth.mapper.BaseMapperPlus; import com.das.modules.equipment.domain.dto.SysEquipmentDto; import com.das.modules.equipment.domain.excel.SysEquipmentExcel; -import com.das.modules.equipment.domain.vo.BaseImptabmappingVo; import com.das.modules.equipment.domain.vo.SysEquipmentVo; import com.das.modules.equipment.entity.SysEquipment; -import com.das.modules.page.domian.WindTurbinesPageVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,8 +14,13 @@ import java.util.List; @Mapper public interface SysEquipmentMapper extends BaseMapperPlus { - - IPage querySysEquipmentList(IPage page, @Param("info") SysEquipmentDto sysEquipmentDto); + /** + * 分页查询设备列表 + * @param page 分页信息 + * @param sysEquipmentDto 查询条件 + * @return 返回值 + */ + IPage queryEquipmentListInPage(IPage page, @Param("info") SysEquipmentDto sysEquipmentDto); /** * 查询根设备列表 @@ -25,7 +28,12 @@ public interface SysEquipmentMapper extends BaseMapperPlus queryRootEquipments(); - List queryInfoById (@Param("info") SysEquipmentDto sysEquipmentDto); + /** + * 导出设备信息 + * @param sysEquipmentDto 查询条件 + * @return SysEquipmentExcel 列表 + */ + List queryExportExcelInfo(@Param("info") SysEquipmentDto sysEquipmentDto); Long queryChildEquipmentCount(@Param("id")Long id); @@ -37,9 +45,14 @@ public interface SysEquipmentMapper extends BaseMapperPlus queryBelongLines(@Param("objectType") Long objectType); - List querySysEquipmentList(@Param("info") SysEquipmentDto sysEquipmentDto); + List queryEquipmentListInPage(@Param("info") SysEquipmentDto sysEquipmentDto); - SysEquipmentVo queryWindFarm(@Param("info") SysEquipmentDto sysEquipmentDto); + /** + * 查询设备列表 + * @param sysEquipmentDto 查询条件 + * @return + */ + List queryEquipmentList(@Param("info") SysEquipmentDto sysEquipmentDto); } diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java index 6a659f3c..83aec758 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java @@ -117,7 +117,7 @@ public class SysEquipmentServiceImpl implements SysEquipmentService { PageQuery pageQuery = new PageQuery(); pageQuery.setPageNum(sysEquipmentDto.getPageNum()); pageQuery.setPageSize(sysEquipmentDto.getPageSize()); - IPage iPage = sysEquipmentMapper.querySysEquipmentList(pageQuery.build(), sysEquipmentDto); + IPage iPage = sysEquipmentMapper.queryEquipmentListInPage(pageQuery.build(), sysEquipmentDto); return PageDataInfo.build(iPage.getRecords(), iPage.getTotal()); } @@ -145,9 +145,15 @@ public class SysEquipmentServiceImpl implements SysEquipmentService { return equipList; } + /** + * 设备台账导出Excel + * @param sysEquipmentDto 查询参数 + * @param request HttpServletRequest + * @param response HttpServletResponse + */ @Override public void exportSysEquipment(SysEquipmentDto sysEquipmentDto, HttpServletRequest request, HttpServletResponse response) { - List sysEquipmentList = sysEquipmentMapper.queryInfoById(sysEquipmentDto); + List sysEquipmentList = sysEquipmentMapper.queryExportExcelInfo(sysEquipmentDto); //自定义别名 别名的key和实体类中的名称要对应上！！ LinkedHashMap map = new LinkedHashMap<>(); map.put("tag", "*标识（I：新增，U：修改，D：删除）"); diff --git a/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java b/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java index 26d14989..aa457b2e 100644 --- a/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java +++ b/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java @@ -55,7 +55,7 @@ public class WindTurbinesPageService { stopWatch.start("获取风机页面数据"); SysEquipmentDto sysEquipmentDto = new SysEquipmentDto(); sysEquipmentDto.setObjectType(OBJECT_TYPE); - List sysEquipmentVos = sysEquipmentMapper.querySysEquipmentList(sysEquipmentDto); + List sysEquipmentVos = sysEquipmentMapper.queryEquipmentListInPage(sysEquipmentDto); //风机返回数据列表 List windTurbinesPageVos = new ArrayList<>(); List paramList = new ArrayList<>(); diff --git a/das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java b/das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java index 993082c8..bbd20792 100644 --- a/das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java +++ b/das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java @@ -27,6 +27,9 @@ public class HomeServiceImpl implements HomeService { @Autowired private DataService dataService; + //缺省风电场对象 + private SysEquipmentVo defaultWindFarm = null; + /** * 接口1： 首页风机矩阵数据 @@ -38,7 +41,7 @@ public class HomeServiceImpl implements HomeService { SysEquipmentDto sysEquipmentDto = new SysEquipmentDto(); sysEquipmentDto.setObjectType(EquipmentTypeIds.EQUIPMENT_TYPE_STATION_WTG); //获取所有风机设备 - List sysEquipmentVos = sysEquipmentMapper.querySysEquipmentList(sysEquipmentDto); + List sysEquipmentVos = sysEquipmentMapper.queryEquipmentListInPage(sysEquipmentDto); //风机返回数据列表 List homeWindRealTimeVoList = new ArrayList<>(); List paramList = new ArrayList<>(); @@ -98,10 +101,18 @@ public class HomeServiceImpl implements HomeService { Long windFarmId = windFarmRealDataDto.getWindFarmId(); //查询数据库中风电场设备，取第一个风电场 if (windFarmId == null) { - SysEquipmentDto sysEquipmentDto = new SysEquipmentDto(); - sysEquipmentDto.setObjectType(EquipmentTypeIds.EQUIPMENT_TYPE_WIND_FARM); - SysEquipmentVo sysEquipmentVo1 = sysEquipmentMapper.queryWindFarm(sysEquipmentDto); - windFarmId = sysEquipmentVo1.getId(); + if(defaultWindFarm ==null){ + SysEquipmentDto sysEquipmentDto = new SysEquipmentDto(); + sysEquipmentDto.setObjectType(EquipmentTypeIds.EQUIPMENT_TYPE_WIND_FARM); + List list = sysEquipmentMapper.queryEquipmentList(sysEquipmentDto); + defaultWindFarm = list.get(0); + } + + if(defaultWindFarm==null){ + throw new RuntimeException("系统中没有风电场台账信息"); + } + + windFarmId = defaultWindFarm.getId(); } List paramList = new ArrayList<>(); //构建需要查询的物模型属 性 diff --git a/das/src/main/resources/mapper/SysEquipmentMapper.xml b/das/src/main/resources/mapper/SysEquipmentMapper.xml index b035b922..9f018a07 100644 --- a/das/src/main/resources/mapper/SysEquipmentMapper.xml +++ b/das/src/main/resources/mapper/SysEquipmentMapper.xml @@ -64,7 +64,7 @@ - select t.* from sys_equipment t @@ -99,7 +99,7 @@ - select t.*,se."name" as parentEquipmentName,sim.iot_model_name as iotModelName, sim.iot_model_code, so."name" as orgName, so.mrid,se.code as parentEquipmentCode from sys_equipment t @@ -141,7 +141,7 @@ select se.id as irn,se.name,se.model,se.belong_line as belongLine, se.iot_model_id as modelId from sys_equipment se where se.object_type = #{objectType} order by se.name - select t.* from sys_equipment t @@ -167,7 +167,6 @@ order by t.name - limit 1