第三方接口修改

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -584,23 +584,23 @@ public class BaseCameraManagementController extends BaseController {
         return success();
     }
 
-    @ApiOperation("播放回放")
-    @PostMapping("/api/play")
-    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
-    public AjaxResult play(@Validated @RequestBody BaseCameraResVo vo) {
-        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        lw.eq(BaseCameraManagement::getCameraCode, vo.getCameraCode());
-        BaseCameraManagement one = baseCameraManagementService.getOne(lw);
-        if (ObjectUtils.isEmpty(one)) {
-            throw new BaseException("相机编号【" + vo.getCameraCode() + "】不存在");
-        }
-        String path = CameraUtil.historyPlayListStr(one.getChannel(), vo.getStartTime(), vo.getEntTime());
-        if (org.apache.commons.lang3.StringUtils.isBlank(path)) {
-            throw new BaseException("当前相机无视频录像");
-        }
-        return new AjaxResult(200, "ok", serverConfig.getUrl() + path);
-//        return success(CameraUtil.historyPlayList(one.getChannel(), vo.getStartTime(), vo.getEntTime()));
-    }
+//    @ApiOperation("播放回放")
+//    @PostMapping("/api/play")
+//    @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
+//    public AjaxResult play(@Validated @RequestBody BaseCameraResVo vo) {
+//        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
+//        lw.eq(BaseCameraManagement::getCameraCode, vo.getCameraCode());
+//        BaseCameraManagement one = baseCameraManagementService.getOne(lw);
+//        if (ObjectUtils.isEmpty(one)) {
+//            throw new BaseException("相机编号【" + vo.getCameraCode() + "】不存在");
+//        }
+//        String path = CameraUtil.historyPlayListStr(one.getChannel(), vo.getStartTime(), vo.getEntTime());
+//        if (org.apache.commons.lang3.StringUtils.isBlank(path)) {
+//            throw new BaseException("当前相机无视频录像");
+//        }
+//        return new AjaxResult(200, "ok", serverConfig.getUrl() + path);
+////        return success(CameraUtil.historyPlayList(one.getChannel(), vo.getStartTime(), vo.getEntTime()));
+//    }
 
     @ApiOperation("视频服务设备数量")
     @GetMapping("/totalNumberOfDevices")

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

@@ -223,6 +223,12 @@ public class GeoHazardMonitorTokenController {
                 lw.eq(MsgAlarm::getAlarmId, reqMsgAlarmVo.getAlarmId());
             }
             MsgAlarm alarm = msgAlarmService.getOne(lw);
+            if (ObjectUtils.isEmpty(alarm)){
+                jsonObject.put("resultCode", 0);
+                jsonObject.put("message", "失败");
+                jsonObject.put("data", "没有该报警唯一标识的报警信息");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+            }
             log.info("alarm:{}", alarm);
             BaseUser admin = baseUserService.getUserName("admin");
             MsgAlarmFrequency msgAlarmVice = new MsgAlarmFrequency();
@@ -395,6 +401,12 @@ public class GeoHazardMonitorTokenController {
             LambdaQueryWrapper<BaseTerminal> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(BaseTerminal::getTerminalCode, vehiclePosition.getTerminalCode());
             BaseTerminal baseTerminal = baseTerminalService.getOne(wrapper);
+            if (ObjectUtils.isEmpty(baseTerminal)){
+                jsonObject.put("resultCode", 0);
+                jsonObject.put("message", "失败");
+                jsonObject.put("data", "关联表中没有改终端编码的信息");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+            }
             vehiclePosition.setTravelMile(heartbeatVo.getCurrentMile());
             vehiclePosition.setVehicleCode(baseTerminal.getVehicleCode());
             vehiclePosition.setTerminalLatitude(heartbeatVo.getLatitude());
@@ -411,8 +423,8 @@ public class GeoHazardMonitorTokenController {
             //目视距离和里程位置
             if (save && update) {
                 LambdaQueryWrapper<MsgAlarm> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.le(MsgAlarm::getAlarmMile, heartbeatVo.getCurrentMile());
-                queryWrapper.ge(MsgAlarm::getAlarmMile, (heartbeatVo.getCurrentMile() + 10000));
+                queryWrapper.ge(MsgAlarm::getAlarmMile, heartbeatVo.getCurrentMile());
+                queryWrapper.le(MsgAlarm::getAlarmMile, (heartbeatVo.getCurrentMile() + 10000));
                 queryWrapper.eq(MsgAlarm::getLineDir, heartbeatVo.getLineDir());
                 queryWrapper.orderByAsc(MsgAlarm::getAlarmMile);
                 List<MsgAlarm> list = msgAlarmService.list(queryWrapper);
@@ -438,12 +450,19 @@ public class GeoHazardMonitorTokenController {
                         alarmInfoVo.setAlarmId(list.get(0).getAlarmId());
                         alarmInfoVo.setAlarmMile(list.get(0).getAlarmMile());
                         alarmInfoVo.setAlarmTime(list.get(0).getAlarmTime().getTime());
+                        alarmInfoVo.setAlarmContent(list.get(0).getContent());
                         alarmInfoVo.setAlarmType(list.get(0).getAlarmType());
                         alarmInfoVo.setAlarmLevel(list.get(0).getAlarmLevel());
                         AlarmFilesVo[] files = new AlarmFilesVo[1];
                         LambdaQueryWrapper<MsgAlarmExt> ext = new LambdaQueryWrapper<>();
                         ext.eq(MsgAlarmExt::getAlarmId, list.get(0).getAlarmId());
                         MsgAlarmExt one = msgAlarmExtService.getOne(ext);
+                        if (ObjectUtils.isEmpty(one)){
+                            jsonObject.put("resultCode", 0);
+                            jsonObject.put("message", "失败");
+                            jsonObject.put("data", "没有该报警ID的关联信息");
+                            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+                        }
                         files[0] = new AlarmFilesVo();
                         files[0].setAlarmAttType(one.getAlarmAttType());
                         files[0].setAlarmAttPath(one.getAlarmAttPath());
@@ -482,6 +501,7 @@ public class GeoHazardMonitorTokenController {
                                 alarmInfoVo1.setAlarmMile(list.get(i).getAlarmMile());
                                 alarmInfoVo1.setAlarmTime(list.get(i).getAlarmTime().getTime());
                                 alarmInfoVo1.setAlarmType(list.get(i).getAlarmType());
+                                alarmInfoVo1.setAlarmContent(list.get(i).getContent());
                                 alarmInfoVo1.setAlarmLevel(list.get(i).getAlarmLevel());
                                 LambdaQueryWrapper<MsgAlarmExt> alarm = new LambdaQueryWrapper<>();
                                 alarm.eq(MsgAlarmExt::getAlarmId, list.get(0).getAlarmId());
@@ -509,10 +529,10 @@ public class GeoHazardMonitorTokenController {
                     //没有报警信息的时候
                     distance = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
                     LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
-                    base.gt(BaseCameraManagement::getInstallMiles, distance);
+                    base.gt(BaseCameraManagement::getInstallMile, distance);
                     base.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
-                    base.orderByAsc(BaseCameraManagement::getInstallMiles);
-                    wrapper.last("limit 4");
+                    base.orderByAsc(BaseCameraManagement::getInstallMile);
+                    base.last("limit 4");
                     List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
                     String flv = CameraUtil.getPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getChannel(), false);
                     for (BaseCameraManagement baseCameraManagement : list1) {
@@ -633,12 +653,24 @@ public class GeoHazardMonitorTokenController {
                 wrapper.eq(BaseCameraManagement::getLineDir, cameraVo.getLineDir());
             }
             List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
+            if (list.size()<=0){
+                jsonObject.put("resultCode", 0);
+                jsonObject.put("message", "失败");
+                jsonObject.put("data", "没有该线路编码或行别的相机信息");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+            }
             for (BaseCameraManagement baseCameraManagement : list) {
                 LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
                 if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
                     queryWrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
                 }
                 BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+                if (ObjectUtils.isEmpty(baseRailwayManagement)){
+                    jsonObject.put("resultCode", 0);
+                    jsonObject.put("message", "失败");
+                    jsonObject.put("data", "没有该线路编码的线路信息");
+                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+                }
                 baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
             }
             list.sort(new Comparator<BaseCameraManagement>() {
@@ -742,6 +774,12 @@ public class GeoHazardMonitorTokenController {
                 wrapper.eq(MsgAlarm::getLineDir, cameraVo.getLineDir());
             }
             List<MsgAlarm> list = msgAlarmService.list(wrapper);
+            if (list.size()<=0){
+                jsonObject.put("resultCode", 0);
+                jsonObject.put("message", "失败");
+                jsonObject.put("data", "没有该报警线路或行别的报警信息");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+            }
             QueryAlarmVo queryAlarmVo = new QueryAlarmVo();
             List<RespAlarmList> listVos = new ArrayList<>();
             for (MsgAlarm msgAlarm : list) {
@@ -755,6 +793,12 @@ public class GeoHazardMonitorTokenController {
                 LambdaQueryWrapper<MsgAlarmExt> alarm = new LambdaQueryWrapper<>();
                 alarm.eq(MsgAlarmExt::getAlarmId, msgAlarm.getAlarmId());
                 List<MsgAlarmExt> list1 = msgAlarmExtService.list(alarm);
+                if (list1.size()<=0){
+                    jsonObject.put("resultCode", 0);
+                    jsonObject.put("message", "失败");
+                    jsonObject.put("data", "没有该报警唯一标识的扩展信息");
+                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+                }
                 AlarmFilesVo[] vo = new AlarmFilesVo[list1.size()];
                 for (int i1 = 0; i1 < list1.size(); i1++) {
                     vo[i1] = new AlarmFilesVo();
@@ -837,7 +881,7 @@ public class GeoHazardMonitorTokenController {
                         urls = serverConfig.getUrl() + cacheObject;
                     }
                 } else {
-                    jsonObject.put("resultCode", 1);
+                    jsonObject.put("resultCode", 0);
                     jsonObject.put("message", "失败");
                     jsonObject.put("data", "没有该报警里程位置的相机");
                     return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
@@ -859,7 +903,8 @@ public class GeoHazardMonitorTokenController {
 
     public static void main(String[] args) {
         JSONObject res = new JSONObject();
-        res.put("terminalCode", "111");
+        res.put("terminalCode", "001");
+        res.put("alarmId","42010001541320001115");
         String s = SM4Utils.encryptData_ECB(JSONObject.toJSONString(res), "4370780c9a8c43e5");
         System.out.println(s);
     }

vehicle-admin/src/main/resources/application.yml

@@ -39,7 +39,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: debug
+    com.ozs: debug
     org.springframework: warn
 
 # 用户配置