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

lift-common/src/main/java/cn.com.ty.lift.common/constants/ApiConstants.java

@@ -67,22 +67,22 @@ public class ApiConstants {
     public static final String CURRENT_USER_TYPE = "currentUserType";
 
     /**
-     *  访问类型 pc端访问
+     * 访问类型 pc端访问
      */
     public static final int ACCESS_TYPE_PC = 0;
 
     /**
-     *  访问类型 app端访问
+     * 访问类型 app端访问
      */
     public static final int ACCESS_TYPE_APP = 1;
 
     /**
-     *  访问类型 公众号端访问
+     * 访问类型 公众号端访问
      */
     public static final int ACCESS_TYPE_PUBLIC = 2;
 
     /**
-     *  访问类型 小程序端访问
+     * 访问类型 小程序端访问
      */
     public static final int ACCESS_TYPE_APPLETS = 3;
 
@@ -325,4 +325,9 @@ public class ApiConstants {
         String ADD_AUTHORITY = "addAuthority";
     }
 
+    public interface DeviceModel {
+        Integer Android = 1;
+        Integer IOS = 2;
+        Integer PC = 3;
+    }
 }

lift-push/src/main/java/cn/com/ty/lift/push/app/PushConsumer.java

@@ -139,7 +139,7 @@ public class PushConsumer {
      */
     private void saveMessage(PushMessage pushMessage) {
         List<String> toList = pushMessage.getToList();
-        List<UserAccount> userAccounts = userAccountService.list(Wrappers.<UserAccount>query().in(!toList.isEmpty(),"device_flag", toList));
+        List<UserAccount> userAccounts = userAccountService.list(Wrappers.<UserAccount>query().in(!toList.isEmpty(), "device_flag", toList));
         List<TimeMessage> timeMessages = new ArrayList<>();
         for (UserAccount userAccount : userAccounts) {
             TimeMessage timeMessage = new TimeMessage();
@@ -160,11 +160,11 @@ public class PushConsumer {
                     break;
             }
             timeMessage.setDeviceModel(userAccount.getDeviceModel());
-            timeMessage.setUserId(10000L);
+            timeMessage.setCreateUserId(10000L);
             timeMessage.setCreateTime(LocalDateTime.now());
             timeMessages.add(timeMessage);
         }
-        log.info("消息记录列表:"+timeMessages.toString());
+        log.info("消息记录列表:" + timeMessages.toString());
         timeMessageService.saveBatch(timeMessages);
     }
 }

lift-push/src/main/java/cn/com/ty/lift/push/message/controller/TimeMessageController.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.push.message.controller;
 
+import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.push.message.dao.entity.TimeMessage;
 import cn.com.ty.lift.push.message.object.MessageBO;
 import cn.com.ty.lift.push.message.object.MessageVo;
@@ -34,12 +35,14 @@ public class TimeMessageController {
         IPage<TimeMessage> result = timeMessageService.page(page, Wrappers.<TimeMessage>query()
                 .eq(messageVo.getUserId() != null, "user_id", messageVo.getUserId())
                 .eq(messageVo.getType() != null, "type", messageVo.getType())
+                .notIn("device_model", ApiConstants.DeviceModel.PC)
                 .orderByAsc("view_flag", "create_time"));
         MessageBO messageBO = MessageBO.pageCastMessageBo(result);
         messageBO.setReadCount((long) timeMessageService.count(Wrappers.<TimeMessage>query()
                 .eq(messageVo.getUserId() != null, "user_id", messageVo.getUserId())
                 .eq("view_flag", 1)
-                .eq("type", messageVo.getType())));
+                .eq("type", messageVo.getType())
+                .notIn("device_model", ApiConstants.DeviceModel.PC)));
         messageBO.setUnreadCount(messageBO.getTotal() - messageBO.getReadCount());
         return RestResponse.success(messageBO);
     }
@@ -57,14 +60,15 @@ public class TimeMessageController {
     }
 
     /**
+     * 设置多条消息已读
+     *
      * @param messageVo id列表
-     * @return 多条消息详情
+     * @return 操作结果
      */
-    @PostMapping("details")
-    public RestResponse<Collection<TimeMessage>> messages(@RequestBody MessageVo messageVo) {
+    @PostMapping("read")
+    public RestResponse<Boolean> messages(@RequestBody MessageVo messageVo) {
         Collection<TimeMessage> timeMessages = timeMessageService.listByIds(messageVo.getIds());
         timeMessages.forEach(timeMessage -> timeMessage.setViewFlag(1));
-        timeMessageService.updateBatchById(timeMessages);
-        return RestResponse.success(timeMessages);
+        return RestResponse.success(timeMessageService.updateBatchById(timeMessages));
     }
 }