|
|
|
@@ -9,6 +9,7 @@ import java.util.HashMap; |
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
@@ -167,9 +168,32 @@ public class WxUserStructureController { |
|
|
|
@ApiImplicitParams({
|
|
|
|
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
|
|
|
|
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
|
|
|
|
public ResultData findUserByChannel(String channelName,Integer pageNum, Integer pageSize) {
|
|
|
|
PageInfo<WxCUser> list = wxCUserService.listByChannel(null, pageNum, pageSize);
|
|
|
|
return new ResultData(list);
|
|
|
|
public ResultData findUserByChannel(String channelName,Integer pageNum, Integer pageSize) {
|
|
|
|
List<String> sceneList =null;
|
|
|
|
if(StringUtils.isNotBlank(channelName)) {
|
|
|
|
WxUserChannel c= new WxUserChannel();
|
|
|
|
c.setChannelName(channelName);
|
|
|
|
PageInfo<WxUserChannel> page = wxUserChannelService.listAsPage(c, 1, 100);
|
|
|
|
if(page.getSize()>0) {
|
|
|
|
sceneList = new ArrayList<>();
|
|
|
|
for(WxUserChannel wuc:page.getList()) {
|
|
|
|
sceneList.add(wuc.getSceneAddress());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
PageInfo<WxCUser> page = wxCUserService.listByChannel(sceneList, pageNum, pageSize);
|
|
|
|
for(WxCUser u:page.getList()) {
|
|
|
|
WxUserChannel c= new WxUserChannel();
|
|
|
|
c.setSceneAddress(u.getSceneAddress());
|
|
|
|
PageInfo<WxUserChannel> uc = wxUserChannelService.listAsPage(c, 1, 1);
|
|
|
|
if(uc.getSize()>0) {
|
|
|
|
u.setChannelName(uc.getList().get(0).getChannelName());
|
|
|
|
}else {
|
|
|
|
u.setChannelName("其他来源");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return new ResultData(page);
|
|
|
|
}
|
|
|
|
|
|
|
|
@ApiOperation("获取用户所有渠道")
|
|
|
|
|