From f511c2eb84573788c85816c6a08e228e20934930 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 19 Dec 2017 22:46:56 +0800
Subject: [PATCH] updated

---
 src/main/resources/mapper/OperateUserMapper.xml                  |    4 +---
 src/main/java/com/moral/controller/UserController.java           |   25 ++++++++++++++++++-------
 src/main/java/com/moral/mapper/OperateUserMapper.java            |    2 --
 src/main/java/com/moral/service/OperateUserService.java          |    8 +++++++-
 src/main/java/com/moral/service/impl/OperateUserServiceImpl.java |   19 +++++++++++++++++--
 5 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/moral/controller/UserController.java b/src/main/java/com/moral/controller/UserController.java
index a18fba7..4f202d0 100644
--- a/src/main/java/com/moral/controller/UserController.java
+++ b/src/main/java/com/moral/controller/UserController.java
@@ -17,7 +17,7 @@
     @Resource
     private OperateUserService operateUserService;
 
-    @RequestMapping(value = "/operate_user", method = RequestMethod.GET)
+    @GetMapping("/operate_user")
     public PageResult findOperateUserList() {
 
         Long total = operateUserService.findOperateUserCount();
@@ -25,15 +25,26 @@
         return new PageResult(total, data);
     }
 
-    @RequestMapping(value = "/operate_user/{id}", method = RequestMethod.GET)
+    @GetMapping("/operate_user/{id}")
     public OperateUser findOperateUserById(@PathVariable(value = "id") int id) {
 
-        return operateUserService.findOperateUserById(id);
+        return operateUserService.findOperateUser(id);
     }
 
-    @RequestMapping(value = "/operate_user/save", method = RequestMethod.POST)
-    public int saveOrUpdate(@RequestBody OperateUser operateUser) {
-        System.out.println(JSON.toJSONString(operateUser));
-        return 1;
+    @PostMapping("/operate_user/save")
+    public int saveOrUpdate(@RequestBody OperateUser user) {
+        int result = 1;
+        Integer id = user.getId();
+        if(id != null && id > 0) {
+            result = operateUserService.updateOperateUser(user);
+        } else {
+            result = operateUserService.insertOperateUser(user);
+        }
+        return result;
+    }
+
+    @DeleteMapping("/operate_user/{id}")
+    public int delete(@PathVariable(value = "id") int id) {
+        return operateUserService.deleteOperateUser(id);
     }
 }
diff --git a/src/main/java/com/moral/mapper/OperateUserMapper.java b/src/main/java/com/moral/mapper/OperateUserMapper.java
index 2d608af..e47e95d 100644
--- a/src/main/java/com/moral/mapper/OperateUserMapper.java
+++ b/src/main/java/com/moral/mapper/OperateUserMapper.java
@@ -11,6 +11,4 @@
     List<OperateUser> findOperateUserList();
 
     Long findOperateUserCount();
-
-    OperateUser findOperateUserById( @Param("id") int id);
 }
\ No newline at end of file
diff --git a/src/main/java/com/moral/service/OperateUserService.java b/src/main/java/com/moral/service/OperateUserService.java
index 293b91f..e0e17e5 100644
--- a/src/main/java/com/moral/service/OperateUserService.java
+++ b/src/main/java/com/moral/service/OperateUserService.java
@@ -16,5 +16,11 @@
 
 	Long findOperateUserCount();
 
-    public OperateUser findOperateUserById(int id);
+    OperateUser findOperateUser(int id);
+
+    int insertOperateUser(OperateUser user);
+
+    int updateOperateUser(OperateUser user);
+
+    int deleteOperateUser(int id);
 }
diff --git a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
index b7d5410..28a0d2c 100644
--- a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java
@@ -72,8 +72,23 @@
 	}
 
 	@Override
-	public OperateUser findOperateUserById(int id) {
-		return operateUserMapper.findOperateUserById(id);
+	public OperateUser findOperateUser(int id) {
+		return operateUserMapper.selectByPrimaryKey(id);
+	}
+
+	@Override
+	public int insertOperateUser(OperateUser user) {
+		return operateUserMapper.insert(user);
+	}
+
+	@Override
+	public int updateOperateUser(OperateUser user) {
+		return operateUserMapper.updateByPrimaryKey(user);
+	}
+
+	@Override
+	public int deleteOperateUser(int id) {
+		return operateUserMapper.deleteByPrimaryKey(id);
 	}
 
 }
diff --git a/src/main/resources/mapper/OperateUserMapper.xml b/src/main/resources/mapper/OperateUserMapper.xml
index 8e83fd0..609b2dc 100644
--- a/src/main/resources/mapper/OperateUserMapper.xml
+++ b/src/main/resources/mapper/OperateUserMapper.xml
@@ -17,7 +17,7 @@
           operate_user
     </select>
 
-    <select id="findOperateUserById" resultType="com.moral.entity.OperateUser">
+    <select id="findOperateUser" resultType="com.moral.entity.OperateUser">
         SELECT
           *
         FROM
@@ -25,7 +25,5 @@
         WHERE
           id = #{id}
     </select>
-
-
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0