Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -235,6 +235,10 @@ public class BaseRequestMapping {
        public static final String saveWxTempConfig ="/saveWxTempConfig";
        public static final String findWxTempConfigList ="/findWxTempConfigList";
        public static final String findWxTemplateConfig ="/findWxTemplateConfig";
        public static final String getusersummary ="/getusersummary";
        public static final String getusercumulate ="/getusercumulate";
    }
    /**

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/wx/WechatController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * Created by Trick on 2018/9/26.
 * Created by Trick on 2018/9/26..
 */
@RestController
@RequestMapping(BaseRequestMapping.WeChat.wechat_base)
@@ -232,4 +232,29 @@ public class WechatController extends EnvelopRestEndpoint {
    }
    //===================模板消息end==========================================
    //===================微信粉丝统计==========================================
    @GetMapping(value = BaseRequestMapping.WeChat.getusersummary)
    @ApiOperation(value = "获取用户增减数据", notes = "获取用户增减数据")
    public Envelop getusersummary(@ApiParam(name = "wechatId", value = "微信id")
                                  @RequestParam(value = "wechatId", required = true)String wechatId,
                                  @ApiParam(name = "beginDate", value = "开始时间，例如：2014-12-02")
                                  @RequestParam(value = "beginDate", required = true)String beginDate,
                                  @ApiParam(name = "endDate", value = "结束时间，例如：2014-12-07")
                                  @RequestParam(value = "endDate", required = true)String endDate) {
        return wechatService.getusersummary(wechatId,beginDate,endDate);
    }
    @GetMapping(value = BaseRequestMapping.WeChat.getusercumulate)
    @ApiOperation(value = "获取累计用户数据", notes = "获取累计用户数据")
    public Envelop getusercumulate(@ApiParam(name = "wechatId", value = "微信id")
                                   @RequestParam(value = "wechatId", required = true)String wechatId,
                                   @ApiParam(name = "beginDate", value = "开始时间，例如：2014-12-02")
                                   @RequestParam(value = "beginDate", required = true)String beginDate,
                                   @ApiParam(name = "endDate", value = "结束时间，例如：2014-12-07")
                                   @RequestParam(value = "endDate", required = true)String endDate) {
        return wechatService.getusercumulate(wechatId,beginDate,endDate);
    }
    //===================微信粉丝统计end==========================================
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WechatService.java

@@ -5,7 +5,6 @@ import com.yihu.jw.entity.base.wx.*;
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;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +18,7 @@ import java.util.Map;
import java.util.UUID;
/**
 * Created by trick on 2017/5/20 0020.
 * Created by trick on 2017/5/20 0020
 */
@Service
@Transactional
@@ -43,6 +42,8 @@ public class WechatService {
    private WxTemplateDao wxTemplateDao;
    @Autowired
    private WxTemplateConfigDao wxTemplateConfigDao;
    @Autowired
    private WxAccessTokenService wxAccessTokenService;
    //====================微信与租户管理=======================
@@ -455,5 +456,28 @@ public class WechatService {
    }
    //===================模板消息end=======================================
    //===================微信统计==========================================
    public Envelop getusersummary(String wechatId,String beginDate,String endDate){
        String url ="https://api.weixin.qq.com/datacube/getusersummary?access_token="+wxAccessTokenService.getWxAccessTokenById(wechatId).getAccessToken();
        String param = "{ \n" +
                "    \"begin_date\": \""+beginDate+"\", \n" +
                "    \"end_date\": \""+endDate+"\"\n" +
                "}";
        String result = com.yihu.jw.util.wechat.wxhttp.HttpUtil.sendPost(url, param);
        return Envelop.getSuccess(result);
    }
    public Envelop getusercumulate(String wechatId,String beginDate,String endDate){
        String url ="https://api.weixin.qq.com/datacube/getusercumulate?access_token="+wxAccessTokenService.getWxAccessTokenById(wechatId).getAccessToken();
        String param = "{ \n" +
                "    \"begin_date\": \""+beginDate+"\", \n" +
                "    \"end_date\": \""+endDate+"\"\n" +
                "}";
        String result = com.yihu.jw.util.wechat.wxhttp.HttpUtil.sendPost(url, param);
        return Envelop.getSuccess(result);
    }
    //===================微信统计end=======================================
}