Merge branch 'han' of uskycloud/usky-modules into server-165

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmNoticeResultServiceImpl.java

@@ -61,55 +61,59 @@ public class BaseAlarmNoticeResultServiceImpl extends AbstractCrudService<BaseAl
     public Integer send(BaseAlarm baseAlarm, List<BaseAlarmNotice> records3, Integer alarmId, List<DmpProduct> records,
                         BaseAlarmType baseAlarmType, List<DmpDevice> records2) throws ClientException {
         log.info("start asyncServiceExecutor--------------------");
-        String[] array = records3.get(0).getReceiver1().split(",");
         Integer saveAlarmResult = 0;
-        for (String s : array) {
-            LambdaQueryWrapper<SysUser> lambdaQuery4 = Wrappers.lambdaQuery();
-            lambdaQuery4.eq(SysUser::getUserId,s)
-                    .eq(SysUser::getDelFlag,0);
-            SysUser sysUser = sysUserMapper.selectOne(lambdaQuery4);
-            BaseAlarmNoticeResult baseAlarmNoticeResult = new BaseAlarmNoticeResult();
-            baseAlarmNoticeResult.setReceiver(sysUser.getNickName());
-            baseAlarmNoticeResult.setReceiverPhone(sysUser.getPhonenumber());
-            baseAlarmNoticeResult.setAlarmId(alarmId);
-            baseAlarmNoticeResult.setNoticeTime(LocalDateTime.now());
-            baseAlarmNoticeResult.setNoticeContent(records.get(0).getProductName()+","+baseAlarmType.getTypeName()+","+baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
-                    "HH:mm:ss")));
-            baseAlarmNoticeResult.setTenantId(records.get(0).getTenantId());
-            if (records3.get(0).getNoticeMethod().contains("电话")){
-                SingleCallByTtsResponse code = voiceNotice.sendCVoice(sysUser.getPhonenumber(),
-                        records.get(0).getProductName(),baseAlarmType.getTypeName(),
-                        baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
-                                "HH:mm:ss")));
-                baseAlarmNoticeResult.setNoticeType(3);
-                if(code.getCode() != null && code.getCode().equals("OK")) {
-                    //请求成功
-                    baseAlarmNoticeResult.setNoticeResult(1);
-                }else {
-                    baseAlarmNoticeResult.setNoticeResult(2);
+        try{
+            String[] array = records3.get(0).getReceiver1().split(",");
+            for (String s : array) {
+                LambdaQueryWrapper<SysUser> lambdaQuery4 = Wrappers.lambdaQuery();
+                lambdaQuery4.eq(SysUser::getUserId,s)
+                        .eq(SysUser::getDelFlag,0);
+                SysUser sysUser = sysUserMapper.selectOne(lambdaQuery4);
+                BaseAlarmNoticeResult baseAlarmNoticeResult = new BaseAlarmNoticeResult();
+                baseAlarmNoticeResult.setReceiver(sysUser.getNickName());
+                baseAlarmNoticeResult.setReceiverPhone(sysUser.getPhonenumber());
+                baseAlarmNoticeResult.setAlarmId(alarmId);
+                baseAlarmNoticeResult.setNoticeTime(LocalDateTime.now());
+                baseAlarmNoticeResult.setNoticeContent(records.get(0).getProductName()+","+baseAlarmType.getTypeName()+","+baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
+                        "HH:mm:ss")));
+                baseAlarmNoticeResult.setTenantId(records.get(0).getTenantId());
+                if (records3.get(0).getNoticeMethod().contains("电话")){
+                    SingleCallByTtsResponse code = voiceNotice.sendCVoice(sysUser.getPhonenumber(),
+                            records.get(0).getProductName(),baseAlarmType.getTypeName(),
+                            baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
+                                    "HH:mm:ss")));
+                    baseAlarmNoticeResult.setNoticeType(3);
+                    if(code.getCode() != null && code.getCode().equals("OK")) {
+                        //请求成功
+                        baseAlarmNoticeResult.setNoticeResult(1);
+                    }else {
+                        baseAlarmNoticeResult.setNoticeResult(2);
+                    }
+                    saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
                 }
-                saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
-            }
-            if (records3.get(0).getNoticeMethod().contains("短信")){
-                DefaultProfile profile = DefaultProfile.getProfile("cn-beijing", "LTAI5tH3VvRL5BUkovCokHJX", "SaaWUouNqvcA0C746gcNOH9m6SRYN4");
-                IAcsClient client = new DefaultAcsClient(profile);
-                SendSmsRequest request = new SendSmsRequest();
-                request.setPhoneNumbers(sysUser.getPhonenumber());//接收短信的手机号码
-                request.setSignName("上海永天科技股份有限公司");//短信签名名称
-                request.setTemplateCode("SMS_463791105");//短信模板CODE
-                request.setTemplateParam("{\"deviceName\":\""+records2.get(0).getDeviceName()+"\","+"\"time\":\""+baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
-                        "HH:mm:ss"))+"\","+
-                        "\"alarmType\":\""+baseAlarmType.getTypeName()+"\","+"\"alarmContent\":\""+baseAlarm.getAlarmContent()+"\"}");
-                SendSmsResponse code = client.getAcsResponse(request);
-                baseAlarmNoticeResult.setNoticeType(4);
-                if(code.getCode() != null && code.getCode().equals("OK")) {
-                    //请求成功
-                    baseAlarmNoticeResult.setNoticeResult(1);
-                }else {
-                    baseAlarmNoticeResult.setNoticeResult(2);
+                if (records3.get(0).getNoticeMethod().contains("短信")){
+                    DefaultProfile profile = DefaultProfile.getProfile("cn-beijing", "LTAI5tH3VvRL5BUkovCokHJX", "SaaWUouNqvcA0C746gcNOH9m6SRYN4");
+                    IAcsClient client = new DefaultAcsClient(profile);
+                    SendSmsRequest request = new SendSmsRequest();
+                    request.setPhoneNumbers(sysUser.getPhonenumber());//接收短信的手机号码
+                    request.setSignName("上海永天科技股份有限公司");//短信签名名称
+                    request.setTemplateCode("SMS_463791105");//短信模板CODE
+                    request.setTemplateParam("{\"deviceName\":\""+records2.get(0).getDeviceName()+"\","+"\"time\":\""+baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
+                            "HH:mm:ss"))+"\","+
+                            "\"alarmType\":\""+baseAlarmType.getTypeName()+"\","+"\"alarmContent\":\""+baseAlarm.getAlarmContent()+"\"}");
+                    SendSmsResponse code = client.getAcsResponse(request);
+                    baseAlarmNoticeResult.setNoticeType(4);
+                    if(code.getCode() != null && code.getCode().equals("OK")) {
+                        //请求成功
+                        baseAlarmNoticeResult.setNoticeResult(1);
+                    }else {
+                        baseAlarmNoticeResult.setNoticeResult(2);
+                    }
+                    saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
                 }
-                saveAlarmResult = baseMapper.insert(baseAlarmNoticeResult);
             }
+        }catch (Exception e){
+            e.printStackTrace();
         }
         return saveAlarmResult;
     }

service-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java

@@ -11,47 +11,47 @@ import org.springframework.scheduling.quartz.SchedulerFactoryBean;
  * 
  * @author ruoyi
  */
-//@Configuration
-//public class ScheduleConfig
-//{
-//    @Bean
-//    public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource)
-//    {
-//        SchedulerFactoryBean factory = new SchedulerFactoryBean();
-//        factory.setDataSource(dataSource);
-//
-//        // quartz参数
-//        Properties prop = new Properties();
-//        prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler");
-//        prop.put("org.quartz.scheduler.instanceId", "AUTO");
-//        // 线程池配置
-//        prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool");
-//        prop.put("org.quartz.threadPool.threadCount", "20");
-//        prop.put("org.quartz.threadPool.threadPriority", "5");
-//        // JobStore配置
-//        prop.put("org.quartz.jobStore.class", "org.springframework.scheduling.quartz.LocalDataSourceJobStore");
-//        // 集群配置
-//        prop.put("org.quartz.jobStore.isClustered", "true");
-//        prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");
-//        prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1");
-//        prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true");
-//
-//        // sqlserver 启用
-//        // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?");
-//        prop.put("org.quartz.jobStore.misfireThreshold", "12000");
-//        prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
-//        factory.setQuartzProperties(prop);
-//
-//        factory.setSchedulerName("RuoyiScheduler");
-//        // 延时启动
-//        factory.setStartupDelay(1);
-//        factory.setApplicationContextSchedulerContextKey("applicationContextKey");
-//        // 可选，QuartzScheduler
-//        // 启动时更新己存在的Job，这样就不用每次修改targetObject后删除qrtz_job_details表对应记录了
-//        factory.setOverwriteExistingJobs(true);
-//        // 设置自动启动，默认为true
-//        factory.setAutoStartup(true);
-//
-//        return factory;
-//    }
-//}
+@Configuration
+public class ScheduleConfig
+{
+    @Bean
+    public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource)
+    {
+        SchedulerFactoryBean factory = new SchedulerFactoryBean();
+        factory.setDataSource(dataSource);
+
+        // quartz参数
+        Properties prop = new Properties();
+        prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler");
+        prop.put("org.quartz.scheduler.instanceId", "AUTO");
+        // 线程池配置
+        prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool");
+        prop.put("org.quartz.threadPool.threadCount", "20");
+        prop.put("org.quartz.threadPool.threadPriority", "5");
+        // JobStore配置
+        prop.put("org.quartz.jobStore.class", "org.springframework.scheduling.quartz.LocalDataSourceJobStore");
+        // 集群配置
+        prop.put("org.quartz.jobStore.isClustered", "true");
+        prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");
+        prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1");
+        prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true");
+
+        // sqlserver 启用
+        // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?");
+        prop.put("org.quartz.jobStore.misfireThreshold", "12000");
+        prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
+        factory.setQuartzProperties(prop);
+
+        factory.setSchedulerName("RuoyiScheduler");
+        // 延时启动
+        factory.setStartupDelay(1);
+        factory.setApplicationContextSchedulerContextKey("applicationContextKey");
+        // 可选，QuartzScheduler
+        // 启动时更新己存在的Job，这样就不用每次修改targetObject后删除qrtz_job_details表对应记录了
+        factory.setOverwriteExistingJobs(true);
+        // 设置自动启动，默认为true
+        factory.setAutoStartup(true);
+
+        return factory;
+    }
+}