数据合并-湖分
管理端-湖分管理 通用模块-湖分
This commit is contained in:
@@ -0,0 +1,58 @@
|
||||
package com.peanut.modules.common.controller;
|
||||
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.common.utils.ShiroUtils;
|
||||
import com.peanut.modules.common.entity.UserContribution;
|
||||
import com.peanut.modules.master.service.UserContributionService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 湖分
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController("commonUserContribution")
|
||||
@RequestMapping("common/userContribution")
|
||||
public class UserContributionController {
|
||||
|
||||
@Autowired
|
||||
private UserContributionService contributionService;
|
||||
|
||||
//获取我的湖分列表
|
||||
@RequestMapping("/getUserContribution")
|
||||
public R getUserContribution(){
|
||||
Integer userId = ShiroUtils.getUId();
|
||||
//各分类总分
|
||||
MPJLambdaWrapper wrapper = new MPJLambdaWrapper();
|
||||
wrapper.eq("user_id",userId);
|
||||
wrapper.select("type");
|
||||
wrapper.select("sum(score) as score");
|
||||
wrapper.groupBy("type");
|
||||
List contributions = contributionService.listMaps(wrapper);
|
||||
//统计总分
|
||||
MPJLambdaWrapper totalWrapper = new MPJLambdaWrapper();
|
||||
totalWrapper.eq("user_id",userId);
|
||||
totalWrapper.select("sum(score) as score");
|
||||
Map map = contributionService.getMap(totalWrapper);
|
||||
return R.ok().put("list",contributions).put("total",map.get("score"));
|
||||
}
|
||||
|
||||
//分类下湖分明细
|
||||
@RequestMapping("/getUserContributionByType")
|
||||
public R getUserContributionByType(String type){
|
||||
Integer userId = 785;
|
||||
MPJLambdaWrapper wrapper = new MPJLambdaWrapper();
|
||||
wrapper.eq("user_id",userId);
|
||||
wrapper.eq("type",type);
|
||||
wrapper.orderByDesc("create_time");
|
||||
List contributions = contributionService.listMaps(wrapper);
|
||||
return R.ok().put("list",contributions);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.peanut.modules.common.dao;
|
||||
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.peanut.modules.common.entity.UserContribution;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface UserContributionDao extends MPJBaseMapper<UserContribution> {
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package com.peanut.modules.common.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@TableName("user_contribution")
|
||||
public class UserContribution {
|
||||
|
||||
@TableId
|
||||
private Integer id;
|
||||
|
||||
private Integer userId;
|
||||
|
||||
//分数
|
||||
private Double score;
|
||||
|
||||
//明细
|
||||
private String detail;
|
||||
|
||||
//类型 在线教学 01 学术期刊 03 太湖讲堂 05 创作技术 07 注册邀请 11 课程邀请 13
|
||||
private String type;
|
||||
|
||||
//兑换标志 未兑换0 兑换完毕1
|
||||
private Integer conversionFlag;
|
||||
|
||||
private Date createTime;
|
||||
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
|
||||
@TableField(exist = false)
|
||||
private MyUserEntity user;
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.peanut.modules.common.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.peanut.modules.common.entity.UserContribution;
|
||||
|
||||
public interface UserContributionService extends IService<UserContribution> {
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.peanut.modules.common.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.peanut.modules.common.dao.UserContributionDao;
|
||||
import com.peanut.modules.common.entity.UserContribution;
|
||||
import com.peanut.modules.common.service.UserContributionService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Slf4j
|
||||
@Service("commonUserContributionService")
|
||||
public class UserContributionServiceImpl extends ServiceImpl<UserContributionDao, UserContribution> implements UserContributionService {
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
package com.peanut.modules.master.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.common.entity.MyUserEntity;
|
||||
import com.peanut.modules.common.entity.UserContribution;
|
||||
import com.peanut.modules.master.service.MyUserService;
|
||||
import com.peanut.modules.master.service.UserContributionService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 湖分管理
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController("masterUserContribution")
|
||||
@RequestMapping("master/userContribution")
|
||||
public class UserContributionController {
|
||||
|
||||
@Autowired
|
||||
private UserContributionService contributionService;
|
||||
@Autowired
|
||||
private MyUserService userService;
|
||||
|
||||
@RequestMapping("/listByPage")
|
||||
public R listByPage(@RequestBody Map<String, Object> params) {
|
||||
MPJLambdaWrapper<UserContribution> wrapper = new MPJLambdaWrapper();
|
||||
wrapper.selectAll(UserContribution.class);
|
||||
wrapper.leftJoin(MyUserEntity.class, MyUserEntity::getId, UserContribution::getUserId);
|
||||
if (params.containsKey("userName")&& StringUtils.isNotEmpty(params.get("userName").toString())) {
|
||||
wrapper.like(MyUserEntity::getName,params.get("userName"));
|
||||
wrapper.like(MyUserEntity::getNickname,params.get("userName"));
|
||||
}
|
||||
if (params.containsKey("tel")&& StringUtils.isNotEmpty(params.get("tel").toString())) {
|
||||
wrapper.like(MyUserEntity::getTel,params.get("tel"));
|
||||
}
|
||||
if (params.containsKey("email")&& StringUtils.isNotEmpty(params.get("email").toString())) {
|
||||
wrapper.like(MyUserEntity::getEmail,params.get("email"));
|
||||
}
|
||||
if (params.containsKey("type")&& StringUtils.isNotEmpty(params.get("type").toString())) {
|
||||
wrapper.eq(UserContribution::getType,params.get("type"));
|
||||
}
|
||||
wrapper.orderByDesc(UserContribution::getCreateTime);
|
||||
Page<UserContribution> page = contributionService.page(new Page<>(
|
||||
Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper);
|
||||
List<UserContribution> userContributions = page.getRecords();
|
||||
if (userContributions.size() > 0){
|
||||
for (UserContribution contribution : userContributions) {
|
||||
contribution.setUser(userService.getById(contribution.getUserId()));
|
||||
}
|
||||
}
|
||||
return R.ok().put("result", page);
|
||||
}
|
||||
|
||||
@RequestMapping("/saveUserContribution")
|
||||
public R saveUserContribution(@RequestBody UserContribution contribution) {
|
||||
contributionService.save(contribution);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@RequestMapping("/delUserContribution")
|
||||
public R delMessage(String id) {
|
||||
contributionService.removeById(id);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.peanut.modules.master.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.peanut.modules.common.entity.UserContribution;
|
||||
|
||||
public interface UserContributionService extends IService<UserContribution> {
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.peanut.modules.master.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.peanut.modules.common.dao.UserContributionDao;
|
||||
import com.peanut.modules.common.entity.UserContribution;
|
||||
import com.peanut.modules.master.service.UserContributionService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Slf4j
|
||||
@Service("masterUserContributionService")
|
||||
public class UserContributionServiceImpl extends ServiceImpl<UserContributionDao, UserContribution> implements UserContributionService {
|
||||
}
|
||||
Reference in New Issue
Block a user