gao.qiang пре 2 година
родитељ
комит
bc37d277b8

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

@@ -976,20 +976,16 @@ 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();
-                    vo[i1].setAlarmAttType(list1.get(i1).getAlarmAttType());
-                    vo[i1].setAlarmAttPath(list1.get(i1).getAlarmAttPath());
+                if (list1.size() > 0) {
+                    AlarmFilesVo[] vo = new AlarmFilesVo[list1.size()];
+                    for (int i1 = 0; i1 < list1.size(); i1++) {
+                        vo[i1] = new AlarmFilesVo();
+                        vo[i1].setAlarmAttType(list1.get(i1).getAlarmAttType());
+                        vo[i1].setAlarmAttPath(list1.get(i1).getAlarmAttPath());
+                    }
+                    //返回结果
+                    alarmInfoVo1.setAlarmFiles(vo);
                 }
-                //返回结果
-                alarmInfoVo1.setAlarmFiles(vo);
                 alarmListVo.setAlarmInfo(alarmInfoVo1);
                 listVos.add(alarmListVo);
             }