x

src/main/java/com/egolm/film/api/web/member/MemberApplyController.java

@@ -3,8 +3,6 @@ package com.egolm.film.api.web.member;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -50,157 +48,6 @@ public class MemberApplyController {
 		return Rjx.jsonOk().setData(list);
 	}
 	
-	@ResponseBody
-	@PostMapping("save_type")
-	@ApiOperation("新增影片,并保存申报影片类型")
-	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="header", dataType="string", name="i18n_language"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_type_name",   value="影片类型"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="enroll_type_name", value="影片性质"),
-	})
-	public Object saveMemberFilmType(String film_type_name, String enroll_type_name) {
-		LoginToken loginToken = tokenService.getToken();
-		Integer member_id = (Integer)loginToken.getId();
-		Long member_film_id = filmService.saveMemberFilmType(member_id, film_type_name, enroll_type_name);
-		return Rjx.jsonOk().set("member_film_id", member_film_id);
-	}
-	
-	@ResponseBody
-	@PostMapping("save_base")
-	@ApiOperation("保存影片基本信息")
-	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="header", dataType="string", name="i18n_language"),
-		@ApiImplicitParam(paramType="query", dataType="long",   required=true,  name="member_film_id",         value="影片ID"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=false, name="enroll_type_name_other", value="申报奖项", allowMultiple=true),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="cn_name",                value="中文名称"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="en_name",                value="英文名称"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="intro",                  value="影片简介"),
-	})
-	public Object saveMemberFilmBase(
-			Long member_film_id, 
-			String cn_name, 
-			String en_name, 
-			String intro, HttpServletRequest req) {
-		
-		LoginToken loginToken = tokenService.getToken();
-		Integer member_id = (Integer)loginToken.getId();
-		String[] enroll_type_name_other = req.getParameterValues("enroll_type_name_other");
-		filmService.saveMemberFilmBase(
-				member_id, 
-				member_film_id, 
-				enroll_type_name_other,
-				cn_name, 
-				en_name,
-				intro);
-		filmService.initKeywords(member_film_id);
-		return Rjx.jsonOk();
-	}
-	
-	@ResponseBody
-	@PostMapping("save_info")
-	@ApiOperation("保存影片制作信息")
-	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="header", dataType="string", name="i18n_language"),
-		@ApiImplicitParam(paramType="query", dataType="long",   required=true,  name="member_film_id",        value="影片ID"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="film_country",          value="制作国家"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="dialogue_lang",         value="对白语言"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="subtitle_lang",         value="字幕语言"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="co_production_country", value="合拍国家"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="film_total_time",       value="影片时长"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="completion_date",       value="完成日期"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="show_date",             value="公映日期"),
-		
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="first_show_date",         value="首次上映日期"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="first_show_city",         value="首次上映城市"),
-		@ApiImplicitParam(paramType="query", dataType="int",    required=true,  name="is_apply_other_filmfest", value="是否申请其他电影节", allowableValues="0, 1"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=false, name="other_filmfest_name",     value="申请其他电影节名称"),
-		
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="film_medium",           value="影片色彩"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="film_format",           value="样片规格"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=false, name="film_format_url",       value="样片URL地址"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=false, name="film_format_passw",     value="样片URL访问密码"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=false, name="film_format_other",     value="其他样品信息"),
-	})
-	public Object saveMemberFilmInfo(
-			Long member_film_id, 
-			String film_country, 
-			String dialogue_lang,
-			String subtitle_lang, 
-			String film_total_time, 
-			String completion_date, 
-			String show_date, 
-			String first_show_date,
-			String first_show_city,
-			Integer is_apply_other_filmfest,
-			String other_filmfest_name,
-			String film_medium, 
-			String film_format,
-			String film_format_url,
-			String film_format_passw,
-			String film_format_other, 
-			HttpServletRequest req) {
-		
-		LoginToken loginToken = tokenService.getToken();
-		Integer member_id = (Integer)loginToken.getId();
-		String[] co_production_country = req.getParameterValues("co_production_country");
-		filmService.saveMemberFilmInfo(
-				member_id,
-				member_film_id, 
-				film_country, 
-				dialogue_lang, 
-				subtitle_lang, 
-				co_production_country, 
-				film_total_time, 
-				completion_date, 
-				show_date, 
-				first_show_date,
-				first_show_city,
-				is_apply_other_filmfest,
-				other_filmfest_name,
-				film_medium, 
-				film_format, 
-				film_format_url,
-				film_format_passw,
-				film_format_other);
-		return Rjx.jsonOk();
-	}
-	
-	@ResponseBody
-	@PostMapping("save_company")
-	@ApiOperation("保存影片申报信息")
-	@ApiImplicitParams({
-		@ApiImplicitParam(paramType="header", dataType="string", name="i18n_language"),
-		@ApiImplicitParam(paramType="query", dataType="long",   required=true, name="member_film_id",       value="影片ID"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_apply_company",   value="申报公司"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_apply_realname",  value="申报联系人"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_apply_email",     value="申报邮件"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_apply_tel",       value="申报电话"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_apply_mobile",    value="申报手机"),
-		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_apply_country",   value="申报国家"),
-	})
-	public Object saveMemberFilmCompany(
-			Long member_film_id, String 
-			film_apply_company, 
-			String film_apply_realname, 
-			String film_apply_email, 
-			String film_apply_tel, 
-			String film_apply_mobile, 
-			String film_apply_country) {
-		
-		LoginToken loginToken = tokenService.getToken();
-		Integer member_id = (Integer)loginToken.getId();
-		filmService.saveMemberFilmCompany(
-				member_id,
-				member_film_id, 
-				film_apply_company,
-				film_apply_realname,
-				film_apply_email, 
-				film_apply_tel, 
-				film_apply_mobile,
-				film_apply_country);
-		return Rjx.jsonOk();
-	}
-	
 	@ResponseBody
 	@PostMapping("do_apply")
 	@ApiOperation("提交申报")

src/main/java/com/egolm/film/api/web/member/MemberApplyControllerDeserted.java

+package com.egolm.film.api.web.member;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.egolm.common.bean.Rjx;
+import com.egolm.film.api.service.FilmService;
+import com.egolm.film.api.service.MemberTokenService;
+import com.egolm.film.model.LoginToken;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@Api
+@Deprecated
+@Controller
+@RequestMapping("member/apply")
+public class MemberApplyControllerDeserted {
+	
+	@Autowired
+	private FilmService filmService;
+	
+	@Autowired
+	private MemberTokenService tokenService;
+	
+	@ResponseBody
+	@PostMapping("save_type")
+	@ApiOperation("新增影片,并保存申报影片类型")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="header", dataType="string", name="i18n_language"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_type_name",   value="影片类型"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="enroll_type_name", value="影片性质"),
+	})
+	public Object saveMemberFilmType(String film_type_name, String enroll_type_name) {
+		LoginToken loginToken = tokenService.getToken();
+		Integer member_id = (Integer)loginToken.getId();
+		Long member_film_id = filmService.saveMemberFilmType(member_id, film_type_name, enroll_type_name);
+		return Rjx.jsonOk().set("member_film_id", member_film_id);
+	}
+	
+	@ResponseBody
+	@PostMapping("save_base")
+	@ApiOperation("保存影片基本信息")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="header", dataType="string", name="i18n_language"),
+		@ApiImplicitParam(paramType="query", dataType="long",   required=true,  name="member_film_id",         value="影片ID"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=false, name="enroll_type_name_other", value="申报奖项", allowMultiple=true),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="cn_name",                value="中文名称"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="en_name",                value="英文名称"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="intro",                  value="影片简介"),
+	})
+	public Object saveMemberFilmBase(
+			Long member_film_id, 
+			String cn_name, 
+			String en_name, 
+			String intro, HttpServletRequest req) {
+		
+		LoginToken loginToken = tokenService.getToken();
+		Integer member_id = (Integer)loginToken.getId();
+		String[] enroll_type_name_other = req.getParameterValues("enroll_type_name_other");
+		filmService.saveMemberFilmBase(
+				member_id, 
+				member_film_id, 
+				enroll_type_name_other,
+				cn_name, 
+				en_name,
+				intro);
+		filmService.initKeywords(member_film_id);
+		return Rjx.jsonOk();
+	}
+	
+	@ResponseBody
+	@PostMapping("save_info")
+	@ApiOperation("保存影片制作信息")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="header", dataType="string", name="i18n_language"),
+		@ApiImplicitParam(paramType="query", dataType="long",   required=true,  name="member_film_id",        value="影片ID"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="film_country",          value="制作国家"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="dialogue_lang",         value="对白语言"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="subtitle_lang",         value="字幕语言"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="co_production_country", value="合拍国家"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="film_total_time",       value="影片时长"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="completion_date",       value="完成日期"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="show_date",             value="公映日期"),
+		
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="first_show_date",         value="首次上映日期"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="first_show_city",         value="首次上映城市"),
+		@ApiImplicitParam(paramType="query", dataType="int",    required=true,  name="is_apply_other_filmfest", value="是否申请其他电影节", allowableValues="0, 1"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=false, name="other_filmfest_name",     value="申请其他电影节名称"),
+		
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="film_medium",           value="影片色彩"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true,  name="film_format",           value="样片规格"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=false, name="film_format_url",       value="样片URL地址"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=false, name="film_format_passw",     value="样片URL访问密码"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=false, name="film_format_other",     value="其他样品信息"),
+	})
+	public Object saveMemberFilmInfo(
+			Long member_film_id, 
+			String film_country, 
+			String dialogue_lang,
+			String subtitle_lang, 
+			String film_total_time, 
+			String completion_date, 
+			String show_date, 
+			String first_show_date,
+			String first_show_city,
+			Integer is_apply_other_filmfest,
+			String other_filmfest_name,
+			String film_medium, 
+			String film_format,
+			String film_format_url,
+			String film_format_passw,
+			String film_format_other, 
+			HttpServletRequest req) {
+		
+		LoginToken loginToken = tokenService.getToken();
+		Integer member_id = (Integer)loginToken.getId();
+		String[] co_production_country = req.getParameterValues("co_production_country");
+		filmService.saveMemberFilmInfo(
+				member_id,
+				member_film_id, 
+				film_country, 
+				dialogue_lang, 
+				subtitle_lang, 
+				co_production_country, 
+				film_total_time, 
+				completion_date, 
+				show_date, 
+				first_show_date,
+				first_show_city,
+				is_apply_other_filmfest,
+				other_filmfest_name,
+				film_medium, 
+				film_format, 
+				film_format_url,
+				film_format_passw,
+				film_format_other);
+		return Rjx.jsonOk();
+	}
+	
+	@ResponseBody
+	@PostMapping("save_company")
+	@ApiOperation("保存影片申报信息")
+	@ApiImplicitParams({
+		@ApiImplicitParam(paramType="header", dataType="string", name="i18n_language"),
+		@ApiImplicitParam(paramType="query", dataType="long",   required=true, name="member_film_id",       value="影片ID"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_apply_company",   value="申报公司"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_apply_realname",  value="申报联系人"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_apply_email",     value="申报邮件"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_apply_tel",       value="申报电话"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_apply_mobile",    value="申报手机"),
+		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_apply_country",   value="申报国家"),
+	})
+	public Object saveMemberFilmCompany(
+			Long member_film_id, String 
+			film_apply_company, 
+			String film_apply_realname, 
+			String film_apply_email, 
+			String film_apply_tel, 
+			String film_apply_mobile, 
+			String film_apply_country) {
+		
+		LoginToken loginToken = tokenService.getToken();
+		Integer member_id = (Integer)loginToken.getId();
+		filmService.saveMemberFilmCompany(
+				member_id,
+				member_film_id, 
+				film_apply_company,
+				film_apply_realname,
+				film_apply_email, 
+				film_apply_tel, 
+				film_apply_mobile,
+				film_apply_country);
+		return Rjx.jsonOk();
+	}
+}