Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/job/BusinessJob.java

@@ -67,7 +67,7 @@ public class BusinessJob {
     /**
      * 查询当天所有维保工的维保任务并提醒
      */
-    @Scheduled(cron = "0 */5 * * * ?")
+    @Scheduled(cron = "0 0 7 * * ?")
     public void sendMaintenanceTask() {
         //查询所有维保工当天的维保任务
         List<MaintenanceTask> maintenanceTasks = maintenancePlanMapper.queryMaintenanceTask();

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

@@ -273,7 +273,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
         boolean ret = saveProject(project);
         if (!ret) return RestResponse.fail(MessageUtils.get("msg.add.fail"));
         //新增项目消息推送
-        sendMessage(project.getId(), request.getMtCompanyId(), project.getProjectStatus());
+        sendMessage(project.getId(), project.getMtCompanyId(), project.getProjectStatus());
         //批量新增项目成员信息
         List<ProjectUser> users = request.getUserList();
         users.forEach(user -> user.setProjectId(project.getId()));

lift-business-service/src/main/java/cn/com/ty/lift/business/push/entity/InspectionTips.java

@@ -2,6 +2,7 @@ package cn.com.ty.lift.business.push.entity;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -13,6 +14,7 @@ import java.util.stream.Collectors;
  * @since 2020/4/24
  */
 @Data
+@NoArgsConstructor
 public class InspectionTips {
     /**
      * 维保公司id

lift-business-service/src/main/java/cn/com/ty/lift/business/push/entity/RepairTips.java

@@ -2,6 +2,7 @@ package cn.com.ty.lift.business.push.entity;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -16,6 +17,7 @@ import java.util.stream.Collectors;
  * @since 2020/4/24
  */
 @Data
+@NoArgsConstructor
 public class RepairTips {
     /**
      * 维保公司id

lift-business-service/src/main/java/cn/com/ty/lift/business/push/entity/TaskTips.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.business.push.entity;
 
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * TODO
@@ -9,6 +10,7 @@ import lombok.Data;
  * @since 2020/4/29
  */
 @Data
+@NoArgsConstructor
 public class TaskTips {
     private long mtCompanyId;
 

lift-business-service/src/main/resources/mapper/project/ProjectMapper.xml

@@ -217,8 +217,8 @@
 				 LEFT JOIN user_info ui ON r.user_id = ui.user_id
 				 LEFT JOIN property_company pc ON p.pp_company_id = pc.id
 		WHERE 1=1
-		<if test="request.id!=null and request.id!=''">
-			AND p.id = #{request.id,jdbcType=BIGINT}
+		<if test="id!=null and id!=''">
+			AND p.id = #{id,jdbcType=BIGINT}
 		</if>
 		    ) t
 		LEFT JOIN property_contact pcc ON t.contact_id = pcc.id

lift-business-service/src/main/resources/mapper/push/PushUserMapper.xml

@@ -112,7 +112,7 @@
 
     <select id="findRegionByEmergencyRepair" resultType="cn.com.ty.lift.business.project.dao.entity.Region">
         SELECT
-            re.user_id,
+            re.user_id AS userId,
             re.clerk
         FROM emergency_repair er
             LEFT JOIN project pr ON pr.id = er.project_id
@@ -129,7 +129,7 @@
 
     <select id="findRegionByAnnualInspection" resultType="cn.com.ty.lift.business.project.dao.entity.Region">
         SELECT
-            re.user_id,
+            re.user_id AS userId,
             re.clerk
         FROM annual_inspection ai
             LEFT JOIN project_lift_relevance plr ON plr.lift_id = ai.lift_id AND plr.mt_company_id = ai.mt_company_id
@@ -147,7 +147,7 @@
 
     <select id="findRegionByProject" resultType="cn.com.ty.lift.business.project.dao.entity.Region">
         SELECT
-            re.user_id,
+            re.user_id AS userId,
             re.clerk
         FROM project pr
             LEFT JOIN region re ON re.id = pr.region_id

lift-common/src/main/java/cn.com.ty.lift.common/model/PushMessage.java

@@ -573,10 +573,7 @@ public class PushMessage implements Serializable {
      */
     public boolean sendTokenOnPlatform(JmsMessagingTemplate jmsMessagingTemplate, PushUserInfo pushUserInfo) {
         try {
-            if (Objects.isNull(pushUserInfo)) {
-                return false;
-            }
-            if(!pushUserInfo.available()){
+            if (Objects.isNull(pushUserInfo) || !pushUserInfo.available()) {
                 return false;
             }
             this.add(pushUserInfo.getDeviceFlag());

lift-common/src/main/java/cn.com.ty.lift.common/model/PushUserInfo.java

@@ -2,7 +2,9 @@ package cn.com.ty.lift.common.model;
 
 import cn.com.ty.lift.common.utils.ValuePool;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.util.Objects;
 
 /**
@@ -11,7 +13,8 @@ import java.util.Objects;
  * @description 推送模块用户信息
  */
 @Data
-public class PushUserInfo {
+@NoArgsConstructor
+public class PushUserInfo implements Serializable {
 
     /**
      * 用户id