From 373922bbbf87889ab920230f38606604de175c2d Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Wed, 19 Feb 2025 14:36:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=B7=BB=E5=8A=A0=E4=B8=A4?= =?UTF-8?q?=E4=B8=AA=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/mobile/AppScenicController.java | 12 ++++++++++-- .../ycwl/basic/exception/CustomExceptionHandle.java | 9 +-------- .../model/pc/template/entity/TemplateEntity.java | 1 + .../basic/model/pc/template/resp/TemplateRespVO.java | 1 + .../basic/service/impl/pc/TemplateServiceImpl.java | 6 +++--- src/main/resources/mapper/TemplateMapper.xml | 8 +++++--- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java index 965243d..5590392 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java @@ -19,6 +19,8 @@ import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.JwtTokenUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -28,6 +30,7 @@ import java.util.List; * @Author：longbinbin * @Date：2024/12/5 10:22 */ +@Slf4j @RestController @RequestMapping("/api/mobile/scenic/v1") @Api(tags = "景区相关接口") @@ -71,9 +74,14 @@ public class AppScenicController { @ApiOperation("景区视频源素材列表") @GetMapping("/face/{faceId}/contentList") - public ApiResponse> contentList(@PathVariable Long faceId) { + public ApiResponse> contentList(@PathVariable String faceId) { + if (!StringUtils.isNumeric(faceId)) { + log.error("请求异常, faceId: [{}]",faceId); + return ApiResponse.fail("请求异常"); + } + Long id = Long.parseLong(faceId); JwtInfo worker = JwtTokenUtil.getWorker(); - List contentPageVOS = appScenicService.faceContentList(worker.getUserId(), faceId); + List contentPageVOS = appScenicService.faceContentList(worker.getUserId(), id); return ApiResponse.success(contentPageVOS); } diff --git a/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java b/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java index 37f9720..024ba82 100644 --- a/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java +++ b/src/main/java/com/ycwl/basic/exception/CustomExceptionHandle.java @@ -72,15 +72,8 @@ public class CustomExceptionHandle { */ @ExceptionHandler(value = Exception.class) public ApiResponse handle(Exception e) { - LOGGER.error("系统异常 -> {}", e.getMessage(), e); String requestText = getRequestAsText(); - new Thread(() -> NotifyFactory.via().sendTo( - new NotifyContent( - "帧途后台报错了！", - e.getMessage() + "\n---\n请求主体：\n```\n" + requestText + "\n```\n---\n错误栈：\n```\n" + getStackTrace(e) + "\n```" - ), - "default_user" - )).start(); + LOGGER.error("系统异常 -> {}\n{}", e.getMessage(), requestText, e); return ApiResponse.buildResult(BizCodeEnum.SERVER_UNKONWN_ERROR); } diff --git a/src/main/java/com/ycwl/basic/model/pc/template/entity/TemplateEntity.java b/src/main/java/com/ycwl/basic/model/pc/template/entity/TemplateEntity.java index 335bbae..bbe1780 100644 --- a/src/main/java/com/ycwl/basic/model/pc/template/entity/TemplateEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/template/entity/TemplateEntity.java @@ -76,5 +76,6 @@ public class TemplateEntity { private Integer sort; private Integer cropEnable; private String onlyIf; + private String resolution; private List children; } diff --git a/src/main/java/com/ycwl/basic/model/pc/template/resp/TemplateRespVO.java b/src/main/java/com/ycwl/basic/model/pc/template/resp/TemplateRespVO.java index a05b411..48afaf9 100644 --- a/src/main/java/com/ycwl/basic/model/pc/template/resp/TemplateRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/template/resp/TemplateRespVO.java @@ -86,6 +86,7 @@ public class TemplateRespVO { private BigDecimal price; private BigDecimal slashPrice; private Integer sort; + private String resolution; private Integer cropEnable; private String onlyIf; private List children; diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/TemplateServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/TemplateServiceImpl.java index b3baae2..e2615e7 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/TemplateServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/TemplateServiceImpl.java @@ -70,9 +70,9 @@ public class TemplateServiceImpl implements TemplateService { @Override public ApiResponse deleteById(Long id) { int i = templateMapper.deleteById(id); + templateRepository.clearTemplateCache(id); if (i > 0) { templateMapper.deleteByPid(id); - templateRepository.clearTemplateCache(id); return ApiResponse.success(i); }else { return ApiResponse.fail("删除模版失败"); @@ -92,8 +92,8 @@ public class TemplateServiceImpl implements TemplateService { item.setStatus(1); templateMapper.add(item); }); - templateRepository.clearTemplateCache(template.getId()); } + templateRepository.clearTemplateCache(template.getId()); if (i > 0) { return ApiResponse.success(true); }else { @@ -120,7 +120,7 @@ public class TemplateServiceImpl implements TemplateService { @Override public void saveConfig(Long configId, TemplateConfigEntity config) { config.setId(configId); - templateRepository.clearTemplateCache(config.getTemplateId()); templateMapper.updateConfigById(config); + templateRepository.clearTemplateCache(config.getTemplateId()); } } diff --git a/src/main/resources/mapper/TemplateMapper.xml b/src/main/resources/mapper/TemplateMapper.xml index 5046f8a..407c481 100644 --- a/src/main/resources/mapper/TemplateMapper.xml +++ b/src/main/resources/mapper/TemplateMapper.xml @@ -2,8 +2,8 @@ - insert into template(id, scenic_id, `name`, pid, is_placeholder, source_url, luts, overlays, audios, cover_url, frame_rate, speed, price, slash_price, crop_enable, only_if) - values (#{id}, #{scenicId}, #{name}, #{pid}, #{isPlaceholder}, #{sourceUrl}, #{luts}, #{overlays}, #{audios}, #{coverUrl}, #{frameRate}, #{speed}, #{price}, #{slashPrice}, #{cropEnable}, #{onlyIf}) + insert into template(id, scenic_id, `name`, pid, is_placeholder, source_url, luts, overlays, audios, cover_url, frame_rate, speed, price, slash_price, crop_enable, only_if, resolution, create_time) + values (#{id}, #{scenicId}, #{name}, #{pid}, #{isPlaceholder}, #{sourceUrl}, #{luts}, #{overlays}, #{audios}, #{coverUrl}, #{frameRate}, #{speed}, #{price}, #{slashPrice}, #{cropEnable}, #{onlyIf}, #{resolution}, now()) insert into template_config(id, template_id, create_time) @@ -12,6 +12,7 @@ update template + update_time = now(), `name` = #{name}, `scenic_id` = #{scenicId}, pid = #{pid}, @@ -28,8 +29,9 @@ sort = #{sort}, crop_enable = #{cropEnable}, only_if = #{onlyIf}, + resolution = #{resolution}, - where id = #{id} + where id = #{id} update template