Prechádzať zdrojové kódy

增加系统类型的判断,可以将推荐模块用于少儿院线以为的其他系统

yaobo 7 rokov pred
rodič
commit
ac8729ea01

+ 7 - 1
src/main/java/cn/efunbox/controller/ClickController.java

@@ -58,6 +58,7 @@ public class ClickController {
     	Map<String, Object> map = new HashMap<String, Object>(2);
         String age = request.getParameter("age")==null?"0":request.getParameter("age").trim();
 		String sex = request.getParameter("sex")==null?"1":request.getParameter("sex").trim();
+		String type = request.getParameter("type")==null?"1":request.getParameter("type").trim();
 		String film_code = request.getParameter("film_code")==null?"":request.getParameter("film_code").trim();
 		if(film_code.isEmpty()){
 			map.put("code", 301);
@@ -68,6 +69,7 @@ public class ClickController {
 		Click click = new Click();
 		click.setAge(Integer.valueOf(age));
 		click.setSex(Integer.valueOf(sex));
+		click.setType(Integer.valueOf(type));
 		click.setFilm_code(film_code);
 		click.setCreated(curTime);
 /*		
@@ -100,7 +102,11 @@ public class ClickController {
 		click.setSeries_count(Integer.valueOf(series_count));
 		click.setTarget_people(Integer.valueOf(target_people));
 */
-		Film film = filmService.get(film_code);
+		Film film = filmService.get(film_code, Integer.valueOf(type));
+		if(film==null){
+			map.put("code", 302);
+			return map;
+		}
 		click.setAge_group(film.getAge_group());
 		click.setArea(film.getArea());
 		click.setDuration(film.getDuration());

+ 6 - 3
src/main/java/cn/efunbox/controller/FilmController.java

@@ -52,11 +52,12 @@ public class FilmController {
     public Map<String,Object> delete(){
     	Map<String, Object> map = new HashMap<String, Object>(2);
         String film_code = request.getParameter("film_code")==null?"":request.getParameter("film_code").trim();
-		if(film_code.isEmpty()){
+        String type = request.getParameter("type")==null?"1":request.getParameter("type").trim();
+		if(film_code.isEmpty() || type.isEmpty()){
 			map.put("code", 301);
 			return map;
 		}
-    	filmService.delete(film_code);
+    	filmService.delete(film_code, Integer.valueOf(type));
         map.put("code", 200);
         return map;
     }
@@ -65,6 +66,7 @@ public class FilmController {
     @ResponseBody
     public Map<String,Object> add(){
     	Map<String, Object> map = new HashMap<String, Object>(2);
+        String type = request.getParameter("type")==null?"1":request.getParameter("type").trim();
         String film_code = request.getParameter("film_code")==null?"":request.getParameter("film_code").trim();
 		String film_type = request.getParameter("film_type")==null?"1":request.getParameter("film_type").trim();
 		String mark_type = request.getParameter("mark_type")==null?"0":request.getParameter("mark_type").trim();
@@ -80,12 +82,13 @@ public class FilmController {
 		String target_people = request.getParameter("target_people")==null?"0":request.getParameter("target_people").trim();
 		String language = request.getParameter("language")==null?"0":request.getParameter("language").trim();
 		String duration = request.getParameter("duration")==null?"0":request.getParameter("duration").trim();
-		if(film_code.isEmpty()){
+		if(film_code.isEmpty() || type.isEmpty()){
 			map.put("code", 301);
 			return map;
 		}
 		int curTime = (int)(System.currentTimeMillis()/1000);
 		Film film = new Film();
+		film.setType(Integer.valueOf(type));
 		film.setAge_group(Integer.valueOf(age_group));
 		film.setArea(Integer.valueOf(area));
 		film.setCreated(curTime);

+ 40 - 45
src/main/java/cn/efunbox/controller/RecommendController.java

@@ -35,6 +35,46 @@ public class RecommendController {
     public void setRecommendService(IRecommendService recmdService) {
         this.recmdService = recmdService;
     }
+
+    @RequestMapping("/getAll")
+    @ResponseBody
+    public Map<String,Object> getAll(){
+        List<Recommend> rows = recmdService.loadAll();
+        Map<String, Object> map = new HashMap<String, Object>(2);
+        map.put("code", 200);
+        map.put("rows", rows);
+        return map;
+    }
+
+    @RequestMapping("/search")
+    @ResponseBody
+    public Map<String,Object> search(){
+    	String ageStr = request.getParameter("age")==null?"0":request.getParameter("age").trim();
+		String sexStr = request.getParameter("sex")==null?"1":request.getParameter("sex").trim();
+		String typeStr = request.getParameter("type")==null?"1":request.getParameter("type").trim();
+		String pageStr = request.getParameter("page")==null?"1":request.getParameter("page").trim();
+		String sizeStr = request.getParameter("size")==null?"10":request.getParameter("size").trim();
+		int age = Integer.valueOf(ageStr);
+		int sex = Integer.valueOf(sexStr);
+		int type = Integer.valueOf(typeStr);
+		int page = Integer.valueOf(pageStr);
+		int size = Integer.valueOf(sizeStr);
+		if(age<0 || age>20)
+			age = 5;
+		if(sex!=1 && sex!=2)
+			sex = 1;
+		if(page<1)
+			page = 1;
+		if(size<10)
+			size = 10;
+		int offset = Math.max(0, (page-1)) * size;
+        List<Recommend> rows = recmdService.search(age, sex, type, size, offset);
+        Map<String, Object> map = new HashMap<String, Object>(2);
+        map.put("code", 200);
+        map.put("rows", rows);
+        return map;
+    }
+    
 /*
     @RequestMapping("/showAll")
     public String getRecommend(Model model){
@@ -73,49 +113,4 @@ public class RecommendController {
         return new ModelAndView(new MappingJacksonJsonView(),map);
     }
 */
-    @RequestMapping("/getAll")
-    @ResponseBody
-    public Map<String,Object> getAll(){
-        List<Recommend> rows = recmdService.loadAll();
-        Map<String, Object> map = new HashMap<String, Object>(2);
-        map.put("code", 200);
-        map.put("rows", rows);
-        return map;
-    }
-
-    @RequestMapping("/search")
-    @ResponseBody
-    public Map<String,Object> search(){
-    	String ageStr = request.getParameter("age");
-		String sexStr = request.getParameter("sex");
-		String pageStr = request.getParameter("page");
-		String sizeStr = request.getParameter("size");
-		if(ageStr==null)
-			ageStr = "5";
-		if(sexStr==null)
-			sexStr = "1";
-		if(pageStr==null)
-			pageStr = "1";
-		if(sizeStr==null)
-			sizeStr = "10";
-		int age = Integer.valueOf(ageStr);
-		int sex = Integer.valueOf(sexStr);
-		int page = Integer.valueOf(pageStr);
-		int size = Integer.valueOf(sizeStr);
-		if(age<0 || age>20)
-			age = 5;
-		if(sex!=1 && sex!=2)
-			sex = 1;
-		if(page<1)
-			page = 1;
-		if(size<10)
-			size = 10;
-		int offset = Math.max(0, (page-1)) * size;
-        List<Recommend> rows = recmdService.search(age, sex, size, offset);
-        Map<String, Object> map = new HashMap<String, Object>(2);
-        map.put("code", 200);
-        map.put("rows", rows);
-        return map;
-    }
-    
 }

+ 2 - 2
src/main/java/cn/efunbox/dao/FilmMapper.java

@@ -25,12 +25,12 @@ public interface FilmMapper {
      * 删除一条记录
      * @param film_code
      */
-    void delete(@Param("film_code") String film_code);
+    void delete(@Param("film_code") String film_code, @Param("type") int type);
 
     /**
      * 搜索一条记录
      * @param film_code
      */
-    Film get(@Param("film_code") String film_code);
+    Film get(@Param("film_code") String film_code, @Param("type") int type);
    
 }

+ 1 - 1
src/main/java/cn/efunbox/dao/RecommendMapper.java

@@ -23,5 +23,5 @@ public interface RecommendMapper {
      * 搜索
      * @return
      */
-	List<Recommend> search(@Param("age") int age, @Param("sex") int sex, @Param("limit") int limit, @Param("offset") int offset);
+	List<Recommend> search(@Param("age") int age, @Param("sex") int sex, @Param("type") int type, @Param("limit") int limit, @Param("offset") int offset);
 }

+ 2 - 2
src/main/java/cn/efunbox/mapping/ClickMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="cn.efunbox.dao.ClickMapper">
     <!-- 查询所有结果 -->  
      <insert id="insert" parameterType="Click">
-		insert into film_click(age,sex,film_code,film_type,mark_type,is_vip,film_grade,film_star,age_group,series_count,publish_date,online_date,area,movie_type,target_people,language,duration,created) 
-		values(#{age},#{sex},#{film_code},#{film_type},#{mark_type},#{is_vip},#{film_grade},#{film_star},#{age_group},#{series_count},#{publish_date},#{online_date},#{area},#{movie_type},#{target_people},#{language},#{duration},#{created}) 
+		insert into film_click(type,age,sex,film_code,film_type,mark_type,is_vip,film_grade,film_star,age_group,series_count,publish_date,online_date,area,movie_type,target_people,language,duration,created) 
+		values(#{type},#{age},#{sex},#{film_code},#{film_type},#{mark_type},#{is_vip},#{film_grade},#{film_star},#{age_group},#{series_count},#{publish_date},#{online_date},#{area},#{movie_type},#{target_people},#{language},#{duration},#{created}) 
 	</insert>
      
     <!-- 查询所有结果 -->  

+ 4 - 4
src/main/java/cn/efunbox/mapping/FilmMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="cn.efunbox.dao.FilmMapper">
     <!-- 新增 -->  
      <insert id="insert" parameterType="Film">
-		insert into film_info(film_code,film_type,mark_type,is_vip,film_grade,film_star,age_group,series_count,publish_date,online_date,area,movie_type,target_people,language,duration,created) 
-		values(#{film_code},#{film_type},#{mark_type},#{is_vip},#{film_grade},#{film_star},#{age_group},#{series_count},#{publish_date},#{online_date},#{area},#{movie_type},#{target_people},#{language},#{duration},#{created}) 
+		insert into film_info(type,film_code,film_type,mark_type,is_vip,film_grade,film_star,age_group,series_count,publish_date,online_date,area,movie_type,target_people,language,duration,created) 
+		values(#{type},#{film_code},#{film_type},#{mark_type},#{is_vip},#{film_grade},#{film_star},#{age_group},#{series_count},#{publish_date},#{online_date},#{area},#{movie_type},#{target_people},#{language},#{duration},#{created}) 
 	</insert>
     
     <!-- 查询 -->  
@@ -14,12 +14,12 @@
     
     <!-- 删除 -->  
     <select id="delete" resultType="int" >  
-        delete from film_info where film_code=#{film_code} limit 1 
+        delete from film_info where film_code=#{film_code} and type=#{type} limit 1 
     </select>
     
     <!-- 删除 -->  
     <select id="get" resultType="Film" >  
-        select * from film_info where film_code=#{film_code} limit 1 
+        select * from film_info where film_code=#{film_code} and type=#{type} limit 1 
     </select>
     
 </mapper>

+ 1 - 1
src/main/java/cn/efunbox/mapping/RecommendMapper.xml

@@ -9,7 +9,7 @@
     <!-- 搜索 -->  
     <select id="search" resultType="Recommend" >  
         select * from film_recmd 
-        where age=#{age} and sex=#{sex}
+        where age=#{age} and sex=#{sex} and type=#{type}
 		order by score desc limit #{limit} offset #{offset}
     </select>
 </mapper>

+ 17 - 28
src/main/java/cn/efunbox/model/Click.java

@@ -9,6 +9,7 @@ package cn.efunbox.model;
 public class Click {
  
 	private int id;			//唯一编号
+	private int type;		//系统类型 1、少儿院线推荐节目
     private int age;		//年龄:1-99
     private int sex;		//性别:1为男,2为女
     private String film_code;//电影编号
@@ -31,6 +32,7 @@ public class Click {
     /*
      CREATE TABLE `film_click` (
                   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '唯一编号',
+                  `type` int(5) DEFAULT '0' COMMENT '系统类型 1、少儿院线推荐节目',
                   `age` int(5) DEFAULT '0' COMMENT '年龄:1-99',
                   `sex` int(2) DEFAULT '1' COMMENT '性别:1为男,2为女',
                   `film_code` varchar(100) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '电影编号',
@@ -55,34 +57,7 @@ public class Click {
                   KEY `film_type` (`film_type`)
                 ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='节目点击观看记录'; 
      */
-    
-    /*
-    CREATE TABLE `film_info` (
-				`codes` varchar(10) NOT NULL COMMENT '电影编号',
-				`names` varchar(30) DEFAULT NULL COMMENT '电影名称',
-				`english_name` varchar(50) DEFAULT NULL COMMENT '英语名称',
-				`simple_desc` varchar(30) DEFAULT NULL COMMENT '一句话描述',
-				`film_type` tinyint(2) DEFAULT NULL COMMENT '电影类型 1、电影 2:剧集',
-				`mark_type` tinyint(2) DEFAULT NULL COMMENT '角标类型 1:new',
-				`is_vip` tinyint(2) DEFAULT NULL COMMENT '是否为vip 1:是',
-				`film_grade` float(4,2) DEFAULT NULL COMMENT '电影评分',
-				`film_star` float(4,2) DEFAULT NULL COMMENT '电影评星',
-				`age_group` tinyint(3) DEFAULT NULL COMMENT '适用年龄段',
-				`series_count` smallint(4) DEFAULT NULL COMMENT '集数,电影为1',
-				`publish_date` date DEFAULT NULL COMMENT '发行时间',
-				`publis_company` varchar(50) DEFAULT NULL COMMENT '出品公司',
-				`area` varchar(50) DEFAULT NULL COMMENT '地区',
-				`movie_type` varchar(50) DEFAULT NULL COMMENT '类型',
-				`target_people` varchar(50) DEFAULT NULL COMMENT '适合人群',
-				`language` varchar(10) DEFAULT NULL COMMENT '语言',
-				`introduce` text COMMENT '详细介绍',
-				`duration` smallint(5) DEFAULT NULL COMMENT '电影时长,分钟',
-				`icon_url` varchar(50) DEFAULT NULL,
-				`background_url` varchar(50) DEFAULT NULL,
-				PRIMARY KEY (`codes`)
-		) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-   	*/
-
+ 
 	/**
 	 * @return the id
 	 */
@@ -98,6 +73,20 @@ public class Click {
 	}
 
 	/**
+	 * @return the type
+	 */
+	public int getType() {
+		return type;
+	}
+
+	/**
+	 * @param type the type to set
+	 */
+	public void setType(int type) {
+		this.type = type;
+	}
+
+	/**
 	 * @return the age
 	 */
 	public int getAge() {

+ 16 - 0
src/main/java/cn/efunbox/model/Film.java

@@ -9,6 +9,7 @@ package cn.efunbox.model;
 public class Film {
  
 	private int id;			//唯一编号
+	private int type;		//系统类型 1、少儿院线推荐节目
     private String film_code;//电影编号
     private int film_type;	//电影类型 1、电影 2:剧集
     private int mark_type;	//角标类型 1:new
@@ -29,6 +30,7 @@ public class Film {
     /*
      CREATE TABLE `film_info` (
                   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '唯一编号',
+                  `type` int(5) DEFAULT '0' COMMENT '系统类型 1、少儿院线推荐节目',
                   `film_code` varchar(100) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '电影编号',
                   `film_type` int(2) DEFAULT '1' COMMENT '电影类型 1、电影 2:剧集',
                   `mark_type` int(2) DEFAULT '0' COMMENT '角标类型 1:new',
@@ -66,6 +68,20 @@ public class Film {
 	}
 
 	/**
+	 * @return the type
+	 */
+	public int getType() {
+		return type;
+	}
+
+	/**
+	 * @param type the type to set
+	 */
+	public void setType(int type) {
+		this.type = type;
+	}
+
+	/**
 	 * @return the film_code
 	 */
 	public String getFilm_code() {

+ 17 - 0
src/main/java/cn/efunbox/model/Recommend.java

@@ -10,6 +10,7 @@ import java.sql.Date;
 public class Recommend {
 	
 	private int id;			//唯一编号
+	private int type;		//系统类型 1、少儿院线推荐节目
     private int age;		//年龄:1-99
     private int sex;		//性别:1为男,2为女
     private String film_code;//电影编号
@@ -22,6 +23,7 @@ public class Recommend {
     /*
      CREATE TABLE `film_recmd` (
                   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '唯一编号',
+                  `type` int(5) DEFAULT '0' COMMENT '系统类型 1、少儿院线推荐节目',
                   `age` int(5) DEFAULT '5' COMMENT '年龄:1-99',
                   `sex` int(2) DEFAULT '1' COMMENT '性别:1为男,2为女',
                   `film_code` varchar(100) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '电影编号',
@@ -51,6 +53,21 @@ public class Recommend {
 		this.id = id;
 	}
 
+	/**
+	 * @return the type
+	 */
+	public int getType() {
+		return type;
+	}
+
+
+	/**
+	 * @param type the type to set
+	 */
+	public void setType(int type) {
+		this.type = type;
+	}
+
 
 	/**
 	 * @return the age

+ 2 - 2
src/main/java/cn/efunbox/service/IFilmService.java

@@ -16,13 +16,13 @@ public interface IFilmService {
      * 删除记录
      * @return
      */
-    void delete(String film_code);
+    void delete(String film_code, int type);
 
     /**
      * 搜索记录
      * @return
      */
-    Film get(String film_code);
+    Film get(String film_code, int type);
     
     /**
      * 加载全部

+ 1 - 1
src/main/java/cn/efunbox/service/IRecommendService.java

@@ -16,5 +16,5 @@ public interface IRecommendService {
      * 搜索特定年龄、性别的推荐节目
      * @return
      */
-    List<Recommend> search(int age, int sex, int limit, int offset);
+    List<Recommend> search(int age, int sex, int type, int limit, int offset);
 }

+ 4 - 4
src/main/java/cn/efunbox/service/impl/FilmServiceImpl.java

@@ -35,14 +35,14 @@ public class FilmServiceImpl implements IFilmService {
 		return filmMapper.insert(film);
 	}
 
-	public void delete(String film_code) {
+	public void delete(String film_code, int type) {
 		// TODO Auto-generated method stub
-		filmMapper.delete(film_code);
+		filmMapper.delete(film_code, type);
 	}
 
-	public Film get(String film_code) {
+	public Film get(String film_code, int type) {
 		// TODO Auto-generated method stub
-		return filmMapper.get(film_code);
+		return filmMapper.get(film_code, type);
 	}
 
 

+ 2 - 2
src/main/java/cn/efunbox/service/impl/RecommendServiceImpl.java

@@ -30,9 +30,9 @@ public class RecommendServiceImpl implements IRecommendService {
 		return recmdMapper.queryAll();
 	}
 
-	public List<Recommend> search(int age, int sex, int limit, int offset) {
+	public List<Recommend> search(int age, int sex, int type, int limit, int offset) {
 		// TODO Auto-generated method stub
-		return recmdMapper.search(age, sex, limit, offset);
+		return recmdMapper.search(age, sex, type, limit, offset);
 	}
 
 }