Compare commits
8 Commits
fix/userin
...
4f07b22919
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4f07b22919 | ||
|
|
1634565e92 | ||
|
|
65114aca14 | ||
|
|
9d14b3b7dc | ||
|
|
eb441b03e5 | ||
|
|
d40a15cbb5 | ||
|
|
7bf6b5d5ed | ||
|
|
1ad4012070 |
20
api/pom.xml
Normal file
20
api/pom.xml
Normal file
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.xiang.app</groupId>
|
||||
<artifactId>xservice-cornucopia</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>api</artifactId>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
@@ -0,0 +1,39 @@
|
||||
package com.xiang.app.module.jntyzx.pojo.req;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@Data
|
||||
public class UserAddReq {
|
||||
|
||||
/**
|
||||
* 用户名称
|
||||
*/
|
||||
@NotBlank(message = "用户名称不能为空")
|
||||
private String name;
|
||||
/**
|
||||
* token
|
||||
*/
|
||||
@NotBlank(message = "token不能为空")
|
||||
private String token;
|
||||
/**
|
||||
* wx openId
|
||||
*/
|
||||
@NotBlank(message = "openId不能为空")
|
||||
private String openId;
|
||||
|
||||
/**
|
||||
* 会员卡号
|
||||
*/
|
||||
@NotBlank(message = "会员卡号不能为空")
|
||||
private String memberCardNo;
|
||||
|
||||
/**
|
||||
* 状态 0:禁用 1:启用
|
||||
*/
|
||||
@NotNull(message = "用户状态不能为空")
|
||||
private Integer status;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
package com.xiang.app.module.jntyzx.pojo.req;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Author: xiang
|
||||
* @Date: 2026-03-24 16:40
|
||||
*/
|
||||
@Data
|
||||
public class UserQueryReq {
|
||||
|
||||
/**
|
||||
* 用户名称
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* wx openId
|
||||
*/
|
||||
private String openId;
|
||||
|
||||
/**
|
||||
* 会员卡号
|
||||
*/
|
||||
private String memberCardNo;
|
||||
|
||||
/**
|
||||
* 状态 0:禁用 1:启用
|
||||
*/
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 是否可以下单 0:否 1:是
|
||||
*/
|
||||
private Integer isOrder;
|
||||
|
||||
/**
|
||||
* 是否封禁 0:否 1:是
|
||||
*/
|
||||
private Integer isRestriction;
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package com.xiang.app.module.jntyzx.pojo.req;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@Data
|
||||
public class UserStatusUpdateReq {
|
||||
|
||||
/**
|
||||
* 用户名称
|
||||
*/
|
||||
@NotBlank(message = "用户名称不能为空")
|
||||
private String username;
|
||||
|
||||
/**
|
||||
* status
|
||||
*/
|
||||
@NotNull(message = "状态不能为空")
|
||||
private Integer status;
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package com.xiang.app.module.jntyzx.pojo.req;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
@Data
|
||||
public class UserTokenUpdateReq {
|
||||
|
||||
/**
|
||||
* 用户名称
|
||||
*/
|
||||
@NotBlank(message = "用户名称不能为空")
|
||||
private String username;
|
||||
|
||||
/**
|
||||
* token
|
||||
*/
|
||||
@NotBlank(message = "token不能为空")
|
||||
private String token;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package com.xiang.app.module.jntyzx.pojo.req;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
@Data
|
||||
public class UsernameReq {
|
||||
@NotBlank(message = "用户名称不能为空")
|
||||
private String username;
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package com.xiang.app.module.jntyzx.pojo.resp;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* @Author: xiang
|
||||
* @Date: 2026-03-24 16:40
|
||||
*/
|
||||
@Data
|
||||
public class JtUserVo {
|
||||
|
||||
private Long userId;
|
||||
|
||||
/**
|
||||
* 用户名称
|
||||
*/
|
||||
private String name;
|
||||
/**
|
||||
* token
|
||||
*/
|
||||
private String token;
|
||||
/**
|
||||
* wx:openId
|
||||
*/
|
||||
private String openId;
|
||||
/**
|
||||
* 账号状态:
|
||||
* 状态(0:禁用 1:启用)
|
||||
*/
|
||||
private Integer status;
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd Hh:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd Hh:mm:ss")
|
||||
private LocalDateTime updateTime;
|
||||
/**
|
||||
* 江南体育中心会员卡号
|
||||
*/
|
||||
private String memberCardNo;
|
||||
/**
|
||||
* 是否可以下单
|
||||
*/
|
||||
private Boolean isOrder;
|
||||
/**
|
||||
* 是否封禁
|
||||
*/
|
||||
private Boolean isRestriction;
|
||||
/**
|
||||
* 封禁结束时间
|
||||
*/
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd Hh:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd Hh:mm:ss")
|
||||
private LocalDateTime restrictionDeadline;
|
||||
/**
|
||||
* 封禁缘由
|
||||
*/
|
||||
private String restrictionDesc;
|
||||
|
||||
}
|
||||
1
pom.xml
1
pom.xml
@@ -17,6 +17,7 @@
|
||||
<modules>
|
||||
<module>xservice-server</module>
|
||||
<module>xservice-core</module>
|
||||
<module>api</module>
|
||||
</modules>
|
||||
|
||||
<properties>
|
||||
|
||||
@@ -17,4 +17,11 @@
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.xiang.app</groupId>
|
||||
<artifactId>api</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
@@ -16,6 +16,18 @@ public class RedisKeyConstant {
|
||||
|
||||
public static final String JNTYZX_VENUE_MSG_SEND_KEY = "jntyzx:order:venue:msg:send";
|
||||
|
||||
private static final String JNTYZX_VENUE_SUBSCRIBE_KEY = "jntyzx:venue:subscribe:";
|
||||
|
||||
private static final String JNTYZX_ORDER_CLOSE_CARD_KEY = "jntyzx:order:close:card:";
|
||||
|
||||
public static String getCloseCardKey(String username) {
|
||||
return JNTYZX_ORDER_CLOSE_CARD_KEY + username + ":" +getDate();
|
||||
}
|
||||
|
||||
public static String getVenueSubscribeKey(String placeName) {
|
||||
return JNTYZX_VENUE_SUBSCRIBE_KEY + placeName + ":" + getDate();
|
||||
}
|
||||
|
||||
public static String getDate() {
|
||||
LocalDate now = LocalDate.now();
|
||||
return ":" + DateUtils.getDateFromDate(now);
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
package com.xiang.app.modules.jntyzx.converts;
|
||||
|
||||
import com.xiang.app.module.jntyzx.pojo.resp.JtUserVo;
|
||||
import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.Mapping;
|
||||
import org.mapstruct.Named;
|
||||
import org.mapstruct.factory.Mappers;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface UserConverter {
|
||||
|
||||
UserConverter INSTANCE = Mappers.getMapper(UserConverter.class);
|
||||
@Mapping(source = "id", target = "userId")
|
||||
@Mapping(source = "isOrder", target = "isOrder", qualifiedByName = "isOrder")
|
||||
@Mapping(source = "isRestriction", target = "isRestriction", qualifiedByName = "isRestrict")
|
||||
JtUserVo convert(UserTokenInfoDO userTokenInfoDO);
|
||||
List<JtUserVo> convert(List<UserTokenInfoDO> userTokenInfoDOs);
|
||||
|
||||
@Named("isOrder")
|
||||
default Boolean isOrder(Integer value) {
|
||||
return Objects.nonNull(value) && Objects.equals(value, 1);
|
||||
}
|
||||
|
||||
@Named("isRestrict")
|
||||
default Boolean isRestrict(Integer value) {
|
||||
return Objects.nonNull(value) && Objects.equals(value, 0);
|
||||
}
|
||||
}
|
||||
@@ -54,4 +54,6 @@ public class UserTokenInfoDO {
|
||||
*/
|
||||
@TableField("is_restriction")
|
||||
private Integer isRestriction;
|
||||
|
||||
private LocalDateTime updateTime;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,11 @@ package com.xiang.app.modules.jntyzx.manage;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.xiang.app.modules.jntyzx.entity.pojo.UserRestrictionInfo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IUserRestrictionManage extends IService<UserRestrictionInfo> {
|
||||
|
||||
UserRestrictionInfo queryByUserId(Long userId);
|
||||
|
||||
List<UserRestrictionInfo> queryByIdList(List<Long> idList);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package com.xiang.app.modules.jntyzx.manage;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.xiang.app.module.jntyzx.pojo.req.UserQueryReq;
|
||||
import com.xiang.app.module.jntyzx.pojo.resp.JtUserVo;
|
||||
import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
|
||||
|
||||
import java.util.List;
|
||||
@@ -15,4 +17,5 @@ public interface IUserTokenInfoManage extends IService<UserTokenInfoDO> {
|
||||
|
||||
List<UserTokenInfoDO> listCanOrder();
|
||||
|
||||
List<UserTokenInfoDO> queryByList(UserQueryReq req);
|
||||
}
|
||||
|
||||
@@ -7,6 +7,8 @@ import com.xiang.app.modules.jntyzx.entity.pojo.UserRestrictionInfo;
|
||||
import com.xiang.app.modules.jntyzx.mapper.JntyzxUserRestrictionInfoMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class UserRestrictionManageImpl extends ServiceImpl<JntyzxUserRestrictionInfoMapper, UserRestrictionInfo> implements IUserRestrictionManage {
|
||||
@Override
|
||||
@@ -15,4 +17,11 @@ public class UserRestrictionManageImpl extends ServiceImpl<JntyzxUserRestriction
|
||||
lambdaQueryWrapper.eq(UserRestrictionInfo::getUserId, userId);
|
||||
return baseMapper.selectOne(lambdaQueryWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UserRestrictionInfo> queryByIdList(List<Long> idList) {
|
||||
LambdaQueryWrapper<UserRestrictionInfo> lambdaQueryWrapper = Wrappers.lambdaQuery();
|
||||
lambdaQueryWrapper.in(UserRestrictionInfo::getUserId, idList);
|
||||
return baseMapper.selectList(lambdaQueryWrapper);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
package com.xiang.app.modules.jntyzx.manage;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.xiang.app.module.jntyzx.pojo.req.UserQueryReq;
|
||||
import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
|
||||
import com.xiang.app.modules.jntyzx.mapper.JntyzxUserTokenInfoMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* @Author: xiang
|
||||
@@ -27,6 +30,7 @@ public class UserTokenInfoManageImpl extends ServiceImpl<JntyzxUserTokenInfoMapp
|
||||
LambdaQueryWrapper<UserTokenInfoDO> lambdaQueryWrapper = Wrappers.lambdaQuery();
|
||||
lambdaQueryWrapper.eq(UserTokenInfoDO::getStatus, 1);
|
||||
lambdaQueryWrapper.eq(UserTokenInfoDO::getName, name);
|
||||
lambdaQueryWrapper.last("limit 1");
|
||||
return baseMapper.selectOne(lambdaQueryWrapper);
|
||||
}
|
||||
|
||||
@@ -38,4 +42,28 @@ public class UserTokenInfoManageImpl extends ServiceImpl<JntyzxUserTokenInfoMapp
|
||||
lambdaQueryWrapper.eq(UserTokenInfoDO::getIsRestriction, 0);
|
||||
return baseMapper.selectList(lambdaQueryWrapper);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UserTokenInfoDO> queryByList(UserQueryReq req) {
|
||||
LambdaQueryWrapper<UserTokenInfoDO> lambdaQueryWrapper = Wrappers.lambdaQuery();
|
||||
if (StringUtils.isNotBlank(req.getName())) {
|
||||
lambdaQueryWrapper.like(UserTokenInfoDO::getName, req.getName());
|
||||
}
|
||||
if (StringUtils.isNotBlank(req.getOpenId())) {
|
||||
lambdaQueryWrapper.eq(UserTokenInfoDO::getOpenId, req.getOpenId());
|
||||
}
|
||||
if (StringUtils.isNotBlank(req.getMemberCardNo())) {
|
||||
lambdaQueryWrapper.eq(UserTokenInfoDO::getMemberCardNo, req.getMemberCardNo());
|
||||
}
|
||||
if (Objects.nonNull(req.getStatus())) {
|
||||
lambdaQueryWrapper.eq(UserTokenInfoDO::getStatus, req.getStatus());
|
||||
}
|
||||
if (Objects.nonNull(req.getIsRestriction())) {
|
||||
lambdaQueryWrapper.eq(UserTokenInfoDO::getIsRestriction, req.getIsRestriction());
|
||||
}
|
||||
if (Objects.nonNull(req.getIsOrder())) {
|
||||
lambdaQueryWrapper.eq(UserTokenInfoDO::getIsOrder, req.getIsOrder());
|
||||
}
|
||||
return baseMapper.selectList(lambdaQueryWrapper);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
package com.xiang.app.modules.jntyzx.service;
|
||||
|
||||
import com.xiang.app.module.jntyzx.pojo.req.UserAddReq;
|
||||
import com.xiang.app.module.jntyzx.pojo.req.UserQueryReq;
|
||||
import com.xiang.app.module.jntyzx.pojo.req.UsernameReq;
|
||||
import com.xiang.app.module.jntyzx.pojo.resp.JtUserVo;
|
||||
import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -16,4 +22,14 @@ public interface IUserTokenInfoService {
|
||||
boolean flushSingleToken(String name);
|
||||
boolean flushToken();
|
||||
boolean updateTokenByName(String name, String token);
|
||||
|
||||
List<JtUserVo> list(UserQueryReq req);
|
||||
|
||||
Boolean updateStatusByUserName(String username, Integer status);
|
||||
|
||||
Boolean refreshToken(String username);
|
||||
|
||||
Boolean save(UserAddReq req);
|
||||
|
||||
JtUserVo info(Long userId);
|
||||
}
|
||||
|
||||
@@ -5,9 +5,7 @@ import com.alibaba.fastjson2.JSONObject;
|
||||
import com.alibaba.fastjson2.TypeReference;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.xiang.app.modules.jntyzx.constants.RedisKeyConstant;
|
||||
import com.xiang.app.modules.jntyzx.constants.UrlConstant;
|
||||
import com.xiang.app.modules.jntyzx.entity.pojo.OrderInfoDO;
|
||||
import com.xiang.app.modules.jntyzx.entity.pojo.VenueInfoDO;
|
||||
import com.xiang.app.modules.jntyzx.entity.req.SubscribeRequest;
|
||||
import com.xiang.app.modules.jntyzx.entity.req.SubscribeVo;
|
||||
@@ -20,10 +18,7 @@ import com.xiang.app.modules.jntyzx.manage.IOrderCreateInfoManage;
|
||||
import com.xiang.app.modules.jntyzx.service.IJntyzxHttpService;
|
||||
import com.xiang.app.modules.jntyzx.utils.JntyzxSaltEncodeUtils;
|
||||
import com.xiang.xmc.service.cache.service.IRedisService;
|
||||
import com.xiang.xmc.service.http.helper.BaseHttpHelp;
|
||||
import com.xiang.xmc.service.http.helper.HttpHelper;
|
||||
import com.xiang.xmc.service.http.helper.HttpHelperFactory;
|
||||
import com.xiang.xservice.basic.utils.Base64;
|
||||
import com.xiang.xservice.basic.utils.JsonUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -32,9 +27,6 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
@@ -154,14 +146,15 @@ public class JntyzxHttpServiceImpl implements IJntyzxHttpService {
|
||||
Map<String, String> params = Maps.newHashMap();
|
||||
params.put("X-Access-Token", token);
|
||||
String resp = HttpHelper.doPost(UrlConstant.ADD_SUBSCRIBE, params, JsonUtils.toJsonString(subscribeRequest));
|
||||
log.info("[江体小程序] 羽毛球场地下单响应结果:{}", resp);
|
||||
if (StringUtils.isBlank(resp)) {
|
||||
log.info("请求结果为空");
|
||||
log.info("[resp] 请求结果为空");
|
||||
return null;
|
||||
}
|
||||
JntyzxResponse<OrderCreateResp> response = JSON.parseObject(resp, new TypeReference<JntyzxResponse<OrderCreateResp>>() {
|
||||
});
|
||||
if (Objects.isNull(response)) {
|
||||
log.info("请求结果为空");
|
||||
log.info("[res ==> response] 请求结果为空");
|
||||
return null;
|
||||
}
|
||||
return response;
|
||||
|
||||
@@ -50,6 +50,12 @@ public class OrderInfoServiceImpl implements IJtOrderService {
|
||||
return true;
|
||||
}
|
||||
|
||||
String user = (String) redisService.get(RedisKeyConstant.getCloseCardKey(userTokenInfoDO.getName()));
|
||||
if (StringUtils.isNotBlank(user)) {
|
||||
log.info("用户:{}有锁卡风险,不在请求接口!");
|
||||
return true;
|
||||
}
|
||||
|
||||
JntyzxResponse<OrderCreateResp> orderResp = jntyzxHttpService.createOrder(venueInfoDOS, userTokenInfoDO.getToken(), userTokenInfoDO.getOpenId());
|
||||
if (Objects.isNull(orderResp)) {
|
||||
return false;
|
||||
@@ -80,8 +86,13 @@ public class OrderInfoServiceImpl implements IJtOrderService {
|
||||
}
|
||||
if (orderResp.getMessage().contains("限制")) {
|
||||
log.info("改会员卡被限制,不在请求,用户:{}", userTokenInfoDO.getName());
|
||||
redisService.set(RedisKeyConstant.getCloseCardKey(userTokenInfoDO.getName()), "true");
|
||||
throw new BusinessException("会员卡被限制,不在请求");
|
||||
}
|
||||
if (orderResp.getMessage().contains("已有人预订")) {
|
||||
log.info("该场地已被人预定,更换场地, 用户:{}", userTokenInfoDO.getName());
|
||||
redisService.set(RedisKeyConstant.getVenueSubscribeKey(venueInfoDOS.get(0).getPlaceName()), "true");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
package com.xiang.app.modules.jntyzx.service.impl;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.xiang.app.common.service.dingtalk.JtDingTalkFactory;
|
||||
import com.xiang.app.module.jntyzx.pojo.req.UserAddReq;
|
||||
import com.xiang.app.module.jntyzx.pojo.req.UserQueryReq;
|
||||
import com.xiang.app.module.jntyzx.pojo.resp.JtUserVo;
|
||||
import com.xiang.app.modules.jntyzx.converts.UserConverter;
|
||||
import com.xiang.app.modules.jntyzx.entity.pojo.UserRestrictionInfo;
|
||||
import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
|
||||
import com.xiang.app.modules.jntyzx.entity.resp.JntyzxResponse;
|
||||
@@ -9,6 +15,7 @@ import com.xiang.app.modules.jntyzx.manage.IUserRestrictionManage;
|
||||
import com.xiang.app.modules.jntyzx.manage.IUserTokenInfoManage;
|
||||
import com.xiang.app.modules.jntyzx.service.IJntyzxHttpService;
|
||||
import com.xiang.app.modules.jntyzx.service.IUserTokenInfoService;
|
||||
import com.xiang.xservice.basic.exception.BusinessException;
|
||||
import com.xiang.xservice.basic.utils.DateUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -16,8 +23,12 @@ import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Author: xiang
|
||||
@@ -32,6 +43,7 @@ public class UserTokenInfoServiceImpl implements IUserTokenInfoService {
|
||||
private final IJntyzxHttpService jntyzxHttpService;
|
||||
private final JtDingTalkFactory jtDingTalkFactory;
|
||||
private final IUserRestrictionManage userRestrictionManage;
|
||||
private final UserConverter userConverter;
|
||||
|
||||
|
||||
@Override
|
||||
@@ -108,6 +120,97 @@ public class UserTokenInfoServiceImpl implements IUserTokenInfoService {
|
||||
return flag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<JtUserVo> list(UserQueryReq req) {
|
||||
List<UserTokenInfoDO> userTokenInfoDOS = userTokenInfoManage.queryByList(req);
|
||||
if (CollectionUtils.isEmpty(userTokenInfoDOS)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
List<Long> idList = userTokenInfoDOS.stream().map(UserTokenInfoDO::getId).toList();
|
||||
List<UserRestrictionInfo> userRestrictionInfos = userRestrictionManage.queryByIdList(idList);
|
||||
Map<Long, UserRestrictionInfo> userRestrictionInfoMap = Maps.newHashMap();
|
||||
if (CollectionUtils.isNotEmpty(userRestrictionInfos)) {
|
||||
userRestrictionInfoMap.putAll(
|
||||
userRestrictionInfos.stream().collect(Collectors.toMap(
|
||||
UserRestrictionInfo::getUserId, Function.identity(), (a, b) -> a)));
|
||||
}
|
||||
List<JtUserVo> jtUserVoList = userConverter.convert(userTokenInfoDOS);
|
||||
jtUserVoList.forEach(item -> {
|
||||
if (userRestrictionInfoMap.containsKey(item.getUserId())) {
|
||||
UserRestrictionInfo userRestrictionInfo = userRestrictionInfoMap.get(item.getUserId());
|
||||
if (Objects.nonNull(userRestrictionInfo)) {
|
||||
if (userRestrictionInfo.getRestrictionDeadline().isAfter(LocalDateTime.now())) {
|
||||
item.setRestrictionDeadline(userRestrictionInfo.getRestrictionDeadline());
|
||||
item.setRestrictionDesc(userRestrictionInfo.getRestrictionDesc());
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
return jtUserVoList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean updateStatusByUserName(String username, Integer status) {
|
||||
if (StringUtils.isEmpty(username)) {
|
||||
log.error("用户名为空");
|
||||
return false;
|
||||
}
|
||||
UserTokenInfoDO userTokenInfoDO = userTokenInfoManage.getByName(username);
|
||||
if (Objects.isNull(userTokenInfoDO)) {
|
||||
throw new BusinessException("用户不存在!");
|
||||
}
|
||||
userTokenInfoDO.setStatus(status);
|
||||
return userTokenInfoManage.updateById(userTokenInfoDO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean refreshToken(String username) {
|
||||
if (StringUtils.isEmpty(username)) {
|
||||
log.error("用户名为空");
|
||||
return false;
|
||||
}
|
||||
UserTokenInfoDO userTokenInfoDO = userTokenInfoManage.getByName(username);
|
||||
if (Objects.isNull(userTokenInfoDO)) {
|
||||
throw new BusinessException("用户不存在!");
|
||||
}
|
||||
return healthDeclaration(userTokenInfoDO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean save(UserAddReq req) {
|
||||
UserTokenInfoDO userTokenInfoDO = userTokenInfoManage.getByName(req.getName());
|
||||
if (Objects.nonNull(userTokenInfoDO)) {
|
||||
throw new BusinessException("用户名已存在!");
|
||||
}
|
||||
userTokenInfoDO = new UserTokenInfoDO();
|
||||
userTokenInfoDO.setName(req.getName());
|
||||
userTokenInfoDO.setToken(req.getToken());
|
||||
userTokenInfoDO.setOpenId(req.getOpenId());
|
||||
userTokenInfoDO.setStatus(req.getStatus());
|
||||
userTokenInfoDO.setIsOrder(1);
|
||||
userTokenInfoDO.setMemberCardNo(req.getMemberCardNo());
|
||||
userTokenInfoDO.setIsRestriction(0);
|
||||
userTokenInfoDO.setUpdateTime(LocalDateTime.now());
|
||||
return userTokenInfoManage.save(userTokenInfoDO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public JtUserVo info(Long userId) {
|
||||
UserTokenInfoDO userTokenInfoDO = userTokenInfoManage.getById(userId);
|
||||
if (Objects.isNull(userTokenInfoDO)) {
|
||||
throw new BusinessException("用户不存在!");
|
||||
}
|
||||
JtUserVo jtUserVo = userConverter.convert(userTokenInfoDO);
|
||||
UserRestrictionInfo userRestrictionInfo = userRestrictionManage.queryByUserId(userId);
|
||||
if (Objects.nonNull(userRestrictionInfo)) {
|
||||
if (userRestrictionInfo.getRestrictionDeadline().isAfter(LocalDateTime.now())) {
|
||||
jtUserVo.setRestrictionDeadline(userRestrictionInfo.getRestrictionDeadline());
|
||||
jtUserVo.setRestrictionDesc(userRestrictionInfo.getRestrictionDesc());
|
||||
}
|
||||
}
|
||||
return jtUserVo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询用户信息
|
||||
*
|
||||
|
||||
@@ -25,4 +25,17 @@ public class VenueInfoUtils {
|
||||
public static boolean get8210VenueInfo(SitePositionList sitePositionList) {
|
||||
return StringUtils.equals(sitePositionList.getSjName(), "20:00-21:00") || StringUtils.equals(sitePositionList.getSjName(), "21:00-22:00");
|
||||
}
|
||||
|
||||
public static int sortVenueInfo(String placeName) {
|
||||
if (placeName.contains("十号")) {
|
||||
return 0;
|
||||
}
|
||||
if (placeName.contains("二号")) {
|
||||
return 1;
|
||||
}
|
||||
if (placeName.contains("九号")) {
|
||||
return 2;
|
||||
}
|
||||
return 3;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,6 +17,7 @@ import org.springframework.context.annotation.ComponentScan;
|
||||
@SpringBootApplication
|
||||
@ConfigurationPropertiesScan(basePackages = {
|
||||
"com.xiang.xservice.logger",
|
||||
"com.xiang.xmc.service.http"
|
||||
})
|
||||
@MapperScan(basePackages = {
|
||||
"com.xiang.app.modules.*.mapper"
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
package com.xiang.app.schedule.jntyzx;
|
||||
|
||||
import com.xiang.app.modules.jntyzx.constants.RedisKeyConstant;
|
||||
import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
|
||||
import com.xiang.app.modules.jntyzx.entity.pojo.VenueInfoDO;
|
||||
import com.xiang.app.modules.jntyzx.entity.resp.query.SitePositionList;
|
||||
import com.xiang.app.modules.jntyzx.service.IJntyzxHttpService;
|
||||
import com.xiang.app.modules.jntyzx.service.IJtOrderService;
|
||||
import com.xiang.app.modules.jntyzx.service.IUserTokenInfoService;
|
||||
import com.xiang.app.modules.jntyzx.utils.VenueInfoUtils;
|
||||
import com.xiang.app.modules.jntyzx.utils.WeekendUtils;
|
||||
import com.xiang.core.quartz.annotation.XxzJob;
|
||||
import com.xiang.xmc.service.cache.service.IRedisService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.collections4.MapUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 江体小程序场地捡漏任务 周日和周二 启动捡漏周一和周三的场地
|
||||
* @Author: xiang
|
||||
* @Date: 2026-03-23 09:23
|
||||
*/
|
||||
@Component
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
public class JtVenuePickTask {
|
||||
|
||||
private final IJntyzxHttpService jntyzxHttpService;
|
||||
private final IUserTokenInfoService userTokenInfoService;
|
||||
private final IRedisService redisService;
|
||||
private final IJtOrderService jtOrderService;
|
||||
|
||||
|
||||
@XxzJob(name = "jtVenuePickTask")
|
||||
@GetMapping("jtVenuePickTask")
|
||||
public void handler() {
|
||||
log.info("江体小程序场地捡漏,time:{}", System.currentTimeMillis());
|
||||
|
||||
List<UserTokenInfoDO> availableUser = userTokenInfoService.getAvailableUser();
|
||||
if (CollectionUtils.isEmpty(availableUser)) {
|
||||
log.info("当前无可用用户查询场地信息!");
|
||||
return;
|
||||
}
|
||||
UserTokenInfoDO userTokenInfoDO = availableUser.get(0);
|
||||
|
||||
if (Objects.isNull(userTokenInfoDO)) {
|
||||
return;
|
||||
}
|
||||
String subscribeKey = RedisKeyConstant.JNTYZX_ORDER_CREATE_KEY + userTokenInfoDO.getName() + LocalDate.now();
|
||||
String subscribeValue = (String) redisService.get(subscribeKey);
|
||||
if (StringUtils.isNotBlank(subscribeValue)) {
|
||||
log.info("用户:{}今日已进行场地预定,不进行捡漏处理!", userTokenInfoDO.getName());
|
||||
return;
|
||||
}
|
||||
|
||||
String token = userTokenInfoDO.getToken();
|
||||
List<SitePositionList> sitePositionLists = jntyzxHttpService.queryAvailableTomorrow(WeekendUtils.isWeekend(), token);
|
||||
sitePositionLists = sitePositionLists.stream()
|
||||
.filter(item -> !item.getPlaceName().contains("小馆"))
|
||||
.filter(VenueInfoUtils::get8210VenueInfo)
|
||||
.filter(item -> StringUtils.equals(item.getContacts(), "0")).toList();
|
||||
if (CollectionUtils.isEmpty(sitePositionLists)) {
|
||||
log.info("目前没有可以捡漏的场地");
|
||||
return;
|
||||
}
|
||||
Map<String, List<VenueInfoDO>> map = sitePositionLists.stream().map(item -> {
|
||||
VenueInfoDO venueInfoDO = new VenueInfoDO();
|
||||
venueInfoDO.setPlaceName(item.getPlaceName());
|
||||
venueInfoDO.setPlaceId(item.getPlaceId());
|
||||
venueInfoDO.setScheduleId(Integer.valueOf(item.getScheduleId()));
|
||||
venueInfoDO.setSjName(item.getSjName());
|
||||
venueInfoDO.setMoney(item.getMoney());
|
||||
venueInfoDO.setClassName(item.getClassName());
|
||||
venueInfoDO.setClassCode(item.getClassCode());
|
||||
venueInfoDO.setAppointments(item.getAppointments());
|
||||
venueInfoDO.setCTypeCode(item.getCtypeCode());
|
||||
return venueInfoDO;
|
||||
}).collect(Collectors.groupingByConcurrent(VenueInfoDO::getPlaceName));
|
||||
|
||||
if (MapUtils.isEmpty(map)) {
|
||||
log.info("暂无可下单场地,time:{}", System.currentTimeMillis());
|
||||
return;
|
||||
}
|
||||
|
||||
List<UserTokenInfoDO> users = userTokenInfoService.getCanOrderUser();
|
||||
if (CollectionUtils.isEmpty(users)) {
|
||||
log.info("暂无可下单用户, time:{}", System.currentTimeMillis());
|
||||
return;
|
||||
}
|
||||
users.parallelStream().forEach(user -> {
|
||||
try {
|
||||
List<String> placeNameList = map.keySet().stream().sorted(Comparator.comparing(VenueInfoUtils::sortVenueInfo)).toList();
|
||||
for (String placeName : placeNameList) {
|
||||
List<VenueInfoDO> venueInfoDOList = map.get(placeName);
|
||||
String valid = (String) redisService.get(RedisKeyConstant.getVenueSubscribeKey(placeName));
|
||||
if (StringUtils.isNotBlank(valid)) {
|
||||
break;
|
||||
}
|
||||
boolean order = jtOrderService.createOrder(venueInfoDOList, user);
|
||||
if (order) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
Thread.sleep(1250);
|
||||
} catch (InterruptedException e) {
|
||||
log.error("睡眠失败~~~");
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// 关键点:异常只影响当前 user
|
||||
log.error("createOrder 异常,user={}", user.getId(), e);
|
||||
return; // 结束这个 user,不影响其他 user
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
package com.xiang.app.schedule.jntyzx;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.xiang.app.common.service.dingtalk.JtDingTalkFactory;
|
||||
import com.xiang.app.modules.jntyzx.constants.RedisKeyConstant;
|
||||
import com.xiang.app.modules.jntyzx.entity.pojo.UserTokenInfoDO;
|
||||
import com.xiang.app.modules.jntyzx.entity.pojo.VenueInfoDO;
|
||||
import com.xiang.app.modules.jntyzx.service.IJtOrderService;
|
||||
@@ -8,14 +10,17 @@ import com.xiang.app.modules.jntyzx.service.IUserTokenInfoService;
|
||||
import com.xiang.app.modules.jntyzx.service.IVenueService;
|
||||
import com.xiang.app.modules.jntyzx.utils.VenueInfoUtils;
|
||||
import com.xiang.core.quartz.annotation.XxzJob;
|
||||
import com.xiang.xmc.service.cache.service.IRedisService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.collections4.MapUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -30,6 +35,7 @@ public class JtVenueSubscribeTask {
|
||||
private final IJtOrderService jtOrderService;
|
||||
private final IVenueService venueService;
|
||||
private final JtDingTalkFactory jtDingTalkFactory;
|
||||
private final IRedisService redisService;
|
||||
|
||||
@XxzJob(name = "jtVenueSubscribeTask")
|
||||
@GetMapping("/jtVenueSubscribeTask")
|
||||
@@ -51,9 +57,15 @@ public class JtVenueSubscribeTask {
|
||||
|
||||
users.parallelStream().forEach(user -> {
|
||||
try {
|
||||
for (String placeName : venueInfoMap.keySet()) {
|
||||
List<String> placeNameList = venueInfoMap.keySet().stream().sorted(Comparator.comparing(VenueInfoUtils::sortVenueInfo)).toList();
|
||||
log.info("场地排序后的集合:{}", JSON.toJSONString(placeNameList));
|
||||
for (String placeName : placeNameList) {
|
||||
List<VenueInfoDO> venueInfoDOList = venueInfoMap.get(placeName);
|
||||
for (int i = 0; i < 10; i++) {
|
||||
String valid = (String) redisService.get(RedisKeyConstant.getVenueSubscribeKey(placeName));
|
||||
if (StringUtils.isNotBlank(valid)) {
|
||||
break;
|
||||
}
|
||||
boolean order = jtOrderService.createOrder(venueInfoDOList, user);
|
||||
if (order) {
|
||||
return;
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
package com.xiang.app.server.jntyzx;
|
||||
|
||||
import com.xiang.app.module.jntyzx.pojo.req.UserAddReq;
|
||||
import com.xiang.app.module.jntyzx.pojo.req.UserQueryReq;
|
||||
import com.xiang.app.module.jntyzx.pojo.req.UserStatusUpdateReq;
|
||||
import com.xiang.app.module.jntyzx.pojo.req.UserTokenUpdateReq;
|
||||
import com.xiang.app.module.jntyzx.pojo.req.UsernameReq;
|
||||
import com.xiang.app.module.jntyzx.pojo.resp.JtUserVo;
|
||||
import com.xiang.app.modules.jntyzx.service.IUserTokenInfoService;
|
||||
import com.xiang.xservice.basic.common.resp.Result;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 江南体育中心用户管理控制器
|
||||
*
|
||||
* @Author: xiang
|
||||
* @Date: 2026-03-24 16:38
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/private/apps/jntyzx/user")
|
||||
@RequiredArgsConstructor
|
||||
public class UserTokenServer {
|
||||
|
||||
private final IUserTokenInfoService userTokenInfoService;
|
||||
|
||||
|
||||
@PostMapping("/list")
|
||||
public Result<List<JtUserVo>> list(@RequestBody @NotNull(message = "请求参数不能为空") @Valid UserQueryReq req) {
|
||||
return Result.data(userTokenInfoService.list(req));
|
||||
}
|
||||
@GetMapping("/info/{id}")
|
||||
public Result<JtUserVo> info(@PathVariable("id") Long userId) {
|
||||
return Result.data(userTokenInfoService.info(userId));
|
||||
}
|
||||
|
||||
@PostMapping("/updateToken")
|
||||
public Result<Boolean> updateToken(@RequestBody @NotNull(message = "请求参数不能为空") @Valid UserTokenUpdateReq req) {
|
||||
return Result.data(userTokenInfoService.updateTokenByName(req.getUsername(), req.getToken()));
|
||||
}
|
||||
|
||||
@PostMapping("/updateStatus")
|
||||
public Result<Boolean> updateStatus(@RequestBody @NotNull(message = "请求参数不能为空") @Valid UserStatusUpdateReq req) {
|
||||
return Result.data(userTokenInfoService.updateStatusByUserName(req.getUsername(), req.getStatus()));
|
||||
}
|
||||
|
||||
@PostMapping("/refreshToken")
|
||||
public Result<Boolean> refreshToken(@RequestBody @NotNull(message = "请求参数不能为空") @Valid UsernameReq req) {
|
||||
return Result.data(userTokenInfoService.refreshToken(req.getUsername()));
|
||||
}
|
||||
|
||||
@PostMapping("/add")
|
||||
public Result<Boolean> addUser(@RequestBody @NotNull(message = "请求参数不能为空") @Valid UserAddReq req) {
|
||||
return Result.data(userTokenInfoService.save(req));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user