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

123

Browse Source
This commit is contained in:
张良(004796)
2024-02-04 14:35:18 +08:00
parent ac6b009dfd
commit 405660082d
26 changed files with 307 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java
View File

@@ -29,7 +29,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.management.ObjectName;
import java.util.List;
@@ -58,10 +57,8 @@ public class IndexController {
@Log(title = "获取APP系统核心参数", businessType = BusinessType.OTHER, isSaveDb = false)
@SaIgnore
public R<AppHomeConfig> config(){
AppHomeConfig config = new AppHomeConfig();
config.setOssDomain(systemConfigManager.getSystemConfig(SystemConfigEnum.COS_DOMAIN));
config.setOpenWithdraw(systemConfigManager.getSystemConfigOfBool(SystemConfigEnum.OPEN_WITHDRAW));
return R.ok(config);
AppHomeConfig appHomeConfig = homeManager.config();
return R.ok(appHomeConfig);
}

17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.cai.app;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.cai.domain.UserAlbum;
import com.ruoyi.cai.dto.app.query.album.AlbumAddReq;
import com.ruoyi.cai.dto.app.query.IdRes;
@@ -8,15 +9,18 @@ import com.ruoyi.cai.dto.app.query.user.UserUpdateReq;
import com.ruoyi.cai.dto.app.query.member.UpdateNoGreet;
import com.ruoyi.cai.dto.app.query.member.UpdateRankHideReq;
import com.ruoyi.cai.dto.app.vo.CurrentUserInfoVo;
import com.ruoyi.cai.dto.app.vo.UserCallAppVo;
import com.ruoyi.cai.dto.app.vo.user.CurrentUserUpdateInfoVo;
import com.ruoyi.cai.dto.app.vo.user.MemberInfoVo;
import com.ruoyi.cai.dto.app.vo.user.UserAlbumAuditVo;
import com.ruoyi.cai.dto.app.vo.user.UserAvatarMinVo;
import com.ruoyi.cai.manager.CurrentUserManager;
import com.ruoyi.cai.service.UserAlbumService;
import com.ruoyi.cai.service.UserCallService;
import com.ruoyi.cai.service.UserMemberService;
import com.ruoyi.cai.service.UserOnlineService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.helper.LoginHelper;
@@ -28,6 +32,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/api/user")
@Tag(name = "用户相关接口")
@@ -144,6 +150,17 @@ public class UserAppController {
return R.ok(vo);
}
@Autowired
private UserCallService userCallService;
@GetMapping("/callLog/page")
@Operation(summary = "通话记录查询-分页")
@Log(title = "通话记录查询", businessType = BusinessType.OTHER, isSaveDb = true)
public R<List<UserCallAppVo>> callLog(PageQuery pageQuery,
@Parameter(description = "当前用户在通话中的类型 0=全部 1=主叫方 2=接收方") Integer type){
IPage<UserCallAppVo> page = userCallService.pageApp(pageQuery, type, LoginHelper.getUserId());
return R.ok(page.getRecords());
}
/*@PostMapping("/album/reset")
@Operation(summary = "重排序相册",hidden = true)
@Log(title = "重排序相册", businessType = BusinessType.OTHER, isSaveDb = false)

4
ruoyi-admin/src/test/java/com/ruoyi/test/business/NoticeTest.java
View File

@@ -2,7 +2,7 @@ package com.ruoyi.test.business;
import com.ruoyi.cai.domain.Gift;
import com.ruoyi.cai.domain.User;
import com.ruoyi.cai.mq.handle.dto.WindowRechargeDTO;
import com.ruoyi.cai.mq.handle.dto.WindowRechargeNotifyDTO;
import com.ruoyi.cai.notice.YunxinHttpService;
import com.ruoyi.cai.notice.data.child.SendGiftWindowsAmountNoticeData;
import com.ruoyi.cai.service.GiftService;
@@ -169,7 +169,7 @@ public class NoticeTest {
@Test
public void sendRechargeWindowsAmount(){
User followUser = userService.getById(10166L);
WindowRechargeDTO dto = new WindowRechargeDTO();
WindowRechargeNotifyDTO dto = new WindowRechargeNotifyDTO();
dto.setId(10166L);
dto.setNickname(followUser.getNickname());
dto.setAvatar(followUser.getAvatar());