合并本地分支

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

 package com.community.huiju.controller;
 
+import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.config.entity.UserElement;
 import com.community.huiju.service.BillServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpSession;
 import java.util.List;
 import java.util.Map;
 
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
 	@RequestMapping(value = "/bills/{communityId}/{payType}",method = RequestMethod.GET)
 	public ResponseBean getBillInvoice(@PathVariable Integer communityId,
-	                                   @PathVariable Integer payType,
-	                                   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-	                                   @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
+									   @PathVariable Integer payType,
+									   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									   @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpSession session){
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
-		List<Map<String,Object>> billsList = billServiceI.getBillsList(communityId,payType,pageNum,pageSize);
+		List<Map<String,Object>> billsList = billServiceI.getBillsList(communityId, payType, userId, pageNum, pageSize);
 		responseBean.addSuccess(billsList);
 		return responseBean;
 	}

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

 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.config.entity.UserElement;
 import com.community.huiju.model.ToCommunities;
 import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.MessageServiceI;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpSession;
 import java.util.List;
 import java.util.Map;
 
 	@ApiOperation(value = "按小区获取消息总数", notes = "按小区获取个人消息总数")
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id") })
 	@RequestMapping(value = "/message/{communityId}/total",method = RequestMethod.GET)
-	public ResponseBean getMessageTotal(@PathVariable Integer communityId){
+	public ResponseBean getMessageTotal(@PathVariable Integer communityId, HttpSession session){
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
-		Map<String,Object> totalMap = messageService.getMessageTotal(communityId);
+		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userId);
 		responseBean.addSuccess(totalMap);
 		return responseBean;
 	}
 	@RequestMapping(value = "/message/{communityId}/news",method = RequestMethod.GET)
 	public ResponseBean getNews(@PathVariable Integer communityId,
 	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-	                            @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
+	                            @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpSession session){
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
-		List<TpMessage> newsList = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS);
+		List<TpMessage> newsList = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS, userId);
 		responseBean.addSuccess(newsList);
 		return responseBean;
 	}
 	@RequestMapping(value = "/message/{communityId}/upcoming",method = RequestMethod.GET)
 	public ResponseBean getUpcoming(@PathVariable Integer communityId,
 	                                @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-	                                @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
+	                                @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpSession session){
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
-		List<TpMessage> upcomingList = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING);
+		List<TpMessage> upcomingList = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING, userId);
 		responseBean.addSuccess(upcomingList);
 		return responseBean;
 	}

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

 import com.community.huiju.config.entity.UserElement;
 import com.community.huiju.model.TpActivity;
 import com.community.huiju.model.TpAnnouncement;
-import com.community.huiju.model.TpMessage;
+import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTransaction;
-import com.community.huiju.model.*;
 import com.community.huiju.service.SocialServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
     @ApiOperation(value = "论坛公告帖子详情", notes = "获取论坛公告帖子详情")
     @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "id", value = "公告帖子id")})
-    public ResponseBean findAnnouncementDetail(@PathVariable(value = "communityId")Integer communityId, @RequestParam("id") Integer id){
+    public ResponseBean findAnnouncementDetail(@PathVariable(value = "communityId")Integer communityId, @RequestParam("id") Integer id, HttpSession session){
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
-        TpAnnouncement tpAnnouncement = socialServiceI.findAnnouncementDetail(id, communityId);
+        TpAnnouncement tpAnnouncement = socialServiceI.findAnnouncementDetail(id, communityId, userId);
         responseBean.addSuccess(tpAnnouncement);
         return responseBean;
     }
     @ApiOperation(value = "活动报名接口", notes = "活动报名接口")
     @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
                          @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id")})
-    public ResponseBean SignActivity(@PathVariable(value = "communityId")Integer communityId, @RequestParam("activityId")Integer activityId){
-        ResponseBean responseBean = socialServiceI.findTaUserInfo(activityId, communityId);
+    public ResponseBean SignActivity(@PathVariable(value = "communityId")Integer communityId, @RequestParam("activityId")Integer activityId, HttpSession session){
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        ResponseBean responseBean = socialServiceI.findTaUserInfo(activityId, communityId, userId);
         return responseBean;
     }
     
     @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){
+    public ResponseBean findActivityDetail(@PathVariable(value = "communityId")Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session){
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
-        TpActivity activity = socialServiceI.findActivityDetail(activityId, communityId);
+        TpActivity activity = socialServiceI.findActivityDetail(activityId, communityId, userId);
         responseBean.addSuccess(activity);
         return responseBean;
     }
     public ResponseBean findUsedDetails(@PathVariable(value = "communityId")Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId=userElement.getId();
+        Integer userId = userElement.getId();
         TpTransaction activity = socialServiceI.findUsedDetails(activityId, communityId,userId);
         responseBean.addSuccess(activity);
         return responseBean;
     @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "帖子Id")})
     @RequestMapping(value = "/stopTicket/{communityId}", method = RequestMethod.GET)
-    public ResponseBean stopTicket(@PathVariable("communityId")Integer communityId, @RequestParam("ticketId")Integer ticketId){
-        ResponseBean responseBean = socialServiceI.stopTpTicketRecord(communityId, ticketId);
+    public ResponseBean stopTicket(@PathVariable("communityId")Integer communityId, @RequestParam("ticketId")Integer ticketId, HttpSession session){
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        ResponseBean responseBean = socialServiceI.stopTpTicketRecord(communityId, ticketId, userId);
         return responseBean;
     }
 
     public ResponseBean addTransaction(TpTransaction tpTransaction, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId=userElement.getId();
+        Integer userId = userElement.getId();
         ResponseBean response=socialServiceI.addAllTransaction(userId,tpTransaction);
         return response;
     }
             @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType ="TpTicket"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "工单Id")})
     @RequestMapping(value = "/accessTicket/{communityId}", method = RequestMethod.POST)
-    public ResponseBean accessTicket(@PathVariable("communityId")Integer communityId, @RequestBody TpTicket tpTicket, @RequestParam("ticketId")String ticketId){
+    public ResponseBean accessTicket(@PathVariable("communityId")Integer communityId, @RequestBody TpTicket tpTicket, @RequestParam("ticketId")String ticketId, HttpSession session){
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
-        socialServiceI.accessTicket(communityId, tpTicket, ticketId);
+        socialServiceI.accessTicket(communityId, tpTicket, ticketId, userId);
         return responseBean;
     }
 }

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

     @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(name = "tpTicketRecordComment", value = "回复记录参数", paramType ="body")})
     @RequestMapping(value = "/ticket/reply/{communityId}", method = RequestMethod.POST)
-    public ResponseBean updateTicketsReply(@PathVariable(value = "communityId") Integer communityId, @RequestBody TpTicketRecordComment tpTicketRecordComment){
+    public ResponseBean updateTicketsReply(@PathVariable(value = "communityId") Integer communityId, @RequestBody TpTicketRecordComment tpTicketRecordComment, HttpSession session){
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
         tpTicketRecordComment.setCommunityId(communityId);
-        Integer size = iTicketService.updateTicketsReply(tpTicketRecordComment);
+        Integer size = iTicketService.updateTicketsReply(tpTicketRecordComment, userId);
         if (size > 0){
             responseBean.addSuccess(size);
         }else{
     public ResponseBean addTransaction(TpTicket tpTicket, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId=userElement.getId();
+        Integer userId = userElement.getId();
         ResponseBean response=iTicketService.addAiTicketService(userId,tpTicket);
         return response;
     }

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

 
     @ApiOperation(value = "查看房屋成员列表", notes = "查看房屋成员列表")
     @RequestMapping(value = "/roomUserList", method = RequestMethod.GET)
-    public ResponseBean accessTicket(){
+    public ResponseBean accessTicket(HttpSession session){
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
-        //todo
-        List<TaUser> taUserList = iTaUserService.getAllRoomUserList(1);
+        List<TaUser> taUserList = iTaUserService.getAllRoomUserList(userId);
         responseBean.addSuccess(taUserList);
         return responseBean;
     }

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

 	 * @param pageSize
 	 * @return
 	 */
-	List<Map<String, Object>> getBillsList(Integer communityId, Integer payType, Integer pageNum, Integer pageSize);
+	List<Map<String, Object>> getBillsList(Integer communityId, Integer payType, Integer userId ,Integer pageNum, Integer pageSize);
 	
 	/**
 	 * 获取账单的详细信息

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

 	 * @param tpTicketRecordComment
 	 * @return
 	 */
-	Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment);
+	Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment, Integer userId);
 }

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

 	 * @param communityId
 	 * @return
 	 */
-	Map<String, Object> getMessageTotal(Integer communityId);
+	Map<String, Object> getMessageTotal(Integer communityId, Integer userId);
 	
 	/**
 	 * 分页获取消息或待办
 	 * @param modelType
 	 * @return
 	 */
-	List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType);
+	List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer userId);
 
 	/**
 	 * 全部已读

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

  * @date 2018/10/23
  */
 public interface SocialServiceI {
-    TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId);
+    TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId, Integer userId);
 
 
 	/**
 	 * @param communityId
 	 * @return
 	 */
-	TpActivity findActivityDetail(Integer activityId, Integer communityId);
+	TpActivity findActivityDetail(Integer activityId, Integer communityId, Integer userId);
 
-	ResponseBean findTaUserInfo(Integer id, Integer communityId);
+	ResponseBean findTaUserInfo(Integer id, Integer communityId, Integer userId);
 
 	/**
 	 * 获取二手租赁详情
 	 * @param ticketId
 	 * @return
 	 */
-	ResponseBean stopTpTicketRecord(Integer communityId, Integer ticketId);
+	ResponseBean stopTpTicketRecord(Integer communityId, Integer ticketId, Integer userId);
 
 	/**
 	 * 添加二手租赁帖子
 	 * @param tpTicket
 	 * @param ticketId
 	 */
-	void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId);
+	void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId, Integer userId);
 }

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

 	 * @return
 	 */
 	@Override
-	public List<Map<String, Object>> getBillsList(Integer communityId, Integer payType, Integer pageNum, Integer pageSize) {
-		//todo
-		Integer userId = 1;
+	public List<Map<String, Object>> getBillsList(Integer communityId, Integer payType, Integer userId ,Integer pageNum, Integer pageSize) {
 		//使用分页插件
 		PageHelper.startPage(pageNum, pageSize);
-		List<Map<String,Object>> billsList = tpBillInvoiceMapper.getBillsList(communityId,userId,payType);
+		List<Map<String,Object>> billsList = tpBillInvoiceMapper.getBillsList(communityId, userId, payType);
 		return billsList;
 	}
 	

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

 	 * @return
 	 */
 	@Override
-	public Map<String, Object> getMessageTotal(Integer communityId) {
-		//todo
-		Integer userId = 1;
+	public Map<String, Object> getMessageTotal(Integer communityId, Integer userId) {
 		return tpMessageMapper.getMessageTotal(userId,communityId);
 	}
 	
 	 * @return
 	 */
 	@Override
-	public List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType) {
-		//todo
-		Integer userId = 1;
+	public List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer userId) {
 		//使用分页插件
 		PageHelper.startPage(pageNum, pageSize);
 		// 获取数据

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

 
     @Override
     @Transactional
-    public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId) {
-        //TODO
-        Integer userId = 1;
+    public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId, Integer userId) {
         //更新此用户的查看次数操作
         Integer allViewNum = updateSocialView(userId,Constant.ANNOUNCEMENT,communityId,id);
         if (null != allViewNum){
      * @return
      */
     @Override
-    public TpActivity findActivityDetail(Integer activityId, Integer communityId) {
-        //TODO
-        Integer userId = 1;
+    public TpActivity findActivityDetail(Integer activityId, Integer communityId, Integer userId) {
         //更新查看次数
         Integer allViewNum = updateSocialView(userId,Constant.ACTIVITY,communityId,activityId);
         if (null != allViewNum){
     }
 
     @Override
-    public ResponseBean findTaUserInfo(Integer activityId, Integer communityId) {
+    public ResponseBean findTaUserInfo(Integer activityId, Integer communityId, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
         TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
         //判断是否已经过了报名截至时间
 
 
         //判断身份是否为业主且状态为已停用
-        //从seession中获取的user_id
-        //TODO
-        TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(1);
-        TaUser taUser = taUserMapper.selectByPrimaryKey(1);
+        TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userId);
+        TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
         if (Constant.INVALID.equals(taUser.getStatus())
             && Constant.OWNER.equals(sysRole.getRoleName())){
 
-            return insertActivitySignUp(tpActivity, communityId);
+            return insertActivitySignUp(tpActivity, communityId, userId);
         }
 
         //身份为家属租客，状态为已停用
         if (Constant.INVALID.equals(taUser.getStatus())
             && (Constant.FAMILYMEMBER.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
 
-            return insertActivitySignUp(tpActivity, communityId);
+            return insertActivitySignUp(tpActivity, communityId, userId);
         }
 
         if (Constant.EFFECTIVE.equals(taUser.getStatus())
                 && (Constant.FAMILYMEMBER.equals(sysRole.getRoleName()))
                 || Constant.TENANT.equals(sysRole.getRoleName())
                 || Constant.OWNER.equals(sysRole.getRoleName())){
-            return insertActivitySignUp(tpActivity, communityId);
+            return insertActivitySignUp(tpActivity, communityId, userId);
         }
         responseBean.addError("9999", "服务器异常");
         return responseBean;
 
     @Transactional
     @Override
-    public ResponseBean stopTpTicketRecord(Integer communityId, Integer ticketId) {
+    public ResponseBean stopTpTicketRecord(Integer communityId, Integer ticketId, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
         try{
             TpTicket tpTicket = new TpTicket();
             tpTicketRecord.setTicketId(ticketId);
             tpTicketRecord.setCommunityId(communityId);
             //TODO
-            tpTicketRecord.setCreateUser(1);
+            tpTicketRecord.setCreateUser(userId);
             tpTicketRecord.setCreateDate(new Date());
             tpTicketRecordMapper.insertSelective(tpTicketRecord);
             return responseBean;
     }
 
     @Override
-    public void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId) {
+    public void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId, Integer userId) {
         //修改工单内容和评分
         tpTicket.setId(Integer.valueOf(ticketId));
         tpTicket.setStatus("5");
         record.setTicketId(Integer.valueOf(ticketId));
         record.setStatus("5");
         //todo
-        record.setCreateUser(1);
+        record.setCreateUser(userId);
         record.setCreateDate(new Date());
         tpTicketRecordMapper.insertSelective(record);
     }
 
-    public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId){
+    public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId, Integer userId){
         ResponseBean responseBean = new ResponseBean();
         //判断是否已经报名
         //todo
-        Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, 1);
+        Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userId);
         if (signNum != 0){
             responseBean.addError("9996", "您已报名，请勿重复报名");
             return responseBean;

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

      * @return
      */
     @Override
-    public Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment) {
-        Integer userId = 1;
+    public Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment, Integer userId) {
         //查询用户名
         TaUser taUser = taUserMapper.selectByPrimaryKey(userId);