From 80643a81b745465df1b701df571866eef0c7a3b1 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Thu, 8 Aug 2024 14:59:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MntnController.java | 15 +++++++-------- .../exception/GlobalExceptionHandler.java | 4 ++-- .../xymanager_common/util/HttpRequestUtil.java | 3 +++ .../xymanager_service/impl/MntnServiceImpl.java | 3 ++- .../xymanager_service/service/MntnService.java | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnController.java index f6d7c93..1954d51 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnController.java @@ -26,21 +26,20 @@ public class MntnController extends BaseController { @PostMapping("") @ApiOperation("上传心跳并返回命令") - public ResponseReult> sync(@RequestParam("cmdid") String cmdid, - @RequestBody HashMap data, - HttpServletRequest req, HttpServletResponse resp) throws Exception { + public HashMap sync(@RequestBody HashMap data, + HttpServletRequest req, HttpServletResponse resp) throws Exception { String ip = HttpRequestUtil.getRemoteIp(req); String multi = req.getHeader("Accept-Cmds"); - HashMap result = service.sync(cmdid, ip, multi, data); + HashMap result = service.sync(ip, multi, data); resp.setHeader("ResSyncTime", String.valueOf(System.currentTimeMillis())); - return ResponseReult.success(result); + return result; } @GetMapping("status") @ApiOperation("上传命令结果") - public ResponseReult status(@RequestParam("cid") Integer cid, - @RequestParam("res") Integer res, - @RequestParam("content") String content) { + public ResponseReult status(@RequestParam("cid") Integer cid, + @RequestParam("res") Integer res, + @RequestParam("content") String content) { service.result(cid, res, content); ResponseReult resp = new ResponseReult(); resp.setCode(0); diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/exception/GlobalExceptionHandler.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/exception/GlobalExceptionHandler.java index 7ff5fe3..1fe7e98 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/exception/GlobalExceptionHandler.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/exception/GlobalExceptionHandler.java @@ -6,8 +6,8 @@ import org.apache.catalina.connector.ClientAbortException; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; import org.springframework.web.bind.MethodArgumentNotValidException; -import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; import java.sql.SQLException; @@ -15,7 +15,7 @@ import java.sql.SQLException; * 全局异常处理 * Created by 晶晶 on 2023/5/8. */ -@ControllerAdvice +@RestControllerAdvice @Slf4j public class GlobalExceptionHandler { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/HttpRequestUtil.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/HttpRequestUtil.java index 088a440..b78a5b8 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/HttpRequestUtil.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/HttpRequestUtil.java @@ -51,6 +51,9 @@ public class HttpRequestUtil { return ip; } ip = req.getRemoteAddr(); + if ("0:0:0:0:0:0:0:1".equals(ip)) { + ip = "127.0.0.1"; + } return ip; } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/MntnServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/MntnServiceImpl.java index 599642e..143d10a 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/MntnServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/MntnServiceImpl.java @@ -38,7 +38,8 @@ public class MntnServiceImpl implements MntnService { CmdService cmdService; @Override - public HashMap sync(String cmdid, String ip, String multi, HashMap data) throws Exception { + public HashMap sync(String ip, String multi, HashMap data) throws Exception { + String cmdid = (String) data.get("id"); Terminals term = terminalExtService.getByCmdid(cmdid); if (term == null) { throw new ApiException("该装置不存在"); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/MntnService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/MntnService.java index 689bab0..ac93cc1 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/MntnService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/MntnService.java @@ -4,7 +4,7 @@ import java.util.HashMap; public interface MntnService { - HashMap sync(String cmdid, String ip, String multi, HashMap data) throws Exception; + HashMap sync(String ip, String multi, HashMap data) throws Exception; void result(Integer cid, Integer res, String content); }