From 2239c6556c8ab98347bb53fa25f3135964409dcd Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Tue, 3 Dec 2024 15:35:49 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../req/AddOrUpdateAdminUserReqVO.java | 4 ++++ .../pc/adminUser/req/AdminUserListReqVO.java | 8 ++------ .../pc/adminUser/resp/AdminUserListRespVO.java | 18 ++++++++---------- .../entity/RenderWorkerEntity.java | 2 +- .../renderWorker/req/RenderWorkerReqQuery.java | 2 +- .../renderWorker/resp/RenderWorkerRespVO.java | 2 +- .../basic/model/pc/role/req/RoleListReqVO.java | 2 -- .../resources/mapper/pc/AdminUserMapper.xml | 9 ++++++++- 8 files changed, 25 insertions(+), 22 deletions(-) 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 46afeb0..4a8df87 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 @@ -16,4 +16,8 @@ public class AddOrUpdateAdminUserReqVO { 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 135b85d..8c33105 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 @@ -11,13 +11,9 @@ public class AdminUserListReqVO extends BaseQueryParameterReq { @ApiModelProperty(value = "姓名") private String name; @ApiModelProperty(value = "账号") + private String account; + @ApiModelProperty(value = "手机号") private String phone; - @ApiModelProperty(value = "工号") - private String jobNo; - @ApiModelProperty(value = "组织ID") - private String companyId; - //@ApiModelProperty(value = "部门ID") - //private String departmentId; @ApiModelProperty(value = "角色ID") private String roleId; } 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 813c5b7..381d3c1 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 @@ -4,27 +4,25 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + @Data @ApiModel(value = "后台管理人员返回列表VO") public class AdminUserListRespVO { @ApiModelProperty(value = "id") private String id; + @ApiModelProperty(value = "账号") + private String account; @ApiModelProperty(value = "昵称") private String name; -// @ApiModelProperty(value = "员工ID") -// private String staffId; -// @ApiModelProperty(value = "员工姓名") -// private String staffName; @ApiModelProperty(value = "手机号") private String phone; -// @ApiModelProperty(value = "工号") -// private String jobNo; -// @ApiModelProperty(value = "组织") -// private String companyName; -// @ApiModelProperty(value = "组织ID") -// private String companyId; @ApiModelProperty(value = "角色") private String roleName; @ApiModelProperty(value = "角色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/renderWorker/entity/RenderWorkerEntity.java b/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java index 2276736..42e34fe 100644 --- a/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/renderWorker/entity/RenderWorkerEntity.java @@ -28,7 +28,7 @@ public class RenderWorkerEntity { /** * 运行环境 */ - private String runTimeVersion; + private String runtimeVersion; /** * 版本 */ 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 520be7e..26d1102 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 @@ -34,7 +34,7 @@ public class RenderWorkerReqQuery extends BaseQueryParameterReq { * 运行环境 */ @ApiModelProperty("运行环境") - private String runTimeVersion; + private String runtimeVersion; /** * 版本 */ 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 2590305..9175685 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 @@ -31,7 +31,7 @@ public class RenderWorkerRespVO { * 运行环境 */ @ApiModelProperty("运行环境") - private String runTimeVersion; + private String runtimeVersion; /** * 版本 */ 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 a364330..97342d6 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 @@ -10,6 +10,4 @@ import lombok.Data; public class RoleListReqVO extends BaseQueryParameterReq { @ApiModelProperty(value = "名字") private String name; -// @ApiModelProperty(value = "0系统角色 1业务角色") -// private Integer type; } diff --git a/src/main/resources/mapper/pc/AdminUserMapper.xml b/src/main/resources/mapper/pc/AdminUserMapper.xml index a6ce0fc..6db54dc 100644 --- a/src/main/resources/mapper/pc/AdminUserMapper.xml +++ b/src/main/resources/mapper/pc/AdminUserMapper.xml @@ -27,7 +27,7 @@ update admin_user - set `role_id` =#{roleId} + set `role_id` =#{roleId}, `account`=#{account}, `name`=#{name}, `phone`=#{phone} where id = #{id} @@ -44,6 +44,9 @@ au.id, au.phone, au.name, + au.account, + au.create_time, + au.status, r.id as roleId, r.name as roleName from admin_user au, @@ -54,6 +57,10 @@ and locate(#{name},au.`name`) > 0 + + and + locate(#{account},au.`account`) > 0 + and locate(#{phone},au.`phone`) > 0 From 58301128fa8607efc45698db3add92d0a3fd3ae8 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Wed, 4 Dec 2024 16:47:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=98=BF=E9=87=8C?= =?UTF-8?q?=E4=BA=91OSS=E3=80=81=E4=BA=BA=E8=84=B8=E6=A3=80=E7=B4=A2SDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml index 159fc53..ecabfb7 100644 --- a/pom.xml +++ b/pom.xml @@ -163,6 +163,24 @@ 3.14.1 + + + com.aliyun.oss + aliyun-sdk-oss + 3.17.4 + + + + + com.aliyun + aliyun-java-sdk-core + 4.6.1 + + + com.aliyun + aliyun-java-sdk-facebody + 2.0.12 + From 100debbf8d234e40f4e56fe4fc436723dfb246fe Mon Sep 17 00:00:00 2001 From: longbinbin <2284496322@qq.com> Date: Wed, 4 Dec 2024 17:07:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E7=94=A8=E6=88=B7=E5=92=8C=E4=BA=BA=E8=84=B8=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mobile/AppFaceController.java | 26 +++++++++++ .../mobile/AppMemberController.java | 44 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java create mode 100644 src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java new file mode 100644 index 0000000..bd4e6fc --- /dev/null +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java @@ -0,0 +1,26 @@ +package com.ycwl.basic.controller.mobile; + +import com.ycwl.basic.utils.ApiResponse; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author：longbinbin + * @Date：2024/12/4 17:03 + */ +@RestController +@RequestMapping("/api/mobile/face/v1") +@Api(tags = "用户人脸相关接口") +public class AppFaceController { + + @ApiOperation("人脸上传") + @PostMapping("/saveFace") + public ApiResponse saveFace() { + //TODO 保存人脸逻辑 + return ApiResponse.success(""); + } + +} diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java new file mode 100644 index 0000000..e8f7588 --- /dev/null +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppMemberController.java @@ -0,0 +1,44 @@ +package com.ycwl.basic.controller.mobile; + +import com.ycwl.basic.utils.ApiResponse; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author：longbinbin + * @Date：2024/12/4 16:54 + */ +@RestController +@RequestMapping("/api/mobile/member/v1") +@Api(tags = "用户相关接口") +public class AppMemberController { + + @PostMapping("/login") + public ApiResponse login() { + //TODO 登录逻辑 + return ApiResponse.success(""); + } + + @PostMapping("/register") + public ApiResponse register() { + //TODO 注册逻辑 + return ApiResponse.success(""); + } + + @GetMapping("/getUserInfo") + public ApiResponse getUserInfo() { + //TODO 获取用户信息逻辑 + return ApiResponse.success(""); + } + + @ApiOperation("是否首次获取视频") + @GetMapping("/isFirstObtainVideo") + public ApiResponse isFirstTimeObtainingVideo() { + //TODO 判断是否首次获取视频逻辑 + return ApiResponse.success(""); + } +} From c123cb486ebe123fecac4e0124dfacb26f9bb220 Mon Sep 17 00:00:00 2001 From: longbinbin <2284496322@qq.com> Date: Wed, 4 Dec 2024 17:30:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mobile/AppFaceController.java | 8 +++ .../controller/mobile/AppOrderController.java | 49 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java 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 bd4e6fc..d0936e0 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java @@ -16,6 +16,14 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "用户人脸相关接口") public class AppFaceController { + + @ApiOperation("人脸有效性校验") + @PostMapping("/checkFaceValidity") + public ApiResponse checkFaceValidity() { + //TODO 人脸有效性校验逻辑 + return ApiResponse.success(""); + } + @ApiOperation("人脸上传") @PostMapping("/saveFace") public ApiResponse saveFace() { diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java new file mode 100644 index 0000000..05e8708 --- /dev/null +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java @@ -0,0 +1,49 @@ +package com.ycwl.basic.controller.mobile; + +import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq; +import com.ycwl.basic.model.pc.order.req.OrderReqQuery; +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.*; + +/** + * @Author：longbinbin + * @Date：2024/12/4 17:16 + */ +@RestController +@RequestMapping("/api/mobile/order/v1") +@Api(tags = "订单相关接口") +public class AppOrderController { + + @Autowired + private OrderService orderService; + + @ApiOperation("用户端订单列表查询") + @PostMapping("/page") + public ApiResponse pageQuery(@RequestBody OrderReqQuery orderReqQuery) { + //TODO 添加用户openid查询条件,仅查询当前用户自己的订单 + return orderService.pageQuery(orderReqQuery); + } + @ApiOperation("用户端订单详情查询") + @GetMapping("getOrderDetails/{id}") + public ApiResponse getOrderDetails(@PathVariable("id") Long id) { + return orderService.detail(id); + } + + @ApiOperation("用户端订单新增") + @PostMapping("/addOrder") + public ApiResponse addOrder(@RequestBody OrderAddOrUpdateReq orderAddReq) { + orderService.add(orderAddReq); + return ApiResponse.success(""); + } + + @ApiOperation("/支付接口") + @PostMapping("/buy") + public ApiResponse buy(@RequestBody Object buyData) { + //TODO 处理购买逻辑 + return ApiResponse.success(""); + } +} From c1a0d6b377e2259ce8b583f846eefeeea9b0e902 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Wed, 4 Dec 2024 17:47:42 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E4=B8=A2=E5=A4=B1=EF=BC=8C=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E6=8A=8Along=E5=8F=98=E6=88=90string=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/config/JacksonConfiguration.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/main/java/com/ycwl/basic/config/JacksonConfiguration.java diff --git a/src/main/java/com/ycwl/basic/config/JacksonConfiguration.java b/src/main/java/com/ycwl/basic/config/JacksonConfiguration.java new file mode 100644 index 0000000..ba2892a --- /dev/null +++ b/src/main/java/com/ycwl/basic/config/JacksonConfiguration.java @@ -0,0 +1,18 @@ +package com.ycwl.basic.config; + +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class JacksonConfiguration { + + @Bean + public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer() { + return builder -> { + // 把 Long 类型序列化为 String + builder.serializerByType(Long.class, ToStringSerializer.instance); + }; + } +}