diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java index 01b8775..802fcb0 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java @@ -42,6 +42,11 @@ public class OpenController extends BaseController { @RequestMapping("/getPhotoListForOpen") @Log(title = "对外图片查询", type = "查询") public ResponseReult getPhotoListForOpen(@RequestHeader HttpHeaders headers, @RequestBody @Validated OpenTerminalAndTimeVo vo) { + if (vo.getCmdId().contains("SHXY")) { + String device = "XYIGQ10C230500"; + String id = vo.getCmdId().substring(vo.getCmdId().length()-3,vo.getCmdId().length()); + vo.setCmdId(device + id); + } String requestIp = HeaderUtil.getRequestIp(headers); ServiceBody serviceBody = terminalPhotoService.getPhotoListForOpen(requestIp,vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { @@ -74,6 +79,11 @@ public class OpenController extends BaseController { @RequestMapping("/cmaDeviceStatus") @Log(title = "查询装置状态接口", type = "查询") public JSONObject cmaDeviceStatus(@RequestBody @Validated OpenCmdidVo vo) { + if (vo.getDeviceID().contains("SHXY")) { + String device = "XYIGQ10C230500"; + String id = vo.getDeviceID().substring(vo.getDeviceID().length()-3,vo.getDeviceID().length()); + vo.setDeviceID(device + id); + } JSONObject serviceBody = openService.cmaDeviceStatus(vo); return serviceBody; }