From 0894b9328ae1c11146175b492ae348bbd4b13404 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 29 四月 2019 16:42:32 +0800
Subject: [PATCH] 加入统一消息提示功能 请用 vc.messege('错误内容')

---
 java110-service/src/main/java/com/java110/service/api/BusinessApi.java |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/java110-service/src/main/java/com/java110/service/api/BusinessApi.java b/java110-service/src/main/java/com/java110/service/api/BusinessApi.java
index 8073af8..b6e4427 100644
--- a/java110-service/src/main/java/com/java110/service/api/BusinessApi.java
+++ b/java110-service/src/main/java/com/java110/service/api/BusinessApi.java
@@ -1,6 +1,8 @@
 package com.java110.service.api;
 
+import com.java110.common.constant.CommonConstant;
 import com.java110.common.constant.ResponseConstant;
+import com.java110.common.util.Assert;
 import com.java110.core.factory.DataQueryFactory;
 import com.java110.core.factory.DataTransactionFactory;
 import com.java110.core.base.controller.BaseController;
@@ -9,6 +11,8 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -18,21 +22,47 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 鏌ヨ鏈嶅姟
- * Created by wuxw on 2018/4/20.
+ * add by wuxw on 2018/4/20.
+ * modify by wuxw on 2019/4/20.
+ * @version 1.1
  */
 @RestController
 @Api(value = "鏌ヨ涓氬姟缁熶竴鎻愪緵鏈嶅姟")
 public class BusinessApi extends BaseController {
 
+    private final static Logger logger = LoggerFactory.getLogger(BusinessApi.class);
+
     @Autowired
     private IQueryServiceSMO queryServiceSMOImpl;
 
+
     @RequestMapping(path = "/businessApi/query",method= RequestMethod.GET)
-    public String queryGet(HttpServletRequest request) {
-        return DataTransactionFactory.createBusinessResponseJson(ResponseConstant.RESULT_CODE_ERROR,"涓嶆敮鎸丟et鏂规硶璇锋眰").toJSONString();
+    @ApiOperation(value="涓氬姟鏌ヨget璇锋眰", notes="test: 杩斿洖 2XX 琛ㄧず鏈嶅姟姝e父")
+    @ApiImplicitParam(paramType="query", name = "method", value = "鐢ㄦ埛缂栧彿", required = true, dataType = "String")
+    @Deprecated
+    public ResponseEntity<String> service(HttpServletRequest request) {
+        try {
+            Map<String, Object> headers = new HashMap<String, Object>();
+            this.getRequestInfo(request, headers);
+            Assert.isNotNull(headers, CommonConstant.HTTP_SERVICE.toLowerCase(),"璇锋眰淇℃伅涓病鏈夊寘鍚玸ervice淇℃伅");
+            //Assert.isNotNull(headers, CommonConstant.HTTP_PARAM,"璇锋眰淇℃伅涓病鏈夊寘鍚弬鏁帮紙params锛変俊鎭�");
+            Map readOnlyMap = super.getParameterStringMap(request);
+            headers.put("params",readOnlyMap);
+            DataQuery dataQuery = DataQueryFactory.newInstance().builder(headers);
+            initConfig(dataQuery);
+            queryServiceSMOImpl.commonQueryService(dataQuery);
+            return dataQuery.getResponseEntity();
+        }catch (Exception e){
+            logger.error("璇锋眰璁㈠崟寮傚父",e);
+            //DataTransactionFactory.createBusinessResponseJson(ResponseConstant.RESULT_CODE_ERROR,e.getMessage()+e).toJSONString();
+            return new ResponseEntity<String>("璇锋眰鍙戠敓寮傚父锛�"+e.getMessage()+e, HttpStatus.INTERNAL_SERVER_ERROR);
+
+        }
     }
 
     /**
@@ -54,6 +84,7 @@
     @RequestMapping(path = "/businessApi/query",method= RequestMethod.POST)
     @ApiOperation(value="涓氬姟鏌ヨpost璇锋眰", notes="test: 杩斿洖 2XX 琛ㄧず鏈嶅姟姝e父")
     @ApiImplicitParam(paramType="query", name = "method", value = "鐢ㄦ埛缂栧彿", required = true, dataType = "String")
+    @Deprecated
     public ResponseEntity<String> queryPost(@RequestBody String businessInfo) {
         try {
             DataQuery dataQuery = DataQueryFactory.newInstance().builder(businessInfo);
@@ -112,6 +143,23 @@
         dataQuery.setServiceSql(DataQueryFactory.getServiceSql(dataQuery));
     }
 
+
+    /**
+     * 鑾峰彇璇锋眰淇℃伅
+     * @param request
+     * @param headers
+     * @throws RuntimeException
+     */
+    private void getRequestInfo(HttpServletRequest request,Map headers) throws Exception{
+        try{
+            super.initHeadParam(request,headers);
+            super.initUrlParam(request,headers);
+        }catch (Exception e){
+            logger.error("鍔犺浇澶翠俊鎭け璐�",e);
+            throw e;
+        }
+    }
+
     public IQueryServiceSMO getQueryServiceSMOImpl() {
         return queryServiceSMOImpl;
     }

--
Gitblit v1.8.0