极光推送

ruoyi-admin/src/main/resources/application.yml

@@ -19,8 +19,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    #active: druid
-    active: prod
+    active: druid
+    #active: prod
   # 文件上传
   servlet:
      multipart:

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

@@ -385,6 +385,7 @@ public class Task {
                 String msgContent = "您有一条督办信息，请及时处理！";
                 String jPushVO = "";
                 List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+                listS.removeAll(Collections.singleton(null));
                 if(listS!=null && listS.size()>0){
                     String[]  registrationId = listS.toArray(new String[listS.size()]);
                     JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
@@ -874,6 +875,7 @@ public class Task {
                     String msgContent = "您有一条督办信息，请及时处理！";
                     String jPushVO = "";
                     List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+                    listS.removeAll(Collections.singleton(null));
                     if(listS!=null && listS.size()>0){
                         String[]  registrationId = listS.toArray(new String[listS.size()]);
                         JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);

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

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -143,6 +144,7 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService {
             String msgContent = "您有一条开工审核信息，请及时处理！";
             String jPushVO = "";
             List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            listS.removeAll(Collections.singleton(null));
             if(listS!=null && listS.size()>0){
                 String[]  registrationId = listS.toArray(new String[listS.size()]);
                 JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
@@ -221,6 +223,7 @@ public class ZsyzKgxxServiceImpl implements IZsyzKgxxService {
             String msgContent = "您有一条开工审核信息，请及时处理！";
             String jPushVO = "";
             List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            listS.removeAll(Collections.singleton(null));
             if(listS!=null && listS.size()>0){
                 String[]  registrationId = listS.toArray(new String[listS.size()]);
                 JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);

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

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -143,6 +144,7 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
             String msgContent = "您有一条签约审核信息，请及时处理！";
             String jPushVO = "";
             List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            listS.removeAll(Collections.singleton(null));
             if(listS!=null && listS.size()>0){
                 String[]  registrationId = listS.toArray(new String[listS.size()]);
                 JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
@@ -223,6 +225,7 @@ public class ZsyzQyxxServiceImpl implements IZsyzQyxxService {
             String msgContent = "您有一条签约审核信息，请及时处理！";
             String jPushVO = "";
             List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            listS.removeAll(Collections.singleton(null));
             if(listS!=null && listS.size()>0){
                 String[]  registrationId = listS.toArray(new String[listS.size()]);
                 JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);

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

@@ -26,10 +26,8 @@ import com.ruoyi.system.service.projectV2.common.ISendSmsConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.ruoyi.common.constant.CommonConstants.*;
@@ -189,6 +187,7 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
             String msgContent = "您有一条首谈审核信息，请及时处理！";
             String jPushVO = "";
             List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            listS.removeAll(Collections.singleton(null));
             if(listS!=null && listS.size()>0){
                 String[]  registrationId = listS.toArray(new String[listS.size()]);
                 JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
@@ -248,6 +247,7 @@ public class ZsyzSbbzbServiceImpl implements IZsyzSbbzbService {
             String msgContent = "您有一条首谈审核信息，请及时处理！";
             String jPushVO = "";
             List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            listS.removeAll(Collections.singleton(null));
             if(listS!=null && listS.size()>0){
                 String[]  registrationId = listS.toArray(new String[listS.size()]);
                 JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);

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

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -142,6 +143,7 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
             String msgContent = "您有一条投产审核信息，请及时处理！";
             String jPushVO = "";
             List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            listS.removeAll(Collections.singleton(null));
             if(listS!=null && listS.size()>0){
                 String[]  registrationId = listS.toArray(new String[listS.size()]);
                 JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
@@ -219,6 +221,7 @@ public class ZsyzTcxxServiceImpl implements IZsyzTcxxService {
             String msgContent = "您有一条投产审核信息，请及时处理！";
             String jPushVO = "";
             List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+            listS.removeAll(Collections.singleton(null));
             if(listS!=null && listS.size()>0){
                 String[]  registrationId = listS.toArray(new String[listS.size()]);
                 JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);

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

@@ -26,10 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.ruoyi.common.constant.CommonConstants.*;
@@ -643,6 +640,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                     String msgContent = "您有一条项目承接信息，请及时处理！";
                     String jPushVO = "";
                     List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+                    listS.removeAll(Collections.singleton(null));
                     if(listS!=null && listS.size()>0){
                         String[]  registrationId = listS.toArray(new String[listS.size()]);
                         JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
@@ -677,6 +675,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                     String msgContent = "您有一条项目审核信息，请及时处理！";
                     String jPushVO = "";
                     List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+                    listS.removeAll(Collections.singleton(null));
                     if(listS!=null && listS.size()>0){
                         String[]  registrationId = listS.toArray(new String[listS.size()]);
                         JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzLcjlMapper.xml

@@ -44,19 +44,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <!--<select id="selectZsyzLcjlListQc" parameterType="ZsyzLcjl" resultMap="ZsyzLcjlResult">
+    <select id="selectZsyzLcjlListQc" parameterType="ZsyzLcjl" resultMap="ZsyzLcjlResult">
         select ANY_VALUE(a.id) as id, ANY_VALUE(a.xm_id) as xm_id, ANY_VALUE(a.xmbh) as xmbh, ANY_VALUE(a.xmmc)as xmmc,
                ANY_VALUE(a.dept_id) as dept_id, ANY_VALUE(a.dept_name) as dept_name, ANY_VALUE(MAX(a.cl_time)) as cl_time, ANY_VALUE(a.progress) as progress
         from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time, progress
         from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
-    </select>-->
+    </select>
 
-    <select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
+    <!--<select id="selectZsyzLcjlListQc" resultType="com.ruoyi.system.domain.projectV2.ZsyzLcjl">
         select id, xm_id, xmbh, xmmc,
                dept_id, dept_name, MAX(cl_time) as cl_time, progress
         from (select id, xm_id, xmbh, xmmc, dept_id, dept_name, cl_time) as cl_time, progress
               from zsyz_lcjl order by xm_id, cl_time desc) a group by xm_id
-    </select>
+    </select>-->
 
     <insert id="insertZsyzLcjl" parameterType="ZsyzLcjl" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_lcjl

ruoyi-system/src/main/resources/mapper/system/projectV2/ZsyzShyjMapper.xml

@@ -70,7 +70,7 @@
     </select>
 
 
-    <!--<select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
+    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
         SELECT
         ANY_VALUE ( s.id ) as id,
         ANY_VALUE ( s.xm_id ) as xm_id ,
@@ -87,20 +87,20 @@
         <where>
             s.shjg = '3'
             <if test="xmmc != null  and xmmc != ''">and s.xmmc like concat( #{xmmc}, '%') </if>
-            <if test="params.beginTime != null and params.beginTime != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 AND date_format(s.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
             </if>
-            <if test="params.endTime != null and params.endTime != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                 AND date_format(s.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
             </if>
         </where>
-        &lt;!&ndash; 数据范围过滤 &ndash;&gt;
+        <!-- 数据范围过滤 -->
         ${params.dataScope}
         GROUP BY
         s.xm_id
-    </select>-->
+    </select>
 
-    <select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
+    <!--<select id="selectZsyzShyjListByWt" resultMap="ZsyzShyjResult">
         SELECT
         s.id,
         s.xm_id ,
@@ -117,18 +117,18 @@
         <where>
             s.shjg = '3'
             <if test="xmmc != null  and xmmc != ''">and s.xmmc like concat( #{xmmc}, '%') </if>
-            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            <if test="params.beginTime != null and params.beginTime != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;
                 AND date_format(s.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
             </if>
-            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            <if test="params.endTime != null and params.endTime != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;
                 AND date_format(s.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
             </if>
         </where>
-        <!-- 数据范围过滤 -->
+        &lt;!&ndash; 数据范围过滤 &ndash;&gt;
         ${params.dataScope}
         GROUP BY
         s.xm_id
-    </select>
+    </select>-->
 
     <insert id="insertZsyzShyj" parameterType="ZsyzShyj" useGeneratedKeys="true" keyProperty="id">
         insert into zsyz_shyj