优化气瓶消息预警接口

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/ScheduleMapper.java

 package com.yeejoin.amos.boot.module.tzs.api.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tzs.api.dto.EquScheduleDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.LicScheduleDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInfoDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
 
 public interface ScheduleMapper {
     EquScheduleDto getEquDetail(String sequenceCode);
@@ -10,4 +13,6 @@ public interface ScheduleMapper {
     LicScheduleDto getLicDetail(String certNo);
 
     CylinderInfoDto getCylDetail(String sequenceCode);
+
+    Page<CylinderInfo> cylinderInfoPage(Page<CylinderInfo> page);
 }

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/ScheduleMapper.xml

@@ -58,4 +58,10 @@
             ci.sequence_code = #{sequenceCode}
     </select>
 
+    <select id="cylinderInfoPage" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo">
+        SELECT ci.sequence_nbr,ci.sequence_code
+        FROM tz_cylinder_inspection ip
+                 LEFT JOIN tz_cylinder_info ci ON ip.sequence_code = ci.sequence_code
+    </select>
+
 </mapper>

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/ScheduleService.java

@@ -86,9 +86,9 @@ public class ScheduleService {
             Page<CylinderInfo> cylPage = new Page<>();
             cylPage.setCurrent(i);
             cylPage.setSize(size);
-            LambdaQueryWrapper<CylinderInfo> cylWrapper = new LambdaQueryWrapper<>();
-            cylWrapper.select(CylinderInfo::getSequenceCode, CylinderInfo::getSequenceNbr).orderByDesc(CylinderInfo::getSequenceNbr);
-            IPage<CylinderInfo> cylresult = cylinderInfoService.page(cylPage, cylWrapper);
+//            LambdaQueryWrapper<CylinderInfo> cylWrapper = new LambdaQueryWrapper<>();
+//            cylWrapper.select(CylinderInfo::getSequenceCode, CylinderInfo::getSequenceNbr).orderByDesc(CylinderInfo::getSequenceNbr);
+            IPage<CylinderInfo> cylresult = scheduleMapper.cylinderInfoPage(cylPage);
             for (CylinderInfo r : cylresult.getRecords()) {
                 // 设置token
                 tzsAuthService.setRequestContext();