From d21f46fe59ab30e8e7adc9850371cfa4abb1bb3c Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Fri, 20 Mar 2020 09:39:03 +0800
Subject: [PATCH] =?UTF-8?q?dev1.0pull=E5=88=B0authlogin=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/DemoController.java   | 18 ++++++++++++++++--
 .../java/com/epmet/service/DemoService.java    | 17 +++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java
index 5ad9d87f8f..2588109776 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java
@@ -157,13 +157,27 @@ public class DemoController {
         return demoService.saveCustomerInfo(dto);
     }
 
+    /**
+     * @param id
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerGridDTO>
+     * @Author yinzuomei
+     * @Description 测试demo-gov get入参@PathVariable
+     * @Date 2020/3/20 9:37
+     **/
     @GetMapping("/getcustomergrid/{id}")
-    public Result<CustomerGridDTO> getcustomergrid(@PathVariable("id") String id){
+    public Result<CustomerGridDTO> getcustomergrid(@PathVariable("id") String id) {
         return demoService.getcustomergrid(id);
     }
 
+    /**
+     * @param id
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.security.user.UserDetail>
+     * @Author yinzuomei
+     * @Description 测试demo-admin get入参@RequestParam
+     * @Date 2020/3/20 9:37
+     **/
     @GetMapping("getSysUserInfoById")
-    public Result<UserDetail> getSysUserInfoById(@RequestParam("id") Long id){
+    public Result<UserDetail> getSysUserInfoById(@RequestParam("id") Long id) {
         return demoService.getSysUserInfoById(id);
     }
 }
diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java
index ed31425ca6..38cfe6ef29 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java
@@ -136,9 +136,22 @@ public interface DemoService extends BaseService<DemoEntity> {
      * @Date 2020/3/18 9:51
      **/
     Result<String> saveCustomerInfo(SaveCustomerFormDTO dto);
-    Result saveCustomerInfo(SaveCustomerFormDTO dto);
 
+    /**
+     * @param id
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerGridDTO>
+     * @Author yinzuomei
+     * @Description 测试demo-gov get入参@PathVariable
+     * @Date 2020/3/20 9:37
+     **/
     Result<CustomerGridDTO> getcustomergrid(String id);
 
-	Result<UserDetail> getSysUserInfoById(Long id);
+    /**
+     * @param id
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.security.user.UserDetail>
+     * @Author yinzuomei
+     * @Description 测试demo-admin get入参@RequestParam
+     * @Date 2020/3/20 9:37
+     **/
+    Result<UserDetail> getSysUserInfoById(Long id);
 }