add verify queue_name

escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java

@@ -152,7 +152,8 @@ public enum Status {
     CREATE_QUEUE_ERROR(10127, "create queue error"),
     QUEUE_NOT_EXIST(10128, "queue {0} not exists"),
     QUEUE_EXIST(10129, "queue already exists"),
-    UPDATE_QUEUE_ERROR(10130, "update queue error"),
+    QUEUE_NAME_EXIST(10130, "queue name already exists"),
+    UPDATE_QUEUE_ERROR(10131, "update queue error"),
 
 
     UDF_FUNCTION_NOT_EXIST(20001, "UDF function not found"),

escheduler-api/src/main/java/cn/escheduler/api/service/QueueService.java

@@ -35,129 +35,151 @@ import java.util.Map;
  * queue service
  */
 @Service
-public class QueueService extends BaseService{
+public class QueueService extends BaseService {
-
-
-  @Autowired
-  private QueueMapper queueMapper;
-
-  /**
-   * query queue list
-   *
-   * @param loginUser
-   * @return
-   */
-  public Map<String, Object> queryList(User loginUser) {
-    Map<String, Object> result = new HashMap<>(5);
-    if (checkAdmin(loginUser, result)) {
-      return result;
-    }
-
-    List<Queue> queueList = queueMapper.queryAllQueue();
-    result.put(Constants.DATA_LIST, queueList);
-    putMsg(result,Status.SUCCESS);
-
-    return result;
-  }
-
-  /**
-   * query queue list paging
-   * @param loginUser
-   * @param searchVal
-   * @param pageNo
-   * @param pageSize
-   * @return
-   */
-  public Map<String, Object> queryList(User loginUser,String searchVal, Integer pageNo, Integer pageSize) {
-    Map<String, Object> result = new HashMap<>(5);
-    if (checkAdmin(loginUser, result)) {
-      return result;
-    }
-
-    Integer count = queueMapper.countQueuePaging(searchVal);
 
-    PageInfo<Queue> pageInfo = new PageInfo<>(pageNo,pageSize);
 
-    List<Queue> queueList = queueMapper.queryQueuePaging(searchVal,pageInfo.getStart(),pageSize);
+    @Autowired
+    private QueueMapper queueMapper;
 
-    pageInfo.setTotalCount(count);
+    /**
-    pageInfo.setLists(queueList);
+     * query queue list
-    result.put(Constants.DATA_LIST, pageInfo);
+     *
-    putMsg(result,Status.SUCCESS);
+     * @param loginUser
+     * @return
+     */
+    public Map<String, Object> queryList(User loginUser) {
+        Map<String, Object> result = new HashMap<>(5);
+        if (checkAdmin(loginUser, result)) {
+            return result;
+        }
 
-    return result;
+        List<Queue> queueList = queueMapper.queryAllQueue();
-  }
+        result.put(Constants.DATA_LIST, queueList);
+        putMsg(result, Status.SUCCESS);
 
-  public Map<String, Object> createQueue(User loginUser,String queue, String queueName) {
+        return result;
-    Map<String, Object> result = new HashMap<>(5);
-    if (checkAdmin(loginUser, result)) {
-      return result;
     }
 
-    if (checkQueueExists(queue)){
+    /**
-      putMsg(result, Status.QUEUE_EXIST, queue);
+     * query queue list paging
-      return result;
+     *
+     * @param loginUser
+     * @param searchVal
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    public Map<String, Object> queryList(User loginUser, String searchVal, Integer pageNo, Integer pageSize) {
+        Map<String, Object> result = new HashMap<>(5);
+        if (checkAdmin(loginUser, result)) {
+            return result;
+        }
+
+        Integer count = queueMapper.countQueuePaging(searchVal);
+
+        PageInfo<Queue> pageInfo = new PageInfo<>(pageNo, pageSize);
+
+        List<Queue> queueList = queueMapper.queryQueuePaging(searchVal, pageInfo.getStart(), pageSize);
+
+        pageInfo.setTotalCount(count);
+        pageInfo.setLists(queueList);
+        result.put(Constants.DATA_LIST, pageInfo);
+        putMsg(result, Status.SUCCESS);
+
+        return result;
     }
 
-    Queue queueObj = new Queue();
+    /**
-    Date now = new Date();
+     * create queue
-
+     *
-    queueObj.setQueue(queue);
+     * @param loginUser
-    queueObj.setQueueName(queueName);
+     * @param queue
-    queueObj.setCreateTime(now);
+     * @param queueName
-    queueObj.setUpdateTime(now);
+     * @return
-
+     */
-    queueMapper.insert(queueObj);
+    public Map<String, Object> createQueue(User loginUser, String queue, String queueName) {
-    putMsg(result, Status.SUCCESS);
+        Map<String, Object> result = new HashMap<>(5);
-
+        if (checkAdmin(loginUser, result)) {
-    return result;
+            return result;
-  }
+        }
-
+
-  public Map<String, Object> updateQueue(User loginUser,int id,String queue, String queueName) {
+        if (checkQueueExists(queue)) {
-    Map<String, Object> result = new HashMap<>(5);
+            putMsg(result, Status.QUEUE_EXIST, queue);
-    if (checkAdmin(loginUser, result)) {
+            return result;
-      return result;
+        }
+
+        if (checkQueueExists(queueName)) {
+            putMsg(result, Status.QUEUE_NAME_EXIST, queueName);
+            return result;
+        }
+
+        Queue queueObj = new Queue();
+        Date now = new Date();
+
+        queueObj.setQueue(queue);
+        queueObj.setQueueName(queueName);
+        queueObj.setCreateTime(now);
+        queueObj.setUpdateTime(now);
+
+        queueMapper.insert(queueObj);
+        putMsg(result, Status.SUCCESS);
+
+        return result;
     }
 
-
+    /**
-
+     * update queue
-    Queue queueObj = queueMapper.queryById(id);
+     *
-    if (queueObj == null) {
+     * @param loginUser
-      putMsg(result,Status.QUEUE_NOT_EXIST,id);
+     * @param id
-      return result;
+     * @param queue
+     * @param queueName
+     * @return
+     */
+    public Map<String, Object> updateQueue(User loginUser, int id, String queue, String queueName) {
+        Map<String, Object> result = new HashMap<>(5);
+        if (checkAdmin(loginUser, result)) {
+            return result;
+        }
+
+
+        Queue queueObj = queueMapper.queryById(id);
+        if (queueObj == null) {
+            putMsg(result, Status.QUEUE_NOT_EXIST, id);
+            return result;
+        }
+
+        //update queue
+
+        if (StringUtils.isNotEmpty(queue)) {
+            if (!queue.equals(queueObj.getQueue()) && checkQueueExists(queue)) {
+                putMsg(result, Status.QUEUE_EXIST, queue);
+                return result;
+            }
+            queueObj.setQueue(queue);
+        }
+        if (StringUtils.isNotEmpty(queueName)) {
+            queueObj.setQueueName(queueName);
+        }
+        Date now = new Date();
+
+        queueObj.setUpdateTime(now);
+
+        queueMapper.update(queueObj);
+        putMsg(result, Status.SUCCESS);
+
+        return result;
     }
 
-    //update queue
 
-    if (StringUtils.isNotEmpty(queue)) {
+    /**
-      if (!queue.equals(queueObj.getQueue()) && checkQueueExists(queue)) {
+     * check queue exists
-          putMsg(result, Status.QUEUE_EXIST, queue);
+     *
-          return result;
+     * @param queue
-      }
+     * @return
-      queueObj.setQueue(queue);
+     */
+    private boolean checkQueueExists(String queue) {
+        return queueMapper.queryByQueue(queue) == null ? false : true;
     }
-    if (StringUtils.isNotEmpty(queueName)) {
-      queueObj.setQueueName(queueName);
-    }
-    Date now = new Date();
-
-    queueObj.setUpdateTime(now);
-
-    queueMapper.update(queueObj);
-    putMsg(result, Status.SUCCESS);
-
-    return result;
-  }
-
-
-  /**
-   * check queue exists
-   *
-   * @param queue
-   * @return
-   */
-  private boolean checkQueueExists(String queue) {
-    return queueMapper.queryByQueue(queue) == null ? false : true;
-  }
 
 }