|
|
@@ -68,6 +68,7 @@ public class SynchronizationServiceImpl implements SynchronizationService {
|
|
|
|
|
|
private List<DictDataRespDTO> systemEquipBoilerType;
|
|
|
private List<DictDataRespDTO> systemEquipBoilerStatus;
|
|
|
+ private List<DictDataRespDTO> systemEquipPipeStatus;
|
|
|
private List<DictDataRespDTO> systemEquipPipeType;
|
|
|
|
|
|
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
@@ -318,6 +319,7 @@ public class SynchronizationServiceImpl implements SynchronizationService {
|
|
|
private void initDict() {
|
|
|
systemEquipBoilerType = dictDataApi.getDictDataList("system_equip_boiler_type").getData();
|
|
|
systemEquipBoilerStatus = dictDataApi.getDictDataList("system_equip_boiler_status").getData();
|
|
|
+ systemEquipPipeStatus = dictDataApi.getDictDataList("PIPE_USE_STATUS").getData();
|
|
|
systemEquipPipeType = dictDataApi.getDictDataList("PIPE_TYPE").getData();
|
|
|
}
|
|
|
|
|
|
@@ -542,8 +544,8 @@ public class SynchronizationServiceImpl implements SynchronizationService {
|
|
|
equipPipeDO.setRelationDeptName(pipeDto.CHECKDEPARTMENT);
|
|
|
|
|
|
// 设置设备状态
|
|
|
- String pipeStatus = findDictValueByLabel(systemEquipBoilerStatus, pipeDto.USESTATUS);
|
|
|
- String unknownStatus = findDictValueByLabel(systemEquipBoilerStatus, "未知");
|
|
|
+ String pipeStatus = findDictValueByLabel(systemEquipPipeStatus, pipeDto.USESTATUS);
|
|
|
+ String unknownStatus = findDictValueByLabel(systemEquipPipeStatus, "未知");
|
|
|
if (pipeStatus != null) {
|
|
|
equipPipeDO.setUseStatus(pipeStatus);
|
|
|
} else {
|
|
|
@@ -605,6 +607,7 @@ public class SynchronizationServiceImpl implements SynchronizationService {
|
|
|
equipPipeDO.setRecord(pipeDto.RECORD);
|
|
|
equipPipeDO.setSevereCyclic(pipeDto.SEVERE_CYCLIC);
|
|
|
equipPipeDO.setStandard(pipeDto.STANDARD);
|
|
|
+ equipPipeDO.setIsEffective(pipeDto.IS_EFFECTIVE);
|
|
|
|
|
|
|
|
|
// 处理管道详情信息
|
|
|
@@ -650,8 +653,8 @@ public class SynchronizationServiceImpl implements SynchronizationService {
|
|
|
equipPipeDetailDO = equipPipeDetailDO != null ? equipPipeDetailDO : new EquipPipeDetailSaveReqVO();
|
|
|
|
|
|
// 设置设备状态
|
|
|
- String pipeStatus = findDictValueByLabel(systemEquipBoilerStatus, pipeDetailDto.USESTATUS);
|
|
|
- String unknownStatus = findDictValueByLabel(systemEquipBoilerStatus, "未知");
|
|
|
+ String pipeStatus = findDictValueByLabel(systemEquipPipeStatus, pipeDetailDto.USESTATUS);
|
|
|
+ String unknownStatus = findDictValueByLabel(systemEquipPipeStatus, "未知");
|
|
|
if (pipeStatus != null) {
|
|
|
equipPipeDetailDO.setUseStatus(pipeStatus);
|
|
|
} else {
|