updates

src/main/java/com/example/zxweb/controller/RmsController.java

@@ -2,18 +2,13 @@ package com.example.zxweb.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.example.zxweb.common.api.vo.Result;
-import com.example.zxweb.common.constant.enums.IotApiPathsEnum;
-import com.example.zxweb.utils.AssertUtils;
-import com.example.zxweb.utils.IotUtils;
 import com.example.zxweb.utils.RmsUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 /**
  * @Description 访客机
  * @Author ZhouWenTao
@@ -29,7 +24,7 @@ public class RmsController {
     public Result<?> fkterminalFindAccessRecord(@RequestBody JSONObject requestBody){
         JSONObject responseBody = RmsUtils.fkterminalFindAccessRecord(requestBody);
         if (responseBody.getInteger("code")!=0) {
-            return Result.error(responseBody.getString("msg"));
+            return Result.error(StringUtils.isBlank(responseBody.getString("msg"))?responseBody.getString("message"):responseBody.getString("msg"));
         }
         responseBody.remove("msg");
         responseBody.remove("code");
@@ -42,20 +37,19 @@ public class RmsController {
     public Result<?> syncOrderrecord(@RequestBody JSONObject requestBody){
         JSONObject responseBody = RmsUtils.syncOrderrecord(requestBody);
         if (responseBody.getInteger("code")!=0) {
-            return Result.error(responseBody.getString("msg"));
+            return Result.error(StringUtils.isBlank(responseBody.getString("msg"))?responseBody.getString("message"):responseBody.getString("msg"));
         }
         responseBody.remove("msg");
         responseBody.remove("code");
         responseBody.remove("success");
         return Result.OK(responseBody);
     }
-
     @ApiOperation(value = "访客注销")
     @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"));
+            return Result.error(StringUtils.isBlank(responseBody.getString("msg"))?responseBody.getString("message"):responseBody.getString("msg"));
         }
         responseBody.remove("msg");
         responseBody.remove("code");
@@ -64,35 +58,3 @@ public class RmsController {
     }
 
 }
-
-//content	object	无
-//content.id	int	访客记录ID
-//content.rcode	string	打印/仅登记卡号
-//content.cardnum	string	发卡卡号
-//content.createtime	string	访客登记时间
-//content.starttime	string	访客登记开始时间
-//content.endtime	string	访客登记结束时间
-//content.logofftime	string	访客访问注销时间
-//content.reasons	string	来访事由
-//content.unit	string	来访单位
-//content.sitePhoto	string	现场照片url
-//content.terminalCode	string	登记设备编号
-//content.status	int	状态：0进行中，1超时注销，2结束，3预约未登记
-//content.visitor	object	访客对象
-//name	string	访客姓名
-//sex	string	性别0女，1男
-//nation	string	民族
-//address	string	身份住址（已取消）
-//idnumAdd	string	证件号
-//phoneAdd	string	手机号
-//photo	string	证件照
-//+user	object	被访人
-//nickname	string	被访人姓名
-//email	string	系统账号
-//photo	string	url照片
-//phone	string	手机号
-//syncId	string	第三方同步ID
-//ecardNum	string	卡号
-//+vcar	object	访客车辆实体对象
-//cardnum	string	车牌号
-//success	string	ture/fals

src/main/java/com/example/zxweb/utils/RestUtil.java

@@ -9,7 +9,6 @@ import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
 import java.nio.charset.StandardCharsets;
-import java.util.Base64;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -240,6 +239,12 @@ public class RestUtil {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        log.info("打印headers:");
+        log.info("-----------");
+        for (String s : headers.keySet()) {
+            log.info(s+":"+headers.get(s));
+        }
+        log.info("-----------");
         // 发送请求
         HttpEntity<String> request = new HttpEntity<>(body, headers);
         //回调接口

src/main/java/com/example/zxweb/utils/RmsUtils.java

@@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.example.zxweb.common.constant.enums.RmsApiEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-import springfox.documentation.spring.web.json.Json;
 
 /**
  * @Description 访客机工具类