diff --git a/pom.xml b/pom.xml index 31d0ed7..641de13 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,6 @@ 21 21 5.8.24 - 8.0.33 1.2.83 2.0.7 5.3.1 @@ -74,9 +73,9 @@ - mysql - mysql-connector-java - ${mysql-connector.version} + com.mysql + mysql-connector-j + 8.3.0 runtime @@ -134,13 +133,7 @@ org.apache.commons commons-lang3 - - - - - com.github.xiaoymin - knife4j-spring-boot-starter - ${knife4j-spring-boot-starter.version} + 3.18.0 @@ -169,7 +162,7 @@ org.apache.commons commons-text - 1.1 + 1.11.0 diff --git a/src/main/java/com/ycwl/basic/config/SwaggerConfig.java b/src/main/java/com/ycwl/basic/config/SwaggerConfig.java deleted file mode 100644 index 8bd71e6..0000000 --- a/src/main/java/com/ycwl/basic/config/SwaggerConfig.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.ycwl.basic.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.ParameterBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.schema.ModelRef; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.Contact; -import springfox.documentation.service.Parameter; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; - -import java.util.ArrayList; -import java.util.List; - -/** - * Swagger 配置类 - * 原生: /swagger-ui.html - * 美化: /doc.html - */ -@Configuration -@EnableSwagger2WebMvc -@Profile({"test"}) -public class SwaggerConfig { - - /** - * Swagger 实例 Bean 是 Docket, 所以通过配置 Docket 实例来配置 Swagger - */ - @Bean - public Docket docket() { - - return new Docket(DocumentationType.SWAGGER_2) - // 展示在 Swagger 页面上的自定义工程描述信息 - .apiInfo(apiInfo()) - // 选择展示哪些接口 - .select() - //只有com.zcy.e.firstaid包内的才去展示 - .apis(RequestHandlerSelectors.basePackage("com.ycwl.basic.controller.mobile")) - .paths(PathSelectors.any()) - .build() - .globalOperationParameters(getGlobalRequestParameters()); - } - - /** - * Swagger 的描述信息 - */ - public ApiInfo apiInfo() { - - return new ApiInfoBuilder() - .title("liuyin-re") - .description("流影重构") - .contact(new Contact("ycwl", "www.xxx.com", "xxxxxxxxx.com")) - .version("1.0") - .build(); - } - - private List getGlobalRequestParameters() { - List parameters = new ArrayList<>(); - parameters.add(new ParameterBuilder() - .name("token") - .description("登录令牌") - .parameterType("header") - .modelRef(new ModelRef("String")) - .required(true) - .build()); - return parameters; - } - -} diff --git a/src/main/java/com/ycwl/basic/controller/FileController.java b/src/main/java/com/ycwl/basic/controller/FileController.java index 96d1234..714507d 100644 --- a/src/main/java/com/ycwl/basic/controller/FileController.java +++ b/src/main/java/com/ycwl/basic/controller/FileController.java @@ -5,8 +5,6 @@ import com.ycwl.basic.annotation.IgnoreToken; import com.ycwl.basic.enums.BizCodeEnum; import com.ycwl.basic.storage.StorageFactory; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,10 +24,10 @@ import java.util.UUID; @RestController @RequestMapping("/api/file/v1") @Slf4j -@Api(tags = "文件接口") +// 文件接口 public class FileController { - @ApiOperation(value = "上传文件") + // 上传文件 @PostMapping("/upload") @IgnoreToken public ApiResponse upload(@RequestParam(value = "file") MultipartFile file) throws IOException { @@ -39,7 +37,7 @@ public class FileController { return ApiResponse.success(url); } - @ApiOperation(value = "删除文件") + // 删除文件 @PostMapping("/delete") @IgnoreToken public ApiResponse delete(@RequestParam(value = "fileName") String fileName) throws IOException { diff --git a/src/main/java/com/ycwl/basic/controller/extern/AioDeviceController.java b/src/main/java/com/ycwl/basic/controller/extern/AioDeviceController.java index 60bad7a..dcf6356 100644 --- a/src/main/java/com/ycwl/basic/controller/extern/AioDeviceController.java +++ b/src/main/java/com/ycwl/basic/controller/extern/AioDeviceController.java @@ -24,7 +24,6 @@ import com.ycwl.basic.service.pc.OrderService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.JwtTokenUtil; import com.ycwl.basic.utils.SnowFlakeUtil; -import io.swagger.annotations.ApiOperation; import jakarta.servlet.ServletRequest; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; @@ -109,12 +108,12 @@ public class AioDeviceController { return ApiResponse.success(resp); } - @ApiOperation("人脸信息") + // 人脸信息 @GetMapping("/{faceId}") public ApiResponse faceInfo(@PathVariable Long faceId) { return faceService.getById(faceId); } - @ApiOperation("照片商品列表") + // 照片商品列表 @GetMapping("/{faceId}/photo") public ApiResponse> sourceGoodsList(@PathVariable Long faceId) { GoodsReqQuery query = new GoodsReqQuery(); @@ -124,7 +123,7 @@ public class AioDeviceController { return ApiResponse.success(goodsDetailVOS); } - @ApiOperation("创建订单") + // 创建订单 @PostMapping("/order") public ApiResponse createOrder(HttpServletRequest request, @RequestBody AioDeviceCreateOrderReq req) { String deviceId = request.getHeader("X-DeviceId"); @@ -135,7 +134,7 @@ public class AioDeviceController { return ApiResponse.success(aioDeviceService.createOrder(aioDevice, req)); } - @ApiOperation("查询订单") + // 查询订单 @GetMapping("/order/{orderId}") public ApiResponse queryOrder(HttpServletRequest request, @PathVariable("orderId") Long orderId) { String deviceId = request.getHeader("X-DeviceId"); diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java index 615846b..9f6e1a8 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java @@ -7,8 +7,6 @@ import com.ycwl.basic.model.pc.face.resp.FaceRespVO; import com.ycwl.basic.service.pc.FaceService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.JwtTokenUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -21,7 +19,7 @@ import java.util.List; */ @RestController @RequestMapping("/api/mobile/face/v1") -@Api(tags = "用户人脸相关接口") +// 用户人脸相关接口 public class AppFaceController { @@ -37,7 +35,7 @@ AppFaceController { * @param scenicId * @return */ - @ApiOperation("人脸照片上传") + // 人脸照片上传 @PostMapping("/faceUPload") public ApiResponse faceUpload(@RequestParam("file")MultipartFile file, @RequestParam("scenicId") Long scenicId) { //获取用户id @@ -72,14 +70,14 @@ AppFaceController { } - @ApiOperation("景区视频源素材列表") + // 景区视频源素材列表 @GetMapping("/{faceId}/contentList") public ApiResponse> contentList(@PathVariable Long faceId) { List contentPageVOS = faceService.faceContentList(faceId); return ApiResponse.success(contentPageVOS); } - @ApiOperation("绑定人脸") + // 绑定人脸 @PostMapping("/{faceId}/bind") public ApiResponse bind(@PathVariable Long faceId) { JwtInfo worker = JwtTokenUtil.getWorker(); diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java index c3af24f..7f74b56 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java @@ -7,8 +7,6 @@ import com.ycwl.basic.model.mobile.goods.*; import com.ycwl.basic.service.mobile.GoodsService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.JwtTokenUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,26 +19,26 @@ import java.util.List; */ @RestController @RequestMapping("/api/mobile/goods/v1") -@Api(tags = "商品相关接口") +// 商品相关接口 public class AppGoodsController { @Autowired private GoodsService goodsService; - @ApiOperation("商品列表") + // 商品列表 @PostMapping("/goodsList") public ApiResponse> goodsList(@RequestBody GoodsReqQuery query) { return goodsService.goodsList(query); } - @ApiOperation("源素材(原片/照片)商品列表") + // 源素材(原片/照片)商品列表 @PostMapping("/sourceGoodsList") public ApiResponse> sourceGoodsList(@RequestBody GoodsReqQuery query) { List goodsDetailVOS = goodsService.sourceGoodsList(query); return ApiResponse.success(goodsDetailVOS); } - @ApiOperation("源素材(原片/照片)商品数量") + // 源素材(原片/照片)商品数量 @PostMapping("/sourceGoodsCount") public ApiResponse sourceGoodsCount(@RequestBody GoodsReqQuery query) { Integer count = goodsService.sourceGoodsCount(query); @@ -60,7 +58,7 @@ public class AppGoodsController { } - @ApiOperation("成片vlog商品详情") + // 成片vlog商品详情 @GetMapping("/getVideoGoodsDetail/{videoId}") @IgnoreToken public ApiResponse videoGoodsDetail(@PathVariable("videoId") Long videoId) { @@ -82,7 +80,7 @@ public class AppGoodsController { * * @return 0没有任务 1 合成中 2 合成成功 */ - @ApiOperation("查询用户当前景区的整体视频合成任务状态 0没有任务 1 合成中 2 合成成功 ") + // 查询用户当前景区的整体视频合成任务状态 0没有任务 1 合成中 2 合成成功 @GetMapping("/getTaskStatus/") public ApiResponse getAllTaskStatus() { JwtInfo worker = JwtTokenUtil.getWorker(); @@ -95,7 +93,7 @@ public class AppGoodsController { * @param templateId 模版id * @return 1 合成中 2 合成成功 */ - @ApiOperation("查询用户当前景区的具体模版视频合成任务状态 1 合成中 2 合成成功 ") + // 查询用户当前景区的具体模版视频合成任务状态 1 合成中 2 合成成功 @GetMapping("/task/face/{faceId}/template/{templateId}") public ApiResponse getTemplateTaskStatus(@PathVariable("faceId") Long faceId, @PathVariable("templateId") Long templateId) { JwtInfo worker = JwtTokenUtil.getWorker(); diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java index cb4103a..7e54cd7 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java @@ -6,8 +6,6 @@ import com.ycwl.basic.model.mobile.weChat.DTO.WeChatUserInfoUpdateDTO; import com.ycwl.basic.model.pc.member.resp.MemberRespVO; import com.ycwl.basic.service.mobile.AppMemberService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -18,7 +16,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequestMapping("/api/mobile/member/v1") -@Api(tags = "用户相关接口") +// 用户相关接口 @Slf4j public class AppMemberController { @@ -32,7 +30,7 @@ public class AppMemberController { * @return * @throws Exception */ - @ApiOperation("登录") + // 登录 @PostMapping("/{scenicId}/login") @IgnoreToken public ApiResponse login(@PathVariable("scenicId") Long scenicId ,@RequestBody WeChatUserInfoDTO userInfoDTO) throws Exception { @@ -44,7 +42,7 @@ public class AppMemberController { * * @return */ - @ApiOperation("获取用户信息") + // 获取用户信息 @GetMapping("/getUserInfo") public ApiResponse getUserInfo() { return memberService.getUserInfo(); @@ -56,19 +54,19 @@ public class AppMemberController { * @param userInfoUpdateDTO * @return */ - @ApiOperation("修改用户信息") + // 修改用户信息 @PostMapping("/update") public ApiResponse update(@RequestBody WeChatUserInfoUpdateDTO userInfoUpdateDTO) { return memberService.update(userInfoUpdateDTO); } - @ApiOperation("新增或修改景区服务通知状态") + // 新增或修改景区服务通知状态 @GetMapping("/updateScenicServiceNoticeStatus") public ApiResponse updateScenicServiceNoticeStatus(Long scenicId) { return memberService.updateScenicServiceNoticeStatus(scenicId); } - @ApiOperation("查看景区服务通知状态 0关闭 1开启") + // 查看景区服务通知状态 0关闭 1开启 @GetMapping("/getScenicServiceNoticeStatus") public ApiResponse getScenicServiceNoticeStatus(Long scenicId) { return memberService.getScenicServiceNoticeStatus(scenicId); diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java index f6b4edf..3d92267 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java @@ -18,8 +18,6 @@ import com.ycwl.basic.pay.entity.PayResponse; import com.ycwl.basic.service.pc.OrderService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.JwtTokenUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,7 +29,7 @@ import java.util.Map; */ @RestController @RequestMapping("/api/mobile/order/v1") -@Api(tags = "订单相关接口") +// 订单相关接口 public class AppOrderController { @Autowired @@ -43,7 +41,7 @@ public class AppOrderController { @Autowired private FaceMapper faceMapper; - @ApiOperation("用户端订单列表查询") + // 用户端订单列表查询 @PostMapping("/page") public ApiResponse> pageQuery(@RequestBody OrderAppPageReq orderReqQuery) { String userId = BaseContextHandler.getUserId(); @@ -51,26 +49,26 @@ public class AppOrderController { return orderService.appPageQuery(orderReqQuery); } - @ApiOperation("用户端订单详情查询") + // 用户端订单详情查询 @GetMapping("getOrderDetails/{id}") public ApiResponse getOrderDetails(@PathVariable("id") Long id) { return orderService.appDetail(id); } - @ApiOperation("用户端订单新增") + // 用户端订单新增 @PostMapping("/addOrder") public ApiResponse> addOrder(@RequestBody CreateOrderReqVO orderAddReq) throws Exception { JwtInfo worker = JwtTokenUtil.getWorker(); return orderService.createOrder(worker.getUserId(), orderAddReq); } - @ApiOperation("查询订单") + // 查询订单 @GetMapping("/queryOrder") public ApiResponse queryOrder(@RequestParam("orderId") Long orderId) { return ApiResponse.success(orderService.queryOrder(orderId)); } - @ApiOperation("用户端打包订单新增") + // 用户端打包订单新增 @PostMapping("/addBatchOrder") public ApiResponse> addOrder(@RequestBody CreateBatchOrderReqVO batchOrderReqVO) throws Exception { JwtInfo worker = JwtTokenUtil.getWorker(); @@ -78,7 +76,7 @@ public class AppOrderController { } - @ApiOperation("获取用户订单数量") + // 获取用户订单数量 @GetMapping("/getUserOrderCount") public ApiResponse getUserOrderCount() { Long userId = Long.parseLong(BaseContextHandler.getUserId()); @@ -86,7 +84,7 @@ public class AppOrderController { return orderService.getOrderCountByUserId(userId); } - @ApiOperation(value = "发起退款", notes = "发起退款") + // 发起退款 @PostMapping("/refundOrder") public ApiResponse refundOrder(@RequestBody RefundOrderReq refundOrderReq) { return orderService.refundOrder(refundOrderReq); diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java index 7d92dde..d929f73 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java @@ -17,8 +17,6 @@ import com.ycwl.basic.service.mobile.AppScenicService; import com.ycwl.basic.service.pc.FaceService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.JwtTokenUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -35,7 +33,7 @@ import java.util.List; @Deprecated @RestController @RequestMapping("/api/mobile/scenic/v1") -@Api(tags = "景区相关接口") +// 景区相关接口 public class AppScenicController { @Autowired @@ -50,7 +48,7 @@ public class AppScenicController { add("3936940597855784960"); }}; - @ApiOperation("分页查询景区列表") + // 分页查询景区列表 @PostMapping("/page") public ApiResponse> pageQuery(@RequestBody ScenicReqQuery scenicReqQuery){ String userId = BaseContextHandler.getUserId(); @@ -60,7 +58,7 @@ public class AppScenicController { return ApiResponse.success(new PageInfo<>(new ArrayList<>())); } } - @ApiOperation("根据id查询景区详情") + // 根据id查询景区详情 @IgnoreToken @GetMapping("/{id}") public ApiResponse getDetails(@PathVariable Long id){ @@ -91,19 +89,19 @@ public class AppScenicController { return ApiResponse.success(resp); } - @ApiOperation("查询景区设备总数和拍到用户的机位数量") + // 查询景区设备总数和拍到用户的机位数量 @GetMapping("/{scenicId}/deviceCount/") public ApiResponse deviceCountByScenicId(@PathVariable Long scenicId){ return appScenicService.deviceCountByScenicId(scenicId); } - @ApiOperation("景区视频源素材列表") + // 景区视频源素材列表 @GetMapping("/contentList/") public ApiResponse> contentList() { return faceService.contentListUseDefaultFace(); } - @ApiOperation("景区视频源素材列表") + // 景区视频源素材列表 @GetMapping("/face/{faceId}/contentList") public ApiResponse> contentList(@PathVariable Long faceId) { List contentPageVOS = faceService.faceContentList(faceId); diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppTaskController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppTaskController.java index 3174d1f..f79eeba 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppTaskController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppTaskController.java @@ -8,7 +8,6 @@ import com.ycwl.basic.service.mobile.GoodsService; import com.ycwl.basic.service.task.TaskService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.JwtTokenUtil; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -46,7 +45,7 @@ public class AppTaskController { * @param templateId 模版id * @return 1 合成中 2 合成成功 */ - @ApiOperation("查询用户当前景区的具体模版视频合成任务状态 1 合成中 2 合成成功 ") + // 查询用户当前景区的具体模版视频合成任务状态 1 合成中 2 合成成功 @GetMapping("/face/{faceId}/template/{templateId}") @IgnoreLogReq public ApiResponse getTemplateTaskStatus(@PathVariable("faceId") Long faceId, @PathVariable("templateId") Long templateId) { diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppWxNotifyController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppWxNotifyController.java index f591ac7..f11cc02 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppWxNotifyController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppWxNotifyController.java @@ -4,7 +4,6 @@ package com.ycwl.basic.controller.mobile; import com.ycwl.basic.annotation.IgnoreToken; import com.ycwl.basic.repository.ScenicRepository; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -23,7 +22,7 @@ import java.util.List; */ @RestController @RequestMapping("/api/mobile/wx/notify/v1") -@Api(tags = "微信消息模板通知") +// 微信消息模板通知 public class AppWxNotifyController { @Autowired private ScenicRepository scenicRepository; diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppWxPayController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppWxPayController.java index 5d1d5ec..43b5e4d 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppWxPayController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppWxPayController.java @@ -8,8 +8,6 @@ import com.ycwl.basic.model.wx.WxPayRespVO; import com.ycwl.basic.pay.entity.PayResponse; import com.ycwl.basic.service.mobile.WxPayService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; @@ -31,13 +29,13 @@ import java.security.GeneralSecurityException; */ @RestController @RequestMapping("/api/mobile/wx/pay/v1") -@Api(tags = "微信支付相关接口") +// 微信支付相关接口 public class AppWxPayController { @Autowired private WxPayService wxPayService; - @ApiOperation(value = "微信支付回调", notes = "微信支付回调") + // 微信支付回调 @PostMapping("/payNotify") @IgnoreToken public ApiResponse payNotify(HttpServletRequest request) { @@ -58,7 +56,7 @@ public class AppWxPayController { return ApiResponse.success(BizCodeEnum.REQUEST_OK); } - @ApiOperation(value = "微信支付退款回调", notes = "微信支付退款回调") + // 微信支付退款回调 @PostMapping("/{scenicId}/refundNotify") @IgnoreToken public ApiResponse refundNotify(@PathVariable Long scenicId, HttpServletRequest request) throws GeneralSecurityException, IOException { diff --git a/src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicAccountController.java b/src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicAccountController.java index 38b851e..0565f2d 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicAccountController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicAccountController.java @@ -14,9 +14,6 @@ import com.ycwl.basic.service.mobile.AppScenicService; import com.ycwl.basic.service.pc.ScenicAccountService; import com.ycwl.basic.service.pc.ScenicService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -38,7 +35,7 @@ import static com.ycwl.basic.constant.JwtRoleConstant.MERCHANT; */ @RestController @RequestMapping("/api/mobile/scenicAccount/v1") -@Api(tags = "景区账号相关接口") +// 景区账号相关接口 public class AppScenicAccountController { @Autowired private ScenicAccountService accountService; @@ -47,7 +44,7 @@ public class AppScenicAccountController { @Autowired private ScenicService adminScenicService; - @ApiOperation("登录") + // 登录 @PostMapping("/login") @IgnoreToken public ApiResponse login(@RequestBody ScenicLoginReq scenicLoginReq) throws Exception { diff --git a/src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicOrderController.java b/src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicOrderController.java index 912eff7..0a09629 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicOrderController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/manage/AppScenicOrderController.java @@ -9,7 +9,6 @@ import com.ycwl.basic.model.pc.scenic.entity.ScenicAccountEntity; import com.ycwl.basic.service.pc.OrderService; import com.ycwl.basic.service.pc.ScenicAccountService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -21,7 +20,7 @@ import java.util.List; @RestController @RequestMapping("/api/mobile/scenic/order/v1") -@Api(tags = "景区账号相关接口") +// 景区账号相关接口 public class AppScenicOrderController { @Autowired private OrderService orderService; diff --git a/src/main/java/com/ycwl/basic/controller/mobile/manage/AppStatisticsController.java b/src/main/java/com/ycwl/basic/controller/mobile/manage/AppStatisticsController.java index acfb7b0..9a5555c 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/manage/AppStatisticsController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/manage/AppStatisticsController.java @@ -11,8 +11,6 @@ import com.ycwl.basic.model.mobile.statistic.resp.AppStatisticsFunnelVO; import com.ycwl.basic.service.mobile.AppStatisticsService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.JwtTokenUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -24,41 +22,41 @@ import org.springframework.web.bind.annotation.*; @Slf4j @RestController @RequestMapping("/api/mobile/statistics/v1") -@Api(tags = "数据统计相关接口") +// 数据统计相关接口 public class AppStatisticsController { @Autowired private AppStatisticsService statisticsService; - @ApiOperation("支付订单金额、预览_支付转化率、扫码_付费用户转化率") + // 支付订单金额、预览_支付转化率、扫码_付费用户转化率 @PostMapping("/one") public ApiResponse oneStatistics(@RequestBody CommonQueryReq query) { return statisticsService.oneStatistics(query); } - @ApiOperation("支付订单数、现场订单数、推送订单数统计") + // 支付订单数、现场订单数、推送订单数统计 @PostMapping("/two") public ApiResponse twoStatistics(@RequestBody CommonQueryReq query) { return statisticsService.twoStatistics(query); } - @ApiOperation("扫码访问人数、推送订阅人数、预览视频人数统计") + // 扫码访问人数、推送订阅人数、预览视频人数统计 @PostMapping("/free") public ApiResponse freeStatistics(@RequestBody CommonQueryReq query) { return statisticsService.freeStatistics(query); } - @ApiOperation("用户转化漏斗") + // 用户转化漏斗 @PostMapping("/userConversionFunnel") public ApiResponse userConversionFunnel(@RequestBody CommonQueryReq query) { return statisticsService.userConversionFunnel(query); } - @ApiOperation("统计数据记录") + // 统计数据记录 @PostMapping("/addStatistics") @IgnoreToken public ApiResponse addStatistics(@RequestBody StatisticsRecordAddReq req) { diff --git a/src/main/java/com/ycwl/basic/controller/pc/AdminUserController.java b/src/main/java/com/ycwl/basic/controller/pc/AdminUserController.java index b7cb34b..b46bf2f 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/AdminUserController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/AdminUserController.java @@ -8,8 +8,6 @@ import com.ycwl.basic.model.pc.adminUser.resp.AdminUserListRespVO; import com.ycwl.basic.model.pc.adminUser.resp.StaffSimpleInfoRespVO; import com.ycwl.basic.service.pc.AdminUserService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -19,7 +17,7 @@ import java.util.List; @RestController @RequestMapping("/api/adminUser/v1") @Slf4j -@Api(tags = "系统后台用户管理") +// 系统后台用户管理 public class AdminUserController { @Autowired @@ -27,7 +25,7 @@ public class AdminUserController { @PostMapping(value = "/login") - @ApiOperation(value = "登录") + // 登录 @IgnoreToken public ApiResponse login(@RequestBody LoginReqVO loginReqVO) throws Exception { log.info("{}:开始登录管理后台", loginReqVO.getAccount()); @@ -35,49 +33,49 @@ public class AdminUserController { } @PostMapping(value = "/updatePassword") - @ApiOperation(value = "用户自己修改密码") + // 用户自己修改密码 public ApiResponse updatePassword(@RequestBody UpdatePasswordReqVO updatePasswordReqVO) throws Exception { log.info("{}:开始修改管理后台密码", updatePasswordReqVO.getId()); return adminUserService.updatePassword(updatePasswordReqVO); } @PostMapping(value = "/list") - @ApiOperation(value = "系统后台用户列表") + // 系统后台用户列表 //@IgnoreToken public ApiResponse>> list(@RequestBody AdminUserListReqVO adminUserListReqVO) { return adminUserService.list(adminUserListReqVO); } @PostMapping(value = "/query/list") - @ApiOperation(value = "系统后台用户列表查询") + // 系统后台用户列表查询 @IgnoreToken public ApiResponse>> queryList(@RequestBody AdminUserListReqVO adminUserListReqVO) { return adminUserService.list(adminUserListReqVO); } @PostMapping(value = "/add") - @ApiOperation(value = "添加系统后台用户") + // 添加系统后台用户 //@IgnoreToken public ApiResponse add(@RequestBody AddOrUpdateAdminUserReqVO addOrUpdateAdminUserReqVO) { return adminUserService.addOrUpdate(addOrUpdateAdminUserReqVO); } @PostMapping(value = "/update") - @ApiOperation(value = "更新系统后台用户") + // 更新系统后台用户 //@IgnoreToken public ApiResponse update(@RequestBody AddOrUpdateAdminUserReqVO addOrUpdateAdminUserReqVO) { return adminUserService.addOrUpdate(addOrUpdateAdminUserReqVO); } @GetMapping(value = "/delete/{id}") - @ApiOperation(value = "删除") + // 删除 //@IgnoreToken public ApiResponse delete(@PathVariable("id") String id) { return adminUserService.delete(id); } @PostMapping(value = "/resetPassword") - @ApiOperation(value = "重置密码") + // 重置密码 //@IgnoreToken public ApiResponse resetPassword(@RequestBody ResetPasswordReqVO resetPasswordReqVO) { log.info("{}:开始重置后台密码", resetPasswordReqVO.getId()); diff --git a/src/main/java/com/ycwl/basic/controller/pc/BrokerController.java b/src/main/java/com/ycwl/basic/controller/pc/BrokerController.java index 9a61793..f43b091 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/BrokerController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/BrokerController.java @@ -14,8 +14,6 @@ import com.ycwl.basic.repository.ScenicRepository; import com.ycwl.basic.storage.StorageFactory; import com.ycwl.basic.storage.adapters.IStorageAdapter; import com.ycwl.basic.model.pc.mp.MpConfigEntity; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; @@ -30,7 +28,7 @@ import java.util.List; */ @RestController @RequestMapping("/api/broker/v1") -@Api(tags = "推客（推广人）管理") +// 推客（推广人）管理 public class BrokerController { @Autowired private BrokerService brokerService; @@ -41,64 +39,64 @@ public class BrokerController { @Autowired private ScenicRepository scenicRepository; - @ApiOperation("分页查询") + // 分页查询 @PostMapping("/page") public ApiResponse page(@RequestBody BrokerReqQuery brokerReqQuery){ return ApiResponse.success(brokerService.pageQuery(brokerReqQuery)); } - @ApiOperation("列表查询") + // 列表查询 @PostMapping("/list") public ApiResponse list(@RequestBody BrokerReqQuery brokerReqQuery){ return ApiResponse.success(brokerService.list(brokerReqQuery)); } - @ApiOperation("详情查询") + // 详情查询 @GetMapping("/getDetails/{id}") public ApiResponse getDetails(@PathVariable("id") Long id){ return ApiResponse.success(brokerService.getById(id)); } - @ApiOperation("新增或修改") + // 新增或修改 @PostMapping("/addOrUpdate") public ApiResponse addOrUpdate(@RequestBody BrokerEntity broker){ return ApiResponse.success(brokerService.addOrUpdate(broker)); } - @ApiOperation("删除") + // 删除 @DeleteMapping("/delete/{id}") public ApiResponse delete(@PathVariable("id") Long id){ return ApiResponse.success(brokerService.delete(id)); } - @ApiOperation("修改状态") + // 修改状态 @PutMapping("/updateStatus/{id}") public ApiResponse updateStatus(@PathVariable("id") Long id){ return ApiResponse.success(brokerService.updateStatus(id)); } - @ApiOperation("修改状态") + // 修改状态 @PutMapping("/updateBrokerEnable/{id}") public ApiResponse updateBrokerEnable(@PathVariable("id") Long id){ return ApiResponse.success(brokerService.updateBrokerEnable(id)); } - @ApiOperation("推客记录分页查询") + // 推客记录分页查询 @PostMapping("/record/page") public ApiResponse pageRecord(@RequestBody BrokerRecordReqQuery brokerRecordReqQuery) { return ApiResponse.success(brokerRecordService.pageQuery(brokerRecordReqQuery)); } - @ApiOperation("推客记录列表查询") + // 推客记录列表查询 @PostMapping("/record/list") public ApiResponse listRecord(@RequestBody BrokerRecordReqQuery brokerRecordReqQuery) { return ApiResponse.success(brokerRecordService.list(brokerRecordReqQuery)); } - @ApiOperation("推客记录详情查询") + // 推客记录详情查询 @GetMapping("/record/getDetails/{id}") public ApiResponse getRecordDetails(@PathVariable("id") Long id) { return ApiResponse.success(brokerRecordService.getById(id)); } - @ApiOperation("根据brokerId和时间范围查询每天的记录数量和orderPrice汇总") + // 根据brokerId和时间范围查询每天的记录数量和orderPrice汇总 @GetMapping("/{id}/record/summary") public ApiResponse> getDailySummaryByBrokerId( @PathVariable("id") Long brokerId, @@ -107,7 +105,7 @@ public class BrokerController { return ApiResponse.success(brokerRecordService.getDailySummaryByBrokerId(brokerId, startTime, endTime)); } - @ApiOperation("根据景区ID下载小程序二维码") + // 根据景区ID下载小程序二维码 @GetMapping("/{id}/QRCode") public ApiResponse downloadQrCode(@PathVariable Long id) { BrokerRespVO broker = brokerService.getById(id); diff --git a/src/main/java/com/ycwl/basic/controller/pc/CouponController.java b/src/main/java/com/ycwl/basic/controller/pc/CouponController.java index c4bb84d..4603caf 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/CouponController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/CouponController.java @@ -8,8 +8,6 @@ import com.ycwl.basic.model.pc.coupon.resp.CouponRespVO; import com.ycwl.basic.model.pc.price.resp.GoodsListRespVO; import com.ycwl.basic.service.pc.CouponService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -17,7 +15,7 @@ import java.util.List; @RestController @RequestMapping("/api/coupon/v1") -@Api(tags = "优惠券管理") +// 优惠券管理 public class CouponController { @Autowired private CouponService couponService; @@ -31,13 +29,13 @@ public class CouponController { return ApiResponse.success(data); } - @ApiOperation("新增优惠券") + // 新增优惠券 @PostMapping("/add") public ApiResponse add(@RequestBody CouponEntity coupon) { return ApiResponse.success(couponService.add(coupon)); } - @ApiOperation("更新优惠券") + // 更新优惠券 @PostMapping("/update/{id}") public ApiResponse update(@PathVariable Integer id, @RequestBody CouponEntity coupon) { coupon.setId(id); @@ -49,19 +47,19 @@ public class CouponController { return ApiResponse.success(couponService.updateStatus(id)); } - @ApiOperation("删除优惠券") + // 删除优惠券 @DeleteMapping("/delete/{id}") public ApiResponse delete(@PathVariable Integer id) { return ApiResponse.success(couponService.delete(id)); } - @ApiOperation("根据ID查询优惠券") + // 根据ID查询优惠券 @GetMapping("/get/{id}") public ApiResponse getById(@PathVariable Integer id) { return ApiResponse.success(couponService.getById(id)); } - @ApiOperation("分页查询优惠券列表") + // 分页查询优惠券列表 @PostMapping("/page") public ApiResponse> list(@RequestBody CouponQueryReq couponQuery) { PageHelper.startPage(couponQuery.getPageNum(), couponQuery.getPageSize()); diff --git a/src/main/java/com/ycwl/basic/controller/pc/DeviceController.java b/src/main/java/com/ycwl/basic/controller/pc/DeviceController.java index 92887d1..abd2e1c 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/DeviceController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/DeviceController.java @@ -10,8 +10,6 @@ import com.ycwl.basic.model.pc.device.resp.DeviceRespVO; import com.ycwl.basic.model.pc.template.req.TemplateSortRequest; import com.ycwl.basic.service.pc.DeviceService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,43 +19,43 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequestMapping("/api/device/v1") -@Api(tags = "设备管理") +// 设备管理 public class DeviceController { @Autowired private DeviceService deviceService; - @ApiOperation("设备分页查询") + // 设备分页查询 @PostMapping("/page") public ApiResponse> pageQuery(@RequestBody DeviceReqQuery deviceReqQuery) { return deviceService.pageQuery(deviceReqQuery); } - @ApiOperation("设备列表查询") + // 设备列表查询 @PostMapping("/list") public ApiResponse list(@RequestBody DeviceReqQuery deviceReqQuery) { return deviceService.list(deviceReqQuery); } - @ApiOperation("设备详情查询") + // 设备详情查询 @GetMapping("/getDetails/{id}") public ApiResponse getDetails(@PathVariable("id") Long id) { return deviceService.getById(id); } - @ApiOperation("新增或修改设备") + // 新增或修改设备 @PostMapping("/addOrUpdate") public ApiResponse addOrUpdate(@RequestBody DeviceAddOrUpdateReq deviceReqQuery) { return deviceService.addOrUpdate(deviceReqQuery); } - @ApiOperation("删除设备") + // 删除设备 @DeleteMapping("/delete/{id}") public ApiResponse delete(@PathVariable("id") Long id) { return deviceService.deleteById(id); } - @ApiOperation("修改设备状态") + // 修改设备状态 @PutMapping("/updateStatus/{id}") public ApiResponse updateStatus(@PathVariable("id") Long id) { return deviceService.updateStatus(id); } - @ApiOperation("排序设备") + // 排序设备 @PostMapping("/sort") public ApiResponse sortDevice(@RequestBody DeviceSortRequest request) { return deviceService.sortDevice(request.getDeviceId(), request.getAfterDeviceId()); diff --git a/src/main/java/com/ycwl/basic/controller/pc/FaceController.java b/src/main/java/com/ycwl/basic/controller/pc/FaceController.java index 5bc5025..896a310 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/FaceController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/FaceController.java @@ -6,8 +6,6 @@ import com.ycwl.basic.model.pc.face.req.FaceReqQuery; import com.ycwl.basic.model.pc.face.resp.FaceRespVO; import com.ycwl.basic.service.pc.FaceService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -19,37 +17,37 @@ import java.util.List; */ @RestController @RequestMapping("/api/face/v1") -@Api(tags = "用户人脸管理") +// 用户人脸管理 public class FaceController { @Autowired private FaceService faceService; - @ApiOperation("分页查询用户人脸") + // 分页查询用户人脸 @PostMapping("/page") public ApiResponse> pageQuery(@RequestBody FaceReqQuery faceReqQuery) { return faceService.pageQuery(faceReqQuery); } - @ApiOperation("用户人脸列表查询") + // 用户人脸列表查询 @PostMapping("/list") public ApiResponse> list(@RequestBody FaceReqQuery faceReqQuery) { return faceService.list(faceReqQuery); } - @ApiOperation("用户人脸详情查询") + // 用户人脸详情查询 @GetMapping("/getDetail/{id}") public ApiResponse getDetail(@PathVariable("id") Long id) { return faceService.getById(id); } - @ApiOperation("添加用户人脸信息") + // 添加用户人脸信息 @PostMapping("/add") public ApiResponse add(@RequestBody FaceEntity face) { return faceService.add(face); } - @ApiOperation("删除用户人脸信息") + // 删除用户人脸信息 @PostMapping("/deleteById/{id}") public ApiResponse deleteById(@PathVariable Long id) { return faceService.deleteById(id); } - @ApiOperation("批量删除用户人脸") + // 批量删除用户人脸 @PostMapping("/deleteByIds") public ApiResponse deleteByIds(@RequestBody List ids) { return faceService.deleteByIds(ids); diff --git a/src/main/java/com/ycwl/basic/controller/pc/FaceSampleController.java b/src/main/java/com/ycwl/basic/controller/pc/FaceSampleController.java index d62f318..2fceee3 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/FaceSampleController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/FaceSampleController.java @@ -6,8 +6,6 @@ import com.ycwl.basic.model.pc.faceSample.req.FaceSampleReqQuery; import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO; import com.ycwl.basic.service.pc.FaceSampleService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,22 +18,22 @@ import java.util.List; @Deprecated @RestController @RequestMapping("/api/faceSample/v1") -@Api(tags = "人脸样本管理") +// 人脸样本管理 public class FaceSampleController { @Autowired private FaceSampleService FaceSampleService; - @ApiOperation("分页查询人脸样本") + // 分页查询人脸样本 @PostMapping("/page") public ApiResponse> pageQuery(@RequestBody FaceSampleReqQuery FaceSampleReqQuery) { return FaceSampleService.pageQuery(FaceSampleReqQuery); } - @ApiOperation("人脸样本列表查询") + // 人脸样本列表查询 @PostMapping("/list") public ApiResponse> list(@RequestBody FaceSampleReqQuery FaceSampleReqQuery) { return FaceSampleService.list(FaceSampleReqQuery); } - @ApiOperation("人脸样本详情查询") + // 人脸样本详情查询 @GetMapping("/getDetail/{id}") public ApiResponse getDetail(@PathVariable("id") Long id) { return FaceSampleService.getById(id); diff --git a/src/main/java/com/ycwl/basic/controller/pc/MemberController.java b/src/main/java/com/ycwl/basic/controller/pc/MemberController.java index 1b7e732..42c3d67 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/MemberController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/MemberController.java @@ -6,8 +6,6 @@ import com.ycwl.basic.model.pc.member.req.MemberReqQuery; import com.ycwl.basic.model.pc.member.resp.MemberRespVO; import com.ycwl.basic.service.pc.MemberService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -19,37 +17,37 @@ import java.util.List; */ @RestController @RequestMapping("/api/member/v1") -@Api(tags = "前台用户管理") +// 前台用户管理 public class MemberController { @Autowired private MemberService memberService; - @ApiOperation("前台用户分页查询") + // 前台用户分页查询 @PostMapping("/page") public ApiResponse> pageQuery(@RequestBody MemberReqQuery memberReqQuery) { return memberService.pageQuery(memberReqQuery); } - @ApiOperation("前台用户列表查询") + // 前台用户列表查询 @PostMapping("/list") public ApiResponse> list(@RequestBody MemberReqQuery memberReqQuery) { return memberService.list(memberReqQuery); } - @ApiOperation("前台用户详情查询") + // 前台用户详情查询 @GetMapping("/getDetail/{id}") public ApiResponse getDetail(@PathVariable("id") Long id) { return memberService.getById(id); } - @ApiOperation("前台用户删除") + // 前台用户删除 @DeleteMapping("/delete/{id}") public ApiResponse delete(@PathVariable("id") Long id) { return memberService.deleteById(id); } - @ApiOperation("前台用户新增") + // 前台用户新增 @PostMapping("/add") public ApiResponse add(@RequestBody MemberEntity member) { return memberService.add(member); } - @ApiOperation("前台用户修改") + // 前台用户修改 @PostMapping("/update") public ApiResponse update(@RequestBody MemberEntity member) { return memberService.update(member); diff --git a/src/main/java/com/ycwl/basic/controller/pc/OrderController.java b/src/main/java/com/ycwl/basic/controller/pc/OrderController.java index 42b32f2..4137e22 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/OrderController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/OrderController.java @@ -7,8 +7,6 @@ import com.ycwl.basic.model.pc.order.req.OrderReqQuery; import com.ycwl.basic.model.pc.order.resp.OrderRespVO; import com.ycwl.basic.service.pc.OrderService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,38 +18,38 @@ import java.util.List; */ @RestController @RequestMapping("/api/order/v1") -@Api(tags = "订单管理") +// 订单管理 public class OrderController { @Autowired private OrderService orderService; - @ApiOperation(value = "审核退款", notes = "审核退款") + // 审核退款: 审核退款 @PostMapping("/auditRefundOrder") public ApiResponse auditRefundOrder(@RequestBody RefundOrderReq refundOrderReq) { return orderService.auditRefundOrder(refundOrderReq); } - @ApiOperation("分页查询订单") + // 分页查询订单 @PostMapping("page") public ApiResponse> pageQuery(@RequestBody OrderReqQuery query) { return orderService.pageQuery(query); } - @ApiOperation("订单列表查询") + // 订单列表查询 @PostMapping("list") public ApiResponse> list(@RequestBody OrderReqQuery query) { return orderService.list(query); } - @ApiOperation("订单详情查询") + // 订单详情查询 @GetMapping("detail/{id}") public ApiResponse detail(@PathVariable("id") Long orderId) { return orderService.detail(orderId); } - @ApiOperation("订单备注") + // 订单备注 @PostMapping("remark/{id}") public ApiResponse updateRemark(@PathVariable("id") Long orderId, @RequestBody OrderEntity query) { orderService.remarkOrder(orderId, query); diff --git a/src/main/java/com/ycwl/basic/controller/pc/PermissionController.java b/src/main/java/com/ycwl/basic/controller/pc/PermissionController.java index f51643d..df12ccb 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/PermissionController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/PermissionController.java @@ -10,8 +10,6 @@ import com.ycwl.basic.model.pc.role.resp.RolePermissionResp; import com.ycwl.basic.service.pc.PermissionService; import com.ycwl.basic.service.pc.RoleService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -28,7 +26,7 @@ import static com.ycwl.basic.constant.JwtRoleConstant.MERCHANT; @RestController @RequestMapping("/api/permission/v1") -@Api(tags = "权限管理接口") +// 权限管理接口 public class PermissionController { @Autowired private PermissionService permissionService; @@ -57,7 +55,7 @@ public class PermissionController { } } - @ApiOperation("根据用户ID查询权限信息") + // 根据用户ID查询权限信息 @GetMapping("/get/{userId}") public ApiResponse getPermissionByUser(@PathVariable Long userId) { PermissionEntity permission = permissionService.getPermissionByUserId(userId); @@ -67,7 +65,7 @@ public class PermissionController { return ApiResponse.success(new PermissionResp(Arrays.asList(StringUtils.split(permission.getPermString(), ",")), Arrays.asList(StringUtils.split(permission.getMenuString(), ",")))); } - @ApiOperation("保存或更新权限信息") + // 保存或更新权限信息 @PostMapping("/save/{userId}") public ApiResponse saveOrUpdate(@PathVariable Long userId, @RequestBody PermissionSaveReq req) { permissionService.saveOrUpdate(userId, StringUtils.join(req.getPermissions(), ","), StringUtils.join(req.getMenus(), ",")); diff --git a/src/main/java/com/ycwl/basic/controller/pc/PrinterController.java b/src/main/java/com/ycwl/basic/controller/pc/PrinterController.java index 0b3c6e6..f1d3cf4 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/PrinterController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/PrinterController.java @@ -3,8 +3,6 @@ package com.ycwl.basic.controller.pc; import com.ycwl.basic.model.pc.printer.entity.PrinterEntity; import com.ycwl.basic.service.printer.PrinterService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -22,31 +20,31 @@ public class PrinterController { @Autowired private PrinterService printerService; - @ApiOperation("查询列表") + // 查询列表 @PostMapping("/list") public ApiResponse> list(@RequestBody PrinterEntity condition) { return printerService.list(condition); } - @ApiOperation("获取详情") + // 获取详情 @GetMapping("/get/{id}") public ApiResponse get(@PathVariable("id") Integer id) { return printerService.get(id); } - @ApiOperation("新增") + // 新增 @PostMapping("/add") public ApiResponse add(@RequestBody PrinterEntity entity) { return printerService.add(entity); } - @ApiOperation("更新") + // 更新 @PostMapping("/update") public ApiResponse update(@RequestBody PrinterEntity entity) { return printerService.update(entity); } - @ApiOperation("删除") + // 删除 @DeleteMapping("/delete/{id}") public ApiResponse delete(@PathVariable("id") Integer id) { return printerService.delete(id); diff --git a/src/main/java/com/ycwl/basic/controller/pc/RefundController.java b/src/main/java/com/ycwl/basic/controller/pc/RefundController.java index ce82aa2..f2a59c0 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/RefundController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/RefundController.java @@ -7,8 +7,6 @@ import com.ycwl.basic.model.pc.order.req.OrderReqQuery; import com.ycwl.basic.model.pc.order.resp.OrderRespVO; import com.ycwl.basic.service.pc.OrderService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -25,38 +23,38 @@ import java.util.List; */ @RestController @RequestMapping("/api/refund/v1") -@Api(tags = "退款订单管理") +// 退款订单管理 public class RefundController { @Autowired private OrderService orderService; - @ApiOperation(value = "审核退款", notes = "审核退款") + // 审核退款: 审核退款 @PostMapping("/auditRefundOrder") public ApiResponse auditRefundOrder(@RequestBody RefundOrderReq refundOrderReq) { return orderService.auditRefundOrder(refundOrderReq); } - @ApiOperation("分页查询订单") + // 分页查询订单 @PostMapping("page") public ApiResponse> pageQuery(@RequestBody OrderReqQuery query) { return orderService.refundPageQuery(query); } - @ApiOperation("订单列表查询") + // 订单列表查询 @PostMapping("list") public ApiResponse> list(@RequestBody OrderReqQuery query) { return orderService.list(query); } - @ApiOperation("订单详情查询") + // 订单详情查询 @GetMapping("detail/{id}") public ApiResponse detail(@PathVariable("id") Long orderId) { return orderService.detail(orderId); } - @ApiOperation("订单备注") + // 订单备注 @PostMapping("remark/{id}") public ApiResponse updateRemark(@PathVariable("id") Long orderId, @RequestBody OrderEntity query) { orderService.remarkOrder(orderId, query); diff --git a/src/main/java/com/ycwl/basic/controller/pc/RenderWorkerController.java b/src/main/java/com/ycwl/basic/controller/pc/RenderWorkerController.java index 25fb3a9..d200d86 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/RenderWorkerController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/RenderWorkerController.java @@ -4,8 +4,6 @@ import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity; import com.ycwl.basic.model.pc.renderWorker.req.RenderWorkerReqQuery; import com.ycwl.basic.service.pc.RenderWorkerService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -15,47 +13,47 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequestMapping("/api/renderWorker/v1") -@Api(tags = "渲染机管理") +// 渲染机管理 public class RenderWorkerController { @Autowired private RenderWorkerService renderWorkerService; - @ApiOperation("分页查询渲染机") + // 分页查询渲染机 @PostMapping("/page") public ApiResponse pageQuery(@RequestBody RenderWorkerReqQuery renderWorkerReqQuery){ return renderWorkerService.pageQuery(renderWorkerReqQuery); } - @ApiOperation("渲染机列表查询") + // 渲染机列表查询 @PostMapping("/list") public ApiResponse list(@RequestBody RenderWorkerReqQuery renderWorkerReqQuery){ return renderWorkerService.list(renderWorkerReqQuery); } - @ApiOperation("渲染机详情查询") + // 渲染机详情查询 @GetMapping("/detail/{id}") public ApiResponse detail(@PathVariable Long id){ return renderWorkerService.detail(id); } - @ApiOperation("渲染机新增") + // 渲染机新增 @PostMapping("/add") public ApiResponse add(@RequestBody RenderWorkerEntity renderWorker){ return renderWorkerService.add(renderWorker); } - @ApiOperation("渲染机删除") + // 渲染机删除 @DeleteMapping("/delete/{id}") public ApiResponse deleteById(@PathVariable Long id){ return renderWorkerService.deleteById(id); } - @ApiOperation("渲染机修改") + // 渲染机修改 @PostMapping("/update") public ApiResponse update(@RequestBody RenderWorkerEntity renderWorker){ return renderWorkerService.update(renderWorker); } - @ApiOperation("渲染机修改状态") + // 渲染机修改状态 @PutMapping("/updateStatus/{id}") public ApiResponse updateStatus(@PathVariable Long id) { return renderWorkerService.updateStatus(id); diff --git a/src/main/java/com/ycwl/basic/controller/pc/RoleController.java b/src/main/java/com/ycwl/basic/controller/pc/RoleController.java index 41f294f..8d50202 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/RoleController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/RoleController.java @@ -9,8 +9,6 @@ import com.ycwl.basic.model.pc.role.resp.RoleListRespVO; import com.ycwl.basic.model.pc.role.resp.RolePermissionResp; import com.ycwl.basic.service.pc.RoleService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,24 +18,24 @@ import java.util.List; @RestController @RequestMapping("/api/role/v1") -@Api(tags = "系统角色管理") +// 系统角色管理 public class RoleController { @Autowired RoleService roleService; @PostMapping(value = "/page") - @ApiOperation(value = "角色列表分页查询") + // 角色列表分页查询 public ApiResponse> page(@RequestBody RoleListReqVO roleListReqVO) { return roleService.pageQuery(roleListReqVO); } @PostMapping(value = "/list") - @ApiOperation(value = "角色列表") + // 角色列表 public ApiResponse> list(@RequestBody RoleListReqVO roleListReqVO) { return roleService.list(roleListReqVO); } @GetMapping("/{roleId}/permission") - @ApiOperation(value = "角色权限列表") + // 角色权限列表 public ApiResponse getPermissionByRoleId(@PathVariable("roleId") Long roleId) { RolePermissionResp permission = roleService.getPermissionByRoleId(roleId); if (permission == null) { @@ -47,19 +45,19 @@ public class RoleController { } @PostMapping(value = "/addOrUpdate") - @ApiOperation(value = "添加或更新角色") + // 添加或更新角色 public ApiResponse addOrUpdate(@RequestBody AddOrUpdateRoleReqVO addOrUpdateRoleReqVO) { return roleService.addOrUpdate(addOrUpdateRoleReqVO); } @GetMapping(value = "/delete/{id}") - @ApiOperation(value = "删除") + // 删除 public ApiResponse delete(@PathVariable("id") String id) { return roleService.delete(id); } @GetMapping(value = "/updateReturnMenu/{id}") - @ApiOperation(value = "编辑回显该角色当前菜单") + // 编辑回显该角色当前菜单 public ApiResponse updateReturnMenu(@PathVariable("id") String id) { return roleService.updateReturnMenu(id); } @@ -67,7 +65,7 @@ public class RoleController { @GetMapping(value = "/updateStatus/{id}") - @ApiOperation(value = "更改角色类型状态") + // 更改角色类型状态 public ApiResponse updateStatus(@PathVariable("id") String id) { return roleService.updateStatus(id); } diff --git a/src/main/java/com/ycwl/basic/controller/pc/ScenicController.java b/src/main/java/com/ycwl/basic/controller/pc/ScenicController.java index fe9b24a..afd3971 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/ScenicController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/ScenicController.java @@ -19,8 +19,6 @@ import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.WxMpUtil; import com.ycwl.basic.repository.ScenicRepository; import com.ycwl.basic.model.pc.mp.MpConfigEntity; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,7 +35,7 @@ import static com.ycwl.basic.constant.JwtRoleConstant.MERCHANT; */ @RestController @RequestMapping("/api/scenic/v1") -@Api(tags = "景区管理") +// 景区管理 public class ScenicController { @Autowired @@ -52,53 +50,53 @@ public class ScenicController { @Autowired private ScenicAccountService accountService; - @ApiOperation("分页查询景区") + // 分页查询景区 @PostMapping("/page") public ApiResponse> pageQuery(@RequestBody ScenicReqQuery scenicReqQuery) { return scenicService.pageQuery(scenicReqQuery); } - @ApiOperation("查询景区列表") + // 查询景区列表 @PostMapping("/list") public ApiResponse> list(@RequestBody ScenicReqQuery scenicReqQuery) { return scenicService.list(scenicReqQuery); } - @ApiOperation("查询景区详情") + // 查询景区详情 @GetMapping("/getDetail/{id}") public ApiResponse getDetail(@PathVariable Long id) { return scenicService.getById(id); } - @ApiOperation("新增景区") + // 新增景区 @PostMapping("/add") public ApiResponse add(@RequestBody ScenicAddOrUpdateReq scenicAddReq) { return scenicService.add(scenicAddReq); } - @ApiOperation("删除景区") + // 删除景区 @GetMapping("/delete/{id}") public ApiResponse delete(@PathVariable Long id) { return scenicService.deleteById(id); } - @ApiOperation("修改景区") + // 修改景区 @PostMapping("/update") public ApiResponse update(@RequestBody ScenicAddOrUpdateReq scenicAddReq) { return scenicService.update(scenicAddReq); } - @ApiOperation("修改景区状态") + // 修改景区状态 @GetMapping("/updateStatus/{id}") public ApiResponse updateStatus(@PathVariable Long id) { return scenicService.updateStatus(id); } - @ApiOperation("新增景区配置") + // 新增景区配置 @PostMapping("/addConfig") public ApiResponse addConfig(@RequestBody ScenicConfigEntity scenicConfig) { return scenicService.addConfig(scenicConfig); } - @ApiOperation("修改景区配置") + // 修改景区配置 @PostMapping("/updateConfig") public ApiResponse updateConfig(@RequestBody ScenicConfigEntity scenicConfig) { return scenicService.updateConfigById(scenicConfig); } - @ApiOperation("查询景区配置") + // 查询景区配置 @GetMapping("/config/{id}") public ApiResponse getConfig(@PathVariable("id") Long id) { return ApiResponse.success(scenicService.getConfig(id)); @@ -114,7 +112,7 @@ public class ScenicController { return ApiResponse.success(null); } - @ApiOperation("根据景区ID下载小程序二维码") + // 根据景区ID下载小程序二维码 @GetMapping("/{id}/QRCode") public ApiResponse downloadQrCode(@PathVariable Long id) { MpConfigEntity mpConfig = scenicRepository.getScenicMpConfig(id); diff --git a/src/main/java/com/ycwl/basic/controller/pc/SourceController.java b/src/main/java/com/ycwl/basic/controller/pc/SourceController.java index 1c2b1c1..14ebbe2 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/SourceController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/SourceController.java @@ -7,8 +7,6 @@ import com.ycwl.basic.model.pc.source.req.SourceReqQuery; import com.ycwl.basic.service.pc.SourceService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.JwtTokenUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -18,20 +16,20 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequestMapping("/api/source/v1") -@Api(tags = "视频源管理") +// 视频源管理 public class SourceController { @Autowired private SourceService sourceService; @Deprecated - @ApiOperation("分页查询视频源") + // 分页查询视频源 @PostMapping("/page") public ApiResponse pageQuery(@RequestBody SourceReqQuery sourceReqQuery) { return sourceService.pageQuery(sourceReqQuery); } @Deprecated - @ApiOperation("查询视频源列表") + // 查询视频源列表 @PostMapping("/list") public ApiResponse list(@RequestBody SourceReqQuery sourceReqQuery) { return sourceService.list(sourceReqQuery); @@ -42,7 +40,7 @@ public class SourceController { return sourceService.cutVideo(id); } @Deprecated - @ApiOperation("删除视频源") + // 删除视频源 @DeleteMapping("/delete/{id}") public ApiResponse deleteById(@PathVariable Long id) { return sourceService.deleteById(id); diff --git a/src/main/java/com/ycwl/basic/controller/pc/TaskController.java b/src/main/java/com/ycwl/basic/controller/pc/TaskController.java index 73049c0..2009c6f 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/TaskController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/TaskController.java @@ -4,8 +4,6 @@ import com.ycwl.basic.model.pc.task.entity.TaskEntity; import com.ycwl.basic.model.pc.task.req.TaskReqQuery; import com.ycwl.basic.service.pc.TaskService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -16,38 +14,38 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/task/v1") @Deprecated -@Api(tags = "任务列表管理") +// 任务列表管理 public class TaskController { @Autowired private TaskService taskService; - @ApiOperation("分页查询任务列表") + // 分页查询任务列表 @PostMapping("/page") public ApiResponse pageQuery(@RequestBody TaskReqQuery taskReqQuery) { return taskService.pageQuery(taskReqQuery); } - @ApiOperation("查询任务列表") + // 查询任务列表 @PostMapping("/list") public ApiResponse list(@RequestBody TaskReqQuery taskReqQuery) { return taskService.list(taskReqQuery); } - @ApiOperation("查询任务详情") + // 查询任务详情 @GetMapping("/getDetail/{id}") public ApiResponse getById(@PathVariable Long id) { return taskService.getById(id); } - @ApiOperation("删除任务") + // 删除任务 @DeleteMapping("/delete/{id}") public ApiResponse deleteById(@PathVariable Long id) { return taskService.deleteById(id); } - @ApiOperation("修改任务") + // 修改任务 @PostMapping("/update") public ApiResponse update(@RequestBody TaskEntity taskEntity) { return taskService.update(taskEntity); } - @ApiOperation("修改任务状态") + // 修改任务状态 @PostMapping("/updateStatus") public ApiResponse updateStatus(@RequestParam Long id, @RequestParam Integer status) { return taskService.updateStatus(id,status); diff --git a/src/main/java/com/ycwl/basic/controller/pc/TemplateController.java b/src/main/java/com/ycwl/basic/controller/pc/TemplateController.java index 9dd288d..b721430 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/TemplateController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/TemplateController.java @@ -9,8 +9,6 @@ import com.ycwl.basic.model.pc.template.req.TemplateSortRequest; import com.ycwl.basic.model.pc.template.resp.TemplateRespVO; import com.ycwl.basic.service.pc.TemplateService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,49 +20,49 @@ import java.util.List; */ @RestController @RequestMapping("/api/template/v1") -@Api(tags = "模板管理") +// 模板管理 public class TemplateController { @Autowired private TemplateService templateService; - @ApiOperation("分页查询模板") + // 分页查询模板 @PostMapping("/page") public ApiResponse> pageQuery(@RequestBody TemplateReqQuery templateReqQuery) { return templateService.pageQuery(templateReqQuery); } - @ApiOperation("查询模板列表") + // 查询模板列表 @PostMapping("/list") public ApiResponse> list(@RequestBody TemplateReqQuery templateReqQuery) { return templateService.list(templateReqQuery); } - @ApiOperation("查询模板详情") + // 查询模板详情 @GetMapping("getDetail/{id}") public ApiResponse getById(@PathVariable Long id) { return templateService.getById(id); } - @ApiOperation("添加模板") + // 添加模板 @PostMapping("/add") public ApiResponse add(@RequestBody TemplateEntity template) { return templateService.add(template); } - @ApiOperation("删除模板") + // 删除模板 @DeleteMapping("/delete/{id}") public ApiResponse deleteById(@PathVariable Long id) { return templateService.deleteById(id); } - @ApiOperation("修改模板") + // 修改模板 @PostMapping("/update") public ApiResponse update(@RequestBody TemplateEntity template) { return templateService.update(template); } - @ApiOperation("修改模板状态") + // 修改模板状态 @PostMapping("/updateStatus/{id}") public ApiResponse updateStatus(@PathVariable("id") Long id) { return templateService.updateStatus(id); } - @ApiOperation("排序模板") + // 排序模板 @PostMapping("/sort") public ApiResponse sortTemplate(@RequestBody TemplateSortRequest request) { return templateService.sortTemplate(request.getTemplateId(), request.getAfterTemplateId()); diff --git a/src/main/java/com/ycwl/basic/controller/pc/VideoController.java b/src/main/java/com/ycwl/basic/controller/pc/VideoController.java index 067eaaa..adad59d 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/VideoController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/VideoController.java @@ -6,8 +6,6 @@ import com.ycwl.basic.model.pc.video.req.VideoReqQuery; import com.ycwl.basic.model.pc.video.resp.VideoRespVO; import com.ycwl.basic.service.pc.VideoService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,23 +19,23 @@ import java.util.List; @RestController @RequestMapping("/api/video/v1") @Deprecated -@Api(tags = "视频成片管理") +// 视频成片管理 public class VideoController { @Autowired private VideoService videoService; - @ApiOperation("分页查询成片") + // 分页查询成片 @PostMapping("/page") public ApiResponse> pageQuery(@RequestBody VideoReqQuery videoReqQuery) { return videoService.pageQuery(videoReqQuery); } - @ApiOperation("查询成片列表") + // 查询成片列表 @PostMapping("/list") public ApiResponse> list(@RequestBody VideoReqQuery videoReqQuery) { return videoService.list(videoReqQuery); } - @ApiOperation("查询成片详情") + // 查询成片详情 @GetMapping("/getDetail/{id}") public ApiResponse getById(@PathVariable Long id) { return videoService.getById(id); diff --git a/src/main/java/com/ycwl/basic/controller/printer/PrinterTaskController.java b/src/main/java/com/ycwl/basic/controller/printer/PrinterTaskController.java index ba45d19..b307a2a 100644 --- a/src/main/java/com/ycwl/basic/controller/printer/PrinterTaskController.java +++ b/src/main/java/com/ycwl/basic/controller/printer/PrinterTaskController.java @@ -7,14 +7,13 @@ import com.ycwl.basic.model.printer.resp.PrintTaskResp; import com.ycwl.basic.model.printer.resp.TaskSyncResp; import com.ycwl.basic.service.printer.PrinterService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @IgnoreToken -@Api(tags = "打印机对接接口") +// 打印机对接接口 @RestController @RequestMapping("/printer/v1") public class PrinterTaskController { diff --git a/src/main/java/com/ycwl/basic/controller/task/TaskTaskController.java b/src/main/java/com/ycwl/basic/controller/task/TaskTaskController.java index 68906e8..4ccb790 100644 --- a/src/main/java/com/ycwl/basic/controller/task/TaskTaskController.java +++ b/src/main/java/com/ycwl/basic/controller/task/TaskTaskController.java @@ -10,7 +10,6 @@ import com.ycwl.basic.model.task.req.WorkerAuthReqVo; import com.ycwl.basic.model.task.resp.TaskSyncRespVo; import com.ycwl.basic.service.task.TaskService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -21,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; @IgnoreToken @RestController -@Api(tags = "渲染端对接接口") +// 渲染端对接接口 @RequestMapping("/task/v1/") public class TaskTaskController { diff --git a/src/main/java/com/ycwl/basic/controller/viid/ViidController.java b/src/main/java/com/ycwl/basic/controller/viid/ViidController.java index aa0deed..b05698c 100644 --- a/src/main/java/com/ycwl/basic/controller/viid/ViidController.java +++ b/src/main/java/com/ycwl/basic/controller/viid/ViidController.java @@ -43,7 +43,6 @@ import com.ycwl.basic.task.DynamicTaskGenerator; import com.ycwl.basic.utils.ImageUtils; import com.ycwl.basic.utils.IpUtils; import com.ycwl.basic.utils.SnowFlakeUtil; -import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -75,7 +74,7 @@ import static com.ycwl.basic.constant.StorageConstant.VIID_FACE; @IgnoreToken @RestController -@Api(tags = "摄像头对接接口") +// 摄像头对接接口 @RequestMapping("/VIID") @Slf4j public class ViidController { diff --git a/src/main/java/com/ycwl/basic/controller/vpt/VptController.java b/src/main/java/com/ycwl/basic/controller/vpt/VptController.java index 120d1ad..6f8d815 100644 --- a/src/main/java/com/ycwl/basic/controller/vpt/VptController.java +++ b/src/main/java/com/ycwl/basic/controller/vpt/VptController.java @@ -11,7 +11,6 @@ import com.ycwl.basic.storage.adapters.IStorageAdapter; import com.ycwl.basic.storage.enums.StorageAcl; import com.ycwl.basic.storage.utils.StorageUtil; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; @@ -26,7 +25,7 @@ import java.util.List; @Slf4j @IgnoreToken @RestController -@Api(tags = "自定义切片工具对接接口") +// 自定义切片工具对接接口 @RequestMapping("/vpt/v1/") public class VptController { diff --git a/src/main/java/com/ycwl/basic/controller/wvp/WvpController.java b/src/main/java/com/ycwl/basic/controller/wvp/WvpController.java index 31ca6fc..6d772f2 100644 --- a/src/main/java/com/ycwl/basic/controller/wvp/WvpController.java +++ b/src/main/java/com/ycwl/basic/controller/wvp/WvpController.java @@ -12,7 +12,6 @@ import com.ycwl.basic.storage.adapters.IStorageAdapter; import com.ycwl.basic.storage.enums.StorageAcl; import com.ycwl.basic.storage.utils.StorageUtil; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; @@ -27,7 +26,7 @@ import java.util.List; @Slf4j @IgnoreToken @RestController -@Api(tags = "WVP对接接口") +// WVP对接接口 @RequestMapping("/wvp/v1/") public class WvpController { diff --git a/src/main/java/com/ycwl/basic/interceptor/AuthInterceptor.java b/src/main/java/com/ycwl/basic/interceptor/AuthInterceptor.java index 3c28059..25d0118 100644 --- a/src/main/java/com/ycwl/basic/interceptor/AuthInterceptor.java +++ b/src/main/java/com/ycwl/basic/interceptor/AuthInterceptor.java @@ -63,11 +63,6 @@ public class AuthInterceptor implements HandlerInterceptor { return true; } - // 放行白名单 - if (getWhite(request.getRequestURI())) { - return true; - } - /* 验证token */ @@ -156,16 +151,6 @@ public class AuthInterceptor implements HandlerInterceptor { return token; } - - //白名单swagger2 - private boolean getWhite(String path) { - return StringUtils.containsAny( - path, - "springfox", "swagger", "v2", - "webjars", "doc.html", "favicon.ico" - ); - } - /** * 业务接口白名单 * diff --git a/src/main/java/com/ycwl/basic/model/common/BaseQueryParameterReq.java b/src/main/java/com/ycwl/basic/model/common/BaseQueryParameterReq.java index c370d94..e299b86 100644 --- a/src/main/java/com/ycwl/basic/model/common/BaseQueryParameterReq.java +++ b/src/main/java/com/ycwl/basic/model/common/BaseQueryParameterReq.java @@ -1,19 +1,17 @@ package com.ycwl.basic.model.common; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @date 2021年10月26日 14:09 */ -@ApiModel(value = "公共查询参数实体类", description = "公共查询参数实体类") +// 公共查询参数实体类: 公共查询参数实体类 @Data public class BaseQueryParameterReq { - @ApiModelProperty(value = "当前页数") + // 当前页数 private Integer pageNum = 1; - @ApiModelProperty(value = "每页条数") + // 每页条数 private Integer pageSize = 10; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java index 8e9e198..8910c04 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsDetailVO.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.mobile.goods; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -15,31 +13,31 @@ import java.util.Date; * @Date：2024/12/5 15:10 */ @Data -@ApiModel("商品详情") +// 商品详情 public class GoodsDetailVO { - @ApiModelProperty("商品名称") + // 商品名称 private String goodsName; - @ApiModelProperty("人脸id") + // 人脸id private Long faceId; - @ApiModelProperty("景区id") + // 景区id private Long scenicId; - @ApiModelProperty("景区名称") + // 景区名称 private String scenicName; - @ApiModelProperty("商品类型 1:成片视频 2:源素材") + // 商品类型 1:成片视频 2:源素材 private Integer goodsType; - @ApiModelProperty("商品id goodsType=1时为videoId，goodsType=2时为sourceId") + // 商品id goodsType=1时为videoId，goodsType=2时为sourceId private Long goodsId; - @ApiModelProperty("模版封面图片") + // 模版封面图片 private String templateCoverUrl; - @ApiModelProperty("图片文件存储地址") + // 图片文件存储地址 private String url; - @ApiModelProperty("视频文件存储地址") + // 视频文件存储地址 private String videoUrl; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; - @ApiModelProperty("价格") + // 价格 private BigDecimal price; - @ApiModelProperty("是否已购买 0否 1是") + // 是否已购买 0否 1是 private Integer isBuy; private Integer isFree; private Integer parts; diff --git a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsPageVO.java b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsPageVO.java index 336772d..406e05e 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsPageVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsPageVO.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.goods; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -11,22 +9,22 @@ import java.math.BigDecimal; * @Date：2024/12/5 15:10 */ @Data -@ApiModel("移动端商品列表响应信息") +// 移动端商品列表响应信息 public class GoodsPageVO { - @ApiModelProperty("商品名称") + // 商品名称 private String goodsName; - @ApiModelProperty("景区id") + // 景区id private Long scenicId; private Long faceId; - @ApiModelProperty("景区名称") + // 景区名称 private String scenicName; - @ApiModelProperty("商品类型 1:成片视频 2:源素材") + // 商品类型 1:成片视频 2:源素材 private Integer goodsType; - @ApiModelProperty("源素材类型 1:视频 2:图片") + // 源素材类型 1:视频 2:图片 private Integer sourceType; - @ApiModelProperty("商品（vlog）id goodsType为1时才有值") + // 商品（vlog）id goodsType为1时才有值 private Long goodsId; private String templateName; - @ApiModelProperty("模版封面图片") + // 模版封面图片 private String templateCoverUrl; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsPriceQueryReq.java b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsPriceQueryReq.java index 2079ea8..02efbcc 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsPriceQueryReq.java +++ b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsPriceQueryReq.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.goods; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -11,12 +9,12 @@ import lombok.experimental.Accessors; */ @Accessors(chain = true) @Data -@ApiModel("查询商品价格请求参数") +// 查询商品价格请求参数 public class GoodsPriceQueryReq { - @ApiModelProperty("景区id") + // 景区id private Long scenicId; - @ApiModelProperty("商品类型 0:成片vlog 12:源素材") + // 商品类型 0:成片vlog 12:源素材 private Integer goodsType; - @ApiModelProperty("商品id goodsType=0时才有值") + // 商品id goodsType=0时才有值 private Long goodsId; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsReqQuery.java b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsReqQuery.java index d77b333..fef01d8 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsReqQuery.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.goods; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -9,14 +7,14 @@ import lombok.Data; * @Date：2024/12/5 15:40 */ @Data -@ApiModel(value = "商品查询对象") +// 商品查询对象 public class GoodsReqQuery { - @ApiModelProperty("是否已购买 0否 1是") + // 是否已购买 0否 1是 private Integer isBuy; private Long faceId; private Long goodsId; - @ApiModelProperty("景区id") + // 景区id private Long scenicId; - @ApiModelProperty("源素材商品类型 1视频 2图像") + // 源素材商品类型 1视频 2图像 private Integer sourceType; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsUrlVO.java b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsUrlVO.java index 182fd7a..83567b8 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsUrlVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/goods/GoodsUrlVO.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.mobile.goods; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -13,13 +11,13 @@ import java.util.Date; * @Date：2024/12/5 15:10 */ @Data -@ApiModel("商品详情") +// 商品详情 public class GoodsUrlVO { - @ApiModelProperty("商品类型 0:vlog 1:成片视频 2:源素材") + // 商品类型 0:vlog 1:成片视频 2:源素材 private Integer goodsType; - @ApiModelProperty("商品id goodsType=0时为videoId，goodsType=2时为sourceId") + // 商品id goodsType=0时为videoId，goodsType=2时为sourceId private Long goodsId; - @ApiModelProperty("图片文件存储地址") + // 图片文件存储地址 private String url; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; diff --git a/src/main/java/com/ycwl/basic/model/mobile/goods/VideoGoodsDetailVO.java b/src/main/java/com/ycwl/basic/model/mobile/goods/VideoGoodsDetailVO.java index 820cb00..2af781c 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/goods/VideoGoodsDetailVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/goods/VideoGoodsDetailVO.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.mobile.goods; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -13,40 +11,40 @@ import java.util.Date; * @Date：2024/12/5 15:10 */ @Data -@ApiModel("vlog商品详情") +// vlog商品详情 public class VideoGoodsDetailVO { - @ApiModelProperty("商品名称") + // 商品名称 private String goodsName; - @ApiModelProperty("景区id") + // 景区id private Long scenicId; - @ApiModelProperty("景区名称") + // 景区名称 private String scenicName; - @ApiModelProperty("经度") + // 经度 private BigDecimal longitude; - @ApiModelProperty("纬度") + // 纬度 private BigDecimal latitude; - @ApiModelProperty("商品类型 1:成片视频 2:源素材") + // 商品类型 1:成片视频 2:源素材 private Integer goodsType; - @ApiModelProperty("源素材类型 1:视频 2:图片") + // 源素材类型 1:视频 2:图片 private Integer sourceType; - @ApiModelProperty("商品id goodsType=1时为videoId，goodsType=2时为sourceId") + // 商品id goodsType=1时为videoId，goodsType=2时为sourceId private Long goodsId; - @ApiModelProperty("模版封面图片") + // 模版封面图片 private String templateCoverUrl; - @ApiModelProperty("图片文件存储地址") + // 图片文件存储地址 private String url; - @ApiModelProperty("视频文件存储地址") + // 视频文件存储地址 private String videoUrl; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date shotTime; - @ApiModelProperty("价格") + // 价格 private String price; private String slashPrice; - @ApiModelProperty("是否已购买 0否 1是") + // 是否已购买 0否 1是 private Integer isBuy; - @ApiModelProperty("镜头数") + // 镜头数 private Integer lensNum; private Long faceId; private boolean share = false; diff --git a/src/main/java/com/ycwl/basic/model/mobile/index/TopStateResp.java b/src/main/java/com/ycwl/basic/model/mobile/index/TopStateResp.java index 3955536..a5ed8c7 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/index/TopStateResp.java +++ b/src/main/java/com/ycwl/basic/model/mobile/index/TopStateResp.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.mobile.index; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -12,10 +10,10 @@ import lombok.Data; * @Version: 1.0 */ @Data -@ApiModel("顶部状态") +// 顶部状态 public class TopStateResp { - @ApiModelProperty("是否录入有效人脸") + // 是否录入有效人脸 private Boolean isFace = false; - @ApiModelProperty("AI合成了多少个视频，null时没有合成的视频") + // AI合成了多少个视频，null时没有合成的视频 private Integer aiVideoNum; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/order/OrderAppPageReq.java b/src/main/java/com/ycwl/basic/model/mobile/order/OrderAppPageReq.java index a651f50..676505d 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/order/OrderAppPageReq.java +++ b/src/main/java/com/ycwl/basic/model/mobile/order/OrderAppPageReq.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.mobile.order; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,9 +13,9 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel(value = "移动端订单查询对象") +// 移动端订单查询对象 public class OrderAppPageReq extends BaseQueryParameterReq { - @ApiModelProperty(value = "用户id",hidden = true) + // 用户id private Long memberId; // /** // * 微信openId @@ -84,6 +82,6 @@ public class OrderAppPageReq extends BaseQueryParameterReq { // private Date startRefundTime; // private Date endRefundTime; - @ApiModelProperty("订单类型 0成片（vlog） 1原片 2照片") + // 订单类型 0成片（vlog） 1原片 2照片 private Integer type; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/order/RefundOrderReq.java b/src/main/java/com/ycwl/basic/model/mobile/order/RefundOrderReq.java index 879c183..12fbd54 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/order/RefundOrderReq.java +++ b/src/main/java/com/ycwl/basic/model/mobile/order/RefundOrderReq.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.mobile.order; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -12,10 +10,10 @@ import lombok.Data; * @Version: 1.0 */ @Data -@ApiModel("退款请求参数") +// 退款请求参数 public class RefundOrderReq { - @ApiModelProperty("订单ID") + // 订单ID private Long orderId; - @ApiModelProperty("理由") + // 理由 private String refundReason; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/scenic/ScenicAppVO.java b/src/main/java/com/ycwl/basic/model/mobile/scenic/ScenicAppVO.java index 3a1a272..780f604 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/scenic/ScenicAppVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/scenic/ScenicAppVO.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.scenic; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -11,71 +9,71 @@ import java.math.BigDecimal; * @Date：2024/12/6 10:25 */ @Data -@ApiModel("移动端景区响应参数") +// 移动端景区响应参数 public class ScenicAppVO { private Long id; /** * 景区名称 */ - @ApiModelProperty("景区名称") + // 景区名称 private String name; /** * 联系电话 */ - @ApiModelProperty("联系电话") + // 联系电话 private String phone; /** * 景区介绍 */ - @ApiModelProperty("景区介绍") + // 景区介绍 private String introduction; - @ApiModelProperty("封面图") + // 封面图 private String coverUrl; /** * 经度 */ - @ApiModelProperty("经度") + // 经度 private BigDecimal longitude; /*** * 纬度 */ - @ApiModelProperty("纬度") + // 纬度 private BigDecimal latitude; /** * 半径（km） */ - @ApiModelProperty("半径（km）") + // 半径（km） private BigDecimal radius; /** * 省份 */ - @ApiModelProperty("省份") + // 省份 private String province; /** * 城市 */ - @ApiModelProperty("城市") + // 城市 private String city; /** * 区 */ - @ApiModelProperty("区") + // 区 private String area; /** * 详细地址 */ - @ApiModelProperty("详细地址") + // 详细地址 private String address; /** * 距离 */ - @ApiModelProperty("距离米") + // 距离米 private BigDecimal distance; /** * 机位数量 */ - @ApiModelProperty("机位数量") + // 机位数量 private Integer deviceNum; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/scenic/ScenicDeviceCountVO.java b/src/main/java/com/ycwl/basic/model/mobile/scenic/ScenicDeviceCountVO.java index 951e376..b3fab30 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/scenic/ScenicDeviceCountVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/scenic/ScenicDeviceCountVO.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.scenic; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -9,8 +7,8 @@ import lombok.Data; * @Date：2024/12/6 10:37 */ @Data -@ApiModel("移动端景区设备数量响应参数") +// 移动端景区设备数量响应参数 public class ScenicDeviceCountVO { - @ApiModelProperty("景区设备总数") + // 景区设备总数 private Integer totalDeviceCount; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/scenic/ScenicIndexVO.java b/src/main/java/com/ycwl/basic/model/mobile/scenic/ScenicIndexVO.java index 437c0ec..2eee540 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/scenic/ScenicIndexVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/scenic/ScenicIndexVO.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.scenic; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -10,10 +8,10 @@ import java.math.BigDecimal; * @Author：songmingsong */ @Data -@ApiModel("首页景区列表") +// 首页景区列表 public class ScenicIndexVO { - @ApiModelProperty("经度") + // 经度 private BigDecimal longitude; - @ApiModelProperty("纬度") + // 纬度 private BigDecimal latitude; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/scenic/account/ScenicLoginOldRespVO.java b/src/main/java/com/ycwl/basic/model/mobile/scenic/account/ScenicLoginOldRespVO.java index e026260..751b4fc 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/scenic/account/ScenicLoginOldRespVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/scenic/account/ScenicLoginOldRespVO.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.scenic.account; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @@ -11,18 +9,18 @@ import java.util.List; * @Date：2024/12/13 9:44 */ @Data -@ApiModel("景区账号登录响应类") +// 景区账号登录响应类 public class ScenicLoginOldRespVO { private Long id; - @ApiModelProperty("景区id") + // 景区id private Long scenicId; - @ApiModelProperty("是否是超级管理员") + // 是否是超级管理员 private Integer isSuper; - @ApiModelProperty("账号名称") + // 账号名称 private String name; - @ApiModelProperty("账号") + // 账号 private String account; - @ApiModelProperty("1启用 0禁用") + // 1启用 0禁用 private Integer status; private String token; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/scenic/account/ScenicLoginReq.java b/src/main/java/com/ycwl/basic/model/mobile/scenic/account/ScenicLoginReq.java index 4ee4674..7bb0b4c 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/scenic/account/ScenicLoginReq.java +++ b/src/main/java/com/ycwl/basic/model/mobile/scenic/account/ScenicLoginReq.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.scenic.account; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -9,10 +7,7 @@ import lombok.Data; * @Date：2024/12/13 9:44 */ @Data -@ApiModel("景区账号登录请求类") public class ScenicLoginReq { - @ApiModelProperty("账号") private String account; - @ApiModelProperty("密码") private String password; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/scenic/account/ScenicLoginRespVO.java b/src/main/java/com/ycwl/basic/model/mobile/scenic/account/ScenicLoginRespVO.java index 2bb3ba8..cc1af9d 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/scenic/account/ScenicLoginRespVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/scenic/account/ScenicLoginRespVO.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.scenic.account; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @@ -11,18 +9,18 @@ import java.util.List; * @Date：2024/12/13 9:44 */ @Data -@ApiModel("景区账号登录响应类") +// 景区账号登录响应类 public class ScenicLoginRespVO { private Long id; - @ApiModelProperty("景区id") + // 景区id private List scenicId; - @ApiModelProperty("是否是超级管理员") + // 是否是超级管理员 private Integer isSuper; - @ApiModelProperty("账号名称") + // 账号名称 private String name; - @ApiModelProperty("账号") + // 账号 private String account; - @ApiModelProperty("1启用 0禁用") + // 1启用 0禁用 private Integer status; private String token; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/scenic/content/ContentPageVO.java b/src/main/java/com/ycwl/basic/model/mobile/scenic/content/ContentPageVO.java index 82153e4..1dab013 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/scenic/content/ContentPageVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/scenic/content/ContentPageVO.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.scenic.content; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -11,26 +9,26 @@ import java.math.BigDecimal; * @Date：2024/12/5 15:10 */ @Data -@ApiModel("景区内容（成片、待成片模版、源素材）列表响应信息") +// 景区内容（成片、待成片模版、源素材）列表响应信息 public class ContentPageVO { - @ApiModelProperty("内容名称") + // 内容名称 private String name; - @ApiModelProperty("景区id") + // 景区id private Long scenicId; - @ApiModelProperty("景区名称") + // 景区名称 private String scenicName; - @ApiModelProperty("内容类型 0模版 1:成片视频 2:源素材 ") + // 内容类型 0模版 1:成片视频 2:源素材 private Integer contentType; - @ApiModelProperty("源素材类型 1:视频 2:图片") + // 源素材类型 1:视频 2:图片 private Integer sourceType; private int lockType; - @ApiModelProperty("内容id contentType为0或1时才有值") + // 内容id contentType为0或1时才有值 private Long contentId; - @ApiModelProperty("模版id") + // 模版id private Long templateId; - @ApiModelProperty("模版封面图片 contentType为0或1时才有值") + // 模版封面图片 contentType为0或1时才有值 private String templateCoverUrl; - @ApiModelProperty("是否购买：0未购买，1已购买") + // 是否购买：0未购买，1已购买 private Integer isBuy; private BigDecimal duration; private Integer goodsType; diff --git a/src/main/java/com/ycwl/basic/model/mobile/statistic/req/CommonQueryReq.java b/src/main/java/com/ycwl/basic/model/mobile/statistic/req/CommonQueryReq.java index a8313d0..68281e1 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/statistic/req/CommonQueryReq.java +++ b/src/main/java/com/ycwl/basic/model/mobile/statistic/req/CommonQueryReq.java @@ -1,8 +1,5 @@ package com.ycwl.basic.model.mobile.statistic.req; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.Date; @@ -12,11 +9,11 @@ import java.util.Date; * @Date：2024/12/11 19:03 */ @Data -@ApiModel("移动端公用请求参数") +// 移动端公用请求参数 public class CommonQueryReq { - @ApiModelProperty(value = "查询统计纬度 0今天、1昨天、2-近一周（7天）、3-近30天、4-近1年") + // 查询统计纬度 0今天、1昨天、2-近一周（7天）、3-近30天、4-近1年 private Integer standard; - @ApiModelProperty(value = "景区id") + // 景区id private Long scenicId; private boolean realtime; private Date startTime; diff --git a/src/main/java/com/ycwl/basic/model/mobile/statistic/req/StatisticsRecordAddReq.java b/src/main/java/com/ycwl/basic/model/mobile/statistic/req/StatisticsRecordAddReq.java index 8135c2b..2a94770 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/statistic/req/StatisticsRecordAddReq.java +++ b/src/main/java/com/ycwl/basic/model/mobile/statistic/req/StatisticsRecordAddReq.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.statistic.req; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -9,16 +7,16 @@ import lombok.Data; * @Date：2024/12/12 18:31 */ @Data -@ApiModel("移动端用户操作统计记录添加类") +// 移动端用户操作统计记录添加类 public class StatisticsRecordAddReq { - @ApiModelProperty(value = "主键id",hidden = true) + // 主键id private Long id; - @ApiModelProperty("统计数据类型，0扫码访问，1上传人脸，2预览视频，3现场支付，4事后支付，5退款，6消息推送，8下载，9点击购买") + // 统计数据类型，0扫码访问，1上传人脸，2预览视频，3现场支付，4事后支付，5退款，6消息推送，8下载，9点击购买 private Integer type; - @ApiModelProperty(value = "景区id") + // 景区id private Long scenicId; - @ApiModelProperty(value = "触发用户id",hidden = true) + // 触发用户id private Long memberId; - @ApiModelProperty("关联数据ID 例如：预览视频就是视频id") + // 关联数据ID 例如：预览视频就是视频id private Long morphId; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppSta1VO.java b/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppSta1VO.java index 6610e9a..cd9db1b 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppSta1VO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppSta1VO.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.statistic.resp; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -9,18 +7,18 @@ import lombok.Data; * @Date：2024/12/11 18:23 */ @Data -@ApiModel("移动端订单金额、预览_支付转化率、扫码_付费用户转化率统计结果类") +// 移动端订单金额、预览_支付转化率、扫码_付费用户转化率统计结果类 public class AppSta1VO { - @ApiModelProperty("现在的数据 支付订单金额") + // 现在的数据 支付订单金额 private String nowOrderAmount; - @ApiModelProperty("上一期的数据 支付订单金额") + // 上一期的数据 支付订单金额 private String previousOrderAmount; - @ApiModelProperty("现在的数据 预览_支付转化率") + // 现在的数据 预览_支付转化率 private String nowPreviewPay; - @ApiModelProperty("上一期的数据 预览_支付转化率") + // 上一期的数据 预览_支付转化率 private String previousPreviewPay; - @ApiModelProperty("现在的数据 扫码_付费用户转化率") + // 现在的数据 扫码_付费用户转化率 private String nowScanCodePay; - @ApiModelProperty("上一期的数据 扫码_付费用户转化率") + // 上一期的数据 扫码_付费用户转化率 private String previousScanCodePay; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppSta2VO.java b/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppSta2VO.java index b889438..9f18e7d 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppSta2VO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppSta2VO.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.statistic.resp; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -9,18 +7,18 @@ import lombok.Data; * @Date：2024/12/11 18:23 */ @Data -@ApiModel("移动端支付订单数、现场订单数、推送订单数统计结果类") +// 移动端支付订单数、现场订单数、推送订单数统计结果类 public class AppSta2VO { - @ApiModelProperty("现在的数据 支付订单数") + // 现在的数据 支付订单数 private Integer nowPayOrderNum; - @ApiModelProperty("上一期的数据 支付订单数") + // 上一期的数据 支付订单数 private Integer previousPayOrderNum; - @ApiModelProperty("现在的数据 现场订单数") + // 现在的数据 现场订单数 private Integer nowSceneOrderNum; - @ApiModelProperty("上一期的数据 现场订单数") + // 上一期的数据 现场订单数 private Integer previousSceneOrderNum; - @ApiModelProperty("现在的数据 推送订单数") + // 现在的数据 推送订单数 private Integer nowPushOrderNum; - @ApiModelProperty("上一期的数据 推送订单数") + // 上一期的数据 推送订单数 private Integer previousPushOrderNum; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppSta3VO.java b/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppSta3VO.java index bf6560e..1095147 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppSta3VO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppSta3VO.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.statistic.resp; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -9,18 +7,18 @@ import lombok.Data; * @Date：2024/12/11 18:23 */ @Data -@ApiModel("移动端扫码访问人数、推送订阅人数、预览视频人数统计结果类") +// 移动端扫码访问人数、推送订阅人数、预览视频人数统计结果类 public class AppSta3VO { - @ApiModelProperty("现在的数据 扫码访问人数") + // 现在的数据 扫码访问人数 private Integer nowScanCodeOfPeopleNum; - @ApiModelProperty("上一期的数据 扫码访问人数") + // 上一期的数据 扫码访问人数 private Integer previousScanCodeOfPeopleNum; - @ApiModelProperty("现在的数据 推送订阅人数") + // 现在的数据 推送订阅人数 private Integer nowPushOfPeopleNum; - @ApiModelProperty("上一期的数据 推送订阅人数") + // 上一期的数据 推送订阅人数 private Integer previousPushOfPeopleNum; - @ApiModelProperty("现在的数据 预览视频人数") + // 现在的数据 预览视频人数 private Integer nowPreviewVideoOfPeopleNum; - @ApiModelProperty("上一期的数据 预览视频人数") + // 上一期的数据 预览视频人数 private Integer previousPreviewVideoOfPeopleNum; } diff --git a/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppStatisticsFunnelVO.java b/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppStatisticsFunnelVO.java index 460fe47..444cb15 100644 --- a/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppStatisticsFunnelVO.java +++ b/src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppStatisticsFunnelVO.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.mobile.statistic.resp; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.math.RoundingMode; @@ -11,47 +9,47 @@ import java.math.RoundingMode; * @Date：2024/12/12 16:24 */ @Data -@ApiModel("移动端用户转化漏斗") +// 移动端用户转化漏斗 public class AppStatisticsFunnelVO { - @ApiModelProperty("镜头检测游客数") + // 镜头检测游客数 private int cameraShotOfMemberNum; // cs1 - @ApiModelProperty("扫码访问人数") + // 扫码访问人数 private int scanCodeVisitorOfMemberNum; // sv1 - @ApiModelProperty("上传头像（人脸）人数") + // 上传头像（人脸）人数 private int uploadFaceOfMemberNum; // u1 - @ApiModelProperty("推送订阅人数") + // 推送订阅人数 private int pushOfMemberNum; // m1 - @ApiModelProperty("生成视频人数") + // 生成视频人数 private int completeVideoOfMemberNum; // gv1 - @ApiModelProperty("预览视频人数") + // 预览视频人数 private int previewVideoOfMemberNum; // pv1 - @ApiModelProperty("点击购买人数") + // 点击购买人数 private int clickOnPayOfMemberNum; // cp1 - @ApiModelProperty("支付订单人数") + // 支付订单人数 private int payOfMemberNum; // p1 - @ApiModelProperty("总访问人数") + // 总访问人数 private int totalVisitorOfMemberNum; // v1 - @ApiModelProperty("生成视频条数") + // 生成视频条数 private int completeOfVideoNum; // gv2 - @ApiModelProperty("预览视频条数") + // 预览视频条数 private int previewOfVideoNum; // pv2 - @ApiModelProperty("支付订单数") + // 支付订单数 private int payOfOrderNum; // p2 - @ApiModelProperty("支付订单金额") + // 支付订单金额 private BigDecimal payOfOrderAmount; // o3 - @ApiModelProperty("退款订单数") + // 退款订单数 private int refundOfOrderNum; // ro2 - @ApiModelProperty("退款订单金额") + // 退款订单金额 private BigDecimal refundOfOrderAmount; // ro3 - @ApiModelProperty("镜头检测游客数_扫码访问人数_转化率") + // 镜头检测游客数_扫码访问人数_转化率 public String getCsom_scaom() { return "-"; // TODO: REAL } - @ApiModelProperty("扫码访问人数_上传头像人数_转化率") + // 扫码访问人数_上传头像人数_转化率 public String getScaom_ufom() { if (uploadFaceOfMemberNum == 0 || scanCodeVisitorOfMemberNum == 0) { return "0.00"; @@ -61,7 +59,7 @@ public class AppStatisticsFunnelVO { .divide(new BigDecimal(scanCodeVisitorOfMemberNum), 2, RoundingMode.HALF_UP) .toString(); } - @ApiModelProperty("上传头像人数_推送订阅人数_转化率") + // 上传头像人数_推送订阅人数_转化率 public String getUfom_pom() { if (pushOfMemberNum == 0 || uploadFaceOfMemberNum == 0) { return "0.00"; @@ -71,7 +69,7 @@ public class AppStatisticsFunnelVO { .divide(new BigDecimal(pushOfMemberNum), 2, RoundingMode.HALF_UP) .toString(); } - @ApiModelProperty("推送订阅人数_生成视频人数_转化率") + // 推送订阅人数_生成视频人数_转化率 public String getPom_cvom() { if (completeVideoOfMemberNum == 0 || pushOfMemberNum == 0) { return "0.00"; @@ -81,7 +79,7 @@ public class AppStatisticsFunnelVO { .divide(new BigDecimal(pushOfMemberNum), 2, RoundingMode.HALF_UP) .toString(); } - @ApiModelProperty("生成视频人数_预览视频人数_转化率") + // 生成视频人数_预览视频人数_转化率 public String getCvom_pvom() { if (previewVideoOfMemberNum == 0 || completeVideoOfMemberNum == 0) { return "0.00"; @@ -91,7 +89,7 @@ public class AppStatisticsFunnelVO { .divide(new BigDecimal(completeVideoOfMemberNum), 2, RoundingMode.HALF_UP) .toString(); } - @ApiModelProperty("预览视频人数_点击购买人数_转化率") + // 预览视频人数_点击购买人数_转化率 public String getPvom_cpom() { if (clickOnPayOfMemberNum == 0 || previewVideoOfMemberNum == 0) { return "0.00"; @@ -101,7 +99,7 @@ public class AppStatisticsFunnelVO { .divide(new BigDecimal(previewVideoOfMemberNum), 2, RoundingMode.HALF_UP) .toString(); } - @ApiModelProperty("点击购买人数_支付订单人数_转化率") + // 点击购买人数_支付订单人数_转化率 public String getCpom_pom() { if (payOfMemberNum == 0 || clickOnPayOfMemberNum == 0) { return "0.00"; diff --git a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AddOrUpdateAdminUserReqVO.java b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AddOrUpdateAdminUserReqVO.java index 4a8df87..a04eed6 100644 --- a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AddOrUpdateAdminUserReqVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AddOrUpdateAdminUserReqVO.java @@ -1,23 +1,21 @@ package com.ycwl.basic.model.pc.adminUser.req; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -@ApiModel(value = "新增或更新后台管理人员VO") +// 新增或更新后台管理人员VO public class AddOrUpdateAdminUserReqVO { - @ApiModelProperty(value = "id，有为更新，没有为新增") + // id，有为更新，没有为新增 private String id; - @ApiModelProperty(value = "角色ID") + // 角色ID private String roleId; - @ApiModelProperty(value = "账号") + // 账号 private String account; - @ApiModelProperty(value = "密码") + // 密码 private String password; - @ApiModelProperty(value = "名称") + // 名称 private String name; - @ApiModelProperty(value = "手机号") + // 手机号 private String phone; } diff --git a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AdminUserListReqVO.java b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AdminUserListReqVO.java index ec90495..f9ea920 100644 --- a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AdminUserListReqVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/AdminUserListReqVO.java @@ -1,21 +1,19 @@ package com.ycwl.basic.model.pc.adminUser.req; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel(value = "后台管理人员请求VO") +// 后台管理人员请求VO public class AdminUserListReqVO extends BaseQueryParameterReq { - @ApiModelProperty(value = "姓名") + // 姓名 private String name; - @ApiModelProperty(value = "账号") + // 账号 private String account; - @ApiModelProperty(value = "手机号") + // 手机号 private String phone; - @ApiModelProperty(value = "角色ID") + // 角色ID private String roleId; } diff --git a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/LoginReqVO.java b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/LoginReqVO.java index a4cd5bb..7393f91 100644 --- a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/LoginReqVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/LoginReqVO.java @@ -1,14 +1,12 @@ package com.ycwl.basic.model.pc.adminUser.req; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -@ApiModel(value = "登录请求VO") +// 登录请求VO public class LoginReqVO { - @ApiModelProperty(value = "账号") + // 账号 private String account; - @ApiModelProperty(value = "密码") + // 密码 private String password; } diff --git a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/ResetPasswordReqVO.java b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/ResetPasswordReqVO.java index 1975424..c05c0c7 100644 --- a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/ResetPasswordReqVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/ResetPasswordReqVO.java @@ -1,14 +1,12 @@ package com.ycwl.basic.model.pc.adminUser.req; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -@ApiModel(value = "重置密码请求VO") +// 重置密码请求VO public class ResetPasswordReqVO { - @ApiModelProperty(value = "id") + // id private String id; - @ApiModelProperty(value = "密码") + // 密码 private String password; } diff --git a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/UpdatePasswordReqVO.java b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/UpdatePasswordReqVO.java index 2e036d4..6ca1487 100644 --- a/src/main/java/com/ycwl/basic/model/pc/adminUser/req/UpdatePasswordReqVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/adminUser/req/UpdatePasswordReqVO.java @@ -1,16 +1,14 @@ package com.ycwl.basic.model.pc.adminUser.req; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -@ApiModel() +// public class UpdatePasswordReqVO { - @ApiModelProperty(value = "id",hidden = true) + // id private String id; - @ApiModelProperty(value = "密码") + // 密码 private String pwd; - @ApiModelProperty(value = "新密码") + // 新密码 private String newPwd; } diff --git a/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/AdminUserListRespVO.java b/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/AdminUserListRespVO.java index 381d3c1..b1f3d0a 100644 --- a/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/AdminUserListRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/AdminUserListRespVO.java @@ -1,28 +1,26 @@ package com.ycwl.basic.model.pc.adminUser.resp; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data -@ApiModel(value = "后台管理人员返回列表VO") +// 后台管理人员返回列表VO public class AdminUserListRespVO { - @ApiModelProperty(value = "id") + // id private String id; - @ApiModelProperty(value = "账号") + // 账号 private String account; - @ApiModelProperty(value = "昵称") + // 昵称 private String name; - @ApiModelProperty(value = "手机号") + // 手机号 private String phone; - @ApiModelProperty(value = "角色") + // 角色 private String roleName; - @ApiModelProperty(value = "角色ID") + // 角色ID private String roleId; - @ApiModelProperty(value = "状态") + // 状态 private Integer status; - @ApiModelProperty(value = "创建时间") + // 创建时间 private Date createTime; } diff --git a/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/LoginRespVO.java b/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/LoginRespVO.java index 67cbce7..6929aa9 100644 --- a/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/LoginRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/LoginRespVO.java @@ -2,20 +2,18 @@ package com.ycwl.basic.model.pc.adminUser.resp; import com.ycwl.basic.model.pc.menu.MenuNode; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data -@ApiModel(value = "登录返回VO") +// 登录返回VO public class LoginRespVO { - @ApiModelProperty(value = "token") + // token private String token; - @ApiModelProperty(value = "用户名") + // 用户名 private String name; - @ApiModelProperty(value = "角色名") + // 角色名 private String typeName; private boolean superAdmin; } diff --git a/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/StaffSimpleInfoRespVO.java b/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/StaffSimpleInfoRespVO.java index e54fced..5b15527 100644 --- a/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/StaffSimpleInfoRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/adminUser/resp/StaffSimpleInfoRespVO.java @@ -1,16 +1,14 @@ package com.ycwl.basic.model.pc.adminUser.resp; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -@ApiModel(value = "员工信息返回VO") +// 员工信息返回VO public class StaffSimpleInfoRespVO { - @ApiModelProperty(value = "id") + // id private String id; - @ApiModelProperty(value = "名字") + // 名字 private String name; - @ApiModelProperty(value = "工号") + // 工号 private String jobNo; } diff --git a/src/main/java/com/ycwl/basic/model/pc/broker/req/BrokerRecordReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/broker/req/BrokerRecordReqQuery.java index 8ba26c7..5a80395 100644 --- a/src/main/java/com/ycwl/basic/model/pc/broker/req/BrokerRecordReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/broker/req/BrokerRecordReqQuery.java @@ -3,8 +3,6 @@ package com.ycwl.basic.model.pc.broker.req; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,14 +14,14 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("查询推客记录请求参数") +// 查询推客记录请求参数 public class BrokerRecordReqQuery extends BaseQueryParameterReq { private Long brokerId; private Long orderId; - @ApiModelProperty("开始时间") + // 开始时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; - @ApiModelProperty("结束时间") + // 结束时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; } \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/model/pc/broker/req/BrokerReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/broker/req/BrokerReqQuery.java index d571cb8..41f5dab 100644 --- a/src/main/java/com/ycwl/basic/model/pc/broker/req/BrokerReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/broker/req/BrokerReqQuery.java @@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.broker.req; import com.baomidou.mybatisplus.annotation.TableId; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,17 +13,17 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("查询推客列表请求参数") +// 查询推客列表请求参数 public class BrokerReqQuery extends BaseQueryParameterReq { private Long id; private Long scenicId; - @ApiModelProperty("推客名称") + // 推客名称 private String name; - @ApiModelProperty("手机号") + // 手机号 private String phone; - @ApiModelProperty("状态，0禁用，1启用") + // 状态，0禁用，1启用 private Integer status; - @ApiModelProperty("提成状态，0禁用，1启用") + // 提成状态，0禁用，1启用 private Integer brokerEnable; private Date startTime; private Date endTime; diff --git a/src/main/java/com/ycwl/basic/model/pc/broker/resp/BrokerRecordRespVO.java b/src/main/java/com/ycwl/basic/model/pc/broker/resp/BrokerRecordRespVO.java index c60f23c..6052ecf 100644 --- a/src/main/java/com/ycwl/basic/model/pc/broker/resp/BrokerRecordRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/broker/resp/BrokerRecordRespVO.java @@ -1,7 +1,6 @@ package com.ycwl.basic.model.pc.broker.resp; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/ycwl/basic/model/pc/broker/resp/BrokerRespVO.java b/src/main/java/com/ycwl/basic/model/pc/broker/resp/BrokerRespVO.java index 4b2d591..3f77197 100644 --- a/src/main/java/com/ycwl/basic/model/pc/broker/resp/BrokerRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/broker/resp/BrokerRespVO.java @@ -2,7 +2,6 @@ package com.ycwl.basic.model.pc.broker.resp; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -17,10 +16,10 @@ public class BrokerRespVO { private Long id; private Long scenicId; private String scenicName; - @ApiModelProperty("推客名称") + // 推客名称 private String name; private String phone; - @ApiModelProperty("状态，0禁用，1启用") + // 状态，0禁用，1启用 private Integer brokerEnable; private BigDecimal brokerRate; private Integer status; diff --git a/src/main/java/com/ycwl/basic/model/pc/coupon/req/CouponQueryReq.java b/src/main/java/com/ycwl/basic/model/pc/coupon/req/CouponQueryReq.java index 94b1959..7d35d54 100644 --- a/src/main/java/com/ycwl/basic/model/pc/coupon/req/CouponQueryReq.java +++ b/src/main/java/com/ycwl/basic/model/pc/coupon/req/CouponQueryReq.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.pc.coupon.req; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.ycwl.basic.model.common.BaseQueryParameterReq; import lombok.EqualsAndHashCode; @@ -10,24 +8,24 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("优惠券查询请求参数") +// 优惠券查询请求参数 public class CouponQueryReq extends BaseQueryParameterReq { - @ApiModelProperty("景区ID") + // 景区ID private Long scenicId; private String name; - @ApiModelProperty("优惠券类型：0普通/1首次推送/2二次/3三次") + // 优惠券类型：0普通/1首次推送/2二次/3三次 private Integer type; - @ApiModelProperty("折扣类型：0降价/1打折") + // 折扣类型：0降价/1打折 private Integer discountType; - @ApiModelProperty("状态：0关闭/1开启") + // 状态：0关闭/1开启 private Integer status; - @ApiModelProperty("创建时间起始") + // 创建时间起始 private Date createAtStart; - @ApiModelProperty("创建时间结束") + // 创建时间结束 private Date createAtEnd; } \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceAddOrUpdateReq.java b/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceAddOrUpdateReq.java index b8f7058..d70ad17 100644 --- a/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceAddOrUpdateReq.java +++ b/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceAddOrUpdateReq.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.pc.device.req; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -13,27 +11,27 @@ import java.util.Date; * @Date：2024/11/29 14:53 */ @Data -@ApiModel("设备新增修改参数") +// 设备新增修改参数 public class DeviceAddOrUpdateReq { private Long id; - @ApiModelProperty("景区id") + // 景区id private Long scenicId; - @ApiModelProperty("设备名称") + // 设备名称 private String name; - @ApiModelProperty("设备编号") + // 设备编号 private String no; /** * 经度 */ - @ApiModelProperty("经度") + // 经度 private BigDecimal longitude; /*** * 纬度 */ - @ApiModelProperty("纬度") + // 纬度 private BigDecimal latitude; - @ApiModelProperty("是否启用，0不启用，1启用") + // 是否启用，0不启用，1启用 private Integer status; - @ApiModelProperty("是否在线，0不在线，1在线") + // 是否在线，0不在线，1在线 private Integer online; } diff --git a/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceReqQuery.java index 3adfd92..99277c3 100644 --- a/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceReqQuery.java @@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.device.req; import com.baomidou.mybatisplus.annotation.TableId; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,18 +13,18 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("设备查询参数") +// 设备查询参数 public class DeviceReqQuery extends BaseQueryParameterReq { - @ApiModelProperty("景区id") + // 景区id private Long scenicId; - @ApiModelProperty("设备名称") + // 设备名称 private String name; - @ApiModelProperty("设备编号") + // 设备编号 private String no; - @ApiModelProperty("是否启用，0不启用，1启用") + // 是否启用，0不启用，1启用 private Integer status; - @ApiModelProperty("是否在线，0不在线，1在线") + // 是否在线，0不在线，1在线 private Integer online; private Date startTime; private Date endTime; diff --git a/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceSortRequest.java b/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceSortRequest.java index 8e1e5bb..44d9f26 100644 --- a/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceSortRequest.java +++ b/src/main/java/com/ycwl/basic/model/pc/device/req/DeviceSortRequest.java @@ -1,13 +1,12 @@ package com.ycwl.basic.model.pc.device.req; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class DeviceSortRequest { - @ApiModelProperty(value = "被操作模板的ID", required = true) + // 被操作模板的ID private Long deviceId; - @ApiModelProperty(value = "排在其后的模板ID") + // 排在其后的模板ID private Long afterDeviceId; } \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/model/pc/device/resp/DeviceRespVO.java b/src/main/java/com/ycwl/basic/model/pc/device/resp/DeviceRespVO.java index 49f8665..920ceea 100644 --- a/src/main/java/com/ycwl/basic/model/pc/device/resp/DeviceRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/device/resp/DeviceRespVO.java @@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.device.resp; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -14,29 +12,29 @@ import java.util.Date; * @Date：2024/11/29 14:58 */ @Data -@ApiModel("设备列表响应参数") +// 设备列表响应参数 public class DeviceRespVO { private Long id; - @ApiModelProperty("景区id") + // 景区id private Long scenicId; - @ApiModelProperty("设备名称") + // 设备名称 private String name; - @ApiModelProperty("设备编号") + // 设备编号 private String no; - @ApiModelProperty("经度") + // 经度 private BigDecimal longitude; - @ApiModelProperty("纬度") + // 纬度 private BigDecimal latitude; - @ApiModelProperty("是否启用，0不启用，1启用") + // 是否启用，0不启用，1启用 private Integer status; - @ApiModelProperty("是否在线，0不在线，1在线") + // 是否在线，0不在线，1在线 private Integer online; private String coverUrl; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt; - @ApiModelProperty("景区名称") + // 景区名称 private String scenicName; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date keepaliveAt; diff --git a/src/main/java/com/ycwl/basic/model/pc/face/req/FaceReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/face/req/FaceReqQuery.java index cb891d6..ca13d35 100644 --- a/src/main/java/com/ycwl/basic/model/pc/face/req/FaceReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/face/req/FaceReqQuery.java @@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.face.req; import com.baomidou.mybatisplus.annotation.TableId; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,21 +14,21 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("人脸查询参数") +// 人脸查询参数 public class FaceReqQuery extends BaseQueryParameterReq { - @ApiModelProperty("景区id") + // 景区id private Long scenicId; - @ApiModelProperty("会员id") + // 会员id private Long memberId; - @ApiModelProperty("用户上传的人脸照片") + // 用户上传的人脸照片 private String faceUrl; - @ApiModelProperty("与样本匹配的ID，逗号隔开") + // 与样本匹配的ID，逗号隔开 private String matchSampleIds; - @ApiModelProperty("匹配率") + // 匹配率 private BigDecimal startMatchRate; - @ApiModelProperty("匹配率") + // 匹配率 private BigDecimal endMatchRate; - @ApiModelProperty("匹配的结果，JSON字符串") + // 匹配的结果，JSON字符串 private String matchResult; private Date startTime; private Date endTime; diff --git a/src/main/java/com/ycwl/basic/model/pc/face/resp/FaceRespVO.java b/src/main/java/com/ycwl/basic/model/pc/face/resp/FaceRespVO.java index ac7904e..b5298a8 100644 --- a/src/main/java/com/ycwl/basic/model/pc/face/resp/FaceRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/face/resp/FaceRespVO.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.pc.face.resp; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -13,22 +11,22 @@ import java.util.Date; * @Date：2024/11/29 15:18 */ @Data -@ApiModel("人脸查询响应参数") +// 人脸查询响应参数 public class FaceRespVO { private Long id; - @ApiModelProperty("景区ID") + // 景区ID private Long scenicId; - @ApiModelProperty("会员id") + // 会员id private Long memberId; - @ApiModelProperty("用户上传的人脸照片") + // 用户上传的人脸照片 private String faceUrl; - @ApiModelProperty("与样本匹配的ID，逗号隔开") + // 与样本匹配的ID，逗号隔开 private String matchSampleIds; - @ApiModelProperty("匹配率") + // 匹配率 private BigDecimal firstMatchRate; - @ApiModelProperty("人脸图片得分，不高的提示用户重新录入") + // 人脸图片得分，不高的提示用户重新录入 private BigDecimal score; - @ApiModelProperty("匹配的结果，JSON字符串") + // 匹配的结果，JSON字符串 private String matchResult; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; diff --git a/src/main/java/com/ycwl/basic/model/pc/faceSample/req/FaceSampleReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/faceSample/req/FaceSampleReqQuery.java index 2e90b90..13ef8e9 100644 --- a/src/main/java/com/ycwl/basic/model/pc/faceSample/req/FaceSampleReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/faceSample/req/FaceSampleReqQuery.java @@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,22 +15,22 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("人脸样本查询参数") +// 人脸样本查询参数 public class FaceSampleReqQuery extends BaseQueryParameterReq { /** * 景区ID */ - @ApiModelProperty("景区ID") + // 景区ID private Long scenicId; /** * 来源设备 */ - @ApiModelProperty("来源设备") + // 来源设备 private Long deviceId; /** * 是否匹配，0未匹配，1已匹配 */ - @ApiModelProperty("是否匹配，0未匹配，1已匹配") + // 是否匹配，0未匹配，1已匹配 private Integer status; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; diff --git a/src/main/java/com/ycwl/basic/model/pc/faceSample/resp/FaceSampleRespVO.java b/src/main/java/com/ycwl/basic/model/pc/faceSample/resp/FaceSampleRespVO.java index 01c65ca..895f4b1 100644 --- a/src/main/java/com/ycwl/basic/model/pc/faceSample/resp/FaceSampleRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/faceSample/resp/FaceSampleRespVO.java @@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.faceSample.resp; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -13,46 +11,46 @@ import java.util.Date; * @Date：2024/11/29 15:40 */ @Data -@ApiModel("人脸样本响应参数") +// 人脸样本响应参数 public class FaceSampleRespVO { private Long id; /** * 景区ID */ - @ApiModelProperty("景区ID") + // 景区ID private Long scenicId; private String scenicName; /** * 来源设备 */ - @ApiModelProperty("来源设备") + // 来源设备 private Long deviceId; private String deviceName; /** * 人脸照片 */ - @ApiModelProperty("人脸照片") + // 人脸照片 private String faceUrl; private Float score; /** * 与样本匹配的ID，逗号隔开 */ - @ApiModelProperty("与样本匹配的ID，逗号隔开") + // 与样本匹配的ID，逗号隔开 private String matchSampleIds; /** * 匹配率 */ - @ApiModelProperty("匹配率") + // 匹配率 private String firstMatchRate; /** * 匹配的结果，JSON字符串 */ - @ApiModelProperty("匹配的结果，JSON字符串") + // 匹配的结果，JSON字符串 private String matchResult; /** * 是否匹配，0未匹配，1已匹配 */ - @ApiModelProperty("是否匹配，0未匹配，1已匹配") + // 是否匹配，0未匹配，1已匹配 private Integer status; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; diff --git a/src/main/java/com/ycwl/basic/model/pc/member/req/MemberReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/member/req/MemberReqQuery.java index 7e04db4..07ba2cb 100644 --- a/src/main/java/com/ycwl/basic/model/pc/member/req/MemberReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/member/req/MemberReqQuery.java @@ -3,8 +3,6 @@ package com.ycwl.basic.model.pc.member.req; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,61 +14,61 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("查询用户列表请求参数") +// 查询用户列表请求参数 public class MemberReqQuery extends BaseQueryParameterReq { private Long scenicId; /** * 微信openId */ - @ApiModelProperty("微信openId") + // 微信openId private String openId; /** * 微信昵称 */ - @ApiModelProperty("微信昵称") + // 微信昵称 private String nickname; /** * 真实姓名 */ - @ApiModelProperty("真实姓名") + // 真实姓名 private String realName; /** * 推客优惠码 */ - @ApiModelProperty("推客优惠码") + // 推客优惠码 private String promoCode; /** * 推客id */ - @ApiModelProperty("推客id") + // 推客id private Long brokerId; /** * 是否同意用户协议，1同意0未同意 */ - @ApiModelProperty("是否同意用户协议，1同意0未同意") + // 是否同意用户协议，1同意0未同意 private Integer agreement; /** * 电话号码 */ - @ApiModelProperty("电话号码") + // 电话号码 private String phone; /** * 国家 */ - @ApiModelProperty("国家") + // 国家 private String country; /** * 省份 */ - @ApiModelProperty("省份") + // 省份 private String province; /** * 城市 */ - @ApiModelProperty("城市") + // 城市 private String city; - @ApiModelProperty("创建时间") + // 创建时间 private Date startTime; - @ApiModelProperty("创建时间") + // 创建时间 private Date endTime; } diff --git a/src/main/java/com/ycwl/basic/model/pc/member/resp/MemberRespVO.java b/src/main/java/com/ycwl/basic/model/pc/member/resp/MemberRespVO.java index 1ed3e47..d6b711a 100644 --- a/src/main/java/com/ycwl/basic/model/pc/member/resp/MemberRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/member/resp/MemberRespVO.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.pc.member.resp; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -12,7 +10,7 @@ import java.util.Date; * @Date：2024/11/29 15:59 */ @Data -@ApiModel("查询用户信息响应参数") +// 查询用户信息响应参数 public class MemberRespVO { private Long uid; private Long id; @@ -20,63 +18,63 @@ public class MemberRespVO { /** * 微信openId */ - @ApiModelProperty("微信openId") + // 微信openId private String openId; /** * 微信头像 */ - @ApiModelProperty("微信头像") + // 微信头像 private String avatarUrl; /** * 微信昵称 */ - @ApiModelProperty("微信昵称") + // 微信昵称 private String nickname; /** * 真实姓名 */ - @ApiModelProperty("真实姓名") + // 真实姓名 private String realName; /** * 推客优惠码 */ - @ApiModelProperty("推客优惠码") + // 推客优惠码 private String promoCode; /** * 推客id */ - @ApiModelProperty("推客id") + // 推客id private Long brokerId; /** * 是否同意用户协议，1同意0未同意 */ - @ApiModelProperty("是否同意用户协议，1同意0未同意") + // 是否同意用户协议，1同意0未同意 private Integer agreement; /** * 电话号码 */ - @ApiModelProperty("电话号码") + // 电话号码 private String phone; /** * 国家 */ - @ApiModelProperty("国家") + // 国家 private String country; /** * 省份 */ - @ApiModelProperty("省份") + // 省份 private String province; /** * 城市 */ - @ApiModelProperty("城市") + // 城市 private String city; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createDate; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt; private Integer orderCount; - @ApiModelProperty("是否开启服务通知 0关闭 1开启") + // 是否开启服务通知 0关闭 1开启 private Integer isServiceNotification; } diff --git a/src/main/java/com/ycwl/basic/model/pc/menu/MenuNode.java b/src/main/java/com/ycwl/basic/model/pc/menu/MenuNode.java index 29f2902..cc62bbf 100644 --- a/src/main/java/com/ycwl/basic/model/pc/menu/MenuNode.java +++ b/src/main/java/com/ycwl/basic/model/pc/menu/MenuNode.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.pc.menu; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @@ -11,25 +9,25 @@ import java.util.List; * 菜单数node类 */ @Data -@ApiModel(value = "菜单数node类", description = "菜单数node类") +// 菜单数node类: 菜单数node类 public class MenuNode { - @ApiModelProperty(value = "当前节点ID") + // 当前节点ID private String id; - @ApiModelProperty(value = "父节点ID") + // 父节点ID private String parentId; - @ApiModelProperty(value = "菜单名") + // 菜单名 private String name; - @ApiModelProperty(value = "路由") + // 路由 private String target; - @ApiModelProperty(value = "排序") + // 排序 private Integer sort; - @ApiModelProperty(value = "子节点数据") + // 子节点数据 private List childrenList; } diff --git a/src/main/java/com/ycwl/basic/model/pc/menu/entity/MenuEntity.java b/src/main/java/com/ycwl/basic/model/pc/menu/entity/MenuEntity.java index a0a98c4..f1e163c 100644 --- a/src/main/java/com/ycwl/basic/model/pc/menu/entity/MenuEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/menu/entity/MenuEntity.java @@ -2,7 +2,6 @@ package com.ycwl.basic.model.pc.menu.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -15,28 +14,28 @@ import java.util.Date; @TableName("menu") public class MenuEntity { @TableId - @ApiModelProperty(value = "ID") + // ID private String id; - @ApiModelProperty(value = "父节点ID") + // 父节点ID private String parentId; - @ApiModelProperty(value = "路由") + // 路由 private String target; - @ApiModelProperty(value = "菜单名") + // 菜单名 private String name; - @ApiModelProperty(value = "菜单类型 （0菜单 1按钮）") + // 菜单类型 （0菜单 1按钮） private Integer type; - @ApiModelProperty(value = "排序") + // 排序 private Integer sort; - @ApiModelProperty(value = "权限路径") + // 权限路径 private String permissionUrl; - @ApiModelProperty(value = "是否删除 （0正常 1删除）") + // 是否删除 （0正常 1删除） private String isRemove; - @ApiModelProperty(value = "业务类型 （0 系统菜单 1 业务菜单）") + // 业务类型 （0 系统菜单 1 业务菜单） private Integer businessType; - @ApiModelProperty(value = "创建时间") + // 创建时间 private Date createTime; - @ApiModelProperty("图标") + // 图标 private String icon; } diff --git a/src/main/java/com/ycwl/basic/model/pc/menu/resp/MenuRespVO.java b/src/main/java/com/ycwl/basic/model/pc/menu/resp/MenuRespVO.java index cc5ed5d..0f70e4f 100644 --- a/src/main/java/com/ycwl/basic/model/pc/menu/resp/MenuRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/menu/resp/MenuRespVO.java @@ -1,7 +1,6 @@ package com.ycwl.basic.model.pc.menu.resp; import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -12,28 +11,28 @@ import java.util.Date; */ @Data public class MenuRespVO { - @ApiModelProperty(value = "ID") + // ID private String id; - @ApiModelProperty(value = "父节点ID") + // 父节点ID private String parentId; - @ApiModelProperty(value = "路由") + // 路由 private String target; - @ApiModelProperty(value = "菜单名") + // 菜单名 private String name; - @ApiModelProperty(value = "菜单类型 （0菜单 1按钮）") + // 菜单类型 （0菜单 1按钮） private Integer type; - @ApiModelProperty(value = "排序") + // 排序 private Integer sort; - @ApiModelProperty(value = "权限路径") + // 权限路径 private String permissionUrl; - @ApiModelProperty(value = "是否删除 （0正常 1删除）") + // 是否删除 （0正常 1删除） private String isRemove; - @ApiModelProperty(value = "业务类型 （0 系统菜单 1 业务菜单）") + // 业务类型 （0 系统菜单 1 业务菜单） private Integer businessType; - @ApiModelProperty(value = "创建时间") + // 创建时间 private Date createTime; - @ApiModelProperty("图标") + // 图标 private String icon; } diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddReq.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddReq.java index a405170..868fcab 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddReq.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddReq.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.pc.order.req; import com.ycwl.basic.model.mobile.goods.GoodsDetailVO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -13,47 +11,47 @@ import java.util.List; * @Date：2024/12/3 14:17 */ @Data -@ApiModel("订单的新增或修改请求参数") +// 订单的新增或修改请求参数 public class OrderAddReq { - @ApiModelProperty(value = "订单id",hidden = true) + // 订单id private Long id; - @ApiModelProperty(value = "用户id",hidden = true) + // 用户id private Long memberId; /** * 微信openId */ - @ApiModelProperty(value = "微信openId", hidden = true) + // 微信openId private String openid; - @ApiModelProperty("景区id") + // 景区id private Long scenicId; /** * 价格 */ - @ApiModelProperty(value = "价格", hidden = true) + // 价格 private BigDecimal price; /** * 实际支付价格 */ - @ApiModelProperty(value = "实际支付价格",hidden = true) + // 实际支付价格 private BigDecimal payPrice; /** * 备注 */ - @ApiModelProperty("备注") + // 备注 private String remark; /** * 推客id */ - @ApiModelProperty(value = "推客id",hidden = true) + // 推客id private Long brokerId; /** * 推客优惠码 */ - @ApiModelProperty(value="推客优惠码",hidden = true) + // 推客优惠码 private String promoCode; - @ApiModelProperty(value = "订单商品类型 1成片，2源素材") + // 订单商品类型 1成片，2源素材 private Integer goodsType; - @ApiModelProperty("订单商品明细") + // 订单商品明细 private List goodsItemList; } diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderItemDTO.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderItemDTO.java index 3ae3c19..d1ff87c 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderItemDTO.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderItemDTO.java @@ -1,7 +1,5 @@ package com.ycwl.basic.model.pc.order.req; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -9,22 +7,22 @@ import lombok.Data; * @Date：2024/12/3 14:21 */ @Data -@ApiModel("订单明细") +// 订单明细 public class OrderItemDTO { private Long id; /** * 订单id */ - @ApiModelProperty("订单id") + // 订单id private Long orderId; /** * 商品类型，0其他，1成片，2原片 */ - @ApiModelProperty("商品类型，0其他，1成片，2源素材") + // 商品类型，0其他，1成片，2源素材 private Integer goodsType; /** * 商品ID，goods_type=1关联video.id，=2关联source.id */ - @ApiModelProperty("商品ID，goods_type=1关联video.id，=2关联source.id") + // 商品ID，goods_type=1关联video.id，=2关联source.id private Long goodsId; } diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java index 0bf53d3..5879062 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java @@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,55 +16,55 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel(value = "订单查询对象") +// 订单查询对象 public class OrderReqQuery extends BaseQueryParameterReq { private Long id; private Long scenicId; private Long memberId; - @ApiModelProperty("用户昵称") + // 用户昵称 private String memberNickname; private String memberUid; - @ApiModelProperty("用户真实名称") + // 用户真实名称 private String memberRealName; /** * 微信openId */ - @ApiModelProperty("微信openId") + // 微信openId private Long openId; /** * 备注 */ - @ApiModelProperty("备注") + // 备注 private String remark; /** * 推客id */ - @ApiModelProperty("推客id") + // 推客id private Long brokerId; /** * 推客优惠码 */ - @ApiModelProperty("推客优惠码") + // 推客优惠码 private String promoCode; /** * 退款原因 */ - @ApiModelProperty("退款原因") + // 退款原因 private String refundReason; /** * 退款状态，0未提出，1已通过，2待审核 */ - @ApiModelProperty("退款状态，0未提出，1已通过，2待审核") + // 退款状态，0未提出，1已通过，2待审核 private Integer refundStatus; /** * 状态，0未支付，1已支付，2已退款，9已取消 */ - @ApiModelProperty("状态，0未支付，1已支付，2已退款，9已取消") + // 状态，0未支付，1已支付，2已退款，9已取消 private Integer status; /** * 订单创建时间 */ - @ApiModelProperty("订单创建时间") + // 订单创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startCreateTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -74,7 +72,7 @@ public class OrderReqQuery extends BaseQueryParameterReq { /** * 订单支付时间 */ - @ApiModelProperty("订单支付时间") + // 订单支付时间 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date startPayTime; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @@ -82,7 +80,7 @@ public class OrderReqQuery extends BaseQueryParameterReq { /** * 订单取消时间 */ - @ApiModelProperty("订单取消时间") + // 订单取消时间 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date startCancelTime; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @@ -90,12 +88,12 @@ public class OrderReqQuery extends BaseQueryParameterReq { /** * 订单退款时间 */ - @ApiModelProperty("订单退款时间") + // 订单退款时间 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date startRefundTime; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date endRefundTime; - @ApiModelProperty("订单类型 0成片（vlog） 1原片 2照片") + // 订单类型 0成片（vlog） 1原片 2照片 private Integer type; } diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderUpdateReq.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderUpdateReq.java index f8234a2..a1f36e2 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderUpdateReq.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderUpdateReq.java @@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.order.req; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycwl.basic.model.mobile.goods.GoodsDetailVO; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -15,91 +13,91 @@ import java.util.List; * @Date：2024/12/3 14:17 */ @Data -@ApiModel("订单的新增或修改请求参数") +// 订单的新增或修改请求参数 public class OrderUpdateReq { - @ApiModelProperty(value = "订单id",hidden = true) + // 订单id private Long id; - @ApiModelProperty(value = "用户id",hidden = true) + // 用户id private Long memberId; /** * 微信openId */ - @ApiModelProperty(value = "微信openId", hidden = true) + // 微信openId private Long openId; - @ApiModelProperty("景区id") + // 景区id private Long scenicId; /** * 价格 */ - @ApiModelProperty(value = "价格", hidden = true) + // 价格 private BigDecimal price; /** * 实际支付价格 */ - @ApiModelProperty(value = "实际支付价格",hidden = true) + // 实际支付价格 private BigDecimal payPrice; /** * 备注 */ - @ApiModelProperty("备注") + // 备注 private String remark; /** * 推客id */ - @ApiModelProperty("推客id") + // 推客id private Long brokerId; /** * 推客优惠码 */ - @ApiModelProperty("推客优惠码") + // 推客优惠码 private String promoCode; - @ApiModelProperty("订单商品类型 1成片，2源素材") + // 订单商品类型 1成片，2源素材 private Integer goodsType; /** * 退款原因 */ - @ApiModelProperty("退款原因") + // 退款原因 private String refundReason; /** * 退款状态，0未提出，1已通过，2待审核 */ - @ApiModelProperty("退款状态，0未提出，1已通过，2待审核") + // 退款状态，0未提出，1已通过，2待审核 private Integer refundStatus; /** * 状态，0未支付，1已支付，2已退款，9已取消 */ - @ApiModelProperty("状态，0未支付，1已支付，2已退款，9已取消") + // 状态，0未支付，1已支付，2已退款，9已取消 private Integer status; /** * 订单创建时间 */ - @ApiModelProperty("订单创建时间") + // 订单创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; /** * 订单更新时间 */ - @ApiModelProperty("订单更新时间") + // 订单更新时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt; /** * 订单支付时间 */ - @ApiModelProperty("订单支付时间") + // 订单支付时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date payAt; /** * 订单取消时间 */ - @ApiModelProperty("订单取消时间") + // 订单取消时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date cancelAt; /** * 订单退款时间 */ - @ApiModelProperty("订单退款时间") + // 订单退款时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date refundAt; - @ApiModelProperty("订单商品明细") + // 订单商品明细 private List goodsItemList; } diff --git a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java index f050cfd..46eb1c3 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.pc.order.resp; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -14,80 +12,80 @@ import java.util.List; * @Date：2024/11/29 15:59 */ @Data -@ApiModel("移动端订单信息响应类") +// 移动端订单信息响应类 public class OrderAppRespVO { private Long id; private Integer type; /** * 价格 */ - @ApiModelProperty("价格") + // 价格 private BigDecimal price; private BigDecimal slashPrice; /** * 实际支付价格 */ - @ApiModelProperty("实际支付价格") + // 实际支付价格 private BigDecimal payPrice; /** * 备注 */ - @ApiModelProperty("备注") + // 备注 private String remark; /** * 退款原因 */ - @ApiModelProperty("退款原因") + // 退款原因 private String refundReason; /** * 退款状态，0未提出，1已通过，2待审核 */ - @ApiModelProperty("退款状态，0未提出，1已通过，2待审核") + // 退款状态，0未提出，1已通过，2待审核 private Integer refundStatus; /** * 状态，0未支付，1已支付，2已退款，9已取消 */ - @ApiModelProperty("状态，0未支付，1已支付，2已退款，9已取消") + // 状态，0未支付，1已支付，2已退款，9已取消 private Integer status; /** * 订单创建时间 */ - @ApiModelProperty("订单创建时间") + // 订单创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; /** * 订单更新时间 */ - @ApiModelProperty("订单更新时间") + // 订单更新时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt; /** * 订单支付时间 */ - @ApiModelProperty("订单支付时间") + // 订单支付时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date payAt; /** * 订单取消时间 */ - @ApiModelProperty("订单取消时间") + // 订单取消时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date cancelAt; /** * 订单退款时间 */ - @ApiModelProperty("订单退款时间") + // 订单退款时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date refundAt; private Long scenicId; - @ApiModelProperty("景区名称") + // 景区名称 private String scenicName; /** * 商品类型，0其他，1成片，2原片，3模板成片 */ - @ApiModelProperty("商品类型，0成片，12源素材") + // 商品类型，0成片，12源素材 private Integer goodsType; - @ApiModelProperty("订单明细") + // 订单明细 private List orderItemList; public BigDecimal getDiscountPrice() { diff --git a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java index 711c554..ddeed23 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java @@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.order.resp; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -14,34 +12,34 @@ import java.util.List; * @Date：2024/12/3 14:07 */ @Data -@ApiModel("订单购买的内容（订单明细）") +// 订单购买的内容（订单明细） public class OrderItemVO { private Long id; /** * 订单id */ - @ApiModelProperty("订单id") + // 订单id private Long orderId; - @ApiModelProperty("商品类型，1成片，2源素材") + // 商品类型，1成片，2源素材 private Integer goodsType; /** * 商品ID，goods_type=1关联video.id，=2关联source.id，=3关联template.id */ - @ApiModelProperty("商品ID，goods_type=1关联video.id，=2关联source.id") + // 商品ID，goods_type=1关联video.id，=2关联source.id private Long goodsId; private Long faceId; private String faceUrl; - @ApiModelProperty("景区名称") + // 景区名称 private String scenicName; - @ApiModelProperty("商品名称 模版名称/原片x个/照片x个") + // 商品名称 模版名称/原片x个/照片x个 private String goodsName; - @ApiModelProperty("视频链接") + // 视频链接 private String videoUrl; - @ApiModelProperty("图片存储地址") + // 图片存储地址 private String imgUrl; private String coverUrl; - @ApiModelProperty("原素材类型：1视频，2图像") + // 原素材类型：1视频，2图像 private Integer sourceType; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java index 7469406..6c2df91 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java @@ -3,8 +3,6 @@ package com.ycwl.basic.model.pc.order.resp; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycwl.basic.model.mobile.goods.GoodsDetailVO; import com.ycwl.basic.model.pc.order.entity.OrderItemEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -16,7 +14,7 @@ import java.util.List; * @Date：2024/11/29 15:59 */ @Data -@ApiModel("查询订单信息响应参数") +// 查询订单信息响应参数 public class OrderRespVO { private Long id; private Long memberId; @@ -25,90 +23,90 @@ public class OrderRespVO { private Integer type; private String orderType; private String goodsName; - @ApiModelProperty("用户昵称") + // 用户昵称 private String memberNickname; private String memberUid; - @ApiModelProperty("用户真实名称") + // 用户真实名称 private String memberRealName; /** * 微信openId */ - @ApiModelProperty("微信openId") + // 微信openId private String openId; /** * 价格 */ - @ApiModelProperty("价格") + // 价格 private BigDecimal price; private BigDecimal slashPrice; /** * 实际支付价格 */ - @ApiModelProperty("实际支付价格") + // 实际支付价格 private BigDecimal payPrice; /** * 备注 */ - @ApiModelProperty("备注") + // 备注 private String remark; /** * 推客id */ - @ApiModelProperty("推客id") + // 推客id private Long brokerId; /** * 推客优惠码 */ - @ApiModelProperty("推客优惠码") + // 推客优惠码 private String promoCode; - @ApiModelProperty("订单商品类型 1成片，2源素材") + // 订单商品类型 1成片，2源素材 private Integer goodsType; /** * 退款原因 */ - @ApiModelProperty("退款原因") + // 退款原因 private String refundReason; /** * 退款状态，0未提出，1已通过，2待审核 */ - @ApiModelProperty("退款状态，0未提出，1已通过，2待审核") + // 退款状态，0未提出，1已通过，2待审核 private Integer refundStatus; /** * 状态，0未支付，1已支付，2已退款，9已取消 */ - @ApiModelProperty("状态，0未支付，1已支付，2已退款，9已取消") + // 状态，0未支付，1已支付，2已退款，9已取消 private Integer status; /** * 订单创建时间 */ - @ApiModelProperty("订单创建时间") + // 订单创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; /** * 订单更新时间 */ - @ApiModelProperty("订单更新时间") + // 订单更新时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt; /** * 订单支付时间 */ - @ApiModelProperty("订单支付时间") + // 订单支付时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date payAt; /** * 订单取消时间 */ - @ApiModelProperty("订单取消时间") + // 订单取消时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date cancelAt; /** * 订单退款时间 */ - @ApiModelProperty("订单退款时间") + // 订单退款时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date refundAt; - @ApiModelProperty("订单明细") + // 订单明细 private List orderItemList; private Long scenicId; private String scenicName; diff --git a/src/main/java/com/ycwl/basic/model/pc/renderWorker/req/RenderWorkerReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/renderWorker/req/RenderWorkerReqQuery.java index 0f10144..1877854 100644 --- a/src/main/java/com/ycwl/basic/model/pc/renderWorker/req/RenderWorkerReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/renderWorker/req/RenderWorkerReqQuery.java @@ -3,8 +3,6 @@ package com.ycwl.basic.model.pc.renderWorker.req; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,64 +16,64 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("渲染机列表查询参数") +// 渲染机列表查询参数 public class RenderWorkerReqQuery extends BaseQueryParameterReq { @TableId private Long id; /** * 渲染机名称 */ - @ApiModelProperty("渲染机名称") + // 渲染机名称 private String name; /** * 系统 */ - @ApiModelProperty("系统") + // 系统 private String platform; /** * 运行环境 */ - @ApiModelProperty("运行环境") + // 运行环境 private String runtimeVersion; /** * 版本 */ - @ApiModelProperty("版本") + // 版本 private String version; /** * cpu数量 */ - @ApiModelProperty("cpu数量") + // cpu数量 private Integer cpuCount; /** * cpu使用率 */ - @ApiModelProperty("cpu使用率") + // cpu使用率 private BigDecimal cpuUsage; /** * 支持的功能，逗号隔开 */ - @ApiModelProperty("支持的功能，逗号隔开") + // 支持的功能，逗号隔开 private String supportFeature; /** * 是否仅用于指定景区，空或0不适用，否则为景区ID */ - @ApiModelProperty("是否仅用于指定景区，空或0不适用，否则为景区ID") + // 是否仅用于指定景区，空或0不适用，否则为景区ID private Long scenicOnly; /** * 是否仅用于测试，0不是，1是 */ - @ApiModelProperty("是否仅用于测试，0不是，1是") + // 是否仅用于测试，0不是，1是 private Integer testOnly; /** * 是否在线，0不在，1在 */ - @ApiModelProperty("是否在线，0不在，1在") + // 是否在线，0不在，1在 private Integer online; /** * 状态，0禁用，1启用 */ - @ApiModelProperty("状态，0禁用，1启用") + // 状态，0禁用，1启用 private Integer status; private Date startTime; private Date endTime; diff --git a/src/main/java/com/ycwl/basic/model/pc/renderWorker/resp/RenderWorkerRespVO.java b/src/main/java/com/ycwl/basic/model/pc/renderWorker/resp/RenderWorkerRespVO.java index 9175685..40b4e5c 100644 --- a/src/main/java/com/ycwl/basic/model/pc/renderWorker/resp/RenderWorkerRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/renderWorker/resp/RenderWorkerRespVO.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.pc.renderWorker.resp; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -14,78 +12,78 @@ import java.util.Date; * 渲染机管理表 */ @Data -@ApiModel("查询渲染机列表响应对象") +// 查询渲染机列表响应对象 public class RenderWorkerRespVO { private Long id; /** * 渲染机名称 */ - @ApiModelProperty("渲染机名称") + // 渲染机名称 private String name; /** * 系统 */ - @ApiModelProperty("系统") + // 系统 private String platform; /** * 运行环境 */ - @ApiModelProperty("运行环境") + // 运行环境 private String runtimeVersion; /** * 版本 */ - @ApiModelProperty("版本") + // 版本 private String version; /** * 访问秘钥 */ - @ApiModelProperty("访问秘钥") + // 访问秘钥 private String accessKey; /** * cpu数量 */ - @ApiModelProperty("cpu数量") + // cpu数量 private Integer cpuCount; /** * cpu使用率 */ - @ApiModelProperty("cpu使用率") + // cpu使用率 private BigDecimal cpuUsage; /** * 内存总量，MB */ - @ApiModelProperty("内存总量，MB") + // 内存总量，MB private BigDecimal memoryTotal; /** * 内存余量，MB */ - @ApiModelProperty("内存余量，MB") + // 内存余量，MB private BigDecimal memoryAvailable; /** * 支持的功能，逗号隔开 */ - @ApiModelProperty("支持的功能，逗号隔开") + // 支持的功能，逗号隔开 private String supportFeature; /** * 是否仅用于指定景区，空或0不适用，否则为景区ID */ - @ApiModelProperty("是否仅用于指定景区，空或0不适用，否则为景区ID") + // 是否仅用于指定景区，空或0不适用，否则为景区ID private Long scenicOnly; /** * 是否仅用于测试，0不是，1是 */ - @ApiModelProperty("是否仅用于测试，0不是，1是") + // 是否仅用于测试，0不是，1是 private Integer testOnly; /** * 是否在线，0不在，1在 */ - @ApiModelProperty("是否在线，0不在，1在") + // 是否在线，0不在，1在 private Integer online; /** * 状态，0禁用，1启用 */ - @ApiModelProperty("状态，0禁用，1启用") + // 状态，0禁用，1启用 private Integer status; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; diff --git a/src/main/java/com/ycwl/basic/model/pc/role/req/AddOrUpdateRoleReqVO.java b/src/main/java/com/ycwl/basic/model/pc/role/req/AddOrUpdateRoleReqVO.java index e9addad..8f11d28 100644 --- a/src/main/java/com/ycwl/basic/model/pc/role/req/AddOrUpdateRoleReqVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/role/req/AddOrUpdateRoleReqVO.java @@ -1,15 +1,14 @@ package com.ycwl.basic.model.pc.role.req; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data public class AddOrUpdateRoleReqVO { - @ApiModelProperty(value = "id,更新的时候传") + // id,更新的时候传 private String id; - @ApiModelProperty(value = "角色名称") + // 角色名称 private String name; // @ApiModelProperty(value = "0系统角色 1业务角色") // private Integer type; diff --git a/src/main/java/com/ycwl/basic/model/pc/role/req/RoleListReqVO.java b/src/main/java/com/ycwl/basic/model/pc/role/req/RoleListReqVO.java index dd33d22..f32d59f 100644 --- a/src/main/java/com/ycwl/basic/model/pc/role/req/RoleListReqVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/role/req/RoleListReqVO.java @@ -1,15 +1,13 @@ package com.ycwl.basic.model.pc.role.req; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel(value = "角色请求列表VO") +// 角色请求列表VO public class RoleListReqVO extends BaseQueryParameterReq { - @ApiModelProperty(value = "名字") + // 名字 private String name; } diff --git a/src/main/java/com/ycwl/basic/model/pc/role/resp/RoleListRespVO.java b/src/main/java/com/ycwl/basic/model/pc/role/resp/RoleListRespVO.java index 9d05ca9..2c368ea 100644 --- a/src/main/java/com/ycwl/basic/model/pc/role/resp/RoleListRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/role/resp/RoleListRespVO.java @@ -1,22 +1,20 @@ package com.ycwl.basic.model.pc.role.resp; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data -@ApiModel(value = "角色列表返回数据VO") +// 角色列表返回数据VO public class RoleListRespVO { - @ApiModelProperty(value = "id") + // id private String id; - @ApiModelProperty(value = "名字") + // 名字 private String name; - @ApiModelProperty(value = "0正常 1关闭") + // 0正常 1关闭 private Integer status; - @ApiModelProperty(value = "创建时间") + // 创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; } diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicEntity.java b/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicEntity.java index e41c857..f0c69fc 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/entity/ScenicEntity.java @@ -2,7 +2,6 @@ package com.ycwl.basic.model.pc.scenic.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAccountReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAccountReqQuery.java index 547560b..7deedf9 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAccountReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAccountReqQuery.java @@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.scenic.req; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,28 +9,28 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("景区账号分页查询请求参数") +// 景区账号分页查询请求参数 public class ScenicAccountReqQuery extends BaseQueryParameterReq { - @ApiModelProperty("景区ID") + // 景区ID private Long scenicId; - @ApiModelProperty("账号名称") + // 账号名称 private String account; - @ApiModelProperty("手机号") + // 手机号 private String phone; - @ApiModelProperty("账号状态（1启用/0关闭）") + // 账号状态（1启用/0关闭） private Integer status; - @ApiModelProperty("是否超级管理员（1是/0否）") + // 是否超级管理员（1是/0否） private Integer isSuper; - @ApiModelProperty("创建时间起始") + // 创建时间起始 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date startTime; - @ApiModelProperty("创建时间结束") + // 创建时间结束 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; } \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAddOrUpdateReq.java b/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAddOrUpdateReq.java index 5814014..f9ab8f7 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAddOrUpdateReq.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicAddOrUpdateReq.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.pc.scenic.req; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -13,80 +11,80 @@ import java.util.Date; * @Date：2024/12/3 15:29 */ @Data -@ApiModel("新增或修改景区请求参数") +// 新增或修改景区请求参数 public class ScenicAddOrUpdateReq { private Long id; /** * 景区名称 */ - @ApiModelProperty("景区名称") + // 景区名称 private String name; /** * 景区电话 */ - @ApiModelProperty("联系电话") + // 联系电话 private String phone; /** * 景区介绍 */ - @ApiModelProperty("景区介绍") + // 景区介绍 private String introduction; private String logoUrl; - @ApiModelProperty("封面图") + // 封面图 private String coverUrl; /** * 经度 */ - @ApiModelProperty("经度") + // 经度 private BigDecimal longitude; /*** * 纬度 */ - @ApiModelProperty("纬度") + // 纬度 private BigDecimal latitude; /** * 半径（km） */ - @ApiModelProperty("半径（km）") + // 半径（km） private BigDecimal radius; /** * 省份 */ - @ApiModelProperty("省份") + // 省份 private String province; /** * 城市 */ - @ApiModelProperty("城市") + // 城市 private String city; /** * 区 */ - @ApiModelProperty("区") + // 区 private String area; /** * 详细地址 */ - @ApiModelProperty("详细地址") + // 详细地址 private String address; /** * 状态 1启用0关闭 */ - @ApiModelProperty("状态 1启用0关闭") + // 状态 1启用0关闭 private String status; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; - @ApiModelProperty("景区源素材价格，元") + // 景区源素材价格，元 private BigDecimal price; private BigDecimal sourceVideoPrice; private BigDecimal sourceImagePrice; - @ApiModelProperty("账号") + // 账号 private String account; - @ApiModelProperty("密码") + // 密码 private String password; private String kfCodeUrl; private String kfPhone; diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicReqQuery.java index 3ad1196..048decc 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/req/ScenicReqQuery.java @@ -3,8 +3,6 @@ package com.ycwl.basic.model.pc.scenic.req; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,57 +16,57 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("景区列表查询参数") +// 景区列表查询参数 public class ScenicReqQuery extends BaseQueryParameterReq { /** * 景区名称 */ - @ApiModelProperty("景区名称") + // 景区名称 private String name; /** * 景区介绍 */ - @ApiModelProperty("景区介绍") + // 景区介绍 private String introduction; /** * 经度 */ - @ApiModelProperty("经度") + // 经度 private BigDecimal longitude; /*** * 纬度 */ - @ApiModelProperty("纬度") + // 纬度 private BigDecimal latitude; /** * 半径（km） */ - @ApiModelProperty("半径（km）") + // 半径（km） private BigDecimal radius; /** * 省份 */ - @ApiModelProperty("省份") + // 省份 private String province; /** * 城市 */ - @ApiModelProperty("城市") + // 城市 private String city; /** * 区 */ - @ApiModelProperty("区") + // 区 private String area; /** * 详细地址 */ - @ApiModelProperty("详细地址") + // 详细地址 private String address; /** * 状态 1启用0关闭 */ - @ApiModelProperty("状态 1启用0关闭") + // 状态 1启用0关闭 private String status; private Date startTime; private Date endTime; diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicRespVO.java b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicRespVO.java index c81d6b4..63e23c0 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicRespVO.java @@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.scenic.resp; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -15,81 +13,81 @@ import java.util.Date; * 景区管理表 */ @Data -@ApiModel("查询景区列表响应参数") +// 查询景区列表响应参数 public class ScenicRespVO { private Long id; /** * 景区名称 */ - @ApiModelProperty("景区名称") + // 景区名称 private String name; /** * 账号 */ - @ApiModelProperty("账号") + // 账号 private String account; /** * 联系电话 */ - @ApiModelProperty("联系电话") + // 联系电话 private String phone; /** * 景区介绍 */ - @ApiModelProperty("景区介绍") + // 景区介绍 private String introduction; private String logoUrl; - @ApiModelProperty("封面图") + // 封面图 private String coverUrl; /** * 经度 */ - @ApiModelProperty("经度") + // 经度 private BigDecimal longitude; /*** * 纬度 */ - @ApiModelProperty("纬度") + // 纬度 private BigDecimal latitude; /** * 半径（km） */ - @ApiModelProperty("半径（km）") + // 半径（km） private BigDecimal radius; /** * 省份 */ - @ApiModelProperty("省份") + // 省份 private String province; /** * 城市 */ - @ApiModelProperty("城市") + // 城市 private String city; /** * 区 */ - @ApiModelProperty("区") + // 区 private String area; /** * 详细地址 */ - @ApiModelProperty("详细地址") + // 详细地址 private String address; /** * 状态 1启用0关闭 */ - @ApiModelProperty("状态 1启用0关闭") + // 状态 1启用0关闭 private Integer status; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; - @ApiModelProperty("景区源素材价格，元") + // 景区源素材价格，元 private BigDecimal price; private BigDecimal sourceVideoPrice; private BigDecimal sourceImagePrice; - @ApiModelProperty("镜头数") + // 镜头数 private Integer lensNum; private String kfCodeUrl; private String kfPhone; diff --git a/src/main/java/com/ycwl/basic/model/pc/source/entity/SourceEntity.java b/src/main/java/com/ycwl/basic/model/pc/source/entity/SourceEntity.java index 2737dd0..8697bad 100644 --- a/src/main/java/com/ycwl/basic/model/pc/source/entity/SourceEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/source/entity/SourceEntity.java @@ -2,7 +2,6 @@ package com.ycwl.basic.model.pc.source.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/ycwl/basic/model/pc/source/req/SourceReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/source/req/SourceReqQuery.java index 32c919d..0239442 100644 --- a/src/main/java/com/ycwl/basic/model/pc/source/req/SourceReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/source/req/SourceReqQuery.java @@ -3,8 +3,6 @@ package com.ycwl.basic.model.pc.source.req; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,33 +16,33 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel(value = "视频源查询对象") +// 视频源查询对象 public class SourceReqQuery extends BaseQueryParameterReq { @TableId private Long id; /** * 景区id */ - @ApiModelProperty("景区id") + // 景区id private Long scenicId; /** * 来源设备id */ - @ApiModelProperty("来源设备id") + // 来源设备id private Long deviceId; /** * 所属用户 */ - @ApiModelProperty("所属用户") + // 所属用户 private Long memberId; - @ApiModelProperty("原素材类型：1视频，2图像") + // 原素材类型：1视频，2图像 private Integer type; /** * 文件存储地址 */ - @ApiModelProperty("文件存储地址") + // 文件存储地址 private String url; - @ApiModelProperty("是否被购买：0未购买，1已购买") + // 是否被购买：0未购买，1已购买 private Integer isBuy; private Long faceId; private Date startTime; diff --git a/src/main/java/com/ycwl/basic/model/pc/source/resp/SourceRespVO.java b/src/main/java/com/ycwl/basic/model/pc/source/resp/SourceRespVO.java index 102e343..dc2a6ec 100644 --- a/src/main/java/com/ycwl/basic/model/pc/source/resp/SourceRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/source/resp/SourceRespVO.java @@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.source.resp; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -15,36 +13,36 @@ import java.util.Date; * 视频源 */ @Data -@ApiModel(value = "视频源响应对象") +// 视频源响应对象 public class SourceRespVO { @TableId private Long id; /** * 景区id */ - @ApiModelProperty("景区id") + // 景区id private Long scenicId; - @ApiModelProperty("景区名称") + // 景区名称 private String scenicName; /** * 来源设备id */ - @ApiModelProperty("来源设备id") + // 来源设备id private Long deviceId; private String deviceName; private Long faceId; - @ApiModelProperty("原素材类型：1视频，2图像") + // 原素材类型：1视频，2图像 private Integer type; /** * 文件存储地址 */ - @ApiModelProperty("图片文件存储地址") + // 图片文件存储地址 private String url; - @ApiModelProperty("视频文件存储地址") + // 视频文件存储地址 private String videoUrl; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; - @ApiModelProperty("是否购买：0未购买，1已购买") + // 是否购买：0未购买，1已购买 private int isBuy; private int isFree; } diff --git a/src/main/java/com/ycwl/basic/model/pc/task/req/TaskReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/task/req/TaskReqQuery.java index 017aef0..14c4a16 100644 --- a/src/main/java/com/ycwl/basic/model/pc/task/req/TaskReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/task/req/TaskReqQuery.java @@ -3,8 +3,6 @@ package com.ycwl.basic.model.pc.task.req; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,50 +15,50 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("任务列表查询参数") +// 任务列表查询参数 public class TaskReqQuery extends BaseQueryParameterReq { @TableId private Long id; /** * 执行任务的机器ID，render_worker.id */ - @ApiModelProperty("执行任务的机器ID") + // 执行任务的机器ID private Long workerId; /** * 用户ID，可以不和用户关联 */ - @ApiModelProperty("用户ID") + // 用户ID private Long memberId; private Long faceId; /** * 模板ID */ - @ApiModelProperty("模板ID") + // 模板ID private Long templateId; /** * 景区ID */ - @ApiModelProperty("景区ID") + // 景区ID private Long scenicId; /** * 任务参数，JSON字符串 */ - @ApiModelProperty("任务参数") + // 任务参数 private String taskParams; /** * 视频链接，未完成状态下没有 */ - @ApiModelProperty("视频链接") + // 视频链接 private String videoUrl; /** * 状态，0未完成，1已完成，2正在处理 */ - @ApiModelProperty("状态") + // 状态 private Integer status; /** * 结果，不管成功还是失败 */ - @ApiModelProperty("结果") + // 结果 private String result; private Date startTime; private Date endTime; diff --git a/src/main/java/com/ycwl/basic/model/pc/task/resp/TaskRespVO.java b/src/main/java/com/ycwl/basic/model/pc/task/resp/TaskRespVO.java index f2500d9..5ba53bd 100644 --- a/src/main/java/com/ycwl/basic/model/pc/task/resp/TaskRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/task/resp/TaskRespVO.java @@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.task.resp; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -14,44 +12,44 @@ import java.util.Date; * 任务列表 */ @Data -@ApiModel("查询任务列表响应参数") +// 查询任务列表响应参数 public class TaskRespVO { private Long id; /** * 执行任务的机器ID，render_worker.id */ - @ApiModelProperty("执行任务的机器ID") + // 执行任务的机器ID private Long workerId; private Long faceId; /** * 模板ID */ - @ApiModelProperty("模板ID") + // 模板ID private Long templateId; /** * 景区ID */ - @ApiModelProperty("景区ID") + // 景区ID private Long scenicId; /** * 任务参数，JSON字符串 */ - @ApiModelProperty("任务参数") + // 任务参数 private String taskParams; /** * 视频链接，未完成状态下没有 */ - @ApiModelProperty("视频链接") + // 视频链接 private String videoUrl; /** * 状态，0未完成，1已完成，2正在处理 */ - @ApiModelProperty("状态") + // 状态 private Integer status; /** * 结果，不管成功还是失败 */ - @ApiModelProperty("结果") + // 结果 private String result; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; diff --git a/src/main/java/com/ycwl/basic/model/pc/template/req/TemplateReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/template/req/TemplateReqQuery.java index 19a44e0..82ab772 100644 --- a/src/main/java/com/ycwl/basic/model/pc/template/req/TemplateReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/template/req/TemplateReqQuery.java @@ -3,9 +3,6 @@ package com.ycwl.basic.model.pc.template.req; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,61 +16,61 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("模版查询请求类") +// 模版查询请求类 public class TemplateReqQuery extends BaseQueryParameterReq { - @ApiModelProperty("景区id") + // 景区id private Long scenicId; /** * 模版名称 */ - @ApiModelProperty("模版名称") + // 模版名称 private String name; /** * 父模版ID */ - @ApiModelProperty("父模版ID") + // 父模版ID private Long pid; /** * 是否是占位素材，0不是，1是 */ - @ApiModelProperty("是否是占位素材，0不是，1是") + // 是否是占位素材，0不是，1是 private Integer isPlaceholder; /** * 来源，如果是占位素材则为占位标识 * CHILD：所有子模板 * PLACEHOLDER_***：根据任务附加属性获取 */ - @ApiModelProperty("来源，如果是占位素材则为占位标识") + // 来源，如果是占位素材则为占位标识 private String sourceUrl; /** * 逗号隔开，叠加调色列表 */ - @ApiModelProperty("逗号隔开，叠加调色列表") + // 逗号隔开，叠加调色列表 private String luts; /** * 逗号隔开，叠加蒙版列表 */ - @ApiModelProperty("逗号隔开，叠加蒙版列表") + // 逗号隔开，叠加蒙版列表 private String overlays; /** * 逗号隔开，叠加音轨列表 */ - @ApiModelProperty("逗号隔开，叠加音轨列表") + // 逗号隔开，叠加音轨列表 private String audios; /** * 帧率 */ - @ApiModelProperty("帧率") + // 帧率 private Integer frameRate; /** * 倍速，默认1 */ - @ApiModelProperty("倍速，默认1") + // 倍速，默认1 private BigDecimal speed; /** * 是否启用，0不是，1是 */ - @ApiModelProperty("是否启用，0不是，1是") + // 是否启用，0不是，1是 private Integer status; private Date startTime; private Date endTime; diff --git a/src/main/java/com/ycwl/basic/model/pc/template/req/TemplateSortRequest.java b/src/main/java/com/ycwl/basic/model/pc/template/req/TemplateSortRequest.java index e7208e0..88c9007 100644 --- a/src/main/java/com/ycwl/basic/model/pc/template/req/TemplateSortRequest.java +++ b/src/main/java/com/ycwl/basic/model/pc/template/req/TemplateSortRequest.java @@ -1,13 +1,12 @@ package com.ycwl.basic.model.pc.template.req; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class TemplateSortRequest { - @ApiModelProperty(value = "被操作模板的ID", required = true) + // 被操作模板的ID private Long templateId; - @ApiModelProperty(value = "排在其后的模板ID") + // 排在其后的模板ID private Long afterTemplateId; } \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/model/pc/template/resp/TemplateRespVO.java b/src/main/java/com/ycwl/basic/model/pc/template/resp/TemplateRespVO.java index d782a6e..d20af44 100644 --- a/src/main/java/com/ycwl/basic/model/pc/template/resp/TemplateRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/template/resp/TemplateRespVO.java @@ -2,8 +2,6 @@ package com.ycwl.basic.model.pc.template.resp; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -16,69 +14,69 @@ import java.util.List; * 模版 */ @Data -@ApiModel("模版响应数据类") +// 模版响应数据类 public class TemplateRespVO { private Long id; private Long scenicId; - @ApiModelProperty("景区名称") + // 景区名称 private String scenicName; /** * 模版名称 */ - @ApiModelProperty("模版名称") + // 模版名称 private String name; /** * 父模版ID */ - @ApiModelProperty("父模版ID") + // 父模版ID private Long pid; /** * 是否是占位素材，0不是，1是 */ - @ApiModelProperty("是否是占位素材，0不是，1是") + // 是否是占位素材，0不是，1是 private Integer isPlaceholder; /** * 来源，如果是占位素材则为占位标识 * CHILD：所有子模板 * PLACEHOLDER_***：根据任务附加属性获取 */ - @ApiModelProperty("来源，如果是占位素材则为占位标识") + // 来源，如果是占位素材则为占位标识 private String sourceUrl; private String effects; /** * 逗号隔开，叠加调色列表 */ - @ApiModelProperty("逗号隔开，叠加调色列表") + // 逗号隔开，叠加调色列表 private String luts; /** * 逗号隔开，叠加蒙版列表 */ - @ApiModelProperty("逗号隔开，叠加蒙版列表") + // 逗号隔开，叠加蒙版列表 private String overlays; /** * 逗号隔开，叠加音轨列表 */ - @ApiModelProperty("逗号隔开，叠加音轨列表") + // 逗号隔开，叠加音轨列表 private String audios; /** * 帧率 */ - @ApiModelProperty("帧率") + // 帧率 private Integer frameRate; /** * 倍速，默认1 */ - @ApiModelProperty("倍速，默认1") + // 倍速，默认1 private BigDecimal speed; /** * 封面 */ - @ApiModelProperty("封面") + // 封面 private String coverUrl; /** * 是否启用，0不是，1是 */ - @ApiModelProperty("是否启用，0不是，1是") + // 是否启用，0不是，1是 private Integer status; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; diff --git a/src/main/java/com/ycwl/basic/model/pc/video/entity/VideoEntity.java b/src/main/java/com/ycwl/basic/model/pc/video/entity/VideoEntity.java index ed996b1..6978fc0 100644 --- a/src/main/java/com/ycwl/basic/model/pc/video/entity/VideoEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/video/entity/VideoEntity.java @@ -2,7 +2,6 @@ package com.ycwl.basic.model.pc.video.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/ycwl/basic/model/pc/video/req/VideoReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/video/req/VideoReqQuery.java index fe3b1f7..bf57606 100644 --- a/src/main/java/com/ycwl/basic/model/pc/video/req/VideoReqQuery.java +++ b/src/main/java/com/ycwl/basic/model/pc/video/req/VideoReqQuery.java @@ -3,8 +3,6 @@ package com.ycwl.basic.model.pc.video.req; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ycwl.basic.model.common.BaseQueryParameterReq; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,41 +15,41 @@ import java.util.Date; */ @EqualsAndHashCode(callSuper = true) @Data -@ApiModel("成片查询请求类") +// 成片查询请求类 public class VideoReqQuery extends BaseQueryParameterReq { /** * 景区id */ - @ApiModelProperty("景区id") + // 景区id private Long scenicId; - @ApiModelProperty("人脸id") + // 人脸id private Long faceId; /** * 用户id */ - @ApiModelProperty("用户id") + // 用户id private Long memberId; /** * 模版id */ - @ApiModelProperty("模版id") + // 模版id private Long templateId; /** * 任务id */ - @ApiModelProperty("任务id") + // 任务id private Long taskId; /** * 执行任务的机器ID，render_worker.id */ - @ApiModelProperty("执行任务的机器ID，render_worker.id") + // 执行任务的机器ID，render_worker.id private Long workerId; /** * 视频链接 */ - @ApiModelProperty("视频链接") + // 视频链接 private String videoUrl; - @ApiModelProperty("是否购买 1是 0否") + // 是否购买 1是 0否 private Integer isBuy; private Date startTime; private Date endTime; diff --git a/src/main/java/com/ycwl/basic/model/pc/video/resp/VideoRespVO.java b/src/main/java/com/ycwl/basic/model/pc/video/resp/VideoRespVO.java index b2f0a91..77cd620 100644 --- a/src/main/java/com/ycwl/basic/model/pc/video/resp/VideoRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/video/resp/VideoRespVO.java @@ -1,8 +1,6 @@ package com.ycwl.basic.model.pc.video.resp; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -14,47 +12,47 @@ import java.util.Date; * 视频成片 */ @Data -@ApiModel("成片响应数据类") +// 成片响应数据类 public class VideoRespVO { private Long id; /** * 景区id */ - @ApiModelProperty("景区id") + // 景区id private Long scenicId; - @ApiModelProperty("景区名称") + // 景区名称 private String scenicName; /** * 人脸ID */ - @ApiModelProperty("人脸ID") + // 人脸ID private Long faceId; /** * 模版id */ - @ApiModelProperty("模版id") + // 模版id private Long templateId; - @ApiModelProperty("模版名称") + // 模版名称 private String templateName; - @ApiModelProperty("模版价格") + // 模版价格 private BigDecimal templatePrice; private BigDecimal slashPrice; - @ApiModelProperty("模版封面图片") + // 模版封面图片 private String templateCoverUrl; /** * 任务id */ - @ApiModelProperty("任务id") + // 任务id private Long taskId; /** * 执行任务的机器ID，render_worker.id */ - @ApiModelProperty("执行任务的机器ID，render_worker.id") + // 执行任务的机器ID，render_worker.id private Long workerId; /** * 视频链接 */ - @ApiModelProperty("视频链接") + // 视频链接 private String videoUrl; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; diff --git a/src/main/java/com/ycwl/basic/model/snowFlake/UniqueId.java b/src/main/java/com/ycwl/basic/model/snowFlake/UniqueId.java index dbda6a4..8747074 100644 --- a/src/main/java/com/ycwl/basic/model/snowFlake/UniqueId.java +++ b/src/main/java/com/ycwl/basic/model/snowFlake/UniqueId.java @@ -1,5 +1,4 @@ package com.ycwl.basic.model.snowFlake; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -27,16 +26,16 @@ public class UniqueId implements Serializable { /** * 工作机器ID、数据中心ID、序列号、上次生成ID的时间戳 */ - @ApiModelProperty(value = "机器ID") + // 机器ID private long machineId; - @ApiModelProperty(value = "数据中心ID") + // 数据中心ID private long datacenterId; - @ApiModelProperty(value = "毫秒内序列") + // 毫秒内序列 private long sequence; - @ApiModelProperty(value = "时间戳") + // 时间戳 private long timestamp; @Override diff --git a/src/main/java/com/ycwl/basic/model/snowFlake/UniqueIdMetaData.java b/src/main/java/com/ycwl/basic/model/snowFlake/UniqueIdMetaData.java index 83d0f4e..2c377fd 100644 --- a/src/main/java/com/ycwl/basic/model/snowFlake/UniqueIdMetaData.java +++ b/src/main/java/com/ycwl/basic/model/snowFlake/UniqueIdMetaData.java @@ -1,6 +1,5 @@ package com.ycwl.basic.model.snowFlake; -import io.swagger.annotations.ApiModelProperty; public class UniqueIdMetaData { /** @@ -13,73 +12,73 @@ public class UniqueIdMetaData { /** * 机器ID所占位数 */ - @ApiModelProperty(value = "机器位数") + // 机器位数 public static final long MACHINE_ID_BITS = 5L; /** * 机器ID最大值31，0-31 */ - @ApiModelProperty(value = "机器ID最大") + // 机器ID最大 public static final long MAX_MACHINE_ID = ~(-1L << MACHINE_ID_BITS); /** * 数据中心ID所占位数 */ - @ApiModelProperty(value = "数据中心ID所占位数") + // 数据中心ID所占位数 public static final long DATACENTER_ID_BITS = 5L; /** * 数据中心ID最大值31，0-31 */ - @ApiModelProperty(value = "数据中心ID最大值") + // 数据中心ID最大值 public static final long MAX_DATACENTER_ID = ~(-1L << MACHINE_ID_BITS); /** * Sequence所占位数 */ - @ApiModelProperty(value = "序列所占位数") + // 序列所占位数 public static final long SEQUENCE_BITS = 12L; /** * 机器ID偏移量12 */ - @ApiModelProperty(value = "机器ID偏移量") + // 机器ID偏移量 public static final long MACHINE_SHIFT_BITS = SEQUENCE_BITS; /** * 数据中心ID偏移量12+5=17 */ - @ApiModelProperty(value = "数据中心ID偏移量") + // 数据中心ID偏移量 public static final long DATACENTER_SHIFT_BITS = SEQUENCE_BITS + MACHINE_ID_BITS; /** * 时间戳的偏移量12+5+5=22 */ - @ApiModelProperty(value = "时间戳偏移量") + // 时间戳偏移量 public static final long TIMESTAMP_LEFT_SHIFT_BITS = SEQUENCE_BITS + MACHINE_ID_BITS + DATACENTER_ID_BITS; /** * Sequence掩码4095 */ - @ApiModelProperty(value = "序列掩码") + // 序列掩码 public static final long SEQUENCE_MASK = ~(-1L << SEQUENCE_BITS); /** * 机器ID掩码1023 */ - @ApiModelProperty(value = "机器ID掩码") + // 机器ID掩码 public static final long MACHINE_MASK = ~(-1L << MACHINE_ID_BITS); /** * 数据中心掩码1023 */ - @ApiModelProperty(value = "数据中心掩码") + // 数据中心掩码 public static final long DATACENTER_MASK = ~(-1L << MACHINE_ID_BITS); /** * 时间戳掩码2的41次方减1 */ - @ApiModelProperty(value = "时间戳掩码") + // 时间戳掩码 public static final long TIMESTAMP_MASK = ~(-1L << 41L); } diff --git a/src/main/java/com/ycwl/basic/model/wx/WXPayOrderReqVO.java b/src/main/java/com/ycwl/basic/model/wx/WXPayOrderReqVO.java index 97f472a..7b5b2c0 100644 --- a/src/main/java/com/ycwl/basic/model/wx/WXPayOrderReqVO.java +++ b/src/main/java/com/ycwl/basic/model/wx/WXPayOrderReqVO.java @@ -1,7 +1,6 @@ package com.ycwl.basic.model.wx; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -15,16 +14,16 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class WXPayOrderReqVO { - @ApiModelProperty(value = "总金额(单位：分)",required = true) + // 总金额(单位：分) private Integer totalPrice; - @ApiModelProperty(value = "商品名称",required = true) + // 商品名称 private String goodsName; - @ApiModelProperty(value = "openid",required = true) + // openid private String openId; - @ApiModelProperty(value = "商品订单号",required = true) + // 商品订单号 private Long orderSn; private String description; diff --git a/src/main/java/com/ycwl/basic/model/wx/WxPayRespVO.java b/src/main/java/com/ycwl/basic/model/wx/WxPayRespVO.java index 9d9e3fe..8346f9a 100644 --- a/src/main/java/com/ycwl/basic/model/wx/WxPayRespVO.java +++ b/src/main/java/com/ycwl/basic/model/wx/WxPayRespVO.java @@ -1,7 +1,6 @@ package com.ycwl.basic.model.wx; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -24,26 +23,26 @@ public class WxPayRespVO implements Serializable { /** * 预支付交易会话标识小程序下单接口返回的prepay_id参数值 */ - @ApiModelProperty("预支付交易会话标识小程序下单接口返回的prepay_id参数值") + // 预支付交易会话标识小程序下单接口返回的prepay_id参数值 private String prepayId; /** * 随机字符串 */ - @ApiModelProperty("随机字符串") + // 随机字符串 private String nonceStr; /** * 时间戳 */ - @ApiModelProperty("时间戳") + // 时间戳 private Long timeStamp; /** * 签名 */ - @ApiModelProperty("签名") + // 签名 private String paySign; /** * 签名签名算法 */ - @ApiModelProperty("签名算法") + // 签名算法 private String signType; } diff --git a/src/main/java/com/ycwl/basic/profitsharing/controller/ProfitSharingRecordController.java b/src/main/java/com/ycwl/basic/profitsharing/controller/ProfitSharingRecordController.java index be3e462..623961a 100644 --- a/src/main/java/com/ycwl/basic/profitsharing/controller/ProfitSharingRecordController.java +++ b/src/main/java/com/ycwl/basic/profitsharing/controller/ProfitSharingRecordController.java @@ -6,20 +6,18 @@ import com.ycwl.basic.profitsharing.dto.ProfitSharingRecordReqQuery; import com.ycwl.basic.profitsharing.dto.ProfitSharingRecordTableRespVo; import com.ycwl.basic.profitsharing.service.ProfitSharingRecordService; import com.ycwl.basic.utils.ApiResponse; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/profitSharingRecord/v1") -@Api(tags = "利润分成记录相关接口") +// 利润分成记录相关接口 public class ProfitSharingRecordController { @Autowired private ProfitSharingRecordService profitSharingRecordService; - @ApiOperation("根据景区ID查询利润分成记录，支持分页，按创建时间倒序") + // 根据景区ID查询利润分成记录，支持分页，按创建时间倒序 @PostMapping("/page") public ApiResponse queryPage(@RequestBody ProfitSharingRecordReqQuery req) { ProfitSharingRecordTableRespVo records = profitSharingRecordService.list(req); diff --git a/src/main/java/com/ycwl/basic/profitsharing/dto/ProfitSharingRecordRespVO.java b/src/main/java/com/ycwl/basic/profitsharing/dto/ProfitSharingRecordRespVO.java index 01430c5..4fe6e4c 100644 --- a/src/main/java/com/ycwl/basic/profitsharing/dto/ProfitSharingRecordRespVO.java +++ b/src/main/java/com/ycwl/basic/profitsharing/dto/ProfitSharingRecordRespVO.java @@ -1,54 +1,52 @@ package com.ycwl.basic.profitsharing.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.util.Date; @Data -@ApiModel(value = "利润分成记录响应VO") +// 利润分成记录响应VO public class ProfitSharingRecordRespVO { - @ApiModelProperty(value = "记录ID") + // 记录ID private Long id; - @ApiModelProperty(value = "景区ID") + // 景区ID private Long scenicId; private String scenicName; - @ApiModelProperty(value = "订单ID") + // 订单ID private Long orderId; - @ApiModelProperty(value = "用户ID") + // 用户ID private Long userId; - @ApiModelProperty(value = "用户名") + // 用户名 private String userName; - @ApiModelProperty(value = "分成金额") + // 分成金额 private BigDecimal amount; - @ApiModelProperty(value = "微信分成金额") + // 微信分成金额 private BigDecimal wxAmount; - @ApiModelProperty(value = "手动分成金额") + // 手动分成金额 private BigDecimal manualAmount; - @ApiModelProperty(value = "微信分账比例模式") + // 微信分账比例模式 private Integer rateMode; - @ApiModelProperty(value = "微信分账比例") + // 微信分账比例 private BigDecimal wxRate; - @ApiModelProperty(value = "实际分账比例") + // 实际分账比例 private BigDecimal realRate; - @ApiModelProperty(value = "订单金额") + // 订单金额 private BigDecimal orderAmount; private Integer status; - @ApiModelProperty(value = "创建时间") + // 创建时间 private Date createTime; } \ No newline at end of file diff --git a/src/main/java/com/ycwl/basic/profitsharing/dto/ProfitSharingTableRecordVO.java b/src/main/java/com/ycwl/basic/profitsharing/dto/ProfitSharingTableRecordVO.java index 0a39d2d..db00593 100644 --- a/src/main/java/com/ycwl/basic/profitsharing/dto/ProfitSharingTableRecordVO.java +++ b/src/main/java/com/ycwl/basic/profitsharing/dto/ProfitSharingTableRecordVO.java @@ -1,6 +1,5 @@ package com.ycwl.basic.profitsharing.dto; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -10,17 +9,17 @@ import java.util.Map; @Data public class ProfitSharingTableRecordVO { - @ApiModelProperty(value = "景区ID") + // 景区ID private Long scenicId; private String scenicName; - @ApiModelProperty(value = "订单ID") + // 订单ID private Long orderId; - @ApiModelProperty(value = "订单金额") + // 订单金额 private BigDecimal orderAmount; - @ApiModelProperty(value = "创建时间") + // 创建时间 private Date createTime; private Map records; diff --git a/src/main/java/com/ycwl/basic/utils/ApiResponse.java b/src/main/java/com/ycwl/basic/utils/ApiResponse.java index 82aaff1..a1d9e5c 100644 --- a/src/main/java/com/ycwl/basic/utils/ApiResponse.java +++ b/src/main/java/com/ycwl/basic/utils/ApiResponse.java @@ -3,8 +3,6 @@ package com.ycwl.basic.utils; import com.fasterxml.jackson.annotation.JsonIgnore; import com.ycwl.basic.enums.BizCodeEnum; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serial; import java.io.Serializable; @@ -15,7 +13,7 @@ import java.io.Serializable; * @param * @version 1.0.0 */ -@ApiModel(value = "通用返回数据对象") +// 通用返回数据对象 public class ApiResponse implements Serializable { @Serial @@ -24,19 +22,19 @@ public class ApiResponse implements Serializable { /** * 返回CODE码，详见{@link ApiConst.Code}中常量定义 */ - @ApiModelProperty(value = "状态码") + // 状态码 private int code; /** * 返回message */ - @ApiModelProperty(value = "数据描述") + // 数据描述 private String msg; /** * 成功返回数据 */ - @ApiModelProperty(value = "数据") + // 数据 private T data; public ApiResponse() {