Merge branch 'feat-zyq-1002866' into 'master'

【1002866】小程序订阅消息授权流程

See merge request rays/pcloud-common-parent!104

pcloud-common-config/src/main/resources.test/public_system.properties

@@ -131,3 +131,4 @@ mini.appid.uat = wx125b30e53bf22476
 mini.appsecret.uat = 1eb5d1a2e1b262ea8f41e733f664a40c
 mini.appid.prod = wxd951244ee206df89
 mini.appsecret.prod = e3111585d219f7e96e35ef593b67ab2b
+mini.official.account.id = 777
\ No newline at end of file

pcloud-common-core/src/main/java/com/pcloud/common/core/biz/TemplateQueueBiz.java

 package com.pcloud.common.core.biz;
 
+import com.pcloud.common.core.dto.AppletTemplateMessageDto;
 import com.pcloud.common.core.dto.TemplateMessageDto;
 import com.pcloud.common.exceptions.BizException;
 
@@ -19,4 +20,11 @@ public interface TemplateQueueBiz {
 	 */
 	public void sendMessageQueue(TemplateMessageDto templateMessageDto) throws BizException;
 
+	/**
+	 * 发送小程序模板消息
+	 *
+	 * @param appletTemplateMessageDto
+	 */
+	public void sendAppletMessageQueue(AppletTemplateMessageDto appletTemplateMessageDto) throws BizException;
+
 }

pcloud-common-core/src/main/java/com/pcloud/common/core/biz/TemplateQueueBizImpl.java

 package com.pcloud.common.core.biz;
 
+import com.pcloud.common.core.dto.AppletTemplateMessageDto;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -30,4 +31,10 @@ public class TemplateQueueBizImpl implements TemplateQueueBiz {
 		amqpTemplate.convertAndSend(MQQueueConstant.TEMPLATE, templateMessageDto);
 	}
 
+	@Override
+	@ParamLog("发送小程序模板消息QUEUE")
+	public void sendAppletMessageQueue(AppletTemplateMessageDto appletTemplateMessageDto) throws BizException {
+		amqpTemplate.convertAndSend(MQQueueConstant.APPLET_TEMPLATE, appletTemplateMessageDto);
+	}
+
 }

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/MQQueueConstant.java

@@ -21,6 +21,11 @@ public class MQQueueConstant {
 	public static final String TEMPLATE = "templateQueue";
 
 	/**
+	 * 小程序模板消息
+	 */
+	public static final String APPLET_TEMPLATE = "appletTemplateQueue";
+
+	/**
 	 * 音频配音(MP3)
 	 */
 	public static final String DUBBING = "dubbingQueue";

pcloud-common-core/src/main/java/com/pcloud/common/core/dto/AppletTemplateMessageDto.java

+package com.pcloud.common.core.dto;
+
+import com.google.common.collect.Maps;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.Data;
+
+/**
+ * @ClassName com.pcloud.common.core.dto.AppletTemplateMessageDto
+ * @Author ZhengYongQiang
+ * @Description 小程序模板消息
+ * @Date 2020/5/9 14:12
+ * @Version 1.0
+ **/
+@Data
+public class AppletTemplateMessageDto implements Serializable {
+
+    @ApiModelProperty("渠道id")
+    private Long accountSettingId;
+
+    @ApiModelProperty("小程序用户id")
+    private Long wechatUserId;
+
+    @ApiModelProperty("模板code")
+    private String tempalteTypeCode;
+
+    @ApiModelProperty("跳转的小程序页面路由，不填不跳转")
+    private String page;
+
+    @ApiModelProperty("模板消息键值对")
+    private Map<String, String> data;
+
+    /**
+     * 结构转换
+     * @return
+     */
+    public Map<String, Map<String, String>> convertData(){
+        if(data == null || data.size() == 0){
+            return new HashMap<>();
+        }
+        Map<String, Map<String, String>> mapData = Maps.newHashMapWithExpectedSize(data.size());
+        Map<String, String> tempMap;
+        for (String key : data.keySet()){
+            tempMap = Maps.newHashMapWithExpectedSize(1);
+            tempMap.put("value", data.get(key));
+            mapData.put(key, tempMap);
+        }
+        return mapData;
+    }
+
+}