生成二维码

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

@@ -5,6 +5,7 @@ import com.iamberry.rst.core.tools.QRCJson;
 import com.iamberry.rst.core.tools.WeixinUtil;
 import com.iamberry.rst.faces.pts.*;
 import com.iamberry.wechat.tools.NameUtils;
+import com.iamberry.wechat.tools.RespJsonBean;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.ResultInfo;
 import net.sf.json.JSONArray;
@@ -338,20 +339,20 @@ public class MachineController {
      */
     @ResponseBody
     @RequestMapping("/getMachineInfo")
-    public JSONObject getMachineInfo(HttpServletRequest request) {
+    public RespJsonBean getMachineInfo(HttpServletRequest request) {
+        RespJsonBean rsj = new RespJsonBean();
         String barCode = request.getParameter("barCode");
         if (barCode == null || barCode.equals("")) {
             return null;
         }
-        JSONObject json = new JSONObject();
         PtsMachine ptsMachine = machineService.getMachineByBarCode(barCode);
         if(ptsMachine != null){
-            json.put("isBeing",1);
-            json.put("productType",ptsMachine.getMachineProduceType() == 1?"净水机":"冲奶机");
-            json.put("producedTime",ptsMachine.getMachineProducedTime() == null?null:ptsMachine.getMachineProducedTime().getTime());
+            rsj.addResponseKeyValue("isBeing",1);
+            rsj.addResponseKeyValue("productType",ptsMachine.getMachineProduceType() == 1?"净水机":"冲奶机");
+            rsj.addResponseKeyValue("producedTime",ptsMachine.getMachineProducedTime() == null?null:ptsMachine.getMachineProducedTime().getTime());
         }else{
-            json.put("isBeing",2);
+            rsj.addResponseKeyValue("isBeing",2);
         }
-        return json;
+        return rsj;
     }
 }