转换map

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.bizmatics.common.core.exception.BusinessException;
 import com.bizmatics.common.core.util.BeanMapperUtils;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.AlarmPower;
 import com.bizmatics.model.Device;
 import com.bizmatics.model.Site;
@@ -13,14 +14,11 @@ import com.bizmatics.persistence.mapper.DeviceMapper;
 import com.bizmatics.persistence.mapper.SiteMapper;
 import com.bizmatics.service.DeviceService;
 import com.bizmatics.service.SiteService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.service.enums.DeviceStatusCode;
-import com.bizmatics.service.enums.DeviceType;
 import com.bizmatics.service.util.SessionLocal;
 import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
 import lombok.extern.slf4j.Slf4j;
-import net.sf.ehcache.search.parser.MAggregate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -123,11 +121,10 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         }else {
             siteVo.setStatus(DeviceStatusCode.NORMAL.getDescribe());
         }
-        List<String> deviceType = new ArrayList<>();
-        list.stream()
+        List<String> deviceTypes = list.stream()
                 .filter(device -> device.getSiteId().equals(site.getId()))
-                .forEach(device -> deviceType.add(DeviceType.pase(device.getDeviceType()).getName()));
-        siteVo.setDeviceType(deviceType);
+                .map(Device::getDeviceType).collect(Collectors.toList());
+        siteVo.setDeviceType(deviceTypes);
         return siteVo;
     }
 }