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

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

Merge branch 'hjc_sweet_video' into pre

parents 1605bc86 9c1b55ea
...@@ -56,8 +56,8 @@ public class SweetArtistsController { ...@@ -56,8 +56,8 @@ public class SweetArtistsController {
@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 = false),
@ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = true) @ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = false)
}) })
public ResponseDto<Boolean> add(SweetArtistsListParam sweetArtistsList) { public ResponseDto<Boolean> add(SweetArtistsListParam sweetArtistsList) {
return sweetArtistsService.add(sweetArtistsList); return sweetArtistsService.add(sweetArtistsList);
...@@ -80,8 +80,8 @@ public class SweetArtistsController { ...@@ -80,8 +80,8 @@ public class SweetArtistsController {
@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 = false),
@ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = true) @ApiImplicitParam(type = "query", dataType = "String[]", name = "videoArray", value = "视频数组", required = false)
}) })
public ResponseDto<Boolean> change(@RequestParam() String artistsId, SweetArtistsListParam sweetArtistsList) { public ResponseDto<Boolean> change(@RequestParam() String artistsId, SweetArtistsListParam sweetArtistsList) {
return sweetArtistsService.change(artistsId, sweetArtistsList); return sweetArtistsService.change(artistsId, sweetArtistsList);
......
...@@ -88,15 +88,19 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe ...@@ -88,15 +88,19 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
sweetArtistsMapper.insert(sweetArtists); sweetArtistsMapper.insert(sweetArtists);
sweetArtistsUrl.setArtistsId(mid); sweetArtistsUrl.setArtistsId(mid);
sweetArtistsUrl.setCreatedAt(time); sweetArtistsUrl.setCreatedAt(time);
for (String img : sweetArtistsList.getPicArray()) { if (sweetArtistsList.getPicArray() != null) {
sweetArtistsUrl.setUrl(img); for (String img : sweetArtistsList.getPicArray()) {
sweetArtistsUrl.setType("1"); sweetArtistsUrl.setUrl(img);
sweetArtistsUrlMapper.insert(sweetArtistsUrl); sweetArtistsUrl.setType("1");
sweetArtistsUrlMapper.insert(sweetArtistsUrl);
}
} }
for (String video : sweetArtistsList.getVideoArray()) { if (sweetArtistsList.getVideoArray() != null) {
sweetArtistsUrl.setUrl(video); for (String video : sweetArtistsList.getVideoArray()) {
sweetArtistsUrl.setType("2"); sweetArtistsUrl.setUrl(video);
sweetArtistsUrlMapper.insert(sweetArtistsUrl); sweetArtistsUrl.setType("2");
sweetArtistsUrlMapper.insert(sweetArtistsUrl);
}
} }
return ResponseDto.success(); return ResponseDto.success();
} catch (Exception e) { } catch (Exception e) {
......
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