x

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

@@ -156,6 +156,7 @@ public class FilmController {
 				playactor_birthday, 
 				playactor_intro, 
 				is_play_shanghai);
+		filmService.initKeywords(member_film_id);
 		return Rjx.jsonOk();
 	}
 	
@@ -179,6 +180,7 @@ public class FilmController {
 			String create_ip = WebMvcConfig.getRemoteIp();
 			filmService.saveCreateBase(filmBase.getId(), admin_id, member_id, create_ip);
 		}
+		filmService.initKeywords(filmBase.getId());
 		return Rjx.jsonOk().set("id", filmBase.getId());
 	}
 	

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

@@ -52,7 +52,7 @@ public class AdminFirstController {
 	Logger logger = LoggerFactory.getLogger(AdminFirstController.class);
 	
 	@Autowired
-	FilmService memberFilmService;
+	FilmService filmService;
 	
 	@Autowired
 	AdminTokenService tokenService;
@@ -101,7 +101,7 @@ public class AdminFirstController {
 		limit = limit == null ? 20 : limit;
 		Page page = new Page(index, limit, limitKey);
 		Fc_admin admin = Util.mapTo(tokenService.getTokenObj(), Fc_admin.class);
-		List<Map<String, Object>> list = memberFilmService.queryFilmList(admin.getGroup_id(), keyword, state, apply_state, upload_state, film_type, enroll_type, film_country, film_type_short, play_shanghai, review_round, review_state, allot_atate, opt_state, film_group_id, page);
+		List<Map<String, Object>> list = filmService.queryFilmList(admin.getGroup_id(), keyword, state, apply_state, upload_state, film_type, enroll_type, film_country, film_type_short, play_shanghai, review_round, review_state, allot_atate, opt_state, film_group_id, page);
 		return Rjx.jsonOk().setData(list).setPage(page);
 	}
 	
@@ -114,7 +114,7 @@ public class AdminFirstController {
 		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="film_type_name_short", value="影片分类扩展分类"),
 	})
 	public Object pass(Long member_film_id, String film_type_name_short) {
-		memberFilmService.verifyFilmDuplicate(member_film_id);
+		filmService.verifyFilmDuplicate(member_film_id);
 		Fc_member_film film = new Fc_member_film();
 		LoginToken token = tokenService.getToken();
 		Integer adminid = (Integer)token.getId();
@@ -124,12 +124,13 @@ public class AdminFirstController {
 		film.setApply_state(2);
 		film.setUpload_state(0);
 		film.setPass_time(System.currentTimeMillis()/1000);
-		memberFilmService.mergeMemberFilm(film);
-		memberFilmService.pass(member_film_id);
+		filmService.mergeMemberFilm(film);
+		filmService.pass(member_film_id);
 		reviewService.toFirstRound(member_film_id);
 		Map<String, Object> map = emailService.sendByTemplate_01(member_film_id, "doc/first_pass");
 		Rjx rjx = Rjx.jsonOk();
 		rjx.putAll(map);
+		filmService.initKeywords(member_film_id);
 		return rjx;
 	}
 	
@@ -145,7 +146,7 @@ public class AdminFirstController {
 		if(is_stop_apply == null) {
 			is_stop_apply = false;
 		}
-		memberFilmService.reject(is_stop_apply, member_film_id, apply_state_intro);
+		filmService.reject(is_stop_apply, member_film_id, apply_state_intro);
 		return Rjx.jsonOk();
 	}
 	
@@ -175,7 +176,7 @@ public class AdminFirstController {
 		@ApiImplicitParam(paramType="query", dataType="string", required=true, name="upload_id",      value="影片上传ID"),
 	})
 	public Object save_upload_id(Long member_film_id, String upload_id) {
-		memberFilmService.saveUploadId(member_film_id, upload_id);
+		filmService.saveUploadId(member_film_id, upload_id);
 		return Rjx.jsonOk();
 	}
 	
@@ -187,7 +188,7 @@ public class AdminFirstController {
 		@ApiImplicitParam(paramType="query", dataType="int",    required=true, name="upload_state",   value="影片上传状态(0未上传, 1已上传)"),
 	})
 	public Object save_upload_state(Long member_film_id, Integer upload_state) {
-		memberFilmService.saveUploadState(member_film_id, upload_state);
+		filmService.saveUploadState(member_film_id, upload_state);
 		return Rjx.jsonOk();
 	}
 	
@@ -199,7 +200,7 @@ public class AdminFirstController {
 		@ApiImplicitParam(paramType="query", dataType="int",  required=true, name="state",          value="影片状态:1未提交 2已提交"),
 	})
 	public Object update_state(Long member_film_id, Integer state) {
-		memberFilmService.updateFilmState(member_film_id, state);
+		filmService.updateFilmState(member_film_id, state);
 		return Rjx.jsonOk();
 	}
 	
@@ -211,7 +212,9 @@ public class AdminFirstController {
 		@ApiImplicitParam(paramType="query", dataType="int",  required=true, name="id2", value="编号会被替换,并且状态会重置为初审否决"),
 	})
 	public Object exchangeFilmNo(Integer id1, Integer id2) {
-		memberFilmService.exchangeFilmNo(id1, id2);
+		filmService.exchangeFilmNo(id1, id2);
+		filmService.initKeywords(id1.longValue());
+		filmService.initKeywords(id2.longValue());
 		return Rjx.jsonOk();
 	}
 	

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

@@ -31,7 +31,7 @@ public class MemberApplyController {
 	private MemberService memberService;
 	
 	@Autowired
-	private FilmService memberFilmService;
+	private FilmService filmService;
 	
 	@Autowired
 	private MemberTokenService tokenService;
@@ -61,7 +61,7 @@ public class MemberApplyController {
 	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 = memberFilmService.saveMemberFilmType(member_id, film_type_name, enroll_type_name);
+		Long member_film_id = filmService.saveMemberFilmType(member_id, film_type_name, enroll_type_name);
 		return Rjx.jsonOk().set("member_film_id", member_film_id);
 	}
 	
@@ -85,13 +85,14 @@ public class MemberApplyController {
 		LoginToken loginToken = tokenService.getToken();
 		Integer member_id = (Integer)loginToken.getId();
 		String[] enroll_type_name_other = req.getParameterValues("enroll_type_name_other");
-		memberFilmService.saveMemberFilmBase(
+		filmService.saveMemberFilmBase(
 				member_id, 
 				member_film_id, 
 				enroll_type_name_other,
 				cn_name, 
 				en_name,
 				intro);
+		filmService.initKeywords(member_film_id);
 		return Rjx.jsonOk();
 	}
 	
@@ -142,7 +143,7 @@ public class MemberApplyController {
 		LoginToken loginToken = tokenService.getToken();
 		Integer member_id = (Integer)loginToken.getId();
 		String[] co_production_country = req.getParameterValues("co_production_country");
-		memberFilmService.saveMemberFilmInfo(
+		filmService.saveMemberFilmInfo(
 				member_id,
 				member_film_id, 
 				film_country, 
@@ -188,7 +189,7 @@ public class MemberApplyController {
 		
 		LoginToken loginToken = tokenService.getToken();
 		Integer member_id = (Integer)loginToken.getId();
-		memberFilmService.saveMemberFilmCompany(
+		filmService.saveMemberFilmCompany(
 				member_id,
 				member_film_id, 
 				film_apply_company,
@@ -209,7 +210,7 @@ public class MemberApplyController {
 	public Object doApply(Long member_film_id) {
 		LoginToken loginToken = tokenService.getToken();
 		Integer member_id = (Integer)loginToken.getId();
-		memberFilmService.doApply(member_id, member_film_id);
+		filmService.doApply(member_id, member_film_id);
 		return Rjx.jsonOk();
 	}