lizixuan/m2pool_web_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 工单，通知相关接口调试修改

Browse Source
This commit is contained in:
yyb
2025-06-25 16:31:34 +08:00
parent 315079e5d1
commit 0b2decafc9
23 changed files with 356 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageBroadcastController.java
View File

@@ -3,7 +3,9 @@ package com.m2pool.manage.controller;
import com.m2pool.common.core.Result.R;
import com.m2pool.common.core.utils.PageUtils;
import com.m2pool.common.core.web.page.TableDataInfo;
import com.m2pool.common.security.annotation.Logical;
import com.m2pool.common.security.annotation.RequiresLogin;
import com.m2pool.common.security.annotation.RequiresRoles;
import com.m2pool.manage.dto.ManageBroadcastDto;
import com.m2pool.manage.service.ManageBroadcastService;
import com.m2pool.manage.vo.ManageBaseVo;
@@ -35,19 +37,22 @@ public class ManageBroadcastController {
@PostMapping("/get/list/by/page")
@ApiOperation(value = "管理系统:分页查询所有广播信息")
@RequiresLogin
@RequiresRoles(value = {"back_admin","admin"}, logical = Logical.OR)
public TableDataInfo<ManageBroadcastDto> getListDataByPage(@RequestBody PageVo pageVo){
return manageBroadcastService.getListDataByPage(pageVo);
}
@PostMapping("/find/data/by/id")
@ApiOperation(value = "业务系统:用于获取m2pool广播数据")
public R<List<ManageBroadcastDto>> findDataById(@RequestBody ManageBaseVo manageBaseVo){
public R<List<ManageBroadcastDto>> findDataById(@RequestBody(required = false) ManageBaseVo manageBaseVo){
return manageBroadcastService.findDataById(manageBaseVo);
}
@PostMapping("/add")
@ApiOperation(value = "管理系统:新增广播")
@RequiresLogin
@RequiresRoles(value = {"back_admin","admin"}, logical = Logical.OR)
public R<String> add(@RequestBody ManageBroadcastVo broadcastVo){
return manageBroadcastService.addBroadcast(broadcastVo);
}
@@ -55,6 +60,7 @@ public class ManageBroadcastController {
@PostMapping("/delete")
@ApiOperation(value = "管理系统:删除广播")
@RequiresLogin
@RequiresRoles(value = {"back_admin","admin"}, logical = Logical.OR)
public R<String> delete(@RequestBody ManageBaseVo manageBaseVo){
return manageBroadcastService.deleteBroadcastById(manageBaseVo.getId());
}
@@ -62,9 +68,17 @@ public class ManageBroadcastController {
@PostMapping("/update")
@ApiOperation(value = "管理系统:修改广播")
@RequiresLogin
@RequiresRoles(value = {"back_admin","admin"}, logical = Logical.OR)
public R<String> update(@RequestBody ManageBroadcastVo broadcastVo){
return manageBroadcastService.updateBroadcast(broadcastVo);
}
@PostMapping("/find/data/info")
@ApiOperation(value = "管理系统:用于获取通知详情")
@RequiresRoles(value = {"back_admin","admin"}, logical = Logical.OR)
public R<ManageBroadcastDto> findDataInfo(@RequestBody ManageBaseVo manageBaseVo){
return manageBroadcastService.findDataInfo(manageBaseVo);
}
}

5
m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageUserController.java
View File

@@ -2,7 +2,9 @@ package com.m2pool.manage.controller;
import com.m2pool.common.core.Result.R;
import com.m2pool.common.core.web.page.TableDataInfo;
import com.m2pool.common.security.annotation.Logical;
import com.m2pool.common.security.annotation.RequiresLogin;
import com.m2pool.common.security.annotation.RequiresRoles;
import com.m2pool.manage.dto.ManageBroadcastDto;
import com.m2pool.manage.dto.ManageUserDto;
import com.m2pool.manage.dto.ManageUserInfoDto;
@@ -33,6 +35,7 @@ public class ManageUserController {
@PostMapping("/list/info")
@ApiOperation(value = "管理系统:查询注册用户信息列表，包括邮箱、挖矿账号、起付额、挖矿账户状态")
@RequiresLogin
@RequiresRoles(value = {"back_admin","admin"}, logical = Logical.OR)
public TableDataInfo<ManageUserDto> listInfo(@RequestBody ManageUserVo manageUserVo){
return manageUserService.listInfo(manageUserVo);
}
@@ -41,6 +44,7 @@ public class ManageUserController {
@PostMapping("/send/text/mail/message")
@ApiOperation(value = "管理系统:发送邮件给某些用户")
@RequiresLogin
@RequiresRoles(value = {"back_admin","admin"}, logical = Logical.OR)
public void sendTextMailMessage(@RequestBody EmailVo emailVo){
manageUserService.sendTextMailMessage(emailVo.getTo(),emailVo.getSubject(),emailVo.getText());
}
@@ -48,6 +52,7 @@ public class ManageUserController {
@PostMapping("/get/user/info")
@ApiOperation(value = "管理系统:挖矿账户所有收益金额、时间、状态、转账地址")
@RequiresLogin
@RequiresRoles(value = {"back_admin","admin"}, logical = Logical.OR)
public R<ManageUserInfoDto> getUserInfo(@RequestBody ManageUserInfoVo manageUserInfoVo){
return manageUserService.getUserInfo(manageUserInfoVo);
}

5
m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/dto/ManageUserDto.java
View File

@@ -1,5 +1,6 @@
package com.m2pool.manage.dto;
import com.sun.org.apache.xpath.internal.operations.Bool;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
@@ -35,7 +36,9 @@ public class ManageUserDto {
@ApiModelProperty(value = "最小起付金额",example = "100.0")
private String amount;
@ApiModelProperty(value = "是否激活自动提现0 是 1 否",example = "0")
private Integer active;
@ApiModelProperty(value = "挖矿用户状态",example = "0 11")
@ApiModelProperty(value = "挖矿用户状态0 正常 11 已删除 (废除：11已被过滤不会查询出来)",example = "0")
private Integer status;
}

9
m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageBroadcastService.java
View File

@@ -8,6 +8,7 @@ import com.m2pool.manage.entity.ManageBroadcast;
import com.m2pool.manage.vo.ManageBaseVo;
import com.m2pool.manage.vo.ManageBroadcastVo;
import com.m2pool.manage.vo.PageVo;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -56,4 +57,12 @@ public interface ManageBroadcastService extends IService<ManageBroadcast> {
R<String> updateBroadcast(ManageBroadcastVo broadcastVo);
/**
* 查询通知详情
* @param manageBaseVo
* @return
*/
R<ManageBroadcastDto> findDataInfo(ManageBaseVo manageBaseVo);
}

28
m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageBroadcastServiceImpl.java
View File

@@ -69,10 +69,13 @@ public class ManageBroadcastServiceImpl extends ServiceImpl<ManageBroadcastMappe
public R<List<ManageBroadcastDto>> findDataById(ManageBaseVo manageBaseVo) {
LambdaQueryWrapper<ManageBroadcast> eq = new LambdaQueryWrapper<ManageBroadcast>()
.eq(ManageBroadcast::getDel, false);
if(manageBaseVo.getId() != null){
eq.eq(ManageBroadcast::getId, manageBaseVo.getId());
if(manageBaseVo != null && manageBaseVo.getId() != null){
eq.le(ManageBroadcast::getId, manageBaseVo.getId());
eq.orderByDesc(ManageBroadcast::getId).last("limit 20");
}else{
eq.orderByDesc(ManageBroadcast::getId);
}
eq.orderByDesc(ManageBroadcast::getId).last("limit 20");
List<ManageBroadcast> list = this.list(eq);
List<ManageBroadcastDto> collect = list.stream()
@@ -126,6 +129,7 @@ public class ManageBroadcastServiceImpl extends ServiceImpl<ManageBroadcastMappe
@Override
public R<String> updateBroadcast(ManageBroadcastVo broadcastVo) {
boolean b = this.updateById(ManageBroadcast.builder()
.id(broadcastVo.getId())
.content(broadcastVo.getContent())
.updateUser(SecurityUtils.getUsername())
.build());
@@ -134,4 +138,22 @@ public class ManageBroadcastServiceImpl extends ServiceImpl<ManageBroadcastMappe
}
return R.fail("修改失败");
}
@Override
public R<ManageBroadcastDto> findDataInfo(ManageBaseVo manageBaseVo) {
ManageBroadcast byId = this.getById(manageBaseVo.getId());
if(byId != null){
return R.success(ManageBroadcastDto.builder()
.content(byId.getContent())
.id(byId.getId())
.createUser(byId.getCreateUser())
.updateUser(byId.getUpdateUser())
.updateTime(byId.getUpdateTime())
.createTime(byId.getCreateTime())
.build());
}
return R.fail("该通知不存在");
}
}

3
m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml
View File

@@ -12,13 +12,14 @@
uma.miner_user as minerUser,
uma.coin,
uab.balance,
uab.active,
COALESCE(uab.amount,0),
uma.status
FROM
user_account_balance uab
LEFT JOIN user_miner_account uma ON uab.ma_id = uma.id
<where>
uma.coin = #{coin}
uma.coin = #{coin} AND uma.status = 0
<if test="user != null and user != ''">
AND uma.user like CONCAT('%',#{user},'%')
</if>