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

Skip to content

L
liquidnet-bus-v1
Commit 8ec49361 authored by anjiabin's avatar anjiabin
Browse files
Options

redis多数据源

parent c0bb7280
Expand all Show whitespace changes
Inline Side-by-side
Showing with 134 additions and 135 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberCodeAdminController.java
View file @ 8ec49361
......@@ -41,7 +41,7 @@ public class AdamMemberCodeAdminController extends BaseController {
IAdamMemberPriceAdminService adamMemberPriceAdminService;
@Autowired
RedisUtil redisUtil;
RedisDataSourceUtil redisDataSourceUtil;
@GetMapping("mgt")
public String viewCodeMgt(@RequestParam String memberId, ModelMap mmap) {
......@@ -172,9 +172,9 @@ public class AdamMemberCodeAdminController extends BaseController {
// ArrayList<String> updateCodeList = CollectionUtil.arrayListString();
// optParam.getCodes().forEach(r -> {
// String key = AdamRedisConst.INFO_MEMBER_CODE.concat(r);
// AdamMemberCodeVo vo = (AdamMemberCodeVo) redisUtil.get(key);
// AdamMemberCodeVo vo = (AdamMemberCodeVo) redisDataSourceUtil.getRedisKylinUtil().get(key);
// if (null != vo && vo.getState() == beforeState) {
// redisUtil.del(key);
// redisDataSourceUtil.getRedisKylinUtil().del(key);
//
// updateCodeList.add(vo.getCode());
// }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamUserMemberAdminController.java
View file @ 8ec49361
......@@ -29,14 +29,14 @@ import java.util.List;
@RequestMapping("adam/umember")
public class AdamUserMemberAdminController {
@Autowired
RedisUtil redisUtil;
RedisDataSourceUtil redisDataSourceUtil;
@Log(title = "会员管理:会员黑名单:列表", businessType = BusinessType.LIST)
@RequiresPermissions("adam:umember:blk:lis")
@ApiOperation(value = "列表")
@PostMapping("blk/lis")
public ResponseDto<List<String>> listBlack() {
return ResponseDto.success((List<String>) redisUtil.get(AdamRedisConst.BLK_LIST_MEMBER_UID));
return ResponseDto.success((List<String>) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.BLK_LIST_MEMBER_UID));
}
@Log(title = "会员管理:会员黑名单:添加", businessType = BusinessType.INSERT)
......@@ -53,14 +53,14 @@ public class AdamUserMemberAdminController {
invalidList.add(uid);
}
}
List<String> blacklist = (List<String>) redisUtil.get(AdamRedisConst.BLK_LIST_MEMBER_UID);
List<String> blacklist = (List<String>) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.BLK_LIST_MEMBER_UID);
if (CollectionUtils.isEmpty(blacklist)) {
blacklist = existList;
} else {
blacklist.addAll(existList);
}
if (!CollectionUtils.isEmpty(blacklist)) {
redisUtil.set(AdamRedisConst.BLK_LIST_MEMBER_UID, blacklist);
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.BLK_LIST_MEMBER_UID, blacklist);
} else {
log.warn("###blacklist.add:failed,invalidList:{},existList:{},opts:{}", invalidList.size(), existList.size(), opts);
}
......@@ -73,12 +73,12 @@ public class AdamUserMemberAdminController {
@PostMapping("blk/del")
public ResponseDto<List<String>> delBlack(@NotBlank(message = "会员ID不能为空") @RequestParam String opts) {
String[] uidArr = opts.split(",");
List<String> blacklist = (List<String>) redisUtil.get(AdamRedisConst.BLK_LIST_MEMBER_UID);
List<String> blacklist = (List<String>) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.BLK_LIST_MEMBER_UID);
if (!CollectionUtils.isEmpty(blacklist)) {
for (String uid : uidArr) {
blacklist.remove(uid);
}
redisUtil.set(AdamRedisConst.BLK_LIST_MEMBER_UID, blacklist);
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.BLK_LIST_MEMBER_UID, blacklist);
}
return ResponseDto.success(blacklist);
}
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyCouponCodeAdminController.java
View file @ 8ec49361
......@@ -41,7 +41,7 @@ public class CandyCouponCodeAdminController extends BaseController {
private String prefix = "zhengzai/candy/coupon/code";
@Autowired
private RedisUtil redisUtil;
private RedisDataSourceUtil redisDataSourceUtil;
@Autowired
private ICandyCouponCodeAdminService candyCouponCodeAdminService;
@Autowired
......@@ -117,10 +117,10 @@ public class CandyCouponCodeAdminController extends BaseController {
List<String> ccodeUpdateList = CollectionUtil.arrayListString();
list.forEach(r -> {
String key = CandyRedisConst.BASIC_COUPON_CODE.concat(r.getCcode());
CandyCouponCodeDto dto = (CandyCouponCodeDto) redisUtil.get(key);
CandyCouponCodeDto dto = (CandyCouponCodeDto) redisDataSourceUtil.getRedisKylinUtil().get(key);
if (null != dto && dto.getState() == 0) {
dto.setState(4);
redisUtil.set(key, dto);
redisDataSourceUtil.getRedisKylinUtil().set(key, dto);
ccodeUpdateList.add(dto.getCcode());
}
});
......@@ -160,7 +160,7 @@ public class CandyCouponCodeAdminController extends BaseController {
List<String> ccodeUpdateList = CollectionUtil.arrayListString();
list.forEach(r -> {
String uckey = CandyRedisConst.BASIC_USER_COUPON.concat(r.getRedeemUid());
List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisUtil.get(uckey);
List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(uckey);
if (!CollectionUtils.isEmpty(vos)) {
vos.removeIf(rv -> rv.getUcouponId().equals(r.getUcouponId()));
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberCodeAdminServiceImpl.java
View file @ 8ec49361
......@@ -27,7 +27,7 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
@Autowired
AdamMemberCodeMapper memberCodeMapper;
@Autowired
RedisUtil redisUtil;
RedisDataSourceUtil redisDataSourceUtil;
@Override
public boolean createGiftCode(AdamMemberCodeGenParam param) {
......@@ -41,7 +41,7 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
do {
mCode = MemberUtil.freeCode();
String key = AdamRedisConst.INFO_MEMBER_CODE.concat(mCode);
exists = redisUtil.hasKey(key);
exists = redisDataSourceUtil.getRedisKylinUtil().hasKey(key);
} while (exists);
AdamMemberCode initMemberCode = new AdamMemberCode();
......@@ -60,7 +60,7 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
memberCodeList.add(initMemberCode);
codeList.add(mCode);
//redisUtil.set(AdamRedisConst.INFO_MEMBER_CODE.concat(mCode), AdamMemberCodeVo.getNew().copy(initMemberCode));
//redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_CODE.concat(mCode), AdamMemberCodeVo.getNew().copy(initMemberCode));
}
if (this.saveBatch(memberCodeList, memberCodeList.size())) {
......@@ -71,7 +71,7 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
list.forEach(r -> {
r.setMemberNo(getNextMemberNo(param.getMemberId()));
redisUtil.set(AdamRedisConst.INFO_MEMBER_CODE.concat(r.getCode()), AdamMemberCodeVo.getNew().copy(r));
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_CODE.concat(r.getCode()), AdamMemberCodeVo.getNew().copy(r));
});
this.updateBatchById(list, list.size());
return true;
......@@ -115,15 +115,15 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
}
private int getMaxMemberNo() {
Object o = redisUtil.get(AdamRedisConst.INCR_MEMBER_NO);
Object o = redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.INCR_MEMBER_NO);
return null == o ? -1 : (int) o;
}
public boolean setMaxMemberNo(int val) {
return redisUtil.set(AdamRedisConst.INCR_MEMBER_NO, val);
return redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INCR_MEMBER_NO, val);
}
public int incrMemberNo() {
return (int) redisUtil.incr(AdamRedisConst.INCR_MEMBER_NO, 1);
return (int) redisDataSourceUtil.getRedisKylinUtil().incr(AdamRedisConst.INCR_MEMBER_NO, 1);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java
View file @ 8ec49361
......@@ -64,7 +64,7 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
private AdamMemberRefundMapper adamMemberRefundMapper;
@Autowired
private RedisUtil redisUtil;
private RedisDataSourceUtil redisDataSourceUtil;
@Value("${liquidnet.url-refund.apply}")
private String applyUrl;
......@@ -175,7 +175,7 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
adamMemberOrderMapper.updateById(updateInfoMemberOrder);
String moKey = AdamRedisConst.INFO_MEMBER_ORDER + memberOrder.getUid();
ArrayList<AdamMemberOrderVo> vos = (ArrayList<AdamMemberOrderVo>) redisUtil.get(moKey);
ArrayList<AdamMemberOrderVo> vos = (ArrayList<AdamMemberOrderVo>) redisDataSourceUtil.getRedisKylinUtil().get(moKey);
int idx = IntStream.range(0, vos.size())
.filter(i -> vos.get(i).getOrderNo().equals(memberOrder.getOrderNo()))
.findFirst().orElse(-1);
......@@ -183,7 +183,7 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
vo.setState(4);
vo.setUpdatedAt(now);
vos.set(idx, vo);
redisUtil.set(moKey, vos);
redisDataSourceUtil.getRedisKylinUtil().set(moKey, vos);
if (memberRefund.getRenewable() == 2) {// 拉黑用户，直接更新用户会员状态信息
AdamUserMember updateUserMember = new AdamUserMember();
......@@ -197,20 +197,20 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
adamUserMemberMapper.update(updateUserMember, userMemberLambdaUpdateWrapper);
String umkey = AdamRedisConst.INFO_USER_MEMBER + memberOrder.getUid();
AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisUtil.get(umkey);
AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisDataSourceUtil.getRedisKylinUtil().get(umkey);
userMemberVo.setState(2);
userMemberVo.setExpiryAt(now);
userMemberVo.setUpdatedAt(now);
redisUtil.set(umkey, userMemberVo);
redisDataSourceUtil.getRedisKylinUtil().set(umkey, userMemberVo);
List<String> uidBlackList = (List<String>) redisUtil.get(AdamRedisConst.BLK_LIST_MEMBER_UID);
List<String> uidBlackList = (List<String>) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.BLK_LIST_MEMBER_UID);
if (CollectionUtils.isEmpty(uidBlackList)) {
uidBlackList = CollectionUtil.arrayListString();
}
uidBlackList.add(memberOrder.getUid());
redisUtil.set(AdamRedisConst.BLK_LIST_MEMBER_UID, uidBlackList);
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.BLK_LIST_MEMBER_UID, uidBlackList);
}
return AjaxResult.success();
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberPriceAdminServiceImpl.java
View file @ 8ec49361
......@@ -31,7 +31,7 @@ public class AdamMemberPriceAdminServiceImpl extends ServiceImpl<AdamMemberPrice
@Autowired
private AdamMemberMapper adamMemberMapper;
@Autowired
private RedisUtil redisUtil;
private RedisDataSourceUtil redisDataSourceUtil;
// public AdamMemberPriceVo add(AdamMemberPrice info) {
// List<AdamMemberPrice> existList = adamMemberPriceMapper.selectList(
......@@ -43,7 +43,7 @@ public class AdamMemberPriceAdminServiceImpl extends ServiceImpl<AdamMemberPrice
//
// AdamMemberPriceVo vo = AdamMemberPriceVo.getNew().copy(info);
//
// redisUtil.set(AdamRedisConst.INFO_MEMBER_PRICE.concat(vo.getMemberPriceId()), vo);
// redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_PRICE.concat(vo.getMemberPriceId()), vo);
//
// return vo;
// }
......@@ -98,11 +98,11 @@ public class AdamMemberPriceAdminServiceImpl extends ServiceImpl<AdamMemberPrice
String memberPriceId = saveOrUpdateInfo.getMemberPriceId();
String mpKey = AdamRedisConst.INFO_MEMBER_PRICE.concat(memberId);
List<AdamMemberPriceVo> vos = (List<AdamMemberPriceVo>) redisUtil.get(mpKey);
List<AdamMemberPriceVo> vos = (List<AdamMemberPriceVo>) redisDataSourceUtil.getRedisKylinUtil().get(mpKey);
vos.removeIf(r -> (r.getMemberId().equals(memberId) && r.getMemberPriceId().equals(memberPriceId)));
vos.add(AdamMemberPriceVo.getNew().copy(saveOrUpdateInfo));
redisUtil.set(mpKey, vos);
redisDataSourceUtil.getRedisKylinUtil().set(mpKey, vos);
return true;
}
throw new LiquidnetServiceException("-1", "会员价格编辑失败");
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberRightsAdminServiceImpl.java
View file @ 8ec49361
......@@ -27,7 +27,7 @@ public class AdamMemberRightsAdminServiceImpl extends ServiceImpl<AdamMemberRigh
@Autowired
private AdamMemberRightsMapper adamMemberRightsMapper;
@Autowired
private RedisUtil redisUtil;
private RedisDataSourceUtil redisDataSourceUtil;
@Override
public boolean edit(AdamMemberRightsBuildParam param) {
......@@ -75,7 +75,7 @@ public class AdamMemberRightsAdminServiceImpl extends ServiceImpl<AdamMemberRigh
if (saveOrUpadateRst) {
// 同步REDIS:用户端:购买会员详情页:权益列表
List<AdamMemberRightsVo> vos = (List<AdamMemberRightsVo>) redisUtil.get(AdamRedisConst.INFO_MEMBER_RIGHTS.concat(param.getMemberId()));
List<AdamMemberRightsVo> vos = (List<AdamMemberRightsVo>) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.INFO_MEMBER_RIGHTS.concat(param.getMemberId()));
if (CollectionUtils.isEmpty(vos)) {
vos = new ArrayList<>();
}
......@@ -105,7 +105,7 @@ public class AdamMemberRightsAdminServiceImpl extends ServiceImpl<AdamMemberRigh
}
}
}
redisUtil.set(AdamRedisConst.INFO_MEMBER_RIGHTS.concat(param.getMemberId()), vos);
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_RIGHTS.concat(param.getMemberId()), vos);
}
return saveOrUpadateRst;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberServiceAdminImpl.java
View file @ 8ec49361
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberAdminService;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.dto.admin.AdamMemberBuildParam;
......@@ -18,7 +18,6 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
@Slf4j
......@@ -27,7 +26,7 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
@Autowired
AdamMemberMapper adamMemberMapper;
@Autowired
RedisUtil redisUtil;
RedisDataSourceUtil redisDataSourceUtil;
@Override
public void add(AdamMemberBuildParam parameter) {
......@@ -45,7 +44,7 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
AdamMemberVo vo = AdamMemberVo.getNew().copy(adamMember);
adamMemberMapper.insert(adamMember);
redisUtil.set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(vo.getMemberId()), vo);
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(vo.getMemberId()), vo);
}
@Override
......@@ -64,8 +63,8 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
adamMember = adamMemberMapper.selectOne(updateMemberWrapper);
AdamMemberVo vo = AdamMemberVo.getNew().copy(adamMember);
redisUtil.set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(vo.getMemberId()), vo);
redisUtil.del(AdamRedisConst.INFO_MEMBER_SIMPLE);
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(vo.getMemberId()), vo);
redisDataSourceUtil.getRedisKylinUtil().del(AdamRedisConst.INFO_MEMBER_SIMPLE);
return true;
}
return false;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/AdminUpushServiceImpl.java
View file @ 8ec49361
......@@ -65,7 +65,7 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
MongoTemplate mongoTemplate;
@Autowired
RedisUtil redisUtil;
RedisDataSourceUtil redisDataSourceUtil;
public Boolean create(UpushParam upushParam) {
try {
......@@ -94,12 +94,12 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
LinkedList<AdminUpushVo> pushList = new LinkedList<>();
LinkedList<AdminUpushVo> pushList2 = new LinkedList<>();
if (upushParam.getPushRange() == 1) { // all
pushList = (LinkedList<AdminUpushVo>) redisUtil.get(redisKeyIos);
pushList2 = (LinkedList<AdminUpushVo>) redisUtil.get(redisKeyAndroid);
pushList = (LinkedList<AdminUpushVo>) redisDataSourceUtil.getRedisKylinUtil().get(redisKeyIos);
pushList2 = (LinkedList<AdminUpushVo>) redisDataSourceUtil.getRedisKylinUtil().get(redisKeyAndroid);
} else if (upushParam.getPushRange() == 2) { // ios
pushList = (LinkedList<AdminUpushVo>) redisUtil.get(redisKeyIos);
pushList = (LinkedList<AdminUpushVo>) redisDataSourceUtil.getRedisKylinUtil().get(redisKeyIos);
} else if(upushParam.getPushRange() == 3) { // android
pushList = (LinkedList<AdminUpushVo>) redisUtil.get(redisKeyAndroid);
pushList = (LinkedList<AdminUpushVo>) redisDataSourceUtil.getRedisKylinUtil().get(redisKeyAndroid);
}
if (null == pushList) {
......@@ -130,12 +130,12 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
pushList.addFirst(adminUpushVo);
}
if (upushParam.getPushRange() == 1) { // all
redisUtil.set(redisKeyIos, pushList);
redisUtil.set(redisKeyAndroid, pushList2);
redisDataSourceUtil.getRedisKylinUtil().set(redisKeyIos, pushList);
redisDataSourceUtil.getRedisKylinUtil().set(redisKeyAndroid, pushList2);
} else if (upushParam.getPushRange() == 2) { // ios
redisUtil.set(redisKeyIos, pushList);
redisDataSourceUtil.getRedisKylinUtil().set(redisKeyIos, pushList);
} else if(upushParam.getPushRange() == 3) { // android
redisUtil.set(redisKeyAndroid, pushList);
redisDataSourceUtil.getRedisKylinUtil().set(redisKeyAndroid, pushList);
}
// 推送
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java
View file @ 8ec49361
......@@ -45,7 +45,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
private CandyCouponMapper candyCouponMapper;
@Autowired
private RedisUtil redisUtil;
private RedisDataSourceUtil redisDataSourceUtil;
@Autowired
private ICandyCouponAdminService candyCouponAdminService;
......@@ -371,7 +371,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
List<AdamMemberRightsCouponRuleVo> memberRightsCouponRuleVoList = this.copyFromCandyCouponRule(initCouponRuleList);
List<AdamMemberRightsCouponVo> memberRightsCouponVoList =
(List<AdamMemberRightsCouponVo>) redisUtil.get(AdamRedisConst.INFO_MEMBER_RIGHTS_COUPON.concat(updateMgtCoupon.getMcouponId()));
(List<AdamMemberRightsCouponVo>) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.INFO_MEMBER_RIGHTS_COUPON.concat(updateMgtCoupon.getMcouponId()));
if (editing) {// 编辑操作
memberRightsCouponVoList.removeIf(r -> r.getCouponId().equals(updateCoupon.getCouponId()));
} else {// 新增操作
......@@ -400,6 +400,6 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
}
}
redisUtil.set(AdamRedisConst.INFO_MEMBER_RIGHTS_COUPON.concat(updateMgtCoupon.getMcouponId()), memberRightsCouponVoList);
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_RIGHTS_COUPON.concat(updateMgtCoupon.getMcouponId()), memberRightsCouponVoList);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinBannersServiceImpl.java
View file @ 8ec49361
......@@ -55,7 +55,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
MongoTemplate mongoTemplate;
@Autowired
RedisUtil redisUtil;
RedisDataSourceUtil redisDataSourceUtil;
public boolean create(BannersParam bannersParam) {
try {
......@@ -123,7 +123,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
banner.setPositionList(pListStr);
banner.setProvincesList(proListStr);
}
redisUtil.set(KylinRedisConst.ADMIN_BANNER_LIST, bannerList);
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ADMIN_BANNER_LIST, bannerList);
}
public boolean update(BannersParam bannersParam) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinDamaiServiceImpl.java
View file @ 8ec49361
......@@ -59,7 +59,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
@Autowired
private KylinTicketStatusMapper ticketStatusMapper;
@Autowired
private RedisUtil redisUtil;
private RedisDataSourceUtil redisDataSourceUtil;
@Override
public Boolean sycPerformance(String performanceId) {
......@@ -81,7 +81,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
} else if (performanceData.getCityId().equals(3833)) {
obj1.setCityId(520100L);
} else {//520100
obj1.setCityId(Long.parseLong(redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelationData.getFieldId(), "ad_code").toString()));
obj1.setCityId(Long.parseLong(redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelationData.getFieldId(), "ad_code").toString()));
}
obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
obj1.setSystemId(taobaoTicketUtils.getSystemId());
......@@ -133,9 +133,9 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
// } else {
// return 0L;
// }
obj1.setVenueId(Long.parseLong(redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + fieldId, "id").toString()));
obj1.setVenueName(redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + fieldId, "name").toString());
obj1.setVenueAddress(redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + fieldId, "address").toString());
obj1.setVenueId(Long.parseLong(redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + fieldId, "id").toString()));
obj1.setVenueName(redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + fieldId, "name").toString());
obj1.setVenueAddress(redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + fieldId, "address").toString());
req.setPushVenueParam(obj1);
AlibabaDamaiMevOpenPushvenueResponse rsp = client.execute(req);
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundExecuteServiceImpl.java
View file @ 8ec49361
......@@ -44,7 +44,7 @@ public class KylinRefundExecuteServiceImpl {
private KylinOrderRefundBatchesMapper kylinOrderRefundBatchesMapper;
@Autowired
RedisUtil redisUtil;
RedisDataSourceUtil redisDataSourceUtil;
@Autowired
private KylinOrderRefundsServiceImpl kylinOrderRefundsServiceImpl;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundPerformancesAdminServiceImpl.java
View file @ 8ec49361
......@@ -63,7 +63,7 @@ public class KylinRefundPerformancesAdminServiceImpl {
private KylinRefundExecuteServiceImpl kylinRefundExecuteServiceImpl;
@Autowired
RedisUtil redisUtil;
RedisDataSourceUtil redisDataSourceUtil;
public ResponseDto refundBatchApply(RefundBatchApplyParam refundBatchApplyParam) {
String targetId = refundBatchApplyParam.getTargetId();
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinZhengzaiAppVersionsServiceImpl.java
View file @ 8ec49361
......@@ -44,7 +44,7 @@ public class KylinZhengzaiAppVersionsServiceImpl extends ServiceImpl<KylinBanner
private KylinZhengzaiAppVersionsMapper kylinZhengzaiAppVersionsMapper;
@Autowired
RedisUtil redisUtil;
RedisDataSourceUtil redisDataSourceUtil;
public boolean create(ZhengzaiAppVersionsParam zhengzaiAppVersionsParam) {
try {
......@@ -127,18 +127,18 @@ public class KylinZhengzaiAppVersionsServiceImpl extends ServiceImpl<KylinBanner
ZhengzaiAppVersionsListDao infoIos = kylinZhengzaiAppVersionsMapper.getLastInfo(1);
ZhengzaiAppVersionsListDao infoAndroid = kylinZhengzaiAppVersionsMapper.getLastInfo(2);
ZhengzaiAppVersionsVo zhengzaiAppVersionsVo = new ZhengzaiAppVersionsVo();
redisUtil.del(KylinRedisConst.ZHENGZAI_APP_VERSIONS_IOS);
redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.ZHENGZAI_APP_VERSIONS_IOS);
if (null != infoIos) {
BeanUtils.copyProperties(infoIos, zhengzaiAppVersionsVo);
redisUtil.set(KylinRedisConst.ZHENGZAI_APP_VERSIONS_IOS, zhengzaiAppVersionsVo);
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ZHENGZAI_APP_VERSIONS_IOS, zhengzaiAppVersionsVo);
}
redisUtil.del(KylinRedisConst.ZHENGZAI_APP_VERSIONS_ANDROID);
redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.ZHENGZAI_APP_VERSIONS_ANDROID);
if (null != infoAndroid) {
String newPath = appUrl + infoAndroid.getFilePath();
infoAndroid.setFilePath(newPath);
BeanUtils.copyProperties(infoAndroid, zhengzaiAppVersionsVo);
redisUtil.set(KylinRedisConst.ZHENGZAI_APP_VERSIONS_ANDROID, zhengzaiAppVersionsVo);
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ZHENGZAI_APP_VERSIONS_ANDROID, zhengzaiAppVersionsVo);
}
return true;
......@@ -148,18 +148,18 @@ public class KylinZhengzaiAppVersionsServiceImpl extends ServiceImpl<KylinBanner
ZhengzaiAppVersionsListDao infoIos = kylinZhengzaiAppVersionsMapper.getLastInfoCheck(1);
ZhengzaiAppVersionsListDao infoAndroid = kylinZhengzaiAppVersionsMapper.getLastInfoCheck(2);
ZhengzaiAppVersionsVo zhengzaiAppVersionsVo = new ZhengzaiAppVersionsVo();
redisUtil.del(KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_IOS);
redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_IOS);
if (null != infoIos) {
BeanUtils.copyProperties(infoIos, zhengzaiAppVersionsVo);
redisUtil.set(KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_IOS, zhengzaiAppVersionsVo);
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_IOS, zhengzaiAppVersionsVo);
}
redisUtil.del(KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_ANDROID);
redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_ANDROID);
if (null != infoAndroid) {
String newPath = appUrl + infoAndroid.getFilePath();
infoAndroid.setFilePath(newPath);
BeanUtils.copyProperties(infoAndroid, zhengzaiAppVersionsVo);
redisUtil.set(KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_ANDROID, zhengzaiAppVersionsVo);
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ZHENGZAI_APP_VERSIONS_CHECK_ANDROID, zhengzaiAppVersionsVo);
}
return true;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java
View file @ 8ec49361
......@@ -39,7 +39,7 @@ public class MongoVoUtils {
@Autowired
private KylinTicketRelationsMapper ticketRelationsMapper;
@Autowired
private RedisUtil redisUtil;
private RedisDataSourceUtil redisDataSourceUtil;
@Autowired
private DataUtils dataUtils;
......@@ -53,12 +53,12 @@ public class MongoVoUtils {
KylinPerformanceRelations p3 = performanceRelationsMapper.selectOne(new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performancesId));
//场地相关数据
KylinFields fields = new KylinFields();
String cityName = (String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name");
String cityName = (String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name");
fields.setCityId(null);
fields.setLatitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "latitude"));
fields.setLongitude((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "longitude"));
fields.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name"));
fields.setName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "name"));
fields.setLatitude((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "latitude"));
fields.setLongitude((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "longitude"));
fields.setCityName((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name"));
fields.setName((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "name"));
//相关状态时间初始变量
LocalDateTime stopSellTime = null;
......@@ -93,7 +93,7 @@ public class MongoVoUtils {
ticketList.add(kylinTicketVo);
//票种 库存redis
// if (!redisUtil.hasKey(KylinRedisConst.PERFORMANCES_INVENTORY + kylinTicketVo.getTicketsId() + ":" + KylinRedisConst.SURPLUS_GENERAL)) {
// if (!redisDataSourceUtil.getRedisKylinUtil().hasKey(KylinRedisConst.PERFORMANCES_INVENTORY + kylinTicketVo.getTicketsId() + ":" + KylinRedisConst.SURPLUS_GENERAL)) {
// dataUtils.setSurplusGeneral(kylinTicketVo.getTicketsId(), t2.getTotalGeneral());
// dataUtils.setSurplusExchange(kylinTicketVo.getTicketsId(), t2.getSurplusExchange());
// }
......@@ -168,13 +168,13 @@ public class MongoVoUtils {
KylinOrderTicketVo data;
if (dataSingle == null) {
data = (KylinOrderTicketVo) dataUtils.getOrderTicketVo(orderId);
// data = (KylinOrderTicketVo) redisUtil.get(KylinRedisConst.ORDER + orderId);
// data = (KylinOrderTicketVo) redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ORDER + orderId);
} else {
data = dataSingle;
}
BeanUtils.copyProperties(data, voItem);
List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) dataUtils.getOrderList(userId);
// List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
// List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ORDER_LIST + userId);
if (type == 1) {
redisVo.add(voItem);
if (redisData.size() > 0) {
......@@ -201,7 +201,7 @@ public class MongoVoUtils {
if (redisVo.size() == 0) {
vo.add(voItem);
}
redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ORDER_LIST + userId, vo);
return true;
case 2:
for (int i = 0; i < redisVo.size(); i++) {
......@@ -214,7 +214,7 @@ public class MongoVoUtils {
vo.add(redisVo.get(i));
}
}
redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ORDER_LIST + userId, vo);
return true;
default:
return false;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @ 8ec49361
......@@ -53,7 +53,7 @@ public class PerformanceVoUtils {
@Autowired
private MongoVoUtils mongoVoUtils;
@Autowired
private RedisUtil redisUtil;
private RedisDataSourceUtil redisDataSourceUtil;
@Autowired
private KylinPerformancesMapper performancesMapper;
......@@ -250,8 +250,8 @@ public class PerformanceVoUtils {
BeanUtils.copyProperties(performanceUpdateMisVo, performanceRelations);
performances.setDetails(performanceUpdateMisVo.getDetails());
performances.setCityName((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_name"));
performances.setCityId(Integer.parseInt((String) redisUtil.getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_id")));
performances.setCityName((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_name"));
performances.setCityId(Integer.parseInt((String) redisDataSourceUtil.getRedisKylinUtil().getDB15RedisHGet(KylinRedisConst.FIELDS + ":" + performanceRelations.getFieldId(), "city_id")));
performances.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getCreatedAt())));
performances.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getTimeStart())));
performances.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getTimeEnd())));
......
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