LIVE_YE %!s(int64=2) %!d(string=hai) anos
pai
achega
c9ccac91ee

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/utils/jPush/JPushToolUtil.java

@@ -29,7 +29,7 @@ public class JPushToolUtil extends AbstractJPushToolUtil {
         String msgTitle = "推送测试-内容标题" + num;
         String msgContent = "我是内容" + num;
         String jPushVO = "我是扩展的json" + num;
-        String[]  registrationId = {"1104a897924659ab708","120c83f760cc7e16c53"};
+        String[]  registrationId = {"", ""};
         boolean b = JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, registrationId);
         System.out.println("i="+b);
     }*/

+ 8 - 5
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/Task.java

@@ -385,8 +385,10 @@ public class Task {
                 String msgContent = "您有一条督办信息,请及时处理!";
                 String jPushVO = "";
                 List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
-                String[]  registrationId = (String[]) listS.toArray();
-                JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+                if(listS!=null && listS.size()>0){
+                    String[]  registrationId = listS.toArray(new String[listS.size()]);
+                    JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+                }
 
                 for (SysUser sysUser : sysUsers) {
                     if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
@@ -872,8 +874,10 @@ public class Task {
                     String msgContent = "您有一条督办信息,请及时处理!";
                     String jPushVO = "";
                     List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
-                    String[]  registrationId = (String[]) listS.toArray();
-                    JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+                    if(listS!=null && listS.size()>0){
+                        String[]  registrationId = listS.toArray(new String[listS.size()]);
+                        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+                    }
 
                     for (SysUser sysUser : sysUsers) {
                         if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
@@ -892,5 +896,4 @@ public class Task {
     }
 
 
-
 }

+ 23 - 14
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzKgxxServiceImpl.java

@@ -137,13 +137,18 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService {
 
         //发极光推送
         List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
-        String notificationTitle = "消息通知";
-        String msgTitle = "开工审核";
-        String msgContent = "您有一条开工审核信息,请及时处理!";
-        String jPushVO = "";
-        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
-        String[]  registrationId = (String[]) listS.toArray();
-        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+        if(sysUsers!=null && sysUsers.size()>0){
+            String notificationTitle = "消息通知";
+            String msgTitle = "开工审核";
+            String msgContent = "您有一条开工审核信息,请及时处理!";
+            String jPushVO = "";
+            List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            if(listS!=null && listS.size()>0){
+                String[]  registrationId = listS.toArray(new String[listS.size()]);
+                JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+            }
+        }
+
 
 
         return count;
@@ -210,13 +215,17 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService {
 
         //发极光推送
         List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
-        String notificationTitle = "消息通知";
-        String msgTitle = "开工审核";
-        String msgContent = "您有一条开工审核信息,请及时处理!";
-        String jPushVO = "";
-        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
-        String[]  registrationId = (String[]) listS.toArray();
-        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+        if(sysUsers!=null && sysUsers.size()>0){
+            String notificationTitle = "消息通知";
+            String msgTitle = "开工审核";
+            String msgContent = "您有一条开工审核信息,请及时处理!";
+            String jPushVO = "";
+            List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            if(listS!=null && listS.size()>0){
+                String[]  registrationId = listS.toArray(new String[listS.size()]);
+                JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+            }
+        }
 
         return count;
     }

+ 23 - 14
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzQyxxServiceImpl.java

@@ -137,13 +137,18 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
 
         //发极光推送
         List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
-        String notificationTitle = "消息通知";
-        String msgTitle = "签约审核";
-        String msgContent = "您有一条签约审核信息,请及时处理!";
-        String jPushVO = "";
-        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
-        String[]  registrationId = (String[]) listS.toArray();
-        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+        if(sysUsers!=null && sysUsers.size()>0){
+            String notificationTitle = "消息通知";
+            String msgTitle = "签约审核";
+            String msgContent = "您有一条签约审核信息,请及时处理!";
+            String jPushVO = "";
+            List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            if(listS!=null && listS.size()>0){
+                String[]  registrationId = listS.toArray(new String[listS.size()]);
+                JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+            }
+        }
+
 
         return count;
 
@@ -212,13 +217,17 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
 
         //发极光推送
         List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
-        String notificationTitle = "消息通知";
-        String msgTitle = "签约审核";
-        String msgContent = "您有一条签约审核信息,请及时处理!";
-        String jPushVO = "";
-        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
-        String[]  registrationId = (String[]) listS.toArray();
-        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+        if(sysUsers!=null && sysUsers.size()>0){
+            String notificationTitle = "消息通知";
+            String msgTitle = "签约审核";
+            String msgContent = "您有一条签约审核信息,请及时处理!";
+            String jPushVO = "";
+            List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            if(listS!=null && listS.size()>0){
+                String[]  registrationId = listS.toArray(new String[listS.size()]);
+                JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+            }
+        }
 
         return count;
     }

+ 23 - 14
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzSbbzbServiceImpl.java

@@ -183,13 +183,18 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
 
         //发极光推送
         List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
-        String notificationTitle = "消息通知";
-        String msgTitle = "首谈审核";
-        String msgContent = "您有一条首谈审核信息,请及时处理!";
-        String jPushVO = "";
-        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
-        String[]  registrationId = (String[]) listS.toArray();
-        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+        if(sysUsers!=null && sysUsers.size()>0){
+            String notificationTitle = "消息通知";
+            String msgTitle = "首谈审核";
+            String msgContent = "您有一条首谈审核信息,请及时处理!";
+            String jPushVO = "";
+            List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            if(listS!=null && listS.size()>0){
+                String[]  registrationId = listS.toArray(new String[listS.size()]);
+                JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+            }
+        }
+
 
         return count;
     }
@@ -237,13 +242,17 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
 
         //发极光推送
         List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
-        String notificationTitle = "消息通知";
-        String msgTitle = "首谈审核";
-        String msgContent = "您有一条首谈审核信息,请及时处理!";
-        String jPushVO = "";
-        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
-        String[]  registrationId = (String[]) listS.toArray();
-        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+        if(sysUsers!=null && sysUsers.size()>0){
+            String notificationTitle = "消息通知";
+            String msgTitle = "首谈审核";
+            String msgContent = "您有一条首谈审核信息,请及时处理!";
+            String jPushVO = "";
+            List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            if(listS!=null && listS.size()>0){
+                String[]  registrationId = listS.toArray(new String[listS.size()]);
+                JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+            }
+        }
         return count;
     }
 

+ 24 - 14
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/ZsyzTcxxServiceImpl.java

@@ -136,13 +136,18 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
 
         //发极光推送
         List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
-        String notificationTitle = "消息通知";
-        String msgTitle = "投产审核";
-        String msgContent = "您有一条投产审核信息,请及时处理!";
-        String jPushVO = "";
-        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
-        String[]  registrationId = (String[]) listS.toArray();
-        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+        if(sysUsers!=null && sysUsers.size()>0){
+            String notificationTitle = "消息通知";
+            String msgTitle = "投产审核";
+            String msgContent = "您有一条投产审核信息,请及时处理!";
+            String jPushVO = "";
+            List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            if(listS!=null && listS.size()>0){
+                String[]  registrationId = listS.toArray(new String[listS.size()]);
+                JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+            }
+        }
+
         return count;
 
     }
@@ -208,13 +213,18 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
         }
         //发极光推送
         List<SysUser> sysUsers = sysUserService.selectUserByDeptId(100L);
-        String notificationTitle = "消息通知";
-        String msgTitle = "投产审核";
-        String msgContent = "您有一条投产审核信息,请及时处理!";
-        String jPushVO = "";
-        List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
-        String[]  registrationId = (String[]) listS.toArray();
-        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+        if(sysUsers!=null && sysUsers.size()>0){
+            String notificationTitle = "消息通知";
+            String msgTitle = "投产审核";
+            String msgContent = "您有一条投产审核信息,请及时处理!";
+            String jPushVO = "";
+            List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            if(listS!=null && listS.size()>0){
+                String[]  registrationId = listS.toArray(new String[listS.size()]);
+                JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+            }
+        }
+
         return count;
     }
 

+ 8 - 5
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/common/ZsyzCommonServiceImpL.java

@@ -643,9 +643,10 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                     String msgContent = "您有一条项目承接信息,请及时处理!";
                     String jPushVO = "";
                     List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
-                    String[]  registrationId = (String[]) listS.toArray();
-                    JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
-
+                    if(listS!=null && listS.size()>0){
+                        String[]  registrationId = listS.toArray(new String[listS.size()]);
+                        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+                    }
                     for (SysUser sysUser : sysUsers) {
                         if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
                             SendSmsConfig sendSmsConfig = new SendSmsConfig();
@@ -676,8 +677,10 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                     String msgContent = "您有一条项目审核信息,请及时处理!";
                     String jPushVO = "";
                     List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
-                    String[]  registrationId = (String[]) listS.toArray();
-                    JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+                    if(listS!=null && listS.size()>0){
+                        String[]  registrationId = listS.toArray(new String[listS.size()]);
+                        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+                    }
                     for (SysUser sysUser : sysUsers) {
                         if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
                             SendSmsConfig sendSmsConfig = new SendSmsConfig();