shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
dute7liang
2024-01-28 13:07:37 +08:00
parent 13c2337985
commit b8c801ee56
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java
View File

@@ -156,10 +156,10 @@ public class ChatManager {
User toUser = userMap.get(userCall.getToUid()); User toUser = userMap.get(userCall.getToUid());
Anchor anchor = anchorService.getByUserId(toUser.getId()); Anchor anchor = anchorService.getByUserId(toUser.getId());
String wsSocketUrlFormat = systemConfigManager.getWebSocketUrl(); String wsSocketUrlFormat = systemConfigManager.getWebSocketUrl();
String token = setWsToken(userCall.getId(), fromUser.getId(), toUser.getId(), userId); String token = setWsToken(room.getRoomId(), fromUser.getId(), toUser.getId(), userId);
String weSocketUrl = String.format(wsSocketUrlFormat,token,roomId); String weSocketUrl = String.format(wsSocketUrlFormat,token,room.getRoomId());
GetRoomResp getRoomResp = new GetRoomResp(); GetRoomResp getRoomResp = new GetRoomResp();
getRoomResp.setRoomId(userCall.getId()+""); getRoomResp.setRoomId(room.getRoomId()+"");
getRoomResp.setFromUid(userCall.getFromUid()); getRoomResp.setFromUid(userCall.getFromUid());
getRoomResp.setFromNickname(fromUser.getNickname()); getRoomResp.setFromNickname(fromUser.getNickname());
getRoomResp.setFromAvatar(fromUser.getAvatar()); getRoomResp.setFromAvatar(fromUser.getAvatar());

6
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/AccountServiceImpl.java
View File

@@ -18,6 +18,7 @@ import com.ruoyi.cai.manager.IdManager;
import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.cai.manager.SystemConfigManager;
import com.ruoyi.cai.mapper.AccountMapper; import com.ruoyi.cai.mapper.AccountMapper;
import com.ruoyi.cai.service.*; import com.ruoyi.cai.service.*;
import com.ruoyi.cai.util.CaiDateUtil;
import com.ruoyi.cai.util.CaiNumUtil; import com.ruoyi.cai.util.CaiNumUtil;
import com.ruoyi.cai.ws.bean.Room; import com.ruoyi.cai.ws.bean.Room;
import com.ruoyi.cai.ws.bean.RoomData; import com.ruoyi.cai.ws.bean.RoomData;
@@ -32,6 +33,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime;
/** /**
* 用户账户Service业务层处理 * 用户账户Service业务层处理
@@ -402,8 +404,8 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
userCallService.update(Wrappers.lambdaUpdate(UserCall.class) userCallService.update(Wrappers.lambdaUpdate(UserCall.class)
.eq(UserCall::getId, userCall.getId()) .eq(UserCall::getId, userCall.getId())
.set(UserCall::getTraceId,tractId) .set(UserCall::getTraceId,tractId)
.set(UserCall::getBeginTime, DateUtil.date(roomData.getBeginTime()).toLocalDateTime()) .set(UserCall::getBeginTime, CaiDateUtil.toDataSecond(roomData.getBeginTime()))
.set(UserCall::getEndTime,DateUtil.date(roomData.getHangupTime()).toLocalDateTime()) .set(UserCall::getEndTime, CaiDateUtil.toDataSecond(roomData.getBeginTime()))
.set(UserCall::getCallTime,roomData.getHangupTime() - roomData.getBeginTime()) .set(UserCall::getCallTime,roomData.getHangupTime() - roomData.getBeginTime())
.set(UserCall::getCallAmount,amountReal) .set(UserCall::getCallAmount,amountReal)
.set(UserCall::getCallIncome, anchorAmount) .set(UserCall::getCallIncome, anchorAmount)

10
ruoyi-cai/src/main/java/com/ruoyi/cai/util/CaiDateUtil.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.cai.util; package com.ruoyi.cai.util;
import cn.hutool.core.date.DateUtil;
import java.time.DayOfWeek; import java.time.DayOfWeek;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -19,6 +21,14 @@ public class CaiDateUtil {
return localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); return localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
} }
public static LocalDateTime toDataSecond(Long date){
if(date == null){
return null;
}
return DateUtil.date(date*1000).toLocalDateTime();
}
public static void main(String[] args) { public static void main(String[] args) {
LocalDate one = getLastWeekOne(LocalDate.now()); LocalDate one = getLastWeekOne(LocalDate.now());
System.out.println(one.format(DateTimeFormatter.ofPattern("yyyyMMdd"))); System.out.println(one.format(DateTimeFormatter.ofPattern("yyyyMMdd")));