Merge remote-tracking branch 'origin/master'
This commit is contained in:
songmingsong
commit
de07d87775
18
pom.xml
18
pom.xml
@ -163,6 +163,24 @@
|
||||
<version>3.14.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 阿里云对象存储 -->
|
||||
<dependency>
|
||||
<groupId>com.aliyun.oss</groupId>
|
||||
<artifactId>aliyun-sdk-oss</artifactId>
|
||||
<version>3.17.4</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 阿里云人脸识别 -->
|
||||
<dependency>
|
||||
<groupId>com.aliyun</groupId>
|
||||
<artifactId>aliyun-java-sdk-core</artifactId>
|
||||
<version>4.6.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.aliyun</groupId>
|
||||
<artifactId>aliyun-java-sdk-facebody</artifactId>
|
||||
<version>2.0.12</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
||||
@ -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);
|
||||
};
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
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("/checkFaceValidity")
|
||||
public ApiResponse checkFaceValidity() {
|
||||
//TODO 人脸有效性校验逻辑
|
||||
return ApiResponse.success("");
|
||||
}
|
||||
|
||||
@ApiOperation("人脸上传")
|
||||
@PostMapping("/saveFace")
|
||||
public ApiResponse saveFace() {
|
||||
//TODO 保存人脸逻辑
|
||||
return ApiResponse.success("");
|
||||
}
|
||||
|
||||
}
|
||||
@ -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("");
|
||||
}
|
||||
}
|
||||
@ -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("");
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ public class RenderWorkerEntity {
|
||||
/**
|
||||
* 运行环境
|
||||
*/
|
||||
private String runTimeVersion;
|
||||
private String runtimeVersion;
|
||||
/**
|
||||
* 版本
|
||||
*/
|
||||
|
||||
@ -34,7 +34,7 @@ public class RenderWorkerReqQuery extends BaseQueryParameterReq {
|
||||
* 运行环境
|
||||
*/
|
||||
@ApiModelProperty("运行环境")
|
||||
private String runTimeVersion;
|
||||
private String runtimeVersion;
|
||||
/**
|
||||
* 版本
|
||||
*/
|
||||
|
||||
@ -31,7 +31,7 @@ public class RenderWorkerRespVO {
|
||||
* 运行环境
|
||||
*/
|
||||
@ApiModelProperty("运行环境")
|
||||
private String runTimeVersion;
|
||||
private String runtimeVersion;
|
||||
/**
|
||||
* 版本
|
||||
*/
|
||||
|
||||
@ -10,6 +10,4 @@ import lombok.Data;
|
||||
public class RoleListReqVO extends BaseQueryParameterReq {
|
||||
@ApiModelProperty(value = "名字")
|
||||
private String name;
|
||||
// @ApiModelProperty(value = "0系统角色 1业务角色")
|
||||
// private Integer type;
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
<update id="update" parameterType="com.ycwl.basic.model.pc.adminUser.req.AddOrUpdateAdminUserReqVO">
|
||||
update admin_user
|
||||
set `role_id` =#{roleId}
|
||||
set `role_id` =#{roleId}, `account`=#{account}, `name`=#{name}, `phone`=#{phone}
|
||||
where id = #{id}
|
||||
</update>
|
||||
<update id="updatePassword">
|
||||
@ -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
|
||||
</if>
|
||||
<if test="account!=null and account!=''">
|
||||
and
|
||||
locate(#{account},au.`account`) > 0
|
||||
</if>
|
||||
<if test="phone!=null and phone!=''">
|
||||
and
|
||||
locate(#{phone},au.`phone`) > 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user