更新

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -16,7 +16,6 @@ import com.tykj.dev.misc.utils.GetTreeUtils;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.PageUtil;
 import com.tykj.dev.misc.utils.ResultUtil;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -134,17 +133,23 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
     @Override
     public Page<DeviceStatisticsVo> getDeviceStatisticsPage(DeviceLibrarySelectVo deviceLibrarySelectVo, Pageable pageable) {
         //获取存在的所有装备型号
-        List<String> list = new ArrayList<>();
-        if (deviceLibrarySelectVo.getModel() != null) {
-            list.add(deviceLibrarySelectVo.getModel());
-        } else {
-            list = getAllModel();
-        }
+//        List<String> list = new ArrayList<>();
+//        if (deviceLibrarySelectVo.getModel() != null) {
+//            list.add(deviceLibrarySelectVo.getModel());
+//        } else {
+//            list = getAllModel();
+//        }
         //设置最大size的装备查询vo
         List<DeviceStatisticsVo> deviceStatisticsVos = new ArrayList<>();
         DeviceLibrarySelectVo d = new DeviceLibrarySelectVo();
-        BeanUtils.copyProperties(deviceLibrarySelectVo, d);
+//        BeanUtils.copyProperties(deviceLibrarySelectVo, d);
         d.setSize(Integer.MAX_VALUE);
+        d.setPage(0);
+        d.setAreaId(deviceLibrarySelectVo.getAreaId());
+        d.setUnitId(deviceLibrarySelectVo.getUnitId());
+        d.setModel(deviceLibrarySelectVo.getModel());
+        d.setName(deviceLibrarySelectVo.getName());
+        d.setContent(deviceLibrarySelectVo.getContent());
         //获取所有的核心装备
         List<DeviceLibrary> libraryEntities = getCoreDevicePage(d, d.getPageable()).getContent();
         if (libraryEntities.size() > 0) {