提交 1c85f2ac authored 作者: 邓砥奕's avatar 邓砥奕

[RFID模块]修复门禁报警返回值Bug

上级 0609c28b
...@@ -66,7 +66,7 @@ public class AccessController { ...@@ -66,7 +66,7 @@ public class AccessController {
private LibraryWarningLogDetailDao libraryWarningLogDetailDao; private LibraryWarningLogDetailDao libraryWarningLogDetailDao;
@PostMapping("/send") @PostMapping("/send")
public String sendMessage(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException { public DataResult sendMessage(HttpServletRequest httpServletRequest , HttpServletResponse httpServletResponse) throws IOException {
//获取门禁传入json //获取门禁传入json
ServletInputStream inputStream = httpServletRequest.getInputStream(); ServletInputStream inputStream = httpServletRequest.getInputStream();
BufferedReader bufferedInputStream = new BufferedReader(new InputStreamReader(inputStream,"utf-8")); BufferedReader bufferedInputStream = new BufferedReader(new InputStreamReader(inputStream,"utf-8"));
...@@ -76,7 +76,6 @@ public class AccessController { ...@@ -76,7 +76,6 @@ public class AccessController {
sp.append(line); sp.append(line);
} }
String json = sp.toString(); String json = sp.toString();
System.out.println(json);
//数据提交 //数据提交
if (json.contains("20001")){ if (json.contains("20001")){
//Json转对象 //Json转对象
...@@ -163,15 +162,15 @@ public class AccessController { ...@@ -163,15 +162,15 @@ public class AccessController {
} }
//时间同步 //时间同步
else if (json.contains("20002")){ else if (json.contains("20002")){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
TimeConfirm timeConfirm = new TimeConfirm(); // TimeConfirm timeConfirm = new TimeConfirm();
timeConfirm.setCmd("20002"); // timeConfirm.setCmd("20002");
timeConfirm.setData(new TimeData(0,sdf.format(new Date()))); // timeConfirm.setData(new TimeData(0,sdf.format(new Date())));
return JacksonUtil.toJSon(timeConfirm); return null;
} }
//心跳包 //心跳包
else if (json.contains("20003")){ else if (json.contains("20003")){
return DataResult.success(); return null;
} }
else { else {
throw new ApiException("未找到匹配的cmd"); throw new ApiException("未找到匹配的cmd");
......
...@@ -14,18 +14,18 @@ public class DataResult { ...@@ -14,18 +14,18 @@ public class DataResult {
private Status data; private Status data;
//不报警 //不报警
public static String success(){ public static DataResult success(){
DataResult result = new DataResult(); DataResult result = new DataResult();
result.setCmd("20001"); result.setCmd("20001");
result.setData(new Status(0)); result.setData(new Status(0));
return JacksonUtil.toJSon(result); return result;
} }
//报警 //报警
public static String failed(){ public static DataResult failed(){
DataResult result = new DataResult(); DataResult result = new DataResult();
result.setCmd("20001"); result.setCmd("20001");
result.setData(new Status(1)); result.setData(new Status(1));
return JacksonUtil.toJSon(result); return result;
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论