Skip to content

o2oa
o2oa

fuyue82 / o2oa
与 Fork 源项目一致

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 0
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 374c797d 编写于 作者: 程 程剑
浏览文件
操作

Merge branch 'fix/修复内容管理分页查询状态字段不起作用' into 'wrdp' 

[内容管理]修复文档分页查询状态字段不起作用的问题

See merge request o2oa/o2oa!3427
上级 7d88d6ac fb78ca6c
隐藏空白更改
内联 并排
Showing with 75 addition and 148 deletion
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListWithFilterPaging.java
浏览文件 @ 374c797d
......@@ -22,7 +22,7 @@ public class ActionQueryListWithFilterPaging extends BaseAction {
private static Logger logger = LoggerFactory.getLogger(ActionQueryListWithFilterPaging.class);
protected ActionResult<List<Wo>> execute( HttpServletRequest request, Integer page, Integer size, JsonElement jsonElement, EffectivePerson effectivePerson ) {
ActionResult<List<Wo>> result = new ActionResult<>();
ActionResult<List<Wo>> result = new ActionResult<>();
Long total = 0L;
Wi wi = null;
List<Wo> wos = new ArrayList<>();
......@@ -31,7 +31,7 @@ public class ActionQueryListWithFilterPaging extends BaseAction {
Boolean isManager = false;
String personName = effectivePerson.getDistinguishedName();
QueryFilter queryFilter = null;
try {
wi = this.convertToWrapIn( jsonElement, Wi.class );
} catch (Exception e ) {
......@@ -41,25 +41,25 @@ public class ActionQueryListWithFilterPaging extends BaseAction {
logger.error( e, effectivePerson, request, null);
}
if ( wi == null ) { wi = new Wi(); }
if( StringUtils.isEmpty( wi.getDocumentType() )) {
wi.setDocumentType( "信息" );
}
if( StringUtils.isNotEmpty( wi.getOrderField() )) {
if( StringUtils.isEmpty( wi.getOrderField() )) {
wi.setOrderField( "createTime" );
}
if( StringUtils.isNotEmpty( wi.getOrderType() )) {
wi.setOrderField( "DESC" );
if( StringUtils.isEmpty( wi.getOrderType() )) {
wi.setOrderType( "DESC" );
}
if( ListTools.isNotEmpty( wi.getStatusList() )) {
if( ListTools.isEmpty( wi.getStatusList() )) {
List<String> status = new ArrayList<>();
status.add( "published" );
wi.setStatusList( status );
}
if (check) {
try {
queryFilter = wi.getQueryFilter();
......@@ -70,7 +70,7 @@ public class ActionQueryListWithFilterPaging extends BaseAction {
logger.error(e, effectivePerson, request, null);
}
}
if( check ) {
try {
if( effectivePerson.isManager() || userManagerService.isHasPlatformRole( effectivePerson.getDistinguishedName(), "CMSManager" )) {
......@@ -83,7 +83,7 @@ public class ActionQueryListWithFilterPaging extends BaseAction {
logger.error(e, effectivePerson, request, null);
}
}
if (check) {
// 从Review表中查询符合条件的对象总数
try {
......@@ -98,7 +98,7 @@ public class ActionQueryListWithFilterPaging extends BaseAction {
logger.error(e, effectivePerson, request, null);
}
}
if (check) {
//document和Review除了sequence还有5个排序列支持title, appAlias, categoryAlias, categoryName, creatorUnitName的分页查询
//除了sequence和title, appAlias, categoryAlias, categoryName, creatorUnitName之外，其他的列排序全部在内存进行分页
......@@ -114,13 +114,13 @@ public class ActionQueryListWithFilterPaging extends BaseAction {
logger.error(e, effectivePerson, request, null);
}
}
if (check) {
if ( searchResultList != null ) {
Wo wo = null;
for( Document document : searchResultList ) {
for( Document document : searchResultList ) {
try {
wo = Wo.copier.copy( document );
wo = Wo.copier.copy( document );
if( wo.getCreatorPerson() != null && !wo.getCreatorPerson().isEmpty() ) {
wo.setCreatorPersonShort( wo.getCreatorPerson().split( "@" )[0]);
}
......@@ -147,11 +147,11 @@ public class ActionQueryListWithFilterPaging extends BaseAction {
result.setCount(total);
result.setData(wos);
return result;
}
}
public class DocumentCacheForFilter {
private Long total = 0L;
private Long total = 0L;
private List<Wo> documentList = null;
public Long getTotal() {
......@@ -168,18 +168,18 @@ public class ActionQueryListWithFilterPaging extends BaseAction {
public void setDocumentList(List<Wo> documentList) {
this.documentList = documentList;
}
}
}
public static class Wi extends WrapInDocumentFilter{
}
public static class Wo extends WrapOutDocumentList {
public static List<String> Excludes = new ArrayList<String>();
public static WrapCopier<Document, Wo> copier = WrapCopierFactory.wo( Document.class, Wo.class, null,JpaObject.FieldsInvisible);
}
}
\ No newline at end of file
}
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListWithFilterPagingAdmin.java
浏览文件 @ 374c797d
package com.x.cms.assemble.control.jaxrs.document;
import com.google.gson.JsonElement;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.bean.WrapCopier;
......@@ -12,9 +14,15 @@ import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.assemble.control.Business;
import com.x.cms.core.entity.Document;
import com.x.cms.core.entity.Document_;
import com.x.cms.core.entity.Review;
import com.x.cms.core.entity.Review_;
import com.x.cms.core.express.tools.CriteriaBuilderTools;
import com.x.cms.core.express.tools.filter.QueryFilter;
import org.apache.commons.lang3.StringUtils;
import javax.persistence.EntityManager;
import javax.persistence.criteria.*;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
......@@ -29,151 +37,75 @@ public class ActionQueryListWithFilterPagingAdmin extends BaseAction {
protected ActionResult<List<Wo>> execute( HttpServletRequest request, Integer page, Integer size, JsonElement jsonElement, EffectivePerson effectivePerson ) throws Exception {
ActionResult<List<Wo>> result = new ActionResult<>();
Long total = 0L;
Wi wi = null;
List<Wo> wos = new ArrayList<>();
Business business = new Business(null);
if(!business.isManager(effectivePerson)){
result.setCount(0L);
result.setData(wos);
return result;
}
List<Document> searchResultList = new ArrayList<>();
Boolean check = true;
Boolean isManager = false;
String personName = effectivePerson.getDistinguishedName();
QueryFilter queryFilter = null;
try {
wi = this.convertToWrapIn( jsonElement, Wi.class );
} catch (Exception e ) {
check = false;
Exception exception = new ExceptionDocumentInfoProcess( e, "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString() );
result.error( exception );
logger.error( e, effectivePerson, request, null);
}
if ( wi == null ) { wi = new Wi(); }
if( StringUtils.isNotEmpty( wi.getPerson() )){
personName = wi.getPerson();
}
Wi wi = this.convertToWrapIn( jsonElement, Wi.class );
if( StringUtils.isEmpty( wi.getDocumentType() )) {
wi.setDocumentType( "信息" );
}
if( StringUtils.isNotEmpty( wi.getOrderField() )) {
if( StringUtils.isEmpty( wi.getOrderField() )) {
wi.setOrderField( "createTime" );
}
if( StringUtils.isNotEmpty( wi.getOrderType() )) {
wi.setOrderField( "DESC" );
if( StringUtils.isEmpty( wi.getOrderType() )) {
wi.setOrderType( "DESC" );
}
if( ListTools.isNotEmpty( wi.getStatusList() )) {
if( ListTools.isEmpty( wi.getStatusList() )) {
List<String> status = new ArrayList<>();
status.add( "published" );
wi.setStatusList( status );
}
if (check) {
try {
queryFilter = wi.getQueryFilter();
} catch (Exception e) {
check = false;
Exception exception = new ExceptionDocumentInfoProcess(e, "系统在获取查询条件信息时发生异常。");
result.error(exception);
logger.error(e, effectivePerson, request, null);
}
}
QueryFilter queryFilter = wi.getQueryFilter();
if( check ) {
if( StringUtils.equals( effectivePerson.getDistinguishedName(), personName )){
//管理员身份，查全部的
try {
if( effectivePerson.isManager() || userManagerService.isHasPlatformRole( personName, "CMSManager" )) {
isManager = true;
}
} catch (Exception e) {
check = false;
Exception exception = new ExceptionDocumentInfoProcess(e, "系统在判断用户是否是管理时发生异常。");
result.error(exception);
logger.error(e, effectivePerson, request, null);
}
}else{
//管理员查其他人的，以指定人员的权限为准
logger.info( "管理员正在尝试查询人员[ {} ]可见的文档信息列表......", personName );
try {
if( StringUtils.equals( "xadmin", personName )
|| userManagerService.isHasPlatformRole( personName, "CMSManager" )
|| userManagerService.isHasPlatformRole( personName, "Manager" )) {
isManager = true;
}
} catch (Exception e) {
check = false;
Exception exception = new ExceptionDocumentInfoProcess(e, "系统在判断用户是否是管理时发生异常。");
result.error(exception);
logger.error(e, effectivePerson, request, null);
}
}
}
List<DocumentWo> docWos = new ArrayList<>();
try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) {
EntityManager em = emc.get(Document.class);
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Document> cq = cb.createQuery(Document.class);
Root<Document> root = cq.from(Document.class);
Predicate p = CriteriaBuilderTools.composePredicateWithQueryFilter(Document_.class, cb, null, root, queryFilter);
if (check) {
// 从Review表中查询符合条件的对象总数
try {
if( isManager ) {
personName = null;
}
total = documentQueryService.countWithCondition( personName, queryFilter );
} catch (Exception e) {
check = false;
Exception exception = new ExceptionDocumentInfoProcess(e, "系统在获取用户可查询到的文档数据条目数量时发生异常。");
result.error(exception);
logger.error(e, effectivePerson, request, null);
if("asc".equalsIgnoreCase(wi.getOrderType())){
docWos = emc.fetchAscPaging(Document.class, DocumentWo.copier, p, page, size, wi.getOrderField());
}else {
docWos = emc.fetchDescPaging(Document.class, DocumentWo.copier, p, page, size, wi.getOrderField());
}
total = emc.count(Document.class, p);
}
if (check) {
//document和Review除了sequence还有5个排序列支持title, appAlias, categoryAlias, categoryName, creatorUnitName的分页查询
//除了sequence和title, appAlias, categoryAlias, categoryName, creatorUnitName之外，其他的列排序全部在内存进行分页
Wo wo = null;
for( DocumentWo documentWo : docWos ) {
try {
searchResultList = documentQueryService.listPagingWithCondition( personName, wi.getOrderField(), wi.getOrderType(), queryFilter, page, size );
wo = Wo.copier.copy( documentWo );
if( wo.getCreatorPerson() != null && !wo.getCreatorPerson().isEmpty() ) {
wo.setCreatorPersonShort( wo.getCreatorPerson().split( "@" )[0]);
}
if( wo.getCreatorUnitName() != null && !wo.getCreatorUnitName().isEmpty() ) {
wo.setCreatorUnitNameShort( wo.getCreatorUnitName().split( "@" )[0]);
}
if( wo.getCreatorTopUnitName() != null && !wo.getCreatorTopUnitName().isEmpty() ) {
wo.setCreatorTopUnitNameShort( wo.getCreatorTopUnitName().split( "@" )[0]);
}
if( wi.getNeedData() ) {
//需要组装数据
wo.setData( documentQueryService.getDocumentData( documentWo ) );
}
} catch (Exception e) {
check = false;
Exception exception = new ExceptionDocumentInfoProcess(e, "系统在根据用户可访问的文档ID列表对文档进行分页查询时发生异常。");
result.error(exception);
logger.error(e, effectivePerson, request, null);
}
wos.add( wo );
}
if (check) {
if ( searchResultList != null ) {
Wo wo = null;
for( Document document : searchResultList ) {
try {
wo = Wo.copier.copy( document );
if( wo.getCreatorPerson() != null && !wo.getCreatorPerson().isEmpty() ) {
wo.setCreatorPersonShort( wo.getCreatorPerson().split( "@" )[0]);
}
if( wo.getCreatorUnitName() != null && !wo.getCreatorUnitName().isEmpty() ) {
wo.setCreatorUnitNameShort( wo.getCreatorUnitName().split( "@" )[0]);
}
if( wo.getCreatorTopUnitName() != null && !wo.getCreatorTopUnitName().isEmpty() ) {
wo.setCreatorTopUnitNameShort( wo.getCreatorTopUnitName().split( "@" )[0]);
}
if( wi.getNeedData() ) {
//需要组装数据
wo.setData( documentQueryService.getDocumentData( document ) );
}
} catch (Exception e) {
check = false;
Exception exception = new ExceptionDocumentInfoProcess(e, "系统获取文档数据内容信息时发生异常。Id:" + document.getCategoryId());
result.error(exception);
logger.error(e, effectivePerson, request, null);
}
wos.add( wo );
}
}
}
result.setCount(total);
result.setData(wos);
return result;
......@@ -203,16 +135,11 @@ public class ActionQueryListWithFilterPagingAdmin extends BaseAction {
public static class Wi extends WrapInDocumentFilter{
@FieldDescribe( "可以查询的人员：DistinguishedName" )
private String person = "";
public String getPerson() {
return person;
}
}
public void setPerson(String person) {
this.person = person;
}
public static class DocumentWo extends Document{
static WrapCopier<Document, DocumentWo> copier = WrapCopierFactory.wo(Document.class, DocumentWo.class,
JpaObject.singularAttributeField(Document.class, true, true), null);
}
public static class Wo extends WrapOutDocumentList {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或