FIX: transfer mistaken wechat interface from ApiController to WechatController

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/application/ApiService.java

@@ -67,14 +67,4 @@ public interface ApiService {
     String loginClient(Long taskId, Long workerId);
 
     String getCaseList(Long taskId, Long workerId);
-
-    String getGroupsByManager(long managerId);
-
-    String getUserInfoWechat(long userId, String identity);
-
-    String getWorkersByGroup(Long groupId);
-
-    String checkManager(String account, String password);
-
-    String checkWorker(String account, String password);
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/application/WechatService.java

@@ -13,4 +13,14 @@ public interface WechatService {
     String getGroupList(String account);
 
     String joinGroup(String account, Long groupId, String managerName);
+
+    String getGroupsByManager(long managerId);
+
+    String getUserInfoWechat(long userId, String identity);
+
+    String getWorkersByGroup(Long groupId);
+
+    String checkManager(String account, String password);
+
+    String checkWorker(String account, String password);
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/application/impl/ApiServiceImpl.java

@@ -827,119 +827,6 @@ public class ApiServiceImpl implements ApiService {
 
     }
 
-    @Override
-    public String getGroupsByManager(long managerId) {
-        JSONObject result = new JSONObject();
-        Manager manager = managerDao.findOne(managerId);
-        if (manager == null){
-            return null;
-        }
-
-        JSONArray groupArr = new JSONArray();
-        List<Group> groups = groupDao.findByManagerId(manager.getId());
-        for (Group group : groups){
-            JSONObject groupObj = new JSONObject();
-            groupObj.put("id", group.getId());
-            groupObj.put("groupName", group.getName());
-            groupObj.put("managerName", manager.getName());
-
-            groupArr.put(groupObj);
-        }
-
-        result.put("groups", groupArr);
-        return result.toString();
-    }
-
-    @Override
-    public String getUserInfoWechat(long userId, String identity) {
-        JSONObject resultObj = null;
-
-        if (identity.equals("manager")){
-            Manager manager = managerDao.findOne(userId);
-            resultObj.put("email", manager.getEmail());
-            resultObj.put("mobile", manager.getMobile());
-            resultObj.put("level", manager.getLevel());
-            resultObj.put("name", manager.getName());
-            resultObj.put("company", manager.getInformation());
-        }
-        else if (identity.equals("worker")){
-            Worker worker = workerDao.findOne(userId);
-            resultObj.put("email", worker.getEmail());
-            resultObj.put("mobile", worker.getMobile());
-            resultObj.put("level", worker.getLevel());
-            resultObj.put("name", worker.getName());
-            resultObj.put("company", worker.getInformation());
-        }
-
-        return (resultObj == null) ? null : resultObj.toString();
-    }
-
-    @Override
-    public String getWorkersByGroup(Long groupId) {
-        JSONObject result = new JSONObject();
-        Group group = groupDao.findOne(groupId);
-
-        if (group == null){
-            return null;
-        }
-
-        JSONArray workerArr = new JSONArray();
-        List<Group2Worker> group2Workers = group2WorkerDao.findByGroupId(groupId);
-        for (Group2Worker group2Worker : group2Workers){
-            Worker worker = workerDao.findOne(group2Worker.getWorkerId());
-            JSONObject workerObj = new JSONObject();
-            workerObj.put("id", worker.getId());
-            workerObj.put("email", worker.getEmail());
-            workerObj.put("mobile", worker.getMobile());
-            workerObj.put("workerName", worker.getName());
-            workerObj.put("university", worker.getInformation());
-            workerObj.put("grade", worker.getSchoolYear());
-
-            workerArr.put(workerObj);
-        }
-
-        result.put("workers", workerArr);
-        return  result.toString();
-    }
-
-    @Override
-    public String checkManager(String account, String password) {
-        JSONObject resultObj = new JSONObject();
-        Manager manager = managerDao.findByAccount(account);
-        if (manager == null){
-            resultObj.put("message", "manager not found");
-        }
-        else {
-            String encryptedPassword = EncryptionUtil.encryptMD5(password);
-            if (manager.getPassword().equals(encryptedPassword)) {
-                resultObj.put("id", manager.getInformation());
-            } else {
-                resultObj.put("message", "password not match");
-            }
-        }
-
-        return resultObj.toString();
-    }
-
-    @Override
-    public String checkWorker(String account, String password) {
-        JSONObject resultObj = new JSONObject();
-        Worker worker = workerDao.findByAccount(account);
-        if (worker == null){
-            resultObj.put("message", "worker not found");
-        }
-        else {
-            String encryptedPassword = EncryptionUtil.encryptMD5(password);
-            if (worker.getPassword().equals(encryptedPassword)) {
-                resultObj.put("id", worker.getInformation());
-            } else {
-                resultObj.put("message", "password not match");
-            }
-        }
-
-        return resultObj.toString();
-    }
-
     private boolean groupMemberExceeded(Group group) {
         return (group2WorkerDao.findByGroupId(group.getId()).size() >= managerDao.findOne(group.getManagerId()).getGroupSize());
     }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/application/impl/WechatServiceImpl.java

@@ -169,4 +169,119 @@ public class WechatServiceImpl implements WechatService {
         return result.toString();
     }
 
+
+    @Override
+    public String getGroupsByManager(long managerId) {
+        JSONObject result = new JSONObject();
+        Manager manager = managerDao.findOne(managerId);
+        if (manager == null){
+            return null;
+        }
+
+        JSONArray groupArr = new JSONArray();
+        List<Group> groups = groupDao.findByManagerId(manager.getId());
+        for (Group group : groups){
+            JSONObject groupObj = new JSONObject();
+            groupObj.put("id", group.getId());
+            groupObj.put("groupName", group.getName());
+            groupObj.put("managerName", manager.getName());
+
+            groupArr.put(groupObj);
+        }
+
+        result.put("groups", groupArr);
+        return result.toString();
+    }
+
+    @Override
+    public String getUserInfoWechat(long userId, String identity) {
+        JSONObject resultObj = null;
+
+        if (identity.equals("manager")){
+            Manager manager = managerDao.findOne(userId);
+            resultObj.put("email", manager.getEmail());
+            resultObj.put("mobile", manager.getMobile());
+            resultObj.put("level", manager.getLevel());
+            resultObj.put("name", manager.getName());
+            resultObj.put("company", manager.getInformation());
+        }
+        else if (identity.equals("worker")){
+            Worker worker = workerDao.findOne(userId);
+            resultObj.put("email", worker.getEmail());
+            resultObj.put("mobile", worker.getMobile());
+            resultObj.put("level", worker.getLevel());
+            resultObj.put("name", worker.getName());
+            resultObj.put("company", worker.getInformation());
+        }
+
+        return (resultObj == null) ? null : resultObj.toString();
+    }
+
+    @Override
+    public String getWorkersByGroup(Long groupId) {
+        JSONObject result = new JSONObject();
+        Group group = groupDao.findOne(groupId);
+
+        if (group == null){
+            return null;
+        }
+
+        JSONArray workerArr = new JSONArray();
+        List<Group2Worker> group2Workers = group2WorkerDao.findByGroupId(groupId);
+        for (Group2Worker group2Worker : group2Workers){
+            Worker worker = workerDao.findOne(group2Worker.getWorkerId());
+            JSONObject workerObj = new JSONObject();
+            workerObj.put("id", worker.getId());
+            workerObj.put("email", worker.getEmail());
+            workerObj.put("mobile", worker.getMobile());
+            workerObj.put("workerName", worker.getName());
+            workerObj.put("university", worker.getInformation());
+            workerObj.put("grade", worker.getSchoolYear());
+
+            workerArr.put(workerObj);
+        }
+
+        result.put("workers", workerArr);
+        return  result.toString();
+    }
+
+    @Override
+    public String checkManager(String account, String password) {
+        JSONObject resultObj = new JSONObject();
+        Manager manager = managerDao.findByAccount(account);
+        if (manager == null){
+            resultObj.put("message", "manager not found");
+        }
+        else {
+            String encryptedPassword = EncryptionUtil.encryptMD5(password);
+            if (manager.getPassword().equals(encryptedPassword)) {
+                resultObj.put("id", manager.getInformation());
+            } else {
+                resultObj.put("message", "password not match");
+            }
+        }
+
+        return resultObj.toString();
+    }
+
+    @Override
+    public String checkWorker(String account, String password) {
+        JSONObject resultObj = new JSONObject();
+        Worker worker = workerDao.findByAccount(account);
+        if (worker == null){
+            resultObj.put("message", "worker not found");
+        }
+        else {
+            String encryptedPassword = EncryptionUtil.encryptMD5(password);
+            if (worker.getPassword().equals(encryptedPassword)) {
+                resultObj.put("id", worker.getInformation());
+            } else {
+                resultObj.put("message", "password not match");
+            }
+        }
+
+        return resultObj.toString();
+    }
+
+
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/ApiController.java

@@ -142,28 +142,4 @@ public class ApiController extends BaseController {
         return apiLogic.getCaseList(request);
     }
 
-    @RequestMapping(value = UrlConstants.API_CLIENT + "checkManager", method = RequestMethod.GET)
-    public String checkManager(HttpServletRequest request) {
-        return apiLogic.checkManager(request);
-    }
-
-    @RequestMapping(value = UrlConstants.API_CLIENT + "checkWorker", method = RequestMethod.GET)
-    public String checkWorker(HttpServletRequest request) {
-        return apiLogic.checkWorker(request);
-    }
-
-    @RequestMapping(value = UrlConstants.API_CLIENT + "getGroupsByManager", method = RequestMethod.GET)
-    public String getGroupsByManager(HttpServletRequest request) {
-        return apiLogic.getGroupsByManager(request);
-    }
-
-    @RequestMapping(value = UrlConstants.API_CLIENT + "getWorkersByGroup", method = RequestMethod.GET)
-    public String getWorkersByGroup(HttpServletRequest request) {
-        return apiLogic.getWorkersByGroup(request);
-    }
-
-    @RequestMapping(value = UrlConstants.API_CLIENT + "getUserInfo", method = RequestMethod.GET)
-    public String getUserInfoWechat(HttpServletRequest request) {
-        return apiLogic.getUserInfoWechat(request);
-    }
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/WechatController.java

@@ -50,6 +50,31 @@ public class WechatController extends BaseController {
     @RequestMapping(value = UrlConstants.API_WECHAT + "getGroupList", method = RequestMethod.GET)
     public String getGroupList(HttpServletRequest request){ return wechatLogic.getGroupList(request);}
 
+    @RequestMapping(value = UrlConstants.API_CLIENT + "checkManager", method = RequestMethod.GET)
+    public String checkManager(HttpServletRequest request) {
+        return wechatLogic.checkManager(request);
+    }
+
+    @RequestMapping(value = UrlConstants.API_CLIENT + "checkWorker", method = RequestMethod.GET)
+    public String checkWorker(HttpServletRequest request) {
+        return wechatLogic.checkWorker(request);
+    }
+
+    @RequestMapping(value = UrlConstants.API_CLIENT + "getGroupsByManager", method = RequestMethod.GET)
+    public String getGroupsByManager(HttpServletRequest request) {
+        return wechatLogic.getGroupsByManager(request);
+    }
+
+    @RequestMapping(value = UrlConstants.API_CLIENT + "getWorkersByGroup", method = RequestMethod.GET)
+    public String getWorkersByGroup(HttpServletRequest request) {
+        return wechatLogic.getWorkersByGroup(request);
+    }
+
+    @RequestMapping(value = UrlConstants.API_CLIENT + "getUserInfo", method = RequestMethod.GET)
+    public String getUserInfoWechat(HttpServletRequest request) {
+        return wechatLogic.getUserInfoWechat(request);
+    }
+
     /**
      *
      * POST methods
@@ -59,4 +84,5 @@ public class WechatController extends BaseController {
     public String joinGroup(HttpServletRequest request, @RequestBody JoinGroupWechatVO body) {
         return wechatLogic.joinGroup(request, body);
     }
+
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/ApiLogic.java

@@ -54,14 +54,4 @@ public interface ApiLogic {
 
     String login(HttpServletRequest request);
 
-    String checkManager(HttpServletRequest request);
-
-    String checkWorker(HttpServletRequest request);
-
-    String getGroupsByManager(HttpServletRequest request);
-
-    String getWorkersByGroup(HttpServletRequest request);
-
-    String getUserInfoWechat(HttpServletRequest request);
-
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/WechatLogic.java

@@ -18,4 +18,14 @@ public interface WechatLogic {
     String getGroupList(HttpServletRequest request);
 
     String joinGroup(HttpServletRequest request, JoinGroupWechatVO body);
+
+    String checkManager(HttpServletRequest request);
+
+    String checkWorker(HttpServletRequest request);
+
+    String getGroupsByManager(HttpServletRequest request);
+
+    String getWorkersByGroup(HttpServletRequest request);
+
+    String getUserInfoWechat(HttpServletRequest request);
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/ApiLogicImpl.java

@@ -382,89 +382,6 @@ public class ApiLogicImpl implements ApiLogic {
     }
 
     @Override
-    public String checkManager(HttpServletRequest request) {
-        if (request.getParameter("account") == null || request.getParameter("password") == null){
-            return missingParameterResponse;
-        }
-        String account = request.getParameter("account");
-        String password = request.getParameter("password");
-
-        // login the system
-        String result = apiService.checkManager(account, password);
-
-        result = generateResponse(HTTP_OK, "", result);
-
-        return result;
-    }
-
-    @Override
-    public String checkWorker(HttpServletRequest request) {
-        if (request.getParameter("account") == null || request.getParameter("password") == null){
-            return missingParameterResponse;
-        }
-        String account = request.getParameter("account");
-        String password = request.getParameter("password");
-
-        // login the system
-        String result = apiService.checkWorker(account, password);
-
-        result = generateResponse(HTTP_OK, "", result);
-
-        return result;
-    }
-
-    @Override
-    public String getGroupsByManager(HttpServletRequest request) {
-        if (request.getParameter("account") == null){
-            return missingParameterResponse;
-        }
-        long managerId = Long.parseLong(request.getParameter("managerId"));
-
-        // login the system
-        String result = apiService.getGroupsByManager(managerId);
-
-        result = generateResponse(HTTP_OK, "", result);
-
-        return result;
-    }
-
-    @Override
-    public String getWorkersByGroup(HttpServletRequest request) {
-        if (request.getParameter("groupId") == null){
-            return missingParameterResponse;
-        }
-        Long groupId = Long.parseLong(request.getParameter("groupId"));
-
-        // login the system
-        String result = apiService.getWorkersByGroup(groupId);
-
-        result = generateResponse(HTTP_OK, "", result);
-
-        return result;
-    }
-
-    @Override
-    public String getUserInfoWechat(HttpServletRequest request) {
-        if (request.getParameter("identity") == null || request.getParameter("userId") == null){
-            return missingParameterResponse;
-        }
-
-        long userId = Long.parseLong(request.getParameter("userId"));
-        String identity = request.getParameter("identity");
-
-        // login the system
-        String result = apiService.getUserInfoWechat(userId, identity);
-
-        result = generateResponse(HTTP_OK, "", result);
-
-        return result;
-    }
-
-    /**
-     * POST
-     */
-
-    @Override
     public String takeTask(HttpServletRequest request, TakeTaskVO input) {
         int statusCode = HTTP_OK;
 

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/WechatLogicImpl.java

@@ -126,4 +126,90 @@ public class WechatLogicImpl implements WechatLogic {
 
         return result;
     }
+
+    @Override
+    public String checkManager(HttpServletRequest request) {
+        if (request.getParameter("account") == null || request.getParameter("password") == null){
+            return missingParameterResponse;
+        }
+        String account = request.getParameter("account");
+        String password = request.getParameter("password");
+
+        // login the system
+        String result = wechatService.checkManager(account, password);
+
+        result = generateResponse(HTTP_OK, "", result);
+
+        return result;
+    }
+
+    @Override
+    public String checkWorker(HttpServletRequest request) {
+        if (request.getParameter("account") == null || request.getParameter("password") == null){
+            return missingParameterResponse;
+        }
+        String account = request.getParameter("account");
+        String password = request.getParameter("password");
+
+        // login the system
+        String result = wechatService.checkWorker(account, password);
+
+        result = generateResponse(HTTP_OK, "", result);
+
+        return result;
+    }
+
+    @Override
+    public String getGroupsByManager(HttpServletRequest request) {
+        if (request.getParameter("account") == null){
+            return missingParameterResponse;
+        }
+        long managerId = Long.parseLong(request.getParameter("managerId"));
+
+        // login the system
+        String result = wechatService.getGroupsByManager(managerId);
+
+        result = generateResponse(HTTP_OK, "", result);
+
+        return result;
+    }
+
+    @Override
+    public String getWorkersByGroup(HttpServletRequest request) {
+        if (request.getParameter("groupId") == null){
+            return missingParameterResponse;
+        }
+        Long groupId = Long.parseLong(request.getParameter("groupId"));
+
+        // login the system
+        String result = wechatService.getWorkersByGroup(groupId);
+
+        result = generateResponse(HTTP_OK, "", result);
+
+        return result;
+    }
+
+    @Override
+    public String getUserInfoWechat(HttpServletRequest request) {
+        if (request.getParameter("identity") == null || request.getParameter("userId") == null){
+            return missingParameterResponse;
+        }
+
+        long userId = Long.parseLong(request.getParameter("userId"));
+        String identity = request.getParameter("identity");
+
+        // login the system
+        String result = wechatService.getUserInfoWechat(userId, identity);
+
+        result = generateResponse(HTTP_OK, "", result);
+
+        return result;
+    }
+
+    /**
+     * POST
+     */
+
+
+
 }