diff --git a/cloud-admin/pom.xml b/cloud-admin/pom.xml index d9bca20..595110d 100644 --- a/cloud-admin/pom.xml +++ b/cloud-admin/pom.xml @@ -11,6 +11,7 @@ cloud-admin + website-admin @@ -90,7 +91,7 @@ - ${project.artifactId} + ${project.name} org.springframework.boot diff --git a/cloud-admin/src/main/java/com/byhah/cloud/admin/mapper/AnonMapper.java b/cloud-admin/src/main/java/com/byhah/cloud/admin/mapper/AnonMapper.java index a47b8ef..70cf607 100644 --- a/cloud-admin/src/main/java/com/byhah/cloud/admin/mapper/AnonMapper.java +++ b/cloud-admin/src/main/java/com/byhah/cloud/admin/mapper/AnonMapper.java @@ -2,11 +2,10 @@ package com.byhah.cloud.admin.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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.WebsiteCommentSearchDto; +import com.byhah.cloud.admin.module.anon.dto.CaseSearchDto; +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.WebsiteCommentVo; -import com.byhah.cloud.basic.core.entity.website.WebsiteComment; import org.apache.ibatis.annotations.Param; /** @@ -19,10 +18,10 @@ public interface AnonMapper { /** * 成功案例分页 */ - IPage casePage(Page page, @Param("dto") WebsiteCaseSearchDto dto); + IPage casePage(Page page, @Param("dto") CaseSearchDto dto); /** * 客户评价分页 */ - IPage commentPage(Page page, @Param("dto") WebsiteCommentSearchDto dto); + IPage commentPage(Page page, @Param("dto") CommentSearchDto dto); } diff --git a/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/controller/AnonWebsiteController.java b/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/controller/AnonWebsiteController.java index 555e281..710d8d3 100644 --- a/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/controller/AnonWebsiteController.java +++ b/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/controller/AnonWebsiteController.java @@ -1,22 +1,18 @@ package com.byhah.cloud.admin.module.anon.controller; -import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.byhah.cloud.admin.module.anon.dto.WebsiteCaseSearchDto; -import com.byhah.cloud.admin.module.anon.dto.WebsiteCommentSearchDto; -import com.byhah.cloud.admin.module.anon.dto.WebsiteConsultSaveDto; +import com.byhah.cloud.admin.module.anon.dto.CaseSearchDto; +import com.byhah.cloud.admin.module.anon.dto.CommentSearchDto; +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.vo.WebsiteCaseVo; import com.byhah.cloud.admin.module.anon.vo.WebsiteCommentVo; 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.validation.group.Insert; import com.byhah.deploy.starter.web.R; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** @@ -40,19 +36,19 @@ public class AnonWebsiteController { @Operation(summary = "获取成功案例分页") @GetMapping("/casePage") - R> casePage(WebsiteCaseSearchDto dto) { + R> casePage(@RequestParam CaseSearchDto dto) { return R.ok(websiteService.casePage(PageUtils.toPage(), dto)); } @Operation(summary = "获取客户评价分页") @GetMapping("/commentPage") - R> commentPage(WebsiteCommentSearchDto dto) { + R> commentPage(@RequestParam CommentSearchDto dto) { return R.ok(websiteService.commentPage(PageUtils.toPage(), dto)); } @Operation(summary = "保存咨询信息") @PostMapping("/saveConsult") - R saveConsult(@RequestBody WebsiteConsultSaveDto dto) { + R saveConsult(@RequestBody ConsultSaveDto dto) { websiteService.saveConsult(dto); return R.ok(); } diff --git a/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/WebsiteCaseSearchDto.java b/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/CaseSearchDto.java similarity index 91% rename from cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/WebsiteCaseSearchDto.java rename to cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/CaseSearchDto.java index a72f75a..c8b1310 100644 --- a/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/WebsiteCaseSearchDto.java +++ b/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/CaseSearchDto.java @@ -9,7 +9,7 @@ import lombok.Data; * @author ZYJ **/ @Data -public class WebsiteCaseSearchDto { +public class CaseSearchDto { @Schema(description = "案例类型id") private Long typeId; diff --git a/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/WebsiteCommentSearchDto.java b/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/CommentSearchDto.java similarity index 70% rename from cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/WebsiteCommentSearchDto.java rename to cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/CommentSearchDto.java index 159ae12..32da953 100644 --- a/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/WebsiteCommentSearchDto.java +++ b/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/CommentSearchDto.java @@ -9,7 +9,10 @@ import lombok.Data; * @author ZYJ **/ @Data -public class WebsiteCommentSearchDto { +public class CommentSearchDto { + + @Schema(description = "当前页码") + private Integer pageNum; @Schema(description = "每页数量") private Integer pageSize; diff --git a/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/WebsiteConsultSaveDto.java b/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/ConsultSaveDto.java similarity index 85% rename from cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/WebsiteConsultSaveDto.java rename to cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/ConsultSaveDto.java index 96da53c..7cb504a 100644 --- a/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/WebsiteConsultSaveDto.java +++ b/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/dto/ConsultSaveDto.java @@ -1,7 +1,6 @@ package com.byhah.cloud.admin.module.anon.dto; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; import lombok.Data; /** @@ -10,7 +9,7 @@ import lombok.Data; * @author ZYJ **/ @Data -public class WebsiteConsultSaveDto { +public class ConsultSaveDto { @Schema(description = "姓名") private String name; diff --git a/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/service/WebsiteService.java b/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/service/WebsiteService.java index f269951..7da3d53 100644 --- a/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/service/WebsiteService.java +++ b/cloud-admin/src/main/java/com/byhah/cloud/admin/module/anon/service/WebsiteService.java @@ -5,9 +5,9 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.byhah.cloud.admin.mapper.AnonMapper; -import com.byhah.cloud.admin.module.anon.dto.WebsiteCaseSearchDto; -import com.byhah.cloud.admin.module.anon.dto.WebsiteCommentSearchDto; -import com.byhah.cloud.admin.module.anon.dto.WebsiteConsultSaveDto; +import com.byhah.cloud.admin.module.anon.dto.CaseSearchDto; +import com.byhah.cloud.admin.module.anon.dto.CommentSearchDto; +import com.byhah.cloud.admin.module.anon.dto.ConsultSaveDto; import com.byhah.cloud.admin.module.anon.vo.*; import com.byhah.cloud.admin.module.website.service.*; import com.byhah.cloud.basic.constant.RedisKeys; @@ -22,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional; import java.time.Duration; import java.util.List; -import java.util.Objects; /** * 网站接口Service接口实现类 @@ -68,17 +67,17 @@ public class WebsiteService { } @Transactional(rollbackFor = Exception.class, readOnly = true) - public IPage casePage(Page page, WebsiteCaseSearchDto dto) { + public IPage casePage(Page page, CaseSearchDto dto) { return anonMapper.casePage(page, dto); } @Transactional(rollbackFor = Exception.class, readOnly = true) - public IPage commentPage(Page page, WebsiteCommentSearchDto dto) { + public IPage commentPage(Page page, CommentSearchDto dto) { return anonMapper.commentPage(page, dto); } @Transactional(rollbackFor = Exception.class) - public void saveConsult(WebsiteConsultSaveDto dto) { + public void saveConsult(ConsultSaveDto dto) { limit(dto.getPhone(), dto.getEmail()); WebsiteConsult consult = new WebsiteConsult(); BeanUtil.copyProperties(dto, consult); diff --git a/cloud-admin/src/main/resources/application-dev.yml b/cloud-admin/src/main/resources/application-dev.yml index d9682f5..8a3b524 100644 --- a/cloud-admin/src/main/resources/application-dev.yml +++ b/cloud-admin/src/main/resources/application-dev.yml @@ -1,3 +1,5 @@ +server: + port: 18081 spring: data: redis: diff --git a/cloud-admin/src/main/resources/application.yml b/cloud-admin/src/main/resources/application.yml index 5d74d7c..2fafc7c 100644 --- a/cloud-admin/src/main/resources/application.yml +++ b/cloud-admin/src/main/resources/application.yml @@ -1,6 +1,6 @@ server: servlet: - context-path: /api/admin + context-path: /test spring: application: name: website-admin