Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java

@@ -63,7 +63,7 @@ public class TestController extends WebBaseController {
      *
      * @return
      */
-    @RequestMapping("/create-quarter")
+    @RequestMapping("/create-quarter_key")
     @ResponseBody
     public HaobanResponse testListVo(String key) {
         QuartzEnum quartzEnum = QuartzEnum.getByKey(key);
@@ -71,7 +71,21 @@ public class TestController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_0);
         }
         testApiService.quartzTaskConvert(quartzEnum.getServiceName(), quartzEnum.getMethod(), quartzEnum.getCron(), quartzEnum.getParams());
+        return resultResponse(HaoBanErrCode.ERR_1);
+    }
 
+    /**
+     * 创建定时器
+     *
+     * @return
+     */
+    @RequestMapping("/create-quarter")
+    @ResponseBody
+    public HaobanResponse testListVo(String serviceName, String methodName, String cron, String params) {
+        if (StringUtils.isAnyBlank(serviceName,methodName,cron)) {
+            return resultResponse(HaoBanErrCode.ERR_2);
+        }
+        testApiService.quartzTaskConvert(serviceName, methodName, cron, params);
         return resultResponse(HaoBanErrCode.ERR_1);
     }