From cbc1f9db3d796683d88d6d30df3659984dfbeda3 Mon Sep 17 00:00:00 2001
From: webapp <webapp@home-server.attdns.com>
Date: 星期一, 30 九月 2019 22:56:12 +0800
Subject: [PATCH] 取消java110-common jar包，提升为CommonService服务,将之前的Java110-common内容变更为Java110-utils包
---
CodeService/src/main/java/com/java110/code/api/CodeApi.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/CodeService/src/main/java/com/java110/code/api/CodeApi.java b/CodeService/src/main/java/com/java110/code/api/CodeApi.java
index 1055cdf..8429220 100644
--- a/CodeService/src/main/java/com/java110/code/api/CodeApi.java
+++ b/CodeService/src/main/java/com/java110/code/api/CodeApi.java
@@ -2,19 +2,23 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.code.smo.IPrimaryKeyServiceSMO;
-import com.java110.common.constant.ResponseConstant;
-import com.java110.common.exception.ResponseErrorException;
-import com.java110.common.util.Assert;
-import com.java110.common.util.DateUtil;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.ResponseErrorException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.DateUtil;
import com.java110.core.base.controller.BaseController;
import com.java110.core.context.CodeDataFlow;
import com.java110.core.factory.DataFlowFactory;
import com.java110.core.factory.DataTransactionFactory;
-import com.java110.feign.code.ICodeApi;
+import com.java110.core.smo.code.ICodeApi;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
@@ -28,25 +32,37 @@
@RestController
public class CodeApi extends BaseController implements ICodeApi {
- protected final static Logger logger = LoggerFactory.getLogger(CodeApi.class);
+ protected static Logger logger = LoggerFactory.getLogger(CodeApi.class);
@Autowired
IPrimaryKeyServiceSMO primaryKeyServiceSMOImpl;
+ /**
+ * 鐢熸垚缂栫爜鏈嶅姟鍣� 涓嶆敮鎸丟et鏂规硶璇锋眰
+ * @param request http 璇锋眰瀵硅薄
+ * @return 涓嶆敮鎸丟et鏂规硶璇锋眰
+ */
+ @Deprecated
@RequestMapping(path = "/codeApi/generate", method = RequestMethod.GET)
public String generateGet(HttpServletRequest request) {
return DataTransactionFactory.createCodeResponseJson(ResponseConstant.NO_TRANSACTION_ID, "-1",
ResponseConstant.RESULT_CODE_ERROR, "涓嶆敮鎸丟et鏂规硶璇锋眰").toJSONString();
}
+ /**
+ * 鐢熸垚缂栫爜鏈嶅姟鍣� 涓嶆敮鎸丟et鏂规硶璇锋眰
+ * @param orderInfo 璇锋眰淇℃伅
+ * @param request http 璇锋眰瀵硅薄
+ * @return 涓嶆敮鎸丟et鏂规硶璇锋眰
+ */
@RequestMapping(path = "/codeApi/generate", method = RequestMethod.POST)
public String generatePost(@RequestBody String orderInfo, HttpServletRequest request) {
Map<String, String> headers = new HashMap<String, String>();
try {
getRequestInfo(request, headers);
//棰勬牎楠�
- preValiateOrderInfo(orderInfo, headers);
+ preValidateOrderInfo(orderInfo, headers);
CodeDataFlow dataFlow = DataFlowFactory.newInstance(CodeDataFlow.class).builder(orderInfo, null);
primaryKeyServiceSMOImpl.generateCode(dataFlow);
return dataFlow.getResJson().toJSONString();
@@ -59,9 +75,9 @@
/**
* 鑾峰彇璇锋眰淇℃伅
*
- * @param request
- * @param headers
- * @throws RuntimeException
+ * @param request 璇锋眰淇℃伅灏佽
+ * @param headers 璇锋眰澶翠俊鎭�
+ * @throws Exception 澶勭悊鏁版嵁澶辫触浼氳繑鍥濫xception寮傚父
*/
private void getRequestInfo(HttpServletRequest request, Map headers) throws Exception {
try {
@@ -76,9 +92,10 @@
/**
* 杩欓噷棰勬牎楠岋紝璇锋眰鎶ユ枃涓笉鑳芥湁 dataFlowId
*
- * @param orderInfo
+ * @param orderInfo 璇锋眰淇℃伅灏佽
+ * @param headers 璇锋眰澶翠俊鎭�
*/
- private void preValiateOrderInfo(String orderInfo, Map<String, String> headers) {
+ private void preValidateOrderInfo(String orderInfo, Map<String, String> headers) {
Assert.jsonObjectHaveKey(orderInfo, "prefix", "娌℃湁鍖呭惈prefix");
@@ -102,7 +119,7 @@
* @return
*/
@Override
- @RequestMapping(value = "/codeApi/generateCode",method = RequestMethod.POST)
+ @RequestMapping(value = "/codeApi/generateCode", method = RequestMethod.POST)
public String generateCode(@RequestParam("prefix") String prefix) {
try {
--
Gitblit v1.8.0