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

Commit 1208f6b5 authored by 胡佳晨's avatar 胡佳晨

添加 默认验票员 bug修复

parent 938f06c2
...@@ -10,7 +10,7 @@ import java.util.List; ...@@ -10,7 +10,7 @@ import java.util.List;
@ApiModel(value = "SlimeAuthorizationRecordParam", description = "授权验票统计入参") @ApiModel(value = "SlimeAuthorizationRecordParam", description = "授权验票统计入参")
@Data @Data
public class SlimeAuthorizationRecordParam implements java.io.Serializable{ public class SlimeAuthorizationRecordParam implements java.io.Serializable,Cloneable{
private static final long serialVersionUID = -673681507332688410L; private static final long serialVersionUID = -673681507332688410L;
@ApiModelProperty(position = 10, required = true, value = "演出ID") @ApiModelProperty(position = 10, required = true, value = "演出ID")
...@@ -33,4 +33,13 @@ public class SlimeAuthorizationRecordParam implements java.io.Serializable{ ...@@ -33,4 +33,13 @@ public class SlimeAuthorizationRecordParam implements java.io.Serializable{
@ApiModelProperty(position = 15, required = true, value = "授权权限") @ApiModelProperty(position = 15, required = true, value = "授权权限")
@NotEmpty @NotEmpty
private List<SlimeAuthorizationPermissionParam> permissions; private List<SlimeAuthorizationPermissionParam> permissions;
private static final SlimeAuthorizationRecordParam obj = new SlimeAuthorizationRecordParam();
public static SlimeAuthorizationRecordParam getNew() {
try {
return (SlimeAuthorizationRecordParam) obj.clone();
} catch (CloneNotSupportedException e) {
return new SlimeAuthorizationRecordParam();
}
}
} }
...@@ -6,6 +6,11 @@ import com.liquidnet.service.base.ErrorMapping; ...@@ -6,6 +6,11 @@ import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.PagedResult; import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst; import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.slime.constant.SlimeAuthorizationConst;
import com.liquidnet.service.slime.dto.param.SlimeAuthorizationPermissionParam;
import com.liquidnet.service.slime.dto.param.SlimeAuthorizationRecordParam;
import com.liquidnet.service.slime.dto.vo.SlimeAuthorizationRecordsVo;
import com.liquidnet.service.slime.dto.vo.SlimeFieldCheckersVo; import com.liquidnet.service.slime.dto.vo.SlimeFieldCheckersVo;
import com.liquidnet.service.slime.dto.vo.SlimeFieldsDetailsVo; import com.liquidnet.service.slime.dto.vo.SlimeFieldsDetailsVo;
import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo; import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
...@@ -28,6 +33,7 @@ import org.springframework.stereotype.Service; ...@@ -28,6 +33,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
...@@ -49,6 +55,9 @@ public class SlimeFieldsServiceImpl implements ISlimeFieldsService { ...@@ -49,6 +55,9 @@ public class SlimeFieldsServiceImpl implements ISlimeFieldsService {
@Autowired @Autowired
QueueUtil queueUtil; QueueUtil queueUtil;
@Autowired
SlimeAuthorizationRecordsServiceImpl authorizationRecordsService;
@Override @Override
public PagedResult<SlimeFieldsVo> search(String name, int page, int size) { public PagedResult<SlimeFieldsVo> search(String name, int page, int size) {
// 查询条件 // 查询条件
...@@ -214,6 +223,27 @@ public class SlimeFieldsServiceImpl implements ISlimeFieldsService { ...@@ -214,6 +223,27 @@ public class SlimeFieldsServiceImpl implements ISlimeFieldsService {
); );
log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s); log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
SlimeAuthorizationRecordParam param = SlimeAuthorizationRecordParam.getNew();
param.setMobile(mobile);
param.setName(name);
List<SlimeAuthorizationPermissionParam> list = new ArrayList<>();
SlimeAuthorizationPermissionParam permissionParam = SlimeAuthorizationPermissionParam.getNew();
permissionParam.setPermissionId(SlimeAuthorizationConst.PerformancePermission.CHECK.getId());
list.add(permissionParam);
param.setPermissions(list);
param.setUid(uid);
param.setUidRole("CHECKER");
List<KylinPerformanceVo> voList = mongoTemplate.find(Query.query(Criteria.where("fieldId").is("654336562571018243092042").and("appStatus").gte(3)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
for (KylinPerformanceVo item : voList) {
try {
param.setPerformanceId(item.getPerformancesId());
authorizationRecordsService.performanceRecordCheckerAdd(cuid, param);
} catch (Exception e) {
continue;
}
}
return fieldCheckersVo.getFieldCheckerId(); return fieldCheckersVo.getFieldCheckerId();
} }
...@@ -269,13 +299,19 @@ public class SlimeFieldsServiceImpl implements ISlimeFieldsService { ...@@ -269,13 +299,19 @@ public class SlimeFieldsServiceImpl implements ISlimeFieldsService {
SqlMapping.gets(toMqSqls, fieldCheckerUpdateObjs) SqlMapping.gets(toMqSqls, fieldCheckerUpdateObjs)
); );
log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s); log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
List<KylinPerformanceVo> voList = mongoTemplate.find(Query.query(Criteria.where("fieldId").is("654336562571018243092042").and("appStatus").gte(3)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
for (KylinPerformanceVo item : voList) {
SlimeAuthorizationRecordsVo vo = mongoTemplate.findOne(Query.query(Criteria.where("performanceId").is(item.getPerformancesId()).and("uidRole").is("CHECKER").and("uid").is(uid).and("cuid").is(cuid)), SlimeAuthorizationRecordsVo.class, SlimeAuthorizationRecordsVo.class.getSimpleName());
authorizationRecordsService.performanceRecordCheckerDel(cuid, vo.getAuthorizationRecordId());
}
} }
@Override @Override
public SlimeFieldsDetailsVo fieldDetails(String fieldId) { public SlimeFieldsDetailsVo fieldDetails(String fieldId) {
SlimeFieldsVo vo = slimeRdmService.getFieldsVoByFieldId(fieldId); SlimeFieldsVo vo = slimeRdmService.getFieldsVoByFieldId(fieldId);
SlimeFieldsDetailsVo returnData = SlimeFieldsDetailsVo.getNew(); SlimeFieldsDetailsVo returnData = SlimeFieldsDetailsVo.getNew();
BeanUtils.copyProperties(vo,returnData); BeanUtils.copyProperties(vo, returnData);
return returnData; return returnData;
} }
......
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