aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/dev' into dev/dev

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/service/AccountService.java
This commit is contained in:
shahaibo
2024-11-11 16:06:21 +08:00
parent 8c20b51e13 391a28d659
commit 37ff7fbb91
13 changed files with 129 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/ai/da/common/constant/CommonConstant.java
View File

@@ -71,4 +71,9 @@ public class CommonConstant {
public static final String RCA_WORKSHOP_TAG = "#RCAworkshop_2024";
public static final String PORTFOLIO_DELETED_EN = "Portfolio has been deleted";
public static final String PORTFOLIO_DELETED_CN = "作品已删除";
}

6
src/main/java/com/ai/da/common/task/AccountTask.java
View File

@@ -19,7 +19,7 @@ public class AccountTask {
/**
* 每周日晚上刷新 年付用户、月付用户的积分
*/
@Scheduled(cron = "59 59 23 ? * SUN")
// @Scheduled(cron = "59 59 23 ? * SUN")
// @Scheduled(cron = "59 59 23 * * ?")
public void refreshCreditsMonthly() {
log.info("每周日晚11：59：59刷新付费用户积分为 6000");
@@ -33,7 +33,7 @@ public class AccountTask {
}
// 每天凌晨0点执行一次
@Scheduled(cron = "0 0 0 * * ?")
// @Scheduled(cron = "0 0 0 * * ?")
public void cancelActivityBenefits() {
// 1、查询当前所有参与了活动且过期的用户
List<Account> accountList = accountService.getExpiredUserBySystemUser(4);
@@ -46,7 +46,7 @@ public class AccountTask {
}
// 每天检测正式用户到期情况，每天凌晨0点执行
@Scheduled(cron = "0 0 0 * * ?")
// @Scheduled(cron = "0 0 0 * * ?")
public void paidUserToVisitor() {
// 1、查询当前已过期正式用户或试用用户
List<Account> accountList = accountService.getExpiredUserBySystemUser(1);

52
src/main/java/com/ai/da/common/websocket/NotificationConnection.java
View File

@@ -16,11 +16,14 @@ import java.util.concurrent.ConcurrentHashMap;
@Slf4j
public class NotificationConnection {
//连接超时
public static final long MAX_TIME_OUT = 2 * 60 * 1000;
static Map<String,Session> sessionMap = new ConcurrentHashMap<>();
private Session session;
// 这里用ConcurrentHashMap 因为他是一个线程安全的Map
private static ConcurrentHashMap<Long, NotificationConnection> websockets = new ConcurrentHashMap<>();
private static ConcurrentHashMap<NotificationConnection, Long> websockets = new ConcurrentHashMap<>();
//连接建立时执行的操作
/*@OnOpen
public void onOpen(Session session){
@@ -31,24 +34,43 @@ public class NotificationConnection {
@OnOpen
public void onOpen(Session session, @PathParam("id") String id) { // 接收到前端传来的用户ID
this.session = session;
websockets.put(Long.parseLong(id), this); //将ID作为key，当前的对象作为Value
// this.session.setMaxIdleTimeout(MAX_TIME_OUT);
websockets.put(this, Long.parseLong(id)); //将ID作为key，当前的对象作为Value
log.info("【建立连接】 用户为：{}", this.session);
log.info("【建立连接】 用户Id为：{}", id);
log.info("【建立连接】 总数为：{}", websockets.size());
}
@OnClose
public void onClose() {
websockets.remove(this); // 将当前的对象从集合中删除
log.info("【连接断开】 用户为：{}", this.session);
public void onClose(CloseReason reason) {
if (websockets.containsKey(this)) {
websockets.remove(this); // 将当前的对象从集合中删除
log.info("【连接断开】 用户为：{}, sessionId: {}, 原因为{}", websockets.get(this), this.session.getId(), reason);
}
// log.info("【连接断开】 总数为：{}", websockets.size());
}
/**
* 错误时调用
* @param throwable 异常
*/
@OnError
public void onError(Throwable throwable) {
log.info("【连接异常】 用户为：{} , sessionId: {}", websockets.get(this), this.session.getId(), throwable);
websockets.remove(this); // 将当前的对象从集合中删除
}
//收到了客户端消息执行的操作
@OnMessage
public void onMessage(String text){
public void onMessage(Session session, String text){
log.info("收到了一条消息："+text);
// return "已收到你的消息";
if (text.equals("PING")){
sendMsg("PONG", websockets.get(this));
session.setMaxIdleTimeout(MAX_TIME_OUT);
}
}
/*//连接关闭的时候执行的操作
@OnClose
@@ -63,27 +85,31 @@ public class NotificationConnection {
}
}*/
public void sendMsg(String message, Long userId) throws IOException {
public void sendMsg(String message, Long userId) {
if (userId == null) { // 如果等于null则证明是群发
// 获取当前Map的一个迭代器，遍历Map的方式有很多种，看着来
// 这个就是遍历这个集合的过程....
for (Map.Entry<Long, NotificationConnection> entry : websockets.entrySet()) {
for (Map.Entry<NotificationConnection, Long> entry : websockets.entrySet()) {
// 获取每一个Entry实例
// 获取每一个Value，而这个Value就是WebSocket的实例
NotificationConnection webSocket = entry.getValue();
NotificationConnection webSocket = entry.getKey();
// 接下来就是遍历群发
log.info("广播消息 【给用户】 ：{}发送消息【{}】", webSocket, message);
webSocket.session.getBasicRemote().sendText(message); // 发送！！！！！！！！！
try {
webSocket.session.getBasicRemote().sendText(message); // 发送！！！！！！！！！
} catch (IOException e) {
log.error("Failed to send message to session {}: {}", webSocket.session.getId(), e.getMessage());
}
}
} else { // 如果不是群发，则判断ID，其余步骤一致
// 获取当前Map的一个迭代器，遍历Map的方式有很多种，看着来
// 这个就是遍历这个集合的过程....
for (Map.Entry<Long, NotificationConnection> entry : websockets.entrySet()) {
for (Map.Entry<NotificationConnection, Long> entry : websockets.entrySet()) {
// 获取每一个Entry实例
// 获取每一个Value，而这个Value就是WebSocket的实例
NotificationConnection webSocket = entry.getValue();
NotificationConnection webSocket = entry.getKey();
// 获取每一个Key，这个Key就是用户ID
Long key = entry.getKey();
Long key = entry.getValue();
// 判断用户ID与当前的Key相等
if (userId.equals(key)) {
log.info("私发消息 【给用户】 ：{}发送消息【{}】", key, message); // 打印

2
src/main/java/com/ai/da/common/websocket/config/WebSocketConfig.java
View File

@@ -6,8 +6,6 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
/**
* Configuration of WebSocket
*
* @author db1995
*/
@Configuration
public class WebSocketConfig {

10
src/main/java/com/ai/da/controller/ConvenientInquiryController.java
View File

@@ -122,14 +122,16 @@ public class ConvenientInquiryController {
@ApiOperation("试用用户到正式用户的转化率")
@GetMapping("/conversionRate")
public Response<Map<String, Float>> conversionRate() {
return Response.success(convenientInquiryService.conversionRate());
public Response<Map<String, Object>> conversionRate(@ApiParam(value = "startTime") @RequestParam(required = false) @Nullable String startTime,
@ApiParam(value = "endTime") @RequestParam(required = false) @Nullable String endTime) {
return Response.success(convenientInquiryService.conversionRate(startTime, endTime));
}
@ApiOperation("试用用户国家/城市分布")
@GetMapping("/trialUserCountry")
public Response<Map<String, List<Object>>> trialUserCountry() {
return Response.success(convenientInquiryService.trialUserCountry());
public Response<Map<String, List<Object>>> trialUserCountry(@ApiParam(value = "startTime") @RequestParam(required = false) @Nullable String startTime,
@ApiParam(value = "endTime") @RequestParam(required = false) @Nullable String endTime) {
return Response.success(convenientInquiryService.trialUserCountry(startTime, endTime));
}
@ApiOperation("添加用户")

3
src/main/java/com/ai/da/mapper/primary/TrialOrderMapper.java
View File

@@ -3,6 +3,7 @@ package com.ai.da.mapper.primary;
import com.ai.da.common.config.mybatis.plus.CommonMapper;
import com.ai.da.mapper.primary.entity.TrialOrder;
import java.util.List;
import java.util.Map;
/**
@@ -15,6 +16,4 @@ public interface TrialOrderMapper extends CommonMapper<TrialOrder> {
Map<String, Long> countOfficialUser();
}

2
src/main/java/com/ai/da/model/dto/UserDesignStatisticDTO.java
View File

@@ -15,6 +15,8 @@ public class UserDesignStatisticDTO {
private String isTrial;
private String credits;
private String trialOrderId;
private String title;

2
src/main/java/com/ai/da/service/AccountService.java
View File

@@ -184,4 +184,6 @@ public interface AccountService extends IService<Account> {
void halfPricePromotion();
String googleCallback(String code, HttpSession session);
List<String> getPaidCustomerEmail();
}

4
src/main/java/com/ai/da/service/ConvenientInquiryService.java
View File

@@ -32,9 +32,9 @@ public interface ConvenientInquiryService extends IService<Questionnaire> {
Map<String, List<Object>> getActiveUserFunc(String startTime, String endTime, List<Long> ids);
Map<String, Float> conversionRate();
Map<String, Object> conversionRate(String startTime, String endTime);
Map<String, List<Object>> trialUserCountry();
Map<String, List<Object>> trialUserCountry(String startTime, String endTime);
Boolean addUser(AccountAddDTO accountAddDTO);

27
src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
View File

@@ -576,6 +576,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
account.setIsBeginner(1);
account.setSystemUser(3);
account.setValidStartTime(System.currentTimeMillis());
account.setCountry(accountTrialDTO.getCountry());
if (link) {
account.setValidEndTime(toDayEnd(Instant.now().plus(5, ChronoUnit.DAYS).toEpochMilli()));
} else {
@@ -588,6 +589,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
account.setUserPassword("Third-000000");
account.setUserEmail(trialOrder.getEmail());
account.setLanguage(Language.ENGLISH.name());
account.setCountry(accountTrialDTO.getCountry());
account.setValidStartTime(System.currentTimeMillis());
if (link) {
account.setValidEndTime(toDayEnd(Instant.now().plus(5, ChronoUnit.DAYS).toEpochMilli()));
@@ -1469,6 +1471,31 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
}
}
private static final String QUERY_PAID_CUSTOMER_EMAIL = "SELECT distinct c.email " +
"FROM `pmr_wc_order_stats` o " +
"inner join `pmr_wc_customer_lookup` c " +
"on o.customer_id = c.customer_id " +
"and o.net_total in (5000, 500, 250) " +
"and o.`status` != 'wc-failed' " +
"and c.email not in ('1779019091@qq.com', 'xupei3360@163.com', '1627315083@qq.com', 'gigiwu33@hotmail.com')";
public List<String> getPaidCustomerEmail(){
List<String> paidCustomerEmail = new ArrayList<>();
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(QUERY_PAID_CUSTOMER_EMAIL)) {
try (ResultSet queryOrderResultSet = preparedStatement.executeQuery()) {
while (queryOrderResultSet.next()) {
paidCustomerEmail.add(queryOrderResultSet.getString("email"));
}
}
} catch (Exception e) {
// 记录异常并处理
e.printStackTrace();
// return null;
}
return paidCustomerEmail;
}
// 收集调查问卷的信息
@Override
@Transactional(rollbackFor = Exception.class)

40
src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
View File

@@ -392,9 +392,15 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
private TrialOrderMapper trialOrderMapper;
// 试用用户到正式用户的转化率
public Map<String, Float> conversionRate() {
public Map<String, Object> conversionRate(String startTime, String endTime) {
QueryWrapper<TrialOrder> queryWrapper = new QueryWrapper<>();
if (!StringUtils.isNullOrEmpty(startTime)){
queryWrapper.gt("create_time", startTime);
}
if (!StringUtils.isNullOrEmpty(endTime)){
queryWrapper.lt("create_time", endTime);
}
// 获取试用用户总数
queryWrapper.select("count(distinct email) as count");
@@ -402,22 +408,40 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
Long totalTrials = (Long) trialMaps.get(0).get("count");
// 获取从试用用户转为正式用户的用户数量
Map<String, Long> officialMaps = trialOrderMapper.countOfficialUser();
Long trialToOfficial = officialMaps.get("count");
List<String> paidCustomerEmail = accountService.getPaidCustomerEmail();
QueryWrapper<TrialOrder> qw = new QueryWrapper<>();
if (!StringUtils.isNullOrEmpty(startTime)){
qw.gt("create_time", startTime);
}
if (!StringUtils.isNullOrEmpty(endTime)){
qw.lt("create_time", endTime);
}
qw.in("email", paidCustomerEmail);
List<TrialOrder> paidTrialUsers = trialOrderMapper.selectList(qw);
// Map<String, Long> officialMaps = trialOrderMapper.countOfficialUser();
// Long trialToOfficial = officialMaps.get("count");
// 计算转化率
HashMap<String, Float> resp = new HashMap<>();
HashMap<String, Object> resp = new HashMap<>();
resp.put("trialUserCount", totalTrials.floatValue());
resp.put("trialToOfficialCount", trialToOfficial.floatValue());
resp.put("conversionRate", new BigDecimal(trialToOfficial).divide(new BigDecimal(totalTrials), 2, RoundingMode.HALF_UP).floatValue());
resp.put("trialToOfficialCount", (float) paidTrialUsers.size());
resp.put("conversionRate", new BigDecimal(paidTrialUsers.size()).divide(new BigDecimal(totalTrials), 6, RoundingMode.HALF_UP).floatValue());
resp.put("paidTrialUser", paidTrialUsers);
return resp;
}
// 试用用户地区统计
public Map<String, List<Object>> trialUserCountry() {
public Map<String, List<Object>> trialUserCountry(String startTime, String endTime) {
QueryWrapper<TrialOrder> queryWrapper = new QueryWrapper<>();
if (!StringUtils.isNullOrEmpty(startTime)){
queryWrapper.gt("create_time", startTime);
}
if (!StringUtils.isNullOrEmpty(endTime)){
queryWrapper.lt("create_time", endTime);
}
queryWrapper.select("country, count(id) as count")
.groupBy("country");
List<Map<String, Object>> countryCount = trialOrderMapper.selectMaps(queryWrapper);

17
src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java
View File

@@ -112,10 +112,15 @@ public class MessageCenterServiceImpl extends ServiceImpl<NotificationMapper, No
notificationVO.setPortfolioId(null);
}else {
Portfolio byId = portfolioService.getById(notificationVO.getPortfolioId());
if (Objects.isNull(byId.getPortfolioName())){
notificationVO.setPortfolioName(null);
if (!Objects.isNull(byId)){
if (Objects.isNull(byId.getPortfolioName())){
notificationVO.setPortfolioName(null);
}else {
notificationVO.setPortfolioName(byId.getPortfolioName());
}
}else {
notificationVO.setPortfolioName(byId.getPortfolioName());
String name = UserContext.getUserHolder().getLanguage().equals("ENGLISH") ? CommonConstant.PORTFOLIO_DELETED_EN : CommonConstant.PORTFOLIO_DELETED_CN;
notificationVO.setPortfolioName(name);
}
}
// 设置单个人 系统消息是否已读
@@ -199,11 +204,7 @@ public class MessageCenterServiceImpl extends ServiceImpl<NotificationMapper, No
String jsonString = JSON.toJSONString(resp);
// log.info("消息推送 ： {}", jsonString);
try {
notificationConnection.sendMsg(jsonString, receiverId);
} catch (IOException e) {
throw new RuntimeException(e);
}
notificationConnection.sendMsg(jsonString, receiverId);
}
// 取消点赞、删除评论、取消关注

2
src/main/resources/mapper/primary/DesignMapper.xml
View File

@@ -29,7 +29,7 @@
<select id="getDesignStatistic" resultType="com.ai.da.model.dto.UserDesignStatisticDTO" parameterType="String">
select d.*,c.id trialOrderId, c.title,c.surname,c.given_name,c.country,c.occupation,c.create_time
from (
select b.account_id,count(b.account_id) design_times,a.user_name,a.user_email,a.is_trial
select b.account_id,count(b.account_id) design_times,a.user_name,a.user_email,a.is_trial,a.credits
from t_account a
left join t_design b on a.id = b.account_id
<where>