Browse Source

mqtt指令发布

李进 2 years ago
parent
commit
d2b854d0cf

+ 28 - 0
device-api-service/src/main/java/com/xy/config/DeviceThreadPoolConfig.java

@@ -0,0 +1,28 @@
+package com.xy.config;
+
+import com.dtp.core.support.DynamicTp;
+import com.xy.utils.ThreadPoolUtils;
+import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DeviceThreadPoolConfig {
+
+    public static final String DEVICE_COMMON_POLL = "deviceCommonPoll";
+
+    /**
+     * 公用线程池
+     */
+    @DynamicTp
+    @Bean(DEVICE_COMMON_POLL)
+    public ThreadPoolTaskExecutor deviceCommonPoll() {
+        return ThreadPoolUtils.newPoll()
+                .name(DEVICE_COMMON_POLL)
+                .coreSize(10)
+                .maxSize(200)
+                .keepAlive(60)
+                .builder();
+    }
+
+}

+ 0 - 44
device-api-service/src/main/java/com/xy/config/ThreadPoolConfig.java

@@ -1,44 +0,0 @@
-package com.xy.config;
-
-import com.dtp.core.support.DynamicTp;
-import com.xy.utils.ThreadPoolUtils;
-import org.springframework.context.annotation.Bean;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ThreadPoolConfig {
-
-    public static final String COMMON_POLL = "commonPoll";
-
-    public static final String SEND_MQTT_POLL = "sendMqttPoll";
-
-    /**
-     * 公用线程池
-     */
-    @DynamicTp
-    @Bean(COMMON_POLL)
-    public ThreadPoolTaskExecutor commonPoll() {
-        return ThreadPoolUtils.newPoll()
-                .name(COMMON_POLL)
-                .coreSize(10)
-                .maxSize(200)
-                .keepAlive(60)
-                .builder();
-    }
-
-    /**
-     * 指令发布线程池
-     */
-    @DynamicTp
-    @Bean(SEND_MQTT_POLL)
-    public ThreadPoolTaskExecutor sendMqttPoll() {
-        return ThreadPoolUtils.newPoll()
-                .name(SEND_MQTT_POLL)
-                .coreSize(10)
-                .maxSize(200)
-                .keepAlive(60)
-                .builder();
-    }
-
-}

+ 2 - 2
device-api-service/src/main/java/com/xy/service/DeviceCreateIdsServiceImpl.java

@@ -8,7 +8,7 @@ import com.xy.annotation.Lock;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
 import com.xy.collections.list.JList;
 import com.xy.collections.map.JMap;
 import com.xy.collections.map.JMap;
-import com.xy.config.ThreadPoolConfig;
+import com.xy.config.DeviceThreadPoolConfig;
 import com.xy.dto.DeviceCreateIdsDto;
 import com.xy.dto.DeviceCreateIdsDto;
 import com.xy.dto.SysWorkUser.ListDto;
 import com.xy.dto.SysWorkUser.ListDto;
 import com.xy.dto.SysWorkUser.SysWorkVo;
 import com.xy.dto.SysWorkUser.SysWorkVo;
@@ -88,7 +88,7 @@ public class DeviceCreateIdsServiceImpl extends ServiceImpl<DeviceCreateIdsMappe
             deviceCreateIdss.add(deviceCreateIdsInfo);
             deviceCreateIdss.add(deviceCreateIdsInfo);
         }
         }
         JList<JList<DeviceCreateIds>> partition = deviceCreateIdss.partition(20);
         JList<JList<DeviceCreateIds>> partition = deviceCreateIdss.partition(20);
-        ThreadPoolUtils.Execute execute = ThreadPoolUtils.excPoll(ThreadPoolConfig.COMMON_POLL, partition.size());
+        ThreadPoolUtils.Execute execute = ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, partition.size());
         partition.forEach(createIds -> execute.execute(() -> saveBatch(createIds)));
         partition.forEach(createIds -> execute.execute(() -> saveBatch(createIds)));
         execute.end();
         execute.end();
         return R.ok();
         return R.ok();

+ 2 - 2
device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
 import com.xy.collections.list.JList;
-import com.xy.config.ThreadPoolConfig;
+import com.xy.config.DeviceThreadPoolConfig;
 import com.xy.dto.DeviceInfoDto;
 import com.xy.dto.DeviceInfoDto;
 import com.xy.dto.DeviceRegisterDto;
 import com.xy.dto.DeviceRegisterDto;
 import com.xy.dto.DeviceStatusDto;
 import com.xy.dto.DeviceStatusDto;
@@ -63,7 +63,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             return R.ok();
             return R.ok();
         }
         }
         DeviceInfoDto.Vo deviceInfo = copy(DeviceInfoDto.Vo.class, list.get(0));
         DeviceInfoDto.Vo deviceInfo = copy(DeviceInfoDto.Vo.class, list.get(0));
-        ThreadPoolUtils.excPoll(ThreadPoolConfig.COMMON_POLL, 3)
+        ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, 3)
                 .execute(() -> {
                 .execute(() -> {
                     //系统信息
                     //系统信息
                     DeviceSysinfoDto.Vo deviceSysinfo = deviceSysinfoService.get(new DeviceSysinfoDto.Vo().setDeviceId(deviceInfo.getDeviceId())).getData();
                     DeviceSysinfoDto.Vo deviceSysinfo = deviceSysinfoService.get(new DeviceSysinfoDto.Vo().setDeviceId(deviceInfo.getDeviceId())).getData();