Merge branch 'master' of http://gitlab.egolm.com/hanxu/siff-film-api.git

src/main/java/com/egolm/film/api/web/FilmController.java

@@ -199,10 +199,42 @@ public class FilmController {
 		return Rjx.jsonOk().set("id", filmBase.getId());
 	}
 	
+	/**
+	 * 
+	 * @param filmExt
+	 * @return
+	 */
 	@ResponseBody
 	@Transactional
 	@PostMapping("save_film_ext")
 	@ApiOperation("保存电影扩展信息")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="query", dataType="string", name="id", value="影片ID"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="synopsis_cn", value="影片简介中文"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="synopsis_en", value="影片简介英文"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="director_cn", value="导演中文名"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="director_en", value="导演英文名"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="director_biography_cn", value="导演中文简介"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="director_biography_en", value="导演英文简介"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="producer_cn", value="制片人中文名"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="producer_en", value="制片人英文名"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="format", value="放映格式"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="screenplay", value="编剧"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="director_of_photography", value="摄影指导"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="music", value="音乐"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="production_designer", value="艺术指导"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="executive_producer", value="执行制片人"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="editor", value="剪辑"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="cast", value="主要演员制片人"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="world_sales", value="国际销售"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="resolution", value="分辨率"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="aspect_ratio", value="画幅"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="sound_format", value="音频"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="frame_rate", value="帧数"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="kdm", value="密钥"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="director_photo", value="导演照片"),
+		@ApiImplicitParam(paramType="query", dataType="string", name="mv_photo", value="剧照"),
+	})
 	public Object update_base(Fc_member_film_ext filmExt) {
 		filmService.saveOrUpdateFilmExt(filmExt);
 		return Rjx.jsonOk();

src/main/java/com/egolm/film/bean/Fc_member_film_ext.java

 package com.egolm.film.bean;
 
 import javax.persistence.Entity;
-
-import javax.persistence.Column;
-
 import javax.persistence.Id;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -14,98 +11,81 @@ public class Fc_member_film_ext implements java.io.Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@ApiModelProperty("影片主表ID(film_id)")
-	@Column(columnDefinition="int(11) COMMENT '影片ID'")
+	@ApiModelProperty(value="int(11) COMMENT '影片ID'")
 	private Integer id;
 
-	@ApiModelProperty("影片简介中文")
-	@Column(columnDefinition="varchar(255) COMMENT '影片简介中文'")
+	@ApiModelProperty(value="varchar(255) COMMENT '影片简介中文'")
 	private String synopsis_cn;
 
-	@ApiModelProperty("影片简介英文")
-	@Column(columnDefinition="varchar(255) COMMENT '影片简介英文'")
+	@ApiModelProperty(value="varchar(255) COMMENT '影片简介英文'")
 	private String synopsis_en;
 
-	@ApiModelProperty("导演中文名")
-	@Column(columnDefinition="varchar(255) COMMENT '导演中文名'")
+	@ApiModelProperty(value="varchar(255) COMMENT '导演中文名'")
 	private String director_cn;
 
-	@ApiModelProperty("导演英文名")
-	@Column(columnDefinition="varchar(255) COMMENT '导演英文名'")
+	@ApiModelProperty(value="varchar(255) COMMENT '导演英文名'")
 	private String director_en;
 
-	@ApiModelProperty("导演中文简介")
-	@Column(columnDefinition="varchar(255) COMMENT '导演中文简介'")
+	@ApiModelProperty(value="varchar(255) COMMENT '导演中文简介'")
 	private String director_biography_cn;
 
-	@ApiModelProperty("导演英文简介")
-	@Column(columnDefinition="varchar(255) COMMENT '导演英文简介'")
+	@ApiModelProperty(value="varchar(255) COMMENT '导演英文简介'")
 	private String director_biography_en;
 
-	@ApiModelProperty("制片人中文名")
-	@Column(columnDefinition="varchar(255) COMMENT '制片人中文名'")
+	@ApiModelProperty(value="varchar(255) COMMENT '制片人中文名'")
 	private String producer_cn;
 
-	@ApiModelProperty("制片人英文名")
-	@Column(columnDefinition="varchar(255) COMMENT '制片人英文名'")
+	@ApiModelProperty(value="varchar(255) COMMENT '制片人英文名'")
 	private String producer_en;
 
-	@ApiModelProperty("放映格式")
-	@Column(columnDefinition="varchar(255) COMMENT '放映格式'")
+	@ApiModelProperty(value="varchar(255) COMMENT '放映格式'")
 	private String format;
 
-	@ApiModelProperty("编剧")
-	@Column(columnDefinition="varchar(255) COMMENT '编剧'")
+	@ApiModelProperty(value="varchar(255) COMMENT '编剧'")
 	private String screenplay;
 
-	@ApiModelProperty("摄影指导")
-	@Column(columnDefinition="varchar(255) COMMENT '摄影指导'")
+	@ApiModelProperty(value="varchar(255) COMMENT '摄影指导'")
 	private String director_of_photography;
 
-	@ApiModelProperty("音乐")
-	@Column(columnDefinition="varchar(255) COMMENT '音乐'")
+	@ApiModelProperty(value="varchar(255) COMMENT '音乐'")
 	private String music;
 
-	@ApiModelProperty("艺术指导")
-	@Column(columnDefinition="varchar(255) COMMENT '艺术指导'")
+	@ApiModelProperty(value="varchar(255) COMMENT '艺术指导'")
 	private String production_designer;
 
-	@ApiModelProperty("执行制片人")
-	@Column(columnDefinition="varchar(255) COMMENT '执行制片人'")
+	@ApiModelProperty(value="varchar(255) COMMENT '执行制片人'")
 	private String executive_producer;
 
-	@ApiModelProperty("剪辑")
-	@Column(columnDefinition="varchar(255) COMMENT '剪辑'")
+	@ApiModelProperty(value="varchar(255) COMMENT '剪辑'")
 	private String editor;
 
-	@ApiModelProperty("主要演员制片人")
-	@Column(columnDefinition="varchar(255) COMMENT '主要演员制片人'")
+	@ApiModelProperty(value="varchar(255) COMMENT '主要演员制片人'")
 	private String cast;
 
-	@ApiModelProperty("国际销售")
-	@Column(columnDefinition="varchar(255) COMMENT '国际销售'")
+	@ApiModelProperty(value="varchar(255) COMMENT '国际销售'")
 	private String world_sales;
 
-	@ApiModelProperty("分辨率")
-	@Column(columnDefinition="varchar(255) COMMENT '分辨率'")
+	@ApiModelProperty(value="varchar(255) COMMENT '分辨率'")
 	private String resolution;
 
-	@ApiModelProperty("画幅")
-	@Column(columnDefinition="varchar(255) COMMENT '画幅'")
+	@ApiModelProperty(value="varchar(255) COMMENT '画幅'")
 	private String aspect_ratio;
 
-	@ApiModelProperty("音频")
-	@Column(columnDefinition="varchar(255) COMMENT '音频'")
+	@ApiModelProperty(value="varchar(255) COMMENT '音频'")
 	private String sound_format;
 
-	@ApiModelProperty("帧数")
-	@Column(columnDefinition="varchar(255) COMMENT '帧数'")
+	@ApiModelProperty(value="varchar(255) COMMENT '帧数'")
 	private String frame_rate;
 
-	@ApiModelProperty("密钥")
-	@Column(columnDefinition="varchar(255) COMMENT '密钥'")
+	@ApiModelProperty(value="varchar(255) COMMENT '密钥'")
 	private String kdm;
 
+	@ApiModelProperty(value="varchar(255) COMMENT '导演照片'")
+	private String director_photo;
+
+	@ApiModelProperty(value="varchar(255) COMMENT '剧照'")
+	private String mv_photo;
+
 
 	public void setId(Integer id) {
 		this.id = id;
@@ -291,5 +271,21 @@ public class Fc_member_film_ext implements java.io.Serializable {
 		return kdm;
 	}
 
+	public void setDirector_photo(String director_photo) {
+		this.director_photo = director_photo;
+	}
+
+	public String getDirector_photo() {
+		return director_photo;
+	}
+
+	public void setMv_photo(String mv_photo) {
+		this.mv_photo = mv_photo;
+	}
+
+	public String getMv_photo() {
+		return mv_photo;
+	}
+
 }