x

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

@@ -28,7 +28,7 @@ public interface AdminAuthService {
 	
 	List<Integer> queryGroupEnrolltypeList(Integer group_id);
 
-	void updateGroupAuth(Integer group_id, Integer[] menu_ids, Integer[] film_types, Integer[] enroll_types);
+	void updateGroupAuth(Integer group_id, Integer[] menu_ids, Integer[] film_types);
 
 	void saveOrUpdateMenu(Fc_admin_menu menu);
 

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

@@ -14,7 +14,6 @@ import com.egolm.common.jdbc.Page;
 import com.egolm.film.api.service.AdminAuthService;
 import com.egolm.film.bean.Fc_admin;
 import com.egolm.film.bean.Fc_admin_group;
-import com.egolm.film.bean.Fc_admin_group_enrolltype;
 import com.egolm.film.bean.Fc_admin_group_filmtype;
 import com.egolm.film.bean.Fc_admin_group_menu;
 import com.egolm.film.bean.Fc_admin_menu;
@@ -114,7 +113,7 @@ public class AdminAuthServiceImpl implements AdminAuthService {
 	
 	@Override
 	@Transactional
-	public void updateGroupAuth(Integer group_id, Integer[] menu_ids, Integer[] film_types, Integer[] enroll_types) {
+	public void updateGroupAuth(Integer group_id, Integer[] menu_ids, Integer[] film_types) {
 		jdbcTemplate.executeUpdate("delete from fc_admin_group_menu where group_id = ?", group_id);
 		jdbcTemplate.executeUpdate("delete from fc_admin_group_filmtype where group_id = ?", group_id);
 		jdbcTemplate.executeUpdate("delete from fc_admin_group_enrolltype where group_id = ?", group_id);
@@ -138,17 +137,6 @@ public class AdminAuthServiceImpl implements AdminAuthService {
 			}
 			jdbcTemplate.batchSave(gtypeList);
 		}
-		if(enroll_types != null && enroll_types.length > 0) {
-			List<Fc_admin_group_enrolltype> typeList = new ArrayList<Fc_admin_group_enrolltype>();
-			for(Integer enrollType : enroll_types) {
-				Fc_admin_group_enrolltype type = new Fc_admin_group_enrolltype();
-				type.setGroup_id(group_id);
-				type.setEnroll_type_id(enrollType);
-				typeList.add(type);
-			}
-			jdbcTemplate.batchSave(typeList);
-		}
-		
 	}
 
 	@Override

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

@@ -222,10 +222,9 @@ public class AdminAuthController {
 		@ApiImplicitParam(paramType="query", dataType="int",  required=true,  allowMultiple=false,name="group_id",     value="组ID"),
 		@ApiImplicitParam(paramType="query", dataType="int",  required=true,  allowMultiple=true, name="menu_id",      value="菜单ID"),
 		@ApiImplicitParam(paramType="query", dataType="int",  required=true,  allowMultiple=true, name="film_type_id", value="影片类型ID"),
-		@ApiImplicitParam(paramType="query", dataType="int",  required=true,  allowMultiple=true, name="enroll_type_id", value="影片性质ID"),
 	})
-	public Object groupAuthUpdate(Integer group_id, Integer state, Integer[] menu_id, Integer[] film_type_id, Integer[] enroll_type_id) {
-		service.updateGroupAuth(group_id, menu_id, film_type_id, enroll_type_id);
+	public Object groupAuthUpdate(Integer group_id, Integer state, Integer[] menu_id, Integer[] film_type_id) {
+		service.updateGroupAuth(group_id, menu_id, film_type_id);
 		return Rjx.jsonOk();
 	}
 	

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="enum_doubtful")

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="enum_enroll")

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="enum_filmtype")

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_admin")

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_admin_group")

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_admin_group_filmtype")

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_admin_group_menu")

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_admin_menu")

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

 package com.egolm.film.bean;
 
-import java.util.Date;
+import javax.persistence.Entity;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
+
 import javax.persistence.Id;
 
+import java.util.Date;
+
 @Entity(name="fc_email_record")
 public class Fc_email_record implements java.io.Serializable {
 

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_film_group")

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

 package com.egolm.film.bean;
 
-import java.util.Date;
+import javax.persistence.Entity;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
+
 import javax.persistence.Id;
 
+import java.util.Date;
+
 @Entity(name="fc_logs")
 public class Fc_logs implements java.io.Serializable {
 

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_logs_ext")

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_member")

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

 package com.egolm.film.bean;
 
-import java.util.Date;
+import javax.persistence.Entity;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
+
 import javax.persistence.Id;
 
+import java.util.Date;
+
 @Entity(name="fc_member_film")
 public class Fc_member_film implements java.io.Serializable {
 

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_member_film_enroll")

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_member_film_issuer")

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_member_film_playactor")

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_member_film_show")

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

 package com.egolm.film.bean;
 
-import java.util.Date;
+import javax.persistence.Entity;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
+
 import javax.persistence.Id;
 
+import java.util.Date;
+
 @Entity(name="fc_review")
 public class Fc_review implements java.io.Serializable {
 

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

 package com.egolm.film.bean;
 
-import java.util.Date;
+import javax.persistence.Entity;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
+
 import javax.persistence.Id;
 
+import java.util.Date;
+
 @Entity(name="fc_review_doubtful")
 public class Fc_review_doubtful implements java.io.Serializable {
 

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

 package com.egolm.film.bean;
 
-import java.util.Date;
+import javax.persistence.Entity;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
+
 import javax.persistence.Id;
 
+import java.util.Date;
+
 @Entity(name="fc_review_history")
 public class Fc_review_history implements java.io.Serializable {
 

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

 package com.egolm.film.bean;
 
-import java.util.Date;
+import javax.persistence.Entity;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
+
 import javax.persistence.Id;
 
+import java.util.Date;
+
 @Entity(name="fc_review_record")
 public class Fc_review_record implements java.io.Serializable {
 

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_review_record_ext")

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

 package com.egolm.film.bean;
 
-import java.util.Date;
+import javax.persistence.Entity;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
+
 import javax.persistence.Id;
 
+import java.util.Date;
+
 @Entity(name="fc_user")
 public class Fc_user implements java.io.Serializable {
 

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

 package com.egolm.film.bean;
 
-import java.util.Date;
+import javax.persistence.Entity;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
+
 import javax.persistence.Id;
 
+import java.util.Date;
+
 @Entity(name="fc_user_group")
 public class Fc_user_group implements java.io.Serializable {
 

src/main/java/com/egolm/film/bean/Fc_admin_group_enrolltype.java → src/main/java/com/egolm/film/bean/Fc_user_group_enroll.java

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
-@Entity(name="fc_admin_group_enrolltype")
-public class Fc_admin_group_enrolltype implements java.io.Serializable {
+@Entity(name="fc_user_group_enroll")
+public class Fc_user_group_enroll implements java.io.Serializable {
 
 	private static final long serialVersionUID = 1L;
 

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

 package com.egolm.film.bean;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
+
+import javax.persistence.Column;
+
 import javax.persistence.Id;
 
 @Entity(name="fc_user_group_fun")