日志输出修改、垫片配置保存垫片路径

wanghongbo
Commit 2ebc60b2d135bab58c879e94054453577a6f5048 2ebc60b2 1 parent b561c775
Showing 2 changed files with 7 additions and 6 deletions
src/main/java/com/wondertek/service/impl/BackupMaterialServiceImpl.java
src/main/java/com/wondertek/service/impl/RoomOperationServiceImpl.java
--- a/src/main/java/com/wondertek/service/impl/BackupMaterialServiceImpl.java
View file @2ebc60b
+++ b/src/main/java/com/wondertek/service/impl/BackupMaterialServiceImpl.java
View file @2ebc60b
@@ -123,6 +123,7 @@ public class BackupMaterialServiceImpl extends ServiceImpl<BackupMaterialMapper,
         backupConfig.setBackupId(backupMaterial.getId());
         backupConfig.setBackupOrder(backupUploadVo.getBackupOrder());
         backupConfig.setBackupStatus(backupUploadVo.getBackupStatus());
+        backupConfig.setBackupPath(relativePath);
         backupConfigMapper.insertOrUpdate(backupConfig);
         //对应垫片任务切源（转码平台演示环境已挂载统一存储）,请求转码平台修改垫片任务直播源
--- a/src/main/java/com/wondertek/service/impl/RoomOperationServiceImpl.java
View file @2ebc60b
+++ b/src/main/java/com/wondertek/service/impl/RoomOperationServiceImpl.java
View file @2ebc60b
@@ -140,22 +140,22 @@ public class RoomOperationServiceImpl implements RoomOperationSerivice {
                         .header("Content-Type", "application/json")
                         .body(JSONUtils.obj2json(paramsMap)).timeout(30000).execute();
                 if (execute.isOk()) {
-                    log.info("-->请求转码系统屏蔽接口,url:{},paramsMap:{}",blockStatusUrl,paramsMap);
+                    log.info("-->请求转码系统屏蔽/恢复接口,url:{},paramsMap:{}",blockStatusUrl,paramsMap);
                     String body = execute.body();
                     ResponseData response = JSONUtils.jsonToObject(body, new TypeReference<ResponseData>() {
                     });
                     if (response.getResultCode().equals("0")) {
-                        log.info("请求转码系统屏蔽接口成功");
+                        log.info("请求转码系统屏蔽/恢复接口成功");
                     }else {
-                        log.info("请求转码系统屏蔽接口响应失败,response:{}",response);
+                        log.info("请求转码系统屏蔽/恢复接口响应失败,response:{}",response);
                         throw new BusinessException("block_status_error", "屏蔽状态错误");
                     }
                 } else {
-                    log.error("请求转码系统屏蔽接口失败,url:{},body:{}", blockStatusUrl, execute.body());
+                    log.error("请求转码系统屏蔽/恢复接口失败,url:{},body:{}", blockStatusUrl, execute.body());
                     throw new BusinessException("block_status_error", "屏蔽状态错误");
                 }
             } catch (Exception e) {
-                log.error("请求转码系统屏蔽接口失败,url:{}", blockStatusUrl, e);
+                log.error("请求转码系统屏蔽/恢复接口失败,url:{}", blockStatusUrl, e);
                 throw new BusinessException("block_status_error", "屏蔽状态错误");
             }
         });
@@ -165,7 +165,7 @@ public class RoomOperationServiceImpl implements RoomOperationSerivice {
         monitorMark.setRoomId(blockParam.getRoomId());
         monitorMark.setCreatedTime(LocalDateTime.now());
         monitorMark.setCreatedBy("admin");
-        monitorMark.setOperationType(blockParam.getBlockStatus().equals("0") ? RoomOperationEnum.RECOVER.getCode() : RoomOperationEnum.BLOCK.getCode());
+        monitorMark.setOperationType(blockParam.getBlockStatus()==0 ? RoomOperationEnum.RECOVER.getCode() : RoomOperationEnum.BLOCK.getCode());
         monitorMark.setOperationTime(LocalDateTime.now());
         monitorMarkMapper.insert(monitorMark);