第三方接口修改

business-service/src/main/java/com/ozs/entity/vo/ParameterVo.java

@@ -0,0 +1,11 @@
+package com.ozs.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class ParameterVo {
+    private  String parameter;
+}

vehicle-admin/src/main/java/com/ozs/web/controller/sdk/GeoHazardMonitorTokenController.java

@@ -34,6 +34,7 @@ import com.ozs.entity.vo.CameraPlayVo;
 import com.ozs.entity.vo.CameraVo;
 import com.ozs.entity.vo.Files;
 import com.ozs.entity.vo.HeartbeatVo;
+import com.ozs.entity.vo.ParameterVo;
 import com.ozs.entity.vo.QueryAlarmVo;
 import com.ozs.entity.vo.ReleaseAlarmVo;
 import com.ozs.entity.vo.ReqMsgAlarmVo;
@@ -151,7 +152,7 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("data", "授权类型填写错误");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-        }else {
+        } else {
             jsonObject.put("resultCode", 0);
             jsonObject.put("message", "失败");
             jsonObject.put("data", "授权类型不能为空");
@@ -197,13 +198,13 @@ public class GeoHazardMonitorTokenController {
      */
     @PostMapping("/api/alarm")
     @Transactional
-    public String alarm(@RequestParam("parameter") String parameter, HttpServletRequest request) {
+    public String alarm(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         log.info("token:{}", token);
-        log.info("parameter:{}", parameter);
+        log.info("parameter:{}", parameterVo);
         JSONObject jsonObject = new JSONObject();
         if (StringUtils.isNotEmpty(token)) {
-            String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
+            String s = SM4Utils.decryptData_ECB(parameterVo.getParameter(), "4370780c9a8c43e5");
             ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
             if (!ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmAttr())) {
                 if (!reqMsgAlarmVo.getAlarmAttr().matches(PATTERN)) {
@@ -213,13 +214,13 @@ public class GeoHazardMonitorTokenController {
                     return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
                 }
             }
-            if (!reqMsgAlarmVo.getAlarmMile().toString().matches(PATTERNS)){
+            if (!reqMsgAlarmVo.getAlarmMile().toString().matches(PATTERNS)) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "报警里程位置填写错误");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (reqMsgAlarmVo.getLineDir()!=1&&reqMsgAlarmVo.getLineDir()!=2){
+            if (reqMsgAlarmVo.getLineDir() != 1 && reqMsgAlarmVo.getLineDir() != 2) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "行别填写错误");
@@ -230,31 +231,31 @@ public class GeoHazardMonitorTokenController {
                 queryWrapper.eq(BaseRailwayManagement::getRailwayCode, reqMsgAlarmVo.getAlarmRailway());
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-            if (ObjectUtils.isEmpty(baseRailwayManagement)){
+            if (ObjectUtils.isEmpty(baseRailwayManagement)) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "填写的报警线路编码不存在");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmId())){
+            if (ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmId())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "报警的唯一标识不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmTime())){
+            if (ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmTime())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "报警时间不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (reqMsgAlarmVo.getAlarmType()<1||reqMsgAlarmVo.getAlarmType()>3){
+            if (reqMsgAlarmVo.getAlarmType() < 1 || reqMsgAlarmVo.getAlarmType() > 3) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "报警病害类型填写错误");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (!reqMsgAlarmVo.getAlarmLevel().toString().matches(PATTERNS)){
+            if (!reqMsgAlarmVo.getAlarmLevel().toString().matches(PATTERNS)) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "报警级别填写错误");
@@ -284,7 +285,7 @@ public class GeoHazardMonitorTokenController {
                 lw.eq(MsgAlarm::getAlarmId, reqMsgAlarmVo.getAlarmId());
             }
             MsgAlarm alarm = msgAlarmService.getOne(lw);
-            if (ObjectUtils.isEmpty(alarm)){
+            if (ObjectUtils.isEmpty(alarm)) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "没有该报警唯一标识的报警信息");
@@ -308,13 +309,13 @@ public class GeoHazardMonitorTokenController {
                 Files[] files1 = reqMsgAlarmVo.getFiles();
                 if (files1.length > 0) {
                     for (int i = 0; i < files1.length; i++) {
-                        if (ObjectUtils.isEmpty(files1[i].fileUrl)){
+                        if (ObjectUtils.isEmpty(files1[i].fileUrl)) {
                             jsonObject.put("resultCode", 0);
                             jsonObject.put("message", "失败");
                             jsonObject.put("data", "上传文件地址不能为空");
                             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
                         }
-                        if (files1[i].fileType<1||files1[i].fileType>3){
+                        if (files1[i].fileType < 1 || files1[i].fileType > 3) {
                             jsonObject.put("resultCode", 0);
                             jsonObject.put("message", "失败");
                             jsonObject.put("data", "文件类型填写错误");
@@ -397,38 +398,38 @@ public class GeoHazardMonitorTokenController {
     /**
      * 报警解除接口
      *
-     * @param parameter
+     * @param parameterVo
      * @param request
      * @return
      */
     @PostMapping("/api/releaseAlarm")
-    public String releaseAlarm(@RequestParam("parameter") String parameter, HttpServletRequest request) {
+    public String releaseAlarm(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         log.info("token:{}", token);
-        log.info("parameter:{}", parameter);
+        log.info("parameter:{}", parameterVo);
         JSONObject jsonObject = new JSONObject();
         if (StringUtils.isNotEmpty(token)) {
-            String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
+            String s = SM4Utils.decryptData_ECB(parameterVo.getParameter(), "4370780c9a8c43e5");
             ReleaseAlarmVo releaseAlarmVo = JSON.parseObject(s, ReleaseAlarmVo.class);
-            if (ObjectUtils.isEmpty(releaseAlarmVo.getAlarmId())){
+            if (ObjectUtils.isEmpty(releaseAlarmVo.getAlarmId())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "报警的唯一标识不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (ObjectUtils.isEmpty(releaseAlarmVo.getReleaseTime())){
+            if (ObjectUtils.isEmpty(releaseAlarmVo.getReleaseTime())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "解除报警时间不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (ObjectUtils.isEmpty(releaseAlarmVo.getReleaseContent())){
+            if (ObjectUtils.isEmpty(releaseAlarmVo.getReleaseContent())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "解除原因不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (ObjectUtils.isEmpty(releaseAlarmVo.getReleaseTime())){
+            if (ObjectUtils.isEmpty(releaseAlarmVo.getReleaseTime())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "解除人不能为空");
@@ -476,42 +477,42 @@ public class GeoHazardMonitorTokenController {
     /**
      * 车载心跳机制交互
      *
-     * @param parameter
+     * @param parameterVo
      * @param request
      * @return
      */
     @PostMapping("/api/terminal/heartbeat")
     @Transactional
-    public String heartbeat(@RequestParam("parameter") String parameter, HttpServletRequest request) {
+    public String heartbeat(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
         Map<String, Object> twoMap = new HashMap<>();
         int distance = 0;
         RespHeartbeatVo respHeartbeatVo = new RespHeartbeatVo();
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         log.info("token:{}", token);
-        log.info("parameter:{}", parameter);
+        log.info("parameter:{}", parameterVo);
         JSONObject jsonObject = new JSONObject();
         if (StringUtils.isNotEmpty(token)) {
-            String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
+            String s = SM4Utils.decryptData_ECB(parameterVo.getParameter(), "4370780c9a8c43e5");
             HeartbeatVo heartbeatVo = JSON.parseObject(s, HeartbeatVo.class);
-            if (ObjectUtils.isEmpty(heartbeatVo.getTerminalCode())){
+            if (ObjectUtils.isEmpty(heartbeatVo.getTerminalCode())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "车载终端编码不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (!heartbeatVo.getCurrentMile().toString().matches(PATTERNS)){
+            if (!heartbeatVo.getCurrentMile().toString().matches(PATTERNS)) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "当前里程位置填写错误");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (ObjectUtils.isEmpty(heartbeatVo.getLatitude())){
+            if (ObjectUtils.isEmpty(heartbeatVo.getLatitude())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "当前所在纬度不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (ObjectUtils.isEmpty(heartbeatVo.getLongitude())){
+            if (ObjectUtils.isEmpty(heartbeatVo.getLongitude())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "当前所在经度不能为空");
@@ -522,25 +523,25 @@ public class GeoHazardMonitorTokenController {
                 railway.eq(BaseRailwayManagement::getRailwayCode, heartbeatVo.getRailwayCode());
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(railway);
-            if (ObjectUtils.isEmpty(baseRailwayManagement)){
+            if (ObjectUtils.isEmpty(baseRailwayManagement)) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "填写的线路编码不存在");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (heartbeatVo.getLineDir()!=1&&heartbeatVo.getLineDir()!=2){
+            if (heartbeatVo.getLineDir() != 1 && heartbeatVo.getLineDir() != 2) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "行别填写错误");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (!heartbeatVo.getVisualDistance().toString().matches(PATTERNS)){
+            if (!heartbeatVo.getVisualDistance().toString().matches(PATTERNS)) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "司机目视距离填写错误");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (heartbeatVo.getSignalStrength()!=1&&heartbeatVo.getSignalStrength()!=2){
+            if (heartbeatVo.getSignalStrength() != 1 && heartbeatVo.getSignalStrength() != 2) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "信号强度填写错误");
@@ -551,7 +552,7 @@ public class GeoHazardMonitorTokenController {
             LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(BaseTerminal::getTerminalCode, vehiclePosition.getTerminalCode());
             BaseTerminal baseTerminal = baseTerminalService.getOne(wrapper);
-            if (ObjectUtils.isEmpty(baseTerminal)){
+            if (ObjectUtils.isEmpty(baseTerminal)) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "关联表中没有改终端编码的信息");
@@ -585,7 +586,7 @@ public class GeoHazardMonitorTokenController {
                     camera.ge(BaseCameraManagement::getBeginMile, list.get(0).getAlarmMile());
                     camera.le(BaseCameraManagement::getEndMile, list.get(0).getAlarmMile());
                     camera.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
-                    camera.eq(BaseCameraManagement::getRailwayCode,heartbeatVo.getRailwayCode());
+                    camera.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                     camera.orderByAsc(BaseCameraManagement::getInstallMile);
                     List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(camera);
                     List<AlarmListVo> listVos = new ArrayList<>();
@@ -608,7 +609,7 @@ public class GeoHazardMonitorTokenController {
                         LambdaQueryWrapper<MsgAlarmExt> ext = new LambdaQueryWrapper<>();
                         ext.eq(MsgAlarmExt::getAlarmId, list.get(0).getAlarmId());
                         MsgAlarmExt one = msgAlarmExtService.getOne(ext);
-                        if (ObjectUtils.isEmpty(one)){
+                        if (ObjectUtils.isEmpty(one)) {
                             jsonObject.put("resultCode", 0);
                             jsonObject.put("message", "失败");
                             jsonObject.put("data", "没有该报警ID的关联信息");
@@ -632,7 +633,7 @@ public class GeoHazardMonitorTokenController {
                         ment.ge(BaseCameraManagement::getBeginMile, list.get(i).getAlarmMile());
                         ment.le(BaseCameraManagement::getEndMile, list.get(i).getAlarmMile());
                         ment.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
-                        ment.eq(BaseCameraManagement::getRailwayCode,heartbeatVo.getRailwayCode());
+                        ment.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                         ment.orderByAsc(BaseCameraManagement::getInstallMile);
                         if (i == 0) {
                             wrapper.last("limit 1,1000000");
@@ -727,27 +728,27 @@ public class GeoHazardMonitorTokenController {
     /**
      * 司机忽略报警接口
      *
-     * @param parameter
+     * @param parameterVo
      * @param request
      * @return
      */
     @PostMapping("/api/terminal/ignore")
-    public String terminalIgnore(@RequestParam("parameter") String parameter, HttpServletRequest request) {
+    public String terminalIgnore(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         Map<String, Object> map = new HashMap<>();
         log.info("token:{}", token);
-        log.info("parameter:{}", parameter);
+        log.info("parameter:{}", parameterVo);
         JSONObject jsonObject = new JSONObject();
         if (StringUtils.isNotEmpty(token)) {
-            String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
+            String s = SM4Utils.decryptData_ECB(parameterVo.getParameter(), "4370780c9a8c43e5");
             TerminalIgnoreVo terminalIgnoreVo = JSON.parseObject(s, TerminalIgnoreVo.class);
-            if (ObjectUtils.isEmpty(terminalIgnoreVo.getTerminalCode())){
+            if (ObjectUtils.isEmpty(terminalIgnoreVo.getTerminalCode())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "车载终端编码不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (ObjectUtils.isEmpty(terminalIgnoreVo.getAlarmId())){
+            if (ObjectUtils.isEmpty(terminalIgnoreVo.getAlarmId())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "报警唯一UUID不能为空");
@@ -796,20 +797,20 @@ public class GeoHazardMonitorTokenController {
     /**
      * 获取所有的相机列表接口定义
      *
-     * @param parameter
+     * @param parameterVo
      * @param request
      * @return
      */
     @PostMapping("/api/query/camera")
-    public String camera(@RequestParam("parameter") String parameter, HttpServletRequest request) {
+    public String camera(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         log.info("token:{}", token);
-        log.info("parameter:{}", parameter);
+        log.info("parameter:{}", parameterVo);
         JSONObject jsonObject = new JSONObject();
         if (StringUtils.isNotEmpty(token)) {
-            String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
+            String s = SM4Utils.decryptData_ECB(parameterVo.getParameter(), "4370780c9a8c43e5");
             CameraVo cameraVo = JSON.parseObject(s, CameraVo.class);
-            if (ObjectUtils.isEmpty(cameraVo.getTerminalCode())){
+            if (ObjectUtils.isEmpty(cameraVo.getTerminalCode())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "车载终端编码不能为空");
@@ -823,7 +824,7 @@ public class GeoHazardMonitorTokenController {
                 wrapper.eq(BaseCameraManagement::getLineDir, cameraVo.getLineDir());
             }
             List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
-            if (list.size()<=0){
+            if (list.size() <= 0) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "没有该线路编码或行别的相机信息");
@@ -835,7 +836,7 @@ public class GeoHazardMonitorTokenController {
                     queryWrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
                 }
                 BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-                if (ObjectUtils.isEmpty(baseRailwayManagement)){
+                if (ObjectUtils.isEmpty(baseRailwayManagement)) {
                     jsonObject.put("resultCode", 0);
                     jsonObject.put("message", "失败");
                     jsonObject.put("data", "没有该线路编码的线路信息");
@@ -881,27 +882,27 @@ public class GeoHazardMonitorTokenController {
     /**
      * 点播功能接口定义(直播流)
      *
-     * @param parameter
+     * @param parameterVo
      * @param request
      * @return
      */
     @PostMapping("/api/camera/play")
-    public String cameraPlay(@RequestParam("parameter") String parameter, HttpServletRequest request) {
+    public String cameraPlay(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         log.info("token:{}", token);
-        log.info("parameter:{}", parameter);
+        log.info("parameter:{}", parameterVo);
         JSONObject jsonObject = new JSONObject();
         if (StringUtils.isNotEmpty(token)) {
-            String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
+            String s = SM4Utils.decryptData_ECB(parameterVo.getParameter(), "4370780c9a8c43e5");
             CameraPlayVo cameraPlayVo = JSON.parseObject(s, CameraPlayVo.class);
-            if (ObjectUtils.isEmpty(cameraPlayVo.getTerminalCode())){
+            if (ObjectUtils.isEmpty(cameraPlayVo.getTerminalCode())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "车载终端编码不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (ObjectUtils.isEmpty(cameraPlayVo.getCameraCode())){
+            if (ObjectUtils.isEmpty(cameraPlayVo.getCameraCode())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "相机编码不能为空");
@@ -934,20 +935,20 @@ public class GeoHazardMonitorTokenController {
     /**
      * 获取报警列表（已解除和未解除）
      *
-     * @param parameter
+     * @param parameterVo
      * @param request
      * @return
      */
     @PostMapping("/api/query/alarm")
-    public String queryAlarm(@RequestParam("parameter") String parameter, HttpServletRequest request) {
+    public String queryAlarm(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         log.info("token:{}", token);
-        log.info("parameter:{}", parameter);
+        log.info("parameter:{}", parameterVo);
         JSONObject jsonObject = new JSONObject();
         if (StringUtils.isNotEmpty(token)) {
-            String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
+            String s = SM4Utils.decryptData_ECB(parameterVo.getParameter(), "4370780c9a8c43e5");
             CameraVo cameraVo = JSON.parseObject(s, CameraVo.class);
-            if (ObjectUtils.isEmpty(cameraVo.getTerminalCode())){
+            if (ObjectUtils.isEmpty(cameraVo.getTerminalCode())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "车载终端编码不能为空");
@@ -961,7 +962,7 @@ public class GeoHazardMonitorTokenController {
                 wrapper.eq(MsgAlarm::getLineDir, cameraVo.getLineDir());
             }
             List<MsgAlarm> list = msgAlarmService.list(wrapper);
-            if (list.size()<=0){
+            if (list.size() <= 0) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "没有该报警线路或行别的报警信息");
@@ -980,7 +981,7 @@ public class GeoHazardMonitorTokenController {
                 LambdaQueryWrapper<MsgAlarmExt> alarm = new LambdaQueryWrapper<>();
                 alarm.eq(MsgAlarmExt::getAlarmId, msgAlarm.getAlarmId());
                 List<MsgAlarmExt> list1 = msgAlarmExtService.list(alarm);
-                if (list1.size()<=0){
+                if (list1.size() <= 0) {
                     jsonObject.put("resultCode", 0);
                     jsonObject.put("message", "失败");
                     jsonObject.put("data", "没有该报警唯一标识的扩展信息");
@@ -1014,28 +1015,28 @@ public class GeoHazardMonitorTokenController {
     /**
      * 获取报警回放
      *
-     * @param parameter
+     * @param parameterVo
      * @param request
      * @return
      */
     @PostMapping("/api/alarm/play")
-    public String alarmPlay(@RequestParam("parameter") String parameter, HttpServletRequest request) {
+    public String alarmPlay(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         String urls = null;
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         log.info("token:{}", token);
-        log.info("parameter:{}", parameter);
+        log.info("parameter:{}", parameterVo);
         JSONObject jsonObject = new JSONObject();
         if (StringUtils.isNotEmpty(token)) {
-            String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
+            String s = SM4Utils.decryptData_ECB(parameterVo.getParameter(), "4370780c9a8c43e5");
             TerminalIgnoreVo terminalIgnoreVo = JSON.parseObject(s, TerminalIgnoreVo.class);
-            if (ObjectUtils.isEmpty(terminalIgnoreVo.getTerminalCode())){
+            if (ObjectUtils.isEmpty(terminalIgnoreVo.getTerminalCode())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "车载终端编码不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
             }
-            if (ObjectUtils.isEmpty(terminalIgnoreVo.getAlarmId())){
+            if (ObjectUtils.isEmpty(terminalIgnoreVo.getAlarmId())) {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "报警唯一UUID不能为空");
@@ -1103,7 +1104,13 @@ public class GeoHazardMonitorTokenController {
     public static void main(String[] args) {
         JSONObject res = new JSONObject();
         res.put("terminalCode", "001");
-        res.put("alarmId","42010001541320001115");
+        res.put("currentMile", 2000);
+        res.put("longitude", "200");
+        res.put("latitude", "300");
+        res.put("railwayCode", "JT01");
+        res.put("lineDir", 1);
+        res.put("visualDistance", 500);
+        res.put("signalStrength", 1);
         String s = SM4Utils.encryptData_ECB(JSONObject.toJSONString(res), "4370780c9a8c43e5");
         System.out.println(s);
     }