Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ESEquipmentCategoryDto.java

@@ -173,4 +173,10 @@ public class ESEquipmentCategoryDto {
     @Field(type = FieldType.Text)
     private String INFORMATION_SITUATION;
 
+
+    /**
+     * 工程装置id（工业管道使用）
+     */
+    @Field(type = FieldType.Keyword)
+    private String PROJECT_CONTRAPTION_ID;
 }

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

@@ -86,6 +86,8 @@ public class BatchDataChangeProcessStrategy implements IChangeDataProcessStrateg
                 String record = item.getRecord();
                 // 设计信息更新
                 pieLineDataChangeService.saveDesignForPieLine(record, allChangeColumns, item);
+                // 更新es的冗余的管道名称字段
+                pieLineDataChangeService.updateEs(record, projectContraptionChangeDataDto);
                 // 技术参数入库保存
                 TechParamsPipelineChangeFieldDto paramsPipelineChangeFieldDto = new TechParamsPipelineChangeFieldDto();
                 BeanUtil.copyProperties(item, paramsPipelineChangeFieldDto, false);

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

@@ -137,6 +137,18 @@ public class EquipChangeDataUpdateService {
         }
     }
 
+    public void updateRegisterEsDataPieLine(String record, ProjectContraptionChangeDataDto registerChangeDataDto) {
+        // es 数据更新
+        Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(record);
+        if (optional.isPresent()) {
+            ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
+            esEquipmentCategoryDto.setPROJECT_CONTRAPTION(registerChangeDataDto.getProjectContraption());
+            // 冗余更新 正常 应该是在加设备时写入
+            esEquipmentCategoryDto.setPROJECT_CONTRAPTION_ID(registerChangeDataDto.getProjectContraptionId()) ;
+            esEquipmentCategory.save(esEquipmentCategoryDto);
+        }
+    }
+
     private EquipmentCategory getEquipmentCategory(EquipRegisterChangeDataDto registerChangeDataDto) {
         return equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, registerChangeDataDto.getEquDefine()));
     }

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

@@ -63,4 +63,8 @@ public class PieLineDataChangeServiceImpl {
         // 2.更新管道的设计单位名称
         equipChangeDataUpdateService.updatePieLineDesignData(record, pieLineDesignChangeDataDto);
     }
+
+    public void updateEs(String record, ProjectContraptionChangeDataDto projectContraptionChangeDataDto) {
+        equipChangeDataUpdateService.updateRegisterEsDataPieLine(record, projectContraptionChangeDataDto);
+    }
 }