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-12-02 14:19:58 +08:00
parent 96321f7b84 7703c6d6cf
commit e9f709ce0f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
renren-admin/src/main/java/io/renren/modules/resource/dataResource/domain/TsingtaoDataResourceService.java
View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import io.renren.common.utils.SpringContextUtils; import io.renren.common.utils.SpringContextUtils;
import io.renren.modules.resource.dataResource.AbstractDataResourceService; import io.renren.modules.resource.dataResource.AbstractDataResourceService;
import io.renren.modules.resource.dto.GetDataResourceListDto; import io.renren.modules.resource.dto.GetDataResourceListDto;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
@ -38,6 +39,7 @@ public class TsingtaoDataResourceService extends AbstractDataResourceService {
String pxcol = dto.getOrderField(); String pxcol = dto.getOrderField();
String order = dto.getOrderType(); String order = dto.getOrderType();
String zyname = dto.getServiceName(); String zyname = dto.getServiceName();
String bmname = dto.getDeptId();
if (page == null) page = 1; if (page == null) page = 1;
if (size == null) size = 10; if (size == null) size = 10;
@ -50,10 +52,10 @@ public class TsingtaoDataResourceService extends AbstractDataResourceService {
" <soap:Body><ZWCJ_mainPort xmlns=\"http://tempuri.org/\">\n" + " <soap:Body><ZWCJ_mainPort xmlns=\"http://tempuri.org/\">\n" +
String.format("<pagenum>%d</pagenum>\n <pagesize>%d</pagesize>\n", page, size) + String.format("<pagenum>%d</pagenum>\n <pagesize>%d</pagesize>\n", page, size) +
String.format("<pxcol>%s</pxcol>\n <order>%s</order>\n", pxcol, order); String.format("<pxcol>%s</pxcol>\n <order>%s</order>\n", pxcol, order);
// if (bmname != null){ if (StringUtils.isNotEmpty(bmname)) {
// parame = parame + String.format("<bmname>%s</bmname>",bmname); parame = parame + String.format("<bmname>%s</bmname>", bmname);
// } }
if (zyname != null) { if (StringUtils.isNotEmpty(zyname)) {
parame = parame + String.format("<zyname>%s</zyname>", zyname); parame = parame + String.format("<zyname>%s</zyname>", zyname);
} }
parame = parame + "</ZWCJ_mainPort></soap:Body></soap:Envelope>"; parame = parame + "</ZWCJ_mainPort></soap:Body></soap:Envelope>";
@ -86,7 +88,7 @@ public class TsingtaoDataResourceService extends AbstractDataResourceService {
} }
/** /**
* 获取各部门上架数据资源的数目情况 * 获取各部门上架数据资源的数目情况（数据资源左侧树）
* *
* @return * @return
*/ */

2
renren-admin/src/main/java/io/renren/modules/resource/dto/GetDataResourceListDto.java
View File

@ -20,4 +20,6 @@ public class GetDataResourceListDto {
private Integer pageNum; private Integer pageNum;
//分页大小 //分页大小
private Integer pageSize; private Integer pageSize;
// 数据资源发布部门id
private String deptId;
} }