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

Commit 23dedf23 authored by Tice's avatar Tice

申请添加 mongo

parent 6676ce6e
...@@ -23,10 +23,10 @@ public class MerchantFieldApplyParam implements java.io.Serializable { ...@@ -23,10 +23,10 @@ public class MerchantFieldApplyParam implements java.io.Serializable {
@NotBlank(message = "名称不能为空") @NotBlank(message = "名称不能为空")
private String name; private String name;
@ApiModelProperty(position = 12, required = true, value = "logo图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png") @ApiModelProperty(position = 12, required = true, value = "logo图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
@NotNull(message = "logo图不能为空") @NotBlank(message = "logo图不能为空")
private String logo; private String logo;
@ApiModelProperty(position = 13, required = true, value = "背景图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png") @ApiModelProperty(position = 13, required = true, value = "背景图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
@NotNull(message = "背景图不能为空") @NotBlank(message = "背景图不能为空")
private String background; private String background;
@ApiModelProperty(position = 14, required = true, value = "介绍[1000]", example = "这是一段介绍文字") @ApiModelProperty(position = 14, required = true, value = "介绍[1000]", example = "这是一段介绍文字")
private String description; private String description;
...@@ -35,28 +35,38 @@ public class MerchantFieldApplyParam implements java.io.Serializable { ...@@ -35,28 +35,38 @@ public class MerchantFieldApplyParam implements java.io.Serializable {
private String builtDate; private String builtDate;
@ApiModelProperty(position = 16, required = true, value = "省id") @ApiModelProperty(position = 16, required = true, value = "省id")
@NotNull(message = "省id不能为null")
private String provinceId; private String provinceId;
@ApiModelProperty(position = 17, required = true, value = "省名称") @ApiModelProperty(position = 17, required = true, value = "省名称")
@NotNull(message = "省名称不能为null")
private String provinceName; private String provinceName;
@ApiModelProperty(position = 18, required = true, value = "城市id") @ApiModelProperty(position = 18, required = true, value = "城市id")
@NotNull(message = "城市id不能为null")
private String cityId; private String cityId;
@ApiModelProperty(position = 19, required = true, value = "城市名称") @ApiModelProperty(position = 19, required = true, value = "城市名称")
@NotNull(message = "城市名称不能为null")
private String cityName; private String cityName;
@ApiModelProperty(position = 20, required = true, value = "县id") @ApiModelProperty(position = 20, required = true, value = "县id")
@NotNull(message = "县id不能为null")
private String districtId; private String districtId;
@ApiModelProperty(position = 21, required = true, value = "县名称") @ApiModelProperty(position = 21, required = true, value = "县名称")
@NotNull(message = "县名称不能为null")
private String districtName; private String districtName;
@ApiModelProperty(position = 22, required = true, value = "详细地址[100]", example = "广渠路1号创1958园区") @ApiModelProperty(position = 22, required = true, value = "详细地址[100]", example = "广渠路1号创1958园区")
@Size(max = 100, message = "已超出详细地址长度限制") @Size(max = 100, message = "已超出详细地址长度限制")
private String address; private String address;
@ApiModelProperty(position = 23, required = true, value = "经度") @ApiModelProperty(position = 23, required = true, value = "经度")
@NotNull()
private String longitude; private String longitude;
@ApiModelProperty(position = 24, required = true, value = "纬度") @ApiModelProperty(position = 24, required = true, value = "纬度")
@NotNull()
private String latitude; private String latitude;
@ApiModelProperty(position = 25, required = true, value = "联系人姓名", example = "张三") @ApiModelProperty(position = 25, required = true, value = "联系人姓名", example = "张三")
@NotNull()
private String contactName; private String contactName;
@ApiModelProperty(position = 26, required = true, value = "联系人邮箱", example = "zhangsan@zhengzai.tv") @ApiModelProperty(position = 26, required = true, value = "联系人邮箱", example = "zhangsan@zhengzai.tv")
@NotNull()
private String contactEmail; private String contactEmail;
@ApiModelProperty(position = 27, required = true, value = "企业名称") @ApiModelProperty(position = 27, required = true, value = "企业名称")
......
package com.liquidnet.service.merchant.service; package com.liquidnet.service.merchant.service;
import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationRecordsVo;
import java.util.List;
public interface IMerchantAuthorizationRecordsService { public interface IMerchantAuthorizationRecordsService {
void performanceCheckerAdd(String cuid, String performanceId, String uid, boolean statistics); void performanceCheckerAdd(String cuid, String performanceId, String uid, String mobile, String name, boolean statistics);
void performanceCheckerDel(String cuid, String performanceId, String uid); void performanceCheckerDel(String cuid, String performanceId, String uid);
void performanceCheckers(String cuid, String performanceId); List<MerchantAuthorizationRecordsVo> performanceCheckers(String cuid, String performanceId);
} }
...@@ -95,12 +95,11 @@ public class MerchantFieldAppliesController extends BaseController { ...@@ -95,12 +95,11 @@ public class MerchantFieldAppliesController extends BaseController {
@RequiresPermissions("merchant:field:apply:approve") @RequiresPermissions("merchant:field:apply:approve")
@PostMapping("/approve") @PostMapping("/approve")
@ResponseBody @ResponseBody
public AjaxResult approve(@RequestParam(required = true) String uid, public AjaxResult approve(@RequestParam(required = true) String fieldApplyId) {
@RequestParam(required = true) String fieldApplyId) {
String authUid = ShiroUtils.getUserId().toString(); String authUid = ShiroUtils.getUserId().toString();
String authName = ShiroUtils.getLoginName(); String authName = ShiroUtils.getLoginName();
return toAjax(merchantFieldAppliesAdminService.applyApprove(uid, fieldApplyId, authUid, authName)); return toAjax(merchantFieldAppliesAdminService.applyApprove(fieldApplyId, authUid, authName));
} }
@ApiOperation(value = "审核驳回") @ApiOperation(value = "审核驳回")
...@@ -108,12 +107,11 @@ public class MerchantFieldAppliesController extends BaseController { ...@@ -108,12 +107,11 @@ public class MerchantFieldAppliesController extends BaseController {
@RequiresPermissions("merchant:field:apply:reject") @RequiresPermissions("merchant:field:apply:reject")
@PostMapping("/reject") @PostMapping("/reject")
@ResponseBody @ResponseBody
public AjaxResult reject(@RequestParam(required = true) String uid, public AjaxResult reject(@RequestParam(required = true) String fieldApplyId,
@RequestParam(required = true) String fieldApplyId,
@RequestParam(required = true) String reject) { @RequestParam(required = true) String reject) {
String authUid = ShiroUtils.getUserId().toString(); String authUid = ShiroUtils.getUserId().toString();
String authName = ShiroUtils.getLoginName(); String authName = ShiroUtils.getLoginName();
return toAjax(merchantFieldAppliesAdminService.applyReject(uid, fieldApplyId, authUid, authName, reject)); return toAjax(merchantFieldAppliesAdminService.applyReject(fieldApplyId, authUid, authName, reject));
} }
} }
...@@ -76,12 +76,11 @@ public class MerchantSponsorAppliesController extends BaseController { ...@@ -76,12 +76,11 @@ public class MerchantSponsorAppliesController extends BaseController {
@RequiresPermissions("merchant:sponsor:apply:approve") @RequiresPermissions("merchant:sponsor:apply:approve")
@PostMapping("/approve") @PostMapping("/approve")
@ResponseBody @ResponseBody
public AjaxResult approve(@RequestParam(required = true) String uid, public AjaxResult approve(@RequestParam(required = true) String sponsorApplyId) {
@RequestParam(required = true) String sponsorApplyId) {
String authUid = ShiroUtils.getUserId().toString(); String authUid = ShiroUtils.getUserId().toString();
String authName = ShiroUtils.getLoginName(); String authName = ShiroUtils.getLoginName();
return toAjax(merchantSponsorAppliesAdminService.applyApprove(uid, sponsorApplyId, authUid, authName)); return toAjax(merchantSponsorAppliesAdminService.applyApprove(sponsorApplyId, authUid, authName));
} }
@ApiOperation(value = "审核驳回") @ApiOperation(value = "审核驳回")
...@@ -89,12 +88,11 @@ public class MerchantSponsorAppliesController extends BaseController { ...@@ -89,12 +88,11 @@ public class MerchantSponsorAppliesController extends BaseController {
@RequiresPermissions("merchant:sponsor:apply:reject") @RequiresPermissions("merchant:sponsor:apply:reject")
@PostMapping("/reject") @PostMapping("/reject")
@ResponseBody @ResponseBody
public AjaxResult reject(@RequestParam(required = true) String uid, public AjaxResult reject(@RequestParam(required = true) String sponsorApplyId,
@RequestParam(required = true) String sponsorApplyId,
@RequestParam(required = true) String reject) { @RequestParam(required = true) String reject) {
String authUid = ShiroUtils.getUserId().toString(); String authUid = ShiroUtils.getUserId().toString();
String authName = ShiroUtils.getLoginName(); String authName = ShiroUtils.getLoginName();
return toAjax(merchantSponsorAppliesAdminService.applyReject(uid, sponsorApplyId, authUid, authName, reject)); return toAjax(merchantSponsorAppliesAdminService.applyReject(sponsorApplyId, authUid, authName, reject));
} }
} }
...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.entity.MerchantFieldApplies; import com.liquidnet.service.merchant.entity.MerchantFieldApplies;
public interface IMerchantFieldAppliesAdminService extends IService<MerchantFieldApplies> { public interface IMerchantFieldAppliesAdminService extends IService<MerchantFieldApplies> {
boolean applyApprove(String uid, String fieldApplyId, String auditUid, String auditName); boolean applyApprove(String fieldApplyId, String auditUid, String auditName);
boolean applyReject(String uid, String fieldApplyId, String auditUid, String auditName, String reject); boolean applyReject(String fieldApplyId, String auditUid, String auditName, String reject);
} }
...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.entity.MerchantSponsorApplies; import com.liquidnet.service.merchant.entity.MerchantSponsorApplies;
public interface IMerchantSponsorAppliesAdminService extends IService<MerchantSponsorApplies> { public interface IMerchantSponsorAppliesAdminService extends IService<MerchantSponsorApplies> {
boolean applyApprove(String uid, String sponsorApplyId, String auditUid, String auditName); boolean applyApprove(String sponsorApplyId, String auditUid, String auditName);
boolean applyReject(String uid, String sponsorApplyId, String auditUid, String auditName, String reject); boolean applyReject(String sponsorApplyId, String auditUid, String auditName, String reject);
} }
...@@ -251,7 +251,6 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me ...@@ -251,7 +251,6 @@ public class MerchantAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Me
String[] checkerPermissionIds = { String[] checkerPermissionIds = {
MerchantPermissionConst.PerformancePermission.CHECK.getId() MerchantPermissionConst.PerformancePermission.CHECK.getId()
}; };
for (MerchantFieldCheckersVo fieldCheckersVo: fieldCheckersVos) { for (MerchantFieldCheckersVo fieldCheckersVo: fieldCheckersVos) {
// 验票员 授权记录 entity // 验票员 授权记录 entity
MerchantAuthorizationRecords checkerAuthorizationRecords = new MerchantAuthorizationRecords(); MerchantAuthorizationRecords checkerAuthorizationRecords = new MerchantAuthorizationRecords();
......
package com.liquidnet.client.admin.zhengzai.merchant.utils; package com.liquidnet.client.admin.zhengzai.merchant.utils;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo; import com.liquidnet.service.merchant.dto.vo.*;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
import org.bson.Document; import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
...@@ -11,6 +10,8 @@ import org.springframework.data.mongodb.core.query.Query; ...@@ -11,6 +10,8 @@ import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update; import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
@Component @Component
public class MerchantMongoUtil { public class MerchantMongoUtil {
@Autowired @Autowired
...@@ -41,4 +42,16 @@ public class MerchantMongoUtil { ...@@ -41,4 +42,16 @@ public class MerchantMongoUtil {
Update update = Update.fromDocument(document); Update update = Update.fromDocument(document);
mongoTemplate.upsert(query, update, MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName()); mongoTemplate.upsert(query, update, MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName());
} }
public List<MerchantFieldAppliesVo> getFieldAppliesVosByUid(String uid) {
return mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null)), MerchantFieldAppliesVo.class, MerchantFieldAppliesVo.class.getSimpleName());
}
public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) {
return mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null)), MerchantSponsorAppliesVo.class, MerchantSponsorAppliesVo.class.getSimpleName());
}
public List<MerchantAuthorizationRecordsVo> getCheckersAuthorizationRecordsVosByCuid(String cuid, String performanceId) {
return mongoTemplate.find(Query.query(Criteria.where("uidRole").is("checker").and("cuid").is(cuid).and("performanceId").is(performanceId).and("deletedAt").is(null)), MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
}
} }
...@@ -29,7 +29,7 @@ public class MerchantRedisUtil { ...@@ -29,7 +29,7 @@ public class MerchantRedisUtil {
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
if (null == vo) { if (null == vo) {
vo = mongoUtil.getFieldsVoByFieldId(fieldId); vo = mongoUtil.getFieldsVoByFieldId(fieldId);
this.setFieldsVoByFieldId(fieldId, vo); redisUtil.set(key, vo);
} }
return vo; return vo;
} }
...@@ -46,6 +46,10 @@ public class MerchantRedisUtil { ...@@ -46,6 +46,10 @@ public class MerchantRedisUtil {
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
List<MerchantFieldAppliesVo> vos = (List<MerchantFieldAppliesVo>) redisUtil.get(key); List<MerchantFieldAppliesVo> vos = (List<MerchantFieldAppliesVo>) redisUtil.get(key);
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
if (null == vos) {
vos = mongoUtil.getFieldAppliesVosByUid(uid);
redisUtil.set(key, vos);
}
return vos; return vos;
} }
...@@ -123,7 +127,7 @@ public class MerchantRedisUtil { ...@@ -123,7 +127,7 @@ public class MerchantRedisUtil {
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
if (null == vo) { if (null == vo) {
vo = mongoUtil.getSponsorsVoBySponsorId(sponsorId); vo = mongoUtil.getSponsorsVoBySponsorId(sponsorId);
this.setSponsorsVoBySponsorId(sponsorId, vo); redisUtil.set(key, vo);
} }
return vo; return vo;
} }
...@@ -139,6 +143,10 @@ public class MerchantRedisUtil { ...@@ -139,6 +143,10 @@ public class MerchantRedisUtil {
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
List<MerchantSponsorAppliesVo> vos = (List<MerchantSponsorAppliesVo>) redisUtil.get(key); List<MerchantSponsorAppliesVo> vos = (List<MerchantSponsorAppliesVo>) redisUtil.get(key);
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
if (null == vos) {
vos = mongoUtil.getSponsorAppliesVosByUid(uid);
redisUtil.set(key, vos);
}
return vos; return vos;
} }
......
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
# 创建集合 # 创建集合
db.createCollection("MerchantFieldsVo"); db.createCollection("MerchantFieldsVo");
db.createCollection("MerchantFieldAppliesVo");
db.createCollection("MerchantSponsorsVo"); db.createCollection("MerchantSponsorsVo");
db.createCollection("MerchantSponsorAppliesVo");
db.createCollection("MerchantAuthorizationRecordsVo");
# 创建索引 # 创建索引
...@@ -10,7 +13,19 @@ db.MerchantFieldsVo.createIndex({fieldId:"hashed"}); ...@@ -10,7 +13,19 @@ db.MerchantFieldsVo.createIndex({fieldId:"hashed"});
db.MerchantFieldsVo.createIndex({isOnline:"hashed"}); db.MerchantFieldsVo.createIndex({isOnline:"hashed"});
db.MerchantFieldsVo.createIndex({uid:"hashed"}); db.MerchantFieldsVo.createIndex({uid:"hashed"});
db.MerchantFieldsVo.createIndex({companyId:"hashed"}); db.MerchantFieldsVo.createIndex({companyId:"hashed"});
db.MerchantSponsorsVo.createIndex({fieldId:"hashed"}); db.MerchantFieldAppliesVo.createIndex({fieldApplyId:"hashed"});
db.MerchantFieldAppliesVo.createIndex({uid:"hashed"});
db.MerchantSponsorsVo.createIndex({sponsorId:"hashed"});
db.MerchantSponsorsVo.createIndex({isOnline:"hashed"}); db.MerchantSponsorsVo.createIndex({isOnline:"hashed"});
db.MerchantSponsorsVo.createIndex({uid:"hashed"}); db.MerchantSponsorsVo.createIndex({uid:"hashed"});
db.MerchantSponsorsVo.createIndex({companyId:"hashed"}); db.MerchantSponsorsVo.createIndex({companyId:"hashed"});
db.MerchantSponsorAppliesVo.createIndex({sponsorApplyId:"hashed"});
db.MerchantSponsorAppliesVo.createIndex({uid:"hashed"});
db.MerchantAuthorizationRecordsVo.createIndex({authorizationRecordId:"hashed"});
db.MerchantAuthorizationRecordsVo.createIndex({performanceId:"hashed"});
db.MerchantAuthorizationRecordsVo.createIndex({uidRole:"hashed"});
db.MerchantAuthorizationRecordsVo.createIndex({uid:"hashed"});
db.MerchantAuthorizationRecordsVo.createIndex({cuidRole:"hashed"});
db.MerchantAuthorizationRecordsVo.createIndex({cuid:"hashed"});
package com.liquidnet.service.merchant.service; package com.liquidnet.service.merchant.service;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo; import com.liquidnet.service.merchant.dto.vo.*;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
@Component @Component
public class MerchantMongoService { public class MerchantMongoService {
@Autowired @Autowired
private MongoTemplate mongoTemplate; private MongoTemplate mongoTemplate;
public MerchantFieldsVo getMerchantFieldsVoByFieldId(String fieldId) { public MerchantFieldsVo getFieldsVoByFieldId(String fieldId) {
return mongoTemplate.findOne(Query.query(Criteria.where("fieldId").is(fieldId)), MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName()); return mongoTemplate.findOne(Query.query(Criteria.where("fieldId").is(fieldId)), MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
} }
public MerchantSponsorsVo getMerchantSponsorsVoBySponsorId(String sponsorId) { public List<MerchantFieldAppliesVo> getFieldAppliesVosByUid(String uid) {
return mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null)), MerchantFieldAppliesVo.class, MerchantFieldAppliesVo.class.getSimpleName());
}
public MerchantSponsorsVo getSponsorsVoBySponsorId(String sponsorId) {
return mongoTemplate.findOne(Query.query(Criteria.where("sponsorId").is(sponsorId)), MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName()); return mongoTemplate.findOne(Query.query(Criteria.where("sponsorId").is(sponsorId)), MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName());
} }
public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) {
return mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null)), MerchantSponsorAppliesVo.class, MerchantSponsorAppliesVo.class.getSimpleName());
}
public List<MerchantAuthorizationRecordsVo> getCheckersAuthorizationRecordsVosByCuid(String cuid, String performanceId) {
return mongoTemplate.find(Query.query(Criteria.where("uidRole").is("checker").and("cuid").is(cuid).and("performanceId").is(performanceId).and("deletedAt").is(null)), MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
}
} }
...@@ -28,8 +28,8 @@ public class MerchantRdmService { ...@@ -28,8 +28,8 @@ public class MerchantRdmService {
MerchantFieldsVo vo = (MerchantFieldsVo) redisUtil.get(key); MerchantFieldsVo vo = (MerchantFieldsVo) redisUtil.get(key);
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
if (null == vo) { if (null == vo) {
vo = merchantMongoService.getMerchantFieldsVoByFieldId(fieldId); vo = merchantMongoService.getFieldsVoByFieldId(fieldId);
this.setFieldsVoByFieldId(fieldId, vo); redisUtil.set(key, vo);
} }
return vo; return vo;
} }
...@@ -46,6 +46,10 @@ public class MerchantRdmService { ...@@ -46,6 +46,10 @@ public class MerchantRdmService {
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
List<MerchantFieldAppliesVo> vos = (List<MerchantFieldAppliesVo>) redisUtil.get(key); List<MerchantFieldAppliesVo> vos = (List<MerchantFieldAppliesVo>) redisUtil.get(key);
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
if (null == vos) {
vos = merchantMongoService.getFieldAppliesVosByUid(uid);
redisUtil.set(key, vos);
}
return vos; return vos;
} }
...@@ -102,8 +106,8 @@ public class MerchantRdmService { ...@@ -102,8 +106,8 @@ public class MerchantRdmService {
MerchantSponsorsVo vo = (MerchantSponsorsVo) redisUtil.get(key); MerchantSponsorsVo vo = (MerchantSponsorsVo) redisUtil.get(key);
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
if (null == vo) { if (null == vo) {
vo = merchantMongoService.getMerchantSponsorsVoBySponsorId(sponsorId); vo = merchantMongoService.getSponsorsVoBySponsorId(sponsorId);
this.setSponsorsVoBySponsorId(sponsorId, vo); redisUtil.set(key, vo);
} }
return vo; return vo;
} }
...@@ -119,6 +123,10 @@ public class MerchantRdmService { ...@@ -119,6 +123,10 @@ public class MerchantRdmService {
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
List<MerchantSponsorAppliesVo> vos = (List<MerchantSponsorAppliesVo>) redisUtil.get(key); List<MerchantSponsorAppliesVo> vos = (List<MerchantSponsorAppliesVo>) redisUtil.get(key);
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
if (null == vos) {
vos = merchantMongoService.getSponsorAppliesVosByUid(uid);
redisUtil.set(key, vos);
}
return vos; return vos;
} }
......
package com.liquidnet.service.merchant.service.impl; package com.liquidnet.service.merchant.service.impl;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.merchant.constant.MerchantPermissionConst;
import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationPermissionsVo;
import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationRecordsVo;
import com.liquidnet.service.merchant.service.IMerchantAuthorizationRecordsService; import com.liquidnet.service.merchant.service.IMerchantAuthorizationRecordsService;
import com.liquidnet.service.merchant.service.MerchantMongoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Service
public class MerchantAuthorizationRecordsServiceImpl implements IMerchantAuthorizationRecordsService { public class MerchantAuthorizationRecordsServiceImpl implements IMerchantAuthorizationRecordsService {
@Autowired
MerchantMongoService merchantMongoService;
@Override @Override
public void performanceCheckerAdd(String cuid, String performanceId, String uid, boolean statistics) { public void performanceCheckerAdd(String cuid, String performanceId, String uid, String mobile, String name, boolean statistics) {
LocalDateTime now = LocalDateTime.now();
MerchantAuthorizationRecordsVo checkerAuthorizationRecordsVo = MerchantAuthorizationRecordsVo.getNew();
checkerAuthorizationRecordsVo.setAuthorizationRecordId(IDGenerator.nextSnowId());
checkerAuthorizationRecordsVo.setPerformanceId(performanceId);
checkerAuthorizationRecordsVo.setUidRole("checker");
checkerAuthorizationRecordsVo.setUid(uid);
checkerAuthorizationRecordsVo.setMobile(mobile);
checkerAuthorizationRecordsVo.setName(name);
checkerAuthorizationRecordsVo.setCuid("cuid");
// checkerAuthorizationRecordsVo.setCuidRole("fielder");
checkerAuthorizationRecordsVo.setCreatedAt(now);
// 验票员 授权权限
String[] checkerPermissionIds = {
MerchantPermissionConst.PerformancePermission.CHECK.getId()
};
// 验票员 授权权限 entity vo
ArrayList<MerchantAuthorizationPermissionsVo> checkerAuthorizationPermissionsVos = new ArrayList<>();
for (String permissionId : checkerPermissionIds) {
MerchantAuthorizationPermissionsVo checkerAuthorizationPermissionsVo = MerchantAuthorizationPermissionsVo.getNew();
checkerAuthorizationPermissionsVo.setAuthorizationPermissionId(IDGenerator.nextSnowId());
checkerAuthorizationPermissionsVo.setAuthorizationRecordId(checkerAuthorizationRecordsVo.getAuthorizationRecordId());
checkerAuthorizationPermissionsVo.setPermissionId(permissionId);
checkerAuthorizationPermissionsVo.setStartTime(now);
checkerAuthorizationPermissionsVo.setEndTime(now.plusYears(99));
checkerAuthorizationPermissionsVo.setCreatedAt(now);
checkerAuthorizationPermissionsVos.add(checkerAuthorizationPermissionsVo);
}
checkerAuthorizationRecordsVo.setPermissionsVos(checkerAuthorizationPermissionsVos);
} }
@Override @Override
...@@ -14,7 +62,8 @@ public class MerchantAuthorizationRecordsServiceImpl implements IMerchantAuthori ...@@ -14,7 +62,8 @@ public class MerchantAuthorizationRecordsServiceImpl implements IMerchantAuthori
} }
@Override @Override
public void performanceCheckers(String cuid, String performanceId) { public List<MerchantAuthorizationRecordsVo> performanceCheckers(String cuid, String performanceId) {
List<MerchantAuthorizationRecordsVo> authorizationRecordsVos = merchantMongoService.getCheckersAuthorizationRecordsVosByCuid(cuid, performanceId);
return authorizationRecordsVos;
} }
} }
...@@ -155,6 +155,11 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService { ...@@ -155,6 +155,11 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
merchantRdmService.addFieldAppliesVoByUid(uid, fieldAppliesVos, fieldAppliesVo); merchantRdmService.addFieldAppliesVoByUid(uid, fieldAppliesVos, fieldAppliesVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
// 申请场地 mongo
s = System.currentTimeMillis();
mongoTemplate.insert(fieldAppliesVo, MerchantFieldAppliesVo.class.getSimpleName());
log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
if (null != fieldsVo) { if (null != fieldsVo) {
// 场地 sql // 场地 sql
toMqSqls.add(SqlMapping.get("merchant_fields.update_claim_status_and_uid")); toMqSqls.add(SqlMapping.get("merchant_fields.update_claim_status_and_uid"));
...@@ -217,12 +222,19 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService { ...@@ -217,12 +222,19 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
fieldAppliesVo.setUpdatedAt(now); fieldAppliesVo.setUpdatedAt(now);
fieldAppliesVo.setDeletedAt(now); fieldAppliesVo.setDeletedAt(now);
// 场地默认验票员 redis // 申请场地 redis
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
merchantRdmService.delFieldAppliesVoByUid(uid, fieldAppliesVos, fieldAppliesVo); merchantRdmService.delFieldAppliesVoByUid(uid, fieldAppliesVos, fieldAppliesVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
// 场地默认验票员 sql // 申请场地 mongo
s = System.currentTimeMillis();
Query query = Query.query(Criteria.where("fieldApplyId").is(fieldAppliesVo.getFieldApplyId()));
Update update = Update.update("updatedAt", fieldAppliesVo.getUpdatedAt()).set("deletedAt", fieldAppliesVo.getDeletedAt());
mongoTemplate.updateFirst(query, update, MerchantFieldAppliesVo.class, MerchantFieldAppliesVo.class.getSimpleName());
log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
// 申请场地 sql
LinkedList<String> toMqSqls = CollectionUtil.linkedListString(); LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> fieldAppliesUpdateObjs = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> fieldAppliesUpdateObjs = CollectionUtil.linkedListObjectArr();
toMqSqls.add(SqlMapping.get("merchant_field_applies.update")); toMqSqls.add(SqlMapping.get("merchant_field_applies.update"));
...@@ -256,6 +268,12 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService { ...@@ -256,6 +268,12 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage()); throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
} }
MerchantFieldAppliesVo fieldAppliesVo = fieldAppliesVos.get(idx);
if (null != fieldAppliesVo.getFieldId() && !fieldAppliesVo.getFieldId().isEmpty()) {
MerchantFieldsVo fieldsVo = merchantRdmService.getFieldsVoByFieldId(fieldAppliesVo.getFieldId());
fieldAppliesVo.setFieldVo(fieldsVo);
}
return fieldAppliesVos.get(idx); return fieldAppliesVos.get(idx);
} }
......
...@@ -26,6 +26,7 @@ import org.springframework.data.domain.Sort; ...@@ -26,6 +26,7 @@ import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
...@@ -144,6 +145,11 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService { ...@@ -144,6 +145,11 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
merchantRdmService.addSponsorAppliesVoByUid(uid, sponsorAppliesVos, sponsorAppliesVo); merchantRdmService.addSponsorAppliesVoByUid(uid, sponsorAppliesVos, sponsorAppliesVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
// 申请主办 mongo
s = System.currentTimeMillis();
mongoTemplate.insert(sponsorAppliesVo, MerchantSponsorAppliesVo.class.getSimpleName());
log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
// 申请主办 sql // 申请主办 sql
toMqSqls.add(SqlMapping.get("merchant_sponsor_applies.insert")); toMqSqls.add(SqlMapping.get("merchant_sponsor_applies.insert"));
sponsorApplyInsertObjs.add(new Object[]{ sponsorApplyInsertObjs.add(new Object[]{
...@@ -167,7 +173,7 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService { ...@@ -167,7 +173,7 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
@Override @Override
public void applyDel(String uid, String sponsorApplyId) { public void applyDel(String uid, String sponsorApplyId) {
// 查找场地申请,是否存在且已经驳回 // 查找主办申请,是否存在且已经驳回
List<MerchantSponsorAppliesVo> sponsorAppliesVos = merchantRdmService.getSponsorAppliesVosByUid(uid); List<MerchantSponsorAppliesVo> sponsorAppliesVos = merchantRdmService.getSponsorAppliesVosByUid(uid);
if (CollectionUtils.isEmpty(sponsorAppliesVos)) { if (CollectionUtils.isEmpty(sponsorAppliesVos)) {
ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("13203"); ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("13203");
...@@ -191,12 +197,19 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService { ...@@ -191,12 +197,19 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
sponsorAppliesVo.setUpdatedAt(now); sponsorAppliesVo.setUpdatedAt(now);
sponsorAppliesVo.setDeletedAt(now); sponsorAppliesVo.setDeletedAt(now);
// 场地默认验票员 redis // 主办申请 redis
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
merchantRdmService.delSponsorAppliesVoByUid(uid, sponsorAppliesVos, sponsorAppliesVo); merchantRdmService.delSponsorAppliesVoByUid(uid, sponsorAppliesVos, sponsorAppliesVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
// 场地默认验票员 sql // 主办申请 mongo
s = System.currentTimeMillis();
Query query = Query.query(Criteria.where("sponsorApplyId").is(sponsorAppliesVo.getSponsorApplyId()));
Update update = Update.update("updatedAt", sponsorAppliesVo.getUpdatedAt()).set("deletedAt", sponsorAppliesVo.getDeletedAt());
mongoTemplate.updateFirst(query, update, MerchantSponsorAppliesVo.class, MerchantSponsorAppliesVo.class.getSimpleName());
log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
// 主办申请 sql
LinkedList<String> toMqSqls = CollectionUtil.linkedListString(); LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> sponsorAppliesUpdateObjs = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> sponsorAppliesUpdateObjs = CollectionUtil.linkedListObjectArr();
toMqSqls.add(SqlMapping.get("merchant_sponsor_applies.update")); toMqSqls.add(SqlMapping.get("merchant_sponsor_applies.update"));
...@@ -215,7 +228,7 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService { ...@@ -215,7 +228,7 @@ public class MerchantSponsorsServiceImpl implements IMerchantSponsorsService {
@Override @Override
public MerchantSponsorAppliesVo applyInfo(String uid, String sponsorApplyId) { public MerchantSponsorAppliesVo applyInfo(String uid, String sponsorApplyId) {
// 查找场地申请,是否存在 // 查找主办申请,是否存在
List<MerchantSponsorAppliesVo> sponsorAppliesVos = merchantRdmService.getSponsorAppliesVosByUid(uid); List<MerchantSponsorAppliesVo> sponsorAppliesVos = merchantRdmService.getSponsorAppliesVosByUid(uid);
if (CollectionUtils.isEmpty(sponsorAppliesVos)) { if (CollectionUtils.isEmpty(sponsorAppliesVos)) {
ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("13203"); ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("13203");
......
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