pc端推送消息完善

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualInspectionController.java

@@ -11,10 +11,12 @@ import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.project.dao.entity.Region;
 import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.business.push.service.PushUserService;
+import cn.com.ty.lift.common.constants.WebSocketConstants;
 import cn.com.ty.lift.common.model.CountPage;
 import cn.com.ty.lift.common.model.PushMessage;
 import cn.com.ty.lift.common.model.PushUserInfo;
 import cn.com.ty.lift.common.utils.DateUtils;
+import cn.com.ty.lift.common.utils.SendMessageUtil;
 import cn.com.ty.lift.common.utils.ValuePool;
 import cn.com.ty.lift.common.verify.Val;
 import cn.com.ty.lift.common.verify.Validate;
@@ -43,6 +45,7 @@ import java.io.OutputStream;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -276,7 +279,13 @@ public class AnnualInspectionController {
             }
             if(!userIds.isEmpty()){
                 List<PushUserInfo> pushUserInfos = pushUserService.listByUserIds(old.getMtCompanyId(), userIds);
-                PushMessage.inspectionConfirmCheckDate(info.getProjectName(), info.getDevicePosition(), info.getRegistrationCode(), info.getCheckDate()).sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfos);
+                PushMessage pushMessage = PushMessage.inspectionConfirmCheckDate(info.getProjectName(),
+                        info.getDevicePosition(), info.getRegistrationCode(), info.getCheckDate());
+                pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfos);
+                //pc端推送消息
+                List<Long> pushUserIds = pushUserInfos.stream().map(PushUserInfo::getUserId).collect(Collectors.toList());
+                SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, pushUserIds, pushMessage.getContent(),
+                        WebSocketConstants.MessageType.INSPECTION_MSG);
             }
         }
         return RestResponse.success(ai);

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -24,6 +24,7 @@ import cn.com.ty.lift.business.push.service.PushUserService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.constants.CommonEnum;
+import cn.com.ty.lift.common.constants.WebSocketConstants;
 import cn.com.ty.lift.common.export.ExportUtils;
 import cn.com.ty.lift.common.model.PushMessage;
 import cn.com.ty.lift.common.model.PushUserInfo;
@@ -210,7 +211,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
 
 
     /**
-     * @param liftId 电梯ID
+     * @param liftId      电梯ID
      * @param mtCompanyId 公司ID
      * @return
      * @description 新增电梯消息推送
@@ -241,7 +242,8 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
                     pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfos);
                     List<Long> sendToUserIdList = pushUserInfos.stream().map(PushUserInfo::getUserId).collect(Collectors.toList());
                     //推送pc端
-                    SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent());
+                    SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent(),
+                            WebSocketConstants.MessageType.WORK_MSG);
                 });
             }
         }
@@ -263,7 +265,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
         Long mtCompanyId = request.getMtCompanyId();
         Lift lift = request.getLift();
         if (maintenanceService.judge(mtCompanyId))
-        return RestResponse.fail(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.limit.num"));
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.limit.num"));
         RestResponse response = preJudgment(mtCompanyId, lift.getRegistrationCode());
         if (ApiConstants.RESULT_ERROR.equals(response.getStatusCode())) return response;
         //新增标记 (0:新增,1:查询后带入)
@@ -329,7 +331,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
     }
 
     /**
-     * @param projectId 项目ID
+     * @param projectId   项目ID
      * @param mtCompanyId 公司ID
      * @return
      * @description 更新电梯位置消息推送
@@ -360,7 +362,8 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
                     pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfos);
                     List<Long> sendToUserIdList = pushUserInfos.stream().map(PushUserInfo::getUserId).collect(Collectors.toList());
                     //推送pc端
-                    SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent());
+                    SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent(),
+                            WebSocketConstants.MessageType.WORK_MSG);
                 });
             }
         }
@@ -567,9 +570,10 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
 
     /**
      * 待确认年检计划，提前45天提醒
+     *
      * @return
      */
-    public IPage<LiftAnnualInspectionResponse> toConfirmAnnualInspection(IPage<LiftAnnualInspectionResponse> page, Long mtCompanyId, int days){
+    public IPage<LiftAnnualInspectionResponse> toConfirmAnnualInspection(IPage<LiftAnnualInspectionResponse> page, Long mtCompanyId, int days) {
         return baseMapper.toConfirmAnnualInspection(page, mtCompanyId, days);
     }
 

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/PlatformCompanyLiftRelevanceService.java

@@ -17,6 +17,7 @@ import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.business.project.service.ProjectService;
 import cn.com.ty.lift.business.push.service.PushUserService;
 import cn.com.ty.lift.common.constants.CommonEnum;
+import cn.com.ty.lift.common.constants.WebSocketConstants;
 import cn.com.ty.lift.common.model.PushMessage;
 import cn.com.ty.lift.common.model.PushUserInfo;
 import cn.com.ty.lift.common.utils.SendMessageUtil;
@@ -201,7 +202,8 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
             pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfos);
             List<Long> sendToUserIdList = pushUserInfos.stream().map(PushUserInfo::getUserId).collect(Collectors.toList());
             //推送pc端
-            SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent());
+            SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent(),
+                    WebSocketConstants.MessageType.WORK_MSG);
         }
     }
 
@@ -231,7 +233,8 @@ public class PlatformCompanyLiftRelevanceService extends ServiceImpl<PlatformCom
             pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfos);
             List<Long> sendToUserIdList = pushUserInfos.stream().map(PushUserInfo::getUserId).collect(Collectors.toList());
             //推送pc端
-            SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent());
+            SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent(),
+                    WebSocketConstants.MessageType.WORK_MSG);
         }
     }
 

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectLiftRelevanceService.java

@@ -16,6 +16,7 @@ import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResp
 import cn.com.ty.lift.business.project.dao.mapper.ProjectLiftRelevanceMapper;
 import cn.com.ty.lift.business.push.service.PushUserService;
 import cn.com.ty.lift.common.constants.CommonEnum;
+import cn.com.ty.lift.common.constants.WebSocketConstants;
 import cn.com.ty.lift.common.model.PushMessage;
 import cn.com.ty.lift.common.model.PushUserInfo;
 import cn.com.ty.lift.common.utils.SendMessageUtil;
@@ -249,7 +250,8 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
                 pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfos);
                 List<Long> sendToUserIdList = pushUserInfos.stream().map(PushUserInfo::getUserId).collect(Collectors.toList());
                 //推送pc端
-                SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent());
+                SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent(),
+                        WebSocketConstants.MessageType.WORK_MSG);
             });
         }
     }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -17,6 +17,7 @@ import cn.com.ty.lift.business.push.service.PushUserService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.ty.lift.common.constants.CommonEnum.ProjectStatus;
+import cn.com.ty.lift.common.constants.WebSocketConstants;
 import cn.com.ty.lift.common.export.ExportUtils;
 import cn.com.ty.lift.common.model.PushMessage;
 import cn.com.ty.lift.common.model.PushUserInfo;
@@ -142,7 +143,8 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
             pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfos);
             List<Long> sendToUserIdList = pushUserInfos.stream().map(PushUserInfo::getUserId).collect(Collectors.toList());
             //推送pc端
-            SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent());
+            SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent(),
+                    WebSocketConstants.MessageType.WORK_MSG);
         }
     }
 
@@ -313,7 +315,8 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
             }
             List<Long> sendToUserIdList = pushUserInfos.stream().map(PushUserInfo::getUserId).collect(Collectors.toList());
             //推送pc端
-            SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent());
+            SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent(),
+                    WebSocketConstants.MessageType.WORK_MSG);
         }
     }
 

lift-common/src/main/java/cn.com.ty.lift.common/utils/SendMessageUtil.java

@@ -20,18 +20,23 @@ public class SendMessageUtil {
      * @param jmsMessagingTemplate 推送消息模板
      * @param sendToUserIdList     要推送的用户id
      * @param content              推送的消息内容
+     * @param msgType              消息类型 : 1 团队消息
+     *                                       2 公司消息
+     *                                       3 保养消息
+     *                                       4 急修消息
+     *                                       5 年检消息
+     *                                       6 提醒(消息简报)
      * @return 是否推送成功 false 失败 true 成功
      * @description
      * @date 2020/5/2 4:11 下午
      */
     public static boolean sendMessageToPC(JmsMessagingTemplate jmsMessagingTemplate, List<Long> sendToUserIdList,
-                                          String content) {
+                                          String content, int msgType) {
         if (sendToUserIdList != null && sendToUserIdList.size() > 0) {
             //组合消息
             List<TimeMessage> TimeMessageList = new ArrayList<>();
             sendToUserIdList.forEach(sendToUserId -> {
-                TimeMessageList.add(TimeMessage.create(sendToUserId,
-                        WebSocketConstants.MessageType.TEAM_MSG, content));
+                TimeMessageList.add(TimeMessage.create(sendToUserId, msgType, content));
             });
             //推送消息
             return SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, TimeMessageList);
@@ -41,7 +46,7 @@ public class SendMessageUtil {
 
     /**
      * @param jmsMessagingTemplate 推动模板类
-     * @param TimeMessageList     要推送的消息列表
+     * @param TimeMessageList      要推送的消息列表
      * @return 是否成功 false 失败 true 成功
      * @description 将消息推送到PC端
      * @date 2020/5/2 3:38 下午

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/LoginService.java

@@ -226,7 +226,7 @@ public class LoginService implements ILoginService {
                 .eq("applet_open_id", openId)
         );
         if (userAccount == null) {
-            return RestResponse.fail(ApiConstants.RESULT_NO_DATA, "用户尚未绑定用户信息");
+            return RestResponse.success(openId, ApiConstants.RESULT_NO_DATA, "用户尚未绑定用户信息");
         }
         userRequest.setMobile(userAccount.getMobile());
         UserResponse userResponse = userService.getAppletUserInfo(userAccount.getUserId());

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserApplicationService.java

@@ -2,6 +2,7 @@ package cn.com.ty.lift.system.user.service.impl;
 
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.constants.CommonEnum;
+import cn.com.ty.lift.common.constants.WebSocketConstants;
 import cn.com.ty.lift.common.model.PushMessage;
 import cn.com.ty.lift.common.model.PushUserInfo;
 import cn.com.ty.lift.common.utils.ProjectUtils;
@@ -351,7 +352,8 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         //申请加入团队成功，给公司所有文员推送信息
         List<Long> clerkIds = userService.getUserIdByCompanyIdAndRoleCode(companyId,
                 CommonEnum.DefaultRole.CLERK.getCode());
-        return SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, clerkIds, content);
+        return SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, clerkIds, content,
+                WebSocketConstants.MessageType.TEAM_MSG);
     }
 
     /**
@@ -386,7 +388,8 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
             //将消息推送到pc端
             List<Long> userIdList = pushUserInfoList.stream().map(PushUserInfo::getUserId)
                     .collect(Collectors.toList());
-            SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, userIdList, content);
+            SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, userIdList, content,
+                    WebSocketConstants.MessageType.TEAM_MSG);
             return true;
         }
         return false;