diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/ActionApplication.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/ActionApplication.java index 40d7aaed984470fe6af7c937709db6f423d35fa3..8041c2c9bfe2a6bcebe368d8df1968551fed678e 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/ActionApplication.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/ActionApplication.java @@ -14,8 +14,6 @@ import com.x.processplatform.assemble.surface.jaxrs.file.FileAction; import com.x.processplatform.assemble.surface.jaxrs.form.FormAction; import com.x.processplatform.assemble.surface.jaxrs.job.JobAction; import com.x.processplatform.assemble.surface.jaxrs.process.ProcessAction; -import com.x.processplatform.assemble.surface.jaxrs.querystat.QueryStatAction; -import com.x.processplatform.assemble.surface.jaxrs.queryview.QueryViewAction; import com.x.processplatform.assemble.surface.jaxrs.read.ReadAction; import com.x.processplatform.assemble.surface.jaxrs.readcompleted.ReadCompletedAction; import com.x.processplatform.assemble.surface.jaxrs.review.ReviewAction; @@ -51,8 +49,6 @@ public class ActionApplication extends AbstractActionApplication { classes.add(WorkAction.class); classes.add(WorkCompletedAction.class); classes.add(JobAction.class); - classes.add(QueryViewAction.class); - classes.add(QueryStatAction.class); classes.add(ToolAction.class); classes.add(TestAction.class); classes.add(FileAction.class); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/ActionExecute.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/ActionExecute.java deleted file mode 100644 index 284fe1efa3d5b8af8efc5d032aabf7d7b7e29501..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/ActionExecute.java +++ /dev/null @@ -1,347 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.querystat; - -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.reflect.TypeToken; -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.bean.NameIdPair; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.gson.XGsonBuilder; -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.base.core.project.tools.ListTools; -import com.x.processplatform.assemble.surface.Business; -import com.x.processplatform.core.entity.element.Application; -import com.x.processplatform.core.entity.element.QueryStat; -import com.x.processplatform.core.entity.element.QueryView; -import com.x.processplatform.core.entity.query.Calculate; -import com.x.processplatform.core.entity.query.DateRangeEntry; -import com.x.processplatform.core.entity.query.FilterEntry; -import com.x.processplatform.core.entity.query.Query; -import com.x.processplatform.core.entity.query.SelectEntry; -import com.x.processplatform.core.entity.query.WhereEntry; - -class ActionExecute extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionExecute.class); - - private static Type filterEntryCollectionType = new TypeToken>() { - }.getType(); - - private static Type stringCollectionType = new TypeToken>() { - }.getType(); - - ActionResult execute(EffectivePerson effectivePerson, String flag, String applicationFlag, - JsonElement jsonElement) throws Exception { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - ActionResult result = new ActionResult<>(); - Wi wi = this.convertToWrapIn(jsonElement, Wi.class); - Business business = new Business(emc); - Application application = business.application().pick(applicationFlag); - if (null == application) { - throw new ApplicationNotExistedException(applicationFlag); - } - QueryStat queryStat = business.queryStat().pick(flag, application); - if (null == queryStat) { - throw new QueryStatNotExistedException(flag, applicationFlag); - } - QueryView queryView = business.queryView().pick(queryStat.getQueryView(), application); - if (null == queryView) { - throw new QueryViewNotExistedException(flag, applicationFlag); - } - if (!business.queryView().allowRead(effectivePerson, queryView, application)) { - throw new QueryViewAccessDeniedException(effectivePerson.getDistinguishedName(), queryView.getId(), - applicationFlag); - } - Query query = gson.fromJson(queryView.getData(), Query.class); - /* 从queryStat里面取得data,并从中间分离出calculate注入到query中 */ - if (StringUtils.isNotBlank(queryStat.getData())) { - JsonElement element = gson.fromJson(queryStat.getData(), JsonElement.class); - if (null != element && element.isJsonObject()) { - JsonObject jsonObject = element.getAsJsonObject(); - if (jsonObject.has("calculate")) { - query.setCalculate(gson.fromJson(jsonObject.get("calculate"), Calculate.class)); - } - } - } - if (null != wi) { - if (null != wi.getDate()) { - query.setDateRangeEntry(this.readDateRangeEntry(wi.getDate())); - } - if ((null != wi.getFilter()) && (!wi.getFilter().isJsonNull())) { - query.setFilterEntryList(this.readFilterEntryList(wi.getFilter())); - } - if ((null != wi.getColumn()) && (!wi.getColumn().isJsonNull())) { - query.setColumnList(this.readColumnList(wi.getColumn(), query.getSelectEntryList())); - } - WhereEntry whereEntry = this.readWhereEntry(wi.getApplication(), wi.getProcess(), wi.getUnit(), - wi.getPerson(), wi.getIdentity()); - if (whereEntry.available()) { - query.setWhereEntry(whereEntry); - } - } - query.query(); - /* 整理一下输出值 */ - if ((null != query.getGroupEntry()) && query.getGroupEntry().available()) { - query.setGrid(null); - } - if ((null != query.getCalculate()) && (query.getCalculate().available())) { - query.setGrid(null); - query.setGroupGrid(null); - } - result.setData(query); - return result; - } - } - - public static class Wi extends GsonPropertyObject { - - private DateRangeEntry date; - - private JsonElement filter; - - private JsonElement column; - - private JsonElement application; - - private JsonElement process; - - private JsonElement unit; - - private JsonElement person; - - private JsonElement identity; - - public DateRangeEntry getDate() { - return date; - } - - public void setDate(DateRangeEntry date) { - this.date = date; - } - - public JsonElement getFilter() { - return filter; - } - - public void setFilter(JsonElement filter) { - this.filter = filter; - } - - public JsonElement getColumn() { - return column; - } - - public void setColumn(JsonElement column) { - this.column = column; - } - - public JsonElement getApplication() { - return application; - } - - public void setApplication(JsonElement application) { - this.application = application; - } - - public JsonElement getProcess() { - return process; - } - - public void setProcess(JsonElement process) { - this.process = process; - } - - public JsonElement getPerson() { - return person; - } - - public void setPerson(JsonElement person) { - this.person = person; - } - - public JsonElement getIdentity() { - return identity; - } - - public void setIdentity(JsonElement identity) { - this.identity = identity; - } - - public JsonElement getUnit() { - return unit; - } - - public void setUnit(JsonElement unit) { - this.unit = unit; - } - - } - - private WhereEntry readWhereEntry(JsonElement application, JsonElement process, JsonElement unit, - JsonElement person, JsonElement identity) throws Exception { - WhereEntry whereEntry = new WhereEntry(); - if (null != application && (!application.isJsonNull())) { - whereEntry.setApplicationList(this.readApplication(application)); - } - if (null != process && (!process.isJsonNull())) { - whereEntry.setProcessList(this.readProcess(process)); - } - if (null != unit && (!unit.isJsonNull())) { - whereEntry.setUnitList(this.readUnit(unit)); - } - if (null != person && (!person.isJsonNull())) { - whereEntry.setPersonList(this.readPerson(person)); - } - if (null != identity && (!identity.isJsonNull())) { - whereEntry.setIdentityList(this.readIdentity(identity)); - } - return whereEntry; - } - - private List readApplication(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private List readProcess(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private List readUnit(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private List readIdentity(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private List readPerson(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private DateRangeEntry readDateRangeEntry(DateRangeEntry o) throws Exception { - if (!o.available()) { - throw new Exception("dateRangeEntry not available:" + o); - } - return o; - } - - private List readFilterEntryList(JsonElement o) throws Exception { - List list = new ArrayList<>(); - if (o.isJsonArray()) { - list = XGsonBuilder.instance().fromJson(o, filterEntryCollectionType); - } else if (o.isJsonObject()) { - list.add(XGsonBuilder.instance().fromJson(o, FilterEntry.class)); - } - for (FilterEntry entry : list) { - if (!entry.available()) { - throw new Exception("filterEntry not available:" + entry); - } - } - return list; - } - - private List readColumnList(JsonElement o, List selectEntryList) throws Exception { - List columns = new ArrayList<>(); - if (o.isJsonArray()) { - /* 多值 */ - for (JsonElement element : o.getAsJsonArray()) { - String column = this.getColumn(element, selectEntryList); - if (StringUtils.isNotEmpty(column)) { - columns.add(column); - } - } - } else if (o.isJsonPrimitive()) { - /* 单值 */ - String column = this.getColumn(o, selectEntryList); - if (StringUtils.isNotEmpty(column)) { - columns.add(column); - } - } - return columns; - } - - private String getColumn(JsonElement o, List list) throws Exception { - if (null == o || o.isJsonNull() || (!o.isJsonPrimitive()) || ListTools.isEmpty(list)) { - return null; - } - if (o.getAsJsonPrimitive().isNumber()) { - Integer idx = o.getAsJsonPrimitive().getAsInt(); - if ((idx >= 1) && (idx <= (list.size() + 1))) { - return list.get(idx - 1).getColumn(); - } - } else if (o.getAsJsonPrimitive().isString()) { - String str = o.getAsJsonPrimitive().getAsString(); - for (SelectEntry entry : list) { - if (StringUtils.equals(entry.getColumn(), str)) { - return entry.getColumn(); - } - } - } - return null; - } -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/ActionFlag.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/ActionFlag.java deleted file mode 100644 index 49b84f785faffd26f9b96b729750fa519007e738..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/ActionFlag.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.querystat; - -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.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -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.processplatform.assemble.surface.Business; -import com.x.processplatform.core.entity.element.Application; -import com.x.processplatform.core.entity.element.QueryStat; - -class ActionFlag extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionFlag.class); - - ActionResult execute(EffectivePerson effectivePerson, String flag, String applicationFlag) throws Exception { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - ActionResult result = new ActionResult<>(); - Business business = new Business(emc); - Application application = business.application().pick(applicationFlag); - if (null == application) { - throw new ApplicationNotExistedException(applicationFlag); - } - QueryStat o = business.queryStat().pick(flag, application); - if (null == o) { - throw new QueryStatNotExistedException(flag, applicationFlag); - } - if (!business.queryStat().allowRead(effectivePerson, o, application)) { - throw new QueryStatAccessDeniedException(effectivePerson.getDistinguishedName(), flag, applicationFlag); - } - Wo wo = Wo.copier.copy(o); - result.setData(wo); - return result; - } - } - - public static class Wo extends QueryStat { - - private static final long serialVersionUID = 2886873983211744188L; - - static WrapCopier copier = WrapCopierFactory.wo(QueryStat.class, Wo.class, null, - JpaObject.FieldsInvisible); - - } - -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/ActionList.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/ActionList.java deleted file mode 100644 index ee072abb08b433c6f39c153670dbcb43752a2f54..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/ActionList.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.querystat; - -import java.util.ArrayList; -import java.util.List; - -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 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.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.organization.OrganizationDefinition; -import com.x.base.core.project.tools.SortTools; -import com.x.processplatform.assemble.surface.Business; -import com.x.processplatform.assemble.surface.wrapout.element.WrapOutQueryStat; -import com.x.processplatform.core.entity.element.Application; -import com.x.processplatform.core.entity.element.QueryStat; -import com.x.processplatform.core.entity.element.QueryStat_; - -class ActionList extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionList.class); - - ActionResult> execute(EffectivePerson effectivePerson, String applicationFlag) - throws Exception { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); - Application application = business.application().pick(applicationFlag); - if (null == application) { - throw new ApplicationNotExistedException(applicationFlag); - } - ActionResult> result = new ActionResult<>(); - List wraps = new ArrayList<>(); - List ids = this.list(business, effectivePerson, application); - List os = business.entityManagerContainer().list(QueryStat.class, ids); - wraps = outCopier.copy(os); - SortTools.asc(wraps, true, "name"); - result.setData(wraps); - return result; - } - } - - private List list(Business business, EffectivePerson effectivePerson, Application application) - throws Exception { - EntityManager em = business.entityManagerContainer().get(QueryStat.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(QueryStat.class); - Predicate p = cb.conjunction(); - /* 不是管理员或者流程管理员 */ - if (effectivePerson.isNotManager() - && (!business.organization().person().hasRole(effectivePerson.getDistinguishedName(), - OrganizationDefinition.ProcessPlatformManager, OrganizationDefinition.Manager)) - && effectivePerson.isNotPerson(application.getControllerList())) { - p = cb.equal(root.get(QueryStat_.creatorPerson), effectivePerson.getDistinguishedName()); - p = cb.or(p, root.get(QueryStat_.controllerList).in(effectivePerson.getDistinguishedName())); - p = cb.or(p, - cb.and(cb.isEmpty(root.get(QueryStat_.availablePersonList)), - cb.isEmpty(root.get(QueryStat_.availableUnitList)), - cb.isEmpty(root.get(QueryStat_.availableIdentityList)))); - p = cb.or(p, cb.isMember(effectivePerson.getDistinguishedName(), root.get(QueryStat_.availablePersonList))); - p = cb.or(p, root.get(QueryStat_.availableUnitList) - .in(business.organization().unit().listWithPersonSupNested(effectivePerson))); - p = cb.or(p, root.get(QueryStat_.availableIdentityList) - .in(business.organization().identity().listWithPerson(effectivePerson))); - } - p = cb.and(p, cb.equal(root.get(QueryStat_.application), application.getId())); - cq.select(root.get(QueryStat_.id)).where(p).distinct(true); - List list = em.createQuery(cq).getResultList(); - return list; - } - -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/ApplicationNotExistedException.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/ApplicationNotExistedException.java deleted file mode 100644 index 41317f76d18c6ac991bf3bce8820a96b35879e8e..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/ApplicationNotExistedException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.querystat; - -import com.x.base.core.project.exception.PromptException; - -class ApplicationNotExistedException extends PromptException { - - private static final long serialVersionUID = 5092496738469805434L; - - ApplicationNotExistedException(String flag) { - super("application:{} not existed.", flag); - } -} diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/BaseAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/BaseAction.java deleted file mode 100644 index a3c8f747feefbea3c6186850d2390df03e1d4be9..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/BaseAction.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.querystat; - -import com.x.base.core.project.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.processplatform.assemble.surface.wrapout.element.WrapOutQueryStat; -import com.x.processplatform.core.entity.element.QueryStat; - -abstract class BaseAction extends StandardJaxrsAction { - - static WrapCopier outCopier = WrapCopierFactory.wo(QueryStat.class, - WrapOutQueryStat.class, null, WrapOutQueryStat.Excludes); - -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryStatAccessDeniedException.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryStatAccessDeniedException.java deleted file mode 100644 index 26bd50af547f528cf6a549fe33703d1e3e37b24b..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryStatAccessDeniedException.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.querystat; - -import com.x.base.core.project.exception.PromptException; - -class QueryStatAccessDeniedException extends PromptException { - - private static final long serialVersionUID = 5192798633373774203L; - - QueryStatAccessDeniedException(String person, String queryStat, String application) { - super("person:{} access queryStat :{}, denied, in application: {}.", person, queryStat, application); - } - -} diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryStatAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryStatAction.java deleted file mode 100644 index dc94bc8626b4d5c4dee8eca09496ab29ec005c30..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryStatAction.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.querystat; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.processplatform.assemble.surface.wrapout.element.WrapOutQueryStat; -import com.x.processplatform.core.entity.query.Query; - -@Path("querystat") -@JaxrsDescribe("统计操作") -public class QueryStatAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(QueryStatAction.class); - - //@HttpMethodDescribe(value = "列示所有当前用户可见的QueryStat.", response = WrapOutQueryStat.class) - @GET - @Path("list/application/flag/{applicationFlag}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void list(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @PathParam("applicationFlag") String applicationFlag) { - ActionResult> result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionList().execute(effectivePerson, applicationFlag); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result)); - } - - @JaxrsMethodDescribe(value = "获取指定的QueryStat.", action = ActionFlag.class) - @GET - @Path("flag/{flag}/application/flag/{applicationFlag}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void flag(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @PathParam("flag") String flag, - @PathParam("applicationFlag") String applicationFlag) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionFlag().execute(effectivePerson, flag, applicationFlag); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result)); - } - - //@HttpMethodDescribe(value = "执行QueryView查询.", response = Query.class) - @PUT - @Path("flag/{flag}/application/flag/{applicationFlag}/execute") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void execute(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @PathParam("flag") String flag, - @PathParam("applicationFlag") String applicationFlag, JsonElement jsonElement) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionExecute().execute(effectivePerson, flag, applicationFlag, jsonElement); - } catch (Exception e) { - logger.error(e, effectivePerson, request, jsonElement); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result)); - } - -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryStatNotExistedException.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryStatNotExistedException.java deleted file mode 100644 index 029798a202c85abf6fa932dcff195c29d8b7493c..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryStatNotExistedException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.querystat; - -import com.x.base.core.project.exception.PromptException; - -class QueryStatNotExistedException extends PromptException { - - private static final long serialVersionUID = -4720230175081531553L; - - QueryStatNotExistedException(String flag, String applicationFlag) { - super("queryStat :{}, not existed in application: {}.", flag, applicationFlag); - } -} diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryViewAccessDeniedException.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryViewAccessDeniedException.java deleted file mode 100644 index 6d2b37e3694d7f3abc44d47cb6d7436afd3c2026..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryViewAccessDeniedException.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.querystat; - -import com.x.base.core.project.exception.PromptException; - -class QueryViewAccessDeniedException extends PromptException { - - private static final long serialVersionUID = -3643751916412139045L; - - QueryViewAccessDeniedException(String person, String queryView, String application) { - super("person:{} access queryView :{}, denied, in application: {}.", person, queryView, application); - } - -} diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryViewNotExistedException.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryViewNotExistedException.java deleted file mode 100644 index 3ecb584d9c69234672b5bac28a7a30c3519948da..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/querystat/QueryViewNotExistedException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.querystat; - -import com.x.base.core.project.exception.PromptException; - -class QueryViewNotExistedException extends PromptException { - - private static final long serialVersionUID = 1633835400422042028L; - - QueryViewNotExistedException(String flag, String applicationFlag) { - super("queryView: {}, not existed in application: {}.", flag, applicationFlag); - } -} diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionExcel.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionExcel.java deleted file mode 100644 index 736c25acba638d269f5c299ce8aa66ae3865f0f0..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionExcel.java +++ /dev/null @@ -1,391 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.queryview; - -import java.io.ByteArrayOutputStream; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; - -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.apache.poi.xssf.usermodel.XSSFRow; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.reflect.TypeToken; -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.bean.NameIdPair; -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.WoId; -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.base.core.project.tools.StringTools; -import com.x.processplatform.assemble.surface.Business; -import com.x.processplatform.core.entity.element.Application; -import com.x.processplatform.core.entity.element.QueryView; -import com.x.processplatform.core.entity.query.DateRangeEntry; -import com.x.processplatform.core.entity.query.FilterEntry; -import com.x.processplatform.core.entity.query.Query; -import com.x.processplatform.core.entity.query.Row; -import com.x.processplatform.core.entity.query.SelectEntry; -import com.x.processplatform.core.entity.query.WhereEntry; - -import net.sf.ehcache.Ehcache; -import net.sf.ehcache.Element; - -class ActionExcel extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionExcel.class); - - private static Type filterEntryCollectionType = new TypeToken>() { - }.getType(); - - private static Type stringCollectionType = new TypeToken>() { - }.getType(); - - private Gson gson = XGsonBuilder.instance(); - - ActionResult execute(EffectivePerson effectivePerson, String flag, String applicationFlag, - JsonElement jsonElement) throws Exception { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create(); - XSSFWorkbook workbook = new XSSFWorkbook(); - ByteArrayOutputStream os = new ByteArrayOutputStream()) { - Ehcache cache = ApplicationCache.instance().getCache(QueryView.class); - ActionResult result = new ActionResult<>(); - Wi wi = this.convertToWrapIn(jsonElement, Wi.class); - Business business = new Business(emc); - Application application = business.application().pick(applicationFlag); - QueryView queryView = business.queryView().pick(flag, application, ExceptionWhen.not_found); - if (!business.queryView().allowRead(effectivePerson, queryView, application)) { - throw new Exception("insufficient permissions."); - } - Query query = this.concrete(queryView, wi); - query.query(); - /* 整理一下输出值 */ - if ((null != query.getGroupEntry()) && query.getGroupEntry().available()) { - query.setGrid(null); - } - if ((null != query.getCalculate()) && (query.getCalculate().available())) { - query.setGrid(null); - query.setGroupGrid(null); - } - XSSFSheet sheet = workbook.createSheet("grid"); - - if (ListTools.isNotEmpty(query.getSelectEntryList())) { - XSSFRow r = sheet.createRow(0); - XSSFCell c = null; - int i = 0; - for (SelectEntry o : query.getSelectEntryList()) { - c = r.createCell(i); - c.setCellValue(o.getDisplayName()); - i++; - } - } - if (null != query.getGrid() && (!query.getGrid().isEmpty())) { - Row row = null; - XSSFRow r = null; - XSSFCell c = null; - int i = 0; - for (int j = 0; j < query.getGrid().size(); j++) { - row = query.getGrid().get(j); - r = sheet.createRow(j + 1); - i = 0; - for (Entry entry : row.getData().entrySet()) { - c = r.createCell(i); - c.setCellValue(Objects.toString(entry.getValue(), "")); - i++; - } - } - } - String name = queryView.getName() + ".xlsx"; - workbook.write(os); - ExcelResultObject obj = new ExcelResultObject(); - obj.setBytes(os.toByteArray()); - obj.setName(name); - obj.setPerson(effectivePerson.getDistinguishedName()); - String id = StringTools.uniqueToken(); - cache.put(new Element(id, obj)); - Wo wo = new Wo(); - wo.setId(id); - result.setData(wo); - return result; - } - } - - public static class Wo extends WoId { - - } - - public static class Wi extends GsonPropertyObject { - - private DateRangeEntry date; - - private JsonElement filter; - - private JsonElement column; - - private JsonElement application; - - private JsonElement process; - - private JsonElement unit; - - private JsonElement person; - - private JsonElement identity; - - public DateRangeEntry getDate() { - return date; - } - - public void setDate(DateRangeEntry date) { - this.date = date; - } - - public JsonElement getFilter() { - return filter; - } - - public void setFilter(JsonElement filter) { - this.filter = filter; - } - - public JsonElement getColumn() { - return column; - } - - public void setColumn(JsonElement column) { - this.column = column; - } - - public JsonElement getApplication() { - return application; - } - - public void setApplication(JsonElement application) { - this.application = application; - } - - public JsonElement getProcess() { - return process; - } - - public void setProcess(JsonElement process) { - this.process = process; - } - - public JsonElement getPerson() { - return person; - } - - public void setPerson(JsonElement person) { - this.person = person; - } - - public JsonElement getIdentity() { - return identity; - } - - public void setIdentity(JsonElement identity) { - this.identity = identity; - } - - public JsonElement getUnit() { - return unit; - } - - public void setUnit(JsonElement unit) { - this.unit = unit; - } - - } - - private Query concrete(QueryView queryView, Wi wi) throws Exception { - Query query = gson.fromJson(queryView.getData(), Query.class); - if (null != wi) { - if (null != wi.getDate()) { - query.setDateRangeEntry(this.readDateRangeEntry(wi.getDate())); - } - if ((null != wi.getFilter()) && (!wi.getFilter().isJsonNull())) { - query.setFilterEntryList(this.readFilterEntryList(wi.getFilter())); - } - if ((null != wi.getColumn()) && (!wi.getColumn().isJsonNull())) { - query.setColumnList(this.readColumnList(wi.getColumn(), query.getSelectEntryList())); - } - WhereEntry whereEntry = this.readWhereEntry(wi.getApplication(), wi.getProcess(), wi.getUnit(), - wi.getPerson(), wi.getIdentity()); - if (whereEntry.available()) { - query.setWhereEntry(whereEntry); - } - } - return query; - } - - private WhereEntry readWhereEntry(JsonElement application, JsonElement process, JsonElement unit, - JsonElement person, JsonElement identity) throws Exception { - WhereEntry whereEntry = new WhereEntry(); - if (null != application && (!application.isJsonNull())) { - whereEntry.setApplicationList(this.readApplication(application)); - } - if (null != process && (!process.isJsonNull())) { - whereEntry.setProcessList(this.readProcess(process)); - } - if (null != unit && (!unit.isJsonNull())) { - whereEntry.setUnitList(this.readUnit(unit)); - } - if (null != person && (!person.isJsonNull())) { - whereEntry.setPersonList(this.readPerson(person)); - } - if (null != identity && (!identity.isJsonNull())) { - whereEntry.setIdentityList(this.readIdentity(identity)); - } - return whereEntry; - } - - private List readApplication(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private List readProcess(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private List readUnit(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private List readIdentity(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private List readPerson(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private DateRangeEntry readDateRangeEntry(DateRangeEntry o) throws Exception { - if (!o.available()) { - throw new Exception("dateRangeEntry not available:" + o); - } - return o; - } - - private List readFilterEntryList(JsonElement o) throws Exception { - List list = new ArrayList<>(); - if (o.isJsonArray()) { - list = XGsonBuilder.instance().fromJson(o, filterEntryCollectionType); - } else if (o.isJsonObject()) { - list.add(XGsonBuilder.instance().fromJson(o, FilterEntry.class)); - } - for (FilterEntry entry : list) { - if (!entry.available()) { - throw new Exception("filterEntry not available:" + entry); - } - } - return list; - } - - private List readColumnList(JsonElement o, List selectEntryList) throws Exception { - List columns = new ArrayList<>(); - if (o.isJsonArray()) { - /* 多值 */ - for (JsonElement element : o.getAsJsonArray()) { - String column = this.getColumn(element, selectEntryList); - if (StringUtils.isNotEmpty(column)) { - columns.add(column); - } - } - } else if (o.isJsonPrimitive()) { - /* 单值 */ - String column = this.getColumn(o, selectEntryList); - if (StringUtils.isNotEmpty(column)) { - columns.add(column); - } - } - return columns; - } - - private String getColumn(JsonElement o, List list) throws Exception { - if (null == o || o.isJsonNull() || (!o.isJsonPrimitive()) || ListTools.isEmpty(list)) { - return null; - } - if (o.getAsJsonPrimitive().isNumber()) { - Integer idx = o.getAsJsonPrimitive().getAsInt(); - if ((idx >= 1) && (idx <= (list.size() + 1))) { - return list.get(idx - 1).getColumn(); - } - } else if (o.getAsJsonPrimitive().isString()) { - String str = o.getAsJsonPrimitive().getAsString(); - for (SelectEntry entry : list) { - if (StringUtils.equals(entry.getColumn(), str)) { - return entry.getColumn(); - } - } - } - return null; - } -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionExcelResult.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionExcelResult.java deleted file mode 100644 index ccb4148e3d60c19560643980eba911df207b9c18..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionExcelResult.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.queryview; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.WoFile; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.processplatform.core.entity.element.QueryView; - -import net.sf.ehcache.Ehcache; -import net.sf.ehcache.Element; - -class ActionExcelResult extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionExcelResult.class); - - ActionResult execute(EffectivePerson effectivePerson, String flag) throws Exception { - ActionResult result = new ActionResult<>(); - Ehcache cache = ApplicationCache.instance().getCache(QueryView.class); - String cacheKey = ApplicationCache.concreteCacheKey(flag); - Element element = cache.get(cacheKey); - if (null != element && null != element.getObjectValue()) { - ExcelResultObject obj = (ExcelResultObject) element.getObjectValue(); - if (!StringUtils.equals(effectivePerson.getDistinguishedName(), obj.getPerson())) { - throw new ExceptionPersonNotMatch(effectivePerson.getDistinguishedName()); - } - Wo wo = new Wo(obj.getBytes(), this.contentType(true, obj.getName()), - this.contentDisposition(true, obj.getName())); - result.setData(wo); - } else { - throw new ExceptionExcelResultObject(flag); - } - return result; - } - - public static class Wo extends WoFile { - - public Wo(byte[] bytes, String contentType, String contentDisposition) { - super(bytes, contentType, contentDisposition); - } - - } - -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionExecute.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionExecute.java deleted file mode 100644 index 62beff17a630d17206faf97d4dc5973ef659486d..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionExecute.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.queryview; - -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.reflect.TypeToken; -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.bean.NameIdPair; -import com.x.base.core.project.exception.ExceptionWhen; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.gson.XGsonBuilder; -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.base.core.project.tools.ListTools; -import com.x.processplatform.assemble.surface.Business; -import com.x.processplatform.core.entity.element.Application; -import com.x.processplatform.core.entity.element.QueryView; -import com.x.processplatform.core.entity.query.DateRangeEntry; -import com.x.processplatform.core.entity.query.FilterEntry; -import com.x.processplatform.core.entity.query.Query; -import com.x.processplatform.core.entity.query.SelectEntry; -import com.x.processplatform.core.entity.query.WhereEntry; - -class ActionExecute extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionExecute.class); - - private static Type filterEntryCollectionType = new TypeToken>() { - }.getType(); - - private static Type stringCollectionType = new TypeToken>() { - }.getType(); - - private Gson gson = XGsonBuilder.instance(); - - ActionResult execute(EffectivePerson effectivePerson, String flag, String applicationFlag, - JsonElement jsonElement) throws Exception { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - ActionResult result = new ActionResult<>(); - Wi wi = this.convertToWrapIn(jsonElement, Wi.class); - Business business = new Business(emc); - Application application = business.application().pick(applicationFlag); - QueryView queryView = business.queryView().pick(flag, application); - if (null == queryView) { - throw new ExceptionQueryViewNotExist(flag); - } - if (!business.queryView().allowRead(effectivePerson, queryView, application)) { - throw new Exception("insufficient permissions."); - } - Query query = this.concrete(queryView, wi); - logger.debug(effectivePerson, "query:{}.", query); - query.query(); - /* 整理一下输出值 */ - if ((null != query.getGroupEntry()) && query.getGroupEntry().available()) { - query.setGrid(null); - } - if ((null != query.getCalculate()) && (query.getCalculate().available())) { - query.setGrid(null); - query.setGroupGrid(null); - } - result.setData(query); - return result; - } - } - - public static class Wi extends GsonPropertyObject { - - private DateRangeEntry date; - - private JsonElement filter; - - private JsonElement column; - - private JsonElement application; - - private JsonElement process; - - private JsonElement unit; - - private JsonElement person; - - private JsonElement identity; - - public DateRangeEntry getDate() { - return date; - } - - public void setDate(DateRangeEntry date) { - this.date = date; - } - - public JsonElement getFilter() { - return filter; - } - - public void setFilter(JsonElement filter) { - this.filter = filter; - } - - public JsonElement getColumn() { - return column; - } - - public void setColumn(JsonElement column) { - this.column = column; - } - - public JsonElement getApplication() { - return application; - } - - public void setApplication(JsonElement application) { - this.application = application; - } - - public JsonElement getProcess() { - return process; - } - - public void setProcess(JsonElement process) { - this.process = process; - } - - public JsonElement getPerson() { - return person; - } - - public void setPerson(JsonElement person) { - this.person = person; - } - - public JsonElement getIdentity() { - return identity; - } - - public void setIdentity(JsonElement identity) { - this.identity = identity; - } - - public JsonElement getUnit() { - return unit; - } - - public void setUnit(JsonElement unit) { - this.unit = unit; - } - - } - - private Query concrete(QueryView queryView, Wi wi) throws Exception { - Query query = gson.fromJson(queryView.getData(), Query.class); - if (null != wi) { - if (null != wi.getDate()) { - query.setDateRangeEntry(this.readDateRangeEntry(wi.getDate())); - } - if ((null != wi.getFilter()) && (!wi.getFilter().isJsonNull())) { - query.setFilterEntryList(this.readFilterEntryList(wi.getFilter())); - } - if ((null != wi.getColumn()) && (!wi.getColumn().isJsonNull())) { - query.setColumnList(this.readColumnList(wi.getColumn(), query.getSelectEntryList())); - } - WhereEntry whereEntry = this.readWhereEntry(wi.getApplication(), wi.getProcess(), wi.getUnit(), - wi.getPerson(), wi.getIdentity()); - if (whereEntry.available()) { - query.setWhereEntry(whereEntry); - } - } - return query; - } - - private WhereEntry readWhereEntry(JsonElement application, JsonElement process, JsonElement unit, - JsonElement person, JsonElement identity) throws Exception { - WhereEntry whereEntry = new WhereEntry(); - if (null != application && (!application.isJsonNull())) { - whereEntry.setApplicationList(this.readApplication(application)); - } - if (null != process && (!process.isJsonNull())) { - whereEntry.setProcessList(this.readProcess(process)); - } - if (null != unit && (!unit.isJsonNull())) { - whereEntry.setUnitList(this.readUnit(unit)); - } - if (null != person && (!person.isJsonNull())) { - whereEntry.setPersonList(this.readPerson(person)); - } - if (null != identity && (!identity.isJsonNull())) { - whereEntry.setIdentityList(this.readIdentity(identity)); - } - return whereEntry; - } - - private List readApplication(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private List readProcess(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private List readUnit(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private List readIdentity(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private List readPerson(JsonElement o) throws Exception { - List results = new ArrayList<>(); - List flags = new ArrayList<>(); - if (o.isJsonArray()) { - flags = XGsonBuilder.instance().fromJson(o, stringCollectionType); - } else if (o.isJsonPrimitive() && o.getAsJsonPrimitive().isString()) { - flags.add(o.getAsJsonPrimitive().getAsString()); - } - for (String str : flags) { - NameIdPair p = new NameIdPair(str, str); - results.add(p); - } - return results; - } - - private DateRangeEntry readDateRangeEntry(DateRangeEntry o) throws Exception { - if (!o.available()) { - throw new Exception("dateRangeEntry not available:" + o); - } - return o; - } - - private List readFilterEntryList(JsonElement o) throws Exception { - List list = new ArrayList<>(); - if (o.isJsonArray()) { - list = XGsonBuilder.instance().fromJson(o, filterEntryCollectionType); - } else if (o.isJsonObject()) { - list.add(XGsonBuilder.instance().fromJson(o, FilterEntry.class)); - } - for (FilterEntry entry : list) { - if (!entry.available()) { - throw new Exception("filterEntry not available:" + entry); - } - } - return list; - } - - private List readColumnList(JsonElement o, List selectEntryList) throws Exception { - List columns = new ArrayList<>(); - if (o.isJsonArray()) { - /* 多值 */ - for (JsonElement element : o.getAsJsonArray()) { - String column = this.getColumn(element, selectEntryList); - if (StringUtils.isNotEmpty(column)) { - columns.add(column); - } - } - } else if (o.isJsonPrimitive()) { - /* 单值 */ - String column = this.getColumn(o, selectEntryList); - if (StringUtils.isNotEmpty(column)) { - columns.add(column); - } - } - return columns; - } - - private String getColumn(JsonElement o, List list) throws Exception { - if (null == o || o.isJsonNull() || (!o.isJsonPrimitive()) || ListTools.isEmpty(list)) { - return null; - } - if (o.getAsJsonPrimitive().isNumber()) { - Integer idx = o.getAsJsonPrimitive().getAsInt(); - if ((idx >= 1) && (idx <= (list.size() + 1))) { - return list.get(idx - 1).getColumn(); - } - } else if (o.getAsJsonPrimitive().isString()) { - String str = o.getAsJsonPrimitive().getAsString(); - for (SelectEntry entry : list) { - if (StringUtils.equals(entry.getColumn(), str)) { - return entry.getColumn(); - } - } - } - return null; - } -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionFlag.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionFlag.java deleted file mode 100644 index 6dbc39a10084e80d11e3656a8075957e02f79316..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionFlag.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.queryview; - -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.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -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.processplatform.assemble.surface.Business; -import com.x.processplatform.core.entity.element.Application; -import com.x.processplatform.core.entity.element.QueryView; - -class ActionFlag extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionExecute.class); - - ActionResult execute(EffectivePerson effectivePerson, String flag, String applicationFlag) throws Exception { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - ActionResult result = new ActionResult<>(); - Business business = new Business(emc); - Application application = business.application().pick(applicationFlag); - if (null == application) { - throw new ExceptionApplicationNotExist(applicationFlag); - } - QueryView o = business.queryView().pick(flag, application); - if (null == o) { - throw new ExceptionQueryViewNotExist(flag); - } - if (!business.queryView().allowRead(effectivePerson, o, application)) { - throw new Exception("insufficient permissions"); - } - Wo wo = Wo.copier.copy(o); - result.setData(wo); - return result; - } - } - - public static class Wo extends QueryView { - - private static final long serialVersionUID = 2886873983211744188L; - - public static WrapCopier copier = WrapCopierFactory.wo(QueryView.class, Wo.class, null, - JpaObject.FieldsInvisible); - } - -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionList.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionList.java deleted file mode 100644 index 98382c1947f2abc3ac97f031a9ba06973ed0b564..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ActionList.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.queryview; - -import java.util.ArrayList; -import java.util.List; - -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 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.bean.WrapCopier; -import com.x.base.core.project.bean.WrapCopierFactory; -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.base.core.project.organization.OrganizationDefinition; -import com.x.base.core.project.tools.SortTools; -import com.x.processplatform.assemble.surface.Business; -import com.x.processplatform.core.entity.element.Application; -import com.x.processplatform.core.entity.element.QueryView; -import com.x.processplatform.core.entity.element.QueryView_; - -class ActionList extends BaseAction { - - private static Logger logger = LoggerFactory.getLogger(ActionExecute.class); - - ActionResult> execute(EffectivePerson effectivePerson, String applicationFlag) throws Exception { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); - Application application = business.application().pick(applicationFlag); - if (null == application) { - throw new ExceptionApplicationNotExist(applicationFlag); - } - ActionResult> result = new ActionResult<>(); - List wraps = new ArrayList<>(); - List ids = this.list(business, effectivePerson, application); - List os = business.entityManagerContainer().list(QueryView.class, ids); - wraps = Wo.copier.copy(os); - SortTools.asc(wraps, true, "name"); - result.setData(wraps); - return result; - } - } - - public static class Wo extends QueryView { - - private static final long serialVersionUID = 2886873983211744188L; - public static List Excludes = new ArrayList<>(JpaObject.FieldsInvisible); - - static WrapCopier copier = WrapCopierFactory.wo(QueryView.class, Wo.class, null, Wo.Excludes); - - } - - private List list(Business business, EffectivePerson effectivePerson, Application application) - throws Exception { - EntityManager em = business.entityManagerContainer().get(QueryView.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(QueryView.class); - Predicate p = cb.conjunction(); - /* 不是管理员或者流程管理员 */ - if (effectivePerson.isNotManager() - && (!business.organization().person().hasRole(effectivePerson, - OrganizationDefinition.ProcessPlatformManager, OrganizationDefinition.Manager)) - && effectivePerson.isNotPerson(application.getControllerList())) { - p = cb.equal(root.get(QueryView_.creatorPerson), effectivePerson.getDistinguishedName()); - p = cb.or(p, root.get(QueryView_.controllerList).in(effectivePerson.getDistinguishedName())); - p = cb.or(p, - cb.and(cb.isEmpty(root.get(QueryView_.availablePersonList)), - cb.isEmpty(root.get(QueryView_.availableUnitList)), - cb.isEmpty(root.get(QueryView_.availableIdentityList)))); - p = cb.or(p, cb.isMember(effectivePerson.getDistinguishedName(), root.get(QueryView_.availablePersonList))); - p = cb.or(p, root.get(QueryView_.availableUnitList) - .in(business.organization().unit().listWithPersonSupNested(effectivePerson))); - p = cb.or(p, root.get(QueryView_.availableIdentityList) - .in(business.organization().identity().listWithPerson(effectivePerson.getDistinguishedName()))); - } - p = cb.and(p, cb.equal(root.get(QueryView_.application), application.getId())); - p = cb.and(p, cb.notEqual(root.get(QueryView_.display), false)); - cq.select(root.get(QueryView_.id)).where(p).distinct(true); - List list = em.createQuery(cq).getResultList(); - return list; - } - -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/BaseAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/BaseAction.java deleted file mode 100644 index 927c2fba16787b451895a609d070e32cb89c87ed..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/BaseAction.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.queryview; - -import com.x.base.core.project.jaxrs.StandardJaxrsAction; - -abstract class BaseAction extends StandardJaxrsAction { - - public static class ExcelResultObject { - - private byte[] bytes; - - private String person; - - private String name; - - public byte[] getBytes() { - return bytes; - } - - public void setBytes(byte[] bytes) { - this.bytes = bytes; - } - - public String getPerson() { - return person; - } - - public void setPerson(String person) { - this.person = person; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - } - -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ExceptionApplicationNotExist.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ExceptionApplicationNotExist.java deleted file mode 100644 index 59d85889a526508311bffc3c703ad441edd97b4e..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ExceptionApplicationNotExist.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.queryview; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionApplicationNotExist extends PromptException { - - private static final long serialVersionUID = -4908883340253465376L; - - ExceptionApplicationNotExist(String flag) { - super("指定的应用不存在:{}.", flag); - } - -} diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ExceptionExcelResultObject.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ExceptionExcelResultObject.java deleted file mode 100644 index 987e22105327bf79b95a6f5f6f0468998e978eb6..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ExceptionExcelResultObject.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.queryview; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionExcelResultObject extends PromptException { - - private static final long serialVersionUID = -4908883340253465376L; - - ExceptionExcelResultObject(String flag) { - super("指定的Excel结果不存在:{}.", flag); - } - -} diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ExceptionPersonNotMatch.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ExceptionPersonNotMatch.java deleted file mode 100644 index f40ff535b1c9aa793b8d5c3187c4ff2ab9f29841..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ExceptionPersonNotMatch.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.queryview; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionPersonNotMatch extends PromptException { - - private static final long serialVersionUID = -4908883340253465376L; - - ExceptionPersonNotMatch(String flag) { - super("用户不匹配:{}.", flag); - } - -} diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ExceptionQueryViewNotExist.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ExceptionQueryViewNotExist.java deleted file mode 100644 index f894155258919e3cb1295b109071213375829a5d..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/ExceptionQueryViewNotExist.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.queryview; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionQueryViewNotExist extends PromptException { - - private static final long serialVersionUID = -4908883340253465376L; - - ExceptionQueryViewNotExist(String flag) { - super("指定的应用不存在:{}.", flag); - } - -} diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/QueryViewAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/QueryViewAction.java deleted file mode 100644 index 97a39a87dec150ee56653f1543b18608e9fd9bcd..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/queryview/QueryViewAction.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.x.processplatform.assemble.surface.jaxrs.queryview; - -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.container.AsyncResponse; -import javax.ws.rs.container.Suspended; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.JaxrsDescribe; -import com.x.base.core.project.annotation.JaxrsMethodDescribe; -import com.x.base.core.project.annotation.JaxrsParameterDescribe; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.http.HttpMediaType; -import com.x.base.core.project.jaxrs.ResponseFactory; -import com.x.base.core.project.jaxrs.StandardJaxrsAction; -import com.x.base.core.project.logger.Logger; -import com.x.base.core.project.logger.LoggerFactory; -import com.x.processplatform.core.entity.query.Query; - -@Path("queryview") -@JaxrsDescribe("视图操作") -public class QueryViewAction extends StandardJaxrsAction { - - private static Logger logger = LoggerFactory.getLogger(QueryViewAction.class); - - @JaxrsMethodDescribe(value = "列示所有当前用户可见的QueryView而且display=true的.", action = ActionList.class) - @GET - @Path("list/application/flag/{applicationFlag}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void list(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @PathParam("applicationFlag") String applicationFlag) { - ActionResult> result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionList().execute(effectivePerson, applicationFlag); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result)); - } - - @JaxrsMethodDescribe(value = "获取指定的QueryView.", action = ActionFlag.class) - @GET - @Path("flag/{flag}/application/flag/{applicationFlag}") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void flag(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("视图标识") @PathParam("flag") String flag, - @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionFlag().execute(effectivePerson, flag, applicationFlag); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result)); - } - - @JaxrsMethodDescribe(value = "执行QueryView查询.", action = ActionExecute.class) - @PUT - @Path("flag/{flag}/application/flag/{applicationFlag}/execute") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void execute(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("视图标识") @PathParam("flag") String flag, - @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, - JsonElement jsonElement) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionExecute().execute(effectivePerson, flag, applicationFlag, jsonElement); - } catch (Exception e) { - logger.error(e, effectivePerson, request, jsonElement); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result)); - } - - @JaxrsMethodDescribe(value = "导出Excel的Query执行结果,PUT方法,可以添加附加Query参数", action = ActionExcel.class) - @PUT - @Path("flag/{flag}/application/flag/{applicationFlag}/excel") - @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) - public void excel(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("视图标识") @PathParam("flag") String flag, - @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, - JsonElement jsonElement) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionExcel().execute(effectivePerson, flag, applicationFlag, jsonElement); - } catch (Exception e) { - logger.error(e, effectivePerson, request, jsonElement); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result)); - } - - @JaxrsMethodDescribe(value = "导出Excel的Query执行结果,Get方法,不添加附加Query参数.", action = ActionExcelResult.class) - @GET - @Path("excel/result/{flag}") - @Consumes(MediaType.APPLICATION_JSON) - public void excelResult(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("对象标识") @PathParam("flag") String flag) { - ActionResult result = new ActionResult<>(); - EffectivePerson effectivePerson = this.effectivePerson(request); - try { - result = new ActionExcelResult().execute(effectivePerson, flag); - } catch (Exception e) { - logger.error(e, effectivePerson, request, null); - result.error(e); - } - asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result)); - } - -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/wrapin/element/WrapInApplicationDict.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/wrapin/element/WrapInApplicationDict.java deleted file mode 100644 index 3d93a1ac33d8d920a8f09ccc21b7b7c9a2e217d9..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/wrapin/element/WrapInApplicationDict.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.x.processplatform.assemble.surface.wrapin.element; - -import com.google.gson.JsonElement; -import com.x.processplatform.core.entity.element.ApplicationDict; - -public class WrapInApplicationDict extends ApplicationDict { - - private static final long serialVersionUID = 6419951244780354684L; - private JsonElement data; - - public JsonElement getData() { - return data; - } - - public void setData(JsonElement data) { - this.data = data; - } -} diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/wrapin/element/WrapInQueryExecute.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/wrapin/element/WrapInQueryExecute.java deleted file mode 100644 index 233898db2ab52a3ef677cb61e58bc6d2c363533c..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/wrapin/element/WrapInQueryExecute.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.x.processplatform.assemble.surface.wrapin.element; - -import com.google.gson.JsonElement; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.processplatform.core.entity.query.DateRangeEntry; - -public class WrapInQueryExecute extends GsonPropertyObject { - - private DateRangeEntry date; - - private JsonElement filter; - - private JsonElement column; - - private JsonElement application; - - private JsonElement process; - - private JsonElement company; - - private JsonElement department; - - private JsonElement person; - - private JsonElement identity; - - public DateRangeEntry getDate() { - return date; - } - - public void setDate(DateRangeEntry date) { - this.date = date; - } - - public JsonElement getFilter() { - return filter; - } - - public void setFilter(JsonElement filter) { - this.filter = filter; - } - - public JsonElement getColumn() { - return column; - } - - public void setColumn(JsonElement column) { - this.column = column; - } - - public JsonElement getApplication() { - return application; - } - - public void setApplication(JsonElement application) { - this.application = application; - } - - public JsonElement getProcess() { - return process; - } - - public void setProcess(JsonElement process) { - this.process = process; - } - - public JsonElement getCompany() { - return company; - } - - public void setCompany(JsonElement company) { - this.company = company; - } - - public JsonElement getDepartment() { - return department; - } - - public void setDepartment(JsonElement department) { - this.department = department; - } - - public JsonElement getPerson() { - return person; - } - - public void setPerson(JsonElement person) { - this.person = person; - } - - public JsonElement getIdentity() { - return identity; - } - - public void setIdentity(JsonElement identity) { - this.identity = identity; - } - -} diff --git a/o2server/x_processplatform_assemble_surface/src/test/java/com/x/processplatform/assemble/surface/test/TestClient.java b/o2server/x_processplatform_assemble_surface/src/test/java/com/x/processplatform/assemble/surface/test/TestClient.java deleted file mode 100644 index 130fe74499c69d376c9af9569a16a03dc1ddb1ba..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/test/java/com/x/processplatform/assemble/surface/test/TestClient.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.x.processplatform.assemble.surface.test; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.filefilter.FalseFileFilter; -import org.apache.commons.io.filefilter.TrueFileFilter; -import org.apache.commons.lang3.builder.CompareToBuilder; -import org.junit.Test; - -import com.x.base.core.project.bean.NameIdPair; -import com.x.base.core.project.bean.NameValuePair; -import com.x.base.core.project.connection.HttpConnection; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.processplatform.core.entity.query.CalculateEntry; -import com.x.processplatform.core.entity.query.CalculateType; -import com.x.processplatform.core.entity.query.DateEffectType; -import com.x.processplatform.core.entity.query.DateRangeEntry; -import com.x.processplatform.core.entity.query.DateRangeType; -import com.x.processplatform.core.entity.query.FilterEntry; -import com.x.processplatform.core.entity.query.GroupEntry; -import com.x.processplatform.core.entity.query.OrderEntry; -import com.x.processplatform.core.entity.query.OrderType; -import com.x.processplatform.core.entity.query.Query; -import com.x.processplatform.core.entity.query.SelectEntry; -import com.x.processplatform.core.entity.query.SelectType; - -public class TestClient { - @Test - public void test1() { - Query query = new Query(); - query.getWhereEntry().getApplicationList().add(new NameIdPair("测试应用", "0c2c3d76-5301-4918-8869-f88de8d2fe57")); - query.getRestrictWhereEntry().getApplicationList() - .add(new NameIdPair("测试应用", "0c2c3d76-5301-4918-8869-f88de8d2fe57")); - DateRangeEntry dateRangeEntry1 = new DateRangeEntry(); - dateRangeEntry1.setDateEffectType(DateEffectType.start); - dateRangeEntry1.setYear("2016"); - dateRangeEntry1.setDateRangeType(DateRangeType.year); - query.setDateRangeEntry(dateRangeEntry1); - DateRangeEntry dateRangeEntry2 = new DateRangeEntry(); - dateRangeEntry2.setDateEffectType(DateEffectType.start); - dateRangeEntry2.setYear("2016"); - dateRangeEntry2.setDateRangeType(DateRangeType.year); - query.setRestrictDateRangeEntry(dateRangeEntry2); - SelectEntry selectEntry1 = new SelectEntry(); - SelectEntry selectEntry2 = new SelectEntry(); - SelectEntry selectEntry3 = new SelectEntry(); - SelectEntry selectEntry4 = new SelectEntry(); - SelectEntry selectEntry5 = new SelectEntry(); - SelectEntry selectEntry6 = new SelectEntry(); - selectEntry1.setSelectType(SelectType.attribute); - selectEntry1.setAttribute("title"); - selectEntry1.setColumn("atitle"); - selectEntry1.setDisplayName("标题"); - selectEntry2.setSelectType(SelectType.attribute); - selectEntry2.setAttribute("creatorPerson"); - selectEntry2.setColumn("acreatorPerson"); - selectEntry2.setDisplayName("创建人"); - selectEntry3.setSelectType(SelectType.path); - selectEntry3.setPath("subject"); - selectEntry3.setColumn("psubject"); - selectEntry3.setDisplayName("主题"); - selectEntry4.setSelectType(SelectType.path); - selectEntry4.setPath("amonut"); - selectEntry4.setColumn("pamonut"); - selectEntry4.setDisplayName("金额"); - selectEntry5.setSelectType(SelectType.path); - selectEntry5.setPath("phone"); - selectEntry5.setColumn("pphone"); - selectEntry5.setDisplayName("电话"); - selectEntry6.setSelectType(SelectType.path); - selectEntry6.setPath("slDate"); - selectEntry6.setColumn("pslDate"); - selectEntry6.setDisplayName("日期"); - query.getSelectEntryList().add(selectEntry1); - query.getSelectEntryList().add(selectEntry2); - query.getSelectEntryList().add(selectEntry3); - query.getSelectEntryList().add(selectEntry4); - query.getSelectEntryList().add(selectEntry5); - query.getSelectEntryList().add(selectEntry6); - FilterEntry filterEntry1 = new FilterEntry(); - filterEntry1.setComparison("equals"); - filterEntry1.setValue("aaaaa"); - filterEntry1.setPath("city.name"); - filterEntry1.setLogic("and"); - query.getFilterEntryList().add(filterEntry1); - FilterEntry filterEntry2 = new FilterEntry(); - filterEntry2.setComparison("notEquals"); - filterEntry2.setValue("bbbbb"); - filterEntry2.setPath("city.title"); - filterEntry2.setLogic("and"); - query.getRestrictFilterEntryList().add(filterEntry2); - - CalculateEntry calculateEntry1 = new CalculateEntry(); - CalculateEntry calculateEntry2 = new CalculateEntry(); - CalculateEntry calculateEntry3 = new CalculateEntry(); - CalculateEntry calculateEntry4 = new CalculateEntry(); - CalculateEntry calculateEntry5 = new CalculateEntry(); - CalculateEntry calculateEntry6 = new CalculateEntry(); - calculateEntry1.setCalculateType(CalculateType.sum); - calculateEntry1.setColumn("pamount"); - calculateEntry2.setCalculateType(CalculateType.average); - calculateEntry2.setColumn("pamount"); - calculateEntry3.setCalculateType(CalculateType.count); - calculateEntry3.setColumn("pamount"); - // calculateEntry4.setCalculateType(CalculateType.groupSum); - // calculateEntry4.setColumn("pamount"); - // calculateEntry5.setCalculateType(CalculateType.groupAverage); - // calculateEntry5.setColumn("pamount"); - // calculateEntry6.setCalculateType(CalculateType.groupCount); - calculateEntry6.setColumn("pamount"); - // query.getCalculateEntryList().add(calculateEntry1); - // query.getCalculateEntryList().add(calculateEntry2); - // query.getCalculateEntryList().add(calculateEntry3); - // query.getCalculateEntryList().add(calculateEntry4); - // query.getCalculateEntryList().add(calculateEntry5); - // query.getCalculateEntryList().add(calculateEntry6); - GroupEntry groupEntry = new GroupEntry(); - groupEntry.setColumn("pphone"); - groupEntry.setOrderType(OrderType.desc); - query.setGroupEntry(groupEntry); - OrderEntry orderEntry1 = new OrderEntry(); - orderEntry1.setColumn("pphone"); - orderEntry1.setOrderType(OrderType.asc); - OrderEntry orderEntry2 = new OrderEntry(); - orderEntry2.setColumn("pslDate"); - orderEntry2.setOrderType(OrderType.desc); - query.getOrderEntryList().add(orderEntry1); - query.getOrderEntryList().add(orderEntry2); - System.out.println(query.toString()); - } - - @Test - public void test2() throws Exception { - Map map1 = new HashMap<>(); - map1.put("title", "aaaa"); - map1.put("order", 1); - Map map2 = new HashMap<>(); - map2.put("title", "aaaa"); - map2.put("order", 2); - Map map3 = new HashMap<>(); - map3.put("title", "bbbb"); - map3.put("order", 3); - Map map4 = new HashMap<>(); - map4.put("title", "bbbb"); - map4.put("order", 4); - List> list = new ArrayList<>(); - list.add(map1); - list.add(map2); - list.add(map3); - list.add(map4); - List attributes = new ArrayList<>(); - OrderEntry order1 = new OrderEntry(); - OrderEntry order2 = new OrderEntry(); - order1.setColumn("title"); - order1.setOrderType(OrderType.desc); - order2.setColumn("order"); - order2.setOrderType(OrderType.asc); - attributes.add(order1); - attributes.add(order2); - list = list.stream().sorted((o1, o2) -> compareWith(o1, o2, attributes)).collect(Collectors.toList()); - System.out.println(XGsonBuilder.toJson(list)); - } - - public static int compareWith(Map o1, Map o2, List orderEntries) { - CompareToBuilder compareToBuilder = new CompareToBuilder(); - for (OrderEntry en : orderEntries) { - if (Objects.equals(OrderType.asc, en.getOrderType())) { - compareToBuilder.append(o1.get(en.getColumn()), o2.get(en.getColumn())); - } else { - compareToBuilder.append(o2.get(en.getColumn()), o1.get(en.getColumn())); - } - } - return compareToBuilder.toComparison(); - } - - @Test - public void test3() throws Exception { - String addr = "http://dev.ray.local:20020/x_processplatform_assemble_surface/jaxrs/work/process/3fb84f9b-0b04-49d2-9e6d-db44abca3528?v=0.4.2&jgj06idw"; - NameValuePair p = new NameValuePair("x-token", "TGzu9RzlNSLTGmXpL-MtJWt3UM2XzDf1lLLI6RVFFlXvQ_2S-AT8jQ"); - List heads = new ArrayList<>(); - heads.add(p); - for (int i = 0; i < 100000; i++) { - System.out.println(i); - HttpConnection.postAsString(addr, heads, "{title: \"数据测试流程一-无标题\", identity: \"zr\"}"); - } - } - - @Test - public void test4() throws Exception { - File file = new File("D:/导出"); - for (File o : FileUtils.listFiles(file, FalseFileFilter.FALSE, TrueFileFilter.TRUE)) { - System.out.println(o.getAbsolutePath()); - } - - } -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/test/java/com/x/processplatform/assemble/surface/test/TestClientImportFile.java b/o2server/x_processplatform_assemble_surface/src/test/java/com/x/processplatform/assemble/surface/test/TestClientImportFile.java deleted file mode 100644 index c3dbc206958c98fc7173bfbc6d6a40ad99d83837..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/test/java/com/x/processplatform/assemble/surface/test/TestClientImportFile.java +++ /dev/null @@ -1,268 +0,0 @@ -package com.x.processplatform.assemble.surface.test; - -import java.io.File; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.filefilter.DirectoryFileFilter; -import org.apache.commons.io.filefilter.FalseFileFilter; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.entity.mime.content.FileBody; -import org.apache.http.entity.mime.content.StringBody; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.protocol.HTTP; -import org.junit.Test; - -import com.google.gson.JsonElement; -import com.x.base.core.project.annotation.FieldDescribe; -import com.x.base.core.project.bean.NameValuePair; -import com.x.base.core.project.connection.ActionResponse; -import com.x.base.core.project.connection.ConnectionAction; -import com.x.base.core.project.gson.GsonPropertyObject; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.base.core.project.jaxrs.WoId; -import com.x.base.core.project.tools.DateTools; -import com.x.base.core.project.tools.DefaultCharset; - -public class TestClientImportFile { - - @Test - public void test4() throws Exception { - File file = new File("d:/公文中等结果集"); - List heads = new ArrayList<>(); - String xtoken = "jlMh2guoFia-EPxnDppJq1pXYeQZDa_GCp05aUeYqxzMvh87Dpd_A725Uy1VQNhSXe8IsPd8nkw"; - heads.add(new NameValuePair("x-token", xtoken)); - for (File dir : FileUtils.listFilesAndDirs(file, FalseFileFilter.FALSE, DirectoryFileFilter.DIRECTORY)) { - if (!StringUtils.equals(file.getAbsolutePath(), dir.getAbsolutePath())) { - File docFile = new File(dir, "文件内容&文件内容.doc"); - File infoFile = new File(dir, "baseinfo.txt"); - if ((!docFile.exists()) || (!infoFile.exists())) { - System.out.println(dir + "中的文件为空"); - } else { - String infoText = StringUtils.trim(FileUtils.readFileToString(infoFile, "gbk")); - infoText = StringUtils.substring(infoText, 1, infoText.length() - 1); - Info info = XGsonBuilder.instance().fromJson(infoText, Info.class); - System.out.println(info); - Req req = new Req(); - req.setTitle(info.getSubject()); - req.setForm("00a9df18-4a5a-490a-a2a4-224faf7d7e2a"); - req.setIdentity("周睿@93b9c84c-e5be-4fd9-bcef-96754bc34371@I"); - Map map = new HashMap<>(); - map.put("mainSend", StringUtils.split(info.getFGMainDepartmentWP(), "#")); - map.put("contactSend", StringUtils.split(info.getFGContactDepartmentRP(), "#")); - map.put("date", DateTools.parse(info.getFLBeginDateOS(), "yyyy/MM/dd HH:mm:ss")); - map.put("subject", info.getSubject()); - req.setData(XGsonBuilder.instance().toJsonTree(map)); - ActionResponse resp = ConnectionAction.post( - "http://dev.:20020/x_processplatform_assemble_surface/jaxrs/workcompleted/process/ 8a01b431-8aac-4ab1-b555-7686952e13a7", - heads, req.toString()); - WoId id = resp.getData(WoId.class); - CloseableHttpClient httpclient = HttpClients.createDefault(); - HttpPost httppost = new HttpPost( - "http://127.0.0.1:20020/x_processplatform_assemble_surface/jaxrs/attachment/upload/workcompleted/" - + id.getId()); - ContentType contentType = ContentType.create(HTTP.PLAIN_TEXT_TYPE, DefaultCharset.charset); - HttpEntity reqEntity = MultipartEntityBuilder.create().addPart("file", new FileBody(docFile)) - .addPart("fileName", new StringBody("文件内容&文件内容.doc", contentType)) - .addPart("site", new StringBody("attachment", contentType)).build(); - httppost.setEntity(reqEntity); - httppost.addHeader("x-token", xtoken); - // httpclient.execute(httppost); - CloseableHttpResponse response = httpclient.execute(httppost); - } - } - } - } - - @Test - public void test1() throws Exception { - File file = new File("E:/公文文档1"); - List heads = new ArrayList<>(); - String xtoken = "HeEoZIVgPjQ31rEg7ARdQeRVMf3woS408yvnPg3u8lM7ddsEJNHFDLJTxCww6MWxaEy5G28B49o"; - heads.add(new NameValuePair("x-token", xtoken)); - for (File dir : FileUtils.listFilesAndDirs(file, FalseFileFilter.FALSE, DirectoryFileFilter.DIRECTORY)) { - if (!StringUtils.equals(file.getAbsolutePath(), dir.getAbsolutePath())) { - File docFile = new File(dir, "文件内容&文件内容.doc"); - File infoFile = new File(dir, "baseinfo.txt"); - if ((!docFile.exists()) || (!infoFile.exists())) { - System.out.println(dir + "中的文件为空"); - } else { - String infoText = StringUtils.trim(FileUtils.readFileToString(infoFile, "gbk")); - infoText = StringUtils.substring(infoText, 1, infoText.length() - 1); - infoText = "{" + infoText + "}"; - Info info = XGsonBuilder.instance().fromJson(infoText, Info.class); - System.out.println(info); - Req req = new Req(); - req.setTitle(info.getSubject()); - req.setForm("990c1e21-5643-4c89-abe7-ce7527520b74"); - req.setIdentity("周睿@ce37b1c0-61c5-4b94-bcf3-c489347cf062@I"); - Map map = new HashMap<>(); - map.put("mainSend", StringUtils.split(info.getFGMainDepartmentWP(), "#")); - map.put("contactSend", StringUtils.split(info.getFGContactDepartmentRP(), "#")); - map.put("date", DateTools.parse(info.getFLBeginDateOS(), "yyyy/MM/dd HH:mm:ss")); - map.put("subject", info.getSubject()); - req.setData(XGsonBuilder.instance().toJsonTree(map)); - ActionResponse resp = ConnectionAction.post( - "http://127.0.0.1:20020/x_processplatform_assemble_surface/jaxrs/workcompleted/process/c2da6212-7241-489f-9cfa-e2003fff89d4", - heads, req.toString()); - WoId id = resp.getData(WoId.class); - CloseableHttpClient httpclient = HttpClients.createDefault(); - HttpPost httppost = new HttpPost( - "http://127.0.0.1:20020/x_processplatform_assemble_surface/jaxrs/attachment/upload/workcompleted/" - + id.getId()); - ContentType contentType = ContentType.create(HTTP.PLAIN_TEXT_TYPE, DefaultCharset.charset); - HttpEntity reqEntity = MultipartEntityBuilder.create().addPart("file", new FileBody(docFile)) - .addPart("fileName", new StringBody("文件内容&文件内容.doc", contentType)) - .addPart("site", new StringBody("attachment", contentType)).build(); - httppost.setEntity(reqEntity); - httppost.addHeader("x-token", xtoken); - // httpclient.execute(httppost); - CloseableHttpResponse response = httpclient.execute(httppost); - } - } - } - } - - public static class Info extends GsonPropertyObject { - private String subject; - private String FGMainDepartmentWP; - private String FGContactDepartmentRP; - private String FLBeginDateOS; - - public String getSubject() { - return subject; - } - - public void setSubject(String subject) { - this.subject = subject; - } - - public String getFGMainDepartmentWP() { - return FGMainDepartmentWP; - } - - public void setFGMainDepartmentWP(String fGMainDepartmentWP) { - FGMainDepartmentWP = fGMainDepartmentWP; - } - - public String getFGContactDepartmentRP() { - return FGContactDepartmentRP; - } - - public void setFGContactDepartmentRP(String fGContactDepartmentRP) { - FGContactDepartmentRP = fGContactDepartmentRP; - } - - public String getFLBeginDateOS() { - return FLBeginDateOS; - } - - public void setFLBeginDateOS(String fLBeginDateOS) { - FLBeginDateOS = fLBeginDateOS; - } - - } - - public static class Req extends GsonPropertyObject { - - @FieldDescribe("标题.") - private String title; - - @FieldDescribe("序号.") - private String serial; - - @FieldDescribe("指定表单.") - private String form; - - @FieldDescribe("指定表单数据.") - private String formData; - - @FieldDescribe("启动人员身份.") - private String identity; - - @FieldDescribe("开始日期.") - private Date startTime; - - @FieldDescribe("结束日期.") - private Date completedTime; - - @FieldDescribe("工作数据.") - private JsonElement data; - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getIdentity() { - return identity; - } - - public void setIdentity(String identity) { - this.identity = identity; - } - - public JsonElement getData() { - return data; - } - - public void setData(JsonElement data) { - this.data = data; - } - - public Date getCompletedTime() { - return completedTime; - } - - public void setCompletedTime(Date completedTime) { - this.completedTime = completedTime; - } - - public String getForm() { - return form; - } - - public void setForm(String form) { - this.form = form; - } - - public String getFormData() { - return formData; - } - - public void setFormData(String formData) { - this.formData = formData; - } - - public String getSerial() { - return serial; - } - - public void setSerial(String serial) { - this.serial = serial; - } - - public Date getStartTime() { - return startTime; - } - - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - } - -} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/test/java/com/x/processplatform/assemble/surface/test/aaa.json b/o2server/x_processplatform_assemble_surface/src/test/java/com/x/processplatform/assemble/surface/test/aaa.json deleted file mode 100644 index 8c9a924c2f321db69c37b432dbd472f629c688a7..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_assemble_surface/src/test/java/com/x/processplatform/assemble/surface/test/aaa.json +++ /dev/null @@ -1,161 +0,0 @@ -{ - "scopeType": "workCompleted", - "exportGrid": true, - "exportGoupGrid": true, - "selectEntryList": [ - { - "orderType": "original", - "selectType": "attribute", - "attribute": "title", - "column": "atitle", - "displayName": "标题", - "path": "" - }, - { - "orderType": "original", - "selectType": "attribute", - "attribute": "creatorPerson", - "column": "acreatorPerson", - "displayName": "创建人", - "path": "" - }, - { - "orderType": "original", - "selectType": "path", - "attribute": "", - "column": "psubject", - "displayName": "主题", - "path": "subject" - }, - { - "orderType": "original", - "selectType": "path", - "attribute": "", - "column": "pamonut", - "displayName": "金额", - "path": "amonut" - }, - { - "orderType": "original", - "selectType": "path", - "attribute": "", - "column": "pphone", - "displayName": "电话", - "path": "phone" - }, - { - "orderType": "original", - "selectType": "path", - "attribute": "", - "column": "pslDate", - "displayName": "日期", - "path": "slDate" - } - ], - "whereEntry": { - "applicationList": [ - { - "name": "测试应用", - "id": "0c2c3d76-5301-4918-8869-f88de8d2fe57" - } - ], - "processList": [], - "companyList": [], - "departmentList": [], - "personList": [], - "identityList": [] - }, - "restrictWhereEntry": { - "applicationList": [ - { - "name": "测试应用", - "id": "0c2c3d76-5301-4918-8869-f88de8d2fe57" - } - ], - "processList": [], - "companyList": [], - "departmentList": [], - "personList": [], - "identityList": [] - }, - "filterEntryList": [ - { - "path": "city.name", - "value": "aaaaa", - "logic": "and", - "comparison": "equals" - } - ], - "restrictFilterEntryList": [ - { - "path": "city.title", - "value": "bbbbb", - "logic": "and", - "comparison": "notEquals" - } - ], - "dateRangeEntry": { - "dateRangeType": "year", - "dateEffectType": "start", - "start": "2016-11-16 13:22:39", - "completed": "2016-11-16 13:22:39", - "year": "2016", - "month": "", - "date": "", - "season": 0, - "week": 0, - "adjust": 0 - }, - "restrictDateRangeEntry": { - "dateRangeType": "year", - "dateEffectType": "start", - "start": "2016-11-16 13:22:39", - "completed": "2016-11-16 13:22:39", - "year": "2016", - "month": "", - "date": "", - "season": 0, - "week": 0, - "adjust": 0 - }, - "orderEntryList": [ - { - "column": "pphone", - "orderType": "asc" - }, - { - "column": "pslDate", - "orderType": "desc" - } - ], - "groupEntry": { - "column": "pphone", - "orderType": "desc" - }, - "calculateEntryList": [ - { - "column": "pamount", - "calculateType": "sum" - }, - { - "column": "pamount", - "calculateType": "average" - }, - { - "column": "pamount", - "calculateType": "count" - }, - { - "column": "pamount", - "calculateType": "groupSum" - }, - { - "column": "pamount", - "calculateType": "groupAverage" - }, - { - "column": "pamount", - "calculateType": "groupCount" - } - ] -} diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/DateEffectType.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/DateEffectType.java deleted file mode 100644 index 15b5380baeb539ce75aecf780886d109d24f2d55..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/DateEffectType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.x.processplatform.core.entity.query; - -public enum DateEffectType { - start, completed -} \ No newline at end of file diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/OrderEffectType.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/OrderEffectType.java deleted file mode 100644 index 90de8e0e9a7516bb1fbb544f3d15bf6de7f2e6d4..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/OrderEffectType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.x.processplatform.core.entity.query; - -public enum OrderEffectType { - key, value -} diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/OrderType.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/OrderType.java deleted file mode 100644 index 7e0c9778106bc1c6c5df4b308bc2a1696ae363a3..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/OrderType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.x.processplatform.core.entity.query; - -public enum OrderType { - desc, asc, original -} \ No newline at end of file diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/ScopeType.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/ScopeType.java deleted file mode 100644 index 602f4972f941c4220858b42bd3d5410a97f1bddc..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/ScopeType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.x.processplatform.core.entity.query; - -public enum ScopeType { - work, workCompleted -} \ No newline at end of file diff --git a/o2server/x_processplatform_core_express/.gitignore b/o2server/x_processplatform_core_express/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..2b9643134ef6e4020d45328dfee6504a38ea6ef2 --- /dev/null +++ b/o2server/x_processplatform_core_express/.gitignore @@ -0,0 +1,4 @@ +.classpath +.project +/.settings/ +/target/ diff --git a/o2server/x_processplatform_core_express/COPYING b/o2server/x_processplatform_core_express/COPYING new file mode 100644 index 0000000000000000000000000000000000000000..be3f7b28e564e7dd05eaf59d64adba1a4065ac0e --- /dev/null +++ b/o2server/x_processplatform_core_express/COPYING @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/o2server/x_processplatform_core_express/pom.xml b/o2server/x_processplatform_core_express/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..ca1864e80b14262d5e474b31fdc4a7e7fc753ea5 --- /dev/null +++ b/o2server/x_processplatform_core_express/pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + + o2oa + o2server + 4.0.5 + + x_processplatform_core_express + jar + + + o2oa + x_base_core_project + + + o2oa + x_processplatform_core_entity + + + + + + maven-resources-plugin + + + copy-jar + verify + + copy-resources + + + ../store/jars + + + target + + ${project.artifactId}.jar + + + + + + + + + + \ No newline at end of file diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Calculate.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Calculate.java similarity index 87% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Calculate.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Calculate.java index d7d1ac73e42210aaa634d39dc90bd8c4fabd2b1b..dcde9a80f8e84e964cb3a8fecb21ae7b8ecbff73 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Calculate.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Calculate.java @@ -1,10 +1,13 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.ArrayList; import java.util.List; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.tools.ListTools; +import com.x.processplatform.core.entity.query.CalculateEntry; +import com.x.processplatform.core.entity.query.OrderEffectType; +import com.x.processplatform.core.entity.query.OrderType; public class Calculate extends GsonPropertyObject { diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CalculateCell.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CalculateCell.java similarity index 87% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CalculateCell.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CalculateCell.java index bcff949a2ffc7c69f41e4eee5ace9925fbe9d74e..8b77d7015b3ce6d317677d1e85ecf6d16518bd55 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CalculateCell.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CalculateCell.java @@ -1,6 +1,7 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import com.x.base.core.project.gson.GsonPropertyObject; +import com.x.processplatform.core.entity.query.CalculateEntry; public class CalculateCell extends GsonPropertyObject { diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CalculateEntry.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CalculateEntry.java similarity index 86% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CalculateEntry.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CalculateEntry.java index 2d5f4931b5e9fbc8481e67d405d07dd680f7101b..b02d88a12f917edeafcde6b1856024500bbae30d 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CalculateEntry.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CalculateEntry.java @@ -1,8 +1,11 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import org.apache.commons.lang3.StringUtils; import com.x.base.core.project.gson.GsonPropertyObject; +import com.x.processplatform.core.entity.query.CalculateType; +import com.x.processplatform.core.entity.query.OrderEffectType; +import com.x.processplatform.core.entity.query.OrderType; public class CalculateEntry extends GsonPropertyObject { diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CalculateEntryTools.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CalculateEntryTools.java similarity index 91% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CalculateEntryTools.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CalculateEntryTools.java index 293a3cc7c99d8d2c259e248b02df221f09e3f63d..6909cc66de17b40b6a7ca15b315e1e8670af0763 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CalculateEntryTools.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CalculateEntryTools.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -11,6 +11,15 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.builder.CompareToBuilder; +import com.x.processplatform.core.entity.query.Calculate; +import com.x.processplatform.core.entity.query.CalculateCell; +import com.x.processplatform.core.entity.query.CalculateEntry; +import com.x.processplatform.core.entity.query.GroupEntry; +import com.x.processplatform.core.entity.query.OrderEffectType; +import com.x.processplatform.core.entity.query.OrderType; +import com.x.processplatform.core.entity.query.Row; +import com.x.processplatform.core.entity.query.Table; + public class CalculateEntryTools { public static List calculateAmount(Table table, List calculateEntries) diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CalculateType.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CalculateType.java similarity index 74% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CalculateType.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CalculateType.java index 1e214a9969f182cbf7f7fe93cfcd079c50c85fb7..882c10fe120cc681d978ae0d48e9e720724ff393 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CalculateType.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CalculateType.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import com.x.base.core.entity.JpaObject; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Comparison.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Comparison.java similarity index 98% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Comparison.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Comparison.java index 5fd60dc5fcd34286bf749c793c15d2e881daaca9..9727255279d986b71218103d1f1ccb812f364be7 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Comparison.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Comparison.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import org.apache.commons.lang3.StringUtils; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CustomFilterEntry.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CustomFilterEntry.java similarity index 88% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CustomFilterEntry.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CustomFilterEntry.java index e8f23ac89626ed95ea6f2b1318fcacb113162f4c..8e1651dd9c5c33ab1fa695c0fe1711318f354577 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/CustomFilterEntry.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/CustomFilterEntry.java @@ -1,8 +1,9 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import org.apache.commons.lang3.StringUtils; import com.x.base.core.project.gson.GsonPropertyObject; +import com.x.processplatform.core.entity.query.FormatType; public class CustomFilterEntry extends GsonPropertyObject { diff --git a/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/DateEffectType.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/DateEffectType.java new file mode 100644 index 0000000000000000000000000000000000000000..6f9e3063f3ee3f969f9fb16b8799fc6d4a914546 --- /dev/null +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/DateEffectType.java @@ -0,0 +1,5 @@ +package com.x.processplatform.core.express.query; + +public enum DateEffectType { + start, completed +} \ No newline at end of file diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/DateRangeEntry.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/DateRangeEntry.java similarity index 92% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/DateRangeEntry.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/DateRangeEntry.java index a5e47842b9dff2ab1c34aa3fb59c6baf5b1d6958..6b857c9b0435066d345902ffa3e52e976984fa63 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/DateRangeEntry.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/DateRangeEntry.java @@ -1,9 +1,11 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.Date; import java.util.Objects; import com.x.base.core.project.gson.GsonPropertyObject; +import com.x.processplatform.core.entity.query.DateEffectType; +import com.x.processplatform.core.entity.query.DateRangeType; public class DateRangeEntry extends GsonPropertyObject { diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/DateRangeEntryTools.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/DateRangeEntryTools.java similarity index 94% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/DateRangeEntryTools.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/DateRangeEntryTools.java index 0966e9a1e36dc48c3870ad30b409e27279f48af7..8d6dc3e9f60960b75f1af0b18ebff7cd73ebf41d 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/DateRangeEntryTools.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/DateRangeEntryTools.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.Predicate; @@ -6,6 +6,7 @@ import javax.persistence.criteria.Root; import com.x.processplatform.core.entity.content.Work; import com.x.processplatform.core.entity.content.WorkCompleted; +import com.x.processplatform.core.entity.query.DateRangeEntry; import com.x.query.core.entity.Item; public class DateRangeEntryTools { diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/DateRangeType.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/DateRangeType.java similarity index 59% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/DateRangeType.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/DateRangeType.java index bc4f919b21620b710f2d852429ecbdc4cb449f96..350e4ff6685a19a2147db36f1559fd6a50d79dbf 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/DateRangeType.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/DateRangeType.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; public enum DateRangeType { year, season, month, week, date, range, none diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/EnterType.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/EnterType.java similarity index 75% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/EnterType.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/EnterType.java index 4c9a55fb6245689616feeee426626c32821d4338..a11b2d0df039221fd9f3d43be7dab9554fc6a41d 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/EnterType.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/EnterType.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import com.x.base.core.entity.JpaObject; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/FilterEntry.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/FilterEntry.java similarity index 94% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/FilterEntry.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/FilterEntry.java index fc179d78785a29715d460cd2ee65876daca24e2a..443ff2ae5a651132d9e157c2f3c9a232c64c355b 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/FilterEntry.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/FilterEntry.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -6,6 +6,7 @@ import org.apache.commons.lang3.math.NumberUtils; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.tools.DateTools; +import com.x.processplatform.core.entity.query.FormatType; public class FilterEntry extends GsonPropertyObject { diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/FilterEntryTools.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/FilterEntryTools.java similarity index 98% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/FilterEntryTools.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/FilterEntryTools.java index 69a028640ff72da94d24509f02231873ecb12f46..3fe61e87069f2276836b8c53e266a3d292615a13 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/FilterEntryTools.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/FilterEntryTools.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.Date; import java.util.List; @@ -13,6 +13,9 @@ import org.apache.commons.lang3.math.NumberUtils; import com.x.base.core.project.tools.DateTools; import com.x.base.core.project.tools.ListTools; +import com.x.processplatform.core.entity.query.Comparison; +import com.x.processplatform.core.entity.query.FilterEntry; +import com.x.processplatform.core.entity.query.FormatType; import com.x.query.core.entity.Item; import com.x.query.core.entity.Item_; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/FormatType.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/FormatType.java similarity index 60% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/FormatType.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/FormatType.java index 75d92770e6a59899f9b8af4c86a7b292a56b3648..bddc43bc9b5ead39009d2d5556ea7a57a38d2697 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/FormatType.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/FormatType.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; public enum FormatType { textValue, numberValue, booleanValue, dateTimeValue diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/GroupEntry.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/GroupEntry.java similarity index 86% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/GroupEntry.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/GroupEntry.java index 753a1401c70a8c6d99bd0589ef3e95721990fa4e..9fd29c69e63e14871fa94c5f3d85e72cddfb5dec 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/GroupEntry.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/GroupEntry.java @@ -1,8 +1,9 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import org.apache.commons.lang3.StringUtils; import com.x.base.core.project.gson.GsonPropertyObject; +import com.x.processplatform.core.entity.query.OrderType; public class GroupEntry extends GsonPropertyObject { diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/GroupEntryTools.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/GroupEntryTools.java similarity index 81% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/GroupEntryTools.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/GroupEntryTools.java index 03e84f9fa885bb3f5ef344fefaca66d2ddd3f311..3bc30a0380993139f91ae796d5ff9ae5184e87c2 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/GroupEntryTools.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/GroupEntryTools.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -10,6 +10,13 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.builder.CompareToBuilder; +import com.x.processplatform.core.entity.query.GroupEntry; +import com.x.processplatform.core.entity.query.OrderEntry; +import com.x.processplatform.core.entity.query.OrderEntryTools; +import com.x.processplatform.core.entity.query.OrderType; +import com.x.processplatform.core.entity.query.Row; +import com.x.processplatform.core.entity.query.Table; + public class GroupEntryTools { public static List> group(Table table, GroupEntry groupEntry, List orderEntries) throws Exception { diff --git a/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/OrderEffectType.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/OrderEffectType.java new file mode 100644 index 0000000000000000000000000000000000000000..c722857106a3d314ce00bdbc4ce11145a172dec3 --- /dev/null +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/OrderEffectType.java @@ -0,0 +1,5 @@ +package com.x.processplatform.core.express.query; + +public enum OrderEffectType { + key, value +} diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/OrderEntry.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/OrderEntry.java similarity index 88% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/OrderEntry.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/OrderEntry.java index d5b877c653a7a89921586068efc0236b1b24f7ee..d787100135cc56f7cb2c739073d3114411c77c38 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/OrderEntry.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/OrderEntry.java @@ -1,10 +1,11 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.Objects; import org.apache.commons.lang3.StringUtils; import com.x.base.core.project.gson.GsonPropertyObject; +import com.x.processplatform.core.entity.query.OrderType; public class OrderEntry extends GsonPropertyObject { diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/OrderEntryTools.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/OrderEntryTools.java similarity index 80% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/OrderEntryTools.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/OrderEntryTools.java index c0f238b217fb5ca07e064b2d93c2b20bfe901096..5d64122477c0358779805e4058dc124ae01e736f 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/OrderEntryTools.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/OrderEntryTools.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.ArrayList; import java.util.List; @@ -8,6 +8,10 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.builder.CompareToBuilder; import com.x.base.core.project.tools.ListTools; +import com.x.processplatform.core.entity.query.OrderEntry; +import com.x.processplatform.core.entity.query.OrderType; +import com.x.processplatform.core.entity.query.Row; +import com.x.processplatform.core.entity.query.Table; public class OrderEntryTools { diff --git a/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/OrderType.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/OrderType.java new file mode 100644 index 0000000000000000000000000000000000000000..4292293740599c02a30988202383cf2e4b37abed --- /dev/null +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/OrderType.java @@ -0,0 +1,5 @@ +package com.x.processplatform.core.express.query; + +public enum OrderType { + desc, asc, original +} \ No newline at end of file diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Query.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Query.java similarity index 94% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Query.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Query.java index 0db700be421da22f02461002978b2da0cebced1f..ab50df47c78f9f3536e2d9a5ec6b650c99789364 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Query.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Query.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.ArrayList; import java.util.Date; @@ -29,6 +29,28 @@ import com.x.processplatform.core.entity.content.Work; import com.x.processplatform.core.entity.content.WorkCompleted; import com.x.processplatform.core.entity.content.WorkCompleted_; import com.x.processplatform.core.entity.content.Work_; +import com.x.processplatform.core.entity.query.Calculate; +import com.x.processplatform.core.entity.query.CalculateCell; +import com.x.processplatform.core.entity.query.CalculateEntryTools; +import com.x.processplatform.core.entity.query.Comparison; +import com.x.processplatform.core.entity.query.CustomFilterEntry; +import com.x.processplatform.core.entity.query.DateEffectType; +import com.x.processplatform.core.entity.query.DateRangeEntry; +import com.x.processplatform.core.entity.query.DateRangeEntryTools; +import com.x.processplatform.core.entity.query.DateRangeType; +import com.x.processplatform.core.entity.query.FilterEntry; +import com.x.processplatform.core.entity.query.FilterEntryTools; +import com.x.processplatform.core.entity.query.GroupEntry; +import com.x.processplatform.core.entity.query.GroupEntryTools; +import com.x.processplatform.core.entity.query.OrderEntry; +import com.x.processplatform.core.entity.query.OrderEntryTools; +import com.x.processplatform.core.entity.query.Row; +import com.x.processplatform.core.entity.query.ScopeType; +import com.x.processplatform.core.entity.query.SelectEntry; +import com.x.processplatform.core.entity.query.SelectEntryTools; +import com.x.processplatform.core.entity.query.Table; +import com.x.processplatform.core.entity.query.WhereEntry; +import com.x.processplatform.core.entity.query.WhereEntryTools; import com.x.query.core.entity.Item; import com.x.query.core.entity.Item_; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Row.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Row.java similarity index 94% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Row.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Row.java index 8cae1b5171153c16354a51086c48c7307322c03a..93f8cfbd7d478d99862f605a9916bb47e1ec4df5 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Row.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Row.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.LinkedHashMap; import java.util.Objects; diff --git a/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/ScopeType.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/ScopeType.java new file mode 100644 index 0000000000000000000000000000000000000000..3bed52082a919b97511c6279ccd96ca9f0f53a7c --- /dev/null +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/ScopeType.java @@ -0,0 +1,5 @@ +package com.x.processplatform.core.express.query; + +public enum ScopeType { + work, workCompleted +} \ No newline at end of file diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/SelectEntry.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/SelectEntry.java similarity index 95% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/SelectEntry.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/SelectEntry.java index 02196f5dd875f3a357d6779aa26ab18af4ced8ed..493db6cb7d4b361a1de8d7b5f3d89907706af36d 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/SelectEntry.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/SelectEntry.java @@ -1,10 +1,12 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.Objects; import org.apache.commons.lang3.StringUtils; import com.x.base.core.project.gson.GsonPropertyObject; +import com.x.processplatform.core.entity.query.OrderType; +import com.x.processplatform.core.entity.query.SelectType; public class SelectEntry extends GsonPropertyObject { diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/SelectEntryTools.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/SelectEntryTools.java similarity index 80% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/SelectEntryTools.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/SelectEntryTools.java index 2b612ffc3fce9ad0fc2524443d779efffb834c7e..15321926d7c02259461690bbfaa1220f268766ef 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/SelectEntryTools.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/SelectEntryTools.java @@ -1,8 +1,12 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.List; import java.util.stream.Collectors; +import com.x.processplatform.core.entity.query.OrderType; +import com.x.processplatform.core.entity.query.SelectEntry; +import com.x.processplatform.core.entity.query.SelectType; + public class SelectEntryTools { public static List filterOrderSelectEntries(List selectEntries) { diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/SelectType.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/SelectType.java similarity index 50% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/SelectType.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/SelectType.java index fd26462c887b910002ec211434574f4c74f05174..71c80593f635da80d96d8ff34a51f9f585b99a88 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/SelectType.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/SelectType.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; public enum SelectType { attribute, path, padding diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Table.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Table.java similarity index 76% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Table.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Table.java index fd5199a866029032af078ac921743fc77db7b023..22f68bee631212cb85dc649f3da95fb1bcbd660b 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/Table.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/Table.java @@ -1,9 +1,11 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.ArrayList; import org.apache.commons.lang3.StringUtils; +import com.x.processplatform.core.entity.query.Row; + public class Table extends ArrayList { private static final long serialVersionUID = 7525624451700204922L; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/WhereEntry.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/WhereEntry.java similarity index 97% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/WhereEntry.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/WhereEntry.java index 3e29c931cfbbfd179e6d99b5a7d9837ddc8405d8..cc5b0b1f2554a85bac4b9697f51c79979b5fb2b0 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/WhereEntry.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/WhereEntry.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.ArrayList; import java.util.List; diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/WhereEntryTools.java b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/WhereEntryTools.java similarity index 98% rename from o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/WhereEntryTools.java rename to o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/WhereEntryTools.java index 30fb6d9e452ca197d40e8a8b98e8b3e6a5a0763d..6a988b4c11a82ebc67b1000df2093ff913625092 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/query/WhereEntryTools.java +++ b/o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/query/WhereEntryTools.java @@ -1,4 +1,4 @@ -package com.x.processplatform.core.entity.query; +package com.x.processplatform.core.express.query; import java.util.List; @@ -13,6 +13,7 @@ import com.x.processplatform.core.entity.content.Work; import com.x.processplatform.core.entity.content.WorkCompleted; import com.x.processplatform.core.entity.content.WorkCompleted_; import com.x.processplatform.core.entity.content.Work_; +import com.x.processplatform.core.entity.query.WhereEntry; import com.x.query.core.entity.Item; import com.x.query.core.entity.Item_;