wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-11-09 12:13:07 +08:00
parent fc9bff33a8 28f842f126
commit c53d5706cb
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
View File

@ -21,8 +21,11 @@ import io.renren.modules.resource.excel.census.config.CustomCellWriteWeightConfi
import io.renren.modules.resource.service.ResourceService; import io.renren.modules.resource.service.ResourceService;
import io.renren.modules.resource.videoPreview.AbstractVideoPreviewService; import io.renren.modules.resource.videoPreview.AbstractVideoPreviewService;
import io.renren.modules.resource.videoPreview.VideoPreviewFactory; import io.renren.modules.resource.videoPreview.VideoPreviewFactory;
import io.renren.modules.security.user.SecurityUser;
import io.renren.modules.sys.dao.SysUserDao;
import io.renren.modules.sys.dto.SysDeptDTO; import io.renren.modules.sys.dto.SysDeptDTO;
import io.renren.modules.sys.dto.SysUserDTO; import io.renren.modules.sys.dto.SysUserDTO;
import io.renren.modules.sys.entity.SysUserEntity;
import io.renren.modules.sys.service.SysDeptService; import io.renren.modules.sys.service.SysDeptService;
import io.renren.modules.sys.service.SysUserService; import io.renren.modules.sys.service.SysUserService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
@ -115,6 +118,9 @@ public class ResourceController {
@Autowired @Autowired
private SysDeptService sysDeptService; private SysDeptService sysDeptService;
@Autowired
private SysUserDao sysUserDao;
@Autowired @Autowired
private SysUserService sysUserService; private SysUserService sysUserService;
@ -535,15 +541,26 @@ public class ResourceController {
if (page == null) page = 1; if (page == null) page = 1;
if (size == null) size = 10; if (size == null) size = 10;
String url = "http://15.72.158.81/zyjk/ZywMessage.asmx"; Long userId = SecurityUser.getUserId();
if (userId == null){
return new Result<>().error("请登录");
}
SysUserEntity sysUser = sysUserDao.getById(userId);
if (sysUser == null || sysUser.getGuid() == null) {
return new Result<>().error("该账号没有权限");
}
String url = "http://15.72.158.81/zyjk/ZywMessage.asmx?op=ZySPPort";
String parame = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + String parame = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
"<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">\n" + "<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">\n" +
" <soap:Body>\n" + " <soap:Body>\n" +
" <ZySPPort xmlns=\"http://tempuri.org/\">\n" + " <ZySPPort xmlns=\"http://tempuri.org/\">\n" +
" <userguid>e8d2fb43-f512-4918-ab47-1141b925af10</userguid>\n" + // " <userguid>e8d2fb43-f512-4918-ab47-1141b925af10</userguid>\n" +
" <pagenum>1</pagenum>\n" + String.format("<userguid>%s</userguid>", sysUser.getGuid()) +
" <pagesize>10</pagesize>\n" + String.format("<pagenum>%d</pagenum>", page) +
" <title></title>\n" + String.format("<pagesize>%d</pagesize>", size) +
title != null ? String.format("<title>%s</title>", title) : "" +
" </ZySPPort>\n" + " </ZySPPort>\n" +
" </soap:Body>\n" + " </soap:Body>\n" +
"</soap:Envelope>"; "</soap:Envelope>";