diff --git a/src/main/java/com/example/zxweb/controller/RmsController.java b/src/main/java/com/example/zxweb/controller/RmsController.java index 2044d69..ad37b2b 100644 --- a/src/main/java/com/example/zxweb/controller/RmsController.java +++ b/src/main/java/com/example/zxweb/controller/RmsController.java @@ -28,6 +28,9 @@ public class RmsController { @PostMapping(value = "/fkterminal/findAccessRecord") public Result fkterminalFindAccessRecord(@RequestBody JSONObject requestBody){ JSONObject responseBody = RmsUtils.fkterminalFindAccessRecord(requestBody); + if (responseBody.getInteger("code")!=0) { + return Result.error(responseBody.getString("msg")); + } responseBody.remove("msg"); responseBody.remove("code"); responseBody.remove("success"); @@ -38,6 +41,9 @@ public class RmsController { @PostMapping(value = "/sync/orderrecord") public Result syncOrderrecord(@RequestBody JSONObject requestBody){ JSONObject responseBody = RmsUtils.syncOrderrecord(requestBody); + if (responseBody.getInteger("code")!=0) { + return Result.error(responseBody.getString("msg")); + } responseBody.remove("msg"); responseBody.remove("code"); responseBody.remove("success"); @@ -48,6 +54,9 @@ public class RmsController { @PostMapping(value = "/fkterminal/recoverCard") public Result fkterminalRecoverCard(@RequestBody JSONObject requestBody){ JSONObject responseBody = RmsUtils.fkterminalRecoverCard(requestBody); + if (responseBody.getInteger("code")!=0) { + return Result.error(responseBody.getString("msg")); + } responseBody.remove("msg"); responseBody.remove("code"); responseBody.remove("success"); diff --git a/src/main/java/com/example/zxweb/utils/RmsUtils.java b/src/main/java/com/example/zxweb/utils/RmsUtils.java index 07e9697..4dc1f9a 100644 --- a/src/main/java/com/example/zxweb/utils/RmsUtils.java +++ b/src/main/java/com/example/zxweb/utils/RmsUtils.java @@ -23,12 +23,12 @@ public class RmsUtils { header=new JSONObject(); header.put("AppCode","42142fd0jkbf4515853b7fcec64748f6"); //header.put("devid","68EDA45C54F3"); - header.put("devid","68EDA444D9DG"); +// header.put("devid","68EDA444D9DG"); //68EDA444DODG header.put("Content-Type","application/json"); //获取TOKEN - //getToken(); - //header.put("TOKEN",TOKEN); + getToken(); + header.put("token",TOKEN); } @@ -61,8 +61,8 @@ public class RmsUtils { AssertUtils.notEmpty(endtime,"请输入结束时间-[endtime]"); JSONObject responseBody = RestUtil.post(API_PREFIX+RmsApiEnum.getApiByText("访客查询"), requestBody, header); AssertUtils.notNull(responseBody,"请求失败"); - Integer code = responseBody.getInteger("code"); - AssertUtils.isTrue(0==code,"请求异常:"+responseBody.getString("msg")); + //Integer code = responseBody.getInteger("code"); + //AssertUtils.isTrue(0==code,"请求异常:"+responseBody.getString("msg")); return responseBody; } @@ -89,8 +89,8 @@ public class RmsUtils { AssertUtils.notEmpty(visitorName,"请输入访客姓名-[visitorName]"); JSONObject responseBody = RestUtil.post(API_PREFIX+RmsApiEnum.getApiByText("访客预约"), requestBody, header); AssertUtils.notNull(responseBody,"请求接口异常"); - Integer code = responseBody.getInteger("code"); - AssertUtils.isTrue(code==0,"请求访客预约接口异常:"+requestBody.getOrDefault("msg","")); + //Integer code = responseBody.getInteger("code"); + //AssertUtils.isTrue(code==0,"请求访客预约接口异常:"+requestBody.getOrDefault("msg","")); return responseBody; } @@ -107,8 +107,8 @@ public class RmsUtils { AssertUtils.notEmpty(cardNum,"清输入访客证件号-[cardNum]"); JSONObject responseBody = RestUtil.post(API_PREFIX+RmsApiEnum.getApiByText("访客注销"), requestBody, header); AssertUtils.notNull(responseBody,"请求失败"); - Integer code = responseBody.getInteger("code"); - AssertUtils.isTrue(0==code,"请求异常:"+responseBody.getString("msg")); + //Integer code = responseBody.getInteger("code"); + //AssertUtils.isTrue(0==code,"请求异常:"+responseBody.getString("msg")); return responseBody; } }