From 94f4895754ca3361ab55290fef7068de6172eb0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Thu, 2 Oct 2025 14:11:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E5=8D=87=E7=BA=A7Swagger?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E5=B9=B6=E4=BC=98=E5=8C=96=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E7=94=B3=E8=AF=B7=E9=80=BB=E8=BE=91-=20=E5=B0=86Swagg?= =?UTF-8?q?er=E6=B3=A8=E8=A7=A3=E4=BB=8Ev2=E5=8D=87=E7=BA=A7=E8=87=B3v3?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20-=20=E4=BC=98=E5=8C=96=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E7=94=B3=E8=AF=B7=E6=97=B6=E7=94=A8=E6=88=B7ID?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=80=BB=E8=BE=91=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=B5=8B=E5=80=BC=20-=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=96=87=E6=A1=88=EF=BC=8C=E7=BB=9F=E4=B8=80=E4=B8=BA"?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F"=20-=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=B3=A8=E8=A7=A3=E4=B8=AD=E7=9A=84=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=A0=87=E8=AF=86=E5=BC=95=E7=94=A8=E9=94=99=E8=AF=AF?= =?UTF-8?q?=20-=20=E4=B8=BA=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=B7=BB=E5=8A=A0JS?= =?UTF-8?q?ON=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=20-=20=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8Schema?= =?UTF-8?q?=E6=9B=BF=E4=BB=A3ApiModel=E5=92=8CApiModelProperty=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ShopDealerApplyController.java | 6 ++- .../ShopDealerRecordController.java | 39 +++++++++---------- .../shop/entity/ShopDealerRecord.java | 35 +++++++++-------- .../shop/param/ShopDealerRecordParam.java | 25 ++++++------ 4 files changed, 53 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java index e7c1807..4404596 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerApplyController.java @@ -89,7 +89,9 @@ public class ShopDealerApplyController extends BaseController { User loginUser = getLoginUser(); if (loginUser != null) { shopDealerApply.setApplyTime(LocalDateTime.now()); - shopDealerApply.setUserId(loginUser.getUserId()); + if(shopDealerApply.getUserId() == null) { + shopDealerApply.setUserId(loginUser.getUserId()); + } } if (shopDealerApply.getRefereeId() != null) { if(shopDealerUserService.getByIdRel(shopDealerApply.getRefereeId()) == null){ @@ -129,7 +131,7 @@ public class ShopDealerApplyController extends BaseController { shopDealerUserService.save(dealerUser); } } - return success("修改成功"); + return success("保存成功"); } return fail("修改失败"); } diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerRecordController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerRecordController.java index 69cc1fa..44b2c22 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerRecordController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerRecordController.java @@ -9,8 +9,8 @@ import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.shop.entity.ShopDealerRecord; import com.gxwebsoft.shop.param.ShopDealerRecordParam; import com.gxwebsoft.shop.service.ShopDealerRecordService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -23,40 +23,37 @@ import java.util.List; * @author 科技小王子 * @since 2025-10-02 12:21:50 */ -@Api(tags = "客户跟进情况管理") +@Tag(name = "客户跟进情况管理") @RestController @RequestMapping("/api/shop/shop-dealer-record") public class ShopDealerRecordController extends BaseController { @Resource private ShopDealerRecordService shopDealerRecordService; - @PreAuthorize("hasAuthority('shop:shopDealerRecord:list')") - @ApiOperation("分页查询客户跟进情况") + @Operation(summary = "分页查询客户跟进情况") @GetMapping("/page") public ApiResult> page(ShopDealerRecordParam param) { // 使用关联查询 return success(shopDealerRecordService.pageRel(param)); } - @PreAuthorize("hasAuthority('shop:shopDealerRecord:list')") - @ApiOperation("查询全部客户跟进情况") + @Operation(summary = "查询全部客户跟进情况") @GetMapping() public ApiResult> list(ShopDealerRecordParam param) { // 使用关联查询 return success(shopDealerRecordService.listRel(param)); } - @PreAuthorize("hasAuthority('shop:shopDealerRecord:list')") - @ApiOperation("根据id查询客户跟进情况") + @Operation(summary = "根据id查询客户跟进情况") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { // 使用关联查询 return success(shopDealerRecordService.getByIdRel(id)); } - @PreAuthorize("hasAuthority('shop:shopDealerRecord:save')") + @PreAuthorize("hasAuthority('shop:shopDealerApply:save')") @OperationLog - @ApiOperation("添加客户跟进情况") + @Operation(summary = "添加客户跟进情况") @PostMapping() public ApiResult save(@RequestBody ShopDealerRecord shopDealerRecord) { // 记录当前登录用户id @@ -70,9 +67,9 @@ public class ShopDealerRecordController extends BaseController { return fail("添加失败"); } - @PreAuthorize("hasAuthority('shop:shopDealerRecord:update')") + @PreAuthorize("hasAuthority('shop:shopDealerApply:update')") @OperationLog - @ApiOperation("修改客户跟进情况") + @Operation(summary = "修改客户跟进情况") @PutMapping() public ApiResult update(@RequestBody ShopDealerRecord shopDealerRecord) { if (shopDealerRecordService.updateById(shopDealerRecord)) { @@ -81,9 +78,9 @@ public class ShopDealerRecordController extends BaseController { return fail("修改失败"); } - @PreAuthorize("hasAuthority('shop:shopDealerRecord:remove')") + @PreAuthorize("hasAuthority('shop:shopDealerApply:remove')") @OperationLog - @ApiOperation("删除客户跟进情况") + @Operation(summary = "删除客户跟进情况") @DeleteMapping("/{id}") public ApiResult remove(@PathVariable("id") Integer id) { if (shopDealerRecordService.removeById(id)) { @@ -92,9 +89,9 @@ public class ShopDealerRecordController extends BaseController { return fail("删除失败"); } - @PreAuthorize("hasAuthority('shop:shopDealerRecord:save')") + @PreAuthorize("hasAuthority('shop:shopDealerApply:save')") @OperationLog - @ApiOperation("批量添加客户跟进情况") + @Operation(summary = "批量添加客户跟进情况") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) { if (shopDealerRecordService.saveBatch(list)) { @@ -103,9 +100,9 @@ public class ShopDealerRecordController extends BaseController { return fail("添加失败"); } - @PreAuthorize("hasAuthority('shop:shopDealerRecord:update')") + @PreAuthorize("hasAuthority('shop:shopDealerApply:update')") @OperationLog - @ApiOperation("批量修改客户跟进情况") + @Operation(summary = "批量修改客户跟进情况") @PutMapping("/batch") public ApiResult removeBatch(@RequestBody BatchParam batchParam) { if (batchParam.update(shopDealerRecordService, "id")) { @@ -114,9 +111,9 @@ public class ShopDealerRecordController extends BaseController { return fail("修改失败"); } - @PreAuthorize("hasAuthority('shop:shopDealerRecord:remove')") + @PreAuthorize("hasAuthority('shop:shopDealerApply:remove')") @OperationLog - @ApiOperation("批量删除客户跟进情况") + @Operation(summary = "批量删除客户跟进情况") @DeleteMapping("/batch") public ApiResult removeBatch(@RequestBody List ids) { if (shopDealerRecordService.removeByIds(ids)) { diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerRecord.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerRecord.java index 347d1a3..3780cda 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerRecord.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerRecord.java @@ -3,8 +3,9 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,46 +20,48 @@ import java.time.LocalDateTime; */ @Data @EqualsAndHashCode(callSuper = false) -@ApiModel(value = "ShopDealerRecord对象", description = "客户跟进情况") +@Schema(description = "客户跟进情况") public class ShopDealerRecord implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "ID") + @Schema(description = "ID") @TableId(value = "id", type = IdType.AUTO) private Integer id; - @ApiModelProperty(value = "上级id, 0是顶级") + @Schema(description = "上级id, 0是顶级") private Integer parentId; - @ApiModelProperty(value = "客户ID") + @Schema(description = "客户ID") private Integer dealerId; - @ApiModelProperty(value = "内容") + @Schema(description = "内容") private String content; - @ApiModelProperty(value = "用户ID") + @Schema(description = "用户ID") private Integer userId; - @ApiModelProperty(value = "排序(数字越小越靠前)") + @Schema(description = "排序(数字越小越靠前)") private Integer sortNumber; - @ApiModelProperty(value = "备注") + @Schema(description = "备注") private String comments; - @ApiModelProperty(value = "状态, 0待处理, 1已完成") + @Schema(description = "状态, 0待处理, 1已完成") private Integer status; - @ApiModelProperty(value = "是否删除, 0否, 1是") + @Schema(description = "是否删除, 0否, 1是") @TableLogic private Integer deleted; - @ApiModelProperty(value = "租户id") + @Schema(description = "租户id") private Integer tenantId; - @ApiModelProperty(value = "创建时间") + @Schema(description = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; - @ApiModelProperty(value = "修改时间") + @Schema(description = "修改时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; -} +} \ No newline at end of file diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerRecordParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerRecordParam.java index 7fb4344..84acded 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerRecordParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerRecordParam.java @@ -4,8 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.gxwebsoft.common.core.annotation.QueryField; import com.gxwebsoft.common.core.annotation.QueryType; import com.gxwebsoft.common.core.web.BaseParam; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,42 +17,42 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) @JsonInclude(JsonInclude.Include.NON_NULL) -@ApiModel(value = "ShopDealerRecordParam对象", description = "客户跟进情况查询参数") +@Schema(description = "客户跟进情况查询参数") public class ShopDealerRecordParam extends BaseParam { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "ID") + @Schema(description = "ID") @QueryField(type = QueryType.EQ) private Integer id; - @ApiModelProperty(value = "上级id, 0是顶级") + @Schema(description = "上级id, 0是顶级") @QueryField(type = QueryType.EQ) private Integer parentId; - @ApiModelProperty(value = "客户ID") + @Schema(description = "客户ID") @QueryField(type = QueryType.EQ) private Integer dealerId; - @ApiModelProperty(value = "内容") + @Schema(description = "内容") private String content; - @ApiModelProperty(value = "用户ID") + @Schema(description = "用户ID") @QueryField(type = QueryType.EQ) private Integer userId; - @ApiModelProperty(value = "排序(数字越小越靠前)") + @Schema(description = "排序(数字越小越靠前)") @QueryField(type = QueryType.EQ) private Integer sortNumber; - @ApiModelProperty(value = "备注") + @Schema(description = "备注") private String comments; - @ApiModelProperty(value = "状态, 0待处理, 1已完成") + @Schema(description = "状态, 0待处理, 1已完成") @QueryField(type = QueryType.EQ) private Integer status; - @ApiModelProperty(value = "是否删除, 0否, 1是") + @Schema(description = "是否删除, 0否, 1是") @QueryField(type = QueryType.EQ) private Integer deleted; -} +} \ No newline at end of file