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

Commit 2772d099 authored by 胡佳晨's avatar 胡佳晨

修改代码 ar活动配置

parent 37b79738
...@@ -6,6 +6,8 @@ import com.liquidnet.service.base.ResponseDto; ...@@ -6,6 +6,8 @@ import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.sweet.entity.SweetArtists; import com.liquidnet.service.sweet.entity.SweetArtists;
import com.liquidnet.service.sweet.entity.SweetArtistsList; import com.liquidnet.service.sweet.entity.SweetArtistsList;
import com.liquidnet.service.sweet.entity.SweetArtistsUrl; import com.liquidnet.service.sweet.entity.SweetArtistsUrl;
import com.liquidnet.service.sweet.param.SweetArtistsListParam;
import com.liquidnet.service.sweet.vo.SweetArtistsVo;
import java.util.List; import java.util.List;
...@@ -19,13 +21,13 @@ import java.util.List; ...@@ -19,13 +21,13 @@ import java.util.List;
*/ */
public interface ISweetArtistsService extends IService<SweetArtists> { public interface ISweetArtistsService extends IService<SweetArtists> {
ResponseDto<PageInfo<SweetArtists>> getList(int page, int size,String name); ResponseDto<PageInfo<SweetArtists>> getList(int page, int size, String name);
ResponseDto<Boolean> add(SweetArtistsList sweetArtistsList); ResponseDto<Boolean> add(SweetArtistsListParam sweetArtistsList);
ResponseDto<SweetArtists> detail(String artistsId); ResponseDto<SweetArtistsVo> detail(String artistsId);
ResponseDto<Boolean> change(String artistsId,SweetArtistsList sweetArtistsList); ResponseDto<Boolean> change(String artistsId, SweetArtistsListParam sweetArtistsList);
ResponseDto<SweetArtists> del(String artistsId); ResponseDto<SweetArtists> del(String artistsId);
......
...@@ -9,7 +9,7 @@ import com.liquidnet.service.sweet.entity.SweetPerformanceShow; ...@@ -9,7 +9,7 @@ import com.liquidnet.service.sweet.entity.SweetPerformanceShow;
import java.time.LocalDateTime; import java.time.LocalDateTime;
public interface ISweetPerformanceService extends IService<SweetPerformanceShow> { public interface ISweetPerformanceService extends IService<SweetPerformanceShow> {
ResponseDto<Boolean> add(String performanceId,String performanceName,String picOne, String picTwo, String arUrl, String timeStart, String timeEnd); ResponseDto<Boolean> add(String performanceId, String performanceName, String picOne, String picTwo, String arUrl, LocalDateTime timeStart, LocalDateTime timeEnd);
ResponseDto<Boolean> change(SweetPerformanceShow show); ResponseDto<Boolean> change(SweetPerformanceShow show);
...@@ -17,6 +17,8 @@ public interface ISweetPerformanceService extends IService<SweetPerformanceShow> ...@@ -17,6 +17,8 @@ public interface ISweetPerformanceService extends IService<SweetPerformanceShow>
ResponseDto<PageInfo<SweetPerformanceShow>> getList(Integer page, Integer size, String performanceName); ResponseDto<PageInfo<SweetPerformanceShow>> getList(Integer page, Integer size, String performanceName);
ResponseDto<SweetPerformanceShow> details(String arId);
ResponseDto<Boolean> changeStatus(String arId,Integer status);
} }
...@@ -34,6 +34,11 @@ public class SweetArtists implements Serializable,Cloneable { ...@@ -34,6 +34,11 @@ public class SweetArtists implements Serializable,Cloneable {
*/ */
private String artistsId; private String artistsId;
/**
* pic_url
*/
private String picUrl;
/** /**
* 艺人名称 * 艺人名称
...@@ -65,9 +70,6 @@ public class SweetArtists implements Serializable,Cloneable { ...@@ -65,9 +70,6 @@ public class SweetArtists implements Serializable,Cloneable {
*/ */
private LocalDateTime updatdAt; private LocalDateTime updatdAt;
@TableField(exist = false)
private List<SweetArtistsUrl> sweetArtistsUrl;
private static final SweetArtists obj = new SweetArtists(); private static final SweetArtists obj = new SweetArtists();
public static SweetArtists getNew() { public static SweetArtists getNew() {
try { try {
......
...@@ -14,6 +14,11 @@ public class SweetPerformanceShow implements Serializable,Cloneable{ ...@@ -14,6 +14,11 @@ public class SweetPerformanceShow implements Serializable,Cloneable{
@TableId(value = "mid", type = IdType.AUTO) @TableId(value = "mid", type = IdType.AUTO)
private Long mid; private Long mid;
/**
* 主键id
*/
private String arId;
private String performanceId; private String performanceId;
/** /**
* 演出名 * 演出名
...@@ -43,11 +48,11 @@ public class SweetPerformanceShow implements Serializable,Cloneable{ ...@@ -43,11 +48,11 @@ public class SweetPerformanceShow implements Serializable,Cloneable{
/** /**
* 开始时间 * 开始时间
*/ */
private String timeStart; private LocalDateTime timeStart;
/** /**
* 结束时间 * 结束时间
*/ */
private String timeEnd; private LocalDateTime timeEnd;
private static final SweetPerformanceShow obj = new SweetPerformanceShow(); private static final SweetPerformanceShow obj = new SweetPerformanceShow();
public static SweetPerformanceShow getNew() { public static SweetPerformanceShow getNew() {
......
package com.liquidnet.service.sweet.param;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
public class SweetArtistsListParam implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
/**
* 艺人名称
*/
private String name;
/**
* 拼音
*/
private String pinyin;
/**
* 封面图
*/
private String picUrl;
/**
* 艺人简介
*/
private String describes;
/**
* 图
*/
private String[] picArray;
/**
* 视频
*/
private String[] videoArray;
}
package com.liquidnet.service.sweet.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.liquidnet.service.sweet.entity.SweetArtistsUrl;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
/**
* <p>
* 艺人表
* </p>
*
* @author liquidnet
* @since 2021-07-23
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SweetArtistsVo implements Serializable,Cloneable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Long mid;
/**
* artists_id
*/
private String artistsId;
/**
* 艺人名称
*/
private String name;
/**
* 拼音
*/
private String pinyin;
/**
* 艺人简介
*/
private String describes;
/**
* 状态 1可用 0不可用
*/
private Integer status;
/**
* 创建时间
*/
private LocalDateTime createdAt;
/**
* 更新时间
*/
private LocalDateTime updatdAt;
private List<SweetArtistsUrl> sweetArtistsUrl;
private static final SweetArtistsVo obj = new SweetArtistsVo();
public static SweetArtistsVo getNew() {
try {
return (SweetArtistsVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new SweetArtistsVo();
}
}
}
...@@ -7,8 +7,10 @@ import com.liquidnet.service.sweet.entity.SweetArtists; ...@@ -7,8 +7,10 @@ import com.liquidnet.service.sweet.entity.SweetArtists;
import com.liquidnet.service.sweet.entity.SweetArtistsList; import com.liquidnet.service.sweet.entity.SweetArtistsList;
import com.liquidnet.service.sweet.entity.SweetArtistsUrl; import com.liquidnet.service.sweet.entity.SweetArtistsUrl;
import com.liquidnet.service.sweet.entity.SweetStage; import com.liquidnet.service.sweet.entity.SweetStage;
import com.liquidnet.service.sweet.param.SweetArtistsListParam;
import com.liquidnet.service.sweet.service.ISweetArtistsService; import com.liquidnet.service.sweet.service.ISweetArtistsService;
import com.liquidnet.service.sweet.service.ISweetStageService; import com.liquidnet.service.sweet.service.ISweetStageService;
import com.liquidnet.service.sweet.vo.SweetArtistsVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -50,13 +52,14 @@ public class SweetArtistsController { ...@@ -50,13 +52,14 @@ public class SweetArtistsController {
@PostMapping("add") @PostMapping("add")
@ApiOperation("添加艺人") @ApiOperation("添加艺人")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "picUrl", value = "封面图片", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "艺人姓名", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "艺人姓名", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "pinyin", value = "姓名拼音", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "pinyin", value = "姓名拼音", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "describes", value = "艺人简介", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "describes", value = "艺人简介", required = true),
@ApiImplicitParam(type = "query", dataType = "String[]", name = "picArray", value = "图片数组", required = true), @ApiImplicitParam(type = "query", dataType = "String[]", name = "picArray", value = "图片数组", required = true),
@ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = true) @ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = true)
}) })
public ResponseDto<Boolean> add(SweetArtistsList sweetArtistsList) { public ResponseDto<Boolean> add(SweetArtistsListParam sweetArtistsList) {
return sweetArtistsService.add(sweetArtistsList); return sweetArtistsService.add(sweetArtistsList);
} }
...@@ -65,13 +68,14 @@ public class SweetArtistsController { ...@@ -65,13 +68,14 @@ public class SweetArtistsController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人Id", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人Id", required = true),
}) })
public ResponseDto<SweetArtists> detail(@RequestParam() String artistsId) { public ResponseDto<SweetArtistsVo> detail(@RequestParam() String artistsId) {
return sweetArtistsService.detail(artistsId); return sweetArtistsService.detail(artistsId);
} }
@PostMapping("change") @PostMapping("change")
@ApiOperation("修改艺人") @ApiOperation("修改艺人")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "picUrl", value = "封面图片", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人Id", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人Id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "艺人姓名", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "艺人姓名", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "pinyin", value = "姓名拼音", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "pinyin", value = "姓名拼音", required = true),
...@@ -79,9 +83,10 @@ public class SweetArtistsController { ...@@ -79,9 +83,10 @@ public class SweetArtistsController {
@ApiImplicitParam(type = "query", dataType = "String[]", name = "picArray", value = "图片数组", required = true), @ApiImplicitParam(type = "query", dataType = "String[]", name = "picArray", value = "图片数组", required = true),
@ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = true) @ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = true)
}) })
public ResponseDto<Boolean> change(@RequestParam() String artistsId,SweetArtistsList sweetArtistsList) { public ResponseDto<Boolean> change(@RequestParam() String artistsId, SweetArtistsListParam sweetArtistsList) {
return sweetArtistsService.change(artistsId, sweetArtistsList); return sweetArtistsService.change(artistsId, sweetArtistsList);
} }
@GetMapping("del") @GetMapping("del")
@ApiOperation("删除艺人") @ApiOperation("删除艺人")
@ApiImplicitParams({ @ApiImplicitParams({
......
...@@ -30,12 +30,29 @@ public class SweetPerformanceController { ...@@ -30,12 +30,29 @@ public class SweetPerformanceController {
@ApiImplicitParam(type = "query", dataType = "String", name = "performanceName", value = "演出名", required = false), @ApiImplicitParam(type = "query", dataType = "String", name = "performanceName", value = "演出名", required = false),
}) })
public ResponseDto<PageInfo<SweetPerformanceShow>> getList(@RequestParam() Integer page, public ResponseDto<PageInfo<SweetPerformanceShow>> getList(@RequestParam() Integer page,
@RequestParam() Integer size, @RequestParam() Integer size,
@RequestParam(required = false) String performanceName) { @RequestParam(required = false) String performanceName) {
return sweetPerformanceService.getList(page, size, performanceName); return sweetPerformanceService.getList(page, size, performanceName);
} }
@GetMapping("details")
@ApiOperation("ar详情")
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "arId", value = "主键id", required = true),
})
public ResponseDto<SweetPerformanceShow> details(@RequestParam("arId") String arId) {
return sweetPerformanceService.details(arId);
}
@GetMapping("changeStatus")
@ApiOperation("ar修改活动状态")
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "arId", value = "主键id", required = true),
@ApiImplicitParam(type = "query", dataType = "int", name = "status", value = "状态[1-启用|0-不可用]", required = true),
})
public ResponseDto<Boolean> changeStatus(@RequestParam("arId") String arId, @RequestParam("status") Integer status) {
return sweetPerformanceService.changeStatus(arId, status);
}
@PostMapping("add") @PostMapping("add")
@ApiOperation("添加") @ApiOperation("添加")
...@@ -53,9 +70,9 @@ public class SweetPerformanceController { ...@@ -53,9 +70,9 @@ public class SweetPerformanceController {
@RequestParam() String picOne, @RequestParam() String picOne,
@RequestParam() String picTwo, @RequestParam() String picTwo,
@RequestParam() String arUrl, @RequestParam() String arUrl,
@RequestParam() String timeStart, @RequestParam() LocalDateTime timeStart,
@RequestParam() String timeEnd) { @RequestParam() LocalDateTime timeEnd) {
return sweetPerformanceService.add(performanceId,performanceName,picOne, picTwo, arUrl, timeStart,timeEnd); return sweetPerformanceService.add(performanceId, performanceName, picOne, picTwo, arUrl, timeStart, timeEnd);
} }
@PostMapping("change") @PostMapping("change")
...@@ -75,10 +92,10 @@ public class SweetPerformanceController { ...@@ -75,10 +92,10 @@ public class SweetPerformanceController {
@PostMapping("del") @PostMapping("del")
@ApiOperation("删除") @ApiOperation("删除")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "performanceId", value = "演出id", required = true) @ApiImplicitParam(type = "query", dataType = "String", name = "arId", value = "主键id", required = true)
}) })
public ResponseDto<Boolean> del( @RequestParam() String performanceId) { public ResponseDto<Boolean> del(@RequestParam() String arId) {
return sweetPerformanceService.del(performanceId); return sweetPerformanceService.del(arId);
} }
......
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto; import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
...@@ -14,9 +15,12 @@ import com.liquidnet.service.sweet.mapper.SweetArtistsMapper; ...@@ -14,9 +15,12 @@ import com.liquidnet.service.sweet.mapper.SweetArtistsMapper;
import com.liquidnet.service.sweet.mapper.SweetArtistsUrlMapper; import com.liquidnet.service.sweet.mapper.SweetArtistsUrlMapper;
import com.liquidnet.service.sweet.mapper.SweetManualArtistsMapper; import com.liquidnet.service.sweet.mapper.SweetManualArtistsMapper;
import com.liquidnet.service.sweet.mapper.SweetStageMapper; import com.liquidnet.service.sweet.mapper.SweetStageMapper;
import com.liquidnet.service.sweet.param.SweetArtistsListParam;
import com.liquidnet.service.sweet.service.ISweetArtistsService; import com.liquidnet.service.sweet.service.ISweetArtistsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.service.sweet.utils.RedisDataUtils; import com.liquidnet.service.sweet.utils.RedisDataUtils;
import com.liquidnet.service.sweet.vo.SweetArtistsVo;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -51,20 +55,10 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe ...@@ -51,20 +55,10 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
try { try {
List<SweetArtists> data; List<SweetArtists> data;
PageHelper.startPage(page, size); PageHelper.startPage(page, size);
if(name!=null){ if (name != null) {
data = sweetArtistsMapper.selectList(Wrappers.lambdaQuery(SweetArtists.class).like(SweetArtists::getName, name)); data = sweetArtistsMapper.selectList(Wrappers.lambdaQuery(SweetArtists.class).like(SweetArtists::getName, name));
for (SweetArtists sweetArtists : data) { } else {
String artistsId = sweetArtists.getArtistsId(); data = sweetArtistsMapper.selectList(Wrappers.lambdaQuery(SweetArtists.class));
List<SweetArtistsUrl> sweetArtistsUrl = sweetArtistsUrlMapper.selectList(Wrappers.lambdaQuery(SweetArtistsUrl.class).eq(SweetArtistsUrl::getArtistsId, artistsId));
sweetArtists.setSweetArtistsUrl(sweetArtistsUrl);
}
}else{
data = sweetArtistsMapper.selectList(Wrappers.lambdaQuery(SweetArtists.class));
for (SweetArtists sweetArtists : data) {
String artistsId = sweetArtists.getArtistsId();
List<SweetArtistsUrl> sweetArtistsUrl = sweetArtistsUrlMapper.selectList(Wrappers.lambdaQuery(SweetArtistsUrl.class).eq(SweetArtistsUrl::getArtistsId, artistsId));
sweetArtists.setSweetArtistsUrl(sweetArtistsUrl);
}
} }
pageInfo = new PageInfo(data); pageInfo = new PageInfo(data);
return ResponseDto.success(pageInfo); return ResponseDto.success(pageInfo);
...@@ -75,16 +69,17 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe ...@@ -75,16 +69,17 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
@Override @Override
@Transactional @Transactional
public ResponseDto<Boolean> add(SweetArtistsList sweetArtistsList) { public ResponseDto<Boolean> add(SweetArtistsListParam sweetArtistsList) {
try { try {
String mid = IDGenerator.nextSnowId(); String mid = IDGenerator.nextSnowId();
LocalDateTime time = LocalDateTime.now(); LocalDateTime time = LocalDateTime.now();
SweetArtistsUrl sweetArtistsUrl= SweetArtistsUrl.getNew(); SweetArtistsUrl sweetArtistsUrl = SweetArtistsUrl.getNew();
SweetArtists sweetArtists = SweetArtists.getNew(); SweetArtists sweetArtists = SweetArtists.getNew();
sweetArtists.setArtistsId(mid); sweetArtists.setArtistsId(mid);
sweetArtists.setName(sweetArtistsList.getName()); sweetArtists.setName(sweetArtistsList.getName());
sweetArtists.setPinyin(sweetArtistsList.getPinyin()); sweetArtists.setPinyin(sweetArtistsList.getPinyin());
sweetArtists.setDescribes(sweetArtistsList.getDescribes()); sweetArtists.setDescribes(sweetArtistsList.getDescribes());
sweetArtists.setPicUrl(sweetArtistsList.getPicUrl());
sweetArtists.setCreatedAt(time); sweetArtists.setCreatedAt(time);
sweetArtists.setUpdatdAt(time); sweetArtists.setUpdatdAt(time);
sweetArtistsMapper.insert(sweetArtists); sweetArtistsMapper.insert(sweetArtists);
...@@ -107,28 +102,30 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe ...@@ -107,28 +102,30 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
} }
@Override @Override
public ResponseDto<SweetArtists> detail(String artistsId) { public ResponseDto<SweetArtistsVo> detail(String artistsId) {
try { try {
SweetArtistsVo vo = SweetArtistsVo.getNew();
SweetArtists sweetArtists = sweetArtistsMapper.selectOne(Wrappers.lambdaQuery(SweetArtists.class).eq(SweetArtists::getArtistsId, artistsId)); SweetArtists sweetArtists = sweetArtistsMapper.selectOne(Wrappers.lambdaQuery(SweetArtists.class).eq(SweetArtists::getArtistsId, artistsId));
List<SweetArtistsUrl> sweetArtistsUrl = sweetArtistsUrlMapper.selectList(Wrappers.lambdaQuery(SweetArtistsUrl.class).eq(SweetArtistsUrl::getArtistsId, artistsId));
sweetArtists.setSweetArtistsUrl(sweetArtistsUrl); BeanUtils.copyProperties(sweetArtists, vo);
return ResponseDto.success(sweetArtists); List<SweetArtistsUrl> sweetArtistsUrl = sweetArtistsUrlMapper.selectList(Wrappers.lambdaQuery(SweetArtistsUrl.class).eq(SweetArtistsUrl::getArtistsId, artistsId));
vo.setSweetArtistsUrl(sweetArtistsUrl);
return ResponseDto.success(vo);
} catch (Exception e) { } catch (Exception e) {
log.error("==",e); log.error("==", e);
return ResponseDto.failure(); return ResponseDto.failure();
} }
} }
@Override @Override
@Transactional @Transactional
public ResponseDto<Boolean> change(String artistsId,SweetArtistsList sweetArtistsList) { public ResponseDto<Boolean> change(String artistsId, SweetArtistsListParam sweetArtistsList) {
try { try {
LocalDateTime time = LocalDateTime.now(); LocalDateTime time = LocalDateTime.now();
SweetArtists sweetArtists = SweetArtists.getNew(); SweetArtists sweetArtists = SweetArtists.getNew();
sweetArtists.setName(sweetArtistsList.getName()); sweetArtists.setName(sweetArtistsList.getName());
sweetArtists.setPinyin(sweetArtistsList.getPinyin()); sweetArtists.setPinyin(sweetArtistsList.getPinyin());
sweetArtists.setPicUrl(sweetArtistsList.getPicUrl());
sweetArtists.setDescribes(sweetArtistsList.getDescribes()); sweetArtists.setDescribes(sweetArtistsList.getDescribes());
sweetArtists.setUpdatdAt(time); sweetArtists.setUpdatdAt(time);
SweetArtistsUrl sweetArtistsUrl = SweetArtistsUrl.getNew(); SweetArtistsUrl sweetArtistsUrl = SweetArtistsUrl.getNew();
......
...@@ -16,6 +16,7 @@ import java.time.LocalDateTime; ...@@ -16,6 +16,7 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@Service @Service
public class SweetPerformanceAppServiceImpl extends ServiceImpl<SweetPerformanceMapper, SweetPerformanceShow> implements ISweetPerformanceAppService { public class SweetPerformanceAppServiceImpl extends ServiceImpl<SweetPerformanceMapper, SweetPerformanceShow> implements ISweetPerformanceAppService {
@Autowired @Autowired
...@@ -24,27 +25,19 @@ public class SweetPerformanceAppServiceImpl extends ServiceImpl<SweetPerformance ...@@ -24,27 +25,19 @@ public class SweetPerformanceAppServiceImpl extends ServiceImpl<SweetPerformance
@Override @Override
public ResponseDto<PageInfo<SweetPerformanceShow>> getlistInTime(Integer page, Integer size) { public ResponseDto<PageInfo<SweetPerformanceShow>> getlistInTime(Integer page, Integer size) {
PageInfo<SweetPerformanceShow> pageInfo = null; PageInfo<SweetPerformanceShow> pageInfo = null;
try { try {
List<SweetPerformanceShow> data = new ArrayList<>(); List<SweetPerformanceShow> data = new ArrayList<>();
PageHelper.startPage(page, size); PageHelper.startPage(page, size);
LocalDateTime time = LocalDateTime.now(); LocalDateTime time = LocalDateTime.now();
/* data = sweetPerformanceMapper.selectList(Wrappers.lambdaQuery(SweetPerformanceShow.class)
.le(SweetPerformanceShow::getTimeStart,time).ge(SweetPerformanceShow::getTimeEnd,time).eq(SweetPerformanceShow::getStatus,1));*/
List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR(); List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR();
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
for (SweetPerformanceShow performanceShow : performanceARList) { for (SweetPerformanceShow performanceShow : performanceARList) {
String timeStart =performanceShow.getTimeStart().replace("T"," "); if (time.isBefore(performanceShow.getTimeEnd()) && time.isAfter(performanceShow.getTimeStart()) && performanceShow.getStatus() == 1) {
String timeEnd = performanceShow.getTimeEnd().replace("T", " ");
LocalDateTime startTime = LocalDateTime.parse(performanceShow.getTimeStart());
LocalDateTime endTime = LocalDateTime.parse(performanceShow.getTimeEnd());
if (startTime.isBefore(time) && endTime.isAfter(time)){
data.add(performanceShow); data.add(performanceShow);
} }
} }
pageInfo = new PageInfo(data); pageInfo = new PageInfo(data);
return ResponseDto.success(pageInfo); return ResponseDto.success(pageInfo);
}catch (Exception e) { } catch (Exception e) {
return ResponseDto.success(pageInfo); return ResponseDto.success(pageInfo);
} }
......
...@@ -10,15 +10,19 @@ import com.liquidnet.commons.lang.util.HttpUtil; ...@@ -10,15 +10,19 @@ import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
import com.liquidnet.service.sweet.entity.SweetArtists; import com.liquidnet.service.sweet.entity.SweetArtists;
import com.liquidnet.service.sweet.entity.SweetPerformanceShow; import com.liquidnet.service.sweet.entity.SweetPerformanceShow;
import com.liquidnet.service.sweet.mapper.SweetPerformanceMapper; import com.liquidnet.service.sweet.mapper.SweetPerformanceMapper;
import com.liquidnet.service.sweet.service.ISweetPerformanceService; import com.liquidnet.service.sweet.service.ISweetPerformanceService;
import com.liquidnet.service.sweet.utils.RedisDataUtils; import com.liquidnet.service.sweet.utils.RedisDataUtils;
import com.mongodb.BasicDBObject;
import com.mongodb.client.result.UpdateResult;
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.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter;
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.data.mongodb.core.query.Update;
...@@ -35,48 +39,31 @@ import java.util.List; ...@@ -35,48 +39,31 @@ import java.util.List;
@Service @Service
public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMapper, SweetPerformanceShow> implements ISweetPerformanceService { public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMapper, SweetPerformanceShow> implements ISweetPerformanceService {
/* @Value("${liquidnet.service.goblin.url}") @Value("${liquidnet.service.goblin.url}")
private String goblinUrl;*/ private String goblinUrl;
@Autowired @Autowired
private SweetPerformanceMapper sweetPerformanceMapper; private SweetPerformanceMapper sweetPerformanceMapper;
@Autowired @Autowired
private RedisDataUtils redisUtils; private RedisDataUtils redisUtils;
@Autowired @Autowired
private MongoTemplate mongoTemplate; private MongoTemplate mongoTemplate;
/* @Autowired @Autowired
private FeignGoblinArClient feignGoblinArClient;*/ private MongoConverter mongoConverter;
@Autowired @Autowired
Environment environment; Environment environment;
@Override @Override
public ResponseDto<Boolean> add(String performanceId,String performanceName,String picOne, String picTwo, String arUrl, String timeStart, String timeEnd) { public ResponseDto<Boolean> add(String performanceId, String performanceName, String picOne, String picTwo, String arUrl, LocalDateTime timeStart, LocalDateTime timeEnd) {
try { try {
String offlineUrl=""; //离线地址 String offlineUrl = goblinUrl + "/goblin/inner/ar/data"; //离线地址
// ResponseDto<Boolean> arData = feignGoblinArClient.getArData(performanceId, "");
// LocalDateTime time = LocalDateTime.now();
/*MultiValueMap<String, String> params = new LinkedMultiValueMap();
params.add("performanceId",mid);
params.add("tag",null);
String returnData = HttpUtil.post(goblinUrl.concat("/goblin/inner/ar/data"), params);*/
String property = environment.getProperty(CurrentUtil.CK_ENV_ACTIVE);
if (LnsEnum.ENV.dev.name().contains(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE))){
offlineUrl="devgoblin.zhengzai.tv/goblin/inner/ar/data";
}else if (LnsEnum.ENV.test.name().contains(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE))){
offlineUrl="testgoblin.zhengzai.tv/goblin/inner/ar/data";
}else {
offlineUrl="prodgoblin.zhengzai.tv/goblin/inner/ar/data";
}
SweetPerformanceShow show = SweetPerformanceShow.getNew(); SweetPerformanceShow show = SweetPerformanceShow.getNew();
show.setArId(IDGenerator.nextTimeId2());
show.setPerformanceId(performanceId); show.setPerformanceId(performanceId);
show.setPerformanceName(performanceName); show.setPerformanceName(performanceName);
show.setPicOne(picOne); show.setPicOne(picOne);
show.setPicTwo(picTwo); show.setPicTwo(picTwo);
show.setArUrl(arUrl); show.setArUrl(arUrl);
show.setOfflineUrl(offlineUrl); show.setOfflineUrl(offlineUrl);
show.setTimeStart(timeStart); show.setTimeStart(timeStart);
show.setTimeEnd(timeEnd); show.setTimeEnd(timeEnd);
//redis //redis
...@@ -88,7 +75,7 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap ...@@ -88,7 +75,7 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
//mysql //mysql
sweetPerformanceMapper.insert(show); sweetPerformanceMapper.insert(show);
return ResponseDto.success(); return ResponseDto.success();
}catch (Exception e) { } catch (Exception e) {
return ResponseDto.failure(); return ResponseDto.failure();
} }
} }
...@@ -96,43 +83,44 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap ...@@ -96,43 +83,44 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
@Override @Override
public ResponseDto<Boolean> change(SweetPerformanceShow show) { public ResponseDto<Boolean> change(SweetPerformanceShow show) {
try { try {
String performanceId = show.getPerformanceId(); String id = show.getArId();
String id = show.getPerformanceId();
//修改redis //修改redis
List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR(); List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR();
for (SweetPerformanceShow performanceShow : performanceARList) { for (int i = 0; i < performanceARList.size(); i++) {
if (performanceShow.getPerformanceId().equals(id)){ SweetPerformanceShow performanceShow = performanceARList.get(i);
//删除要修改的原数据 if (performanceShow.getArId().equals(id)) {
performanceARList.remove(performanceShow); //覆盖要修改的原数据
performanceARList.add(show); performanceARList.set(i, show);
redisUtils.setPerformanceAR(performanceARList); redisUtils.setPerformanceAR(performanceARList);
break;
} }
} }
//修改 mongo数据 //修改 mongo数据
Query query = Query.query(Criteria.where("performanceId").is(performanceId)); Query query = Query.query(Criteria.where("arId").is(id));
Update update = Update.fromDocument(Document.parse(JsonUtils.toJson(show))); Update update = Update.fromDocument(Document.parse(JsonUtils.toJson(show)));
mongoTemplate.updateFirst(query, update,SweetPerformanceShow.class,SweetPerformanceShow.class.getSimpleName()); mongoTemplate.updateFirst(query, update, SweetPerformanceShow.class, SweetPerformanceShow.class.getSimpleName());
//修改mysql //修改mysql
sweetPerformanceMapper.update(show,Wrappers.lambdaUpdate(SweetPerformanceShow.class).eq(SweetPerformanceShow::getPerformanceId, performanceId)); sweetPerformanceMapper.update(show, Wrappers.lambdaUpdate(SweetPerformanceShow.class).eq(SweetPerformanceShow::getArId, id));
return ResponseDto.success(); return ResponseDto.success();
}catch (Exception e) { } catch (Exception e) {
return ResponseDto.failure(); return ResponseDto.failure();
} }
} }
@Override @Override
public ResponseDto<Boolean> del(String performanceId) { public ResponseDto<Boolean> del(String arId) {
//删除 //删除
List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR(); List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR();
for (SweetPerformanceShow performanceShow : performanceARList) { for (SweetPerformanceShow performanceShow : performanceARList) {
if (performanceShow.getPerformanceId().equals(performanceId)){ if (performanceShow.getArId().equals(arId)) {
//删除要修改的原数据 //删除要修改的原数据
performanceARList.remove(performanceShow); performanceARList.remove(performanceShow);
redisUtils.setPerformanceAR(performanceARList); redisUtils.setPerformanceAR(performanceARList);
break;
} }
} }
//redisUtils.delPerformanceARById(performanceId); mongoTemplate.remove(Query.query(Criteria.where("arId").is(arId)), SweetPerformanceShow.class.getSimpleName());
mongoTemplate.remove(Query.query(Criteria.where("performanceId").is(performanceId)),SweetPerformanceShow.class.getSimpleName()); sweetPerformanceMapper.delete(Wrappers.lambdaQuery(SweetPerformanceShow.class).eq(SweetPerformanceShow::getArId, arId));
sweetPerformanceMapper.delete(Wrappers.lambdaQuery(SweetPerformanceShow.class).eq(SweetPerformanceShow::getPerformanceId, performanceId));
return ResponseDto.success(); return ResponseDto.success();
} }
...@@ -143,16 +131,48 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap ...@@ -143,16 +131,48 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
try { try {
List<SweetPerformanceShow> data; List<SweetPerformanceShow> data;
PageHelper.startPage(page, size); PageHelper.startPage(page, size);
if(performanceName!=null){ if (performanceName != null) {
data = sweetPerformanceMapper.selectList(Wrappers.lambdaQuery(SweetPerformanceShow.class).like(SweetPerformanceShow::getPerformanceName, performanceName)); data = sweetPerformanceMapper.selectList(Wrappers.lambdaQuery(SweetPerformanceShow.class).like(SweetPerformanceShow::getPerformanceName, performanceName));
}else { } else {
data = sweetPerformanceMapper.selectList(Wrappers.lambdaQuery(SweetPerformanceShow.class)); data = sweetPerformanceMapper.selectList(Wrappers.lambdaQuery(SweetPerformanceShow.class));
} }
pageInfo = new PageInfo(data); pageInfo = new PageInfo(data);
return ResponseDto.success(pageInfo); return ResponseDto.success(pageInfo);
}catch (Exception e) { } catch (Exception e) {
return ResponseDto.success(pageInfo); return ResponseDto.success(pageInfo);
} }
} }
@Override
public ResponseDto<SweetPerformanceShow> details(String arId) {
return ResponseDto.success(sweetPerformanceMapper.selectOne(Wrappers.lambdaQuery(SweetPerformanceShow.class).eq(SweetPerformanceShow::getArId, arId)));
}
@Override
public ResponseDto<Boolean> changeStatus(String arId, Integer status) {
List<SweetPerformanceShow> performanceARList = redisUtils.getPerformanceAR();
SweetPerformanceShow data = null;
for (int i = 0; i < performanceARList.size(); i++) {
SweetPerformanceShow performanceShow = performanceARList.get(i);
if (performanceShow.getArId().equals(arId)) {
//覆盖要修改的原数据\
performanceShow.setStatus(status);
performanceARList.set(i, performanceShow);
redisUtils.setPerformanceAR(performanceARList);
data = performanceShow;
break;
}
}
//修改 mongo数据
BasicDBObject cv = new BasicDBObject("$set", mongoConverter.convertToMongoType(data));
mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("arId").is("arId")).getQueryObject(),
cv
);
//修改mysql
sweetPerformanceMapper.update(data, Wrappers.lambdaUpdate(SweetPerformanceShow.class).eq(SweetPerformanceShow::getArId, arId));
return ResponseDto.success();
}
} }
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