Skip to content

o2oa
o2oa

weixin_42566577 / o2oa
与 Fork 源项目一致

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

通知 1
Star 0
Fork 0
o2oa
o2oa

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

提交 d5dc8c4a 编写于 作者: R roo00
浏览文件
操作

迁移cms工具类

上级 0b417be0
隐藏空白更改
内联 并排
Showing with 249 addition and 234 deletion
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/AppInfoFactory.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.factory;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import com.x.base.core.project.exception.ExceptionWhen;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.assemble.control.AbstractFactory;
import com.x.cms.assemble.control.Business;
import com.x.cms.core.entity.AppInfo;
import com.x.cms.core.entity.AppInfo_;
import com.x.cms.core.express.tools.CriteriaBuilderTools;
import org.apache.commons.lang3.StringUtils;
import javax.persistence.EntityManager;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.project.exception.ExceptionWhen;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.assemble.control.AbstractFactory;
import com.x.cms.assemble.control.Business;
import com.x.cms.core.entity.AppInfo;
import com.x.cms.core.entity.AppInfo_;
import com.x.cms.core.entity.tools.CriteriaBuilderTools;
/**
* 应用信息表基础功能服务类
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/CategoryInfoFactory.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.factory;
import java.util.ArrayList;
import java.util.List;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.assemble.control.AbstractFactory;
import com.x.cms.assemble.control.Business;
import com.x.cms.core.entity.CategoryInfo;
import com.x.cms.core.entity.CategoryInfo_;
import com.x.cms.core.express.tools.CriteriaBuilderTools;
import org.apache.commons.lang3.StringUtils;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
......@@ -9,15 +14,7 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import com.x.cms.core.entity.tools.CriteriaBuilderTools;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.assemble.control.AbstractFactory;
import com.x.cms.assemble.control.Business;
import com.x.cms.core.entity.CategoryInfo;
import com.x.cms.core.entity.CategoryInfo_;
import java.util.List;
/**
* 分类信息基础功能服务类
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/DocumentCommentInfoFactory.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.factory;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Order;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import com.x.cms.core.entity.DocumentCommentInfo_;
import org.apache.commons.lang3.StringUtils;
import com.x.cms.assemble.control.AbstractFactory;
import com.x.cms.assemble.control.Business;
import com.x.cms.core.entity.DocumentCommentContent;
import com.x.cms.core.entity.DocumentCommentInfo;
import com.x.cms.core.entity.tools.CriteriaBuilderTools;
import com.x.cms.core.entity.tools.DateOperation;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.entity.DocumentCommentInfo_;
import com.x.cms.core.express.tools.CriteriaBuilderTools;
import com.x.cms.core.express.tools.DateOperation;
import com.x.cms.core.express.tools.filter.QueryFilter;
import org.apache.commons.lang3.StringUtils;
import javax.persistence.EntityManager;
import javax.persistence.criteria.*;
import java.util.List;
/**
* 文档评论基础功能服务类
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/DocumentFactory.java
浏览文件 @ d5dc8c4a
......@@ -8,8 +8,8 @@ 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.entity.tools.CriteriaBuilderTools;
import com.x.cms.core.entity.tools.filter.QueryFilter;
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;
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/FormFactory.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.factory;
import java.util.List;
import com.x.base.core.project.exception.ExceptionWhen;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.assemble.control.AbstractFactory;
import com.x.cms.assemble.control.Business;
import com.x.cms.core.entity.element.Form;
import com.x.cms.core.entity.element.Form_;
import com.x.cms.core.express.tools.CriteriaBuilderTools;
import org.apache.commons.lang3.StringUtils;
import javax.persistence.EntityManager;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.project.exception.ExceptionWhen;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.assemble.control.AbstractFactory;
import com.x.cms.assemble.control.Business;
import com.x.cms.core.entity.element.Form;
import com.x.cms.core.entity.element.Form_;
import com.x.cms.core.entity.tools.CriteriaBuilderTools;
/**
* 分类表单模板信息管理表基础功能服务类
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/ItemFactory.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.factory;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Order;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import com.x.base.core.entity.dataitem.ItemCategory;
import com.x.cms.assemble.control.AbstractFactory;
import com.x.cms.assemble.control.Business;
import com.x.cms.core.entity.tools.CriteriaBuilderTools;
import com.x.cms.core.express.tools.CriteriaBuilderTools;
import com.x.query.core.entity.Item;
import com.x.query.core.entity.Item_;
import javax.persistence.EntityManager;
import javax.persistence.criteria.*;
import java.util.List;
public class ItemFactory extends AbstractFactory {
private ItemCategory itemCategory = ItemCategory.cms;
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/ReviewFactory.java
浏览文件 @ d5dc8c4a
......@@ -8,8 +8,8 @@ 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.entity.tools.CriteriaBuilderTools;
import com.x.cms.core.entity.tools.filter.QueryFilter;
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;
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListNextWithFilter.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.jaxrs.comment;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
......@@ -19,9 +12,13 @@ import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.core.entity.DocumentCommentInfo;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.QueryFilter;
import net.sf.ehcache.Element;
import org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
public class ActionListNextWithFilter extends BaseAction {
......@@ -35,7 +32,7 @@ public class ActionListNextWithFilter extends BaseAction {
Boolean check = true;
String cacheKey = null;
Element element = null;
QueryFilter queryFilter = null;
QueryFilter queryFilter = null;
if ( StringUtils.isEmpty( flag ) || "(0)".equals(flag)) {
flag = null;
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListPageWithFilter.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.jaxrs.comment;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.google.gson.JsonElement;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
......@@ -17,10 +12,13 @@ import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.core.entity.DocumentCommentInfo;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.QueryFilter;
import net.sf.ehcache.Element;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
public class ActionListPageWithFilter extends BaseAction {
private static Logger logger = LoggerFactory.getLogger(ActionListPageWithFilter.class);
......@@ -34,7 +32,7 @@ public class ActionListPageWithFilter extends BaseAction {
Boolean check = true;
String cacheKey = null;
Element element = null;
QueryFilter queryFilter = null;
QueryFilter queryFilter = null;
try {
wrapIn = this.convertToWrapIn(jsonElement, Wi.class);
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListPrevWithFilter.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.jaxrs.comment;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
......@@ -19,9 +12,13 @@ import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.core.entity.DocumentCommentInfo;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.QueryFilter;
import net.sf.ehcache.Element;
import org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
public class ActionListPrevWithFilter extends BaseAction {
......@@ -35,7 +32,7 @@ public class ActionListPrevWithFilter extends BaseAction {
Boolean check = true;
String cacheKey = null;
Element element = null;
QueryFilter queryFilter = null;
QueryFilter queryFilter = null;
if ( StringUtils.isEmpty( flag ) || "(0)".equals(flag)) {
flag = null;
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/WrapInQueryDocumentCommentInfo.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.jaxrs.comment;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.entity.tools.filter.term.EqualsTerm;
import com.x.cms.core.entity.tools.filter.term.IsFalseTerm;
import com.x.cms.core.entity.tools.filter.term.IsTrueTerm;
import com.x.cms.core.entity.tools.filter.term.LikeTerm;
import com.x.cms.core.express.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.term.EqualsTerm;
import com.x.cms.core.express.tools.filter.term.IsFalseTerm;
import com.x.cms.core.express.tools.filter.term.IsTrueTerm;
import com.x.cms.core.express.tools.filter.term.LikeTerm;
import org.apache.commons.lang3.StringUtils;
public class WrapInQueryDocumentCommentInfo {
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistImportDataExcel.java
浏览文件 @ d5dc8c4a
......@@ -15,8 +15,9 @@ import com.x.cms.common.excel.reader.DocumentExcelReader;
import com.x.cms.common.excel.reader.ExcelReadRuntime;
import com.x.cms.common.excel.reader.ExcelReadRuntime.DocTemplate;
import com.x.cms.common.excel.reader.ExcelReaderUtil;
import com.x.cms.core.entity.AppInfo;
import com.x.cms.core.entity.CategoryInfo;
import com.x.cms.core.entity.tools.DateOperation;
import com.x.cms.core.express.tools.DateOperation;
import com.x.query.core.entity.View;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -40,6 +41,7 @@ public class ActionPersistImportDataExcel extends BaseAction {
ActionResult<Wo> result = new ActionResult<>();
Wi wi = null;
Wo wo = new Wo();
AppInfo appInfo = null;
DocTemplate template = null;
CategoryInfo categoryInfo = null;
View view = null;
......@@ -67,7 +69,7 @@ public class ActionPersistImportDataExcel extends BaseAction {
Exception exception = new ExceptionDocumentInfoProcess( "参数不正确：json_data：" + json_data );
result.error( exception );
}
if( check ){
try {
categoryInfo = categoryInfoServiceAdv.get( categoryId );
......@@ -85,12 +87,28 @@ public class ActionPersistImportDataExcel extends BaseAction {
}
} catch (Exception e) {
check = false;
Exception exception = new ExceptionDocumentInfoProcess( e, "根据ID查询分类信息对象时发生异常。ID:" + categoryId );
Exception exception = new ExceptionDocumentInfoProcess( e, "根据ID查询分类信息对象时发生异常。categoryId:" + categoryId );
result.error( exception );
logger.error( e, effectivePerson, request, null);
}
}
if( check ){
try {
appInfo = appInfoServiceAdv.get( categoryInfo.getAppId() );
if( appInfo == null ){
check = false;
Exception exception = new ExceptionAppInfoNotExists( categoryInfo.getAppId() );
result.error( exception );
}
} catch (Exception e) {
check = false;
Exception exception = new ExceptionDocumentInfoProcess( e, "根据ID查询栏目信息对象时发生异常。appId:" + categoryInfo.getAppId() );
result.error( exception );
logger.error( e, effectivePerson, request, null);
}
}
if( check ){
try {
fileName = FilenameUtils.getName(new String(disposition.getFileName().getBytes(DefaultCharset.name_iso_8859_1), DefaultCharset.name));
......@@ -137,6 +155,7 @@ public class ActionPersistImportDataExcel extends BaseAction {
template = new ExcelReadRuntime.DocTemplate();
template.setAppId( categoryInfo.getAppId() );
template.setAppName( categoryInfo.getAppName() );
template.setAppAlias( appInfo.getAppAlias() );
template.setCategoryId(categoryId);
template.setCategoryName( categoryInfo.getCategoryName() );
template.setCategoryAlias( categoryInfo.getCategoryAlias() );
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryCountWithFilter.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.jaxrs.document;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.entity.tools.filter.term.InTerm;
import com.x.cms.core.entity.tools.filter.term.NotInTerm;
import com.x.cms.core.express.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.term.InTerm;
import com.x.cms.core.express.tools.filter.term.NotInTerm;
import org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
public class ActionQueryCountWithFilter extends BaseAction {
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListNextWithFilter.java
浏览文件 @ d5dc8c4a
......@@ -11,9 +11,9 @@ import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.core.entity.Document;
import com.x.cms.core.entity.Review;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.entity.tools.filter.term.InTerm;
import com.x.cms.core.entity.tools.filter.term.NotInTerm;
import com.x.cms.core.express.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.term.InTerm;
import com.x.cms.core.express.tools.filter.term.NotInTerm;
import org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpServletRequest;
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListPrevWithFilter.java
浏览文件 @ d5dc8c4a
......@@ -11,9 +11,9 @@ import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.core.entity.Document;
import com.x.cms.core.entity.Review;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.entity.tools.filter.term.InTerm;
import com.x.cms.core.entity.tools.filter.term.NotInTerm;
import com.x.cms.core.express.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.term.InTerm;
import com.x.cms.core.express.tools.filter.term.NotInTerm;
import org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpServletRequest;
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListWithFilterPaging.java
浏览文件 @ d5dc8c4a
......@@ -10,7 +10,7 @@ import com.x.base.core.project.logger.Logger;
import com.x.base.core.project.logger.LoggerFactory;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.core.entity.Document;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.QueryFilter;
import org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpServletRequest;
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/WrapInDocumentFilter.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.jaxrs.document;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.core.express.tools.DateOperation;
import com.x.cms.core.express.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.term.*;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.project.annotation.FieldDescribe;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.core.entity.tools.DateOperation;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.entity.tools.filter.term.EqualsTerm;
import com.x.cms.core.entity.tools.filter.term.InTerm;
import com.x.cms.core.entity.tools.filter.term.IsFalseTerm;
import com.x.cms.core.entity.tools.filter.term.IsTrueTerm;
import com.x.cms.core.entity.tools.filter.term.LikeTerm;
public class WrapInDocumentFilter {
@FieldDescribe( "排序列名" )
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListNextPageViewData.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.jaxrs.view;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.JsonElement;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.project.annotation.FieldDescribe;
......@@ -26,10 +17,17 @@ import com.x.cms.core.entity.Document;
import com.x.cms.core.entity.Review;
import com.x.cms.core.entity.element.View;
import com.x.cms.core.entity.element.ViewFieldConfig;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.entity.tools.filter.term.EqualsTerm;
import com.x.cms.core.entity.tools.filter.term.IsFalseTerm;
import com.x.cms.core.entity.tools.filter.term.IsTrueTerm;
import com.x.cms.core.express.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.term.EqualsTerm;
import com.x.cms.core.express.tools.filter.term.IsFalseTerm;
import com.x.cms.core.express.tools.filter.term.IsTrueTerm;
import org.apache.commons.lang3.StringUtils;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
public class ActionListNextPageViewData extends BaseAction {
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentCommentInfoPersistService.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.service;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.project.http.EffectivePerson;
import com.x.cms.core.entity.DocumentCommentInfo;
import com.x.cms.core.entity.tools.DateOperation;
import com.x.cms.core.express.tools.DateOperation;
import org.apache.commons.lang3.StringUtils;
/**
* 对评论信息的持久化服务
*
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentCommentInfoQueryService.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.service;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.core.entity.DocumentCommentContent;
import com.x.cms.core.entity.DocumentCommentInfo;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.QueryFilter;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.List;
/**
* 对评论信息查询的服务
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentCommentInfoService.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.service;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.entity.annotation.CheckPersistType;
......@@ -12,7 +8,10 @@ import com.x.cms.assemble.control.Business;
import com.x.cms.core.entity.Document;
import com.x.cms.core.entity.DocumentCommentContent;
import com.x.cms.core.entity.DocumentCommentInfo;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.QueryFilter;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
class DocumentCommentInfoService {
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentInfoService.java
浏览文件 @ d5dc8c4a
......@@ -14,7 +14,7 @@ import com.x.cms.core.entity.Document;
import com.x.cms.core.entity.DocumentCommentInfo;
import com.x.cms.core.entity.FileInfo;
import com.x.cms.core.entity.Log;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.QueryFilter;
import com.x.query.core.entity.Item;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.lang3.StringUtils;
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentQueryService.java
浏览文件 @ d5dc8c4a
......@@ -16,7 +16,7 @@ import com.x.cms.core.entity.CategoryInfo;
import com.x.cms.core.entity.Document;
import com.x.cms.core.entity.Review;
import com.x.cms.core.entity.content.Data;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.QueryFilter;
import com.x.query.core.entity.Item;
import org.apache.commons.lang3.StringUtils;
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentViewRecordServiceAdv.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.annotation.CheckPersistType;
......@@ -16,7 +10,13 @@ import com.x.cms.assemble.control.Business;
import com.x.cms.core.entity.Document;
import com.x.cms.core.entity.DocumentViewRecord;
import com.x.cms.core.entity.Log;
import com.x.cms.core.entity.tools.DateOperation;
import com.x.cms.core.express.tools.DateOperation;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 对文档访问记录信息进行管理的服务类（高级）
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/LogService.java
浏览文件 @ d5dc8c4a
package com.x.cms.assemble.control.service;
import java.util.Date;
import java.util.List;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.entity.annotation.CheckPersistType;
import com.x.base.core.entity.annotation.CheckRemoveType;
import com.x.cms.assemble.control.Business;
import com.x.cms.core.entity.Log;
import com.x.cms.core.entity.tools.DateOperation;
import com.x.cms.core.express.tools.DateOperation;
import java.util.Date;
import java.util.List;
public class LogService {
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/ReviewService.java
浏览文件 @ d5dc8c4a
......@@ -12,7 +12,7 @@ import com.x.cms.core.entity.AppInfo;
import com.x.cms.core.entity.CategoryInfo;
import com.x.cms.core.entity.Document;
import com.x.cms.core.entity.Review;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.QueryFilter;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
......
o2server/x_cms_assemble_control/src/main/java/com/x/cms/common/excel/reader/ExcelReadRuntime.java
浏览文件 @ d5dc8c4a
package com.x.cms.common.excel.reader;
import java.util.Date;
import java.util.List;
import com.x.cms.assemble.control.jaxrs.document.ActionPersistImportDataExcel.Wi;
import com.x.cms.assemble.control.jaxrs.document.ActionPersistImportDataExcel.Wo;
import com.x.cms.assemble.control.queue.DataImportStatus;
import java.util.Date;
import java.util.List;
public class ExcelReadRuntime {
public Integer startRow = 1;
......@@ -35,6 +35,7 @@ public class ExcelReadRuntime {
private String documentType = "数据";
private String appId;
private String appName;
private String appAlias;
private String categoryId;
private String categoryName;
private String categoryAlias;
......@@ -246,5 +247,9 @@ public class ExcelReadRuntime {
public void setImportBatchName(String importBatchName) {
this.importBatchName = importBatchName;
}
public String getAppAlias() { return this.appAlias; }
public void setAppAlias(final String appAlias) { this.appAlias = appAlias; }
}
}
o2server/x_cms_core_express/src/main/java/com/x/cms/core/express/permission/CmsPermissionService.java
浏览文件 @ d5dc8c4a
......@@ -6,8 +6,8 @@ import com.x.cms.core.entity.AppInfo;
import com.x.cms.core.entity.CategoryInfo;
import com.x.cms.core.entity.Review;
import com.x.cms.core.entity.Review_;
import com.x.cms.core.entity.tools.CriteriaBuilderTools;
import com.x.cms.core.entity.tools.filter.QueryFilter;
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;
......
o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/tools/CriteriaBuilderTools.java → o2server/x_cms_core_express/src/main/java/com/x/cms/core/express/tools/CriteriaBuilderTools.java
浏览文件 @ d5dc8c4a
package com.x.cms.core.entity.tools;
import java.lang.reflect.Field;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Order;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import org.apache.commons.lang3.StringUtils;
package com.x.cms.core.express.tools;
import com.x.base.core.entity.JpaObject;
import com.x.base.core.entity.SliceJpaObject_;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.core.entity.Document;
import com.x.cms.core.entity.tools.filter.QueryFilter;
import com.x.cms.core.entity.tools.filter.term.DateBetweenTerm;
import com.x.cms.core.entity.tools.filter.term.EqualsTerm;
import com.x.cms.core.entity.tools.filter.term.InTerm;
import com.x.cms.core.entity.tools.filter.term.IsFalseTerm;
import com.x.cms.core.entity.tools.filter.term.IsTrueTerm;
import com.x.cms.core.entity.tools.filter.term.LikeTerm;
import com.x.cms.core.entity.tools.filter.term.MemberTerm;
import com.x.cms.core.entity.tools.filter.term.NotEqualsTerm;
import com.x.cms.core.entity.tools.filter.term.NotInTerm;
import com.x.cms.core.entity.tools.filter.term.NotMemberTerm;
import com.x.cms.core.express.tools.filter.QueryFilter;
import com.x.cms.core.express.tools.filter.term.*;
import org.apache.commons.lang3.StringUtils;
import javax.persistence.EntityManager;
import javax.persistence.criteria.*;
import java.lang.reflect.Field;
import java.util.List;
public class CriteriaBuilderTools {
......
o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/tools/DateOperation.java → o2server/x_cms_core_express/src/main/java/com/x/cms/core/express/tools/DateOperation.java
浏览文件 @ d5dc8c4a
package com.x.cms.core.entity.tools;
package com.x.cms.core.express.tools;
import java.text.ParseException;
import java.text.SimpleDateFormat;
......@@ -452,8 +452,8 @@ public class DateOperation {
df = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
}
try {
java.util.Date d1 = df.parse(date1);
java.util.Date d2 = df.parse(date2);
Date d1 = df.parse(date1);
Date d2 = df.parse(date2);
dayNumber = (d2.getTime() - d1.getTime()) / mins;
} catch (Exception e) {
throw e;
......
o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/tools/LogUtil.java → o2server/x_cms_core_express/src/main/java/com/x/cms/core/express/tools/LogUtil.java
浏览文件 @ d5dc8c4a
package com.x.cms.core.entity.tools;
import java.util.List;
package com.x.cms.core.express.tools;
import com.x.base.core.project.tools.ListTools;
import java.util.List;
/**
* 缓存管理帮助类
* @author liyi
......
o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/tools/filter/QueryFilter.java → o2server/x_cms_core_express/src/main/java/com/x/cms/core/express/tools/filter/QueryFilter.java
浏览文件 @ d5dc8c4a
package com.x.cms.core.entity.tools.filter;
package com.x.cms.core.express.tools.filter;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.core.express.tools.filter.term.*;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import com.x.base.core.project.tools.ListTools;
import com.x.cms.core.entity.tools.filter.term.DateBetweenTerm;
import com.x.cms.core.entity.tools.filter.term.EqualsTerm;
import com.x.cms.core.entity.tools.filter.term.InTerm;
import com.x.cms.core.entity.tools.filter.term.IsFalseTerm;
import com.x.cms.core.entity.tools.filter.term.IsTrueTerm;
import com.x.cms.core.entity.tools.filter.term.LikeTerm;
import com.x.cms.core.entity.tools.filter.term.MemberTerm;
import com.x.cms.core.entity.tools.filter.term.NotEqualsTerm;
import com.x.cms.core.entity.tools.filter.term.NotInTerm;
import com.x.cms.core.entity.tools.filter.term.NotMemberTerm;
public class QueryFilter {
......
o2server/x_console/src/main/java/com/x/server/console/server/JettySeverTools.java
浏览文件 @ d5dc8c4a
......@@ -99,6 +99,8 @@ public abstract class JettySeverTools {
filter = FileFilterUtils.or(filter, new WildcardFileFilter("ehcache-*.jar"));
/* 如果不单独导入会导致java.lang.NoClassDefFoundError: org/eclipse/jetty/http/MimeTypes */
filter = FileFilterUtils.or(filter, new WildcardFileFilter("jetty-all-*.jar"));
/* jersey从AppClassLoader加载 */
// filter = FileFilterUtils.or(filter, new WildcardFileFilter("jersey-*.jar"));
filter = FileFilterUtils.or(filter, new WildcardFileFilter("quartz-*.jar"));
for (File o : FileUtils.listFiles(Config.dir_commons_ext(), filter, null)) {
jars.add(o.getAbsolutePath());
......
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/test/ActionTest1.java 0 → 100644
浏览文件 @ d5dc8c4a
package com.x.processplatform.service.processing.jaxrs.test;
import org.eclipse.jetty.http.MimeTypes;
import com.x.base.core.container.EntityManagerContainer;
import com.x.base.core.container.factory.EntityManagerContainerFactory;
import com.x.base.core.project.http.ActionResult;
import com.x.base.core.project.http.EffectivePerson;
import com.x.base.core.project.jaxrs.WrapBoolean;
class ActionTest1 extends BaseAction {
ActionResult<Wo> execute(EffectivePerson effectivePerson) throws Exception {
try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
ActionResult<Wo> result = new ActionResult<>();
System.out.println(this.getClass().getClassLoader());
System.out.println(Thread.currentThread().getContextClassLoader());
System.out.println(MimeTypes.class.getClassLoader());
System.out.println(org.glassfish.jersey.server.ApplicationHandler.class.getClassLoader());
System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
ClassLoader cl = this.getClass().getClassLoader();
while (null != cl) {
System.out.println("!!!!!!!!!:" + cl);
cl = cl.getParent();
}
return result;
}
}
public static class Wo extends WrapBoolean {
}
}
\ No newline at end of file
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/test/TestAction.java
浏览文件 @ d5dc8c4a
......@@ -161,5 +161,22 @@ public class TestAction extends StandardJaxrsAction {
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
@JaxrsMethodDescribe(value = "立即执行催办任务.", action = ActionTest1.class)
@GET
@Path("test/1")
@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
@Consumes(MediaType.APPLICATION_JSON)
public void test1(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) {
ActionResult<ActionTest1.Wo> result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
try {
result = new ActionTest1().execute(effectivePerson);
} catch (Exception e) {
logger.error(e, effectivePerson, request, null);
result.error(e);
}
asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
}
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或