upush mongo

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/admin/AdminUpushVo.java

+package com.liquidnet.service.adam.dto.vo.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * upush 系统消息
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-07-15
+ */
+@ApiModel
+@Data
+public class AdminUpushVo {
+
+    @ApiModelProperty(value = "upush_id")
+    private String upushId;
+
+    @ApiModelProperty(value = "推送设备 1all 2ios 3android")
+    private Integer pushRange;
+
+    @ApiModelProperty(value = "推送标题")
+    private String pushTitle;
+
+    @ApiModelProperty(value = "推送内容")
+    private String pushContent;
+
+    @ApiModelProperty(value = "封面图")
+    private String img;
+
+    @ApiModelProperty(value = "跳转类型 0打开APP,16演出首页,17商城首页,5场地详情,6票务详情,7商品详情,14商品集合,20音乐人详情,24音乐人集合,21歌曲详情,22专辑详情,26摩登会员,12活动跳转可分享,100活动跳转,32系统消息列表")
+    private Integer jumpType;
+
+    @ApiModelProperty(value = "跳转值 id或者url或者空 根据type区分")
+    private String jumpValue;
+
+    @ApiModelProperty(value = "跳转对应的值名称")
+    private String jumpContent;
+
+    @ApiModelProperty(value = "推送时间 定时推送")
+    private String pushTime;
+
+    @ApiModelProperty(value = "是否发送推送消息，2不发送 1发送推送消息")
+    private Integer isPush;
+
+    @ApiModelProperty(value = "发送类型，2立即发送 1定时发送")
+    private Integer sendType;
+
+    @ApiModelProperty(value = "消息类型，2系统消息 1会员消息 会员不做了 默认2")
+    private Integer messageType;
+
+    @ApiModelProperty(value = "用户类型，2全部用户 1指定手机号 指定手机不做了默认2")
+    private Integer specifyType;
+
+    @ApiModelProperty(value = "消息展示类型，2普通文本，1图文排版")
+    private Integer messageShowType;
+
+    @ApiModelProperty(value = "推送者ID")
+    private String pushedBy;
+
+    @ApiModelProperty(value = "推送者姓名")
+    private String pushedName;
+
+    @ApiModelProperty(value = "任务类消息(type为broadcast、groupcast、filecast、customizedcast且file_id不为空)返回")
+    private String taskId;
+
+    @ApiModelProperty(value = "单播类消息(type为unicast、listcast、customizedcast且不带file_id)返回")
+    private String msgId;
+
+    @ApiModelProperty(value = "错误码")
+    private String errorCode;
+
+    @ApiModelProperty(value = "错误信息")
+    private String errorMsg;
+
+    private String createdAt;
+
+    private String updatedAt;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/ZhengzaiAppVersionsVo.java

@@ -5,7 +5,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 
-
 /**
  * <p>
  * 正在现场app版本控制 返回给前端的数据字段
@@ -14,11 +13,10 @@ import java.io.Serializable;
  * @author jiangxiulong
  * @since 2021-07-11
  */
-
 @Data
 @ApiModel
 public class ZhengzaiAppVersionsVo implements Serializable {
-//    @ApiModelProperty(value = "Banner主键ID")
+//    @ApiModelProperty(value = "")
     private String zhengzaiAppVersionsId;
 
     private String name;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/AdminUpushServiceImpl.java

@@ -9,8 +9,10 @@ import com.liquidnet.client.admin.zhengzai.kylin.utils.upush.AndroidNotification
 import com.liquidnet.client.admin.zhengzai.kylin.utils.upush.PushClient;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.upush.android.AndroidBroadcast;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.upush.ios.IOSBroadcast;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.service.adam.dto.vo.admin.AdminUpushVo;
 import com.liquidnet.service.kylin.dao.UpushDetailsListDao;
 import com.liquidnet.service.kylin.dto.param.admin.UpushParam;
 import com.liquidnet.service.kylin.dto.param.admin.UpushSearchParam;
@@ -22,6 +24,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
+import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -60,6 +63,12 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
     @Autowired
     private AdminUpushMapper adminUpushMapper;
 
+    @Autowired
+    MongoTemplate mongoTemplate;
+
+    @Autowired
+    RedisUtil redisUtil;
+
     public Boolean create(UpushParam upushParam) {
         try {
             // 入数据库
@@ -77,6 +86,11 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
             }
             adminUpushMapper.insert(adminUpush);
 
+            // 处理缓存数据
+            AdminUpushVo adminUpushVo = new AdminUpushVo();
+            BeanUtils.copyProperties(adminUpush, adminUpushVo);
+            mongoTemplate.insert(adminUpushVo, AdminUpushVo.class.getSimpleName());
+
             if (adminUpush.getIsPush() == 1) {
                 if (adminUpush.getPushRange() == 1) {
                     sendAndroidBroadcast(adminUpush);

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/AdminUpush.java

@@ -29,15 +29,10 @@ public class AdminUpush implements Serializable {
     private String upushId;
 
     /**
-     * 推送设备all ios android
+     * 推送设备 1all 2ios 3android
      */
     private Integer pushRange;
 
-    /**
-     * 推送号码
-     */
-    private String mobile;
-
     /**
      * 推送标题
      */
@@ -54,7 +49,7 @@ public class AdminUpush implements Serializable {
     private String img;
 
     /**
-     * 跳转类型 go_app,go_channel,go_super_channel,normal_play,normal_live,ugc_play,ugc_live,ad_link,promotion,ticket,tour,goods,area
+     * 跳转类型
      */
     private Integer jumpType;
 
@@ -64,7 +59,7 @@ public class AdminUpush implements Serializable {
     private String jumpValue;
 
     /**
-     * 跳转对应的值
+     * 跳转对应的值名称
      */
     private String jumpContent;
 
@@ -84,12 +79,12 @@ public class AdminUpush implements Serializable {
     private Integer sendType;
 
     /**
-     * 消息类型，2系统消息 1会员消息
+     * 消息类型，2系统消息 1会员消息 会员不做了 默认2
      */
     private Integer messageType;
 
     /**
-     * 用户类型，2全部用户 1指定手机号
+     * 用户类型，2全部用户 1指定手机号 指定手机不做了默认2
      */
     private Integer specifyType;
 
@@ -109,16 +104,27 @@ public class AdminUpush implements Serializable {
     private String pushedName;
 
     /**
-     * 推送任务ID
+     * 任务类消息(type为broadcast、groupcast、filecast、customizedcast且file_id不为空)返回
      */
     private String taskId;
+
+    /**
+     * 单播类消息(type为unicast、listcast、customizedcast且不带file_id)返回
+     */
     private String msgId;
+
+    /**
+     * 错误码
+     */
     private String errorCode;
+
+    /**
+     * 错误信息
+     */
     private String errorMsg;
 
     private String createdAt;
 
     private String updatedAt;
 
-
 }
\ No newline at end of file