feat(综合搜索)：增量数据同步调整

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

@@ -47,7 +47,7 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
         List<ReminderItemDto> re = new ArrayList<>();
         //  创建后, 监管通过时使用
         JgUseRegistration useRegistration = useRegisterReminderParse.getJgUseRegistrationMapper().selectById(bizId);
-        // 压力管道
+        // 压力管道- 左侧设备类别以装置为维度
         if (StringUtils.isNotEmpty(useRegistration.getProjectContraptionId())) {
             String projectContraptionId = useRegistration.getProjectContraptionId();
             IdxBizJgProjectContraption projectContraption = useRegisterReminderParse.getIdxBizJgProjectContraptionServiceImpl().getById(projectContraptionId);
@@ -58,7 +58,7 @@ public class UseRegisterReminderAdapter extends DefaultReminder {
             reminderItemDto.setDetailData(this.buildProjectContraptionByStatus(useRegistration, useRegistration.getProjectContraptionId()));
             re.add(reminderItemDto);
         }
-        // 气瓶
+        // 气瓶-左侧以气瓶为维度
         if (StringUtils.isEmpty(useRegistration.getProjectContraptionId()) && "unit".equals(useRegistration.getManageType())) {
             LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
             lambda.eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr());

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

@@ -59,7 +59,7 @@ public abstract class DefaultReminder implements IReminderHandler {
 
 
     /**
-     * 获取指定设备、装置、单据下的设备、管道列表-评分使用;台套-台套设备；气瓶-气瓶；装置-装置
+     * 获取指定设备、装置、单据下的设备、管道列表-评分使用;台套-台套设备；气瓶-气瓶；管道-装置
      *
      * @param bizId 唯一标识
      * @return 设备/管道列表

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -427,12 +428,12 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         List<JgUseRegistrationManage> jgUseRegistrationManageList = this.baseMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
                 .in(JgUseRegistrationManage::getSequenceNbr, sequenceNbrList)
                 .eq(JgUseRegistrationManage::getIsDelete, 0)
-                .select(JgUseRegistrationManage::getUseRegistrationCode));
+                .select(JgUseRegistrationManage::getUseRegistrationCode, BaseEntity::getSequenceNbr));
         if (ValidationUtil.isEmpty(jgUseRegistrationManageList)) {
             return new ArrayList<>();
         }
         // List<JSONObject> result = new ArrayList<>();
-        Set<String> useOrgCodes = jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getUseRegistrationCode).collect(Collectors.toSet());
+        Set<String> useOrgCodes = jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getUseRegistrationCode).filter(org.apache.commons.lang3.StringUtils::isNotEmpty).collect(Collectors.toSet());
 
         // es中通过查询【使用登记证编号】所有设备
         // SearchRequest request = new SearchRequest("idx_biz_view_jg_all");
@@ -534,7 +535,8 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     public Page<JSONObject> queryEquForPageByCertificateSeqList(String enableType, List<Long> sequenceNbrList, int current, int size) {
         List<JgUseRegistrationManage> jgUseRegistrationManageList = this.baseMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
                 .in(JgUseRegistrationManage::getSequenceNbr, sequenceNbrList)
-                .eq(JgUseRegistrationManage::getIsDelete, 0));
+                .eq(JgUseRegistrationManage::getIsDelete, 0)
+                .select(JgUseRegistrationManage::getUseRegistrationCode, BaseEntity::getSequenceNbr));
         if (ValidationUtil.isEmpty(jgUseRegistrationManageList)) {
             return new Page<>();
         }
@@ -543,7 +545,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         long totle = 0;
 
         Page<JSONObject> result = new Page<>(Optional.of(current).orElse(1), Optional.of(size).orElse(10));
-        Set<String> useOrgCodes = jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getUseRegistrationCode).collect(Collectors.toSet());
+        Set<String> useOrgCodes = jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getUseRegistrationCode).filter(org.apache.commons.lang3.StringUtils::isNotEmpty).collect(Collectors.toSet());
 
         // es中通过查询【使用登记证编号】所有设备
         SearchRequest request = new SearchRequest("idx_biz_view_jg_all");