北向接口删除 branchId参数

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/ProtectionController.java

@@ -37,7 +37,7 @@ public class ProtectionController {
     @PostMapping({"/api/data/defenceareaList"})
     public ReceiveErrorDto defenceareaList(String msgId, @RequestBody DataPageDto<DefenceAreaDto> request) {
         rabbitMsgIdService.sendMsgId(msgId, "/data/defenceareaList", "报警主机子系统及防区信息同步");
-        LogUtils.BASE_INFO_DEFENCEAREA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "报警主机子系统及防区信息同步:/api/data/defenceareaList", msgId, JSONArray.toJSONString(request));
+        LogUtils.BASE_INFO_DEFENCEAREA.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "报警主机子系统及防区信息同步:/api/data/defenceareaList", msgId, JSONArray.toJSONString(request));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
         try {
             try {
@@ -46,11 +46,11 @@ public class ProtectionController {
                 e.printStackTrace();
                 LogUtils.BASE_INFO_DEFENCEAREA.error("保存失败，{}", e);
             }
-            LogUtils.BASE_INFO_DEFENCEAREA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "报警主机子系统及防区信息同步:/api/data/defenceareaList", msgId, JSON.toJSONString(errorDto));
+            LogUtils.BASE_INFO_DEFENCEAREA.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "报警主机子系统及防区信息同步:/api/data/defenceareaList", msgId, JSON.toJSONString(errorDto));
             return errorDto;
         } catch (Exception e) {
             e.printStackTrace();
-            LogUtils.BASE_INFO_DEFENCEAREA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【异常原因：{}】", "报警主机子系统及防区信息同步:/api/data/defenceareaList", msgId, e.getMessage());
+            LogUtils.BASE_INFO_DEFENCEAREA.info("【北向接口-{}】【msgId:{}】【异常原因：{}】", "报警主机子系统及防区信息同步:/api/data/defenceareaList", msgId, e.getMessage());
             return ReceiveErrorDto.error("数据处理异常");
         }
     }
@@ -67,7 +67,7 @@ public class ProtectionController {
     @PostMapping({"/api/status/defencearea"})
     ReceiveErrorDto info(String msgId, @RequestBody ProtectionEditDto protectionEditDto) {
         rabbitMsgIdService.sendMsgId(msgId, "/status/defencearea", "布撤防数据");
-        LogUtils.STATUS_INFO_DEFENCEAREA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "接收布防数据:/api/status/defencearea", msgId, JSON.toJSONString(protectionEditDto));
+        LogUtils.STATUS_INFO_DEFENCEAREA.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "接收布防数据:/api/status/defencearea", msgId, JSON.toJSONString(protectionEditDto));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
         try {
             errorDto = this.protectionService.saveData(protectionEditDto, msgId);
@@ -75,7 +75,7 @@ public class ProtectionController {
             e.printStackTrace();
             LogUtils.STATUS_INFO_DEFENCEAREA.error("保存错误，{}", e);
         }
-        LogUtils.STATUS_INFO_DEFENCEAREA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "接收布防数据:/api/status/defencearea", msgId, JSON.toJSONString(errorDto));
+        LogUtils.STATUS_INFO_DEFENCEAREA.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "接收布防数据:/api/status/defencearea", msgId, JSON.toJSONString(errorDto));
         return errorDto;
     }
 
@@ -83,12 +83,12 @@ public class ProtectionController {
     @PostMapping({"/api/status/sensor"})
     public ReceiveErrorDto sensor(String msgId, @RequestBody SensorDataDto request) {
         rabbitMsgIdService.sendMsgId(msgId, "/status/sensor", "接收防区传感器报警信息");
-        LogUtils.STATUS_INFO_STATUS_SENSOR.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "接收防区传感器报警信息:/api/status/sensor", msgId, JSON.toJSONString(request));
+        LogUtils.STATUS_INFO_STATUS_SENSOR.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "接收防区传感器报警信息:/api/status/sensor", msgId, JSON.toJSONString(request));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
         try {
             errorDto = this.defenceAreService.saveData(msgId, request);
         } catch (Exception e) {
-            LogUtils.STATUS_INFO_DEFENCEAREA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "接收防区传感器报警信息:/api/status/sensor", msgId, JSON.toJSONString(errorDto));
+            LogUtils.STATUS_INFO_DEFENCEAREA.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "接收防区传感器报警信息:/api/status/sensor", msgId, JSON.toJSONString(errorDto));
             throw new RuntimeException(e);
         }
         return errorDto;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/VideoDataController.java

@@ -44,7 +44,7 @@ public class VideoDataController {
     public ReceiveErrorDto complete( String msgId, @RequestBody VideoIntegrityCheckDto videoIntegrityCheckDto) {
         rabbitMsgIdService.sendMsgId(msgId,"/video/complete","录像完整性检查");
 
-        LogUtils.STATUS_INFO_VIDEO_COMPLETE.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "录像完整性检查:/api/video/complete", msgId, JSONArray.toJSONString(videoIntegrityCheckDto));
+        LogUtils.STATUS_INFO_VIDEO_COMPLETE.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "录像完整性检查:/api/video/complete", msgId, JSONArray.toJSONString(videoIntegrityCheckDto));
         ReceiveErrorDto result = ReceiveErrorDto.success();
         try{
             result = this.videoIntegrityCheckService.saveData(videoIntegrityCheckDto, msgId);
@@ -52,7 +52,7 @@ public class VideoDataController {
             e.printStackTrace();
             LogUtils.STATUS_INFO_VIDEO_COMPLETE.error("保存失败，{}",e);
         }
-        LogUtils.STATUS_INFO_VIDEO_COMPLETE.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "录像完整性检查:/api/video/complete", msgId, JSONArray.toJSONString(result));
+        LogUtils.STATUS_INFO_VIDEO_COMPLETE.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "录像完整性检查:/api/video/complete", msgId, JSONArray.toJSONString(result));
         return result;
     }
 
@@ -68,7 +68,7 @@ public class VideoDataController {
     @PostMapping({"/api/video/daysInfo"})
     public ReceiveErrorDto daysInfo( String msgId, @RequestBody VideoDaysCheckDto videoDaysCheckDto) {
         rabbitMsgIdService.sendMsgId(msgId,"/video/daysInfo","录像机天数检查");
-        LogUtils.STATUS_INFO_VIDEO_DAYS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "录像机天数检查:/api/video/daysInfo", msgId, JSONArray.toJSONString(videoDaysCheckDto));
+        LogUtils.STATUS_INFO_VIDEO_DAYS.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "录像机天数检查:/api/video/daysInfo", msgId, JSONArray.toJSONString(videoDaysCheckDto));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
         try {
             errorDto = this.videoDaysCheckService.saveData(videoDaysCheckDto, msgId);
@@ -76,7 +76,7 @@ public class VideoDataController {
             e.printStackTrace();
             LogUtils.STATUS_INFO_VIDEO_DAYS.error("保存失败，{}",e);
         }
-        LogUtils.STATUS_INFO_VIDEO_DAYS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "录像机天数检查:/api/video/daysInfo", msgId, JSONArray.toJSONString(errorDto));
+        LogUtils.STATUS_INFO_VIDEO_DAYS.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "录像机天数检查:/api/video/daysInfo", msgId, JSONArray.toJSONString(errorDto));
         return errorDto;
     }
 
@@ -85,11 +85,11 @@ public class VideoDataController {
     @PostMapping({"/api/video/diagnosis"})
     public ReceiveErrorDto plan( String msgId, @RequestBody VideoDiagnosisDto videoDiagnosisDto) {
         rabbitMsgIdService.sendMsgId(msgId,"/video/diagnosis","视频质量诊断结果");
-        LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "视频质量诊断结果:/api/video/diagnosis", msgId, JSONArray.toJSONString(videoDiagnosisDto));
+        LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "视频质量诊断结果:/api/video/diagnosis", msgId, JSONArray.toJSONString(videoDiagnosisDto));
         ReceiveErrorDto result = ReceiveErrorDto.success();
         if (ObjectUtil.isEmpty(videoDiagnosisDto.getOrganizationGuid())) {
             result = ReceiveErrorDto.error("organizationGuid  为空");
-            LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "视频质量诊断结果:/api/video/diagnosis", msgId, JSONArray.toJSONString(result));
+            LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "视频质量诊断结果:/api/video/diagnosis", msgId, JSONArray.toJSONString(result));
             return result;
         }
         try{
@@ -98,7 +98,7 @@ public class VideoDataController {
             e.printStackTrace();
             LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.error("保存失败，{}",e);
         }
-        LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "视频质量诊断结果:/api/video/diagnosis", msgId, JSONArray.toJSONString(result));
+        LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "视频质量诊断结果:/api/video/diagnosis", msgId, JSONArray.toJSONString(result));
         return result;
     }
 
@@ -116,7 +116,7 @@ public class VideoDataController {
     @PostMapping({"/api/status/disks"})
     ReceiveErrorDto disks( String msgId, @RequestBody VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto) {
         rabbitMsgIdService.sendMsgId(msgId, "/status/disks", "录像机硬盘检测");
-        LogUtils.STATUS_INFO_DISKS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "录像机硬盘检测:/api/status/disks", msgId, JSON.toJSONString(videoRecorderHardDiskDetectionEditDto));
+        LogUtils.STATUS_INFO_DISKS.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "录像机硬盘检测:/api/status/disks", msgId, JSON.toJSONString(videoRecorderHardDiskDetectionEditDto));
         ReceiveErrorDto result = ReceiveErrorDto.success();
         try {
             result = this.videoRecorderHardDiskDetectionService.saveData(videoRecorderHardDiskDetectionEditDto, msgId);
@@ -124,7 +124,7 @@ public class VideoDataController {
             e.printStackTrace();
             LogUtils.STATUS_INFO_DISKS.error("保存失败，{}", e);
         }
-        LogUtils.STATUS_INFO_DISKS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "录像机硬盘检测:/api/status/disks", msgId, JSON.toJSONString(result));
+        LogUtils.STATUS_INFO_DISKS.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "录像机硬盘检测:/api/status/disks", msgId, JSON.toJSONString(result));
         return result;
     }
 
@@ -142,7 +142,7 @@ public class VideoDataController {
     @PostMapping({"/api/data/dvrDiskList"})
     ReceiveErrorDto disksList( String msgId, @RequestBody DataPageDto<DvrDiskPageDto> dataPageDto) {
         rabbitMsgIdService.sendMsgId(msgId, "/api/data/dvrDiskList", "DVR硬盘空间信息同步");
-        LogUtils.BASE_INFO_DVR_DISK.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "DVR硬盘空间信息同步:/api/data/dvrDiskList", msgId, JSON.toJSONString(dataPageDto));
+        LogUtils.BASE_INFO_DVR_DISK.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "DVR硬盘空间信息同步:/api/data/dvrDiskList", msgId, JSON.toJSONString(dataPageDto));
         ReceiveErrorDto result = ReceiveErrorDto.success();
         try {
             result = this.dvrDiskService.saveData(dataPageDto, msgId);
@@ -150,7 +150,7 @@ public class VideoDataController {
             e.printStackTrace();
             LogUtils.BASE_INFO_DVR_DISK.error("保存失败，{}", e);
         }
-        LogUtils.BASE_INFO_DVR_DISK.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "DVR硬盘空间信息同步:/api/data/dvrDiskList", msgId, JSON.toJSONString(result));
+        LogUtils.BASE_INFO_DVR_DISK.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "DVR硬盘空间信息同步:/api/data/dvrDiskList", msgId, JSON.toJSONString(result));
         return result;
     }
 }