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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-11-10 15:24:54 +08:00
parent 83a24ecc8c e2a937810e
commit 2f6c020f05
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/pom.xml
View File

@ -327,7 +327,7 @@
<excludes>
<!-- 排除生产环境配置 -->
<exclude>application-bt.yml</exclude>
<exclude>application-dev.yml</exclude>
<!-- <exclude>application-dev.yml</exclude> -->
<exclude>application-hwx.yml</exclude>
<exclude>application-my.yml</exclude>
<exclude>application-prod.yml</exclude>

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

@ -23,12 +23,11 @@ import io.renren.modules.resource.videoPreview.AbstractVideoPreviewService;
import io.renren.modules.resource.videoPreview.VideoPreviewFactory;
import io.renren.modules.security.user.SecurityUser;
import io.renren.modules.security.user.UserDetail;
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.enums.SuperAdminEnum;
import io.renren.modules.sys.dto.SysUserDTO;
import io.renren.modules.sys.entity.SysUserEntity;
import io.renren.modules.sys.enums.SuperAdminEnum;
import io.renren.modules.sys.service.SysDeptService;
import io.renren.modules.sys.service.SysUserService;
import io.swagger.annotations.*;
@ -339,7 +338,7 @@ public class ResourceController {
@ApiOperation("查询部门企业列表及汇聚能力数量")
@LogOperation("查询部门企业列表及汇聚能力数量")
public Result selectDeptList(@RequestBody JSONObject jsonObject) {
return new Result().ok(resourceService.selectDeptList(jsonObject, jsonObject.getString("type")));
return new Result().ok(resourceService.selectDeptList(jsonObject, jsonObject.containsKey("type") ? (jsonObject.getString("type") == null ? "" : jsonObject.getString("type")) : ""));
}
@GetMapping("/updateVisits")
@ -564,7 +563,7 @@ public class ResourceController {
String.format(" <userguid>%s</userguid>", sysUser.getGuid()) +
String.format(" <pagenum>%d</pagenum>\n", page) +
String.format(" <pagesize>%d</pagesize>\n", size) +
String.format(" <title>%s</title>\n", title==null ? "" : title) +
String.format(" <title>%s</title>\n", title == null ? "" : title) +
" </ZySPPort>\n" +
" </soap:Body>\n" +
"</soap:Envelope>";
@ -589,14 +588,26 @@ public class ResourceController {
@GetMapping("ZywMessage/yaweiApproveDetails")
@ApiOperation("数据资源审批详情转发")
@LogOperation("数据资源审批详情转发")
public Result yaweiApproveDetails(@ApiParam("申请guid") String applyGuid, @ApiParam("部门guid") String deptGuid) {
public Result yaweiApproveDetails(@ApiParam("申请guid") String applyGuid
// , @ApiParam("部门guid") String deptGuid
) {
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=ZyShowrecord";
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:Body>\n" +
" <ZyShowrecord xmlns=\"http://tempuri.org/\">\n" +
String.format(" <guid>%s</guid>\n", applyGuid) +
String.format(" <bmguid>%s</bmguid>\n", deptGuid) +
String.format(" <userguid>%s</userguid>", sysUser.getGuid()) +
// String.format(" <bmguid>%s</bmguid>\n", deptGuid) +
" </ZyShowrecord>\n" +
" </soap:Body>\n" +
"</soap:Envelope>";
@ -876,7 +887,7 @@ public class ResourceController {
} else {
try {
resourceService.delResBySuAd(id);
}catch (Exception e) {
} catch (Exception e) {
return new Result().error("清除能力及相关数据失败！");
}
return new Result().ok("能力及相关数据已清除。");
@ -894,7 +905,7 @@ public class ResourceController {
} else {
try {
resourceService.delProcinstBySuAd(id, type, resourceId);
}catch (Exception e) {
} catch (Exception e) {
return new Result().error("清除流程及相关数据失败！");
}
return new Result().ok("流程及相关数据已清除。");