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

Commit d5ddd54e authored by jiangxiulong's avatar jiangxiulong

banner参数特殊值0的必填判断 时间空的处理null

演出状态值 sort排序默认放在下面报错处理
parent 1df07d97
......@@ -34,14 +34,14 @@ public class BannersParam implements Serializable {
private String coverImg;
@ApiModelProperty(value = "跳转类型 具体类型有接口提供", required = true, example = "6")
@Min(value = 1, message = "请选择跳转类型")
@Min(value = 0, message = "请选择跳转类型")
private Integer targetType;
@ApiModelProperty(value = "跳转目标id或者url 不跳转则为空", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
private String targetObj;
@ApiModelProperty(value = "是否上线展示 0下线 1上线", required = true, example = "1", allowableValues = "0,1")
@Min(value = 1, message = "请选择是否上线")
@Min(value = 0, message = "请选择是否上线")
private Integer isOnline;
@ApiModelProperty(value = "上线开始时间", example = "2021-05-01 11:22:33")
......@@ -60,14 +60,14 @@ public class BannersParam implements Serializable {
@ApiModelProperty(value = "备注", example = "这是一个演出推广的banner")
private String remarks;
@ApiModelProperty(value = "展示的位置 多选 数组", example = "[\"1\", \"4\", \"3\", \"5\", \"6\", \"8\"]")
@ApiModelProperty(value = "展示的位置 多选 数组", example = "[\"1\", \"3\", \"5\", \"6\", \"8\"]")
@NotEmpty(message = "请选择展示位置")
private List positionList;
@ApiModelProperty(value = "推广省份 多选 数组", example = "[\"1\", \"2\", \"5\"]")
@ApiModelProperty(value = "推广省份 多选 数组", example = "[\"110000\", \"120000\", \"210100\"]")
private List provincesList;
@ApiModelProperty(value = "推广省份 多选 数组", example = "[\"北京\", \"天津\", \"上海\"]")
@ApiModelProperty(value = "推广省份 多选 数组", example = "[\"北京市\", \"天津市\", \"沈阳市\"]")
private List provincesNameList;
@JsonIgnore
......
......@@ -34,7 +34,7 @@ public class KylinBannersController {
@GetMapping("")
@ApiOperation("banner列表")
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "position", value = "展示位置 1首页 3周边 4演出 5积分商城 6YB 8视频", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "position", value = "展示位置 1首页 3周边 5积分商城 6YB 8视频", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "provinceName", value = "城市名称"),
})
public ResponseDto<List<BannersVo>> blist(
......
......@@ -38,7 +38,8 @@ public class KylinPerformancesController {
@ApiImplicitParam(type = "query", dataType = "int", name = "days", value = "时间范围 几天 今天1 三天3。。。"),
@ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "演出名称"),
@ApiImplicitParam(type = "query", dataType = "String", name = "cityName", value = "城市名称"),
@ApiImplicitParam(type = "query", dataType = "int", name = "type", value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧"),
@ApiImplicitParam(type = "query", dataType = "int", name = "type", value = "演出类型 101音乐节 102小型演出(livehouse演出) 103巡演 演出类型只有这几个了"),
// @ApiImplicitParam(type = "query", dataType = "int", name = "type", value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧"),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "isDiscount", value = "是否会员优惠 0 1"),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "isAdvance", value = "是否优先 0 1"),
......
......@@ -5,8 +5,8 @@ import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
import com.liquidnet.service.kylin.dto.param.BannersParam;
import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
import com.liquidnet.service.kylin.dto.vo.BannersVo;
import com.liquidnet.service.kylin.dto.vo.PagerVo;
import com.liquidnet.service.kylin.entity.KylinBanners;
import com.liquidnet.service.kylin.service.impl.admin.KylinBannersServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -57,8 +57,8 @@ public class KylinBannersAdminController {
@GetMapping("{bannersId}")
@ApiOperation("banner详情")
public ResponseDto<KylinBanners> detail(@PathVariable("bannersId") String bannersId) {
KylinBanners result = null;
public ResponseDto<BannersVo> detail(@PathVariable("bannersId") String bannersId) {
BannersVo result = null;
result = kylinBannersServiceImpl.detail(bannersId);
if (null != result) {
return ResponseDto.success(result);
......
......@@ -53,7 +53,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
HashMap<String, Object> info = new HashMap<>();
// 排序 分页
Sort sortName = null; // 默认开票越早的在上面
Sort sortName = Sort.by(Sort.Direction.ASC, "timeStart"); // 默认开票越早的在上面
if (sort.equals("DESC")) {
if (!orderBy.isEmpty()) {
sortName = Sort.by(Sort.Direction.DESC, orderBy);
......@@ -62,8 +62,6 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
if (!orderBy.isEmpty()) {
sortName = Sort.by(Sort.Direction.ASC, orderBy);
}
} else {
sortName = Sort.by(Sort.Direction.ASC, "timeStart");
}
Pageable pageable = PageRequest.of(page - 1, size, sortName);
......
......@@ -68,6 +68,12 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
String bannersId = IDGenerator.nextSnowId().toString();
LocalDateTime createdAt = LocalDateTime.now();
String createdAtString = createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
if (StringUtils.isNullOrEmpty(bannersParam.getOnlineStartTime())) {
bannersParam.setOnlineStartTime(null);
}
if (StringUtils.isNullOrEmpty(bannersParam.getOnlineEndTime())) {
bannersParam.setOnlineEndTime(null);
}
// 入数据库
bannersMapper.insert(bannersParam.getFields(bannersId, createdAtString));
......@@ -101,7 +107,7 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
bannersVo.setTargetObj("");
}
if (StringUtils.isNullOrEmpty(bannersParam.getOnlineStartTime())) {
bannersVo.setOnlineEndTime("");
bannersVo.setOnlineStartTime("");
}
if (StringUtils.isNullOrEmpty(bannersParam.getOnlineEndTime())) {
bannersVo.setOnlineEndTime("");
......@@ -132,6 +138,12 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
KylinBanners params = bannersParam.getFields(null, null);
params.setUpdatedAt(updatedAtString);
if (StringUtils.isNullOrEmpty(bannersParam.getOnlineStartTime())) {
params.setOnlineStartTime(null);
}
if (StringUtils.isNullOrEmpty(bannersParam.getOnlineEndTime())) {
params.setOnlineEndTime(null);
}
// 入数据库
bannersMapper.update(params, new UpdateWrapper<KylinBanners>().eq("banners_id", bannersId));
......@@ -181,15 +193,23 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
}
}
public KylinBanners detail(String bannersId) {
public BannersVo detail(String bannersId) {
KylinBanners data = bannersMapper.selectOne(new UpdateWrapper<KylinBanners>().eq("banners_id", bannersId).eq("is_deleted", 1));
List<String> positionList = kylinBannersRelationsMapper.getBannersRelationsField("field_id", bannersId, 1);
List<String> provincesList = kylinBannersRelationsMapper.getBannersRelationsField("field_id", bannersId, 2);
data.setPositionList(positionList);
data.setProvincesList(provincesList);
BannersVo bannersVo = new BannersVo();
if (null != data) {
List<String> positionList = kylinBannersRelationsMapper.getBannersRelationsField("field_id", bannersId, 1);
List<String> provincesList = kylinBannersRelationsMapper.getBannersRelationsField("field_id", bannersId, 2);
data.setPositionList(positionList);
data.setProvincesList(provincesList);
bannersVo = new BannersVo();
BeanUtils.copyProperties(data, bannersVo);
}else {
return null;
}
return data;
return bannersVo;
}
public List<BannerDetailsListDao> bannerList(BannersSearchParam bannersSearchParam) {
......
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