Merge branch 'fu-dev' of uskycloud/usky-modules into master

service-iot/service-iot-biz/src/main/java/com/usky/iot/RuoYiSystemApplication.java

@@ -36,7 +36,7 @@ import java.net.UnknownHostException;
 @ComponentScan("com.usky")
 @SpringBootApplication
 //开启异步
-@EnableAsync
+//@EnableAsync
 //@EnableRabbit
 public class RuoYiSystemApplication
 {

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/config/DeviceOperate.java

@@ -36,7 +36,7 @@ public class DeviceOperate {
     @Autowired
     DmpDeviceStatusService dmpDeviceStatusService;
 
-    @Async
+    @Async("asyncServiceExecutor")
     public void updateDeviceStatus(){
         log.info("定时同步设备状态数据 start");
         ApiResult<List<Map<String,Object>>> list = remoteTsdbProxyService.getAllDeviceRealTime();

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmServiceImpl.java

@@ -635,7 +635,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
         }
     }
 
-    @Async
+    @Async("asyncServiceExecutor")
     public void deviceAlarm(List<StatusVO> list, List<DmpDeviceInfo> devInfoList, List<BaseAlarm> baseUnAlarmList){
         log.info("定时同步设备告警数据 start");
         if(CollectionUtils.isNotEmpty(devInfoList)){

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkReportServiceImpl.java

@@ -746,7 +746,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
         return timedReports;
     }
 
-    @Async
+    @Async("asyncServiceExecutor")
     @Override
     public void reportSubmissionReminder() {
         Integer tenantId = SecurityUtils.getTenantId();

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/utils/OaSendMessageCenter.java

@@ -56,7 +56,7 @@ public class OaSendMessageCenter {
      * @param isPass 是否通过（0：不通过，1：通过）
      * @param sign 申请单类型
      */
-    @Async
+    @Async("asyncServiceExecutor")
     public void sendAsyncMessage(String username, Long approvalUid, Integer id, List<Long> receivers, Integer isPass, String sign) {
 
         log.info(username + "的申请开始发送消息中心-----------------------------------");