文件上传https

src/main/java/com/cultural/heritage/controller/other/BannerController.java

@@ -25,7 +25,10 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -121,9 +124,7 @@ public class BannerController {
         if (bannerQueryRequest == null) throw new BusinessException(ErrorCode.PARAMS_ERROR);
         long current = bannerQueryRequest.getCurrent();
         long pageSize = bannerQueryRequest.getPageSize();
-        String type = bannerQueryRequest.getType();
+        QueryWrapper<Banner> queryWrapper = bannerService.getQueryWrapper(bannerQueryRequest);
-        QueryWrapper<Banner> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(type), "type", type);
         Page<Banner> page = bannerService.page(new Page<>(current, pageSize),queryWrapper);
         List<Banner> bannerList = page.getRecords();
         List<BannerVO> bannerVOList = commonService.convertList(bannerList, BannerVO.class);
@@ -138,6 +139,28 @@ public class BannerController {
 
 
 
+
+    /**
+     * Web端管理员根据id查询轮播图
+     * @param commonRequest 轮播图id
+     * @return 轮播图
+     */
+    @PostMapping("/query/id")
+    @Operation(summary = "Web端管理员根据id查询轮播图", description = "参数：无，权限：管理员（boss, admin)，方法名:listBannerById")
+    @AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
+    public BaseResponse<BannerVO> listBannerById(@RequestBody CommonRequest commonRequest) {
+        if (commonRequest == null) throw new BusinessException(ErrorCode.PARAMS_ERROR);
+        Long id = commonRequest.getId();
+        Banner banner = bannerService.getById(id);
+        BannerVO bannerVO = new BannerVO();
+        BeanUtils.copyProperties(banner, bannerVO);
+        return ResultUtils.success(bannerVO);
+    }
+
+
+
+
+
     /**
      * 小程序用户根据类型查看轮播图
      * @return 轮播图列表

src/main/java/com/cultural/heritage/controller/wx/WeChatController.java

@@ -3,6 +3,7 @@ package com.cultural.heritage.controller.wx;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cultural.heritage.annotation.AuthCheck;
 import com.cultural.heritage.common.BaseResponse;
@@ -128,7 +129,8 @@ public class WeChatController {
         if (officialAccountArticleQueryRequest == null) throw new BusinessException(ErrorCode.PARAMS_ERROR);
         long current = officialAccountArticleQueryRequest.getCurrent();
         long pageSize = officialAccountArticleQueryRequest.getPageSize();
-        Page<OfficialAccountArticle> page = weChatOfficialAccountService.page(new Page<>(current, pageSize),null);
+        QueryWrapper<OfficialAccountArticle> queryWrapper = weChatOfficialAccountService.getQueryWrapper(officialAccountArticleQueryRequest);
+        Page<OfficialAccountArticle> page = weChatOfficialAccountService.page(new Page<>(current, pageSize),queryWrapper);
         List<OfficialAccountArticle> officialAccountArticleList = page.getRecords();
         List<OfficialAccountArticleVO> officialAccountArticleVOS = commonService.convertList(officialAccountArticleList, OfficialAccountArticleVO.class);
         Page<OfficialAccountArticleVO> voPage = new Page<>();
@@ -159,7 +161,22 @@ public class WeChatController {
 
 
 
-
+    /**
+     * Web端管理员根据id查询文章
+     * @param commonRequest 文章id
+     * @return 文章
+     */
+    @PostMapping("/query/id")
+    @Operation(summary = "Web端管理员根据id查询文章", description = "参数：文章id，权限：管理员（boss, admin)，方法名:listArticleById")
+    @AuthCheck(mustRole = UserConstant.ADMIN_ROLE)
+    public BaseResponse<OfficialAccountArticleVO> listArticleById(@RequestBody CommonRequest commonRequest) {
+        if (commonRequest == null) throw new BusinessException(ErrorCode.PARAMS_ERROR);
+        Long id = commonRequest.getId();
+        OfficialAccountArticle officialAccountArticle = weChatOfficialAccountService.getById(id);
+        OfficialAccountArticleVO officialAccountArticleVO = new OfficialAccountArticleVO();
+        BeanUtils.copyProperties(officialAccountArticle, officialAccountArticleVO);
+        return ResultUtils.success(officialAccountArticleVO);
+    }
 
 
 

src/main/java/com/cultural/heritage/service/other/BannerService.java

@@ -1,6 +1,8 @@
 package com.cultural.heritage.service.other;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cultural.heritage.model.dto.banner.BannerQueryRequest;
 import com.cultural.heritage.model.entity.Banner;
 
 public interface BannerService extends IService<Banner> {
@@ -10,4 +12,10 @@ public interface BannerService extends IService<Banner> {
      * 校验参数
      */
     void validBanner(Banner banner, boolean update);
+
+
+    /**
+     * 获取查询条件
+     */
+    QueryWrapper<Banner> getQueryWrapper(BannerQueryRequest bannerQueryRequest);
 }

src/main/java/com/cultural/heritage/service/other/impl/BannerServiceImpl.java

@@ -1,11 +1,15 @@
 package com.cultural.heritage.service.other.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cultural.heritage.common.ErrorCode;
+import com.cultural.heritage.constant.CommonConstant;
 import com.cultural.heritage.exception.ThrowUtils;
 import com.cultural.heritage.mapper.BannerMapper;
+import com.cultural.heritage.model.dto.banner.BannerQueryRequest;
 import com.cultural.heritage.model.entity.Banner;
 import com.cultural.heritage.service.other.BannerService;
+import com.cultural.heritage.utils.SqlUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -13,7 +17,9 @@ import org.springframework.stereotype.Service;
 public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> implements BannerService {
 
 
-
+    /**
+     * 校验
+     */
     @Override
     public void validBanner(Banner banner, boolean update) {
         Long id = banner.getId();
@@ -22,4 +28,19 @@ public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> impleme
         ThrowUtils.throwIf(update && id == null, ErrorCode.OPERATION_ERROR, "id参数错误");
         ThrowUtils.throwIf(StringUtils.isAnyBlank(type, url), ErrorCode.OPERATION_ERROR, "存在参数为空");
     }
+
+
+    /**
+     * 获取查询条件
+     */
+    @Override
+    public QueryWrapper<Banner> getQueryWrapper(BannerQueryRequest bannerQueryRequest) {
+        QueryWrapper<Banner> queryWrapper = new QueryWrapper<>();
+        String type = bannerQueryRequest.getType();
+        String sortField = bannerQueryRequest.getSortField();
+        String sortOrder = bannerQueryRequest.getSortOrder();
+        queryWrapper.eq(StringUtils.isNotBlank(type), "type", type);
+        queryWrapper.orderBy(SqlUtils.validSortField(sortField), sortOrder.equals(CommonConstant.SORT_ORDER_ASC), sortField);
+        return queryWrapper;
+    }
 }

src/main/java/com/cultural/heritage/service/wx/WeChatOfficialAccountService.java

@@ -1,6 +1,8 @@
 package com.cultural.heritage.service.wx;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.cultural.heritage.model.dto.article.OfficialAccountArticleQueryRequest;
 import com.cultural.heritage.model.entity.OfficialAccountArticle;
 
 public interface WeChatOfficialAccountService extends IService<OfficialAccountArticle> {
@@ -9,4 +11,10 @@ public interface WeChatOfficialAccountService extends IService<OfficialAccountAr
      * 校验
      */
     void validArticle(OfficialAccountArticle officialAccountArticle, boolean update);
+
+
+    /**
+     * 获取查询条件
+     */
+    QueryWrapper<OfficialAccountArticle> getQueryWrapper(OfficialAccountArticleQueryRequest officialAccountArticleQueryRequest);
 }

src/main/java/com/cultural/heritage/service/wx/impl/WeChatOfficialAccountServiceImpl.java

@@ -1,11 +1,16 @@
 package com.cultural.heritage.service.wx.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cultural.heritage.common.ErrorCode;
+import com.cultural.heritage.constant.CommonConstant;
+import com.cultural.heritage.exception.BusinessException;
 import com.cultural.heritage.exception.ThrowUtils;
 import com.cultural.heritage.mapper.OfficialAccountArticleMapper;
+import com.cultural.heritage.model.dto.article.OfficialAccountArticleQueryRequest;
 import com.cultural.heritage.model.entity.OfficialAccountArticle;
 import com.cultural.heritage.service.wx.WeChatOfficialAccountService;
+import com.cultural.heritage.utils.SqlUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -25,11 +30,19 @@ public class WeChatOfficialAccountServiceImpl extends ServiceImpl<OfficialAccoun
         String image = officialAccountArticle.getImage();
 
         ThrowUtils.throwIf(update && id == null, ErrorCode.OPERATION_ERROR, "id参数错误");
-
         if (StringUtils.isAnyBlank(title, publishTime, url, image)) {
-
+            throw new BusinessException(ErrorCode.PARAMS_ERROR, "存在参数为空");
         }
 
 
     }
+
+    @Override
+    public QueryWrapper<OfficialAccountArticle> getQueryWrapper(OfficialAccountArticleQueryRequest officialAccountArticleQueryRequest) {
+        QueryWrapper<OfficialAccountArticle> queryWrapper = new QueryWrapper<>();
+        String sortField = officialAccountArticleQueryRequest.getSortField();
+        String sortOrder = officialAccountArticleQueryRequest.getSortOrder();
+        queryWrapper.orderBy(SqlUtils.validSortField(sortField), sortOrder.equals(CommonConstant.SORT_ORDER_ASC), sortField);
+        return queryWrapper;
+    }
 }

src/main/resources/application.yml

@@ -75,11 +75,11 @@ springdoc:
 
 
 server:
-  port: 8888
+  port: 9092
-  ssl:
+#  ssl:
-    key-store: classpath:carboner.cn.jks
+#    key-store: classpath:carboner.cn.jks
-    key-store-password: 6gsn1hke4m4f7
+#    key-store-password: 6gsn1hke4m4f7
-    key-store-type: JKS
+#    key-store-type: JKS
 
   servlet:
     context-path: /api