|
@@ -63,9 +63,9 @@ public class ByteDanceCreativeTemplateController {
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
HttpServletRequest req) {
|
|
HttpServletRequest req) {
|
|
- Result<IPage<ByteDanceCreativeTemplate>> result = new Result<IPage<ByteDanceCreativeTemplate>>();
|
|
|
|
|
|
+ Result<IPage<ByteDanceCreativeTemplate>> result = new Result<>();
|
|
QueryWrapper<ByteDanceCreativeTemplate> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCreativeTemplate, req.getParameterMap());
|
|
QueryWrapper<ByteDanceCreativeTemplate> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCreativeTemplate, req.getParameterMap());
|
|
- Page<ByteDanceCreativeTemplate> page = new Page<ByteDanceCreativeTemplate>(pageNo, pageSize);
|
|
|
|
|
|
+ Page<ByteDanceCreativeTemplate> page = new Page<>(pageNo, pageSize);
|
|
IPage<ByteDanceCreativeTemplate> pageList = byteDanceCreativeTemplateService.page(page, queryWrapper);
|
|
IPage<ByteDanceCreativeTemplate> pageList = byteDanceCreativeTemplateService.page(page, queryWrapper);
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
result.setResult(pageList);
|
|
result.setResult(pageList);
|
|
@@ -82,7 +82,7 @@ public class ByteDanceCreativeTemplateController {
|
|
@ApiOperation(value = "广告创意模板-添加", notes = "广告创意模板-添加")
|
|
@ApiOperation(value = "广告创意模板-添加", notes = "广告创意模板-添加")
|
|
@PostMapping(value = "/add")
|
|
@PostMapping(value = "/add")
|
|
public Result<ByteDanceCreativeTemplate> add(@RequestBody ByteDanceCreativeTemplate byteDanceCreativeTemplate) {
|
|
public Result<ByteDanceCreativeTemplate> add(@RequestBody ByteDanceCreativeTemplate byteDanceCreativeTemplate) {
|
|
- Result<ByteDanceCreativeTemplate> result = new Result<ByteDanceCreativeTemplate>();
|
|
|
|
|
|
+ Result<ByteDanceCreativeTemplate> result = new Result<>();
|
|
try {
|
|
try {
|
|
byteDanceCreativeTemplateService.save(byteDanceCreativeTemplate);
|
|
byteDanceCreativeTemplateService.save(byteDanceCreativeTemplate);
|
|
result.success("添加成功!");
|
|
result.success("添加成功!");
|
|
@@ -103,7 +103,7 @@ public class ByteDanceCreativeTemplateController {
|
|
@ApiOperation(value = "广告创意模板-编辑", notes = "广告创意模板-编辑")
|
|
@ApiOperation(value = "广告创意模板-编辑", notes = "广告创意模板-编辑")
|
|
@PutMapping(value = "/edit")
|
|
@PutMapping(value = "/edit")
|
|
public Result<ByteDanceCreativeTemplate> edit(@RequestBody ByteDanceCreativeTemplate byteDanceCreativeTemplate) {
|
|
public Result<ByteDanceCreativeTemplate> edit(@RequestBody ByteDanceCreativeTemplate byteDanceCreativeTemplate) {
|
|
- Result<ByteDanceCreativeTemplate> result = new Result<ByteDanceCreativeTemplate>();
|
|
|
|
|
|
+ Result<ByteDanceCreativeTemplate> result = new Result<>();
|
|
ByteDanceCreativeTemplate byteDanceCreativeTemplateEntity = byteDanceCreativeTemplateService.getById(byteDanceCreativeTemplate.getId());
|
|
ByteDanceCreativeTemplate byteDanceCreativeTemplateEntity = byteDanceCreativeTemplateService.getById(byteDanceCreativeTemplate.getId());
|
|
if (byteDanceCreativeTemplateEntity == null) {
|
|
if (byteDanceCreativeTemplateEntity == null) {
|
|
result.error500("未找到对应实体");
|
|
result.error500("未找到对应实体");
|
|
@@ -147,7 +147,7 @@ public class ByteDanceCreativeTemplateController {
|
|
@ApiOperation(value = "广告创意模板-批量删除", notes = "广告创意模板-批量删除")
|
|
@ApiOperation(value = "广告创意模板-批量删除", notes = "广告创意模板-批量删除")
|
|
@DeleteMapping(value = "/deleteBatch")
|
|
@DeleteMapping(value = "/deleteBatch")
|
|
public Result<ByteDanceCreativeTemplate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
|
public Result<ByteDanceCreativeTemplate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
|
|
- Result<ByteDanceCreativeTemplate> result = new Result<ByteDanceCreativeTemplate>();
|
|
|
|
|
|
+ Result<ByteDanceCreativeTemplate> result = new Result<>();
|
|
if (ids == null || "".equals(ids.trim())) {
|
|
if (ids == null || "".equals(ids.trim())) {
|
|
result.error500("参数不识别!");
|
|
result.error500("参数不识别!");
|
|
} else {
|
|
} else {
|
|
@@ -167,7 +167,7 @@ public class ByteDanceCreativeTemplateController {
|
|
@ApiOperation(value = "广告创意模板-通过id查询", notes = "广告创意模板-通过id查询")
|
|
@ApiOperation(value = "广告创意模板-通过id查询", notes = "广告创意模板-通过id查询")
|
|
@GetMapping(value = "/queryById")
|
|
@GetMapping(value = "/queryById")
|
|
public Result<ByteDanceCreativeTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
|
|
public Result<ByteDanceCreativeTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
|
|
- Result<ByteDanceCreativeTemplate> result = new Result<ByteDanceCreativeTemplate>();
|
|
|
|
|
|
+ Result<ByteDanceCreativeTemplate> result = new Result<>();
|
|
ByteDanceCreativeTemplate byteDanceCreativeTemplate = byteDanceCreativeTemplateService.getById(id);
|
|
ByteDanceCreativeTemplate byteDanceCreativeTemplate = byteDanceCreativeTemplateService.getById(id);
|
|
if (byteDanceCreativeTemplate == null) {
|
|
if (byteDanceCreativeTemplate == null) {
|
|
result.error500("未找到对应实体");
|
|
result.error500("未找到对应实体");
|
|
@@ -222,7 +222,8 @@ public class ByteDanceCreativeTemplateController {
|
|
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
|
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
|
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
|
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
|
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
|
|
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
|
|
- MultipartFile file = entity.getValue();// 获取上传文件对象
|
|
|
|
|
|
+ // 获取上传文件对象
|
|
|
|
+ MultipartFile file = entity.getValue();
|
|
ImportParams params = new ImportParams();
|
|
ImportParams params = new ImportParams();
|
|
params.setTitleRows(2);
|
|
params.setTitleRows(2);
|
|
params.setHeadRows(1);
|
|
params.setHeadRows(1);
|
|
@@ -244,5 +245,4 @@ public class ByteDanceCreativeTemplateController {
|
|
}
|
|
}
|
|
return Result.ok("文件导入失败!");
|
|
return Result.ok("文件导入失败!");
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|