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

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/ESEquipmentInfo.java

@@ -574,16 +574,24 @@ public class ESEquipmentInfo {
         @Field(type = FieldType.Date, format = DateFormat.date)
         private LocalDate informEnd;
         /**
-         * 维保负责人姓名
+         * 维保负责1人姓名
          */
         @Field(type = FieldType.Text)
         private String meMaster;
         /**
-         * 维保负责人身份证
+         * 维保负责人1身份证
          */
 
         @Field(type = FieldType.Keyword)
         private String meMasterId;
+
+        /**
+         * 维保负责人1电话
+         */
+
+        @Field(type = FieldType.Keyword)
+        private String meMasterPhone;
+
         /**
          * 紧急救援电话
          */
@@ -607,5 +615,24 @@ public class ESEquipmentInfo {
          */
         @Field(type = FieldType.Text)
         private String me24Telephone;
+
+        /**
+         * 维保负责人2姓名
+         */
+        @Field(type = FieldType.Text)
+        private String meMaster1;
+        /**
+         * 维保负责人2身份证
+         */
+
+        @Field(type = FieldType.Keyword)
+        private String meMaster1Id;
+
+        /**
+         * 维保负责人2电话
+         */
+
+        @Field(type = FieldType.Keyword)
+        private String meMaster1Phone;
     }
 }

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/EquipmentRefreshHandler.java

@@ -66,7 +66,8 @@ public class EquipmentRefreshHandler implements IDataRefreshHandler {
                 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, IdxBizJgUseInfo::getDataQualityScore));
+                        .select(IdxBizJgUseInfo::getRecord, IdxBizJgUseInfo::getCreateDate, IdxBizJgUseInfo::getDataQualityScore,
+                                IdxBizJgUseInfo::getUSC_UNIT_CREDIT_CODE, IdxBizJgUseInfo::getUSC_UNIT_NAME));
                 IdxBizJgDesignInfo designInfo = idxBizJgDesignInfoServiceImpl.getOne(new LambdaQueryWrapper<IdxBizJgDesignInfo>()
                         .eq(IdxBizJgDesignInfo::getRecord, record)
                         .select(IdxBizJgDesignInfo::getRecord, IdxBizJgDesignInfo::getDesignUnitName, IdxBizJgDesignInfo::getDesignUnitCreditCode, IdxBizJgDesignInfo::getDesignDate));
@@ -88,6 +89,8 @@ public class EquipmentRefreshHandler implements IDataRefreshHandler {
                 } catch (Exception e) {
                     log.error("时区转换失败：{}", record, e);
                 }
+                esEquipmentInfo.setUSC_UNIT_CREDIT_CODE(useInfo.getUSC_UNIT_CREDIT_CODE());
+                esEquipmentInfo.setUSC_UNIT_NAME(useInfo.getUSC_UNIT_NAME());
                 esEquipmentInfo.setDataQualityScore(useInfo.getDataQualityScore() != null ? useInfo.getDataQualityScore() : null);
                 esEquipmentInfo.setCarNumber(registerInfo.getCarNumber());
                 esEquipmentInfo.setUSE_ORG_CODE(registerInfo.getUseOrgCode());

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/DataHandlerServiceImpl.java

@@ -1518,7 +1518,9 @@ public class DataHandlerServiceImpl {
                         return 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));
+                    IdxBizJgUseInfo useInfo = useInfoService.getOne(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getRecord, record)
+                            .select(IdxBizJgUseInfo::getRecord, IdxBizJgUseInfo::getCreateDate, IdxBizJgUseInfo::getDataQualityScore,
+                                    IdxBizJgUseInfo::getUSC_UNIT_CREDIT_CODE, IdxBizJgUseInfo::getUSC_UNIT_NAME));
                     IdxBizJgDesignInfo designInfo = idxBizJgDesignInfoServiceImpl.getOne(new LambdaQueryWrapper<IdxBizJgDesignInfo>()
                             .eq(IdxBizJgDesignInfo::getRecord, record)
                             .select(IdxBizJgDesignInfo::getRecord, IdxBizJgDesignInfo::getDesignUnitName, IdxBizJgDesignInfo::getDesignUnitCreditCode,
@@ -1542,6 +1544,9 @@ public class DataHandlerServiceImpl {
                     } catch (Exception e) {
                         log.error("时区转换失败：{}", record, e);
                     }
+                    esEquipmentInfo.setUSC_UNIT_CREDIT_CODE(useInfo.getUSC_UNIT_CREDIT_CODE());
+                    esEquipmentInfo.setUSC_UNIT_NAME(useInfo.getUSC_UNIT_NAME());
+                    esEquipmentInfo.setDataQualityScore(useInfo.getDataQualityScore() != null ? useInfo.getDataQualityScore() : null);
                     esEquipmentInfo.setCarNumber(registerInfo.getCarNumber());
                     esEquipmentInfo.setUSE_ORG_CODE(registerInfo.getUseOrgCode());
                     esEquipmentInfo.setIssueDate(getIssueDate(registerInfo.getUseOrgCode()));

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/JgEquipTransferServiceImpl.java

@@ -13,6 +13,8 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dao.EsEquipmentDao;
+import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransferEq;
@@ -107,6 +109,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     @Autowired
     private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
 
+    @Autowired
+    private final EsEquipmentDao esEquipmentDao;
+
     /**
      * 保存和保存并提交
      *
@@ -601,6 +606,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                                             .build())
                                     .build();
                             tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
+                            updateEsEquipment(equipTransferEq, jgEquipTransfer);
                         });
                     }
                     // 上个代办改为已办
@@ -646,6 +652,15 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         }
     }
 
+    private void updateEsEquipment(JgEquipTransferEq equipTransferEq, JgEquipTransfer jgEquipTransfer) {
+        Optional<ESEquipmentInfo> optionalESEquipmentInfo = esEquipmentDao.findById(equipTransferEq.getEquId());
+        optionalESEquipmentInfo.ifPresent(esEquipmentInfo -> {
+            esEquipmentInfo.setUSC_UNIT_NAME(jgEquipTransfer.getInstallUnitName());
+            esEquipmentInfo.setUSC_UNIT_CREDIT_CODE(jgEquipTransfer.getInstallUnitCreditCode());
+            esEquipmentDao.save(esEquipmentInfo);
+        });
+    }
+
     public InstanceRuntimeData buildInstanceRuntimeData(JgEquipTransfer jgEquipTransfer) {
         return InstanceRuntimeData.builder()
                 .nextExecuteUserIds(jgEquipTransfer.getNextExecuteUserIds())

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java

@@ -10,6 +10,8 @@ import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.util.Date;
 
@@ -333,4 +335,17 @@ public class IdxBizJgUseInfo extends TzsBaseEntity implements IBaseChangeData {
      */
     @TableField("\"VERSION\"")
     private String version;
+
+
+    /**
+     * 安改维单位code-安装告知、移交后写入，登记后清除
+     */
+    @TableField("\"USC_UNIT_CREDIT_CODE\"")
+    private String USC_UNIT_CREDIT_CODE;
+
+    /**
+     * 安改维单位统名称-安装告知、移交后写入，登记后清除
+     */
+    @TableField("\"USC_UNIT_NAME\"")
+    private String USC_UNIT_NAME;
 }