合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MessageController.java

 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
 	@RequestMapping(value = "/message/{communityId}/news",method = RequestMethod.GET)
-	public ResponseBean getNews(@PathVariable Integer communityId,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+	public ResponseBean getNews(@PathVariable Integer communityId,
+	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                            @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
 		ResponseBean responseBean = new ResponseBean();
 		List<TpMessage> newsList = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS);
 		responseBean.addSuccess(newsList);
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
 	@RequestMapping(value = "/message/{communityId}/upcoming",method = RequestMethod.GET)
-	public ResponseBean getUpcoming(@PathVariable Integer communityId,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+	public ResponseBean getUpcoming(@PathVariable Integer communityId,
+	                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                                @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
 		ResponseBean responseBean = new ResponseBean();
 		List<TpMessage> upcomingList = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING);
 		responseBean.addSuccess(upcomingList);

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
     @RequestMapping(value = "/announcements/{communityId}",method = RequestMethod.GET)
-    public ResponseBean getAnnouncements(@PathVariable Integer communityId,@RequestParam String title,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+    public ResponseBean getAnnouncements(@PathVariable Integer communityId,@RequestParam String title,
+                                         @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
         List<TpAnnouncement> announcementList = socialServiceI.getAnnouncements(communityId,title,pageNum,pageSize);
         responseBean.addSuccess(announcementList);
 
     @ApiOperation(value = "获取公告轮播图", notes = "获取公告轮播图")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "communityId",value = "小区id"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "sum",value = "显示的条数")
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区id")
     })
-    @RequestMapping(value = "/announcement/announcementCarouselImg/{communityId}",method = RequestMethod.GET)
-    public ResponseBean getAnnouncement(@PathVariable(value = "communityId")Integer communityId ,@RequestParam("sum") Integer sum){
+    @RequestMapping(value = "/announcement/Img/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getAnnouncement(@PathVariable(value = "communityId")Integer communityId ){
         ResponseBean responseBean = new ResponseBean();
-        List<TpAnnouncement> agreement = socialServiceI.getAnnouncement(communityId,sum);
+        List<TpAnnouncement> agreement = socialServiceI.getAnnouncement(communityId);
         responseBean.addSuccess(agreement);
         return responseBean;
     }
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
     @RequestMapping(value = "/activitys/{communityId}",method = RequestMethod.GET)
-    public ResponseBean getActivitys(@PathVariable Integer communityId,@RequestParam String title,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+    public ResponseBean getActivitys(@PathVariable Integer communityId,@RequestParam String title,
+                                     @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
         List<TpActivity> activityList = socialServiceI.getActivitys(communityId,title,pageNum,pageSize);
         responseBean.addSuccess(activityList);
         return responseBean;
     }
+    
+    @ApiOperation(value = "论坛活动帖子详情", notes = "获取论坛活动帖子详情")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id")})
+    @RequestMapping(value = "/activity/{communityId}", method = RequestMethod.GET)
+    public ResponseBean findActivityDetail(@PathVariable(value = "communityId")Integer communityId, @RequestParam("activityId") Integer activityId){
+        ResponseBean responseBean = new ResponseBean();
+        TpActivity activity = socialServiceI.findActivityDetail(activityId, communityId);
+        responseBean.addSuccess(activity);
+        return responseBean;
+    }
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java

     @RequestMapping(value = "/ticket/service/{communityId}",method = RequestMethod.GET)
     @ApiOperation(value = "获取 报修/投诉/联系单 各3条数据",notes = "根据 小区编号,第几页,一页多少行")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "communityId",value = "小区编号"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "pageCode",value = "第几页"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "pageSize",value = "一页多少数据"),
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区编号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少数据"),
     })
     public ResponseBean getService(@PathVariable(value = "communityId") String communityId,
-                                   @RequestParam(value = "pageCode",defaultValue = "1") Integer pageCode,
+                                   @RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum,
                                    @RequestParam(value = "pageSize",defaultValue = "3") Integer pageSize,
                                    HttpSession session) {
         ResponseBean response = new ResponseBean();
         tpTicket.setCommunityId(Integer.valueOf(communityId));
         tpTicket.setTaUserId(userElement.getId());
 
-        response = iTicketService.getList(tpTicket,pageCode,pageSize);
+        response = iTicketService.getList(tpTicket,pageNum,pageSize);
         return response;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

 
     @ApiOperation(value = "登录", notes = "根据登录名和密码")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "communityId",value = "小区"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "loginName",value = "手机号"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "loginPassword",value = "密码")
+            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "loginName",value = "登陆名(手机号)"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "code",value = "验证码")
     })
     @RequestMapping(value = "/user/login/{communityId}",method = RequestMethod.POST)
     public ResponseBean login(@RequestParam(value = "loginName") String loginName,

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpCarouselSettingMapper.java

 
     int updateByPrimaryKey(TpCarouselSetting record);
 
+     int getcarouselNum(String lease);
+
     Integer selectCarouselNum(String carouselType);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java

 	/**
 	 * 公告轮播图
 	 * @param communityId
-	 * @param sum
 	 * @return
 	 */
-	List<TpAnnouncement> getAnnouncement(Integer communityId, Integer sum);
+	List<TpAnnouncement> getAnnouncement(Integer communityId);
 	
 	/**
 	 * 分页获取活动列表
 	 * @return
 	 */
 	List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize);
+	
+	/**
+	 * 获取活动帖子详情
+	 * @param activityId
+	 * @param communityId
+	 * @return
+	 */
+	TpActivity findActivityDetail(Integer activityId, Integer communityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java

 	public List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType) {
 		//todo
 		Integer userId = 1;
-		pageNum = null == pageNum ? 1 : pageNum;
-		pageSize = null == pageSize ? 10 : pageSize;
 		//使用分页插件
 		PageHelper.startPage(pageNum, pageSize);
 		// 获取数据

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

 package com.community.huiju.service.impl;
 
 import com.community.commom.constant.Constant;
-import com.community.huiju.dao.TpAnnouncementMapper;
-import com.community.huiju.dao.TpSocialViewMapper;
-import com.community.huiju.model.TpAnnouncement;
-import com.community.huiju.model.TpSocialView;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.SocialServiceI;
-import com.community.huiju.dao.TpActivityMapper;
 import com.community.huiju.dao.TpAnnouncementMapper;
-import com.community.huiju.model.TpActivity;
 import com.community.huiju.model.TpAnnouncement;
-import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.SocialServiceI;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 
     @Autowired
     private TpActivityMapper tpActivityMapper;
+
+    @Autowired
+    private TpCarouselSettingMapper tpCarouselSettingMapper;
+
+
     
     @Override
     @Transactional
      */
     @Override
     public List<TpAnnouncement> getAnnouncements(Integer communityId,String title, Integer pageNum, Integer pageSize) {
-        pageNum = null == pageNum ? 1 : pageNum;
-        pageSize = null == pageSize ? 10 : pageSize;
         //使用分页插件
         PageHelper.startPage(pageNum, pageSize);
         // 获取数据
     /**
      * 根据当前小区ID查出轮播图
      * @param communityId 当前小区ID
-     * @param sum 当前查询总数
      * @return
      */
     @Override
-    public List<TpAnnouncement> getAnnouncement(Integer communityId, Integer sum) {
-        List<TpAnnouncement> listAnnouncement=tpAnnouncementMapper.getAnnouncement(communityId ,sum);
+    public List<TpAnnouncement> getAnnouncement(Integer communityId) {
+        Integer Num=tpCarouselSettingMapper.getcarouselNum(Constant.ANNOUNCEMENT);
+        List<TpAnnouncement> listAnnouncement=tpAnnouncementMapper.getAnnouncement(communityId,Num);
         return listAnnouncement;
     }
 
      */
     @Override
     public List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize) {
-        pageNum = null == pageNum ? 1 : pageNum;
-        pageSize = null == pageSize ? 10 : pageSize;
         //使用分页插件
         PageHelper.startPage(pageNum, pageSize);
         // 获取数据
         List<TpActivity> activityList = tpActivityMapper.getActivitys(communityId,title);
         return activityList;
     }
+    
+    /**
+     * 获取活动帖子详情
+     * @param activityId
+     * @param communityId
+     * @return
+     */
+    @Override
+    public TpActivity findActivityDetail(Integer activityId, Integer communityId) {
+        return null;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.ListUtils;
-import org.apache.commons.lang.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import sun.security.krb5.internal.Ticket;
 
 import java.util.List;
 import java.util.Map;
     private TpTicketRecordCommentMapper tpTicketRecordCommentMapper;
 
     @Override
-    public ResponseBean getList(TpTicket tpTicket,Integer pageCode, Integer pageSize) {
+    public ResponseBean getList(TpTicket tpTicket,Integer pageNum, Integer pageSize) {
 
         ResponseBean<Map<String,Object>> responseBean = new ResponseBean();
         // 最终返回值
         Map<String,Object> result = Maps.newHashMap();
 
-        // 查询参数
-        Map<String,Object> lastRecordMap = Maps.newHashMap();
-        lastRecordMap.put("size",1);
-
-
         Map<String,Object> parameter = Maps.newHashMap();
         parameter.put("communityId",tpTicket.getCommunityId());
         parameter.put("taUserId",tpTicket.getTaUserId());
 
 
         // 报修
-        PageHelper.startPage(pageCode,pageSize);
+        PageHelper.startPage(pageNum,pageSize);
         List<TpTicket> tpTicketRepairsList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
-
         List<TpTicketVO> repairsList = Lists.newArrayList();
-        tpTicketRepairsList.stream().forEach(e->{
-            TpTicketVO tpTicketVO = new TpTicketVO();
-            BeanUtils.copyProperties(e,tpTicketVO);
-            // 设置工单编号
-            lastRecordMap.put("tickerId",e.getId());
-            TpTicketRecordComment comment = getTicketRecordComment(lastRecordMap);
-            if (null != comment) {
-                tpTicketVO.setCommentContent(comment.getContent());
-                tpTicketVO.setCommentCreateDate(comment.getCreateDate());
-            }
-
-
-            repairsList.add(tpTicketVO);
-        });
+        tpTicketVOConvert(tpTicketRepairsList,repairsList);
 
         // 投诉
         //  0 代表 报修  1 代表 投诉  2代表 联系单
         parameter.put("type",1);
-        PageHelper.startPage(pageCode,pageSize);
+        PageHelper.startPage(pageNum,pageSize);
         List<TpTicket> tpTicketComplaintList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
-
         List<TpTicketVO> complaintList = Lists.newArrayList();
-        tpTicketComplaintList.stream().forEach(e->{
-            TpTicketVO tpTicketVO = new TpTicketVO();
-            BeanUtils.copyProperties(e,tpTicketVO);
-            // 设置工单编号
-            lastRecordMap.put("tickerId",e.getId());
-            TpTicketRecordComment comment = getTicketRecordComment(lastRecordMap);
-            if (null != comment) {
-                tpTicketVO.setCommentContent(comment.getContent());
-                tpTicketVO.setCommentCreateDate(comment.getCreateDate());
-            }
-
-            complaintList.add(tpTicketVO);
-        });
+        tpTicketVOConvert(tpTicketComplaintList, complaintList);
 
         // 联系工单
         //  0 代表 报修  1 代表 投诉  2代表 联系单
         parameter.put("type",2);
-        PageHelper.startPage(pageCode,pageSize);
+        PageHelper.startPage(pageNum,pageSize);
         List<TpTicket> tpTicketLiaisonList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
-
         List<TpTicketVO> liaisonList = Lists.newArrayList();
-        tpTicketLiaisonList.stream().forEach(e->{
-            TpTicketVO tpTicketVO = new TpTicketVO();
-            BeanUtils.copyProperties(e,tpTicketVO);
-            // 设置工单编号
-            lastRecordMap.put("tickerId",e.getId());
-            TpTicketRecordComment comment = getTicketRecordComment(lastRecordMap);
-            if (null != comment) {
-                tpTicketVO.setCommentContent(comment.getContent());
-                tpTicketVO.setCommentCreateDate(comment.getCreateDate());
-            }
-
-            liaisonList.add(tpTicketVO);
-        });
+        tpTicketVOConvert(tpTicketLiaisonList, liaisonList);
 
         result.put("repairs",repairsList);
         result.put("complaint",complaintList);
                 ?null:list.get(0);
     }
 
-//    public <T> List<T> setTicketData(T t, List<Ticket> source, Map map){
-//        List<T> list = Lists.newArrayList();
-//
-//        // 查询参数
-//        Map<String,Object> lastRecordMap = Maps.newHashMap();
-//        lastRecordMap.put("size",1);
-//
-//        source.stream().forEach(e->{
-//            TpTicketVO tpTicketVO = new TpTicketVO();
-//            BeanUtils.copyProperties(e,tpTicketVO);
-//            // 设置工单编号
-//            lastRecordMap.put("tickerId",e.getId());
-//            TpTicketRecordComment comment = getTicketRecordComment(lastRecordMap);
-//            if (null != comment) {
-//                tpTicketVO.setCommentContent(comment.getContent());
-//                tpTicketVO.setCommentCreateDate(comment.getCreateDate());
-//            }
-//
-//            liaisonList.add(tpTicketVO);
-//        });
-
-
-        //return list;
-    //}
+    /**
+     * 数据转换,并填充数据
+     * @param target
+     * @param source
+     * @return
+     */
+    public void tpTicketVOConvert(List<TpTicket> source, List<TpTicketVO> target){
+
+        // 查询参数
+        Map<String,Object> lastRecordMap = Maps.newHashMap();
+        // 表示查询出最新的一条
+        lastRecordMap.put("size",1);
+
+        source.stream().forEach(e->{
+            TpTicketVO tpTicketVO = new TpTicketVO();
+            BeanUtils.copyProperties(e,tpTicketVO);
+            // 设置工单编号
+            lastRecordMap.put("tickerId",e.getId());
+            TpTicketRecordComment comment = getTicketRecordComment(lastRecordMap);
+            if (null != comment) {
+                tpTicketVO.setCommentContent(comment.getContent());
+                tpTicketVO.setCommentCreateDate(comment.getCreateDate());
+            }
+
+            target.add(tpTicketVO);
+        });
+    }
 
 }

CODE/smart-community/app-api/src/main/resources/mapper/TpCarouselSettingMapper.xml

       carousel_num = #{carouselNum,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <select id="getcarouselNum"  parameterType="java.lang.String" resultType="java.lang.Integer">
+    select carousel_num from tp_carousel_setting where  carousel_type=#{lease,jdbcType=VARCHAR}
+  </select>
+
+
 </mapper>