coder-yqj
diff --git a/‎WebRoot/WEB-INF/classes/com/bishe/photo/controller/PhotoAlbumController.class
1.1 KB b/‎WebRoot/WEB-INF/classes/com/bishe/photo/controller/PhotoAlbumController.class
1.1 KB
diff --git a/‎WebRoot/WEB-INF/classes/com/bishe/photo/dao/PhotoAlbumDao.class
188 Bytes b/‎WebRoot/WEB-INF/classes/com/bishe/photo/dao/PhotoAlbumDao.class
188 Bytes
diff --git a/‎WebRoot/WEB-INF/classes/com/bishe/photo/entity/Comment.class
2.68 KB b/‎WebRoot/WEB-INF/classes/com/bishe/photo/entity/Comment.class
2.68 KB
diff --git a/‎WebRoot/WEB-INF/classes/com/bishe/photo/entity/Photo.class
393 Bytes b/‎WebRoot/WEB-INF/classes/com/bishe/photo/entity/Photo.class
393 Bytes
diff --git a/‎WebRoot/WEB-INF/classes/com/bishe/photo/entity/PhotoAlbumMapper.xml
Lines changed: 11 additions & 0 deletions b/‎WebRoot/WEB-INF/classes/com/bishe/photo/entity/PhotoAlbumMapper.xml
Lines changed: 11 additions & 0 deletions
diff --git a/‎WebRoot/WEB-INF/classes/com/bishe/photo/entity/PhotoMapper.xml
Lines changed: 15 additions & 2 deletions b/‎WebRoot/WEB-INF/classes/com/bishe/photo/entity/PhotoMapper.xml
Lines changed: 15 additions & 2 deletions
diff --git a/‎WebRoot/WEB-INF/classes/com/bishe/photo/service/PhotoAlbumService.class
202 Bytes b/‎WebRoot/WEB-INF/classes/com/bishe/photo/service/PhotoAlbumService.class
202 Bytes
diff --git a/‎WebRoot/WEB-INF/classes/com/bishe/photo/service/impl/PhotoAlbumServiceImpl.class
793 Bytes b/‎WebRoot/WEB-INF/classes/com/bishe/photo/service/impl/PhotoAlbumServiceImpl.class
793 Bytes
diff --git a/‎WebRoot/WEB-INF/classes/db.sql
Lines changed: 14 additions & 3 deletions b/‎WebRoot/WEB-INF/classes/db.sql
Lines changed: 14 additions & 3 deletions
diff --git a/‎src/com/bishe/photo/controller/PhotoAlbumController.java
Lines changed: 34 additions & 4 deletions b/‎src/com/bishe/photo/controller/PhotoAlbumController.java
Lines changed: 34 additions & 4 deletions
@@ -5,6 +5,9 @@
 
 
 	<insert id="saveAlbum" parameterType="com.bishe.photo.entity.PhotoAlbum">
+	<selectKey resultType="int" order="AFTER" keyProperty="id">
+	SELECT LAST_INSERT_ID() AS id
+	</selectKey>
 		insert into t_photoalbum(name,type,userId)
 			values(#{name,jdbcType=VARCHAR},#{type,jdbcType=NUMERIC},#{userId,jdbcType=NUMERIC}) 
 	</insert>
@@ -24,4 +27,12 @@
 		where id=#{id,jdbcType=NUMERIC}
 	</update>
 
+	<select id="findById" parameterType="int" resultType="com.bishe.photo.entity.PhotoAlbum">  
+		select id,name,type,coverUrl,userId from t_photoalbum where id= #{id,jdbcType=NUMERIC}
+	</select>
+	
+	<update id="updateCover" parameterType="hashMap">
+		update t_photoalbum  set coverUrl = #{url,jdbcType=VARCHAR} where id= #{id,jdbcType=NUMERIC}
+	</update>
+	
 </mapper>
@@ -2,7 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"      
  "http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
 <mapper namespace="com.bishe.photo.dao.PhotoDao">
-
 
 	<insert id="save" parameterType="com.bishe.photo.entity.Photo">
 	<selectKey resultType="int" order="AFTER" keyProperty="id">
@@ -13,7 +12,21 @@
 			#{belongId,jdbcType=NUMERIC},#{userId,jdbcType=NUMERIC}) 
 	</insert>
 
-	<select id="findAll" parameterType="int" resultType="com.bishe.photo.entity.Photo">
+	<select id="findCommentByPhotoId" parameterType="int" resultType="com.bishe.photo.entity.Comment">
+		select * from t_comment where photoId = #{id}
+	</select>
+	
+	<resultMap type="com.bishe.photo.entity.Photo" id="photoMap">
+		<id column="id" property="id"/>
+		<collection property="comments" javaType="java.util.ArrayList"
+			ofType="com.bishe.photo.entity.Comment" column="id"
+				select="findCommentByPhotoId">
+		</collection>
+		
+	</resultMap>
+	
+	
+	<select id="findAll" parameterType="int" resultMap="photoMap">
 		select id,name,photoUrl,belongId 
 		from t_photo where belongId=#{belongId,jdbcType=NUMERIC}
 	</select>
 
@@ -3,7 +3,7 @@ CREATE DATABASE photo DEFAULT CHARACTER SET utf8;
 CREATE TABLE t_user(
   u_id int PRIMARY KEY auto_increment,
   username varchar(32) not null default '',
-  password varchar(32) not null default '',
+  password varchar(32) not null default ''
 )ENGINE=innoDB;
 
 --角色表（序列）
@@ -44,7 +44,7 @@ ALTER TABLE t_role_privilege ADD FOREIGN KEY(role_id) REFERENCES t_role(id);
 --相册表
 CREATE TABLE t_photoalbum(
  	id int PRIMARY KEY auto_increment,
-    name VARCHAR(32),
+    name VARCHAR(100),
     type int,
     coverUrl VARCHAR(32),
     userId int references t_user(id)
@@ -54,8 +54,19 @@ CREATE TABLE t_photoalbum(
 
 CREATE TABLE t_photo(
 	id int PRIMARY KEY auto_increment,
-	name VARCHAR(32),
+	name VARCHAR(100),
 	photoUrl VARCHAR(100),
 	belongId int references t_photoalbum(id),
 	userId int references t_user(id)
 )ENGINE=innoDB;
+
+
+CREATE TABLE t_comment(
+	id int PRIMARY KEY auto_increment,
+	content VARCHAR(300),
+	date Date,
+	photoId int references t_photo(id),
+	userId int references t_user(id),
+	userName VARCHAR(32)
+)ENGINE=innoDB;
+
@@ -1,5 +1,6 @@
 package com.bishe.photo.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -12,6 +13,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.bishe.photo.domain.Message;
+import com.bishe.photo.entity.Photo;
 import com.bishe.photo.entity.PhotoAlbum;
 import com.bishe.photo.entity.User;
 import com.bishe.photo.service.PhotoAlbumService;
@@ -32,11 +34,21 @@ public Message addAlbum(String name,Integer type,HttpServletRequest request){
 		logger.info("sessionId:"+session.getId());
 		logger.info("user:"+user);
 		PhotoAlbum photoAlbum = new PhotoAlbum(name,type,user.getId());
-		photoAlbumService.saveAlbum(photoAlbum);
-		return new Message("1", "创建相册成功");
+		Integer saveId = photoAlbumService.saveAlbum(photoAlbum);
+		return this.findById(saveId);
 	}
 
 
+	@RequestMapping("/findById")
+	@ResponseBody
+	public Message findById(Integer id){
+		logger.info("查询id为："+id+" 的照片");
+		PhotoAlbum photos = photoAlbumService.findById(id);
+		List<PhotoAlbum> photoAlbum = new ArrayList<>();
+		photoAlbum.add(photos);
+		return new Message("1",photoAlbum);
+	}
+	
 	@ResponseBody
 	@RequestMapping("/findAll")
 	public Message findAll(HttpServletRequest request){
@@ -53,15 +65,17 @@ public Message findAll(HttpServletRequest request){
 
 	@ResponseBody
 	@RequestMapping("/delete")
-	public Message delete(Integer id){
+	public Message delete(Integer id,HttpServletRequest request){
 		logger.info("删除相册");
+		logger.info("删除相册id为"+id+"的相册");
 		try {
 			photoAlbumService.delete(id);
 		} catch (Exception e) {
 			e.printStackTrace();
 			return new Message("0","删除失败");
 		}
-		return new Message("1","删除成功");
+		
+		return this.findAll(request);
 	}
 
 	@ResponseBody
@@ -76,4 +90,20 @@ public Message update(PhotoAlbum photoAlbum){
 		}
 		return new Message("1","更新成功");
 	}
+	
+	
+	//设置封面
+	@ResponseBody
+	@RequestMapping("/setCover")
+	public Message setCover(String url,Integer id){
+		logger.info("更新相册id为:"+id + " --的封面为:"+url);
+		try {
+			photoAlbumService.updateCover(url, id);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return new Message("0","设置封面失败");
+		}
+		return new Message("1","设置封面成功");
+	}
+	
 }