mj/official-website-cloud
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修改

Browse Source
This commit is contained in:
张云杰 2025-09-12 18:21:35 +08:00
parent 15c6df8a03
commit 8da35ea571
9 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloud-admin/pom.xml
View File

@ -11,6 +11,7 @@
</parent> </parent>
<artifactId>cloud-admin</artifactId> <artifactId>cloud-admin</artifactId>
<name>website-admin</name>
<dependencies> <dependencies>
<!--<dependency>--> <!--<dependency>-->
@ -90,7 +91,7 @@
</dependencies> </dependencies>
<build> <build>
<finalName>${project.artifactId}</finalName> <finalName>${project.name}</finalName>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

9
cloud-admin/src/main/java/com/byhah/cloud/admin/mapper/AnonMapper.java
View File

@ -2,11 +2,10 @@ package com.byhah.cloud.admin.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.byhah.cloud.admin.module.anon.dto.WebsiteCaseSearchDto; import com.byhah.cloud.admin.module.anon.dto.CaseSearchDto;
import com.byhah.cloud.admin.module.anon.dto.WebsiteCommentSearchDto; import com.byhah.cloud.admin.module.anon.dto.CommentSearchDto;
import com.byhah.cloud.admin.module.anon.vo.WebsiteCaseVo; import com.byhah.cloud.admin.module.anon.vo.WebsiteCaseVo;
import com.byhah.cloud.admin.module.anon.vo.WebsiteCommentVo; import com.byhah.cloud.admin.module.anon.vo.WebsiteCommentVo;
import com.byhah.cloud.basic.core.entity.website.WebsiteComment;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
/** /**
@ -19,10 +18,10 @@ public interface AnonMapper {
/** /**
* 成功案例分页 * 成功案例分页
*/ */
IPage<WebsiteCaseVo> casePage(Page<?> page, @Param("dto") WebsiteCaseSearchDto dto); IPage<WebsiteCaseVo> casePage(Page<?> page, @Param("dto") CaseSearchDto dto);
/** /**
* 客户评价分页 * 客户评价分页
*/ */
IPage<WebsiteCommentVo> commentPage(Page<?> page, @Param("dto") WebsiteCommentSearchDto dto); IPage<WebsiteCommentVo> commentPage(Page<?> page, @Param("dto") CommentSearchDto dto);
} }

16
cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/controller/AnonWebsiteController.java
View File

@ -1,22 +1,18 @@
package com.byhah.cloud.admin.module.anon.controller; package com.byhah.cloud.admin.module.anon.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.byhah.cloud.admin.module.anon.dto.WebsiteCaseSearchDto; import com.byhah.cloud.admin.module.anon.dto.CaseSearchDto;
import com.byhah.cloud.admin.module.anon.dto.WebsiteCommentSearchDto; import com.byhah.cloud.admin.module.anon.dto.CommentSearchDto;
import com.byhah.cloud.admin.module.anon.dto.WebsiteConsultSaveDto; import com.byhah.cloud.admin.module.anon.dto.ConsultSaveDto;
import com.byhah.cloud.admin.module.anon.service.WebsiteService; import com.byhah.cloud.admin.module.anon.service.WebsiteService;
import com.byhah.cloud.admin.module.anon.vo.WebsiteCaseVo; import com.byhah.cloud.admin.module.anon.vo.WebsiteCaseVo;
import com.byhah.cloud.admin.module.anon.vo.WebsiteCommentVo; import com.byhah.cloud.admin.module.anon.vo.WebsiteCommentVo;
import com.byhah.cloud.admin.module.anon.vo.WebsiteVo; import com.byhah.cloud.admin.module.anon.vo.WebsiteVo;
import com.byhah.cloud.admin.module.website.dto.WebsiteTargetDto;
import com.byhah.deploy.basic.util.web.PageUtils; import com.byhah.deploy.basic.util.web.PageUtils;
import com.byhah.deploy.basic.validation.group.Insert;
import com.byhah.deploy.starter.web.R; import com.byhah.deploy.starter.web.R;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
/** /**
@ -40,19 +36,19 @@ public class AnonWebsiteController {
@Operation(summary = "获取成功案例分页") @Operation(summary = "获取成功案例分页")
@GetMapping("/casePage") @GetMapping("/casePage")
R<IPage<WebsiteCaseVo>> casePage(WebsiteCaseSearchDto dto) { R<IPage<WebsiteCaseVo>> casePage(@RequestParam CaseSearchDto dto) {
return R.ok(websiteService.casePage(PageUtils.toPage(), dto)); return R.ok(websiteService.casePage(PageUtils.toPage(), dto));
} }
@Operation(summary = "获取客户评价分页") @Operation(summary = "获取客户评价分页")
@GetMapping("/commentPage") @GetMapping("/commentPage")
R<IPage<WebsiteCommentVo>> commentPage(WebsiteCommentSearchDto dto) { R<IPage<WebsiteCommentVo>> commentPage(@RequestParam CommentSearchDto dto) {
return R.ok(websiteService.commentPage(PageUtils.toPage(), dto)); return R.ok(websiteService.commentPage(PageUtils.toPage(), dto));
} }
@Operation(summary = "保存咨询信息") @Operation(summary = "保存咨询信息")
@PostMapping("/saveConsult") @PostMapping("/saveConsult")
R<Void> saveConsult(@RequestBody WebsiteConsultSaveDto dto) { R<Void> saveConsult(@RequestBody ConsultSaveDto dto) {
websiteService.saveConsult(dto); websiteService.saveConsult(dto);
return R.ok(); return R.ok();
} }

2
cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/WebsiteCaseSearchDto.java → cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/CaseSearchDto.java
View File

@ -9,7 +9,7 @@ import lombok.Data;
* @author ZYJ * @author ZYJ
**/ **/
@Data @Data
public class WebsiteCaseSearchDto { public class CaseSearchDto {
@Schema(description = "案例类型id") @Schema(description = "案例类型id")
private Long typeId; private Long typeId;

5
cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/WebsiteCommentSearchDto.java → cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/CommentSearchDto.java
View File

@ -9,7 +9,10 @@ import lombok.Data;
* @author ZYJ * @author ZYJ
**/ **/
@Data @Data
public class WebsiteCommentSearchDto { public class CommentSearchDto {
@Schema(description = "当前页码")
private Integer pageNum;
@Schema(description = "每页数量") @Schema(description = "每页数量")
private Integer pageSize; private Integer pageSize;

3
cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/WebsiteConsultSaveDto.java → cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/ConsultSaveDto.java
View File

@ -1,7 +1,6 @@
package com.byhah.cloud.admin.module.anon.dto; package com.byhah.cloud.admin.module.anon.dto;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
/** /**
@ -10,7 +9,7 @@ import lombok.Data;
* @author ZYJ * @author ZYJ
**/ **/
@Data @Data
public class WebsiteConsultSaveDto { public class ConsultSaveDto {
@Schema(description = "姓名") @Schema(description = "姓名")
private String name; private String name;

13
cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/service/WebsiteService.java
View File

@ -5,9 +5,9 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.byhah.cloud.admin.mapper.AnonMapper; import com.byhah.cloud.admin.mapper.AnonMapper;
import com.byhah.cloud.admin.module.anon.dto.WebsiteCaseSearchDto; import com.byhah.cloud.admin.module.anon.dto.CaseSearchDto;
import com.byhah.cloud.admin.module.anon.dto.WebsiteCommentSearchDto; import com.byhah.cloud.admin.module.anon.dto.CommentSearchDto;
import com.byhah.cloud.admin.module.anon.dto.WebsiteConsultSaveDto; import com.byhah.cloud.admin.module.anon.dto.ConsultSaveDto;
import com.byhah.cloud.admin.module.anon.vo.*; import com.byhah.cloud.admin.module.anon.vo.*;
import com.byhah.cloud.admin.module.website.service.*; import com.byhah.cloud.admin.module.website.service.*;
import com.byhah.cloud.basic.constant.RedisKeys; import com.byhah.cloud.basic.constant.RedisKeys;
@ -22,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.Duration; import java.time.Duration;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* 网站接口Service接口实现类 * 网站接口Service接口实现类
@ -68,17 +67,17 @@ public class WebsiteService {
} }
@Transactional(rollbackFor = Exception.class, readOnly = true) @Transactional(rollbackFor = Exception.class, readOnly = true)
public IPage<WebsiteCaseVo> casePage(Page<WebsiteSuccessCase> page, WebsiteCaseSearchDto dto) { public IPage<WebsiteCaseVo> casePage(Page<WebsiteSuccessCase> page, CaseSearchDto dto) {
return anonMapper.casePage(page, dto); return anonMapper.casePage(page, dto);
} }
@Transactional(rollbackFor = Exception.class, readOnly = true) @Transactional(rollbackFor = Exception.class, readOnly = true)
public IPage<WebsiteCommentVo> commentPage(Page<WebsiteComment> page, WebsiteCommentSearchDto dto) { public IPage<WebsiteCommentVo> commentPage(Page<WebsiteComment> page, CommentSearchDto dto) {
return anonMapper.commentPage(page, dto); return anonMapper.commentPage(page, dto);
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void saveConsult(WebsiteConsultSaveDto dto) { public void saveConsult(ConsultSaveDto dto) {
limit(dto.getPhone(), dto.getEmail()); limit(dto.getPhone(), dto.getEmail());
WebsiteConsult consult = new WebsiteConsult(); WebsiteConsult consult = new WebsiteConsult();
BeanUtil.copyProperties(dto, consult); BeanUtil.copyProperties(dto, consult);

2
cloud-admin/src/main/resources/application-dev.yml
View File

@ -1,3 +1,5 @@
server:
port: 18081
spring: spring:
data: data:
redis: redis:

2
cloud-admin/src/main/resources/application.yml
View File

@ -1,6 +1,6 @@
server: server:
servlet: servlet:
context-path: /api/admin context-path: /test
spring: spring:
application: application:
name: website-admin name: website-admin