zhangjinli 3 years ago
parent f08e334c2e
commit 3126ec2137

@ -2,6 +2,7 @@ package com.zh.project0512.controller.manage;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -24,6 +25,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -34,6 +36,8 @@ import java.sql.Ref;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
@ -97,7 +101,7 @@ public class ReferenceController {
.setDuration(e.getDuration())
.setFileUrl(url)
.setType(FileTypeUtil.getcontentTypeNum(url.substring(url.lastIndexOf("."))))
);
);
// ta.add(new TopicActivity().setTitle(param.getTitle()).setCover(param.getCoverUrl()).setCreatAt(LocalDateTime.now())
// .setContent(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf(".")))));
}
@ -246,15 +250,73 @@ public class ReferenceController {
private Integer duration;
@Schema(title = "封面图片地址")
private String coverUrl;
@Schema(title = "素材分组id", description = "0为未分组")
private Integer groupId;
@Schema(title = "标签id列表")
private List<Integer> tagList;
@Schema(title = "品牌id列表")
private List<Integer> brandList;
}
@Operation(summary = "更新素材")
@PostMapping("/upd")
@Transactional
@AdminTokenValid
@AdminCheckAuthorityAnnotation(jurisdictionId = "108")
public Result upd(@Validated @RequestBody UpdRParam param) {
int id = param.getId();
Reference reference = new Reference().setTitle(param.getTitle()).setFileUrl(param.getFileUrl()).setCoverUrl(param.getCoverUrl()).setUpdateAt(LocalDateTime.now());
// 添加任务标签
List tagIdList = param.getTagList();
if (tagIdList != null) {
if (tagIdList.size() == 0) {
referenceTagService.remove(new QueryWrapper<ReferenceTag>().eq("referenceId", id));
} else {
List<ReferenceTag> tagListOri = referenceTagService.list(new QueryWrapper<ReferenceTag>().eq("referenceId", id));
referenceTagService.remove(new QueryWrapper<ReferenceTag>().eq("referenceId", id).notIn((tagIdList != null && tagIdList.size() != 0), "tagId", tagIdList));
List tagIdListOri = new ArrayList();
for (ReferenceTag rt : tagListOri) {
tagIdListOri.add(rt.getTagId());
}
List<Integer> collect = (List) tagIdList.stream().filter(item -> !tagIdListOri.contains(item)).collect(Collectors.toList());
if (collect != null && collect.size() != 0) {
List<JSONObject> tag = new ArrayList<>();
for (Integer t : collect) {
tag.add(new JSONObject().fluentPut("referenceId", id).fluentPut("tagId", t));
}
referenceTagService.addGroup(tag);
}
}
}
// 添加任务品牌
List brandIdList = param.getBrandList();
if (brandIdList != null) {
if (brandIdList.size() == 0) {
referenceBrandService.remove(new QueryWrapper<ReferenceBrand>().eq("referenceId", id));
} else {
List<ReferenceBrand> brandListOri = referenceBrandService.list(new QueryWrapper<ReferenceBrand>().eq("referenceId", id));
referenceBrandService.remove(new QueryWrapper<ReferenceBrand>().eq("referenceId", id).notIn("brandId", brandIdList));
List brandIdListOri = new ArrayList();
for (ReferenceBrand rb : brandListOri) {
brandIdListOri.add(rb.getBrandId());
}
List<Integer> collect = (List) brandIdList.stream().filter(item -> !brandIdListOri.contains(item)).collect(Collectors.toList());
if (collect != null && collect.size() != 0) {
List<JSONObject> brand = new ArrayList<>();
for (Integer t : collect) {
brand.add(new JSONObject().fluentPut("referenceId", id).fluentPut("brandId", t));
}
referenceBrandService.addGroup(brand);
}
}
}
Reference reference = new Reference()
.setTitle(param.getTitle())
.setFileUrl(param.getFileUrl())
.setCoverUrl(param.getCoverUrl())
.setGroupId(param.getGroupId())
.setUpdateAt(LocalDateTime.now());
if (param.getFileUrl() != null) {
String fileName = param.getFileUrl();
reference.setType(FileTypeUtil.getcontentTypeNum(fileName.substring(fileName.lastIndexOf("."))));
@ -272,10 +334,10 @@ public class ReferenceController {
private Integer groupId;
@Schema(title = "月份区间")
private Integer month;
@Schema(title = "开始时间(yyyy-MM-dd HH:mm:ss)",description = "如果传入month以月份区间为条件")
@Schema(title = "开始时间(yyyy-MM-dd HH:mm:ss)", description = "如果传入month以月份区间为条件")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime beginTime;
@Schema(title = "结束时间(yyyy-MM-dd HH:mm:ss)",description = "如果传入month以月份区间为条件")
@Schema(title = "结束时间(yyyy-MM-dd HH:mm:ss)", description = "如果传入month以月份区间为条件")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
@Schema(title = "tagId数组")
@ -296,9 +358,9 @@ public class ReferenceController {
}
if (null != param.getMonth()) {
qw.between("t1.creatAt", LocalDateTime.now().minusMonths(param.getMonth()), LocalDateTime.now());
}else{
qw.ge(param.getBeginTime()!=null,"t1.creatAt",param.getBeginTime());
qw.le(param.getEndTime()!=null,"t1.creatAt",param.getEndTime());
} else {
qw.ge(param.getBeginTime() != null, "t1.creatAt", param.getBeginTime());
qw.le(param.getEndTime() != null, "t1.creatAt", param.getEndTime());
}
if (null != param.getKeyword()) {
qw.like("t1.title", param.getKeyword());

Loading…
Cancel
Save