From 4e51fe2a51a8b8a2f681fe7c96acd1d7da3e7ad3 Mon Sep 17 00:00:00 2001
From: freeebird <1032796097@qq.com>
Date: Wed, 14 Nov 2018 15:50:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=93=8D=E4=BD=9C=E5=91=98?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=BC=96=E5=86=99=EF=BC=8C=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotel/controller/OperatorController.java  | 44 ++++++++++++++---
 .../java/cn/mafangui/hotel/entity/Worker.java | 13 +++++
 .../controller/OperatorControllerTest.java    | 49 +++++++++++++++++++
 3 files changed, 99 insertions(+), 7 deletions(-)
 create mode 100644 src/test/java/cn/mafangui/hotel/controller/OperatorControllerTest.java

diff --git a/src/main/java/cn/mafangui/hotel/controller/OperatorController.java b/src/main/java/cn/mafangui/hotel/controller/OperatorController.java
index f8c517a..3de29d4 100644
--- a/src/main/java/cn/mafangui/hotel/controller/OperatorController.java
+++ b/src/main/java/cn/mafangui/hotel/controller/OperatorController.java
@@ -1,5 +1,6 @@
 package cn.mafangui.hotel.controller;
 
+import cn.mafangui.hotel.entity.Worker;
 import cn.mafangui.hotel.service.WorkerService;
 import cn.mafangui.hotel.utils.StaticString;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,18 +8,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping(value = "/operator")
 public class OperatorController {
     @Autowired
     private WorkerService workerService;
 
-    /**
-     * 管理员登录
-     * @param username
-     * @param password
-     * @return
-     */
     @RequestMapping(method = RequestMethod.POST,value = "/login")
     public int login(String username,String password){
         if(workerService.login(username,password, StaticString.OPERATOR) != null)
@@ -26,6 +23,39 @@ public class OperatorController {
         else return 0;
     }
 
+    @RequestMapping(method = RequestMethod.POST,value = "/delete")
+    public int deleteOperator(int workerId){
+        return workerService.delete(workerId);
+    }
+
+    @RequestMapping(value = "/all")
+    public List<Worker> getAllOperator(){
+        return workerService.selectByRole(StaticString.OPERATOR);
+    }
+
+    @RequestMapping(method = RequestMethod.POST,value = "/withId")
+    public Worker getOperator(int workerId){
+        return workerService.selectById(workerId);
+    }
+
+    @RequestMapping(method = RequestMethod.POST,value = "/add")
+    public int addOperator(String username,String password,String name,String gender,String phone,String email,String address){
+        Worker worker = new Worker(username,password,name,gender,phone,email,address);
+        worker.setRole(StaticString.OPERATOR);
+        return workerService.insert(worker);
+    }
+
+
+    @RequestMapping(method = RequestMethod.POST,value = "/update")
+    public int updateOperator(int workerId,String name,String gender,String phone,String email,String address){
+        Worker worker = new Worker();
+        worker.setWorkerId(workerId);
+        worker.setName(name);
+        worker.setGender(gender);
+        worker.setPhone(phone);
+        worker.setEmail(email);
+        worker.setAddress(address);
+        return workerService.updateById(worker);
+    }
 
-    // TODO
 }
diff --git a/src/main/java/cn/mafangui/hotel/entity/Worker.java b/src/main/java/cn/mafangui/hotel/entity/Worker.java
index e296561..be9e91c 100644
--- a/src/main/java/cn/mafangui/hotel/entity/Worker.java
+++ b/src/main/java/cn/mafangui/hotel/entity/Worker.java
@@ -123,6 +123,19 @@ public class Worker {
         this.updateTime = updateTime;
     }
 
+    public Worker() {
+    }
+
+    public Worker(String username, String password, String name, String gender, String phone, String email, String address) {
+        this.username = username;
+        this.password = password;
+        this.name = name;
+        this.gender = gender;
+        this.phone = phone;
+        this.email = email;
+        this.address = address;
+    }
+
     @Override
     public String toString() {
         return "Worker{" +
diff --git a/src/test/java/cn/mafangui/hotel/controller/OperatorControllerTest.java b/src/test/java/cn/mafangui/hotel/controller/OperatorControllerTest.java
new file mode 100644
index 0000000..06cd1d2
--- /dev/null
+++ b/src/test/java/cn/mafangui/hotel/controller/OperatorControllerTest.java
@@ -0,0 +1,49 @@
+package cn.mafangui.hotel.controller;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.*;
+
+@SpringBootTest
+@RunWith(SpringJUnit4ClassRunner.class)
+public class OperatorControllerTest {
+    @Autowired
+    OperatorController oc;
+
+    @Test
+    public void login() {
+        Assert.assertEquals(1,oc.login("w1","w1"));
+    }
+
+    @Test
+    public void deleteOperator() {
+        Assert.assertEquals(1,oc.deleteOperator(2));
+    }
+
+    @Test
+    public void getAllOperator() {
+        Assert.assertEquals(1,oc.getAllOperator().size());
+    }
+
+    @Test
+    public void getOperator() {
+        Assert.assertNotNull(oc.getOperator(2));
+    }
+
+    @Test
+    public void addOperator() {
+        int res = oc.addOperator("op","op","杜锋","男","124342","assf","jfad");
+        Assert.assertEquals(1,res);
+    }
+
+    @Test
+    public void updateOperator() {
+        int res = oc.updateOperator(3,"疾风","女","32132","asdsa","assf");
+        Assert.assertEquals(1,res);
+    }
+}
\ No newline at end of file