From 5f62dcd8c07b3d14cd0b62df6df6a1e0ac7e7da8 Mon Sep 17 00:00:00 2001
From: o2sword <171715986@qq.com>
Date: Wed, 8 Jul 2020 23:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E5=BA=94=E7=94=A8=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA=E4=BC=98=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jaxrs/market/ActionInstallOrUpdate.java   |  2 +-
 .../jaxrs/market/ActionListCategory.java      | 40 +++++++++++++++++++
 .../center/jaxrs/market/MarketAction.java     | 17 ++++++++
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionListCategory.java

diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionInstallOrUpdate.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionInstallOrUpdate.java
index f8282b1b9d..8e39eb30a6 100644
--- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionInstallOrUpdate.java
+++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionInstallOrUpdate.java
@@ -64,7 +64,7 @@ class ActionInstallOrUpdate extends BaseAction {
 			if(BooleanUtils.isTrue(Config.collect().getEnable())) {
 				String token = business.loginCollect();
 				if(StringUtils.isNotEmpty(token)){
-					byte[] bytes = ConnectionAction.getFile(Config.collect().url(Collect.ADDRESS_COLLECT_APPLICATION_DOWN),
+					byte[] bytes = ConnectionAction.getFile(Config.collect().url(Collect.ADDRESS_COLLECT_APPLICATION_DOWN + "/" + id),
 							ListTools.toList(new NameValuePair(Collect.COLLECT_TOKEN, token)));
 					if(bytes!=null){
 						WrapModule module = this.install(bytes);
diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionListCategory.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionListCategory.java
new file mode 100644
index 0000000000..2a5fb7ba20
--- /dev/null
+++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionListCategory.java
@@ -0,0 +1,40 @@
+package com.x.program.center.jaxrs.market;
+
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
+import com.x.base.core.project.http.ActionResult;
+import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.jaxrs.WrapStringList;
+import com.x.program.center.core.entity.Application;
+import com.x.program.center.core.entity.Application_;
+
+import javax.persistence.EntityManager;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+import java.util.List;
+
+class ActionListCategory extends BaseAction {
+
+	ActionResult<Wo> execute(EffectivePerson effectivePerson) throws Exception {
+		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+			ActionResult<Wo> result = new ActionResult<>();
+
+			EntityManager em = emc.get(Application.class);
+			CriteriaBuilder cb = em.getCriteriaBuilder();
+			CriteriaQuery<String> cq = cb.createQuery(String.class);
+			Root<Application> root = cq.from(Application.class);
+			cq.select(root.get(Application_.category)).distinct(true);
+			List<String> categoryList = em.createQuery(cq).getResultList();
+
+			Wo wo = new Wo();
+			wo.setValueList(categoryList);
+			result.setData(wo);
+			return result;
+		}
+	}
+
+	public static class Wo extends WrapStringList {
+
+	}
+}
\ No newline at end of file
diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/MarketAction.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/MarketAction.java
index 25b909ca65..b5405ec999 100644
--- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/MarketAction.java
+++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/MarketAction.java
@@ -134,4 +134,21 @@ public class MarketAction extends StandardJaxrsAction {
 		asyncResponse.resume(ResponseFactory.getDefaultActionResultResponse(result));
 	}
 
+	@JaxrsMethodDescribe(value = "列示所有的应用类型.", action = ActionListCategory.class)
+	@GET
+	@Path("list/category")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public void installOrUpdate(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request) {
+		ActionResult<ActionListCategory.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionListCategory().execute(effectivePerson);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, null);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+	}
+
 }
\ No newline at end of file
-- 
GitLab