还原代码修改

gassafety-system/src/main/java/com/zehong/system/service/impl/TDeviceInfoServiceImpl.java

 package com.zehong.system.service.impl;
 
-import java.util.*;
-
+import com.zehong.system.domain.TDeviceInfo;
 import com.zehong.system.domain.TPipe;
 import com.zehong.system.domain.vo.DeviceInfoVo;
+import com.zehong.system.mapper.TDeviceInfoMapper;
 import com.zehong.system.mapper.TPipeMapper;
+import com.zehong.system.service.ITDeviceInfoService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zehong.system.mapper.TDeviceInfoMapper;
-import com.zehong.system.domain.TDeviceInfo;
-import com.zehong.system.service.ITDeviceInfoService;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 设备信息Service业务层处理
@@ -33,9 +36,22 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
      * @return 设备信息
      */
     @Override
-    public TDeviceInfo selectTDeviceInfoById(int deviceId)
+    public DeviceInfoVo selectTDeviceInfoById(int deviceId)
     {
-        return tDeviceInfoMapper.selectTDeviceInfoById(deviceId);
+        DeviceInfoVo deviceInfoVo = new DeviceInfoVo();
+        TDeviceInfo tDeviceInfo = tDeviceInfoMapper.selectTDeviceInfoById(deviceId);
+        BeanUtils.copyProperties(tDeviceInfo, deviceInfoVo);
+
+       /* if (StringUtils.isNotEmpty(tDeviceInfo.getDeviceType())) {
+            List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_device_type");
+            for (SysDictData sysDictData : sysDictDataList) {
+                if (tDeviceInfo.getDeviceType().equals(sysDictData.getDictValue())) {
+                    deviceInfoVo.setDeviceType(sysDictData.getDictLabel());
+                }
+            }
+        }*/
+
+        return deviceInfoVo;
     }
 
     /**
@@ -59,6 +75,15 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
                 TPipe pipe = tPipeMapper.selectTPipeById(device.getPipeId());
                 deviceInfoVo.setPipeName(pipe.getPipeName());
 
+               /* if (StringUtils.isNotEmpty(device.getDeviceType())) {
+                    List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_device_type");
+                    for (SysDictData sysDictData : sysDictDataList) {
+                        if (device.getDeviceType().equals(sysDictData.getDictValue())) {
+                            deviceInfoVo.setDeviceType(sysDictData.getDictLabel());
+                        }
+                    }
+                }*/
+
                 list.add(deviceInfoVo);
             }
         }