修改线程初始化数量

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

@@ -37,11 +37,13 @@ import com.mortals.xhx.common.model.MessageHeader;
 import com.mortals.xhx.common.pdu.DeviceReq;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.site.SitePdu;
-import com.mortals.xhx.common.utils.*;
+import com.mortals.xhx.common.utils.BeanUtil;
+import com.mortals.xhx.common.utils.DownMsgTask;
+import com.mortals.xhx.common.utils.EncryptUtil;
+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;
@@ -1034,22 +1036,28 @@ public class DeviceApiController {
 
     private void buildHomeUrlBySite(DeviceEntity deviceEntity, ProductEntity productEntity, ServerInfo serverInfo, String serverName, Integer serverPort) {
         String scheme = serverInfo.getScheme();
-
         String homeUrl = "";
         //根据站点与资源部署来生成homeurl
 
-        DeviceModuleDistributeQuery query = new DeviceModuleDistributeQuery();
+        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();
         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 = deviceModuleDistributeService.selectOne(query);*/
+            deviceModuleDistributeEntity = list.stream().filter(f -> f.getSelected() == YesNoEnum.NO.getValue()).findFirst().orElseGet(() -> null);
+
             if (!ObjectUtils.isEmpty(deviceModuleDistributeEntity)) {
                 //deviceModuleDistributeService.active(deviceModuleDistributeEntity, null);
                 homeUrl = String.format("/homeDeviceUrl/%s/%s/%s", deviceModuleDistributeEntity.getSiteId(), deviceModuleDistributeEntity.getProductCode(), deviceModuleDistributeEntity.getImageResolutionValue());

device-manager/src/main/java/com/mortals/xhx/module/device/service/DeviceModuleDistributeService.java

 package com.mortals.xhx.module.device.service;
+
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.Context;
-import com.mortals.framework.service.ICRUDService;
+import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.xhx.module.device.model.DeviceModuleDistributeEntity;
 /**
 * DeviceModuleDistributeService
@@ -11,7 +12,7 @@ import com.mortals.xhx.module.device.model.DeviceModuleDistributeEntity;
 * @author zxfei
 * @date 2022-08-02
 */
-public interface DeviceModuleDistributeService extends ICRUDService<DeviceModuleDistributeEntity,Long>{
+public interface DeviceModuleDistributeService extends ICRUDCacheService<DeviceModuleDistributeEntity,Long> {
 
 
     void active(DeviceModuleDistributeEntity distributeEntity, Context context);