fix(重要提醒)：提醒内容为空时左侧不展示

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

@@ -130,6 +130,6 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     Set<Long> queryListByEqsAndStatus(@Param("records") Set<String> records, @Param("status") String status, @Param("applyNo") String applyNo);
 
 
-    Page<ReminderItemDto> queryForUnitVehiclePageForReminder(Page<?> page, @Param("records") List<String> records);
+    List<ReminderItemDto> queryForUnitVehiclePageForReminder(@Param("records") List<String> records);
 
 }

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

@@ -54,5 +54,5 @@ public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformat
 
     List<Map<String, Object>> getVehicleInfoOfPassWithEquId();
 
-    Page<ReminderItemDto> queryForUnitVehiclePageForReminder(Page<ReminderItemDto> page, List<String> records);
+    List<ReminderItemDto> queryUnitVehiclesForReminderList(List<String> records);
 }

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

@@ -1539,6 +1539,5 @@
         <foreach collection="records" item="record" open="(" close=")" separator=",">
             #{record}
         </foreach>
-        ORDER BY ri.REC_DATE DESC
     </select>
 </mapper>

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

@@ -351,7 +351,7 @@
           AND u.estate_unit_credit_code is not null
         ORDER BY u.audit_pass_date
     </select>
-    <select id="queryForUnitVehiclePageForReminder" resultType="com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto">
+    <select id="queryUnitVehiclesForReminderList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto">
         SELECT
         ri."PRODUCT_NAME" AS equipName,
         fi."FACTORY_NUM" AS equipNo,
@@ -363,6 +363,5 @@
         <foreach collection="records" item="record" open="(" close=")" separator=",">
             #{record}
         </foreach>
-        ORDER BY ri.REC_DATE DESC
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/editEquip/EditEquipReminderAdapter.java

@@ -30,14 +30,6 @@ public class EditEquipReminderAdapter extends DefaultReminder {
         this.editEquipParseService = editEquipParseService;
     }
 
-    @Override
-    public IPage<ReminderItemDto> realtimeParse(String bizId, Page<ReminderItemDto> page) {
-        ReminderItemDto reminderItemDto = setRealTimeReminderItem(bizId);
-        page.setRecords(Collections.singletonList(reminderItemDto));
-        page.setTotal(1L);
-        return page;
-    }
-
     private ReminderItemDto setRealTimeReminderItem(String bizId) {
         IdxBizJgRegisterInfo registerInfo = editEquipParseService.getIdxBizJgRegisterInfoService().getOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, bizId).select(IdxBizJgRegisterInfo::getRecord, IdxBizJgRegisterInfo::getProductName));
         ReminderItemDto reminderItemDto = new ReminderItemDto();
@@ -53,7 +45,7 @@ public class EditEquipReminderAdapter extends DefaultReminder {
     }
 
     @Override
-    public IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page) {
+    public List<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData) {
         IdxBizJgRegisterInfo registerInfo = JSON.parseObject(JSON.toJSONString(formData), IdxBizJgRegisterInfo.class);
         IdxBizJgUseInfo bizJgUseInfo = JSON.parseObject(JSON.toJSONString(formData), IdxBizJgUseInfo.class);
         ReminderItemDto reminderItemDto = new ReminderItemDto();
@@ -61,9 +53,7 @@ public class EditEquipReminderAdapter extends DefaultReminder {
         reminderItemDto.setEquipNo(bizJgUseInfo.getUseInnerCode());
         reminderItemDto.setEquipName(registerInfo.getProductName());
         reminderItemDto.setDetailData(formData);
-        page.setRecords(Collections.singletonList(reminderItemDto));
-        page.setTotal(1L);
-        return page;
+        return Collections.singletonList(reminderItemDto);
     }
 
     @Override

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/editProject/EditProjectReminderAdapter.java

@@ -29,11 +29,6 @@ public class EditProjectReminderAdapter extends DefaultReminder {
         this.editProjectParseService = editProjectParseService;
     }
 
-    @Override
-    protected IPage<ReminderItemDto> realtimeParse(String bizId, Page<ReminderItemDto> page) {
-        //  创建后，详情使用
-        return CommonReminderService.setProjectReminderItemPage(bizId, page, editProjectParseService.getIdxBizJgProjectContraptionServiceImpl());
-    }
 
     @Override
     protected List<ReminderItemDto> realtimeParse(String bizId) {
@@ -43,10 +38,10 @@ public class EditProjectReminderAdapter extends DefaultReminder {
 
 
     @Override
-    protected IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page) {
+    protected List<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData) {
         //  新增 + 编辑的保存使用
         IdxBizJgProjectContraption projectContraption = JSON.parseObject(JSON.toJSONString(formData), IdxBizJgProjectContraption.class);
-        return CommonReminderService.setProjectReminderItemPageJson(bizId, page, projectContraption);
+        return CommonReminderService.setProjectReminderItemPageJson(bizId, projectContraption);
     }
 
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/newEquip/NewEquipReminderAdapter.java

 package com.yeejoin.amos.boot.module.jg.biz.reminder.biz.newEquip;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.core.DefaultReminder;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
-import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.service.CommonReminderService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
@@ -16,6 +14,7 @@ import org.springframework.stereotype.Component;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+
 /**
  * 设备/气瓶创建编辑-提醒处理器
  */
@@ -30,19 +29,6 @@ public class NewEquipReminderAdapter extends DefaultReminder {
     }
 
     @Override
-    public IPage<ReminderItemDto> realtimeParse(String bizId, Page<ReminderItemDto> page) {
-        IdxBizJgRegisterInfo registerInfo = newEquipParseService.getIdxBizJgRegisterInfoService().getOneData(bizId);
-        ReminderItemDto reminderItemDto = new ReminderItemDto();
-        reminderItemDto.setEquipId(bizId);
-        reminderItemDto.setEquipNo(registerInfo.getEquCode());
-        reminderItemDto.setEquipName(registerInfo.getProductName());
-        reminderItemDto.setDetailData(newEquipParseService.getEquipDetailByRecord(bizId));
-        page.setRecords(Collections.singletonList(reminderItemDto));
-        page.setTotal(1L);
-        return page;
-    }
-
-    @Override
     protected List<ReminderItemDto> realtimeParse(String bizId) {
         IdxBizJgRegisterInfo registerInfo = newEquipParseService.getIdxBizJgRegisterInfoService().getOneData(bizId);
         ReminderItemDto reminderItemDto = new ReminderItemDto();
@@ -54,7 +40,7 @@ public class NewEquipReminderAdapter extends DefaultReminder {
     }
 
     @Override
-    public IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page) {
+    public List<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData) {
         IdxBizJgRegisterInfo registerInfo = CommonReminderService.geEquipInfoFromJson(formData, IdxBizJgRegisterInfo.class);
         IdxBizJgUseInfo bizJgUseInfo = CommonReminderService.geEquipInfoFromJson(formData, IdxBizJgUseInfo.class);
         ReminderItemDto reminderItemDto = new ReminderItemDto();
@@ -62,9 +48,7 @@ public class NewEquipReminderAdapter extends DefaultReminder {
         reminderItemDto.setEquipNo(bizJgUseInfo.getUseInnerCode());
         reminderItemDto.setEquipName(registerInfo.getProductName());
         reminderItemDto.setDetailData(newEquipParseService.getDetailInfoFromJson(formData));
-        page.setRecords(Collections.singletonList(reminderItemDto));
-        page.setTotal(1L);
-        return page;
+        return Collections.singletonList(reminderItemDto);
     }
 
     @Override

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/newProject/NewProjectReminderAdapter.java

 package com.yeejoin.amos.boot.module.jg.biz.reminder.biz.newProject;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.core.DefaultReminder;
@@ -30,12 +28,6 @@ public class NewProjectReminderAdapter extends DefaultReminder {
         this.newProjectParseService = newProjectParseService;
     }
 
-    @Override
-    protected IPage<ReminderItemDto> realtimeParse(String bizId, Page<ReminderItemDto> page) {
-        //  创建后，详情使用
-        return CommonReminderService.setProjectReminderItemPage(bizId, page, newProjectParseService.getIdxBizJgProjectContraptionServiceImpl());
-    }
-
 
     @Override
     protected List<ReminderItemDto> realtimeParse(String bizId) {
@@ -44,7 +36,7 @@ public class NewProjectReminderAdapter extends DefaultReminder {
     }
 
     @Override
-    protected IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page) {
+    protected List<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData) {
         //  新增 + 编辑的保存使用
         IdxBizJgProjectContraption projectContraption = CommonReminderService.geEquipInfoFromJson(formData, IdxBizJgProjectContraption.class);
         ReminderItemDto reminderItemDto = new ReminderItemDto();
@@ -52,9 +44,7 @@ public class NewProjectReminderAdapter extends DefaultReminder {
         reminderItemDto.setEquipNo(projectContraption.getProjectContraptionNo());
         reminderItemDto.setEquipName(projectContraption.getProjectContraption());
         reminderItemDto.setDetailData(BeanUtil.beanToMap(projectContraption));
-        page.setRecords(Collections.singletonList(reminderItemDto));
-        page.setTotal(1L);
-        return page;
+        return Collections.singletonList(reminderItemDto);
     }
 
     @Override

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/useRegister/UseRegisterReminderAdapter.java

@@ -4,14 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
-import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.vehicleInformation.VehicleInformationReminderAdapter;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.core.DefaultReminder;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.service.CommonReminderService;
@@ -24,7 +21,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -46,7 +43,8 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
     }
 
     @Override
-    public IPage<ReminderItemDto> realtimeParse(String bizId, Page<ReminderItemDto> page) {
+    public List<ReminderItemDto> realtimeParse(String bizId) {
+        List<ReminderItemDto> re = new ArrayList<>();
         //  创建后, 监管通过时使用
         JgUseRegistration useRegistration = useRegisterReminderParse.getJgUseRegistrationMapper().selectById(bizId);
         // 压力管道
@@ -58,8 +56,7 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
             reminderItemDto.setEquipNo(projectContraption.getProjectContraptionNo());
             reminderItemDto.setEquipName(projectContraption.getProjectContraption());
             reminderItemDto.setDetailData(this.buildProjectContraptionByStatus(useRegistration, useRegistration.getProjectContraptionId()));
-            page.setRecords(Collections.singletonList(reminderItemDto));
-            page.setTotal(1L);
+            re.add(reminderItemDto);
         }
         // 气瓶
         if (StringUtils.isEmpty(useRegistration.getProjectContraptionId()) && "unit".equals(useRegistration.getManageType())) {
@@ -67,8 +64,9 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
             lambda.eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr());
             lambda.select(JgUseRegistrationEq::getEquId);
             List<String> records = useRegisterReminderParse.getJgRelationEquipMapper().selectList(lambda).stream().map(JgUseRegistrationEq::getEquId).collect(Collectors.toList());
-            Page<ReminderItemDto> mapPage = useRegisterReminderParse.getJgUseRegistrationMapper().queryForUnitVehiclePageForReminder(page, records);
-            mapPage.getRecords().forEach(item -> item.setDetailData(this.buildSetUseDataByStatus(useRegistration, item.getEquipId())));
+            List<ReminderItemDto> itemDtoList = useRegisterReminderParse.getJgUseRegistrationMapper().queryForUnitVehiclePageForReminder(records);
+            itemDtoList.forEach(item -> item.setDetailData(this.buildSetUseDataByStatus(useRegistration, item.getEquipId())));
+            re.addAll(itemDtoList);
         }
         // 台套设备
         if (StringUtils.isEmpty(useRegistration.getManageType()) || "set".equals(useRegistration.getManageType())) {
@@ -86,49 +84,9 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
             reminderItemDto.setEquipNo(idxBizJgUseInfo.getUseInnerCode());
             reminderItemDto.setEquipName(registerInfo.getProductName());
             reminderItemDto.setDetailData(this.buildSetUseDataByStatus(useRegistration, record));
-            page.setRecords(Collections.singletonList(reminderItemDto));
-            page.setTotal(1L);
+            re.add(reminderItemDto);
         }
-        return page;
-    }
-
-    @Override
-    protected List<ReminderItemDto> realtimeParse(String bizId) {
-        // 创建后，评分使用
-        JgUseRegistration useRegistration = useRegisterReminderParse.getJgUseRegistrationMapper().selectById(bizId);
-        // todo 气瓶时不显示评分，在列表上显示
-        // 压力管道
-        if (StringUtils.isNotEmpty(useRegistration.getProjectContraptionId())) {
-            String projectContraptionId = useRegistration.getProjectContraptionId();
-            IdxBizJgProjectContraption projectContraption = useRegisterReminderParse.getIdxBizJgProjectContraptionServiceImpl().getById(projectContraptionId);
-            ReminderItemDto reminderItemDto = new ReminderItemDto();
-            reminderItemDto.setEquipId(projectContraptionId);
-            reminderItemDto.setEquipNo(projectContraption.getProjectContraptionNo());
-            reminderItemDto.setEquipName(projectContraption.getProjectContraption());
-            // 区分单据状态
-            reminderItemDto.setDetailData(this.buildProjectContraptionByStatus(useRegistration, useRegistration.getProjectContraptionId()));
-            return Collections.singletonList(reminderItemDto);
-        }
-
-        // 台套设备
-        if (StringUtils.isEmpty(useRegistration.getManageType()) || "set".equals(useRegistration.getManageType())) {
-            LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
-            lambda.eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr());
-            lambda.select(JgUseRegistrationEq::getEquId);
-            List<JgUseRegistrationEq> eqList = useRegisterReminderParse.getJgRelationEquipMapper().selectList(lambda);
-            String record = eqList.iterator().next().getEquId();
-            ReminderItemDto reminderItemDto = new ReminderItemDto();
-            IdxBizJgRegisterInfo registerInfo = useRegisterReminderParse.getIdxBizJgRegisterInfoMapper().selectOne(new LambdaQueryWrapper<IdxBizJgRegisterInfo>().eq(IdxBizJgRegisterInfo::getRecord, record)
-                    .select(IdxBizJgRegisterInfo::getRecord, IdxBizJgRegisterInfo::getProductName));
-            IdxBizJgUseInfo idxBizJgUseInfo = useRegisterReminderParse.getIdxBizJgUseInfoMapper().selectOne(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getRecord, record)
-                    .select(IdxBizJgUseInfo::getRecord, IdxBizJgUseInfo::getUseInnerCode));
-            reminderItemDto.setEquipId(record);
-            reminderItemDto.setEquipNo(idxBizJgUseInfo.getUseInnerCode());
-            reminderItemDto.setEquipName(registerInfo.getProductName());
-            reminderItemDto.setDetailData(this.buildSetUseDataByStatus(useRegistration, record));
-            return Collections.singletonList(reminderItemDto);
-        }
-        return Collections.emptyList();
+        return re;
     }
 
     private Map<String, Object> buildSetUseDataByStatus(JgUseRegistration useRegistration, String record) {
@@ -158,19 +116,21 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
     }
 
     @Override
-    public IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page) {
+    public List<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData) {
+        List<ReminderItemDto> re = new ArrayList<>();
         JSONObject data = getSummitDataFromJson(formData);
         String manageType = data.getString("manageType");
         if (StringUtils.isNotEmpty(manageType) && "unit".equals(manageType)) { // 单位办理方式
             String equListCode = data.getString("EQU_LIST_CODE");
-            // 气瓶--气瓶分页
+            // 气瓶--气瓶分页->调整为按照使用登记证维度（此处未修改，只是把规则表进行修改，防止后期又调整为按照气瓶进行缺项）
             if (CylinderTypeEnum.CYLINDER.getCode().equals(formData.get("EQU_CATEGORY_CODE"))) {
                 List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) data.get("equipmentLists");
                 List<String> records = equipmentLists.stream().map(item -> item.get("record").toString()).collect(Collectors.toList());
-                Page<ReminderItemDto> mapPage = useRegisterReminderParse.getJgUseRegistrationMapper().queryForUnitVehiclePageForReminder(page, records);
-                mapPage.getRecords().forEach(item -> {
+                List<ReminderItemDto> itemDtoList = useRegisterReminderParse.getJgUseRegistrationMapper().queryForUnitVehiclePageForReminder(records);
+                itemDtoList.forEach(item -> {
                     item.setDetailData(data);
                 });
+                re.addAll(itemDtoList);
             }
             // 压力管道--装置
             if (EquipmentClassifityEnum.YLGD.getCode().equals(equListCode)) {
@@ -181,8 +141,7 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
                 reminderItemDto.setEquipNo(projectContraption.getProjectContraptionNo());
                 reminderItemDto.setEquipName(projectContraption.getProjectContraption());
                 reminderItemDto.setDetailData(data);
-                page.setRecords(Collections.singletonList(reminderItemDto));
-                page.setTotal(1L);
+                re.add(reminderItemDto);
             }
         } else {                                                             // 台套方式
             String record = data.getString("equipId");
@@ -191,10 +150,9 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
             reminderItemDto.setEquipNo(data.getString("useInnerCode"));
             reminderItemDto.setEquipName(data.getString("productName"));
             reminderItemDto.setDetailData(data);
-            page.setRecords(Collections.singletonList(reminderItemDto));
-            page.setTotal(1L);
+            re.add(reminderItemDto);
         }
-        return page;
+        return re;
     }
 
     private static JSONObject getSummitDataFromJson(Map<String, Object> formData) {
@@ -203,7 +161,7 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
         if (formData.containsKey(notice)) { // 新增登记工作台发起
             data = JSONObject.parseObject(JSONObject.toJSONString(formData.get(notice)));
             data.put("regType", "0");
-        } else if (formData.containsKey(SECOND) ) { // 历史有证、无证登记
+        } else if (formData.containsKey(SECOND)) { // 历史有证、无证登记
             data = JSONObject.parseObject(JSONObject.toJSONString(formData.get(SECOND)));
             String regType = data.getString(KEY_REG_TYPE);
             data.put("regType", regType);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/biz/vehicleInformation/VehicleInformationReminderAdapter.java

@@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformationEq;
@@ -17,7 +15,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -39,24 +36,18 @@ public class VehicleInformationReminderAdapter extends DefaultReminder {
     }
 
     @Override
-    public IPage<ReminderItemDto> realtimeParse(String bizId, Page<ReminderItemDto> page) {
+    public List<ReminderItemDto> realtimeParse(String bizId) {
         //  创建后, 监管通过时使用
         JgVehicleInformation vehicleInformation = vehicleInformationReminderParse.getVehicleInformationMapper().selectById(bizId);
         LambdaQueryWrapper<JgVehicleInformationEq> lambda = new QueryWrapper<JgVehicleInformationEq>().lambda();
         lambda.eq(JgVehicleInformationEq::getVehicleId, vehicleInformation.getSequenceNbr());
         lambda.select(JgVehicleInformationEq::getEquId);
         List<String> records = vehicleInformationReminderParse.getVehicleInformationEqMapper().selectList(lambda).stream().map(JgVehicleInformationEq::getEquId).collect(Collectors.toList());
-        Page<ReminderItemDto> mapPage = vehicleInformationReminderParse.getVehicleInformationMapper().queryForUnitVehiclePageForReminder(page, records);
-        mapPage.getRecords().forEach(item -> item.setDetailData(this.buildCompareData(vehicleInformation, item.getEquipId())));
-        return page;
+        List<ReminderItemDto> itemDtoList = vehicleInformationReminderParse.getVehicleInformationMapper().queryUnitVehiclesForReminderList(records);
+        itemDtoList.forEach(item -> item.setDetailData(this.buildCompareData(vehicleInformation, item.getEquipId())));
+        return itemDtoList;
     }
 
-    @Override
-    protected List<ReminderItemDto> realtimeParse(String bizId) {
-        // 创建后，评分使用
-        // todo 气瓶时不显示评分，在列表上显示
-        return Collections.emptyList();
-    }
 
     private Map<String, Object> buildCompareData(JgVehicleInformation vehicleInformation, String record) {
         Map<String, Object> re = BeanUtil.beanToMap(vehicleInformation);
@@ -72,14 +63,14 @@ public class VehicleInformationReminderAdapter extends DefaultReminder {
 
 
     @Override
-    public IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page) {
+    public List<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData) {
         // 气瓶--气瓶分页
         JSONObject data = getSummitDataFromJson(formData);
         List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) data.get("equipmentLists");
         List<String> records = equipmentLists.stream().map(item -> item.get("record").toString()).collect(Collectors.toList());
-        Page<ReminderItemDto> mapPage = vehicleInformationReminderParse.getVehicleInformationMapper().queryForUnitVehiclePageForReminder(page, records);
-        mapPage.getRecords().forEach(item -> item.setDetailData(this.buildCompareData(data, item.getEquipId())));
-        return page;
+        List<ReminderItemDto> mapPage = vehicleInformationReminderParse.getVehicleInformationMapper().queryUnitVehiclesForReminderList(records);
+        mapPage.forEach(item -> item.setDetailData(this.buildCompareData(data, item.getEquipId())));
+        return mapPage;
     }
 
     private static JSONObject getSummitDataFromJson(Map<String, Object> formData) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/core/DefaultReminder.java

@@ -2,9 +2,9 @@ package com.yeejoin.amos.boot.module.jg.biz.reminder.core;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.biz.factory.GradeStrategyFactory;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
-import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
 import org.springframework.context.ApplicationContext;
 
 import java.util.List;
@@ -18,13 +18,13 @@ public abstract class DefaultReminder implements IReminderHandler {
     }
 
     @Override
-    public IPage<ReminderItemDto> remindersPage(Page<ReminderItemDto> page, String bizId, SourceType sourceType, Map<String, Object> formData) {
-        IPage<ReminderItemDto> params = parse(page, bizId, sourceType, formData);
+    public IPage<ReminderItemDto> getReminderList(Page<ReminderItemDto> page, String bizId, SourceType sourceType, Map<String, Object> formData) {
+        List<ReminderItemDto> params = parse(bizId, sourceType, formData);
         ReminderFieldDiff reminderFieldDiff = applicationContext.getBean(ReminderFieldDiff.class);
         MatchItemDto matchItemDto = setMatchItemBySourceType(sourceType, bizId, formData);
         matchItemDto.setBizType(supportBizType());
         matchItemDto.setPage(page);
-        return reminderFieldDiff.getReminderItemsPage(params, matchItemDto);
+        return reminderFieldDiff.getReminderItemsPage(params, page, matchItemDto);
     }
 
     private MatchItemDto setMatchItemBySourceType(SourceType sourceType, String bizId, Map<String, Object> formData) {
@@ -46,25 +46,17 @@ public abstract class DefaultReminder implements IReminderHandler {
         return strategyFactory.getStrategy(activeStrategy).calculateGrade(realtimeParse(bizId), matchItemDto);
     }
 
-    private IPage<ReminderItemDto> parse(Page<ReminderItemDto> page, String bizId, SourceType sourceType, Map<String, Object> formData) {
+    private List<ReminderItemDto> parse(String bizId, SourceType sourceType, Map<String, Object> formData) {
         switch (sourceType) {
             case realTime:
-                return realtimeParse(bizId, page);
+                return realtimeParse(bizId);
             case json:
-                return jsonParse(bizId, formData, page);
+                return jsonParse(bizId, formData);
             default:
                 throw new RuntimeException("no support type for " + sourceType);
         }
     }
 
-    /**
-     * 获取指定分页的设备、装置、单据下的设备、管道，详情使用
-     *
-     * @param bizId 唯一标识
-     * @return 分页的设备/管道
-     */
-    protected abstract IPage<ReminderItemDto> realtimeParse(String bizId, Page<ReminderItemDto> page);
-
 
     /**
      * 获取指定设备、装置、单据下的设备、管道列表-评分使用;台套-台套设备；气瓶-气瓶；装置-装置
@@ -80,10 +72,9 @@ public abstract class DefaultReminder implements IReminderHandler {
      *
      * @param bizId    唯一标识
      * @param formData 表单数据
-     * @param page     分页信息
      * @return 解析后的分页数据
      */
-    protected abstract IPage<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData, Page<ReminderItemDto> page);
+    protected abstract List<ReminderItemDto> jsonParse(String bizId, Map<String, Object> formData);
 
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/core/IReminderHandler.java

@@ -8,7 +8,7 @@ import java.util.Map;
 
 public interface IReminderHandler {
 
-    IPage<ReminderItemDto> remindersPage(Page<ReminderItemDto> page, String bizId, SourceType sourceType, Map<String, Object> formData);
+    IPage<ReminderItemDto> getReminderList(Page<ReminderItemDto> page, String bizId, SourceType sourceType, Map<String, Object> formData);
 
     Integer getReminderLevel(String bizId, String activeStrategy);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/core/ReminderFieldDiff.java

@@ -7,7 +7,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
 import java.util.List;
 
 public interface ReminderFieldDiff {
-    IPage<ReminderItemDto> getReminderItemsPage(IPage<ReminderItemDto> equips, MatchItemDto matchItem);
+    IPage<ReminderItemDto> getReminderItemsPage(List<ReminderItemDto> params, IPage<ReminderItemDto> equips, MatchItemDto matchItem);
 
     List<ReminderItemDto>  getReminderItemList(List<ReminderItemDto> equips, MatchItemDto matchItem);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/service/CommonReminderService.java

@@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import com.yeejoin.amos.boot.module.jg.api.dto.ReminderItemDto;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
@@ -82,19 +80,9 @@ public class CommonReminderService {
         matchItemDto.setEquDefine(registerInfo.getEquDefine());
     }
 
-    public static IPage<ReminderItemDto> setProjectReminderItemPage(String bizId, Page<ReminderItemDto> page, IdxBizJgProjectContraptionServiceImplService idxBizJgProjectContraptionServiceImpl) {
-        IdxBizJgProjectContraption projectContraption = idxBizJgProjectContraptionServiceImpl.getById(bizId);
-        return setProjectReminderItemPageJson(bizId, page, projectContraption);
-    }
-
     public static List<ReminderItemDto> setProjectReminderItemRealTime(String bizId, IdxBizJgProjectContraptionServiceImplService idxBizJgProjectContraptionServiceImpl) {
         IdxBizJgProjectContraption projectContraption = idxBizJgProjectContraptionServiceImpl.getById(bizId);
-        ReminderItemDto reminderItemDto = new ReminderItemDto();
-        reminderItemDto.setEquipId(bizId);
-        reminderItemDto.setEquipNo(projectContraption.getProjectContraptionNo());
-        reminderItemDto.setEquipName(projectContraption.getProjectContraption());
-        reminderItemDto.setDetailData(BeanUtil.beanToMap(projectContraption));
-        return Collections.singletonList(reminderItemDto);
+        return setProjectReminderItemPageJson(bizId, projectContraption);
     }
 
     public static MatchItemDto setMatchItemForProject(MatchItemDto matchItemDto, IdxBizJgProjectContraption projectContraption) {
@@ -123,15 +111,13 @@ public class CommonReminderService {
         return re;
     }
 
-    public static IPage<ReminderItemDto> setProjectReminderItemPageJson(String bizId, Page<ReminderItemDto> page, IdxBizJgProjectContraption projectContraption) {
+    public static List<ReminderItemDto> setProjectReminderItemPageJson(String bizId, IdxBizJgProjectContraption projectContraption) {
         ReminderItemDto reminderItemDto = new ReminderItemDto();
         reminderItemDto.setEquipId(bizId);
         reminderItemDto.setEquipNo(projectContraption.getProjectContraptionNo());
         reminderItemDto.setEquipName(projectContraption.getProjectContraption());
         reminderItemDto.setDetailData(BeanUtil.beanToMap(projectContraption));
-        page.setRecords(Collections.singletonList(reminderItemDto));
-        page.setTotal(1L);
-        return page;
+        return Collections.singletonList(reminderItemDto);
     }
 
     public void setEquCateInfoForEdit(String record, MatchItemDto matchItemDto) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/service/RemindServiceImpl.java

@@ -22,7 +22,7 @@ public class RemindServiceImpl {
     private final ReminderFactory reminderFactory;
 
     public IPage<ReminderItemDto> getReminderItems(Page<ReminderItemDto> page, String bizId, String bizType, IReminderHandler.SourceType sourceType, Map<String, Object> formData) {
-        return reminderFactory.getReminderHandler(bizType).remindersPage(page, StringUtils.isEmpty(bizId) ? null : bizId, sourceType, formData);
+        return reminderFactory.getReminderHandler(bizType).getReminderList(page, StringUtils.isEmpty(bizId) ? null : bizId, sourceType, formData);
     }
 
     public Integer getReminderLevel(String bizId, String bizType) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/reminder/service/ReminderFieldDiffImpl.java

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.TzsJgColumnReminderRule;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.core.ReminderFieldDiff;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.dto.MatchItemDto;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.TzsJgColumnReminderRuleServiceImpl;
+import com.yeejoin.amos.boot.module.jg.biz.utils.MemoryPageUtils;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -26,11 +27,12 @@ public class ReminderFieldDiffImpl implements ReminderFieldDiff {
     private final TzsJgColumnReminderRuleServiceImpl reminderRuleService;
 
     @Override
-    public IPage<ReminderItemDto> getReminderItemsPage(IPage<ReminderItemDto> page, MatchItemDto matchItem) {
-        page.getRecords().forEach(reminderItemDto -> {
+    public IPage<ReminderItemDto> getReminderItemsPage(List<ReminderItemDto> reminderItemDtos, IPage<ReminderItemDto> page, MatchItemDto matchItem) {
+        reminderItemDtos.forEach(reminderItemDto -> {
             reminderItemDto.setItems(this.buildRemindItem(reminderItemDto, matchItem));
         });
-        return page;
+        List<ReminderItemDto> itemDtoListMissing = reminderItemDtos.stream().filter(item -> !item.getItems().isEmpty()).collect(Collectors.toList());
+        return MemoryPageUtils.paginate(itemDtoListMissing, page.getCurrent(), page.getSize());
     }
 
     @Override

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/utils/MemoryPageUtils.java

+package com.yeejoin.amos.boot.module.jg.biz.utils;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.Comparator;
+import java.util.List;
+
+public class MemoryPageUtils {
+
+    /**
+     * 内存分页（支持排序）
+     *
+     * @param dataList   数据列表
+     * @param current    当前页（从1开始）
+     * @param size       每页大小
+     * @param comparator 排序规则（可选，传null表示不排序）
+     */
+    public static <T> IPage<T> paginate(List<T> dataList, long current, long size, Comparator<T> comparator) {
+        // 1. 参数校验
+        if (current < 1 || size <= 0) {
+            throw new IllegalArgumentException("分页参数错误：current >= 1 && size > 0");
+        }
+
+        // 2. 避免空指针
+        if (dataList == null || dataList.isEmpty()) {
+            return new Page<>(current, size, 0);
+        }
+
+        // 3. 排序（如果传入了comparator）
+        if (comparator != null) {
+            dataList.sort(comparator);
+        }
+
+        // 4. 计算分页区间
+        long total = dataList.size();
+        long fromIndex = (current - 1) * size;
+        if (fromIndex >= total) {
+            return new Page<>(current, size, total); // 超出范围返回空页
+        }
+
+        // 5. 手动分页
+        List<T> pageRecords = dataList.subList(
+                (int) fromIndex,
+                (int) Math.min(fromIndex + size, total)
+        );
+
+        // 6. 构造IPage对象
+        IPage<T> page = new Page<>(current, size, total);
+        page.setRecords(pageRecords);
+        return page;
+    }
+
+    // 简化版（不排序）
+    public static <T> IPage<T> paginate(List<T> dataList, long current, long size) {
+        return paginate(dataList, current, size, null);
+    }
+}