Explorar el Código

修复sonarqube扫描bug

lyq hace 1 año
padre
commit
cefb7b34c0

+ 1 - 0
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/CentereventTEventcatalogueController.java

@@ -230,6 +230,7 @@ public class CentereventTEventcatalogueController extends BaseController {
                 future.get();
             } catch (InterruptedException e) {
                 logger.error(e.getMessage());
+                Thread.currentThread().interrupt();
             } catch (ExecutionException e) {
                 logger.error(e.getMessage());
             }

+ 3 - 6
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/FireIncidentController.java

@@ -86,14 +86,11 @@ public class FireIncidentController {
      */
     @PostMapping("/updateFireEventImage")
     public AjaxResult updateFireEventImage(@RequestBody DaHuaEventBO eventBO) throws ClientException {
-        CentereventTReportmessage centereventTReportmessage = null;
-        if (StringUtils.isNotBlank(eventBO.getEventCode()) && StringUtils.isNotBlank(eventBO.getLogId())) {
-            // 通过eventCode获取报文信息
-            centereventTReportmessage = centereventTReportmessageService.selectCentereventTReportmessageById(eventBO.getEventCode());
-        }
-        if (StringUtils.isNull(centereventTReportmessage)) {
+        if (StringUtils.isBlank(eventBO.getEventCode()) || StringUtils.isBlank(eventBO.getLogId())) {
             return AjaxResult.success("参数异常");
         }
+        // 通过eventCode获取报文信息
+        CentereventTReportmessage centereventTReportmessage = centereventTReportmessageService.selectCentereventTReportmessageById(eventBO.getEventCode());
         // 解析报文
         JSONObject context = JSONObject.parseObject(centereventTReportmessage.getContext()).getJSONObject("info");
         eventBO.setAlarmCode(context.getString("alarmCode"));

+ 3 - 0
src/main/java/com/sooka/sponest/event/utils/RemoteApiUtil.java

@@ -152,6 +152,7 @@ public class RemoteApiUtil {
                 future.get();
             } catch (InterruptedException e) {
                 logger.error(e.getMessage());
+                Thread.currentThread().interrupt();
             } catch (ExecutionException e) {
                 logger.error(e.getMessage());
             }
@@ -178,6 +179,7 @@ public class RemoteApiUtil {
                 future.get();
             } catch (InterruptedException e) {
                 logger.error(e.getMessage());
+                Thread.currentThread().interrupt();
             } catch (ExecutionException e) {
                 logger.error(e.getMessage());
             }
@@ -231,6 +233,7 @@ public class RemoteApiUtil {
                 future.get();
             } catch (InterruptedException e) {
                 logger.error(e.getMessage());
+                Thread.currentThread().interrupt();
             } catch (ExecutionException e) {
                 logger.error(e.getMessage());
             }