diff --git a/.classpath b/.classpath index 1627f06..5e86a3d 100644 --- a/.classpath +++ b/.classpath @@ -7,7 +7,6 @@ - diff --git a/.gitignore b/.gitignore index ae3c172..d238cce 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +*.DS_Store /bin/ diff --git a/WEB-INF/.DS_Store b/WEB-INF/.DS_Store deleted file mode 100644 index 8dacfec..0000000 Binary files a/WEB-INF/.DS_Store and /dev/null differ diff --git a/WEB-INF/classes/.DS_Store b/WEB-INF/classes/.DS_Store deleted file mode 100644 index 9d4c820..0000000 Binary files a/WEB-INF/classes/.DS_Store and /dev/null differ diff --git a/WEB-INF/classes/.gitignore b/WEB-INF/classes/.gitignore deleted file mode 100644 index 5d6ff83..0000000 --- a/WEB-INF/classes/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/com/ -/resources/ -/util/ diff --git a/WEB-INF/classes/com/baby/album/controller/PhotoInfoController.class b/WEB-INF/classes/com/baby/album/controller/PhotoInfoController.class new file mode 100644 index 0000000..d9e9e0d Binary files /dev/null and b/WEB-INF/classes/com/baby/album/controller/PhotoInfoController.class differ diff --git a/WEB-INF/classes/com/baby/album/dao/PhotoInfoDao.class b/WEB-INF/classes/com/baby/album/dao/PhotoInfoDao.class new file mode 100644 index 0000000..fc15f31 Binary files /dev/null and b/WEB-INF/classes/com/baby/album/dao/PhotoInfoDao.class differ diff --git a/WEB-INF/classes/com/baby/album/dao/mappers/PhotoInfoMapper.class b/WEB-INF/classes/com/baby/album/dao/mappers/PhotoInfoMapper.class new file mode 100644 index 0000000..0a09894 Binary files /dev/null and b/WEB-INF/classes/com/baby/album/dao/mappers/PhotoInfoMapper.class differ diff --git a/WEB-INF/classes/com/baby/album/dao/mappers/PhotoInfoMapper.xml b/WEB-INF/classes/com/baby/album/dao/mappers/PhotoInfoMapper.xml new file mode 100644 index 0000000..5eb759f --- /dev/null +++ b/WEB-INF/classes/com/baby/album/dao/mappers/PhotoInfoMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + insert into photo_album(user_id, child_id, photo_url, description, photo_time, + photo_type, create_time, update_time) values (#{userId}, #{childId}, #{photoUrl}, + #{description}, #{photoTime}, #{photoType}, #{createTime}, #{updateTime}) + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WEB-INF/classes/com/baby/album/dto/PhotoInfo.class b/WEB-INF/classes/com/baby/album/dto/PhotoInfo.class new file mode 100644 index 0000000..409ca70 Binary files /dev/null and b/WEB-INF/classes/com/baby/album/dto/PhotoInfo.class differ diff --git a/WEB-INF/classes/com/baby/album/service/PhotoInfoService.class b/WEB-INF/classes/com/baby/album/service/PhotoInfoService.class new file mode 100644 index 0000000..4096db4 Binary files /dev/null and b/WEB-INF/classes/com/baby/album/service/PhotoInfoService.class differ diff --git a/WEB-INF/classes/com/baby/album/service/impl/PhotoInfoServiceImpl.class b/WEB-INF/classes/com/baby/album/service/impl/PhotoInfoServiceImpl.class new file mode 100644 index 0000000..36841a7 Binary files /dev/null and b/WEB-INF/classes/com/baby/album/service/impl/PhotoInfoServiceImpl.class differ diff --git a/WEB-INF/classes/com/baby/child/controller/ChildInfoController.class b/WEB-INF/classes/com/baby/child/controller/ChildInfoController.class new file mode 100644 index 0000000..7af421a Binary files /dev/null and b/WEB-INF/classes/com/baby/child/controller/ChildInfoController.class differ diff --git a/WEB-INF/classes/com/baby/child/dao/ChildInfoDao.class b/WEB-INF/classes/com/baby/child/dao/ChildInfoDao.class new file mode 100644 index 0000000..eb73b95 Binary files /dev/null and b/WEB-INF/classes/com/baby/child/dao/ChildInfoDao.class differ diff --git a/WEB-INF/classes/com/baby/child/dao/mappers/ChildInfoMapper.class b/WEB-INF/classes/com/baby/child/dao/mappers/ChildInfoMapper.class new file mode 100644 index 0000000..864ef27 Binary files /dev/null and b/WEB-INF/classes/com/baby/child/dao/mappers/ChildInfoMapper.class differ diff --git a/WEB-INF/classes/com/baby/child/dao/mappers/ChildInfoMapper.xml b/WEB-INF/classes/com/baby/child/dao/mappers/ChildInfoMapper.xml new file mode 100644 index 0000000..ca336cd --- /dev/null +++ b/WEB-INF/classes/com/baby/child/dao/mappers/ChildInfoMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + insert into child_info(name, nick_name, sex, birthday, icon, user_id, birthday_time, + create_time, update_time) values (#{name}, #{nickName}, #{sex}, #{birthday}, #{icon}, + #{userId}, #{birthdayTime}, #{createTime}, #{updateTime}) + + + + + update child_info set status = 9 where user_id = #{userId} and id = #{id} + + + + + update child_info set name = #{name}, nick_name = #{nickName}, sex = #{sex}, + birthday = #{birthday}, icon = #{icon}, birthday_time = #{birthdayTime}, + update_time = #{updateTime} where user_id = #{userId} and id = #{id} + + + + + \ No newline at end of file diff --git a/WEB-INF/classes/com/baby/child/dto/ChildInfo.class b/WEB-INF/classes/com/baby/child/dto/ChildInfo.class new file mode 100644 index 0000000..4c3e0d3 Binary files /dev/null and b/WEB-INF/classes/com/baby/child/dto/ChildInfo.class differ diff --git a/WEB-INF/classes/com/baby/child/service/ChildInfoService.class b/WEB-INF/classes/com/baby/child/service/ChildInfoService.class new file mode 100644 index 0000000..37e2be4 Binary files /dev/null and b/WEB-INF/classes/com/baby/child/service/ChildInfoService.class differ diff --git a/WEB-INF/classes/com/baby/child/service/impl/ChildInfoServiceImpl.class b/WEB-INF/classes/com/baby/child/service/impl/ChildInfoServiceImpl.class new file mode 100644 index 0000000..72ccb9b Binary files /dev/null and b/WEB-INF/classes/com/baby/child/service/impl/ChildInfoServiceImpl.class differ diff --git a/WEB-INF/classes/com/baby/user/controller/UserController.class b/WEB-INF/classes/com/baby/user/controller/UserController.class new file mode 100644 index 0000000..ef16e87 Binary files /dev/null and b/WEB-INF/classes/com/baby/user/controller/UserController.class differ diff --git a/WEB-INF/classes/com/baby/user/dao/UserDao.class b/WEB-INF/classes/com/baby/user/dao/UserDao.class new file mode 100644 index 0000000..26eb5b6 Binary files /dev/null and b/WEB-INF/classes/com/baby/user/dao/UserDao.class differ diff --git a/WEB-INF/classes/com/baby/user/dao/mappers/UserMapper.class b/WEB-INF/classes/com/baby/user/dao/mappers/UserMapper.class new file mode 100644 index 0000000..bb864e7 Binary files /dev/null and b/WEB-INF/classes/com/baby/user/dao/mappers/UserMapper.class differ diff --git a/WEB-INF/classes/com/baby/user/dao/mappers/UserMapper.xml b/WEB-INF/classes/com/baby/user/dao/mappers/UserMapper.xml new file mode 100644 index 0000000..05d3839 --- /dev/null +++ b/WEB-INF/classes/com/baby/user/dao/mappers/UserMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + insert into user(name,phone,token,device,create_time,update_time,password,head_img) + values(#{name},#{phone},#{token},#{device},#{createTime},#{updateTime},#{password},#{headImg}) + + + + + + + + + + + + update user set token=#{token} + + + id=#{id} + + + phone=#{phone} + + + + + + + + update user set name=#{name},device=#{device},update_time=#{updateTime},head_img=#{headImg} + where token=#{token} + + + + \ No newline at end of file diff --git a/WEB-INF/classes/com/baby/user/dto/User.class b/WEB-INF/classes/com/baby/user/dto/User.class new file mode 100644 index 0000000..704653f Binary files /dev/null and b/WEB-INF/classes/com/baby/user/dto/User.class differ diff --git a/WEB-INF/classes/com/baby/user/service/UserService.class b/WEB-INF/classes/com/baby/user/service/UserService.class new file mode 100644 index 0000000..2c65d8a Binary files /dev/null and b/WEB-INF/classes/com/baby/user/service/UserService.class differ diff --git a/WEB-INF/classes/com/baby/user/service/impl/UserServiceImpl.class b/WEB-INF/classes/com/baby/user/service/impl/UserServiceImpl.class new file mode 100644 index 0000000..8bf7f54 Binary files /dev/null and b/WEB-INF/classes/com/baby/user/service/impl/UserServiceImpl.class differ diff --git a/WEB-INF/classes/com/baby/util/ApiJsonUtil.class b/WEB-INF/classes/com/baby/util/ApiJsonUtil.class new file mode 100644 index 0000000..a13aeeb Binary files /dev/null and b/WEB-INF/classes/com/baby/util/ApiJsonUtil.class differ diff --git a/WEB-INF/classes/com/baby/util/ApiMessage.class b/WEB-INF/classes/com/baby/util/ApiMessage.class new file mode 100644 index 0000000..00dfe82 Binary files /dev/null and b/WEB-INF/classes/com/baby/util/ApiMessage.class differ diff --git a/WEB-INF/classes/com/baby/util/Contants.class b/WEB-INF/classes/com/baby/util/Contants.class new file mode 100644 index 0000000..67a1d73 Binary files /dev/null and b/WEB-INF/classes/com/baby/util/Contants.class differ diff --git a/WEB-INF/classes/com/baby/util/ImageUtil.class b/WEB-INF/classes/com/baby/util/ImageUtil.class new file mode 100644 index 0000000..a58ef91 Binary files /dev/null and b/WEB-INF/classes/com/baby/util/ImageUtil.class differ diff --git a/WEB-INF/classes/com/baby/util/MessageUtil.class b/WEB-INF/classes/com/baby/util/MessageUtil.class new file mode 100644 index 0000000..384f06f Binary files /dev/null and b/WEB-INF/classes/com/baby/util/MessageUtil.class differ diff --git a/WEB-INF/classes/com/baby/util/RedisUtils.class b/WEB-INF/classes/com/baby/util/RedisUtils.class new file mode 100644 index 0000000..417bc0c Binary files /dev/null and b/WEB-INF/classes/com/baby/util/RedisUtils.class differ diff --git a/WEB-INF/classes/com/baby/util/ReportUtil.class b/WEB-INF/classes/com/baby/util/ReportUtil.class new file mode 100644 index 0000000..5f0492b Binary files /dev/null and b/WEB-INF/classes/com/baby/util/ReportUtil.class differ diff --git a/WEB-INF/classes/com/cache/CacheServlet.class b/WEB-INF/classes/com/cache/CacheServlet.class new file mode 100644 index 0000000..c5afa13 Binary files /dev/null and b/WEB-INF/classes/com/cache/CacheServlet.class differ diff --git a/WEB-INF/classes/com/mmb/framework/support/DynamicDataSource.class b/WEB-INF/classes/com/mmb/framework/support/DynamicDataSource.class new file mode 100644 index 0000000..c9f58ad Binary files /dev/null and b/WEB-INF/classes/com/mmb/framework/support/DynamicDataSource.class differ diff --git a/WEB-INF/classes/com/mmb/framework/support/SpringHandler.class b/WEB-INF/classes/com/mmb/framework/support/SpringHandler.class new file mode 100644 index 0000000..51240b3 Binary files /dev/null and b/WEB-INF/classes/com/mmb/framework/support/SpringHandler.class differ diff --git a/WEB-INF/classes/resources/common/spring-common.xml b/WEB-INF/classes/resources/common/spring-common.xml new file mode 100755 index 0000000..6e1a1cd --- /dev/null +++ b/WEB-INF/classes/resources/common/spring-common.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + java:comp/env/jdbc/baby_master + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WEB-INF/classes/resources/ehcache.xml b/WEB-INF/classes/resources/ehcache.xml new file mode 100755 index 0000000..448aeb5 --- /dev/null +++ b/WEB-INF/classes/resources/ehcache.xml @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/WEB-INF/classes/resources/jobs.xml b/WEB-INF/classes/resources/jobs.xml new file mode 100755 index 0000000..305bf4d --- /dev/null +++ b/WEB-INF/classes/resources/jobs.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/WEB-INF/classes/resources/mongo/spring-mongo.xml b/WEB-INF/classes/resources/mongo/spring-mongo.xml new file mode 100644 index 0000000..6ed5eb5 --- /dev/null +++ b/WEB-INF/classes/resources/mongo/spring-mongo.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/WEB-INF/classes/resources/mybatis/mybatis-config.xml b/WEB-INF/classes/resources/mybatis/mybatis-config.xml new file mode 100755 index 0000000..07ec051 --- /dev/null +++ b/WEB-INF/classes/resources/mybatis/mybatis-config.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WEB-INF/classes/resources/mybatis/spring-mybatis.xml b/WEB-INF/classes/resources/mybatis/spring-mybatis.xml new file mode 100755 index 0000000..d0d59d8 --- /dev/null +++ b/WEB-INF/classes/resources/mybatis/spring-mybatis.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/WEB-INF/classes/resources/spring.xml b/WEB-INF/classes/resources/spring.xml new file mode 100755 index 0000000..b08ac3e --- /dev/null +++ b/WEB-INF/classes/resources/spring.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/WEB-INF/classes/util/AssertUtils.class b/WEB-INF/classes/util/AssertUtils.class new file mode 100644 index 0000000..ca9ef3e Binary files /dev/null and b/WEB-INF/classes/util/AssertUtils.class differ diff --git a/WEB-INF/classes/util/CacheUtil.class b/WEB-INF/classes/util/CacheUtil.class new file mode 100644 index 0000000..844f37f Binary files /dev/null and b/WEB-INF/classes/util/CacheUtil.class differ diff --git a/WEB-INF/classes/util/ConstantValue.class b/WEB-INF/classes/util/ConstantValue.class new file mode 100644 index 0000000..23046ee Binary files /dev/null and b/WEB-INF/classes/util/ConstantValue.class differ diff --git a/WEB-INF/classes/util/DateUtil.class b/WEB-INF/classes/util/DateUtil.class new file mode 100644 index 0000000..da2149e Binary files /dev/null and b/WEB-INF/classes/util/DateUtil.class differ diff --git a/WEB-INF/classes/util/DbUtil.class b/WEB-INF/classes/util/DbUtil.class new file mode 100644 index 0000000..1272e58 Binary files /dev/null and b/WEB-INF/classes/util/DbUtil.class differ diff --git a/WEB-INF/classes/util/DesUtils.class b/WEB-INF/classes/util/DesUtils.class new file mode 100644 index 0000000..7b873c4 Binary files /dev/null and b/WEB-INF/classes/util/DesUtils.class differ diff --git a/WEB-INF/classes/util/EmailType.class b/WEB-INF/classes/util/EmailType.class new file mode 100644 index 0000000..010e2b2 Binary files /dev/null and b/WEB-INF/classes/util/EmailType.class differ diff --git a/WEB-INF/classes/util/EmailUtil.class b/WEB-INF/classes/util/EmailUtil.class new file mode 100644 index 0000000..c91a9ca Binary files /dev/null and b/WEB-INF/classes/util/EmailUtil.class differ diff --git a/WEB-INF/classes/util/JsonUtils.class b/WEB-INF/classes/util/JsonUtils.class new file mode 100644 index 0000000..a5fa934 Binary files /dev/null and b/WEB-INF/classes/util/JsonUtils.class differ diff --git a/WEB-INF/classes/util/MD5Util.class b/WEB-INF/classes/util/MD5Util.class new file mode 100644 index 0000000..e4568b5 Binary files /dev/null and b/WEB-INF/classes/util/MD5Util.class differ diff --git a/WEB-INF/classes/util/PageUtil.class b/WEB-INF/classes/util/PageUtil.class new file mode 100644 index 0000000..60d2697 Binary files /dev/null and b/WEB-INF/classes/util/PageUtil.class differ diff --git a/WEB-INF/classes/util/PagingBean.class b/WEB-INF/classes/util/PagingBean.class new file mode 100644 index 0000000..a0efdd4 Binary files /dev/null and b/WEB-INF/classes/util/PagingBean.class differ diff --git a/WEB-INF/classes/util/StringUtil.class b/WEB-INF/classes/util/StringUtil.class new file mode 100644 index 0000000..3bdf411 Binary files /dev/null and b/WEB-INF/classes/util/StringUtil.class differ diff --git a/WEB-INF/classes/util/Tip.class b/WEB-INF/classes/util/Tip.class new file mode 100644 index 0000000..4205641 Binary files /dev/null and b/WEB-INF/classes/util/Tip.class differ diff --git a/WEB-INF/classes/util/UuidUtil.class b/WEB-INF/classes/util/UuidUtil.class new file mode 100644 index 0000000..1c79aea Binary files /dev/null and b/WEB-INF/classes/util/UuidUtil.class differ diff --git a/WEB-INF/classes/util/filter/LoginFilter.class b/WEB-INF/classes/util/filter/LoginFilter.class new file mode 100644 index 0000000..8114b92 Binary files /dev/null and b/WEB-INF/classes/util/filter/LoginFilter.class differ diff --git a/WEB-INF/classes/util/filter/SetCharacterEncodingFilter.class b/WEB-INF/classes/util/filter/SetCharacterEncodingFilter.class new file mode 100644 index 0000000..db9ba93 Binary files /dev/null and b/WEB-INF/classes/util/filter/SetCharacterEncodingFilter.class differ diff --git a/WEB-INF/classes/util/servlet/QuartzJob.class b/WEB-INF/classes/util/servlet/QuartzJob.class new file mode 100644 index 0000000..f6c5226 Binary files /dev/null and b/WEB-INF/classes/util/servlet/QuartzJob.class differ diff --git a/WEB-INF/classes/util/servlet/TimedTaskDispatcher.class b/WEB-INF/classes/util/servlet/TimedTaskDispatcher.class new file mode 100644 index 0000000..0c3001f Binary files /dev/null and b/WEB-INF/classes/util/servlet/TimedTaskDispatcher.class differ diff --git a/WEB-INF/lib/.DS_Store b/WEB-INF/lib/.DS_Store deleted file mode 100644 index 690fd81..0000000 Binary files a/WEB-INF/lib/.DS_Store and /dev/null differ diff --git a/WEB-INF/src/.DS_Store b/WEB-INF/src/.DS_Store deleted file mode 100644 index 9d4c820..0000000 Binary files a/WEB-INF/src/.DS_Store and /dev/null differ diff --git a/WEB-INF/src/com/.DS_Store b/WEB-INF/src/com/.DS_Store deleted file mode 100644 index e1fe14d..0000000 Binary files a/WEB-INF/src/com/.DS_Store and /dev/null differ diff --git a/WEB-INF/src/com/baby/.DS_Store b/WEB-INF/src/com/baby/.DS_Store deleted file mode 100644 index aa6d803..0000000 Binary files a/WEB-INF/src/com/baby/.DS_Store and /dev/null differ diff --git a/WEB-INF/src/com/baby/album/controller/PhotoInfoController.java b/WEB-INF/src/com/baby/album/controller/PhotoInfoController.java index 6a6f75a..20639f2 100644 --- a/WEB-INF/src/com/baby/album/controller/PhotoInfoController.java +++ b/WEB-INF/src/com/baby/album/controller/PhotoInfoController.java @@ -3,8 +3,31 @@ */ package com.baby.album.controller; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import util.DateUtil; + +import com.baby.album.dto.PhotoInfo; +import com.baby.album.service.PhotoInfoService; +import com.baby.child.controller.ChildInfoController; +import com.baby.child.service.ChildInfoService; +import com.baby.user.dto.User; +import com.baby.user.service.UserService; +import com.baby.util.ApiJsonUtil; +import com.baby.util.ApiMessage; /** * @author guolei @@ -14,4 +37,79 @@ @RequestMapping(value="/api/v1/photoInfoController") public class PhotoInfoController { + final static Logger LOG = LoggerFactory.getLogger(ChildInfoController.class); + + @Resource + UserService userService; + @Resource + ChildInfoService childInfoService; + @Resource + PhotoInfoService photoInfoService; + + @RequestMapping(value="/addPhotoInfo", method=RequestMethod.GET) + @ResponseBody + public Map addPhotoInfo(HttpServletRequest request, HttpServletResponse response, PhotoInfo photoInfo) { + Map result = null; + int apiCode = 0; + result = new HashMap(); + try { + String token = request.getParameter("token"); + if (token == null || token.length() <= 0) { + apiCode = ApiMessage.API_PARAM_ERROR_CODE; + result = ApiJsonUtil.getApiData(apiCode, null); + return result; + } + User user = userService.getUserByToken(token); + int userId = user.getId(); + photoInfo.setUserId(userId); + photoInfo.setCreateTime(DateUtil.getNow()); + photoInfo.setUpdateTime(DateUtil.getNow()); + result.put("list", photoInfo); + photoInfoService.addChildPhotoInfo(photoInfo); + result = ApiJsonUtil.getApiData(apiCode, result); + } catch(Exception e) { + result = ApiJsonUtil.getServerError(); + e.printStackTrace(); + } + return result; + } + + @RequestMapping(value="/findChildPhotoById", method=RequestMethod.GET) + @ResponseBody + public Map findChildPhotoById(HttpServletRequest request, HttpServletResponse response) { + Map result = null; + int apiCode = 0; + result = new HashMap(); + try { + String token = request.getParameter("token"); + String childId = request.getParameter("childId"); + String currentPage = request.getParameter("currentPage"); + String pageSize = request.getParameter("pageSize"); + if (token == null || token.length() <= 0) { + apiCode = ApiMessage.API_PARAM_ERROR_CODE; + result = ApiJsonUtil.getApiData(apiCode, null); + return result; + } + Map paramMap = new HashMap(); + paramMap.put("childId", Integer.parseInt(childId)); + int pageCurrentNumber = Integer.parseInt(currentPage); + int pageSizeNumber = Integer.parseInt(pageSize); + int pageIndex = (pageCurrentNumber - 1) * pageSizeNumber; + paramMap.put("pageIndex", pageIndex); + paramMap.put("pageSize", Integer.parseInt(pageSize)); + List list = photoInfoService.findChildPhotoById(paramMap); + Map childParam = new HashMap(); + childParam.put("childId", childId); + int allPhotoCount = photoInfoService.findChildPhotoByIdCount(childParam); + int pageCount = (allPhotoCount % pageSizeNumber == 0) ? (allPhotoCount / pageSizeNumber) : (allPhotoCount / pageSizeNumber + 1); + result.put("pageCount", pageCount); + result.put("currentPage", pageCurrentNumber); + result.put("list", list); + result = ApiJsonUtil.getApiData(apiCode, result); + } catch(Exception e) { + result = ApiJsonUtil.getServerError(); + e.printStackTrace(); + } + return result; + } } diff --git a/WEB-INF/src/com/baby/album/dao/PhotoInfoDao.java b/WEB-INF/src/com/baby/album/dao/PhotoInfoDao.java index 378d99d..0bd464d 100644 --- a/WEB-INF/src/com/baby/album/dao/PhotoInfoDao.java +++ b/WEB-INF/src/com/baby/album/dao/PhotoInfoDao.java @@ -2,10 +2,33 @@ * */ package com.baby.album.dao; + +import java.util.List; +import java.util.Map; + +import com.baby.album.dto.PhotoInfo; + /** * @author guolei * @version 创建时间：2016年6月1日 下午4:00:27 */ public interface PhotoInfoDao { - + /** + * 添加孩子照片信息 + * @param photoInfo + */ + void addChildPhotoInfo(PhotoInfo photoInfo); + + /** + * 查询指定的孩子照片的全部数量 + * @param map + * @return + */ + int findChildPhotoByIdCount(Map map); + + /** + * 查询指定的孩子照片 + * @param map + */ + List findChildPhotoById(Map map); } diff --git a/WEB-INF/src/com/baby/album/dao/mappers/PhotoInfoMapper.java b/WEB-INF/src/com/baby/album/dao/mappers/PhotoInfoMapper.java index 91e9b33..e9aeee3 100644 --- a/WEB-INF/src/com/baby/album/dao/mappers/PhotoInfoMapper.java +++ b/WEB-INF/src/com/baby/album/dao/mappers/PhotoInfoMapper.java @@ -3,10 +3,14 @@ */ package com.baby.album.dao.mappers; +import java.util.List; +import java.util.Map; + import org.apache.ibatis.spring.support.AbstractDaoSupport; import org.springframework.stereotype.Repository; import com.baby.album.dao.PhotoInfoDao; +import com.baby.album.dto.PhotoInfo; /** * @author guolei @@ -14,5 +18,29 @@ */ @Repository public class PhotoInfoMapper extends AbstractDaoSupport implements PhotoInfoDao { + + /* (non-Javadoc) + * @see com.baby.album.dao.PhotoInfoDao#addPhotoInfo(com.baby.album.dto.PhotoInfo) + */ + @Override + public void addChildPhotoInfo(PhotoInfo photoInfo) { + getSession().insert(photoInfo); + } + + /* (non-Javadoc) + * @see com.baby.album.dao.PhotoInfoDao#findChildPhotoByIdCount(java.util.Map) + */ + @Override + public int findChildPhotoByIdCount(Map map) { + // TODO Auto-generated method stub + return getSession().selectOne(map); + } + /* (non-Javadoc) + * @see com.baby.album.dao.PhotoInfoDao#findChildPhotoById(java.util.Map) + */ + @Override + public List findChildPhotoById(Map map) { + return getSession().selectList(map); + } } diff --git a/WEB-INF/src/com/baby/album/dao/mappers/PhotoInfoMapper.xml b/WEB-INF/src/com/baby/album/dao/mappers/PhotoInfoMapper.xml index b994f53..5eb759f 100644 --- a/WEB-INF/src/com/baby/album/dao/mappers/PhotoInfoMapper.xml +++ b/WEB-INF/src/com/baby/album/dao/mappers/PhotoInfoMapper.xml @@ -1 +1,64 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + insert into photo_album(user_id, child_id, photo_url, description, photo_time, + photo_type, create_time, update_time) values (#{userId}, #{childId}, #{photoUrl}, + #{description}, #{photoTime}, #{photoType}, #{createTime}, #{updateTime}) + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WEB-INF/src/com/baby/album/dto/PhotoInfo.java b/WEB-INF/src/com/baby/album/dto/PhotoInfo.java index e4512a5..7eb6029 100644 --- a/WEB-INF/src/com/baby/album/dto/PhotoInfo.java +++ b/WEB-INF/src/com/baby/album/dto/PhotoInfo.java @@ -13,6 +13,7 @@ public class PhotoInfo { private String photoUrl; private String description; private String photoTime; + private int photoType; private String createTime; private String updateTime; private int status; @@ -124,4 +125,12 @@ public int getStatus() { public void setStatus(int status) { this.status = status; } + + public int getPhotoType() { + return photoType; + } + + public void setPhotoType(int photoType) { + this.photoType = photoType; + } } diff --git a/WEB-INF/src/com/baby/album/service/PhotoInfoService.java b/WEB-INF/src/com/baby/album/service/PhotoInfoService.java index 6ccd417..46f6756 100644 --- a/WEB-INF/src/com/baby/album/service/PhotoInfoService.java +++ b/WEB-INF/src/com/baby/album/service/PhotoInfoService.java @@ -2,10 +2,33 @@ * */ package com.baby.album.service; + +import java.util.List; +import java.util.Map; + +import com.baby.album.dto.PhotoInfo; + /** * @author guolei * @version 创建时间：2016年6月1日 下午4:03:15 */ public interface PhotoInfoService { - + /** + * 添加孩子照片信息 + * @param photoInfo + */ + void addChildPhotoInfo(PhotoInfo photoInfo); + + /** + * 查询特定的孩子照片的总数并返回 + * @param map + * @return + */ + int findChildPhotoByIdCount(Map map); + + /** + * 查询特定的孩子照片并返回 + * @param map + */ + List findChildPhotoById(Map map); } diff --git a/WEB-INF/src/com/baby/album/service/impl/PhotoInfoServiceImpl.java b/WEB-INF/src/com/baby/album/service/impl/PhotoInfoServiceImpl.java index 426db85..44d7b13 100644 --- a/WEB-INF/src/com/baby/album/service/impl/PhotoInfoServiceImpl.java +++ b/WEB-INF/src/com/baby/album/service/impl/PhotoInfoServiceImpl.java @@ -3,12 +3,48 @@ */ package com.baby.album.service.impl; +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import com.baby.album.dao.PhotoInfoDao; +import com.baby.album.dto.PhotoInfo; import com.baby.album.service.PhotoInfoService; /** * @author guolei * @version 创建时间：2016年6月1日 下午4:04:19 */ +@Service public class PhotoInfoServiceImpl implements PhotoInfoService { + + @Resource + private PhotoInfoDao photoInfoDao; + + /* (non-Javadoc) + * @see com.baby.album.service.PhotoInfoService#addPhotoInfo(com.baby.album.dto.PhotoInfo) + */ + @Override + public void addChildPhotoInfo(PhotoInfo photoInfo) { + photoInfoDao.addChildPhotoInfo(photoInfo); + } + + /* (non-Javadoc) + * @see com.baby.album.service.PhotoInfoService#findChildPhotoByIdCount(java.util.Map) + */ + @Override + public int findChildPhotoByIdCount(Map map) { + return photoInfoDao.findChildPhotoByIdCount(map); + } + /* (non-Javadoc) + * @see com.baby.album.service.PhotoInfoService#findChildPhotoById(java.util.Map) + */ + @Override + public List findChildPhotoById(Map map) { + return photoInfoDao.findChildPhotoById(map); + } } diff --git a/WEB-INF/src/com/baby/child/.DS_Store b/WEB-INF/src/com/baby/child/.DS_Store deleted file mode 100644 index f4d231a..0000000 Binary files a/WEB-INF/src/com/baby/child/.DS_Store and /dev/null differ diff --git a/WEB-INF/src/com/baby/child/dao/mappers/ChildInfoMapper.java b/WEB-INF/src/com/baby/child/dao/mappers/ChildInfoMapper.java index 49cbd9c..43e8e3f 100644 --- a/WEB-INF/src/com/baby/child/dao/mappers/ChildInfoMapper.java +++ b/WEB-INF/src/com/baby/child/dao/mappers/ChildInfoMapper.java @@ -7,14 +7,11 @@ import java.util.List; import java.util.Map; -import javax.annotation.Resource; - import org.apache.ibatis.spring.support.AbstractDaoSupport; import org.springframework.stereotype.Repository; import com.baby.child.dao.ChildInfoDao; import com.baby.child.dto.ChildInfo; -import com.baby.child.service.ChildInfoService; /** * @author guolei @@ -22,10 +19,7 @@ */ @Repository public class ChildInfoMapper extends AbstractDaoSupport implements ChildInfoDao { - - @Resource - private ChildInfoService childInfoService; - + /* (non-Javadoc) * @see com.baby.child.dao.ChildInfoDao#addChildInfo(int, com.baby.child.dto.ChildInfo) */ diff --git a/WEB-INF/src/com/baby/child/dao/mappers/ChildInfoMapper.xml b/WEB-INF/src/com/baby/child/dao/mappers/ChildInfoMapper.xml index 90023b8..ca336cd 100644 --- a/WEB-INF/src/com/baby/child/dao/mappers/ChildInfoMapper.xml +++ b/WEB-INF/src/com/baby/child/dao/mappers/ChildInfoMapper.xml @@ -10,11 +10,11 @@ - - + + - + diff --git a/WEB-INF/src/com/baby/util/.DS_Store b/WEB-INF/src/com/baby/util/.DS_Store deleted file mode 100644 index dcc70ce..0000000 Binary files a/WEB-INF/src/com/baby/util/.DS_Store and /dev/null differ diff --git a/WEB-INF/src/com/cache/.DS_Store b/WEB-INF/src/com/cache/.DS_Store deleted file mode 100644 index 9094af4..0000000 Binary files a/WEB-INF/src/com/cache/.DS_Store and /dev/null differ diff --git a/WEB-INF/src/com/mmb/.DS_Store b/WEB-INF/src/com/mmb/.DS_Store deleted file mode 100644 index dce2f29..0000000 Binary files a/WEB-INF/src/com/mmb/.DS_Store and /dev/null differ diff --git a/WEB-INF/src/com/mmb/framework/.DS_Store b/WEB-INF/src/com/mmb/framework/.DS_Store deleted file mode 100644 index d2513d7..0000000 Binary files a/WEB-INF/src/com/mmb/framework/.DS_Store and /dev/null differ diff --git a/WEB-INF/src/com/mmb/framework/support/.DS_Store b/WEB-INF/src/com/mmb/framework/support/.DS_Store deleted file mode 100644 index cf6d81e..0000000 Binary files a/WEB-INF/src/com/mmb/framework/support/.DS_Store and /dev/null differ diff --git a/WEB-INF/src/resources/.DS_Store b/WEB-INF/src/resources/.DS_Store deleted file mode 100644 index f97e23d..0000000 Binary files a/WEB-INF/src/resources/.DS_Store and /dev/null differ diff --git a/WEB-INF/src/resources/mongo/spring-mongo.xml b/WEB-INF/src/resources/mongo/spring-mongo.xml index 28e25d8..6ed5eb5 100644 --- a/WEB-INF/src/resources/mongo/spring-mongo.xml +++ b/WEB-INF/src/resources/mongo/spring-mongo.xml @@ -9,23 +9,6 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd"> - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/WEB-INF/src/util/.DS_Store b/WEB-INF/src/util/.DS_Store deleted file mode 100644 index 1af2603..0000000 Binary files a/WEB-INF/src/util/.DS_Store and /dev/null differ diff --git a/WEB-INF/src/util/AssertUtils.java b/WEB-INF/src/util/AssertUtils.java old mode 100755 new mode 100644 diff --git a/WEB-INF/src/util/CacheUtil.java b/WEB-INF/src/util/CacheUtil.java old mode 100755 new mode 100644 diff --git a/WEB-INF/src/util/ConstantValue.java b/WEB-INF/src/util/ConstantValue.java old mode 100755 new mode 100644 diff --git a/WEB-INF/src/util/DateUtil.java b/WEB-INF/src/util/DateUtil.java old mode 100755 new mode 100644 diff --git a/WEB-INF/src/util/DbUtil.java b/WEB-INF/src/util/DbUtil.java old mode 100755 new mode 100644 diff --git a/WEB-INF/src/util/EmailType.java b/WEB-INF/src/util/EmailType.java old mode 100755 new mode 100644 diff --git a/WEB-INF/src/util/EmailUtil.java b/WEB-INF/src/util/EmailUtil.java old mode 100755 new mode 100644 diff --git a/WEB-INF/src/util/MD5Util.java b/WEB-INF/src/util/MD5Util.java old mode 100755 new mode 100644 diff --git a/WEB-INF/src/util/StringUtil.java b/WEB-INF/src/util/StringUtil.java old mode 100755 new mode 100644 diff --git a/WEB-INF/src/util/Tip.java b/WEB-INF/src/util/Tip.java old mode 100755 new mode 100644 diff --git a/WEB-INF/src/util/filter/LoginFilter.java b/WEB-INF/src/util/filter/LoginFilter.java old mode 100755 new mode 100644 diff --git a/WEB-INF/src/util/filter/SetCharacterEncodingFilter.java b/WEB-INF/src/util/filter/SetCharacterEncodingFilter.java old mode 100755 new mode 100644 diff --git a/WEB-INF/src/util/servlet/QuartzJob.java b/WEB-INF/src/util/servlet/QuartzJob.java old mode 100755 new mode 100644 diff --git a/WEB-INF/src/util/servlet/TimedTaskDispatcher.java b/WEB-INF/src/util/servlet/TimedTaskDispatcher.java old mode 100755 new mode 100644 diff --git a/baby.xml b/baby.xml index 11030ab..4ce9b36 100644 --- a/baby.xml +++ b/baby.xml @@ -1,4 +1,4 @@ - +