Ver Fonte

完善功能

周浩 há 9 anos atrás
pai
commit
3d6ba2fb13

+ 1 - 1
hsweb-web-bean/src/main/java/org/hsweb/web/bean/common/InsertParam.java

@@ -3,7 +3,7 @@ package org.hsweb.web.bean.common;
 /**
  * Created by zhouhao on 16-4-19.
  */
-public class InsertParam<T> extends SqlParam<InsertParam> {
+public class InsertParam<T> extends SqlParam<InsertParam<T>> {
     private T data;
 
     public InsertParam() {

+ 7 - 0
hsweb-web-bean/src/main/java/org/hsweb/web/bean/common/PagerResult.java

@@ -1,5 +1,7 @@
 package org.hsweb.web.bean.common;
 
+import com.alibaba.fastjson.JSON;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -37,4 +39,9 @@ public class PagerResult<Po> implements Serializable {
         this.data = data;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }

+ 2 - 1
hsweb-web-bean/src/main/java/org/hsweb/web/bean/common/UpdateParam.java

@@ -3,7 +3,7 @@ package org.hsweb.web.bean.common;
 /**
  * Created by zhouhao on 16-4-19.
  */
-public class UpdateParam<T> extends SqlParam<UpdateParam> {
+public class UpdateParam<T> extends SqlParam<UpdateParam<T>> {
     private T data;
 
     public UpdateParam() {
@@ -25,4 +25,5 @@ public class UpdateParam<T> extends SqlParam<UpdateParam> {
     public void setData(T data) {
         this.data = data;
     }
+
 }

+ 20 - 0
hsweb-web-controller/src/main/java/org/hsweb/web/controller/form/FormController.java

@@ -8,6 +8,7 @@ import org.hsweb.web.bean.po.form.Form;
 import org.hsweb.web.controller.GenericController;
 import org.hsweb.web.message.ResponseMessage;
 import org.hsweb.web.service.form.FormService;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -59,6 +60,25 @@ public class FormController extends GenericController<Form, String> {
             message = new ResponseMessage(false, e);
         }
         return message;
+    }
 
+    @RequestMapping(value = "/{id}/deploy", method = RequestMethod.PUT)
+    public ResponseMessage deploy(@PathVariable("id") String id) {
+        try {
+            formService.deploy(id);
+            return new ResponseMessage(true, "success");
+        } catch (Exception e) {
+            return new ResponseMessage(false, e);
+        }
+    }
+
+    @RequestMapping(value = "/{id}/unDeploy", method = RequestMethod.PUT)
+    public ResponseMessage unDeploy(@PathVariable("id") String id) {
+        try {
+            formService.unDeploy(id);
+            return new ResponseMessage(true, "success");
+        } catch (Exception e) {
+            return new ResponseMessage(false, e);
+        }
     }
 }

+ 1 - 1
hsweb-web-service-impl-common/src/main/java/org/hsweb/web/service/impl/basic/SqlExecutorService.java

@@ -12,7 +12,7 @@ import java.sql.Connection;
  * SQL执行服务类,用于执行原生sql
  * Created by 浩 on 2015-10-09 0009.
  */
-@Service
+@Service(value = "sqlExecutor")
 public class SqlExecutorService extends AbstractJdbcSqlExecutor {
 
     @Resource