模块拆分

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

@@ -72,6 +72,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -204,13 +205,13 @@ public class GeoHazardMonitorTokenController {
             return JSONObject.toJSONString(jsonObject);
         }
     }
-    
+
     /**
      * 报警信息数据传输
      */
     @PostMapping("/api/alarm")
     @Transactional
-    public String alarm(@RequestBody ParameterVo parameterVo, HttpServletRequest request) {
+    public String alarm(@RequestBody ParameterVo parameterVo, HttpServletRequest request) throws IOException {
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         log.info("token:{}", token);
         log.info("parameter:{}", parameterVo);
@@ -221,10 +222,10 @@ public class GeoHazardMonitorTokenController {
             String s = SM4Utils.decryptData_ECB(parameterVo.getParameter(), key);
             ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
             if (ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmAttr())) {
-                    jsonObject.put("resultCode", 0);
-                    jsonObject.put("message", "失败");
-                    jsonObject.put("data", "你填写的报警病害属性不符合规则!!!");
-                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
+                jsonObject.put("resultCode", 0);
+                jsonObject.put("message", "失败");
+                jsonObject.put("data", "你填写的报警病害属性不符合规则!!!");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             }
             if (!reqMsgAlarmVo.getAlarmMile().toString().matches(PATTERNS)) {
                 jsonObject.put("resultCode", 0);
@@ -342,18 +343,11 @@ public class GeoHazardMonitorTokenController {
                 msgAlarmVice.setRailwayCode(reqMsgAlarmVo.getAlarmRailway());
                 msgAlarmVice.setAlarmTime(new Date(reqMsgAlarmVo.getAlarmTime()));
                 msgAlarmFrequencyService.save(msgAlarmVice);
-                try {
-                    log.info("alarmJSON ：{}", JSON.toJSONString(msgAlarm));
-                    String result = HttpClientUtil.postJson(sdkUrl, JSON.toJSONString(msgAlarm));
-                    log.info("result：{}", result);
-                } catch (Exception e) {
-                    log.info(e.getMessage());
-                    e.printStackTrace();
-                    jsonObject.put("resultCode", 0);
-                    jsonObject.put("message", "失败");
-                    jsonObject.put("data", "消息推送失败");
-                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
-                }
+
+                log.info("alarmJSON ：{}", JSON.toJSONString(msgAlarm));
+                String result = HttpClientUtil.postJson(sdkUrl, JSON.toJSONString(msgAlarm));
+                log.info("result：{}", result);
+
                 List<String> collect = baseCameraManagementList.stream().map(BaseCameraManagement::getCameraCode).collect(Collectors.toList());
 //                CompletableFuture.runAsync(() ->cameraUtil.playbackURLs(collect));
             } else {
@@ -584,13 +578,13 @@ public class GeoHazardMonitorTokenController {
                     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                     String currentFormattedDateTime = currentDateTime.format(formatter);
                     String previousFormattedDateTime = previousDateTime.format(formatter);
-                    
+
                     LambdaQueryWrapper<TerminalIgnoreAlarm> queryWrapper1 = new LambdaQueryWrapper<>();
                     List<String> collect = alarmsList.stream().map(MsgAlarm::getAlarmId).collect(Collectors.toList());
                     queryWrapper1.in(TerminalIgnoreAlarm::getAlarmId, collect);
                     queryWrapper1.eq(TerminalIgnoreAlarm::getTerminalCode, heartbeatVo.getTerminalCode());
-                    queryWrapper1.ge(TerminalIgnoreAlarm::getIgnoreTime,previousFormattedDateTime);
-                    queryWrapper1.le(TerminalIgnoreAlarm::getIgnoreTime,currentFormattedDateTime);
+                    queryWrapper1.ge(TerminalIgnoreAlarm::getIgnoreTime, previousFormattedDateTime);
+                    queryWrapper1.le(TerminalIgnoreAlarm::getIgnoreTime, currentFormattedDateTime);
                     List<TerminalIgnoreAlarm> list2 = terminalIgnoreAlarmService.list(queryWrapper1);
                     //找出未忽略的报警信息
                     LambdaQueryWrapper<MsgAlarm> queryWrapper2 = new LambdaQueryWrapper<>();
@@ -601,7 +595,7 @@ public class GeoHazardMonitorTokenController {
                                 .collect(Collectors.toList());
                         if (!ObjectUtils.isEmpty(list)) {
                             queryWrapper2.in(MsgAlarm::getAlarmId, list);
-                        }else {
+                        } else {
                             queryWrapper2.eq(MsgAlarm::getAlarmId, "1111111111111");
                         }
                     } else {