改错

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/code/impl/PhoneCodeImpl.java

@@ -1,7 +1,9 @@
 package com.community.huiju.common.code.impl;
 
 import com.community.commom.constant.Constant;
+import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.ICode;
+import com.community.huiju.common.code.cache.AppkeyCache;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +38,7 @@ public class PhoneCodeImpl implements ICode {
     @Override
     public boolean sendCode(String phone, String code) {
         boolean bool = false;
+
         try {
             String result = null;
             OkHttpClient client = getClient();

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

@@ -2,6 +2,7 @@ package com.community.huiju.controller;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.ICode;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import io.swagger.annotations.Api;
@@ -39,15 +40,22 @@ public class CodeController {
     @RequestMapping(value = "/code/sendCode",method = RequestMethod.POST)
     public ResponseBean sendCode(@RequestParam String phone, HttpSession session) {
         ResponseBean response = new ResponseBean();
+
+        log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
+        if (!AccountValidatorUtil.isPhone(phone)){
+            response.addError("请输入正取的手机号!");
+            return response;
+        }
+
         int code = (int) ((Math.random()*9+1)*1000);
-        boolean result = iCode.sendCode(phone,String.valueOf(code));
-        //boolean result = true;
+        //boolean result = iCode.sendCode(phone,String.valueOf(code));
+        boolean result = true;
         if (result) {
             log.info("{} 验证码: {}",phone,code);
             // 设置缓存
             AppkeyCache.setCache(phone,String.valueOf(code));
             //session.setAttribute(Constant.SESSION_PHONE_CODE,String.valueOf(code));
-            response.addSuccess("发送成功!");
+            response.addSuccess("发送成功!"+code);
         } else {
             response.addError("发送失败!");
         }

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

@@ -86,9 +86,11 @@ public class MessageController {
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
 	@RequestMapping(value = "/readStatus/{communityId}",method = RequestMethod.POST)
-	public ResponseBean allMessageRead(@PathVariable("communityId") Integer communityId){
+	public ResponseBean allMessageRead(@PathVariable("communityId") Integer communityId, HttpSession session){
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
-		messageService.updateMessageReadStatus(communityId);
+		messageService.updateMessageReadStatus(communityId, userId);
 		return responseBean;
 	}
 }

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

@@ -47,7 +47,7 @@ public class SocialController {
         return responseBean;
     }
 
-    @RequestMapping(value = "/sign/{communityId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/sign/{communityId}", method = RequestMethod.POST)
     @ApiOperation(value = "活动报名接口", notes = "活动报名接口")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id"),
@@ -147,7 +147,7 @@ public class SocialController {
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
-    @RequestMapping(value = "/getAllTransaction/{communityId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/getTransactions /{communityId}", method = RequestMethod.GET)
     public ResponseBean getAllPosts(@PathVariable("communityId") Integer communityId, @RequestParam("type") String type,
                                     @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                     @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
@@ -157,29 +157,6 @@ public class SocialController {
         return responseBean;
     }
 
-    @ApiOperation(value = "报修进度终止", notes = "报修进度终止")
-    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "帖子Id"),
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
-    @RequestMapping(value = "/stopTicket/{communityId}", method = RequestMethod.GET)
-    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;
-    }
-
-    @ApiOperation(value = "修改报修内容", notes = "修改报修内容")
-    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "ticketId", value = "工单Id"),
-            @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType = "TpTicket"),
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "type", value = "工单类型")})
-    @RequestMapping(value = "/updateTicket/{ticketId}", method = RequestMethod.POST)
-    public ResponseBean updateTicketContent(@PathVariable("ticketId") Integer ticketId, @RequestBody TpTicket tpTicket, @RequestParam("type") String type) {
-        ResponseBean responseBean = new ResponseBean();
-        socialServiceI.updateTicketContent(ticketId, tpTicket, type);
-        return responseBean;
-    }
-
     @ApiOperation(value = "添加二手租赁帖子", notes = "添加二手租赁帖子")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =

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

@@ -104,7 +104,8 @@ public class TicketController {
 
     @ApiOperation(value = "回复 报修/投诉/联系单 追问接口", notes = "回复 报修/投诉/联系单 追问接口")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(name = "tpTicketRecordComment", value = "回复记录参数", paramType = "body")})
+            @ApiImplicitParam(name = "tpTicketRecordComment", value = "回复记录参数", paramType = "body"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
     @RequestMapping(value = "/ticket/reply/{communityId}", method = RequestMethod.POST)
     public ResponseBean updateTicketsReply(@PathVariable(value = "communityId") Integer communityId, @RequestBody TpTicketRecordComment tpTicketRecordComment, HttpSession session){
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
@@ -122,7 +123,6 @@ public class TicketController {
 
     @ApiOperation(value = "添加报修", notes = "添加报修")
     @ApiImplicitParams({
-
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "ticketContent",value = "工单内容"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "ticketTitle",value = "工单标题"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "repairType",value = "报修房屋类型"),
@@ -146,6 +146,29 @@ public class TicketController {
                 responseBean.addSuccess(agreement);
         return responseBean;
     }
+
+    @ApiOperation(value = "修改报修内容", notes = "修改报修内容")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "ticketId", value = "工单Id"),
+            @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType = "TpTicket"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "type", value = "工单类型")})
+    @RequestMapping(value = "/updateTicket/{ticketId}", method = RequestMethod.POST)
+    public ResponseBean updateTicketContent(@PathVariable("ticketId") Integer ticketId, @RequestBody TpTicket tpTicket, @RequestParam("type") String type) {
+        ResponseBean responseBean = new ResponseBean();
+        iTicketService.updateTicketContent(ticketId, tpTicket, type);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "报修进度终止", notes = "报修进度终止")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "帖子Id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    @RequestMapping(value = "/stopTicket/{communityId}", method = RequestMethod.GET)
+    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 = iTicketService.stopTpTicketRecord(communityId, ticketId, userId);
+        return responseBean;
+    }
 }
 
 

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

@@ -25,5 +25,5 @@ public interface TpMessageMapper {
     
     List<TpMessage> getMessages(@Param(value = "userId") Integer userId,@Param(value = "communityId") Integer communityId, @Param(value = "modelType") Integer modelType);
 
-    void updateReadStatus(Integer communityId);
+    void updateReadStatus(@Param(value = "communityId")Integer communityId, @Param(value = "userId")Integer userId);
 }

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

@@ -54,4 +54,20 @@ public interface ITicketService {
 	 * @return
 	 */
 	Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment, Integer userId);
+
+	/**
+	 * 修改报修内容
+	 * @param ticketId
+	 * @param tpTicket
+	 * @param type
+	 */
+	void updateTicketContent(Integer ticketId, TpTicket tpTicket, String type);
+
+	/**
+	 * 终止报修
+	 * @param communityId
+	 * @param ticketId
+	 * @return
+	 */
+	ResponseBean stopTpTicketRecord(Integer communityId, Integer ticketId, Integer userId);
 }

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

@@ -26,5 +26,5 @@ public interface MessageServiceI {
 	/**
 	 * 全部已读
 	 */
-	void updateMessageReadStatus(Integer communityId);
+	void updateMessageReadStatus(Integer communityId, Integer userId);
 }

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

@@ -66,14 +66,6 @@ public interface SocialServiceI {
 	 */
 	List<TpTransaction> findAllTransaction(Integer communityId, String type, Integer pageNum, Integer paeSize);
 
-	/**
-	 * 终止报修
-	 * @param communityId
-	 * @param ticketId
-	 * @return
-	 */
-	ResponseBean stopTpTicketRecord(Integer communityId, Integer ticketId, Integer userId);
-
 	/**
 	 * 添加二手租赁帖子
 	 */
@@ -91,8 +83,6 @@ public interface SocialServiceI {
 	 */
 	ResponseBean updateTransaction(String paramets,Integer userId);
 
-	void updateTicketContent(Integer ticketId, TpTicket tpTicket, String type);
-
 	/**
 	 * 评价工单以及评分
 	 * @param communityId

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

@@ -34,7 +34,7 @@ public class BannerServiceImpl implements BannerServiceI {
     @Override
     public List<ToBanner> viewAllBannerImg() {
         //查询轮播图数量
-        Integer bannerNum = tpCarouselSettingMapper.selectCarouselNum(Constant.ANNOUNCEMENT);
+        Integer bannerNum = tpCarouselSettingMapper.selectCarouselNum(Constant.BANNER);
 
         String nowTime = DateUtils.getDate("yyyy-MM-dd");
         return toBannerMapper.selectAllByNum(nowTime, bannerNum);

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

@@ -4,6 +4,7 @@ import com.community.huiju.dao.TpMessageMapper;
 import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.MessageServiceI;
 import com.github.pagehelper.PageHelper;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -51,7 +52,7 @@ public class MessageServiceImpl implements MessageServiceI {
 	 * 消息全部已读
 	 */
 	@Override
-	public void updateMessageReadStatus(Integer communityId) {
-		tpMessageMapper.updateReadStatus(communityId);
+	public void updateMessageReadStatus(Integer communityId, Integer userId) {
+		tpMessageMapper.updateReadStatus(communityId, userId);
 	}
 }

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

@@ -188,23 +188,25 @@ public class SocialServiceImpl implements SocialServiceI {
         if (Constant.INVALID.equals(taUser.getStatus())
             && Constant.OWNER.equals(sysRole.getRoleName())){
 
-            return insertActivitySignUp(tpActivity, communityId, userId);
+            responseBean.addError("9996", "您的身份已停用，请联系物业");
+            return responseBean;
         }
 
         //身份为家属租客，状态为已停用
         if (Constant.INVALID.equals(taUser.getStatus())
-            && (Constant.FAMILYMEMBER.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
+            && (Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
 
-            return insertActivitySignUp(tpActivity, communityId, userId);
+            responseBean.addError("9996", "您的身份已停用，请联系物业");
+            return responseBean;
         }
 
         if (Constant.EFFECTIVE.equals(taUser.getStatus())
-                && (Constant.FAMILYMEMBER.equals(sysRole.getRoleName()))
+                && (Constant.RELATION.equals(sysRole.getRoleName()))
                 || Constant.TENANT.equals(sysRole.getRoleName())
                 || Constant.OWNER.equals(sysRole.getRoleName())){
             return insertActivitySignUp(tpActivity, communityId, userId);
         }
-        responseBean.addError("9999", "服务器异常");
+        responseBean.addError("9995", "无法确认您的身份，请联系物业");
         return responseBean;
     }
 
@@ -214,41 +216,11 @@ public class SocialServiceImpl implements SocialServiceI {
         return tpTransactionMapper.findAllTransaction(communityId, type);
     }
 
-    @Transactional
-    @Override
-    public ResponseBean stopTpTicketRecord(Integer communityId, Integer ticketId, Integer userId) {
-        ResponseBean responseBean = new ResponseBean();
-        try{
-            TpTicket tpTicket = new TpTicket();
-            tpTicket.setStatus("6");
-            tpTicket.setId(ticketId);
-            tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
-
-            TpTicketRecord tpTicketRecord = new TpTicketRecord();
-            tpTicketRecord.setStatus("6");
-            tpTicketRecord.setTicketId(ticketId);
-            tpTicketRecord.setCommunityId(communityId);
-            //TODO
-            tpTicketRecord.setCreateUser(userId);
-            tpTicketRecord.setCreateDate(new Date());
-            tpTicketRecordMapper.insertSelective(tpTicketRecord);
-            return responseBean;
-        }catch(Exception e){
-            e.printStackTrace();
-            responseBean.addError("服务器异常");
-            return responseBean;
-        }
-    }
 
-    @Override
-    public void updateTicketContent(Integer ticketId, TpTicket tpTicket, String type) {
-        tpTicket.setId(ticketId);
-        tpTicket.setType(type);
-        tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
-    }
     @Transactional
     @Override
     public ResponseBean addAllTransaction(Integer userId, String paramets) {
+
         ResponseBean response = new ResponseBean();
 
         JSONObject jsonObject = JSONObject.parseObject(paramets);
@@ -275,32 +247,29 @@ public class SocialServiceImpl implements SocialServiceI {
         if (Constant.INVALID.equals(taUser.getStatus())
                 && Constant.OWNER.equals(sysRole.getRoleName())){
 
-            response.addError("");
-            return response
+            response.addError("9996", "您的身份已停用，请联系物业");
+            return response;
         }
 
         //身份为家属租客，状态为已停用
         if (Constant.INVALID.equals(taUser.getStatus())
-                && (Constant.FAMILYMEMBER.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
+                && (Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
 
-             tpTransactionMapper.insertSelective(tpTransaction);
-            TpTransaction tpTransaction1=tpTransactionMapper.getById(tpTransaction.getId());
-            response.addSuccess(tpTransaction1);
+            response.addError("9996", "您的身份已停用，请联系物业");
+            return response;
         }
 
         if (Constant.EFFECTIVE.equals(taUser.getStatus())
-                && (Constant.FAMILYMEMBER.equals(sysRole.getRoleName()))
+                && (Constant.RELATION.equals(sysRole.getRoleName()))
                 || Constant.TENANT.equals(sysRole.getRoleName())
                 || Constant.OWNER.equals(sysRole.getRoleName())){
             tpTransactionMapper.insertSelective(tpTransaction);
             TpTransaction tpTransaction1=tpTransactionMapper.getById(tpTransaction.getId());
             response.addSuccess(tpTransaction1);
         }
-        response.addError("9999", "服务器异常");
+        response.addError("9995", "无法确认您的身份，请联系物业");
         return response;
 
-
-
     }
 
     @Override
@@ -366,7 +335,7 @@ public class SocialServiceImpl implements SocialServiceI {
         TpActivitySignup tpActivitySignup = new TpActivitySignup();
         tpActivitySignup.setActivityId(tpActivity.getId());
         tpActivitySignup.setCommunityId(communityId);
-        tpActivitySignup.setTaUserId(1);
+        tpActivitySignup.setTaUserId(userId);
         tpActivitySignup.setSignUpTime(new Date());
         tpActivitySignupMapper.insertSelective(tpActivitySignup);
         responseBean.addSuccess("报名成功");

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.MD5Utils;
@@ -151,6 +152,17 @@ public class TaUserServiceImpl implements ITaUserService {
         //user.setLoginPassword(MD5Utils.encode(user.getLoginPassword()));
         taUserMapper.insertSelective(user);
 
+        user.setCreateUser(user.getId());
+        user.setUpdateUser(user.getId());
+
+        // 更新
+        taUserMapper.updateByPrimaryKeySelective(user);
+
+        // TODO 这里先默认 type=0 (租客), 后期需要和 资料库对接
+        addUserRole(0,response,user);
+
+
+
         TaUserVO taUserVO = new TaUserVO();
         BeanUtils.copyProperties(user,taUserVO);
         response.addSuccess(taUserVO);
@@ -250,17 +262,17 @@ public class TaUserServiceImpl implements ITaUserService {
             return response;
         }
         if (bool) {
-            if ("1".equals(user.getStatus())) {
+            if (Constant.EFFECTIVE.equals(user.getStatus())) {
                 response.addError("用户已启用!");
                 return response;
             }
-            user.setStatus("1");
+            user.setStatus(Constant.EFFECTIVE+"");
         } else {
-            if ("0".equals(user.getStatus())) {
+            if (Constant.INVALID.equals(user.getStatus())) {
                 response.addError("用户已停用!");
                 return response;
             }
-            user.setStatus("0");
+            user.setStatus(Constant.INVALID+"");
         }
 
         int result = taUserMapper.updateByPrimaryKeySelective(user);
@@ -303,7 +315,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setUpdateDate(new Date());
         user.setUpdateUser(currentUserId);
         user.setParentId(currentUserId);
-        user.setStatus("1");
+        user.setStatus(Constant.EFFECTIVE+"");
         user.setVerifyStatus("1");
         user.setAcceptAgreementStatus("1");
         user.setRemark("这是业主添加的!");
@@ -317,6 +329,19 @@ public class TaUserServiceImpl implements ITaUserService {
             return response;
         }
 
+        addUserRole(type,response,user);
+
+        return response;
+    }
+
+    /**
+     * 公共方法,添加角色.
+     *      用于注册 和 业主添加家属和租客
+     * @param type 0 是租客  1 是家属
+     * @param response
+     * @param user
+     */
+    private void addUserRole(Integer type,ResponseBean response,TaUser user){
         // 先查询角色 在角色关联记录
         // 这里的 2 或者 3 是对应角色编号
         int roleType = type.equals("0") ? 2 : 3;
@@ -324,7 +349,7 @@ public class TaUserServiceImpl implements ITaUserService {
         if (null == taSysRole) {
             response.addError("该权限不存在!");
             log.error("这个角色没有找到!角色名称:{} 角色编号:{}",type.equals("0") ? "租客" : "家属",roleType);
-            return response;
+            return;
         }
 
         TaSysUserRole taSysUserRole = new TaSysUserRole();
@@ -343,8 +368,6 @@ public class TaUserServiceImpl implements ITaUserService {
             log.error("租客或者家属角色权限添加失败!",e);
             throw new RuntimeException("租客或者家属角色权限添加失败");
         }
-
-        return response;
     }
 
     @Transactional

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

@@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
@@ -227,4 +228,37 @@ public class TicketServiceImpl implements ITicketService {
         //插入回复数据
         return tpTicketRecordCommentMapper.insertSelective(tpTicketRecordComment);
     }
+
+    @Override
+    public void updateTicketContent(Integer ticketId, TpTicket tpTicket, String type) {
+        tpTicket.setId(ticketId);
+        tpTicket.setType(type);
+        tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
+    }
+
+    @Transactional
+    @Override
+    public ResponseBean stopTpTicketRecord(Integer communityId, Integer ticketId, Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
+        try{
+            TpTicket tpTicket = new TpTicket();
+            tpTicket.setStatus("6");
+            tpTicket.setId(ticketId);
+            tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
+
+            TpTicketRecord tpTicketRecord = new TpTicketRecord();
+            tpTicketRecord.setStatus("6");
+            tpTicketRecord.setTicketId(ticketId);
+            tpTicketRecord.setCommunityId(communityId);
+            //TODO
+            tpTicketRecord.setCreateUser(userId);
+            tpTicketRecord.setCreateDate(new Date());
+            tpTicketRecordMapper.insertSelective(tpTicketRecord);
+            return responseBean;
+        }catch(Exception e){
+            e.printStackTrace();
+            responseBean.addError("服务器异常");
+            return responseBean;
+        }
+    }
 }

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

@@ -268,7 +268,8 @@
       AND a.activity_title LIKE concat('%',#{title,jdbcType=VARCHAR},'%')
   ORDER BY
       a.sort,
-      a.create_date DESC
+      a.activity_end_time DESC,
+	  a.create_date DESC
   </select>
 
   <select id="getActivity" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpActivity">

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

@@ -271,6 +271,8 @@
     and advice_type = 1
     and model_type = 1
     and source = 1
+    and uuid_type = 1
+    and uuid = #{userId}
   </update>
 
 </mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -34,7 +34,7 @@ public class Constant {
     public static final String REQUEST_URL = "http://micservice.ycjcjy.com/sms";
 
     /** 本地缓存过期时间 单位秒 **/
-    public static final Long CACHE_EXPIRE = 60L;
+    public static final Long CACHE_EXPIRE = 120L;
 
     /** 本地緩存最大个数 **/
     public static final Long CACHE_SIZE = 1000L;
@@ -54,6 +54,9 @@ public class Constant {
     /** 社交二手租赁类型**/
     public static final String LEASE = "lease";
 
+    /** banner类型公告**/
+    public static final String BANNER = "banner";
+
     /**有效状态**/
     public static final Integer EFFECTIVE = 1;
 
@@ -61,13 +64,13 @@ public class Constant {
     public static final Integer INVALID = 0;
 
     /**业主角色**/
-    public static final String OWNER = "owner";
+    public static final String OWNER = "OWNER";
 
     /**租客角色**/
-    public static final String TENANT = "tenant";
+    public static final String TENANT = "TENANT";
 
     /**家属角色**/
-    public static final String FAMILYMEMBER = "familyMember";
+    public static final String RELATION = "RELATION";
     
     /** 工单回复的发起人 **/
     public static final String TICKET_USER_TYPE = "1";

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/RestAuthenticationEntryPoint.java

@@ -33,9 +33,10 @@ public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint {
             } else if (Status.RESPONSE_STATUS_801.getValue().equals(headerError)) {
                 result.addError("401","请您登陆!");
             }
-        }else {
-            result.addError("403",Status.RESPONSE_STATUS_401.getComment());
         }
+//        else {
+//            result.addError("403",Status.RESPONSE_STATUS_401.getComment());
+//        }
 
         try {
             //设置跨域请求 请求结果json刷到响应里

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/RestPreAuthenticatedProcessingFilter.java

@@ -9,8 +9,10 @@ import com.community.huiju.service.IRoleService;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
 import org.springframework.util.AntPathMatcher;
 
@@ -74,7 +76,7 @@ public class RestPreAuthenticatedProcessingFilter extends AbstractPreAuthenticat
                 }
 
                 grantedAuthorityList = roleDTOList.stream()
-                        .map(e->new SimpleGrantedAuthority("ROLE_OWNER")) //
+                        .map(e->new SimpleGrantedAuthority(e.getRoleName()))
                         .collect(Collectors.toList());
             } catch (Exception e){
                 log.error("用户授权失败!",e);

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/WisdomSecurityConfig.java

@@ -35,8 +35,8 @@ public class WisdomSecurityConfig extends WebSecurityConfigurerAdapter {
      */
     private RestPreAuthenticatedProcessingFilter getPreAuthenticatedProcessingFilter() throws Exception {
         RestPreAuthenticatedProcessingFilter filter = new RestPreAuthenticatedProcessingFilter(parametes.getNoneSercurityPath(),iRoleService);
-        //filter.setAuthenticationManager(this.authenticationManagerBean());
-        filter.setAuthenticationManager(new RestPreAuthenticateManager());
+        filter.setAuthenticationManager(this.authenticationManagerBean());
+        //filter.setAuthenticationManager(new RestPreAuthenticateManager());
         return filter;
     }
 
@@ -45,11 +45,11 @@ public class WisdomSecurityConfig extends WebSecurityConfigurerAdapter {
      * @param auth
      * @throws Exception
      */
-//    @Override
-//    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-//        auth.authenticationProvider(new RestPreAuthenticateProvider());
-//        //super.configure(auth);
-//    }
+    @Override
+    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+        auth.authenticationProvider(new RestPreAuthenticateProvider());
+        //super.configure(auth);
+    }
 
     /**
      * 安全策略

CODE/smart-community/zuul/src/main/java/com/community/huiju/security/dome/TokenAuthrentication.java

@@ -0,0 +1,88 @@
+package com.community.huiju.security.dome;
+
+import org.springframework.security.authentication.AbstractAuthenticationToken;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.SpringSecurityCoreVersion;
+
+import java.util.Collection;
+
+/**
+ * 认证
+ * @author weiximei
+ */
+public class TokenAuthrentication extends AbstractAuthenticationToken {
+
+    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+
+    // ~ Instance fields
+    // ================================================================================================
+
+    private final Object principal; // 存储认证信息的
+    //private Object credentials; // 存放密码
+
+    // ~ Constructors
+    // ===================================================================================================
+
+    /**
+     * This constructor can be safely used by any code that wishes to create a
+     * <code>SmsCodeAuthenticationToken</code>, as the {@link #isAuthenticated()}
+     * will return <code>false</code>.
+     *
+     */
+    public TokenAuthrentication(String token) {
+        super(null);
+        this.principal = token; // 存放token
+        //this.credentials = credentials;
+        // 是否认证
+        setAuthenticated(false);
+    }
+
+    /**
+     * This constructor should only be used by <code>AuthenticationManager</code> or
+     * <code>AuthenticationProvider</code> implementations that are satisfied with
+     * producing a trusted (i.e. {@link #isAuthenticated()} = <code>true</code>)
+     * authentication token.
+     *
+     * @param principal
+     * @param authorities
+     */
+    // principal 用户认证信息，authorities用户的权限
+    public TokenAuthrentication(Object principal,
+                                      Collection<? extends GrantedAuthority> authorities) {
+        super(authorities);
+        this.principal = principal; // 登录成功，存放用户信息
+        // this.credentials = credentials;
+        // 是否认证
+        super.setAuthenticated(true); // must use super, as we override
+    }
+
+    // ~ Methods
+    // ========================================================================================================
+    @Override
+    public Object getCredentials() {
+        //return this.credentials;
+        return null;
+    }
+
+    @Override
+    public Object getPrincipal() {
+        return this.principal;
+    }
+
+    @Override
+    public void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException {
+        if (isAuthenticated) {
+            throw new IllegalArgumentException(
+                    "Cannot set this token to trusted - use constructor which takes a GrantedAuthority list instead");
+        }
+
+        super.setAuthenticated(false);
+    }
+
+    @Override
+    public void eraseCredentials() {
+        super.eraseCredentials();
+        // credentials = null;
+    }
+
+}