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

Commit 8206e3ed authored by 胡佳晨's avatar 胡佳晨

提交 sweet 二维码 admin sweet

parent b9d3f92f
......@@ -2,6 +2,7 @@ drop table if exists sweet_qr_code;
create table sweet_qr_code
(
mid bigint unsigned auto_increment primary key,
qr_code_id varchar (64) default '' comment 'ID',
type int default 0 comment '活动type类型',
url varchar(128) default '' comment '二维码地址',
show_num int default 0 comment '展示次数',
......
......@@ -8,6 +8,7 @@ import java.io.Serializable;
@Data
public class CreateActiveQrCodeParam implements Serializable {
private String qrCodeId;
private Integer mid;
private Integer type;
@NotNull(message = "二维码地址")
......
......@@ -2,6 +2,7 @@ package com.liquidnet.service.sweet.constant;
public class SweetConstant {
public final static String SWEET = "sweet:";
public final static String REDIS_KEY_SWEET_MANUAL_PUSH_LIST = "sweet:manual:pushList";
public final static String REDIS_KEY_SWEET_MANUAL_TIME_LIST = "sweet:manual:timeList:manual:";
public final static String REDIS_KEY_SWEET_MANUAL_NOTIFY_LIST = "sweet:manual:notify:manual:";
......@@ -79,4 +80,12 @@ public class SweetConstant {
//猫登活动整体
public final static String REDIS_KEY_SWEET_WECHAT_MAODENG_POSTER_TRANSFER = "sweet:maoDeng:naneAndImg:openId:transfer";
//二维码相关
public final static String QRCODE = SWEET.concat("qrcode:");
public final static String REDIS_KEY_QRCODE_MAX_NUM = QRCODE.concat("maxNum:"); //最大 :type
public final static String REDIS_KEY_QRCODE_SHOW_NUM = QRCODE.concat("showNum:"); //展示次数 :type:mid
public final static String REDIS_KEY_QRCODE_READ_NUM = QRCODE.concat("readNum:"); //读取次数 :type:mid
public final static String REDIS_KEY_QRCODE_LIST = QRCODE.concat("list:"); //二维码实体类 :type
}
package com.liquidnet.service.sweet.service;
import com.liquidnet.service.sweet.entity.SweetActiveType;
import java.util.List;
/**
* <p>
......@@ -15,5 +12,6 @@ import java.util.List;
*/
public interface ISweetActiveTypeService {
String getRandomQrCode(int type);
}
......@@ -12,6 +12,12 @@
<input name="mid" class="form-control" th:value="*{mid}" type="text" required readonly>
</div>
</div>
<div class="form-group" style="display: none">
<label class="col-sm-3 control-label is-required">qrCodeId:</label>
<div class="col-sm-8">
<input name="qrCodeId" class="form-control" th:value="*{qrCodeId}" type="text" required readonly>
</div>
</div>
<div class="form-group" style="display: none">
<label class="col-sm-3 control-label is-required">type:</label>
<div class="col-sm-8">
......
......@@ -55,14 +55,14 @@
field: 'mid',
title: '序号'
},
{
field: 'type',
title: '类型'
},
{
field: 'activeName',
title: '活动名称'
},
{
field: 'type',
title: '类型'
},
{
field: 'alarmNum',
title: '预警个数'
......
......@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.zhengzai.sweet.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetAdminActiveTypeService;
import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils;
import com.liquidnet.service.kylin.dto.param.CreateActiveTypeParam;
import com.liquidnet.service.sweet.entity.SweetActiveType;
import com.liquidnet.service.sweet.mapper.SweetActiveTypeMapper;
......@@ -18,6 +19,8 @@ public class SweetAdminActiveTypeServiceImpl implements ISweetAdminActiveTypeSer
@Autowired
SweetActiveTypeMapper sweetActiveTypeMapper;
@Autowired
SweetRedisAdminUtils sweetRedisAdminUtils;
@Override
public List<SweetActiveType> getList(int page, int size) {
......@@ -41,6 +44,7 @@ public class SweetAdminActiveTypeServiceImpl implements ISweetAdminActiveTypeSer
bean.setAlarmNum(createActiveTypeParam.getAlarmNum());
bean.setMaxCount(createActiveTypeParam.getMaxCount());
bean.setType(createActiveTypeParam.getType());
sweetRedisAdminUtils.setQrCodMaxNum(createActiveTypeParam.getType(), createActiveTypeParam.getMaxCount());
return sweetActiveTypeMapper.insert(bean) == 1;
}
......
......@@ -3,6 +3,8 @@ package com.liquidnet.client.admin.zhengzai.sweet.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetAdminActiveTypeService;
import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetAdminQrCodeService;
import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.kylin.dto.param.CreateActiveQrCodeParam;
import com.liquidnet.service.kylin.dto.param.CreateActiveTypeParam;
import com.liquidnet.service.sweet.entity.SweetActiveType;
......@@ -22,10 +24,16 @@ public class SweetAdminQrCodeServiceImpl implements ISweetAdminQrCodeService {
@Autowired
SweetQrCodeMapper sweetQrCodeMapper;
@Autowired
SweetRedisAdminUtils sweetRedisAdminUtils;
@Override
public List<SweetQrCode> getList(String type) {
return sweetQrCodeMapper.selectList(Wrappers.lambdaQuery(SweetQrCode.class).eq(SweetQrCode::getType, type));
List<SweetQrCode> list = sweetQrCodeMapper.selectList(Wrappers.lambdaQuery(SweetQrCode.class).eq(SweetQrCode::getType, type));
for (SweetQrCode item : list) {
item.setShowNum(sweetRedisAdminUtils.getQrCodeShowNum(Integer.parseInt(type), item.getQrCodeId()));
}
return list;
}
@Override
......@@ -34,12 +42,20 @@ public class SweetAdminQrCodeServiceImpl implements ISweetAdminQrCodeService {
SweetQrCode bean = SweetQrCode.getNew();
int count = sweetQrCodeMapper.selectCount(Wrappers.lambdaQuery(SweetQrCode.class).eq(SweetQrCode::getType, createActiveTypeParam.getType()));
for (int i = 0; i < createActiveTypeParam.getCount(); i++) {
bean.setUrl(createActiveTypeParam.getUrl().concat("&swat=") + (count + i + 1));
int swat = count + i + 1;
String qrCodeId = IDGenerator.nextMilliId();
bean.setQrCodeId(qrCodeId);
bean.setUrl(createActiveTypeParam.getUrl().concat("&swat=") + swat);
bean.setReadNum(0);
bean.setShowNum(0);
bean.setType(createActiveTypeParam.getType());
sweetQrCodeMapper.insert(bean);
//初始化 展示次数 读取次数
sweetRedisAdminUtils.initQrCodeShowNum(createActiveTypeParam.getType(), qrCodeId);
sweetRedisAdminUtils.initQrCodeReadNum(createActiveTypeParam.getType(), qrCodeId);
}
//纪录实体类List
sweetRedisAdminUtils.setQrCodeDetails(createActiveTypeParam.getType(), sweetQrCodeMapper.selectList(Wrappers.lambdaQuery(SweetQrCode.class).eq(SweetQrCode::getType, createActiveTypeParam.getType())));
return true;
} catch (Exception e) {
e.printStackTrace();
......@@ -56,6 +72,7 @@ public class SweetAdminQrCodeServiceImpl implements ISweetAdminQrCodeService {
public Boolean changeInfo(CreateActiveQrCodeParam createActiveTypeParam) {
SweetQrCode bean = SweetQrCode.getNew();
bean.setReadNum(createActiveTypeParam.getReadNum());
sweetRedisAdminUtils.setQrCodeReadNum(createActiveTypeParam.getType(), createActiveTypeParam.getQrCodeId(), createActiveTypeParam.getReadNum());
return sweetQrCodeMapper.update(bean, Wrappers.lambdaUpdate(SweetQrCode.class).eq(SweetQrCode::getMid, createActiveTypeParam.getMid())) > 0;
}
}
......@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.service.sweet.constant.SweetConstant;
import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
import com.liquidnet.service.sweet.entity.SweetQrCode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
......@@ -36,6 +37,7 @@ public class SweetRedisAdminUtils {
.concat(prizeId);
redisDataSourceUtil.getRedisSweetUtil().incr(redisKey, num);
}
public void decrIntegralActivityPrizeNum(String integralActivityId, String prizeId, Integer num) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_NUM
.concat(integralActivityId)
......@@ -43,6 +45,7 @@ public class SweetRedisAdminUtils {
.concat(prizeId);
redisDataSourceUtil.getRedisSweetUtil().decr(redisKey, num);
}
public void delIntegralActivityPrizeNum(String integralActivityId, String prizeId) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_NUM
.concat(integralActivityId)
......@@ -111,4 +114,40 @@ public class SweetRedisAdminUtils {
return (int) obj;
}
}
//
public void initQrCodeReadNum(int type, String qrCodeId) {
String redisKey = SweetConstant.REDIS_KEY_QRCODE_READ_NUM.concat(type + "").concat(":qrCodeId:").concat(qrCodeId);
redisDataSourceUtil.getRedisSweetUtil().set(redisKey, 0);
}
public void setQrCodeReadNum(int type, String qrCodeId, int num) {
String redisKey = SweetConstant.REDIS_KEY_QRCODE_READ_NUM.concat(type + "").concat(":qrCodeId:").concat(qrCodeId);
redisDataSourceUtil.getRedisSweetUtil().set(redisKey, num);
}
public int getQrCodeShowNum(int type, String qrCodeId) {
String redisKey = SweetConstant.REDIS_KEY_QRCODE_SHOW_NUM.concat(type + "").concat(":qrCodeId:").concat(qrCodeId);
Object obj = redisDataSourceUtil.getRedisSweetUtil().get(redisKey);
if (obj == null) {
return 0;
} else {
return (int) obj;
}
}
public void initQrCodeShowNum(int type, String qrCodeId) {
String redisKey = SweetConstant.REDIS_KEY_QRCODE_SHOW_NUM.concat(type + "").concat(":qrCodeId:").concat(qrCodeId);
redisDataSourceUtil.getRedisSweetUtil().set(redisKey, 0);
}
public void setQrCodMaxNum(int type, int num) {
String redisKey = SweetConstant.REDIS_KEY_QRCODE_MAX_NUM.concat(type + "");
redisDataSourceUtil.getRedisSweetUtil().set(redisKey, num);
}
public void setQrCodeDetails(int type, List<SweetQrCode> data) {
String redisKey = SweetConstant.REDIS_KEY_QRCODE_LIST.concat(type + "");
redisDataSourceUtil.getRedisSweetUtil().set(redisKey, data);
}
}
......@@ -13,6 +13,7 @@ public class CollectionUtil {
private static final LinkedList<Object[]> OBJECTS_LINKED_LIST = new LinkedList<>();
private static final LinkedMultiValueMap<String, String> STRING_STRING_LINKED_MULTI_VALUE_MAP = new LinkedMultiValueMap<>();
private static final ArrayList<String> STRING_ARRAY_LIST = new ArrayList<>();
private static final ArrayList<Integer> INTEGER_ARRAY_LIST = new ArrayList<>();
private static final ArrayList<Object> OBJECT_ARRAY_LIST = new ArrayList<>();
......@@ -44,6 +45,11 @@ public class CollectionUtil {
return (ArrayList<String>) STRING_ARRAY_LIST.clone();
}
public static ArrayList<Integer> arrayListInteger() {
return (ArrayList<Integer>) INTEGER_ARRAY_LIST.clone();
}
public static ArrayList<Object> arrayListObject() {
return (ArrayList<Object>) OBJECT_ARRAY_LIST.clone();
}
......
......@@ -26,6 +26,12 @@ public class SweetQrCode implements Serializable, Cloneable {
@TableId(value = "mid", type = IdType.AUTO)
private Long mid;
/**
* Id
*/
private String qrCodeId;
/**
* 活动type类型
*/
......@@ -49,6 +55,7 @@ public class SweetQrCode implements Serializable, Cloneable {
private LocalDateTime createdAt;
private static final SweetQrCode obj = new SweetQrCode();
public static SweetQrCode getNew() {
try {
return (SweetQrCode) obj.clone();
......
package com.liquidnet.service.sweet.controller;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.sweet.service.ISweetActiveTypeService;
import com.liquidnet.service.sweet.service.ISweetAnswerService;
import com.liquidnet.service.sweet.vo.SweetAnswerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* <p>
* 答题表 前端控制器
* </p>
*
* @author jiangxiulong
* @since 2021-08-12
*/
@Api(tags = "活动-二维码")
@RestController
@RequestMapping("/active")
public class SweetQrCodeController {
@Autowired
private ISweetActiveTypeService sweetActiveTypeService;
@GetMapping("qrCode/type")
@ApiOperation("获取答题记录详情")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", dataType = "int", name = "type", value = "活动type", required = true)
})
public ResponseDto<String> getRandomQrCode(int type) {
return ResponseDto.success(sweetActiveTypeService.getRandomQrCode(type));
}
}
package com.liquidnet.service.sweet.service.impl;
import com.liquidnet.commons.lang.util.RandomUtil;
import com.liquidnet.service.sweet.entity.SweetQrCode;
import com.liquidnet.service.sweet.service.ISweetActiveTypeService;
import com.liquidnet.service.sweet.utils.RedisDataUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class SweetActiveQrCodeServiceImpl implements ISweetActiveTypeService {
@Autowired
private RedisDataUtils redisDataUtils;
@Override
public String getRandomQrCode(int type) {
List<SweetQrCode> sweetQrCodeList = redisDataUtils.getQrCodeTypeNum(type);//SweetQrCodeList
SweetQrCode bean = judgeRandom(type, sweetQrCodeList);
redisDataUtils.incrQrCodeShowNum(type, bean.getQrCodeId());//访问数量
return bean.getUrl();
}
//获取 可使用的随机数
private SweetQrCode judgeRandom(int type, List<SweetQrCode> sweetQrCodeList) {
int randomSwat = RandomUtil.getRandomInt(0, sweetQrCodeList.size());//随机到第几个
int showNum = redisDataUtils.getQrCodeShowNum(type, sweetQrCodeList.get(randomSwat).getQrCodeId());//访问数量
int maxNum = redisDataUtils.getQrCodeMaxNum(type);
if (showNum >= maxNum) {//超过阈值
sweetQrCodeList.remove(randomSwat);
return judgeRandom(type, sweetQrCodeList);
} else {
redisDataUtils.setQrCodeDetails(type, sweetQrCodeList);
return sweetQrCodeList.get(randomSwat);
}
}
}
package com.liquidnet.service.sweet.service.impl;
import com.liquidnet.service.sweet.entity.SweetActiveType;
import com.liquidnet.service.sweet.mapper.SweetActiveTypeMapper;
import com.liquidnet.service.sweet.service.ISweetActiveTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 活动type表 服务实现类
* </p>
*
* @author hujiachen
* @since 2021-12-23
*/
@Service
public class SweetActiveTypeServiceImpl implements ISweetActiveTypeService {
}
......@@ -558,6 +558,7 @@ public class RedisDataUtils {
return collect;
}
}
public void setIntegralActivityDrawAll(String integralActivityId, List<SweetIntegralActivityDraw> sweetIntegralActivityDraws) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_ALL_LIST
.concat(integralActivityId);
......@@ -576,6 +577,7 @@ public class RedisDataUtils {
return (LinkedList<IntegralActivityDrawVo>) obj;
}
}
public void setIntegralActivityDrawList(String uid, String integralActivityId, List<IntegralActivityDrawVo> integralActivityDrawVos) {
List<IntegralActivityDrawVo> myList = integralActivityDrawVos.stream().collect(Collectors.toCollection(LinkedList::new));
String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER
......@@ -584,6 +586,7 @@ public class RedisDataUtils {
.concat(uid);
redisUtil.set(redisKey, myList);
}
public void delIntegralActivityDrawList(String uid, String integralActivityId) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER
.concat(integralActivityId)
......@@ -671,6 +674,7 @@ public class RedisDataUtils {
String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_BLACK;
redisUtil.set(redisKey, uidS);
}
public List<String> getIntegralActivityDrawBlack() {
String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_BLACK;
Object obj = redisUtil.get(redisKey);
......@@ -680,10 +684,12 @@ public class RedisDataUtils {
return (List<String>) obj;
}
}
public void setIntegralActivityDrawWhite(List<String> uidS) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_WHITE;
redisUtil.set(redisKey, uidS);
}
public List<String> getIntegralActivityDrawWhite() {
String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_WHITE;
Object obj = redisUtil.get(redisKey);
......@@ -782,4 +788,45 @@ public class RedisDataUtils {
.concat(integralActivityId);
redisUtil.decr(redisKey, num);
}
public List<SweetQrCode> getQrCodeTypeNum(int type) {
String redisKey = SweetConstant.REDIS_KEY_QRCODE_LIST.concat(type + "");
Object obj = redisUtil.get(redisKey);
if (obj == null) {
return new ArrayList<>();
} else {
return (List<SweetQrCode>) obj;
}
}
public void setQrCodeDetails(int type, List<SweetQrCode> data) {
String redisKey = SweetConstant.REDIS_KEY_QRCODE_LIST.concat(type + "");
redisUtil.set(redisKey, data);
}
public int getQrCodeShowNum(int type, String qrCodeId) {
String redisKey = SweetConstant.REDIS_KEY_QRCODE_SHOW_NUM.concat(type + "").concat(":qrCodeId:").concat(qrCodeId);
Object obj = redisUtil.get(redisKey);
if (obj == null) {
return 0;
} else {
return (int) obj;
}
}
public void incrQrCodeShowNum(int type, String qrCodeId) {
String redisKey = SweetConstant.REDIS_KEY_QRCODE_SHOW_NUM.concat(type + "").concat(":qrCodeId:").concat(qrCodeId);
redisUtil.incr(redisKey, 1);
}
public int getQrCodeMaxNum(int type) {
String redisKey = SweetConstant.REDIS_KEY_QRCODE_MAX_NUM.concat(type + "");
Object obj = redisUtil.get(redisKey);
if (obj == null) {
return 0;
} else {
return (int) obj;
}
}
}
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