From 83c80c4be845c6ddb5f1385201e74289d0262598 Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期三, 09 五月 2018 22:39:55 +0800
Subject: [PATCH] 完成 配置方式 页面数据显示

---
 ConsoleService/src/main/java/com/java110/console/rest/ConsoleRest.java |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/ConsoleService/src/main/java/com/java110/console/rest/ConsoleRest.java b/ConsoleService/src/main/java/com/java110/console/rest/ConsoleRest.java
index 2b4ca46..b367679 100644
--- a/ConsoleService/src/main/java/com/java110/console/rest/ConsoleRest.java
+++ b/ConsoleService/src/main/java/com/java110/console/rest/ConsoleRest.java
@@ -9,6 +9,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -16,12 +17,13 @@
  * Created by wuxw on 2018/5/8.
  */
 
+@RestController
 public class ConsoleRest extends BaseController {
 
     @Autowired
     private IConsoleServiceSMO consoleServiceSMOImpl;
 
-    @RequestMapping(path = "/consoleRest/queryTemplateCol",method = RequestMethod.POST)
+    @RequestMapping(path = "/console/queryTemplateCol",method = RequestMethod.POST)
     public String queryTemplateCol(HttpServletRequest request){
         PageData pd = null;
         try {
@@ -40,4 +42,30 @@
 
         return pd.getResJson().toJSONString();
     }
+
+
+    /**
+     * 鑾峰彇妯℃澘鏁版嵁
+     * @param request
+     * @return
+     */
+    @RequestMapping(path = "/console/queryTemplateData",method = RequestMethod.GET)
+    public  String  queryTemplateData(HttpServletRequest request){
+        PageData pd = null;
+        try {
+            pd = this.getPageData(request);
+            // 鍒ゆ柇鐢ㄦ埛鏄惁鐧诲綍
+            checkLogin(pd);
+            consoleServiceSMOImpl.getTemplateData(pd);
+        }catch (IllegalArgumentException e){
+            return DataTransactionFactory.pageResponseJson(pd, ResponseConstant.RESULT_PARAM_ERROR,e.getMessage(),null);
+        }catch (SMOException e){
+            return DataTransactionFactory.pageResponseJson(pd,e.getResult().getCode(),e.getMessage(),null);
+        }catch (Exception e){
+            logger.error("寮傚父淇℃伅锛�",e);
+            return DataTransactionFactory.pageResponseJson(pd,ResponseConstant.RESULT_CODE_ERROR,"璇锋眰鍙傛暟鍑洪敊 ",null);
+        }
+
+        return pd.getResJson().toJSONString();
+    }
 }

--
Gitblit v1.8.0