controller返回格式调整

src/main/java/com/greentech/gateservice/controller/GateController.java

@@ -1,11 +1,14 @@
 package com.greentech.gateservice.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.greentech.gateservice.util.LoginModule;
 import com.netsdk.common.Res;
 import com.netsdk.lib.NetSDKLib;
 import com.netsdk.lib.ToolKits;
 import com.sun.jna.Memory;
 import com.sun.jna.Pointer;
+import com.greentech.gateservice.util.Resonse;
+import org.apache.http.HttpResponse;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -15,7 +18,8 @@ import javax.swing.*;
 @RestController
 public class GateController {
     @RequestMapping("/open/door")
-    public String openDoor(@RequestParam String sn){
+    public JSONObject openDoor(@RequestParam String sn){
+
         NetSDKLib.NET_CTRL_ACCESS_OPEN openInfo = new NetSDKLib.NET_CTRL_ACCESS_OPEN();
         openInfo.nChannelID = 0;
         openInfo.emOpenDoorType = NetSDKLib.EM_OPEN_DOOR_TYPE.EM_OPEN_DOOR_TYPE_REMOTE;
@@ -39,18 +43,18 @@ public class GateController {
                     if (!ret) {
                         JOptionPane.showMessageDialog(null, ToolKits.getErrorCodeShow(), Res.string().getErrorMessage(),
                                 JOptionPane.ERROR_MESSAGE);
-                        return "开门失败";
+                        return Resonse.ResponseError("开门失败");
                     }
-                    return "开门成功";
+                    return Resonse.ResponseSuccess("开门成功");
                 }
 
             }
         }
-        return "未发现设备";
+        return Resonse.ResponseError("未发现设备");
     }
 
     @RequestMapping("/close/door")
-    public String closeDoor(@RequestParam String sn){
+    public JSONObject closeDoor(@RequestParam String sn){
         final NetSDKLib.NET_CTRL_ACCESS_CLOSE close = new NetSDKLib.NET_CTRL_ACCESS_CLOSE();
         close.nChannelID = 0; // 对应的门编号 - 如何开全部的门
         close.write();
@@ -68,12 +72,12 @@ public class GateController {
                     if (!result) {
                         JOptionPane.showMessageDialog(null, ToolKits.getErrorCodeShow(), Res.string().getErrorMessage(),
                                 JOptionPane.ERROR_MESSAGE);
-                        return "关门失败";
+                        return Resonse.ResponseError("关门失败");
                     }
-                    return "关门成功";
+                    return Resonse.ResponseError("关门成功");
                 }
             }
         }
-        return "未发现设备";
+        return Resonse.ResponseError("未发现设备");
     }
 }

src/main/java/com/greentech/gateservice/util/Resonse.java

@@ -0,0 +1,21 @@
+package com.greentech.gateservice.util;
+
+import com.alibaba.fastjson.JSONObject;
+import jdk.nashorn.internal.runtime.regexp.JoniRegExp;
+
+public class Resonse {
+    public static JSONObject ResponseSuccess(Object data) {
+        JSONObject o = new JSONObject();
+        o.put("code",200);
+        o.put("msg","操作成功");
+        o.put("data",data);
+        return o;
+    }
+    public static JSONObject ResponseError(Object data) {
+        JSONObject o = new JSONObject();
+        o.put("code",200);
+        o.put("msg","操作失败");
+        o.put("data",data);
+        return o;
+    }
+}