代码还原 gengdidi

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

@@ -2,12 +2,9 @@ package com.zehong.system.service.impl;
 
 import java.util.*;
 
-import com.zehong.common.core.domain.entity.SysDictData;
-import com.zehong.common.utils.StringUtils;
 import com.zehong.system.domain.TPipe;
 import com.zehong.system.domain.vo.DeviceInfoVo;
 import com.zehong.system.mapper.TPipeMapper;
-import com.zehong.system.service.ISysDictTypeService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,8 +25,6 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
     private TDeviceInfoMapper tDeviceInfoMapper;
     @Autowired
     private TPipeMapper tPipeMapper;
-    @Autowired
-    private ISysDictTypeService iSysDictTypeService;
 
     /**
      * 查询设备信息
@@ -38,22 +33,9 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
      * @return 设备信息
      */
     @Override
-    public DeviceInfoVo selectTDeviceInfoById(int deviceId)
+    public TDeviceInfo selectTDeviceInfoById(int 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;
+        return tDeviceInfoMapper.selectTDeviceInfoById(deviceId);
     }
 
     /**
@@ -77,15 +59,6 @@ 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);
             }
         }