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

Commit bdedcb0a authored by 胡佳晨's avatar 胡佳晨

暂时提交

parent 62a6bb18
...@@ -3,8 +3,6 @@ package com.liquidnet.service.kylin.dto.param; ...@@ -3,8 +3,6 @@ package com.liquidnet.service.kylin.dto.param;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime;
@Data @Data
public class CheckPerformanceRelationParam { public class CheckPerformanceRelationParam {
@ApiModelProperty(value = "演出id") @ApiModelProperty(value = "演出id")
......
package com.liquidnet.service.kylin.dto.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class CheckUserParam {
@ApiModelProperty(value = "演出id")
private String checkUserId;
@ApiModelProperty(value = "可下载时间")
private List<CheckPerformanceRelationParam> checkPerformanceRelationParamList;
}
...@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; ...@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.ChildPerformanceDao; import com.liquidnet.service.kylin.dao.ChildPerformanceDao;
import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam; import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam;
import com.liquidnet.service.kylin.dto.param.CheckUserParam;
import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances; import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
...@@ -27,7 +28,7 @@ public interface IKylinCheckUserPerformancesPartnerService extends IService<Kyli ...@@ -27,7 +28,7 @@ public interface IKylinCheckUserPerformancesPartnerService extends IService<Kyli
ResponseDto<PageInfo<ChildPerformanceDao>> unChildPerformanceList(String merchantId,String checkUserId,int page,int size); ResponseDto<PageInfo<ChildPerformanceDao>> unChildPerformanceList(String merchantId,String checkUserId,int page,int size);
// 添加配置 // 添加配置
ResponseDto<String> setPerformance(List<CheckPerformanceRelationParam> param, String checkUserId); ResponseDto<String> setPerformance(CheckUserParam param);
// 删除配置 // 删除配置
ResponseDto<String> delPerformance(List<String> performanceIds, String checkUserId); ResponseDto<String> delPerformance(List<String> performanceIds, String checkUserId);
......
...@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; ...@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.ChildPerformanceDao; import com.liquidnet.service.kylin.dao.ChildPerformanceDao;
import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam; import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam;
import com.liquidnet.service.kylin.dto.param.CheckUserParam;
import com.liquidnet.service.kylin.mapper.KylinCheckUserPerformancesMapper; import com.liquidnet.service.kylin.mapper.KylinCheckUserPerformancesMapper;
import com.liquidnet.service.kylin.service.impl.partner.KylinCheckUserPerformancesPartnerServiceImpl; import com.liquidnet.service.kylin.service.impl.partner.KylinCheckUserPerformancesPartnerServiceImpl;
import com.liquidnet.service.kylin.service.impl.partner.KylinTicketsPartnerServiceImpl; import com.liquidnet.service.kylin.service.impl.partner.KylinTicketsPartnerServiceImpl;
...@@ -36,9 +37,8 @@ public class KylinCheckUserPerformancesPartnerController { ...@@ -36,9 +37,8 @@ public class KylinCheckUserPerformancesPartnerController {
@PostMapping(value = "") @PostMapping(value = "")
@ApiOperation(value = "添加关联关系", position = 1) @ApiOperation(value = "添加关联关系", position = 1)
@ApiResponse(code = 200, message = "接口返回对象参数") @ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> setPerformance(@RequestParam("param") List<CheckPerformanceRelationParam> param, public ResponseDto<String> setPerformance(@RequestBody CheckUserParam param) {
@RequestParam("checkUserId") String checkUserId) { return userPerformancesPartnerService.setPerformance(param);
return userPerformancesPartnerService.setPerformance(param, checkUserId);
} }
@DeleteMapping(value = "") @DeleteMapping(value = "")
......
...@@ -10,6 +10,7 @@ import com.liquidnet.service.base.ResponseDto; ...@@ -10,6 +10,7 @@ import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.constant.KylinRedisConst; import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dao.ChildPerformanceDao; import com.liquidnet.service.kylin.dao.ChildPerformanceDao;
import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam; import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam;
import com.liquidnet.service.kylin.dto.param.CheckUserParam;
import com.liquidnet.service.kylin.dto.vo.KylinCheckUserPerformanceVo; import com.liquidnet.service.kylin.dto.vo.KylinCheckUserPerformanceVo;
import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances; import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances;
import com.liquidnet.service.kylin.mapper.KylinCheckUserPerformancesMapper; import com.liquidnet.service.kylin.mapper.KylinCheckUserPerformancesMapper;
...@@ -74,12 +75,12 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky ...@@ -74,12 +75,12 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
} }
@Override @Override
public ResponseDto<String> setPerformance(List<CheckPerformanceRelationParam> param, String checkUserId) { public ResponseDto<String> setPerformance(CheckUserParam param) {
try { try {
List<String> performanceList = new ArrayList<>(); List<String> performanceList = new ArrayList<>();
for (CheckPerformanceRelationParam item : param) { for (CheckPerformanceRelationParam item : param.getCheckPerformanceRelationParamList()) {
KylinCheckUserPerformances checkUserPerformances = new KylinCheckUserPerformances(); KylinCheckUserPerformances checkUserPerformances = new KylinCheckUserPerformances();
checkUserPerformances.setCheckUserId(checkUserId); checkUserPerformances.setCheckUserId(param.getCheckUserId());
checkUserPerformances.setCanDownTime(LocalDateTime.parse(item.getCanDownTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); checkUserPerformances.setCanDownTime(LocalDateTime.parse(item.getCanDownTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
checkUserPerformances.setPerformanceId(item.getPerformanceId()); checkUserPerformances.setPerformanceId(item.getPerformanceId());
checkUserPerformances.setCheckUserPerformanceId(IDGenerator.nextSnowId().toString()); checkUserPerformances.setCheckUserPerformanceId(IDGenerator.nextSnowId().toString());
...@@ -89,12 +90,12 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky ...@@ -89,12 +90,12 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
performanceList.add(item.getPerformanceId()); performanceList.add(item.getPerformanceId());
} }
KylinCheckUserPerformanceVo userPerformanceVo = new KylinCheckUserPerformanceVo(); KylinCheckUserPerformanceVo userPerformanceVo = new KylinCheckUserPerformanceVo();
userPerformanceVo.setCheckUserId(checkUserId); userPerformanceVo.setCheckUserId(param.getCheckUserId());
userPerformanceVo.setPerformanceList(performanceList); userPerformanceVo.setPerformanceList(performanceList);
mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(checkUserId)), KylinCheckUserPerformanceVo.class, KylinCheckUserPerformanceVo.class.getSimpleName()); mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(param.getCheckUserId())), KylinCheckUserPerformanceVo.class, KylinCheckUserPerformanceVo.class.getSimpleName());
mongoTemplate.insert(userPerformanceVo, KylinCheckUserPerformanceVo.class.getSimpleName()); mongoTemplate.insert(userPerformanceVo, KylinCheckUserPerformanceVo.class.getSimpleName());
redisUtil.hdel(KylinRedisConst.CHECK_USER_RELATION,checkUserId); redisUtil.hdel(KylinRedisConst.CHECK_USER_RELATION,param.getCheckUserId());
return ResponseDto.success("添加成功"); return ResponseDto.success("添加成功");
}catch (Exception e){ }catch (Exception e){
return ResponseDto.failure(ErrorMapping.get(20101)); return ResponseDto.failure(ErrorMapping.get(20101));
......
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