From de99fe1dc566f6a896f46bc6e6f8ed908cc0ad66 Mon Sep 17 00:00:00 2001
From: XiaoLFeng <gm@x-lf.cn>
Date: Wed, 31 Jan 2024 13:14:33 +0800
Subject: [PATCH] =?UTF-8?q?fix&patch:=20=E8=A1=A5=E4=B8=81info-edit?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E4=BB=A3=E7=A0=81=E8=A7=84=E6=95=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qodana.yaml                                           | 11 +++++++++++
 .../java/com/jsl/oa/controllers/InfoController.java   |  6 +++---
 .../jsl/oa/model/voData/business/info/CarouselVO.java |  3 +++
 src/main/java/com/jsl/oa/services/InfoService.java    |  2 +-
 .../com/jsl/oa/services/impl/InfoServiceImpl.java     |  6 +++---
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/qodana.yaml b/qodana.yaml
index e43be70..f77f38d 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -29,3 +29,14 @@ include:
   - name: JavaLangImport
   - name: UNUSED_IMPORT
   - name: SamePackageImport
+  - name: CheckDependencyLicenses
+  - name: ArgNamesErrorsInspection
+  - name: ArgNamesWarningsInspection
+  - name: AssertMessageNotString
+  - name: EqualsCalledOnEnumConstant
+  - name: ListIndexOfReplaceableByContains
+  - name: ObjectsEqualsCanBeSimplified
+  - name: SizeReplaceableByIsEmpty
+  - name: ArrayCreationWithoutNewKeyword
+exclude:
+  - name: VulnerableLibrariesLocal
diff --git a/src/main/java/com/jsl/oa/controllers/InfoController.java b/src/main/java/com/jsl/oa/controllers/InfoController.java
index d393964..bca43da 100755
--- a/src/main/java/com/jsl/oa/controllers/InfoController.java
+++ b/src/main/java/com/jsl/oa/controllers/InfoController.java
@@ -37,18 +37,18 @@ public class InfoController {
     }
 
     @PutMapping("/info/header-image/edit")
-    public BaseResponse infoEditHeaderImage(@RequestBody @Validated CarouselVO carouselVO, @RequestParam Integer id, HttpServletRequest request, @NotNull BindingResult bindingResult) {
+    public BaseResponse infoEditHeaderImage(@RequestBody @Validated CarouselVO carouselVO, HttpServletRequest request, @NotNull BindingResult bindingResult) {
         log.info("请求接口[PUT]: /info/header-image/edit");
         // 参数校验
         if (bindingResult.hasErrors()) {
             log.warn("参数校验失败: {}", Processing.getValidatedErrorList(bindingResult));
             return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
         }
-        if (id == null) {
+        if (carouselVO.getId() == null) {
             log.warn("参数校验失败: {}", "id不能为空");
             return ResultUtil.error(ErrorCode.PARAMETER_ERROR, "id不能为空");
         }
-        return infoService.editHeaderImage(request, carouselVO, id);
+        return infoService.editHeaderImage(request, carouselVO);
     }
 
     @DeleteMapping("/info/header-image/del")
diff --git a/src/main/java/com/jsl/oa/model/voData/business/info/CarouselVO.java b/src/main/java/com/jsl/oa/model/voData/business/info/CarouselVO.java
index ad0f9dd..abdfa1a 100644
--- a/src/main/java/com/jsl/oa/model/voData/business/info/CarouselVO.java
+++ b/src/main/java/com/jsl/oa/model/voData/business/info/CarouselVO.java
@@ -1,5 +1,6 @@
 package com.jsl.oa.model.voData.business.info;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 /**
@@ -12,7 +13,9 @@ import lombok.Data;
  * @author 筱锋xiao_lfeng
  */
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class CarouselVO {
+    private Integer id;
     private Integer displayOrder;
     private String image;
     private String title;
diff --git a/src/main/java/com/jsl/oa/services/InfoService.java b/src/main/java/com/jsl/oa/services/InfoService.java
index 83b7003..f6f6b3c 100644
--- a/src/main/java/com/jsl/oa/services/InfoService.java
+++ b/src/main/java/com/jsl/oa/services/InfoService.java
@@ -36,7 +36,7 @@ public interface InfoService {
      * @param id         轮播图ID
      * @return {@link BaseResponse}
      */
-    BaseResponse editHeaderImage(HttpServletRequest request, CarouselVO carouselVO, Integer id);
+    BaseResponse editHeaderImage(HttpServletRequest request, CarouselVO carouselVO);
 
     /**
      * <h2>获取轮播图</h2>
diff --git a/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java
index 18d7522..7d48670 100644
--- a/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java
@@ -69,7 +69,7 @@ public class InfoServiceImpl implements InfoService {
 
     @Override
     @CheckUserHasPermission("info.image.edit")
-    public BaseResponse editHeaderImage(HttpServletRequest request, CarouselVO carouselVO, Integer id) {
+    public BaseResponse editHeaderImage(HttpServletRequest request, @NotNull CarouselVO carouselVO) {
         log.info("\t> 执行 Service 层 InfoService.editHeaderImage 方法");
         // 获取用户
         Long userId = Processing.getAuthHeaderToUserId(request);
@@ -77,10 +77,10 @@ public class InfoServiceImpl implements InfoService {
         // 获取轮播图信息
         CarouselDO carouselDO = infoDAO.getCarousel();
         // 获取指定轮播图
-        if (id > carouselDO.getData().size()) {
+        if (carouselVO.getId() > carouselDO.getData().size()) {
             return ResultUtil.error(ErrorCode.ID_NOT_EXIST);
         }
-        CarouselDO.DataDO carousel = carouselDO.getData().get(id - 1);
+        CarouselDO.DataDO carousel = carouselDO.getData().get(carouselVO.getId() - 1);
         carousel.setDisplayOrder(carouselVO.getDisplayOrder())
                 .setImage(carouselVO.getImage())
                 .setDescription(carouselVO.getDescription())