记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 71e5e1d2 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

提交 部分代码 redis代码

parent ab63e46a
Show whitespace changes
Inline Side-by-side
Showing with 409 additions and 74 deletions
liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/constant/SmileRedisConst.java
View file @ 71e5e1d2
......@@ -3,6 +3,8 @@ package com.liquidnet.service.goblin.constant;
public class SmileRedisConst {
public static final String PREFIX = "smile:";
public static final String VOLUNTEERS = "volunteers:";
public static final String SMILE_USER = PREFIX.concat("user"); //用户key
public static final String SMILE_USER_VALIDATE = PREFIX.concat("user:validate"); //用户key
......@@ -29,4 +31,8 @@ public class SmileRedisConst {
public static final String SELL_SHOW_TOTAL_SALE_PRICE_USER = PREFIX.concat("show:total:sale:price:user:"); //用户销售总销售金额
public static final String PROJECT_DETAILS = PREFIX.concat(VOLUNTEERS).concat("project:"); //志愿者活动详情 $key:$projectId
public static final String TEAM_DETAILS = PREFIX.concat(VOLUNTEERS).concat("team:"); //志愿者职责组详情 $key:$teamId
public static final String PROJECT_ID_LIST = PREFIX.concat(VOLUNTEERS).concat("list"); //志愿者活动列表 $key
public static final String VOLUNTEERS_DETAILS = PREFIX.concat(VOLUNTEERS).concat(":"); //志愿者报名详情 $key:$projectId:uid:$uid
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileVolunteersController.java 0 → 100644
View file @ 71e5e1d2
package com.liquidnet.client.admin.web.controller.zhengzai.smile;
import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVPParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVPSParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVSParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVTSParam;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileVolunteersProjectService;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileVolunteersService;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileVolunteersTeamService;
import com.liquidnet.client.admin.zhengzai.smile.vo.SmileProjectDetailsVo;
import com.liquidnet.client.admin.zhengzai.smile.vo.SmileVolunteersDetailsVo;
import com.liquidnet.service.smile.entity.SmileVolunteersTeam;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
@Api(tags = "志愿者")
@Controller
@RequestMapping("/smile/volunteers")
public class SmileVolunteersController extends BaseController {
@Autowired
ISmileVolunteersProjectService volunteersProjectService;
@Autowired
ISmileVolunteersTeamService volunteersTeamService;
@Autowired
ISmileVolunteersService volunteersService;
private final String prefix = "zhengzai/smile/volunteers";
/**
* 新增组
*/
@GetMapping("/team/add")
public String addTeam() {
return prefix + "team/add";
}
/**
* 新增活动
*/
@GetMapping("/project/add")
public String addProject() {
return prefix + "project/add";
}
@PostMapping("team/list")
@ApiOperation("职责组列表")
public TableDataInfo listTeam(SmileVTSParam param) {
return volunteersTeamService.list(param);
}
@PostMapping("team/insert")
@ApiOperation("添加职责组")
@ResponseBody
public AjaxResult insertTeam(@RequestBody SmileVolunteersTeam bean) {
return volunteersTeamService.insertData(bean);
}
@PostMapping("team/update")
@ApiOperation("修改职责组")
@ResponseBody
public AjaxResult upDateTeam(@RequestBody SmileVolunteersTeam bean) {
return volunteersTeamService.updateData(bean);
}
@GetMapping("team/details/{teamId}")
@ApiOperation("修改职责组")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "teamId", value = "组id"),
})
public String detailsTeam(@PathVariable("teamId") String teamId, ModelMap mmap) {
SmileVolunteersTeam data = volunteersTeamService.details(teamId);
mmap.put("smileVolunteersTeam", data);
return prefix + "team/details";
}
@GetMapping("team/search")
@ApiOperation("组名字搜索")
@ResponseBody
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "title", value = "组名称")
})
public AjaxResult search(@RequestParam(value = "title", required = false) String title) {
return volunteersTeamService.search(title);
}
@GetMapping("team/ByProjectId")
@ApiOperation("根据活动id查询关联组")
@ResponseBody
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "projectId", value = "活动id"),
})
public AjaxResult getListByProjectId(@RequestParam(value = "projectId", required = false) String projectId) {
return volunteersTeamService.getListByProjectId(projectId);
}
@PostMapping("project/list")
@ApiOperation("活动列表")
public TableDataInfo listProject(SmileVPSParam param) {
return volunteersProjectService.list(param);
}
@PostMapping("project/insert")
@ApiOperation("活动新增")
@ResponseBody
public AjaxResult insertProject(SmileVPParam param) {
return volunteersProjectService.insertData(param);
}
@PostMapping("project/update")
@ApiOperation("活动修改")
@ResponseBody
public AjaxResult updateProject(SmileVPParam param) {
return volunteersProjectService.updateData(param);
}
@GetMapping("project/details/{projectId}")
@ApiOperation("活动详情")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "projectId", value = "活动id"),
})
public String detailsProject(@PathVariable("projectId") String projectId, ModelMap mmap) {
SmileProjectDetailsVo data = volunteersProjectService.details(projectId);
mmap.put("smileProjectDetailsVo", data);
return prefix + "project/details";
}
@PostMapping("/list")
@ApiOperation("志愿者列表")
public TableDataInfo listVolunteers(SmileVSParam param) {
return volunteersService.list(param);
}
@GetMapping("/details/{uid}/{projectId}")
@ApiOperation("志愿者详情")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "projectId", value = "活动id"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "用户id"),
})
public String detailsVolunteers(String projectId, String uid, ModelMap mmap) {
SmileVolunteersDetailsVo data = volunteersService.details(projectId, uid);
mmap.put("smileVolunteersDetailsVo", data);
return prefix + "/details";
}
@PostMapping("/audit")
@ApiOperation("志愿者审核")
@ResponseBody
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "projectId", value = "活动id"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "用户id"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "teamId", value = "被分配组id"),
@ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "status", value = "审核状态[0-待审核|1-审核通过|2-审核未通过]"),
})
public AjaxResult auditVolunteers(String projectId, String uid, String teamId, Integer status) {
return volunteersService.audit(projectId, uid, teamId, status);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileVolunteersService.java
View file @ 71e5e1d2
......@@ -6,6 +6,7 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVPParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVPSParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVSParam;
import com.liquidnet.client.admin.zhengzai.smile.vo.SmileProjectDetailsVo;
import com.liquidnet.client.admin.zhengzai.smile.vo.SmileVolunteersDetailsVo;
import com.liquidnet.service.smile.entity.SmileVolunteers;
import com.baomidou.mybatisplus.extension.service.IService;
......@@ -26,6 +27,6 @@ public interface ISmileVolunteersService extends IService<SmileVolunteers> {
AjaxResult audit(String projectId, String uid, String teamId, Integer status);
//志愿者详情详情
SmileProjectDetailsVo details(String projectId);
SmileVolunteersDetailsVo details(String projectId, String uid);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileVolunteersTeamService.java
View file @ 71e5e1d2
......@@ -30,10 +30,10 @@ public interface ISmileVolunteersTeamService extends IService<SmileVolunteersTea
//组详情
SmileVolunteersTeam details(String teamId);
//组详情
//组搜索
AjaxResult search(String title);
//根据活动id获取关联组
List<SmileVolunteersTeam> getListByProjectId(String projectId);
AjaxResult getListByProjectId(String projectId);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersProjectServiceImpl.java
View file @ 71e5e1d2
......@@ -9,6 +9,7 @@ import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVPParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVPSParam;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileVolunteersProjectService;
import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
import com.liquidnet.client.admin.zhengzai.smile.vo.SmileProjectDetailsVo;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.smile.entity.SmileProjectTeamRelation;
......@@ -22,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
......@@ -37,6 +39,8 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
SmileProjectTeamRelationMapper projectTeamRelationMapper;
@Autowired
SmileVolunteersTeamMapper volunteersTeamMapper;
@Autowired
SmileRedisUtils redisUtils;
@Override
public TableDataInfo list(SmileVPSParam param) {
......@@ -62,15 +66,22 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
public AjaxResult insertData(SmileVPParam param) {
param.setProjectId(IDGenerator.nextTimeId2());
LocalDateTime now = LocalDateTime.now();
int count = volunteersProjectMapper.insert(copySmileVolunteersProject(param, now, null));
List<SmileVolunteersTeam> teamList = new ArrayList<>();
SmileVolunteersProject data = copySmileVolunteersProject(param, now, null);
int count = volunteersProjectMapper.insert(data);
for (String teamId : param.getTeamIdArray()) {
SmileProjectTeamRelation smileProjectTeamRelation = SmileProjectTeamRelation.getNew();
smileProjectTeamRelation.setProjectId(param.getProjectId());
smileProjectTeamRelation.setTeamId(teamId);
smileProjectTeamRelation.setCreatedAt(now);
SmileVolunteersTeam volunteersTeam = SmileVolunteersTeam.getNew();
volunteersTeam.setTeamId(teamId);
teamList.add(volunteersTeam);
projectTeamRelationMapper.insert(smileProjectTeamRelation);
}
if (count > 0) {
redisUtils.setProject(param.getProjectId(), SmileProjectDetailsVo.getNew().copy(data, teamList));
redisUtils.addProjectId(param.getProjectId());
return AjaxResult.success("添加成功");
}
return AjaxResult.error("添加失败");
......@@ -79,6 +90,7 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
@Override
public AjaxResult updateData(SmileVPParam param) {
LocalDateTime now = LocalDateTime.now();
List<SmileVolunteersTeam> teamList = new ArrayList<>();
LambdaQueryWrapper<SmileVolunteersProject> wrappers = Wrappers.lambdaQuery(SmileVolunteersProject.class);
wrappers.eq(SmileVolunteersProject::getTitle, param.getTitle());
List<SmileVolunteersProject> dataList = volunteersProjectMapper.selectList(wrappers);
......@@ -87,8 +99,8 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
return AjaxResult.error("项目名称重复不可修改");
}
}
int count = volunteersProjectMapper.update(copySmileVolunteersProject(param, null, now), Wrappers.lambdaQuery(SmileVolunteersProject.class).eq(SmileVolunteersProject::getProjectId, param.getProjectId()));
SmileVolunteersProject data = copySmileVolunteersProject(param, null, now);
int count = volunteersProjectMapper.update(data, Wrappers.lambdaQuery(SmileVolunteersProject.class).eq(SmileVolunteersProject::getProjectId, param.getProjectId()));
//删除所有关联关系
projectTeamRelationMapper.delete(Wrappers.lambdaQuery(SmileProjectTeamRelation.class).eq(SmileProjectTeamRelation::getProjectId, param.getProjectId()));
for (String teamId : param.getTeamIdArray()) {
......@@ -96,9 +108,13 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
smileProjectTeamRelation.setProjectId(param.getProjectId());
smileProjectTeamRelation.setTeamId(teamId);
smileProjectTeamRelation.setCreatedAt(now);
SmileVolunteersTeam volunteersTeam = SmileVolunteersTeam.getNew();
volunteersTeam.setTeamId(teamId);
teamList.add(volunteersTeam);
projectTeamRelationMapper.insert(smileProjectTeamRelation);
}
if (count > 0) {
redisUtils.setProject(param.getProjectId(), SmileProjectDetailsVo.getNew().copy(data, teamList));
return AjaxResult.success("修改成功");
}
return AjaxResult.error("修改失败");
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersServiceImpl.java
View file @ 71e5e1d2
......@@ -7,11 +7,9 @@ import com.github.pagehelper.PageHelper;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVSParam;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVTSParam;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileVolunteersService;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileVolunteersTeamService;
import com.liquidnet.client.admin.zhengzai.smile.vo.SmileProjectDetailsVo;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.client.admin.zhengzai.smile.vo.SmileVolunteersDetailsVo;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.smile.entity.*;
import com.liquidnet.service.smile.mapper.*;
import lombok.extern.slf4j.Slf4j;
......@@ -19,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
......@@ -31,9 +30,12 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
@Autowired
SmileVolunteersProjectMapper volunteersProjectMapper;
@Autowired
SmileVolunteersTeamMapper volunteersTeamMapper;
@Autowired
SmileVolunteersTeamRelationMapper volunteersTeamRelationMapper;
@Override
public TableDataInfo list(SmileVSParam param) {
try {
......@@ -91,7 +93,39 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
}
@Override
public SmileProjectDetailsVo details(String projectId) {
public SmileVolunteersDetailsVo details(String projectId, String uid) {
SmileVolunteers bean = volunteersMapper.selectOne(Wrappers.lambdaQuery(SmileVolunteers.class).eq(SmileVolunteers::getProjectId, projectId).eq(SmileVolunteers::getUid, uid));
ArrayList<String> teamIdArray = CollectionUtil.arrayListString();
if (bean == null) {
return null;
} else if (bean.getStatus().equals(0) || bean.getStatus().equals(2)) {//未审核通过显示用户的选择的组
if (bean.getTeamId1() != null && !bean.getTeamId1().equals("")) {
teamIdArray.add(bean.getTeamId1());
}
if (bean.getTeamId2() != null && !bean.getTeamId2().equals("")) {
teamIdArray.add(bean.getTeamId2());
}
if (bean.getTeamId3() != null && !bean.getTeamId3().equals("")) {
teamIdArray.add(bean.getTeamId3());
}
} else if (bean.getStatus().equals(1)) {//审核通过 显示分配的组
List<String> teamIds = volunteersTeamRelationMapper.selectList(Wrappers.lambdaQuery(SmileVolunteersTeamRelation.class).eq(SmileVolunteersTeamRelation::getProjectId, projectId).eq(SmileVolunteersTeamRelation::getUid, uid))
.stream().map(SmileVolunteersTeamRelation::getTeamId).collect(Collectors.toList());
teamIdArray.addAll(teamIds);
} else {
return null;
}
//获取 组内容
List<SmileVolunteersTeam> volunteersTeamList = volunteersTeamMapper.selectList(Wrappers.lambdaQuery(SmileVolunteersTeam.class).in(SmileVolunteersTeam::getTeamId, teamIdArray));
if (volunteersTeamList == null || volunteersTeamList.size() == 0) {
return null;
}
//获取 活动名称
SmileVolunteersProject volunteersProject = volunteersProjectMapper.selectOne(Wrappers.lambdaQuery(SmileVolunteersProject.class).in(SmileVolunteersProject::getProjectId, bean.getProjectId()));
if (volunteersProject == null) {
return null;
}
SmileVolunteersDetailsVo vo = SmileVolunteersDetailsVo.getNew().copy(bean, volunteersTeamList, volunteersProject.getTitle());
return vo;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersTeamServiceImpl.java
View file @ 71e5e1d2
......@@ -8,6 +8,7 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVTSParam;
import com.liquidnet.client.admin.zhengzai.smile.service.ISmileVolunteersTeamService;
import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.smile.entity.SmileProjectTeamRelation;
import com.liquidnet.service.smile.entity.SmileVolunteersTeam;
......@@ -28,6 +29,8 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT
SmileVolunteersTeamMapper volunteersTeamMapper;
@Autowired
SmileProjectTeamRelationMapper projectTeamRelationMapper;
@Autowired
SmileRedisUtils redisUtils;
@Override
public TableDataInfo list(SmileVTSParam param) {
......@@ -54,6 +57,7 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT
bean.setTeamId(IDGenerator.nextTimeId2());
int count = volunteersTeamMapper.insert(bean);
if (count > 0) {
redisUtils.setTeam(bean.getTeamId(),bean);
return AjaxResult.success("添加成功");
}
return AjaxResult.error("添加失败");
......@@ -71,9 +75,10 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT
}
int count = volunteersTeamMapper.update(bean, Wrappers.lambdaQuery(SmileVolunteersTeam.class).eq(SmileVolunteersTeam::getTeamId, bean.getTeamId()));
if (count > 0) {
return AjaxResult.success("添加成功");
redisUtils.setTeam(bean.getTeamId(),bean);
return AjaxResult.success("修改成功");
}
return AjaxResult.error("添加失败");
return AjaxResult.error("修改失败");
}
@Override
......@@ -96,10 +101,13 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT
}
@Override
public List<SmileVolunteersTeam> getListByProjectId(String projectId) {
public AjaxResult getListByProjectId(String projectId) {
//获取 活动 组 关系
List<String> teamIdList = projectTeamRelationMapper.selectList(Wrappers.lambdaQuery(SmileProjectTeamRelation.class).eq(SmileProjectTeamRelation::getProjectId, projectId)).stream().map(SmileProjectTeamRelation::getTeamId).collect(Collectors.toList());
//获取 关联组详情
return volunteersTeamMapper.selectList(Wrappers.lambdaQuery(SmileVolunteersTeam.class).in(SmileVolunteersTeam::getTeamId, teamIdList));
List<SmileVolunteersTeam> beanList = volunteersTeamMapper.selectList(Wrappers.lambdaQuery(SmileVolunteersTeam.class).in(SmileVolunteersTeam::getTeamId, teamIdList));
AjaxResult ajax = new AjaxResult();
ajax.put("value", beanList);
return ajax;
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/utils/SmileRedisUtils.java
View file @ 71e5e1d2
package com.liquidnet.client.admin.zhengzai.smile.utils;
import com.liquidnet.client.admin.zhengzai.smile.vo.SmileProjectDetailsVo;
import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.goblin.constant.SmileRedisConst;
import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
import com.liquidnet.service.goblin.dto.vo.SmileSellDataVO;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.smile.entity.SmileVolunteersTeam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@Component
......@@ -19,115 +24,119 @@ public class SmileRedisUtils {
RedisDataSourceUtil redisDataSourceUtil;
public AbstractRedisUtil getRedis() {
return redisDataSourceUtil.getRedisSweetUtil();
}
/**
* redis保存用户
*/
public void setSmileUserVO(String uid, SmileUserVO smileUserVO){
public void setSmileUserVO(String uid, SmileUserVO smileUserVO) {
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_USER.concat(uid), smileUserVO);
}
/**
* redis获取SmileUserVO
*/
public SmileUserVO getSmileUserVO(String uid){
return (SmileUserVO)redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_USER.concat(uid));
public SmileUserVO getSmileUserVO(String uid) {
return (SmileUserVO) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_USER.concat(uid));
}
/**
* 根据学校id获取学校名称
*/
public String getSchoolNameById(String schoolId){
public String getSchoolNameById(String schoolId) {
return (String) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
}
/**
* 保存/更新学校
*/
public void setSchool(String schoolId, String schoolName){
public void setSchool(String schoolId, String schoolName) {
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId), schoolName);
}
/**
* 保存全部学校
*/
public void setSchoolAll(List<SmileSchoolVo> smileSchoolVos){
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SCHOOL,smileSchoolVos);
public void setSchoolAll(List<SmileSchoolVo> smileSchoolVos) {
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SCHOOL, smileSchoolVos);
}
/**
* 删除学校
*/
public void delSchool(String schoolId){
public void delSchool(String schoolId) {
redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
}
/**
* 获取演出打款状态
*/
public String getShowStatus(String performancesId){
public String getShowStatus(String performancesId) {
return (String) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SHOW.concat(performancesId));
}
/**
* 保存演出ids
*/
public void setShowIds(String perId){
public void setShowIds(String perId) {
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SHOW, perId);
}
/**
* 保存个人打款
*/
public void setPriceByUid(String performancesId,String uid){
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid),0);
public void setPriceByUid(String performancesId, String uid) {
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid), 0);
}
/**
* 获取个人打款状态
*/
public Integer getShowPriceUid(String performancesId,String uid){
public Integer getShowPriceUid(String performancesId, String uid) {
return (Integer) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
}
/**
* 删除个人打款状态
*/
public void delPriceByUid(String performancesId,String uid){
public void delPriceByUid(String performancesId, String uid) {
redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
}
/**
* 总共演出打款
*/
public void setShowPriceId(String performancesId){
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId),0);
public void setShowPriceId(String performancesId) {
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId), 0);
}
/**
* 总共演出打款删除
*/
public void delShowPriceId(String performancesId){
public void delShowPriceId(String performancesId) {
redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
}
/**
*获取演出打款状态
* 获取演出打款状态
*/
public Integer getShowPriceId(String performancesId){
public Integer getShowPriceId(String performancesId) {
return (Integer) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
}
/**
* 获取用户数据
*/
public SmileSellDataVO getSellDataVO(String uid, String performancesId){
public SmileSellDataVO getSellDataVO(String uid, String performancesId) {
return (SmileSellDataVO) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_DATA.concat(uid).concat(performancesId));
}
/**
* 保存票提
*/
public void setAgent(String performancesId,String ticketId, SmileAgentVo smileAgentVo){
public void setAgent(String performancesId, String ticketId, SmileAgentVo smileAgentVo) {
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId), smileAgentVo);
}
......@@ -136,55 +145,65 @@ public class SmileRedisUtils {
}
public BigDecimal getUserTotalPrice(String uid) {
return (redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid)))==null ? BigDecimal.valueOf(0) : (BigDecimal)redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid));
return (redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid))) == null ? BigDecimal.valueOf(0) : (BigDecimal) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid));
}
public void setUserTotalPrice(String uid, BigDecimal add) {
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_USER_REVENUE.concat(uid),add);
}
/*public Boolean set(String key, Object value){
return redisDataSourceUtil.getRedisSweetUtil().set(key, value);
redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_USER_REVENUE.concat(uid), add);
}
public Object get(String key){
return redisDataSourceUtil.getRedisSweetUtil().get(key);
// 覆盖活动详情
public void setProject(String projectId, SmileProjectDetailsVo vo) {
String rdk = SmileRedisConst.PROJECT_DETAILS.concat(projectId);
getRedis().set(rdk, vo);
}
public void del(String s) {
redisDataSourceUtil.getRedisSweetUtil().del(s);
// 覆盖职责组详情
public void setTeam(String teamId, SmileVolunteersTeam vo) {
String rdk = SmileRedisConst.TEAM_DETAILS.concat(teamId);
getRedis().set(rdk, vo);
}
public boolean hset(String key, String item, Object value){
return redisDataSourceUtil.getRedisAdamUtil().hset(key,item,value);
// 获取活动列表id
public ArrayList<String> getProjectId() {
String rdk = SmileRedisConst.PROJECT_ID_LIST;
Object obj = getRedis().get(rdk);
if (obj == null) {
return CollectionUtil.arrayListString();
} else {
return (ArrayList<String>) obj;
}
public boolean lSet(String key, Object value){
return redisDataSourceUtil.getRedisSweetUtil().lSet(key,value);
}
public boolean lSet(String key, List<Object> value){
return redisDataSourceUtil.getRedisSweetUtil().lSet(key,value);
// 添加活动列表id
public void addProjectId(String projectId) {
String rdk = SmileRedisConst.PROJECT_ID_LIST;
ArrayList<String> list = getProjectId();
list.add(projectId);
getRedis().set(rdk, list);
}
public List<Object> lGet(String key, long start, long end) {
return redisDataSourceUtil.getRedisSweetUtil().lGet(key, start, end);
// 添加活动列表id
public void delProjectId(String projectId) {
String rdk = SmileRedisConst.PROJECT_ID_LIST;
ArrayList<String> list = getProjectId();
for (String id : list) {
if (id.equals(projectId)) {
list.remove(projectId);
}
public long lGetListSize(String key) {
return redisDataSourceUtil.getRedisSweetUtil().lGetListSize(key);
}
public Object lGetIndex(String key, long index) {
return redisDataSourceUtil.getRedisSweetUtil().lGetIndex(key,index);
getRedis().set(rdk, list);
}
public long lRemove(String key, long count, Object value){
return redisDataSourceUtil.getRedisSweetUtil().lRemove(key, count, value);
/**
* 添加志愿者报名情况
*
* @param projectId 活动id
* @param uid 用户id
* @param teamIds 组id数组
*/
public void setVolunteers(String projectId, String uid, ArrayList<String> teamIds) {
String rdk = SmileRedisConst.VOLUNTEERS_DETAILS.concat(projectId).concat(":uid:").concat(uid);
getRedis().set(rdk, teamIds);
}
public boolean hasKey(String key) {
return redisDataSourceUtil.getRedisSweetUtil().hasKey(key);
}*/
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/SmileVolunteersDetailsVo.java 0 → 100644
View file @ 71e5e1d2
package com.liquidnet.client.admin.zhengzai.smile.vo;
import com.liquidnet.service.smile.entity.SmileVolunteers;
import com.liquidnet.service.smile.entity.SmileVolunteersProject;
import com.liquidnet.service.smile.entity.SmileVolunteersTeam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
/**
* @author 志愿者活动创建修改
*/
@Data
public class SmileVolunteersDetailsVo implements Cloneable {
@ApiModelProperty(value = "用户id", example = "")
private String uid;
@ApiModelProperty(value = "活动名称", example = "")
private String projectName;
@ApiModelProperty(value = "姓名", example = "")
private String name;
@ApiModelProperty(value = "头像", example = "")
private String img;
@ApiModelProperty(value = "证件号", example = "")
private String idCard;
@ApiModelProperty(value = "性别", example = "")
private Integer sex;
@ApiModelProperty(value = "审核状态", example = "")
private Integer status;
@ApiModelProperty(value = "学校", example = "")
private String school;
@ApiModelProperty(value = "学校地址", example = "")
private String schoolAddress;
@ApiModelProperty(value = "专长", example = "")
private String specialty;
@ApiModelProperty(value = "特长", example = "")
private String specialty2;
@ApiModelProperty(value = "手机号", example = "")
private String phone;
@ApiModelProperty(value = "自我介绍", example = "")
private String introduce;
@ApiModelProperty(value = "创建时间", example = "")
private String createdAt;
@ApiModelProperty(value = "职责组集合", example = "")
private List<SmileVolunteersTeam> teamArray;
private static final SmileVolunteersDetailsVo obj = new SmileVolunteersDetailsVo();
public static SmileVolunteersDetailsVo getNew() {
try {
return (SmileVolunteersDetailsVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new SmileVolunteersDetailsVo();
}
}
public SmileVolunteersDetailsVo copy(SmileVolunteers source, List<SmileVolunteersTeam> teamList,String projectName) {
this.setUid(source.getProjectId());
this.setProjectName(projectName);
this.setName(source.getName());
this.setImg(source.getImg());
this.setIdCard(source.getIdCard());
this.setSex(source.getSex());
this.setStatus(source.getStatus());
this.setSchool(source.getSchool());
this.setSchoolAddress(source.getSchoolAddress());
this.setSpecialty(source.getSpecialty());
this.setSpecialty2(source.getSpecialty2());
this.setPhone(source.getPhone());
this.setIntroduce(source.getIntroduce());
this.setCreatedAt(source.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
this.setTeamArray(teamList);
return this;
}
}
liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileVolunteersTeam.java
View file @ 71e5e1d2
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SmileVolunteersTeam implements Serializable {
public class SmileVolunteersTeam implements Serializable,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -54,5 +54,13 @@ public class SmileVolunteersTeam implements Serializable {
*/
private LocalDateTime updatedAt;
private static final SmileVolunteersTeam obj = new SmileVolunteersTeam();
public static SmileVolunteersTeam getNew() {
try {
return (SmileVolunteersTeam) obj.clone();
} catch (CloneNotSupportedException e) {
return new SmileVolunteersTeam();
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment