feat(综合搜索)：增量更新

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dao/EsUserInfoDao.java

@@ -6,4 +6,5 @@ import org.springframework.stereotype.Repository;
 
 @Repository
 public interface EsUserInfoDao extends PagingAndSortingRepository<EsUserInfo, String> {
+    void deleteAllByUnitCode(String useCode);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/refresh/handler/EquipRefreshHandler.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsDataRefreshMessage;
 import com.yeejoin.amos.boot.module.common.api.service.IDataRefreshHandler;
+import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.jg.biz.refresh.StatisticsDataUpdateService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgInspectionDetectionInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgDesignInfoServiceImpl;
@@ -52,36 +53,45 @@ public class EquipRefreshHandler implements IDataRefreshHandler {
     @Override
     public void doRefresh(TzsDataRefreshMessage message) {
         log.info("3库数据，设备开始刷库：唯一标识：{}", message.getDataId());
-        String record = message.getDataId();
-        ESEquipmentInfo esEquipmentInfo = new ESEquipmentInfo();
-        Map<String, Object> map = categoryOtherInfoMapper.selectDataById(record);
-        ESEquipmentCategoryDto categoryEs = JSON.parseObject(toJSONString(map), ESEquipmentCategoryDto.class);
-        BeanUtil.copyProperties(categoryEs, esEquipmentInfo);
-        IdxBizJgUseInfo useInfo = useInfoService.getOne(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getRecord, record).select(IdxBizJgUseInfo::getRecord, IdxBizJgUseInfo::getCreateDate));
-        IdxBizJgDesignInfo designInfo = idxBizJgDesignInfoServiceImpl.getOne(new LambdaQueryWrapper<IdxBizJgDesignInfo>()
-                .eq(IdxBizJgDesignInfo::getRecord, record)
-                .select(IdxBizJgDesignInfo::getRecord, IdxBizJgDesignInfo::getDesignUnitName, IdxBizJgDesignInfo::getDesignUnitCreditCode));
-        IdxBizJgFactoryInfo factoryInfo = factoryInfoService.getOne(new LambdaQueryWrapper<IdxBizJgFactoryInfo>()
-                .eq(IdxBizJgFactoryInfo::getRecord, record)
-                .select(IdxBizJgFactoryInfo::getRecord, IdxBizJgFactoryInfo::getProduceUnitCreditCode));
-        IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(record);
-        IdxBizJgMaintenanceRecordInfo lastMaintenanceRecordInfo = maintenanceRecordInfoService.queryNewestDetailByRecord(record);
-        try {
-            esEquipmentInfo.setINSPECT_DATE(inspectionDetectionInfo.getSequenceNbr() != null ? inspectionDetectionInfo.getInspectDate() != null ? inspectionDetectionInfo.getInspectDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate() : null :null);
-            esEquipmentInfo.setNEXT_INSPECT_DATE(inspectionDetectionInfo.getSequenceNbr() != null ? inspectionDetectionInfo.getNextInspectDate() != null ? inspectionDetectionInfo.getNextInspectDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()  : null :null);
-            esEquipmentInfo.setCreateDate(useInfo.getCreateDate() != null ? useInfo.getCreateDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime() : null);
-        } catch (Exception e) {
-            log.error("时区转换失败：{}", record, e);
+        switch (DataRefreshEvent.Operation.valueOf(message.getOperation())){
+            case DELETE:
+                esEquipmentDao.deleteById(message.getDataId());
+            case INSERT:
+            case UPDATE:
+                String record = message.getDataId();
+                ESEquipmentInfo esEquipmentInfo = new ESEquipmentInfo();
+                Map<String, Object> map = categoryOtherInfoMapper.selectDataById(record);
+                ESEquipmentCategoryDto categoryEs = JSON.parseObject(toJSONString(map), ESEquipmentCategoryDto.class);
+                BeanUtil.copyProperties(categoryEs, esEquipmentInfo);
+                IdxBizJgUseInfo useInfo = useInfoService.getOne(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getRecord, record).select(IdxBizJgUseInfo::getRecord, IdxBizJgUseInfo::getCreateDate));
+                IdxBizJgDesignInfo designInfo = idxBizJgDesignInfoServiceImpl.getOne(new LambdaQueryWrapper<IdxBizJgDesignInfo>()
+                        .eq(IdxBizJgDesignInfo::getRecord, record)
+                        .select(IdxBizJgDesignInfo::getRecord, IdxBizJgDesignInfo::getDesignUnitName, IdxBizJgDesignInfo::getDesignUnitCreditCode));
+                IdxBizJgFactoryInfo factoryInfo = factoryInfoService.getOne(new LambdaQueryWrapper<IdxBizJgFactoryInfo>()
+                        .eq(IdxBizJgFactoryInfo::getRecord, record)
+                        .select(IdxBizJgFactoryInfo::getRecord, IdxBizJgFactoryInfo::getProduceUnitCreditCode));
+                IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(record);
+                IdxBizJgMaintenanceRecordInfo lastMaintenanceRecordInfo = maintenanceRecordInfoService.queryNewestDetailByRecord(record);
+                try {
+                    esEquipmentInfo.setINSPECT_DATE(inspectionDetectionInfo.getSequenceNbr() != null ? inspectionDetectionInfo.getInspectDate() != null ? inspectionDetectionInfo.getInspectDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate() : null :null);
+                    esEquipmentInfo.setNEXT_INSPECT_DATE(inspectionDetectionInfo.getSequenceNbr() != null ? inspectionDetectionInfo.getNextInspectDate() != null ? inspectionDetectionInfo.getNextInspectDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()  : null :null);
+                    esEquipmentInfo.setCreateDate(useInfo.getCreateDate() != null ? useInfo.getCreateDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime() : null);
+                } catch (Exception e) {
+                    log.error("时区转换失败：{}", record, e);
+                }
+                esEquipmentInfo.setDesignUnitCreditCode(designInfo.getDesignUnitCreditCode());
+                esEquipmentInfo.setMAINTAIN_UNIT(lastMaintenanceRecordInfo.getMeUnitCreditCode());
+                esEquipmentInfo.setMAINTAIN_UNIT_NAME(lastMaintenanceRecordInfo.getMeUnitName());
+                esEquipmentInfo.setDesignUnitName(designInfo.getDesignUnitName());
+                esEquipmentInfo.setProduceUnitCreditCode(factoryInfo.getProduceUnitCreditCode());
+                esEquipmentInfo.setInspections(inspectionDetectionInfo.getSequenceNbr() != null ? Collections.singletonList(BeanUtil.copyProperties(inspectionDetectionInfo, ESEquipmentInfo.Inspection.class)) : new ArrayList<>());
+                esEquipmentInfo.setMaintenances(lastMaintenanceRecordInfo.getSequenceNbr() != null ? Collections.singletonList(BeanUtil.copyProperties(lastMaintenanceRecordInfo, ESEquipmentInfo.Maintenance.class)) : new ArrayList<>());
+                esEquipmentInfo.setTechParams(this.buildTechParamByEquList(record, categoryEs.getEQU_LIST_CODE()));
+                esEquipmentDao.save(esEquipmentInfo);
+                break;
+            default:
+                log.error("uno operation: {}",message.getOperation());
         }
-        esEquipmentInfo.setDesignUnitCreditCode(designInfo.getDesignUnitCreditCode());
-        esEquipmentInfo.setMAINTAIN_UNIT(lastMaintenanceRecordInfo.getMeUnitCreditCode());
-        esEquipmentInfo.setMAINTAIN_UNIT_NAME(lastMaintenanceRecordInfo.getMeUnitName());
-        esEquipmentInfo.setDesignUnitName(designInfo.getDesignUnitName());
-        esEquipmentInfo.setProduceUnitCreditCode(factoryInfo.getProduceUnitCreditCode());
-        esEquipmentInfo.setInspections(inspectionDetectionInfo.getSequenceNbr() != null ? Collections.singletonList(BeanUtil.copyProperties(inspectionDetectionInfo, ESEquipmentInfo.Inspection.class)) : new ArrayList<>());
-        esEquipmentInfo.setMaintenances(lastMaintenanceRecordInfo.getSequenceNbr() != null ? Collections.singletonList(BeanUtil.copyProperties(lastMaintenanceRecordInfo, ESEquipmentInfo.Maintenance.class)) : new ArrayList<>());
-        esEquipmentInfo.setTechParams(this.buildTechParamByEquList(record, categoryEs.getEQU_LIST_CODE()));
-        esEquipmentDao.save(esEquipmentInfo);
     }
 
     private List<ESEquipmentInfo.TechParam> buildTechParamByEquList(String record, String equListCode) {

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/EnterpriseRefreshHandler.java

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.EsBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.common.api.entity.EsUserInfo;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsDataRefreshMessage;
 import com.yeejoin.amos.boot.module.common.api.service.IDataRefreshHandler;
+import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.common.biz.utils.RefreshDataUtils;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseUnitLicence;
@@ -46,30 +47,42 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
     @Override
     public void doRefresh(TzsDataRefreshMessage message) {
         log.info("3库数据，企业开始刷库：唯一标识：{}", message.getDataId());
-        // 企业信息更新
         TzBaseEnterpriseInfo enterpriseInfo = tzBaseEnterpriseInfoMapper.selectById(message.getDataId());
-        EsBaseEnterpriseInfo esBaseEnterpriseInfo = new EsBaseEnterpriseInfo();
-        BeanUtil.copyProperties(enterpriseInfo, esBaseEnterpriseInfo);
-        esBaseEnterpriseInfo.setSequenceNbr(enterpriseInfo.getSequenceNbr() + "");
-        esBaseEnterpriseInfo.setEquipCategory(RefreshDataUtils.castStrList2String(enterpriseInfo.getEquipCategory()));
-        List<TzBaseUnitLicence> unitLicences = licenceMapper.selectList(new LambdaQueryWrapper<TzBaseUnitLicence>().eq(TzBaseUnitLicence::getUnitCode, enterpriseInfo.getUseUnitCode()).eq(TzBaseUnitLicence::getIsDelete, false));
-        List<EsBaseEnterpriseInfo.License> licenses = unitLicences.stream().map(lis -> {
-            EsBaseEnterpriseInfo.License esLicense = new EsBaseEnterpriseInfo.License();
-            BeanUtil.copyProperties(lis, esLicense);
-            return esLicense;
-        }).collect(Collectors.toList());
-        esBaseEnterpriseInfo.setLicenses(licenses);
-        enterpriseInfoDao.save(esBaseEnterpriseInfo);
-        // 人员更新冗余的单位信息
-        List<TzsUserInfo> userOfOneUnit = userInfoMapper.selectList(new LambdaQueryWrapper<TzsUserInfo>().eq(TzsUserInfo::getUnitCode, enterpriseInfo.getUseUnitCode()).eq(BaseEntity::getIsDelete, false).select(BaseEntity::getSequenceNbr));
-        Iterable<EsUserInfo> userInfosEs = esUserInfoDao.findAllById(userOfOneUnit.stream().map(u -> String.valueOf(u.getSequenceNbr())).collect(Collectors.toList()));
-        userInfosEs.forEach(esUserInfo -> {
-            esUserInfo.setUnitType(esBaseEnterpriseInfo.getUnitType());
-            esUserInfo.setSuperviseOrgName(esBaseEnterpriseInfo.getSuperviseOrgName());
-            esUserInfo.setSuperviseOrgCode(esBaseEnterpriseInfo.getSuperviseOrgCode());
-        });
-        if (userInfosEs.iterator().hasNext()) {
-            esUserInfoDao.saveAll(userInfosEs);
+        switch (DataRefreshEvent.Operation.valueOf(message.getOperation())) {
+            case DELETE:
+                enterpriseInfoDao.deleteById(message.getDataId());
+                esUserInfoDao.deleteAllByUnitCode(enterpriseInfo.getUseCode());
+                break;
+            case INSERT:
+            case UPDATE:
+                // 企业信息更新
+                EsBaseEnterpriseInfo esBaseEnterpriseInfo = new EsBaseEnterpriseInfo();
+                BeanUtil.copyProperties(enterpriseInfo, esBaseEnterpriseInfo);
+                esBaseEnterpriseInfo.setSequenceNbr(enterpriseInfo.getSequenceNbr() + "");
+                esBaseEnterpriseInfo.setEquipCategory(RefreshDataUtils.castStrList2String(enterpriseInfo.getEquipCategory()));
+                List<TzBaseUnitLicence> unitLicences = licenceMapper.selectList(new LambdaQueryWrapper<TzBaseUnitLicence>().eq(TzBaseUnitLicence::getUnitCode, enterpriseInfo.getUseUnitCode()).eq(TzBaseUnitLicence::getIsDelete, false));
+                List<EsBaseEnterpriseInfo.License> licenses = unitLicences.stream().map(lis -> {
+                    EsBaseEnterpriseInfo.License esLicense = new EsBaseEnterpriseInfo.License();
+                    BeanUtil.copyProperties(lis, esLicense);
+                    return esLicense;
+                }).collect(Collectors.toList());
+                esBaseEnterpriseInfo.setLicenses(licenses);
+                enterpriseInfoDao.save(esBaseEnterpriseInfo);
+                // 人员更新冗余的单位信息
+                List<TzsUserInfo> userOfOneUnit = userInfoMapper.selectList(new LambdaQueryWrapper<TzsUserInfo>().eq(TzsUserInfo::getUnitCode, enterpriseInfo.getUseUnitCode()).eq(BaseEntity::getIsDelete, false).select(BaseEntity::getSequenceNbr));
+                Iterable<EsUserInfo> userInfosEs = esUserInfoDao.findAllById(userOfOneUnit.stream().map(u -> String.valueOf(u.getSequenceNbr())).collect(Collectors.toList()));
+                userInfosEs.forEach(esUserInfo -> {
+                    esUserInfo.setUnitType(esBaseEnterpriseInfo.getUnitType());
+                    esUserInfo.setSuperviseOrgName(esBaseEnterpriseInfo.getSuperviseOrgName());
+                    esUserInfo.setSuperviseOrgCode(esBaseEnterpriseInfo.getSuperviseOrgCode());
+                });
+                if (userInfosEs.iterator().hasNext()) {
+                    esUserInfoDao.saveAll(userInfosEs);
+                }
+                break;
+            default:
+                log.error("uno operation: {}", message.getOperation());
+                break;
         }
     }
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/UserRefreshHandler.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.common.api.dao.EsUserInfoDao;
 import com.yeejoin.amos.boot.module.common.api.entity.EsUserInfo;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsDataRefreshMessage;
 import com.yeejoin.amos.boot.module.common.api.service.IDataRefreshHandler;
+import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.common.biz.utils.RefreshDataUtils;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
@@ -16,7 +17,6 @@ import com.yeejoin.amos.boot.module.tcm.biz.refresh.CommonRefreshService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StopWatch;
 
 @Component
 @Slf4j
@@ -40,27 +40,36 @@ public class UserRefreshHandler implements IDataRefreshHandler {
     @Override
     public void doRefresh(TzsDataRefreshMessage message) {
         log.info("3库数据，人员开始刷库：唯一标识：{}", message.getDataId());
-        StopWatch watch = new StopWatch();
-        watch.start();
-        TzsUserInfo userInfo = userInfoMapper.selectById(message.getDataId());
-        TzBaseEnterpriseInfo unit = enterpriseInfoMapper.selectOne(new LambdaQueryWrapper<TzBaseEnterpriseInfo>()
-                .select(BaseEntity::getSequenceNbr,
-                        TzBaseEnterpriseInfo::getUseCode,
-                        TzBaseEnterpriseInfo::getUseUnit,
-                        TzBaseEnterpriseInfo::getUnitType,
-                        TzBaseEnterpriseInfo::getSuperviseOrgCode,
-                        TzBaseEnterpriseInfo::getSuperviseOrgName
-                ).eq(BaseEntity::getIsDelete, false).eq(TzBaseEnterpriseInfo::getUseCode, userInfo.getUnitCode()));
-        EsUserInfo esUserInfo = new EsUserInfo();
-        BeanUtil.copyProperties(userInfo, esUserInfo);
-        esUserInfo.setPost(RefreshDataUtils.castStrList2String(userInfo.getPost()));
-        esUserInfo.setNewPost(RefreshDataUtils.castStrList2String(userInfo.getNewPost()));
-        esUserInfo.setSubPost(RefreshDataUtils.castStrList2String(userInfo.getSubPost()));
-        esUserInfo.setEquipType(RefreshDataUtils.castStrList2String(userInfo.getEquipType()));
-        esUserInfo.setUnitType(unit.getUnitType());
-        esUserInfo.setSuperviseOrgName(unit.getSuperviseOrgName());
-        esUserInfo.setSuperviseOrgCode(unit.getSuperviseOrgCode());
-        esUserInfo.setLicenses(commonRefreshService.buildUserLicenses(userInfo.getSequenceNbr()));
-        esUserInfoDao.save(esUserInfo);
+        switch (DataRefreshEvent.Operation.valueOf(message.getOperation())) {
+            case DELETE:
+                esUserInfoDao.deleteById(message.getDataId());
+                break;
+            case INSERT:
+            case UPDATE:
+                TzsUserInfo userInfo = userInfoMapper.selectById(message.getDataId());
+                TzBaseEnterpriseInfo unit = enterpriseInfoMapper.selectOne(new LambdaQueryWrapper<TzBaseEnterpriseInfo>()
+                        .select(BaseEntity::getSequenceNbr,
+                                TzBaseEnterpriseInfo::getUseCode,
+                                TzBaseEnterpriseInfo::getUseUnit,
+                                TzBaseEnterpriseInfo::getUnitType,
+                                TzBaseEnterpriseInfo::getSuperviseOrgCode,
+                                TzBaseEnterpriseInfo::getSuperviseOrgName
+                        ).eq(BaseEntity::getIsDelete, false).eq(TzBaseEnterpriseInfo::getUseCode, userInfo.getUnitCode()));
+                EsUserInfo esUserInfo = new EsUserInfo();
+                BeanUtil.copyProperties(userInfo, esUserInfo);
+                esUserInfo.setPost(RefreshDataUtils.castStrList2String(userInfo.getPost()));
+                esUserInfo.setNewPost(RefreshDataUtils.castStrList2String(userInfo.getNewPost()));
+                esUserInfo.setSubPost(RefreshDataUtils.castStrList2String(userInfo.getSubPost()));
+                esUserInfo.setEquipType(RefreshDataUtils.castStrList2String(userInfo.getEquipType()));
+                esUserInfo.setUnitType(unit.getUnitType());
+                esUserInfo.setSuperviseOrgName(unit.getSuperviseOrgName());
+                esUserInfo.setSuperviseOrgCode(unit.getSuperviseOrgCode());
+                esUserInfo.setLicenses(commonRefreshService.buildUserLicenses(userInfo.getSequenceNbr()));
+                esUserInfoDao.save(esUserInfo);
+                break;
+            default:
+                log.error("uno operation: {}", message.getOperation());
+                break;
+        }
     }
 }