修改线程初始化数量

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -43,6 +43,7 @@ import com.mortals.xhx.common.utils.SendTaskThreadPool;
 import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import com.mortals.xhx.module.device.model.DeviceModuleDistributeEntity;
+import com.mortals.xhx.module.device.model.DeviceModuleDistributeQuery;
 import com.mortals.xhx.module.device.model.DeviceQuery;
 import com.mortals.xhx.module.device.service.DeviceLogService;
 import com.mortals.xhx.module.device.service.DeviceModuleDistributeService;
@@ -1040,24 +1041,26 @@ public class DeviceApiController {
         String homeUrl = "";
         //根据站点与资源部署来生成homeurl
 
+/*
         List<DeviceModuleDistributeEntity> cacheList = deviceModuleDistributeService.getCacheList();
         Map<String, List<DeviceModuleDistributeEntity>> collect = cacheList.stream().collect(Collectors.groupingBy(x -> x.getSiteId() + "#" + x.getProductId()));
         List<DeviceModuleDistributeEntity> list = collect.getOrDefault(deviceEntity.getSiteId() + "#" + productEntity.getId(), new ArrayList<>());
         DeviceModuleDistributeEntity deviceModuleDistributeEntity = list.stream().filter(f -> f.getSelected() == YesNoEnum.YES.getValue()).findFirst().orElseGet(() -> null);
+*/
 
-/*        DeviceModuleDistributeQuery query = new DeviceModuleDistributeQuery();
+       DeviceModuleDistributeQuery query = new DeviceModuleDistributeQuery();
         query.setSiteId(deviceEntity.getSiteId());
         query.setProductId(productEntity.getId());
         query.setSelected(YesNoEnum.YES.getValue());
-        DeviceModuleDistributeEntity deviceModuleDistributeEntity = deviceModuleDistributeService.selectOne(query);*/
+        DeviceModuleDistributeEntity deviceModuleDistributeEntity = deviceModuleDistributeService.selectOne(query);
         if (ObjectUtils.isEmpty(deviceModuleDistributeEntity)) {
             //没有默认选择的资源，实施部署更新一个默认选择 todo
-      /*      query = new DeviceModuleDistributeQuery();
+            query = new DeviceModuleDistributeQuery();
             query.setSiteId(deviceEntity.getSiteId());
             query.setProductId(productEntity.getId());
             query.setSelected(YesNoEnum.NO.getValue());
-            deviceModuleDistributeEntity = deviceModuleDistributeService.selectOne(query);*/
-            deviceModuleDistributeEntity = list.stream().filter(f -> f.getSelected() == YesNoEnum.NO.getValue()).findFirst().orElseGet(() -> null);
+            deviceModuleDistributeEntity = deviceModuleDistributeService.selectOne(query);
+            //deviceModuleDistributeEntity = list.stream().filter(f -> f.getSelected() == YesNoEnum.NO.getValue()).findFirst().orElseGet(() -> null);
 
             if (!ObjectUtils.isEmpty(deviceModuleDistributeEntity)) {
                 //deviceModuleDistributeService.active(deviceModuleDistributeEntity, null);