|  | @ -3,8 +3,7 @@ package com.yihu.jw.base.endpoint.wx;
 | 
	
		
			
				|  |  | import com.alibaba.fastjson.JSONArray;
 | 
	
		
			
				|  |  | import com.yihu.jw.base.service.wx.WechatService;
 | 
	
		
			
				|  |  | import com.yihu.jw.entity.base.wx.*;
 | 
	
		
			
				|  |  | import com.yihu.jw.restmodel.base.wx.WxReplySceneVO;
 | 
	
		
			
				|  |  | import com.yihu.jw.restmodel.base.wx.WxTemplateConfigVO;
 | 
	
		
			
				|  |  | import com.yihu.jw.restmodel.base.wx.*;
 | 
	
		
			
				|  |  | import com.yihu.jw.restmodel.web.Envelop;
 | 
	
		
			
				|  |  | import com.yihu.jw.restmodel.web.MixEnvelop;
 | 
	
		
			
				|  |  | import com.yihu.jw.restmodel.web.ObjEnvelop;
 | 
	
	
		
			
				|  | @ -33,18 +32,18 @@ public class WechatController extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @GetMapping(value = BaseRequestMapping.WeChat.getWechatInfos)
 | 
	
		
			
				|  |  |     @ApiOperation(value = "获取微信基本信息列表", notes = "获取微信基本信息列表")
 | 
	
		
			
				|  |  |     public MixEnvelop getWxWechatList(@ApiParam(name = "name", value = "微信名称")
 | 
	
		
			
				|  |  |                                       @RequestParam(value = "name", required = false) String name,
 | 
	
		
			
				|  |  |                                       @ApiParam(name = "saasName", value = "租户名称")
 | 
	
		
			
				|  |  |                                       @RequestParam(value = "saasName", required = false) String saasName,
 | 
	
		
			
				|  |  |                                       @ApiParam(name = "status", value = "状态")
 | 
	
		
			
				|  |  |                                       @RequestParam(value = "status", required = false) Integer status,
 | 
	
		
			
				|  |  |                                       @ApiParam(name = "publicType", value = "微信类型")
 | 
	
		
			
				|  |  |                                       @RequestParam(value = "publicType", required = false) Integer publicType,
 | 
	
		
			
				|  |  |                                       @ApiParam(name = "page", value = "页码")
 | 
	
		
			
				|  |  |                                       @RequestParam(value = "page", required = true) Integer page,
 | 
	
		
			
				|  |  |                                       @ApiParam(name = "size", value = "每页大小")
 | 
	
		
			
				|  |  |                                       @RequestParam(value = "size", required = true) Integer size) {
 | 
	
		
			
				|  |  |     public MixEnvelop<WxWechatVO,WxWechatVO> getWxWechatList(@ApiParam(name = "name", value = "微信名称")
 | 
	
		
			
				|  |  |                                                              @RequestParam(value = "name", required = false) String name,
 | 
	
		
			
				|  |  |                                                              @ApiParam(name = "saasName", value = "租户名称")
 | 
	
		
			
				|  |  |                                                              @RequestParam(value = "saasName", required = false) String saasName,
 | 
	
		
			
				|  |  |                                                              @ApiParam(name = "status", value = "状态")
 | 
	
		
			
				|  |  |                                                              @RequestParam(value = "status", required = false) Integer status,
 | 
	
		
			
				|  |  |                                                              @ApiParam(name = "publicType", value = "微信类型")
 | 
	
		
			
				|  |  |                                                              @RequestParam(value = "publicType", required = false) Integer publicType,
 | 
	
		
			
				|  |  |                                                              @ApiParam(name = "page", value = "页码")
 | 
	
		
			
				|  |  |                                                              @RequestParam(value = "page", required = true) Integer page,
 | 
	
		
			
				|  |  |                                                              @ApiParam(name = "size", value = "每页大小")
 | 
	
		
			
				|  |  |                                                              @RequestParam(value = "size", required = true) Integer size) {
 | 
	
		
			
				|  |  |         return wechatService.getWxWechatList(name, saasName, status, publicType, page, size);
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
	
		
			
				|  | @ -72,7 +71,7 @@ public class WechatController extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @GetMapping(value = BaseRequestMapping.WeChat.findWechatCombo)
 | 
	
		
			
				|  |  |     @ApiOperation(value = "微信信息下拉框", notes = "微信信息下拉框")
 | 
	
		
			
				|  |  |     public MixEnvelop findWechatCombo() {
 | 
	
		
			
				|  |  |     public MixEnvelop<WxComboVO,WxComboVO> findWechatCombo() {
 | 
	
		
			
				|  |  |         return wechatService.findWechatCombo();
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
	
		
			
				|  | @ -81,12 +80,12 @@ public class WechatController extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  |     //====================图文素材管理============================
 | 
	
		
			
				|  |  |     @GetMapping(value = BaseRequestMapping.WeChat.findWechatImgGroup)
 | 
	
		
			
				|  |  |     @ApiOperation(value = "获取图文素材分组", notes = "获取图文素材分组")
 | 
	
		
			
				|  |  |     public MixEnvelop findWechatImgGroup(@ApiParam(name = "wechatId", value = "微信ID")
 | 
	
		
			
				|  |  |                                          @RequestParam(value = "wechatId", required = true)String wechatId,
 | 
	
		
			
				|  |  |                                          @ApiParam(name = "page", value = "第几页")
 | 
	
		
			
				|  |  |                                          @RequestParam(value = "page", required = false)Integer page,
 | 
	
		
			
				|  |  |                                          @ApiParam(name = "size", value = "每页条数")
 | 
	
		
			
				|  |  |                                          @RequestParam(value = "size", required = false)Integer size) {
 | 
	
		
			
				|  |  |     public MixEnvelop<WxGraphicSceneVO,WxGraphicSceneVO> findWechatImgGroup(@ApiParam(name = "wechatId", value = "微信ID")
 | 
	
		
			
				|  |  |                                                                             @RequestParam(value = "wechatId", required = true)String wechatId,
 | 
	
		
			
				|  |  |                                                                             @ApiParam(name = "page", value = "第几页")
 | 
	
		
			
				|  |  |                                                                             @RequestParam(value = "page", required = false)Integer page,
 | 
	
		
			
				|  |  |                                                                             @ApiParam(name = "size", value = "每页条数")
 | 
	
		
			
				|  |  |                                                                             @RequestParam(value = "size", required = false)Integer size) {
 | 
	
		
			
				|  |  |         return wechatService.findWechatImgGroup(wechatId,page,size);
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
	
		
			
				|  | @ -124,16 +123,16 @@ public class WechatController extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @GetMapping(value = BaseRequestMapping.WeChat.findImg)
 | 
	
		
			
				|  |  |     @ApiOperation(value = "获取图文素材", notes = "获取图文素材")
 | 
	
		
			
				|  |  |     public MixEnvelop findImg(@ApiParam(name = "wechatId", value = "微信id")
 | 
	
		
			
				|  |  |                               @RequestParam(value = "wechatId", required = true)String wechatId,
 | 
	
		
			
				|  |  |                               @ApiParam(name = "title", value = "素材标题")
 | 
	
		
			
				|  |  |                               @RequestParam(value = "title", required = false)String title,
 | 
	
		
			
				|  |  |                               @ApiParam(name = "scene", value = "场景值")
 | 
	
		
			
				|  |  |                               @RequestParam(value = "scene", required = false)String scene,
 | 
	
		
			
				|  |  |                               @ApiParam(name = "page", value = "第几页")
 | 
	
		
			
				|  |  |                               @RequestParam(value = "page", required = true)Integer page,
 | 
	
		
			
				|  |  |                               @ApiParam(name = "size", value = "每页几条")
 | 
	
		
			
				|  |  |                               @RequestParam(value = "size", required = true)Integer size) {
 | 
	
		
			
				|  |  |     public MixEnvelop<WxGraphicMessageVO,WxGraphicMessageVO> findImg(@ApiParam(name = "wechatId", value = "微信id")
 | 
	
		
			
				|  |  |                                                                      @RequestParam(value = "wechatId", required = true)String wechatId,
 | 
	
		
			
				|  |  |                                                                      @ApiParam(name = "title", value = "素材标题")
 | 
	
		
			
				|  |  |                                                                      @RequestParam(value = "title", required = false)String title,
 | 
	
		
			
				|  |  |                                                                      @ApiParam(name = "scene", value = "场景值")
 | 
	
		
			
				|  |  |                                                                      @RequestParam(value = "scene", required = false)String scene,
 | 
	
		
			
				|  |  |                                                                      @ApiParam(name = "page", value = "第几页")
 | 
	
		
			
				|  |  |                                                                      @RequestParam(value = "page", required = true)Integer page,
 | 
	
		
			
				|  |  |                                                                      @ApiParam(name = "size", value = "每页几条")
 | 
	
		
			
				|  |  |                                                                      @RequestParam(value = "size", required = true)Integer size) {
 | 
	
		
			
				|  |  |         return wechatService.findImg(wechatId, title, scene, page, size);
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
	
		
			
				|  | @ -157,17 +156,17 @@ public class WechatController extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  |     @GetMapping(value = BaseRequestMapping.WeChat.findWxReplyScene)
 | 
	
		
			
				|  |  |     @ApiOperation(value = "获取消息配置场景", notes = "获取消息配置场景")
 | 
	
		
			
				|  |  |     public MixEnvelop<WxReplySceneVO,WxReplySceneVO> findWxReplyScene(@ApiParam(name = "wechatId", value = "微信id")
 | 
	
		
			
				|  |  |                                        @RequestParam(value = "wechatId", required = true)String wechatId,
 | 
	
		
			
				|  |  |                                                        @ApiParam(name = "msgType", value = "消息类型")
 | 
	
		
			
				|  |  |                                        @RequestParam(value = "msgType", required = false)String msgType,
 | 
	
		
			
				|  |  |                                                        @ApiParam(name = "event", value = "事件类型")
 | 
	
		
			
				|  |  |                                        @RequestParam(value = "event", required = false)String event,
 | 
	
		
			
				|  |  |                                                        @ApiParam(name = "content", value = "回复内容")
 | 
	
		
			
				|  |  |                                        @RequestParam(value = "content", required = false)String content,
 | 
	
		
			
				|  |  |                                                        @ApiParam(name = "page", value = "页数")
 | 
	
		
			
				|  |  |                                        @RequestParam(value = "page", required = true)Integer page,
 | 
	
		
			
				|  |  |                                                        @ApiParam(name = "size", value = "每页大小")
 | 
	
		
			
				|  |  |                                        @RequestParam(value = "size", required = true)Integer size) {
 | 
	
		
			
				|  |  |                                                                       @RequestParam(value = "wechatId", required = true)String wechatId,
 | 
	
		
			
				|  |  |                                                                       @ApiParam(name = "msgType", value = "消息类型")
 | 
	
		
			
				|  |  |                                                                       @RequestParam(value = "msgType", required = false)String msgType,
 | 
	
		
			
				|  |  |                                                                       @ApiParam(name = "event", value = "事件类型")
 | 
	
		
			
				|  |  |                                                                       @RequestParam(value = "event", required = false)String event,
 | 
	
		
			
				|  |  |                                                                       @ApiParam(name = "content", value = "回复内容")
 | 
	
		
			
				|  |  |                                                                       @RequestParam(value = "content", required = false)String content,
 | 
	
		
			
				|  |  |                                                                       @ApiParam(name = "page", value = "页数")
 | 
	
		
			
				|  |  |                                                                       @RequestParam(value = "page", required = true)Integer page,
 | 
	
		
			
				|  |  |                                                                       @ApiParam(name = "size", value = "每页大小")
 | 
	
		
			
				|  |  |                                                                       @RequestParam(value = "size", required = true)Integer size) {
 | 
	
		
			
				|  |  |         return wechatService.findWxReplyScene(wechatId, msgType, event, content, page, size);
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  |     //====================图文素材管理end============================
 | 
	
	
		
			
				|  | @ -182,20 +181,20 @@ public class WechatController extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  |         return wechatService.saveWxTemp(wxTemplate);
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @GetMapping(value = BaseRequestMapping.WeChat.saveWxTemp)
 | 
	
		
			
				|  |  |     @GetMapping(value = BaseRequestMapping.WeChat.findWxtemp)
 | 
	
		
			
				|  |  |     @ApiOperation(value = "获取微信模板消息基础信息(列表)", notes = "获取微信模板消息基础信息(列表)")
 | 
	
		
			
				|  |  |     public MixEnvelop findWxtemp(@ApiParam(name = "wechatId", value = "微信id")
 | 
	
		
			
				|  |  |                                  @RequestParam(value = "wechatId", required = true)String wechatId,
 | 
	
		
			
				|  |  |                                  @ApiParam(name = "status", value = "状态")
 | 
	
		
			
				|  |  |                                  @RequestParam(value = "status", required = true)Integer status,
 | 
	
		
			
				|  |  |                                  @ApiParam(name = "name", value = "微信模板名称")
 | 
	
		
			
				|  |  |                                  @RequestParam(value = "name", required = true)String name,
 | 
	
		
			
				|  |  |                                  @ApiParam(name = "key", value = "模板id或标题模糊匹配")
 | 
	
		
			
				|  |  |                                  @RequestParam(value = "key", required = true)String key,
 | 
	
		
			
				|  |  |                                  @ApiParam(name = "page", value = "页码")
 | 
	
		
			
				|  |  |                                  @RequestParam(value = "page", required = true)Integer page,
 | 
	
		
			
				|  |  |                                  @ApiParam(name = "size", value = "分页大小")
 | 
	
		
			
				|  |  |                                  @RequestParam(value = "size", required = true)Integer size) {
 | 
	
		
			
				|  |  |     public MixEnvelop<WxTemplateVO,WxTemplateVO> findWxtemp(@ApiParam(name = "wechatId", value = "微信id")
 | 
	
		
			
				|  |  |                                                             @RequestParam(value = "wechatId", required = true)String wechatId,
 | 
	
		
			
				|  |  |                                                             @ApiParam(name = "status", value = "状态")
 | 
	
		
			
				|  |  |                                                             @RequestParam(value = "status", required = true)Integer status,
 | 
	
		
			
				|  |  |                                                             @ApiParam(name = "name", value = "微信模板名称")
 | 
	
		
			
				|  |  |                                                             @RequestParam(value = "name", required = true)String name,
 | 
	
		
			
				|  |  |                                                             @ApiParam(name = "key", value = "模板id或标题模糊匹配")
 | 
	
		
			
				|  |  |                                                             @RequestParam(value = "key", required = true)String key,
 | 
	
		
			
				|  |  |                                                             @ApiParam(name = "page", value = "页码")
 | 
	
		
			
				|  |  |                                                             @RequestParam(value = "page", required = true)Integer page,
 | 
	
		
			
				|  |  |                                                             @ApiParam(name = "size", value = "分页大小")
 | 
	
		
			
				|  |  |                                                             @RequestParam(value = "size", required = true)Integer size) {
 | 
	
		
			
				|  |  |         return wechatService.findWxtemp(wechatId, status, name, key, page, size);
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
	
		
			
				|  | @ -210,24 +209,24 @@ public class WechatController extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  |     @GetMapping(value = BaseRequestMapping.WeChat.findWxTempConfigList)
 | 
	
		
			
				|  |  |     @ApiOperation(value = "获取微信模板列表", notes = "获取微信模板列表")
 | 
	
		
			
				|  |  |     public MixEnvelop<WxTemplateConfigVO,WxTemplateConfigVO> findWxTempConfigList(@ApiParam(name = "wechatId", value = "微信id")
 | 
	
		
			
				|  |  |                                            @RequestParam(value = "wechatId", required = true)String wechatId,
 | 
	
		
			
				|  |  |                                            @ApiParam(name = "scene", value = "微信场景值")
 | 
	
		
			
				|  |  |                                            @RequestParam(value = "scene", required = true)String scene,
 | 
	
		
			
				|  |  |                                            @ApiParam(name = "page", value = "第几页")
 | 
	
		
			
				|  |  |                                            @RequestParam(value = "page", required = true)Integer page,
 | 
	
		
			
				|  |  |                                            @ApiParam(name = "size", value = "分页大小")
 | 
	
		
			
				|  |  |                                            @RequestParam(value = "size", required = true)Integer size) {
 | 
	
		
			
				|  |  |                                                                                   @RequestParam(value = "wechatId", required = true)String wechatId,
 | 
	
		
			
				|  |  |                                                                                   @ApiParam(name = "scene", value = "微信场景值")
 | 
	
		
			
				|  |  |                                                                                   @RequestParam(value = "scene", required = true)String scene,
 | 
	
		
			
				|  |  |                                                                                   @ApiParam(name = "page", value = "第几页")
 | 
	
		
			
				|  |  |                                                                                   @RequestParam(value = "page", required = true)Integer page,
 | 
	
		
			
				|  |  |                                                                                   @ApiParam(name = "size", value = "分页大小")
 | 
	
		
			
				|  |  |                                                                                   @RequestParam(value = "size", required = true)Integer size) {
 | 
	
		
			
				|  |  |         return wechatService.findWxTempConfigList(wechatId, scene, page, size);
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @GetMapping(value = BaseRequestMapping.WeChat.findWxTemplateConfig)
 | 
	
		
			
				|  |  |     @ApiOperation(value = "获取微信模板列表(单条)", notes = "获取微信模板列表(单条)")
 | 
	
		
			
				|  |  |     public ObjEnvelop<WxTemplateConfigVO>  findWxTemplateConfig(@ApiParam(name = "wechatId", value = "微信id")
 | 
	
		
			
				|  |  |                                                    @RequestParam(value = "wechatId", required = true)String wechatId,
 | 
	
		
			
				|  |  |                                                                           @ApiParam(name = "name", value = "模板名称")
 | 
	
		
			
				|  |  |                                                    @RequestParam(value = "name", required = true)String name,
 | 
	
		
			
				|  |  |                                                                           @ApiParam(name = "scene", value = "场景值")
 | 
	
		
			
				|  |  |                                                    @RequestParam(value = "scene", required = true)String scene) {
 | 
	
		
			
				|  |  |                                                                 @RequestParam(value = "wechatId", required = true)String wechatId,
 | 
	
		
			
				|  |  |                                                                 @ApiParam(name = "name", value = "模板名称")
 | 
	
		
			
				|  |  |                                                                 @RequestParam(value = "name", required = true)String name,
 | 
	
		
			
				|  |  |                                                                 @ApiParam(name = "scene", value = "场景值")
 | 
	
		
			
				|  |  |                                                                 @RequestParam(value = "scene", required = true)String scene) {
 | 
	
		
			
				|  |  |         return success(wechatService.findWxTemplateConfig(wechatId,name,scene), WxTemplateConfigVO.class);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     }
 | 
	
	
		
			
				|  | @ -257,4 +256,9 @@ public class WechatController extends EnvelopRestEndpoint {
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     //===================微信粉丝统计end==========================================
 | 
	
		
			
				|  |  |     @GetMapping(value = "header")
 | 
	
		
			
				|  |  |     @ApiOperation(value = "测试header", notes = "测试header")
 | 
	
		
			
				|  |  |     public String getHeader(){
 | 
	
		
			
				|  |  |         return getUID();
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | }
 |