xx

src/main/java/com/egolm/film/api/service/FilmService.java

@@ -135,5 +135,7 @@ public interface FilmService {
 			String film_country, Integer[] review_round, Integer[] review_state, Page page);
 
 	void allot(Long member_film_id, Integer review_round, Integer[] user_id);
+
+	void saveUploadInfo(Long member_film_id, String upload_id, Integer upload_state);
 	
 }

src/main/java/com/egolm/film/api/service/impl/FilmServiceImpl.java

@@ -513,4 +513,15 @@ public class FilmServiceImpl implements FilmService {
 		
 	}
 
+	@Override
+	public void saveUploadInfo(Long member_film_id, String upload_id, Integer upload_state) {
+		Fc_member_film film = new Fc_member_film();
+		film.setId(member_film_id);
+		film.setUpload_state(upload_state);
+		if(StringUtil.isNotBlank(upload_id)) {
+			film.setUpload_id(upload_id);
+		}
+		jdbcTemplate.merge(film);
+	}
+
 }

src/main/java/com/egolm/film/api/web/admin/AdminFirstController.java

@@ -170,25 +170,17 @@ public class AdminFirstController {
 	}
 	
 	@ResponseBody
-	@PostMapping("save_upload_id")
-	@ApiOperation("保存上传唯一ID")
+	@PostMapping("save_upload_info")
+	@ApiOperation("保存上传状态和上传ID")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType="query", dataType="long",   required=true, name="member_film_id", value="申报影片ID"),
 		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="upload_id",      value="影片上传ID"),
-	})
-	public Object save_upload_id(Long member_film_id, String upload_id) {
-		return Rjx.jsonOk();
-	}
-	
-	@ResponseBody
-	@PostMapping("save_upload_state")
-	@ApiOperation("保存上传状态")
-	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="query", dataType="long",   required=true, name="member_film_id", value="申报影片ID"),
 		@ApiImplicitParam(paramType="query", dataType="int",    required=true, name="upload_state",   value="影片上传状态"),
 	})
-	public Object save_upload_state(Long member_film_id, Integer upload_state) {
+	public Object save_upload_info(Long member_film_id, String upload_id, Integer upload_state) {
+		memberFilmService.saveUploadInfo(member_film_id, upload_id, upload_state);
 		return Rjx.jsonOk();
 	}
 	
+	
 }

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

@@ -295,6 +295,16 @@ public class Fc_member_film implements java.io.Serializable {
 	 */
 	private Integer review_round;
 
+	/**
+	 * 上传影片标记
+	 */
+	private String upload_id;
+
+	/**
+	 * 上传影片状态(0上传中,1转码中,2已完成)
+	 */
+	private Integer upload_state;
+
 
 	/**
 	 * 无参数构造方法
@@ -362,8 +372,10 @@ public class Fc_member_film implements java.io.Serializable {
 	 * @param is_check_director 状态
 	 * @param pass_time 通过时间
 	 * @param review_round 当前审片是第几轮
+	 * @param upload_id 上传影片标记
+	 * @param upload_state 上传影片状态(0上传中,1转码中,2已完成)
 	 */
-	public Fc_member_film(Long id, Integer film_no, String origion_name, String en_name, String cn_name, Integer type, Long film_group_id, Integer film_type, String film_type_name, String show_date, Long show_time, String first_show_date, String first_show_city, Integer is_apply_other_filmfest, String other_filmfest_name, String film_medium, String film_format, String completion_date, String film_country, String co_production_country, String film_producers, String production_company, String enroll_type_name, Integer enroll_type, Integer is_like_show, Long create_time, Integer member_id, String create_ip, Integer state, String prize, String dialogue_lang, String subtitle_lang, String play_shanghai, String has_joined_award, String intro, String en_intro, Long last_modify_time, String film_side_demand, String film_total_time, Integer is_show, String film_apply_company, String film_apply_realname, String film_apply_email, String film_apply_tel, String film_apply_mobile, String film_apply_country, String enroll_type_name_other, String film_format_url, String film_format_passw, String film_format_other, String film_type_name_short, String lang, Integer apply_state, String film_district, Integer is_check_director, Long pass_time, Integer review_round) {
+	public Fc_member_film(Long id, Integer film_no, String origion_name, String en_name, String cn_name, Integer type, Long film_group_id, Integer film_type, String film_type_name, String show_date, Long show_time, String first_show_date, String first_show_city, Integer is_apply_other_filmfest, String other_filmfest_name, String film_medium, String film_format, String completion_date, String film_country, String co_production_country, String film_producers, String production_company, String enroll_type_name, Integer enroll_type, Integer is_like_show, Long create_time, Integer member_id, String create_ip, Integer state, String prize, String dialogue_lang, String subtitle_lang, String play_shanghai, String has_joined_award, String intro, String en_intro, Long last_modify_time, String film_side_demand, String film_total_time, Integer is_show, String film_apply_company, String film_apply_realname, String film_apply_email, String film_apply_tel, String film_apply_mobile, String film_apply_country, String enroll_type_name_other, String film_format_url, String film_format_passw, String film_format_other, String film_type_name_short, String lang, Integer apply_state, String film_district, Integer is_check_director, Long pass_time, Integer review_round, String upload_id, Integer upload_state) {
 		this.id = id;
 		this.film_no = film_no;
 		this.origion_name = origion_name;
@@ -421,6 +433,8 @@ public class Fc_member_film implements java.io.Serializable {
 		this.is_check_director = is_check_director;
 		this.pass_time = pass_time;
 		this.review_round = review_round;
+		this.upload_id = upload_id;
+		this.upload_state = upload_state;
 	}
 
 	public void setId(Long id) {
@@ -879,5 +893,21 @@ public class Fc_member_film implements java.io.Serializable {
 		return review_round;
 	}
 
+	public void setUpload_id(String upload_id) {
+		this.upload_id = upload_id;
+	}
+
+	public String getUpload_id() {
+		return upload_id;
+	}
+
+	public void setUpload_state(Integer upload_state) {
+		this.upload_state = upload_state;
+	}
+
+	public Integer getUpload_state() {
+		return upload_state;
+	}
+
 }