Skip to content

A
amos-boot-biz
Commit 32525d12 authored by tianbo's avatar tianbo
Browse files
Options

fix(module-jg): 更新设备变更数据接口，增加设备类别字段- 在 EquipChangeDataUpdateService 中添加设备类别更新逻辑

- 在 ES 设备分类数据同步中添加设备类别代码字段 - 更新 EquipRegisterChangeDataDto 中设备类别字段的注解
parent 6b8a420e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipRegisterChangeDataDto.java
View file @ 32525d12
...@@ -14,7 +14,7 @@ public class EquipRegisterChangeDataDto extends BaseChangeDataDto { ...@@ -14,7 +14,7 @@ public class EquipRegisterChangeDataDto extends BaseChangeDataDto {
@FieldDisplayDefine(value = "设备种类" ,isExist = false) @FieldDisplayDefine(value = "设备种类" ,isExist = false)
private String equList; private String equList;
@FieldDisplayDefine(value = "设备类别" ,isExist = false) @FieldDisplayDefine(value = "设备类别")
private String equCategory; private String equCategory;
@FieldDisplayDefine(value = "设备代码") @FieldDisplayDefine(value = "设备代码")
......
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
View file @ 32525d12
...@@ -47,6 +47,7 @@ public class EquipChangeDataUpdateService { ...@@ -47,6 +47,7 @@ public class EquipChangeDataUpdateService {
LambdaUpdateWrapper<IdxBizJgRegisterInfo> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<IdxBizJgRegisterInfo> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(IdxBizJgRegisterInfo::getRecord, record); updateWrapper.eq(IdxBizJgRegisterInfo::getRecord, record);
updateWrapper.set(IdxBizJgRegisterInfo::getEquCode, registerChangeDataDto.getEquCode()); updateWrapper.set(IdxBizJgRegisterInfo::getEquCode, registerChangeDataDto.getEquCode());
updateWrapper.set(IdxBizJgRegisterInfo::getEquCategory, registerChangeDataDto.getEquCategory());
updateWrapper.set(IdxBizJgRegisterInfo::getEquDefine, registerChangeDataDto.getEquDefine()); updateWrapper.set(IdxBizJgRegisterInfo::getEquDefine, registerChangeDataDto.getEquDefine());
updateWrapper.set(IdxBizJgRegisterInfo::getProductName, registerChangeDataDto.getProductName()); updateWrapper.set(IdxBizJgRegisterInfo::getProductName, registerChangeDataDto.getProductName());
updateWrapper.set(IdxBizJgRegisterInfo::getEquType, registerChangeDataDto.getEquType()); updateWrapper.set(IdxBizJgRegisterInfo::getEquType, registerChangeDataDto.getEquType());
...@@ -118,6 +119,7 @@ public class EquipChangeDataUpdateService { ...@@ -118,6 +119,7 @@ public class EquipChangeDataUpdateService {
esEquipmentCategoryDto.setEQU_CODE(registerChangeDataDto.getEquCode()); esEquipmentCategoryDto.setEQU_CODE(registerChangeDataDto.getEquCode());
esEquipmentCategoryDto.setEQU_TYPE(registerChangeDataDto.getEquType()); esEquipmentCategoryDto.setEQU_TYPE(registerChangeDataDto.getEquType());
esEquipmentCategoryDto.setEQU_DEFINE_CODE(registerChangeDataDto.getEquDefine()); esEquipmentCategoryDto.setEQU_DEFINE_CODE(registerChangeDataDto.getEquDefine());
esEquipmentCategoryDto.setEQU_CATEGORY_CODE(registerChangeDataDto.getEquCategory());
if (StringUtils.isEmpty(registerChangeDataDto.getEquDefine())) { if (StringUtils.isEmpty(registerChangeDataDto.getEquDefine())) {
esEquipmentCategoryDto.setEQU_DEFINE(null); esEquipmentCategoryDto.setEQU_DEFINE(null);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment