add(backend) [推送2.0 版本]

operation-backend/src/main/java/com/idiot/operationbackend/controller/interactive/FollowReplyController.java

@@ -2,9 +2,7 @@ package com.idiot.operationbackend.controller.interactive;
 
 import com.idiot.operationbackend.entity.*;
 import com.idiot.operationbackend.service.facade.AccountService;
-import com.idiot.operationbackend.service.facade.ArticlesService;
 import com.idiot.operationbackend.service.facade.FollowReplyService;
-import com.idiot.operationbackend.service.facade.MaterialService;
 import com.idiot.operationbackend.support.JsonResult;
 import com.idiot.operationbackend.util.JwtTokenUtil;
 import io.swagger.annotations.Api;
@@ -37,12 +35,6 @@ public class FollowReplyController {
     @Autowired
     private FollowReplyService followReplyService;
 
-    @Autowired
-    private MaterialService materialService;
-
-    @Autowired
-    private ArticlesService articlesService;
-
 
 
     @GetMapping
@@ -77,7 +69,6 @@ public class FollowReplyController {
             Account account = accountService.getById(accountId);
             followReply = nonReply(account);
         }
-        queryContents(followReply);
         return ResponseEntity.ok(JsonResult.success(followReply));
     }
 
@@ -102,19 +93,6 @@ public class FollowReplyController {
         return reply;
     }
 
-    private void queryContents(FollowReply reply) {
-        String artIds = reply.getArticlesIds();
-        List<Object> content = new ArrayList<>();
-        List<Articles> articles = articlesService.queryArticlesByIds(artIds);
-        if (Objects.nonNull(articles)) {
-            content.addAll(articles);
-        }
-        String matIds = reply.getMaterialIds();
-        List<Material> materials = materialService.queryByIds(matIds);
-        if (Objects.nonNull(materials)) {
-            content.addAll(materials);
-        }
-        reply.setContents(content);
-    }
+
 
 }

operation-backend/src/main/java/com/idiot/operationbackend/controller/interactive/PushMsgController.java

@@ -2,12 +2,8 @@ package com.idiot.operationbackend.controller.interactive;
 
 import com.idiot.operationbackend.entity.Account;
 import com.idiot.operationbackend.entity.AccountPush;
-import com.idiot.operationbackend.entity.Articles;
-import com.idiot.operationbackend.entity.Material;
 import com.idiot.operationbackend.service.facade.AccountPushService;
 import com.idiot.operationbackend.service.facade.AccountService;
-import com.idiot.operationbackend.service.facade.ArticlesService;
-import com.idiot.operationbackend.service.facade.MaterialService;
 import com.idiot.operationbackend.support.JsonResult;
 import com.idiot.operationbackend.util.JwtTokenUtil;
 import io.swagger.annotations.Api;
@@ -44,12 +40,6 @@ public class PushMsgController {
     @Autowired
     private AccountPushService pushService;
 
-    @Autowired
-    private MaterialService materialService;
-
-    @Autowired
-    private ArticlesService articlesService;
-
 
     @GetMapping
     @ApiOperation(value = "查询推送列表")
@@ -93,7 +83,6 @@ public class PushMsgController {
             Account account = accountService.getById(accountId);
             accountPush = nonPush(account);
         }
-        queryContents(accountPush);
         return ResponseEntity.ok(JsonResult.success(accountPush));
     }
 
@@ -106,20 +95,7 @@ public class PushMsgController {
         return push;
     }
 
-    private void queryContents(AccountPush accountPush) {
-        String artIds = accountPush.getArticlesIds();
-        String matIds = accountPush.getMaterialIds();
-        List<Object> content = new ArrayList<>();
-        List<Articles> articles = articlesService.queryArticlesByIds(artIds);
-        List<Material> materials = materialService.queryByIds(matIds);
-        if (Objects.nonNull(articles)) {
-            content.addAll(articles);
-        }
-        if (Objects.nonNull(materials)) {
-            content.addAll(materials);
-        }
-        accountPush.setContents(content);
-    }
+
 
 
 

operation-backend/src/main/java/com/idiot/operationbackend/controller/interactive/QrCodeController.java

@@ -14,9 +14,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -39,13 +37,6 @@ public class QrCodeController {
     private QrCodeService qrCodeService;
 
 
-    @Autowired
-    private MaterialService materialService;
-
-    @Autowired
-    private ArticlesService articlesService;
-
-
     @Autowired
     private WeChatService weChatService;
 
@@ -67,7 +58,6 @@ public class QrCodeController {
         String userId = JwtTokenUtil.getUserId(token);
         logger.info("用户:{}查询二维码:{}详情",userId,id);
         QrCode qrCode = qrCodeService.getById(id);
-        queryContents(qrCode);
         return ResponseEntity.ok(JsonResult.success(qrCode));
     }
 
@@ -88,19 +78,5 @@ public class QrCodeController {
     }
 
 
-    private void queryContents(QrCode qrCode) {
-        String artIds = qrCode.getArticlesIds();
-        String matIds = qrCode.getMaterialIds();
-        List<Object> content = new ArrayList<>();
-        List<Articles> articles = articlesService.queryArticlesByIds(artIds);
-        if (Objects.nonNull(articles)) {
-            content.addAll(articles);
-        }
-
-        List<Material> materials = materialService.queryByIds(matIds);
-        if (Objects.nonNull(materials)) {
-            content.addAll(materials);
-        }
-        qrCode.setContents(content);
-    }
+
 }

operation-backend/src/main/java/com/idiot/operationbackend/entity/AccountPush.java

@@ -36,15 +36,10 @@ public class AccountPush {
 
     private Boolean enable;
 
-    private String materialIds;
-
-    private String articlesIds;
+    private String contents;
 
     private String createTime;
 
-    @TableField(exist = false)
-    private List<Object> contents;
-
     @TableField(exist = false)
     private boolean setUp;
 
@@ -120,14 +115,6 @@ public class AccountPush {
         this.pushLimit = pushLimit;
     }
 
-    public String getMaterialIds() {
-        return materialIds;
-    }
-
-    public void setMaterialIds(String materialIds) {
-        this.materialIds = materialIds;
-    }
-
     public Boolean getEnable() {
         return enable;
     }
@@ -144,27 +131,39 @@ public class AccountPush {
         this.createTime = createTime;
     }
 
-    public String getArticlesIds() {
-        return articlesIds;
+    public boolean isSetUp() {
+        return setUp;
     }
 
-    public void setArticlesIds(String articlesIds) {
-        this.articlesIds = articlesIds;
+    public void setSetUp(boolean setUp) {
+        this.setUp = setUp;
     }
 
-    public List<Object> getContents() {
+    public String getContents() {
         return contents;
     }
 
-    public void setContents(List<Object> contents) {
+    public void setContents(String contents) {
         this.contents = contents;
     }
 
-    public boolean isSetUp() {
-        return setUp;
-    }
 
-    public void setSetUp(boolean setUp) {
-        this.setUp = setUp;
+    @Override
+    public String toString() {
+        return "AccountPush{" +
+                "id='" + id + '\'' +
+                ", accountId='" + accountId + '\'' +
+                ", nikeName='" + nikeName + '\'' +
+                ", headImage='" + headImage + '\'' +
+                ", pushType=" + pushType +
+                ", pushTimer='" + pushTimer + '\'' +
+                ", quiet='" + quiet + '\'' +
+                ", trigger=" + trigger +
+                ", pushLimit=" + pushLimit +
+                ", enable=" + enable +
+                ", contents='" + contents + '\'' +
+                ", createTime='" + createTime + '\'' +
+                ", setUp=" + setUp +
+                '}';
     }
 }

operation-backend/src/main/java/com/idiot/operationbackend/entity/CustomerMsg.java

@@ -0,0 +1,19 @@
+package com.idiot.operationbackend.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+
+/**
+ * 客服消息
+ * @author wang xiao
+ * @date Created in 13:55 2020/9/22
+ */
+public class CustomerMsg {
+
+    @TableId
+    private String id;
+
+    private String accountId;
+
+    private String label;
+
+}

operation-backend/src/main/java/com/idiot/operationbackend/entity/FollowReply.java

@@ -27,15 +27,10 @@ public class FollowReply {
 
     private Boolean enable;
 
-    private String materialIds;
-
-    private String articlesIds;
+    private String contents;
 
     private String createTime;
 
-    @TableField(exist = false)
-    private List<Object> contents;
-
     @TableField(exist = false)
     private Boolean setUp;
 
@@ -87,22 +82,6 @@ public class FollowReply {
         this.enable = enable;
     }
 
-    public String getMaterialIds() {
-        return materialIds;
-    }
-
-    public void setMaterialIds(String materialIds) {
-        this.materialIds = materialIds;
-    }
-
-    public String getArticlesIds() {
-        return articlesIds;
-    }
-
-    public void setArticlesIds(String articlesIds) {
-        this.articlesIds = articlesIds;
-    }
-
     public String getCreateTime() {
         return createTime;
     }
@@ -111,14 +90,6 @@ public class FollowReply {
         this.createTime = createTime;
     }
 
-    public List<Object> getContents() {
-        return contents;
-    }
-
-    public void setContents(List<Object> contents) {
-        this.contents = contents;
-    }
-
     public Boolean getSetUp() {
         return setUp;
     }
@@ -126,4 +97,27 @@ public class FollowReply {
     public void setSetUp(Boolean setUp) {
         this.setUp = setUp;
     }
+
+    public String getContents() {
+        return contents;
+    }
+
+    public void setContents(String contents) {
+        this.contents = contents;
+    }
+
+    @Override
+    public String toString() {
+        return "FollowReply{" +
+                "id='" + id + '\'' +
+                ", accountId='" + accountId + '\'' +
+                ", nikeName='" + nikeName + '\'' +
+                ", headImage='" + headImage + '\'' +
+                ", pushType=" + pushType +
+                ", enable=" + enable +
+                ", contents='" + contents + '\'' +
+                ", createTime='" + createTime + '\'' +
+                ", setUp=" + setUp +
+                '}';
+    }
 }

operation-backend/src/main/java/com/idiot/operationbackend/entity/QrCode.java

@@ -44,16 +44,13 @@ public class QrCode {
 
     private Integer pushType;
 
-    private String materialIds;
-
-    private String articlesIds;
+    private String content;
 
     private String createTime;
 
     private String expireTime;
 
-    @TableField(exist = false)
-    private List<Object> contents;
+
 
 
     public String getId() {
@@ -128,30 +125,6 @@ public class QrCode {
         this.pushType = pushType;
     }
 
-    public String getMaterialIds() {
-        return materialIds;
-    }
-
-    public void setMaterialIds(String materialIds) {
-        this.materialIds = materialIds;
-    }
-
-    public String getArticlesIds() {
-        return articlesIds;
-    }
-
-    public void setArticlesIds(String articlesIds) {
-        this.articlesIds = articlesIds;
-    }
-
-    public List<Object> getContents() {
-        return contents;
-    }
-
-    public void setContents(List<Object> contents) {
-        this.contents = contents;
-    }
-
     public String getCreateTime() {
         return createTime;
     }
@@ -192,6 +165,13 @@ public class QrCode {
         this.ticket = ticket;
     }
 
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
 
     @Override
     public String toString() {
@@ -208,11 +188,9 @@ public class QrCode {
                 ", url='" + url + '\'' +
                 ", ticket='" + ticket + '\'' +
                 ", pushType=" + pushType +
-                ", materialIds='" + materialIds + '\'' +
-                ", articlesIds='" + articlesIds + '\'' +
+                ", content='" + content + '\'' +
                 ", createTime='" + createTime + '\'' +
                 ", expireTime='" + expireTime + '\'' +
-                ", contents=" + contents +
                 '}';
     }
 }

operation-backend/src/main/java/com/idiot/operationbackend/service/impl/AccountMenuServiceImpl.java

@@ -8,7 +8,6 @@ import com.idiot.operationbackend.service.facade.AccountMenuService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -25,7 +24,8 @@ public class AccountMenuServiceImpl extends ServiceImpl<AccountMenuMapper, Accou
     @Override
     public List<AccountMenu> queryMenuByAccountId(String accountId) {
         List<AccountMenu> accountMenus = list(Wrappers.<AccountMenu>lambdaQuery()
-                .eq(AccountMenu::getAccountId,accountId));
+                .eq(AccountMenu::getAccountId,accountId)
+                .orderByAsc(AccountMenu::getId));
         if (CollectionUtils.isEmpty(accountMenus)) {
             return accountMenus;
         }

operation-backend/src/main/java/com/idiot/operationbackend/support/Constants.java

@@ -20,7 +20,6 @@ public class Constants {
 
     public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss",DEFAULT_LOCALE);
 
-    public static final DateTimeFormatter DATE_TIME_FORMATTER1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH",DEFAULT_LOCALE);
 
     public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd",DEFAULT_LOCALE);
 

sql/dataBase.sql

@@ -208,15 +208,15 @@ CREATE TABLE `t_account_push`  (
   `trigger` int(0) NULL DEFAULT 111 COMMENT '第一位关注公众号，第二位 发送消息到公众号 第三位 点击菜单',
   `push_limit` int(0) NULL DEFAULT NULL COMMENT '推送限制',
   `enable` int(0) NULL DEFAULT NULL COMMENT '开关',
-  `material_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '素材id',
-  `articles_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '图文id',
   `nike_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '名称冗余字段',
   `head_image` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT 'headImage 冗余字段',
+  `contents` json NULL COMMENT '推送内容',
   `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '推送内容' ROW_FORMAT = Dynamic;
 
 
+
 -- ----------------------------
 -- Table structure for t_account_material 素材
 -- ----------------------------
@@ -263,12 +263,12 @@ CREATE TABLE `t_account_follow_reply`  (
   `head_image` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '头像',
   `push_type` int(0) NULL DEFAULT NULL COMMENT '推送方式:0-全部推送,1-按顺序推送,2-随机推送一条',
   `enable` tinyint(1) NULL DEFAULT NULL COMMENT '开关',
-  `material_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '素材id',
-  `articles_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '图文id',
+  `contents` json NULL COMMENT '回复内容',
   `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '被关注回复' ROW_FORMAT = Dynamic;
 
+
 -- ----------------------------
 -- Table structure for t_qr_code 二维码
 -- ----------------------------
@@ -284,11 +284,10 @@ CREATE TABLE `t_qr_code`  (
   `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '二维码地址',
   `ticket` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT 'ticket',
   `push_type` int(0) NULL DEFAULT NULL COMMENT '推送方式',
-  `material_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '素材id',
-  `articles_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '图文id',
   `nike_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '公众号名称 冗余',
   `head_img` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '公众号头像 冗余',
   `expire_time` datetime(0) NULL DEFAULT NULL COMMENT '过期时间',
+  `contents` json NULL COMMENT '扫描二维码推送内容',
   `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '二维码' ROW_FORMAT = Dynamic;