修改设备列表查询接口和首页后端api代码

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<SysEquipment, SysEquipment> {
-
+    /**
-    IPage<SysEquipmentVo> querySysEquipmentList(IPage<SysEquipmentVo> page, @Param("info") SysEquipmentDto sysEquipmentDto);
+     * 分页查询设备列表
+     * @param page 分页信息
+     * @param sysEquipmentDto 查询条件
+     * @return 返回值
+     */
+    IPage<SysEquipmentVo> queryEquipmentListInPage(IPage<SysEquipmentVo> page, @Param("info") SysEquipmentDto sysEquipmentDto);
 
     /**
      * 查询根设备列表
@@ -25,7 +28,12 @@ public interface SysEquipmentMapper extends BaseMapperPlus<SysEquipment, SysEqui
      */
     List<SysEquipmentVo> queryRootEquipments();
 
-    List<SysEquipmentExcel> queryInfoById (@Param("info") SysEquipmentDto sysEquipmentDto);
+    /**
+     * 导出设备信息
+     * @param sysEquipmentDto 查询条件
+     * @return SysEquipmentExcel 列表
+     */
+    List<SysEquipmentExcel> queryExportExcelInfo(@Param("info") SysEquipmentDto sysEquipmentDto);
 
     Long queryChildEquipmentCount(@Param("id")Long id);
 
@@ -37,9 +45,14 @@ public interface SysEquipmentMapper extends BaseMapperPlus<SysEquipment, SysEqui
 
     List<String> queryBelongLines(@Param("objectType") Long objectType);
 
-    List<SysEquipmentVo> querySysEquipmentList(@Param("info") SysEquipmentDto sysEquipmentDto);
+    List<SysEquipmentVo> queryEquipmentListInPage(@Param("info") SysEquipmentDto sysEquipmentDto);
 
-    SysEquipmentVo  queryWindFarm(@Param("info") SysEquipmentDto sysEquipmentDto);
+    /**
+     * 查询设备列表
+     * @param sysEquipmentDto 查询条件
+     * @return
+     */
+    List<SysEquipmentVo>  queryEquipmentList(@Param("info") SysEquipmentDto sysEquipmentDto);
 
 
 }

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<SysEquipmentVo> iPage = sysEquipmentMapper.querySysEquipmentList(pageQuery.build(), sysEquipmentDto);
+        IPage<SysEquipmentVo> 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<SysEquipmentExcel> sysEquipmentList = sysEquipmentMapper.queryInfoById(sysEquipmentDto);
+        List<SysEquipmentExcel> sysEquipmentList = sysEquipmentMapper.queryExportExcelInfo(sysEquipmentDto);
         //自定义别名 别名的key和实体类中的名称要对应上！！
         LinkedHashMap<String, String> map = new LinkedHashMap<>();
         map.put("tag", "*标识（I：新增，U：修改，D：删除）");

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<SysEquipmentVo> sysEquipmentVos = sysEquipmentMapper.querySysEquipmentList(sysEquipmentDto);
+        List<SysEquipmentVo> sysEquipmentVos = sysEquipmentMapper.queryEquipmentListInPage(sysEquipmentDto);
         //风机返回数据列表
         List<WindTurbinesPageVo> windTurbinesPageVos = new ArrayList<>();
         List<SnapshotValueQueryParam> paramList = new ArrayList<>();

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<SysEquipmentVo> sysEquipmentVos = sysEquipmentMapper.querySysEquipmentList(sysEquipmentDto);
+        List<SysEquipmentVo> sysEquipmentVos = sysEquipmentMapper.queryEquipmentListInPage(sysEquipmentDto);
         //风机返回数据列表
         List<HomeWindTurbineMatrixDataVoVo> homeWindRealTimeVoList = new ArrayList<>();
         List<SnapshotValueQueryParam> paramList = new ArrayList<>();
@@ -98,10 +101,18 @@ public class HomeServiceImpl implements HomeService {
         Long windFarmId = windFarmRealDataDto.getWindFarmId();
         //查询数据库中风电场设备，取第一个风电场
         if (windFarmId == null) {
-            SysEquipmentDto sysEquipmentDto = new SysEquipmentDto();
+            if(defaultWindFarm ==null){
-            sysEquipmentDto.setObjectType(EquipmentTypeIds.EQUIPMENT_TYPE_WIND_FARM);
+                SysEquipmentDto sysEquipmentDto = new SysEquipmentDto();
-            SysEquipmentVo sysEquipmentVo1 = sysEquipmentMapper.queryWindFarm(sysEquipmentDto);
+                sysEquipmentDto.setObjectType(EquipmentTypeIds.EQUIPMENT_TYPE_WIND_FARM);
-            windFarmId = sysEquipmentVo1.getId();
+                List<SysEquipmentVo> list = sysEquipmentMapper.queryEquipmentList(sysEquipmentDto);
+                defaultWindFarm = list.get(0);
+            }
+
+            if(defaultWindFarm==null){
+                throw new RuntimeException("系统中没有风电场台账信息");
+            }
+
+            windFarmId = defaultWindFarm.getId();
         }
         List<SnapshotValueQueryParam> paramList = new ArrayList<>();
         //构建需要查询的物模型属                                                                                                                                                                                                                性

das/src/main/resources/mapper/SysEquipmentMapper.xml

@@ -64,7 +64,7 @@
 
     </resultMap>
 
-    <select id="querySysEquipmentList" resultMap="SysEquipmentMap">
+    <select id="queryEquipmentListInPage" resultMap="SysEquipmentMap">
         select t.* from sys_equipment t
         <where>
             <if test="info.iotModelId != null and info.iotModelId != ''">
@@ -99,7 +99,7 @@
     </select>
 
 
-    <select id="queryInfoById" resultMap="SysEquipmentExcelMap">
+    <select id="queryExportExcelInfo" resultMap="SysEquipmentExcelMap">
         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>
 
-    <select id="queryWindFarm" resultMap="SysEquipmentMap">
+    <select id="queryEquipmentList" resultMap="SysEquipmentMap">
         select t.* from sys_equipment t
         <where>
             <if test="info.iotModelId != null and info.iotModelId != ''">
@@ -167,7 +167,6 @@
             </if>
         </where>
         order by t.name
-        limit 1
     </select>
 
 </mapper>