From 6f3cbbdd1c73f38df657e5b0ac05f31d45c717db Mon Sep 17 00:00:00 2001 From: gaojie Date: Mon, 11 Dec 2017 09:44:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=91=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/html/deliveryGoods.html | 15 +++++ .../com/jmfy/controller/TestController.java | 55 +++++++++++++++++++ src/main/thrift/idl/core.thrift | 3 +- 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/html/deliveryGoods.html create mode 100644 src/main/java/com/jmfy/controller/TestController.java diff --git a/src/main/java/com/html/deliveryGoods.html b/src/main/java/com/html/deliveryGoods.html new file mode 100644 index 0000000..e0445df --- /dev/null +++ b/src/main/java/com/html/deliveryGoods.html @@ -0,0 +1,15 @@ + + + + + Title + + +
+ 用 户 Id:

+ 物 品 Id:

+ 物品数量:

+ +
+ + \ No newline at end of file diff --git a/src/main/java/com/jmfy/controller/TestController.java b/src/main/java/com/jmfy/controller/TestController.java new file mode 100644 index 0000000..17a89d3 --- /dev/null +++ b/src/main/java/com/jmfy/controller/TestController.java @@ -0,0 +1,55 @@ +package com.jmfy.controller; + +import com.jmfy.dto.JsonResult; +import com.jmfy.thrift.idl.RPCRequestIFace; +import com.jmfy.thrift.idl.Result; +import com.jmfy.thrift.pool.ClientAdapterPo; +import com.jmfy.thrift.pool.ServiceKey; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; + +@RestController +public class TestController { + + private static final Logger LOGGER = LoggerFactory.getLogger(TestController.class); + + @RequestMapping(value = "/test") + public JsonResult deliveryGoods(HttpServletRequest request){ + int userId = Integer.parseInt(request.getParameter("userId")); + int itemId = Integer.parseInt(request.getParameter("itemId")); + int itemNum = Integer.parseInt(request.getParameter("itemNum")); + + //TODO 根据大区id和小区id从redis找到对应服的 IP和 Port + String ip = "127.0.0.1"; + String port = "7900"; + //TODO RPC 发货 + Result result = null; + ClientAdapterPo rPCClient = null; + String serviceKey = getServiceKey(ServiceKey.RPCCore,ip,port); + try { + rPCClient = ClientAdapterPo.getClientAdapterPo(serviceKey); + result = rPCClient.getClient().TestdeliveryGood(userId,itemId,itemNum); + } catch (Exception e) { + e.printStackTrace(); + } finally { + rPCClient.returnObject(serviceKey); + } + + JsonResult jsonResult = new JsonResult(); + jsonResult.setRet(result.getResultCode()); + jsonResult.setMsg(result.getResultMsg()); + return jsonResult; + } + + public static String getServiceKey(String serviceName, String host, String port) { + StringBuilder sb = new StringBuilder(); + return sb.append(serviceName).append("|") + .append(host).append("|") + .append(port).toString(); + } + +} diff --git a/src/main/thrift/idl/core.thrift b/src/main/thrift/idl/core.thrift index 35fb607..01e2ccd 100644 --- a/src/main/thrift/idl/core.thrift +++ b/src/main/thrift/idl/core.thrift @@ -8,6 +8,7 @@ struct Result { service RPCRequestIFace{ - Result deliveryGood(1:string openid, 2:i32 userId, 3:string payitem, 4:string billno, 5:string amt, + Result deliveryGood(1:string openid, 2:i32 userId, 3:string payitem, 4:string billno, 5:string amt, 6:string channel_id, 7:string token, 8:string serverOrder) throws (1:common.InvalidOperException ouch); + Result TestdeliveryGood(1:i32 userId, 2:i32 itemId ,3:i32 itemNum) throws (1:common.InvalidOperException ouch); } \ No newline at end of file