Ver Fonte

同步设备

xuzhancheng há 6 dias atrás
pai
commit
0dfb8a2962

+ 5 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equippipe/vo/EquipPipeRespVO.java

@@ -368,4 +368,9 @@ public class EquipPipeRespVO {
      * 管道主要规格
      */
     private String standard;
+    /**
+     * 是否有效
+     */
+    private String isEffective;
+
 }

+ 4 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equippipe/vo/EquipPipeSaveReqVO.java

@@ -312,4 +312,8 @@ public class EquipPipeSaveReqVO {
      * 管道主要规格
      */
     private String standard;
+    /**
+     * 是否有效
+     */
+    private String isEffective;
 }

+ 4 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/equippipe/EquipPipeDO.java

@@ -385,4 +385,8 @@ public class EquipPipeDO extends BaseDO {
      * 管道主要规格
      */
     private String standard;
+    /**
+     * 状态
+     */
+    private String isEffective;
 }

+ 7 - 4
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/synchronization/SynchronizationServiceImpl.java

@@ -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 {

+ 5 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/synchronization/dto/PipeDto.java

@@ -343,4 +343,9 @@ public class PipeDto {
      * 街道
      */
     public String STREET;
+
+    /**
+     * 是否有效
+     */
+    public String IS_EFFECTIVE;
 }