合并

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

@@ -64,9 +64,7 @@ public class SocialController extends BaseController {
                                      @RequestParam(value = "remark", required = false) String remark,
                                      @RequestParam("activityId") Integer activityId,
                                      HttpSession session) {
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-
+        UserElement userElement = getUserElement(session);
         ResponseBean responseBean = new ResponseBean();
 
         if (!check(communityId)) {
@@ -74,7 +72,7 @@ public class SocialController extends BaseController {
             return responseBean;
         }
 
-        responseBean = socialServiceI.findTaUserInfo(userElement, activityId, communityId, userId,remark);
+        responseBean = socialServiceI.findTaUserInfo(userElement, activityId, communityId ,remark);
         return responseBean;
     }
     
@@ -332,8 +330,7 @@ public class SocialController extends BaseController {
 
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.addAllTransaction(userId, paramets,userElement.getUserVerifyId());
+        ResponseBean response = socialServiceI.addAllTransaction(userElement, paramets);
         return response;
     }
     
@@ -368,8 +365,7 @@ public class SocialController extends BaseController {
                                              @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.selectAllTransaction(userId, pageNum, pageSize,type,userElement.getCommunityId());
+        ResponseBean response = socialServiceI.selectAllTransaction(userElement, pageNum, pageSize,type);
         return response;
     }
 

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

@@ -161,8 +161,7 @@ public class TicketController extends BaseController {
     public ResponseBean addTransaction(@RequestBody String paramets, HttpSession session) throws IOException {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-        ResponseBean response = iTicketService.addAiTicketService(userId, paramets);
+        ResponseBean response = iTicketService.addAiTicketService(userElement, paramets);
         return response;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTransaction.java

@@ -63,6 +63,11 @@ public class TpTransaction {
      */
     private String releaseIdentity;
 
+    /**
+     * 权重
+     */
+    private String sort;
+
     public void setReleaseIdentity(String releaseIdentity) {
         this.releaseIdentity = releaseIdentity;
     }
@@ -248,4 +253,12 @@ public class TpTransaction {
     public void setBel(String bel) {
         this.bel = bel;
     }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTicketRecordComment;
 import com.community.huiju.vo.TpTicketVO;
@@ -43,11 +44,11 @@ public interface ITicketService {
 
 	/**
 	 * 添加 维修/投诉/联系单
-	 * @param userId
+	 * @param userElement
 	 * @param parameter
 	 * @return
 	 */
-    ResponseBean addAiTicketService(Integer userId,String parameter) throws IOException;
+    ResponseBean addAiTicketService(UserElement userElement, String parameter) throws IOException;
 	
 	/**
 	 * 回复工单

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

@@ -64,11 +64,10 @@ public interface SocialServiceI {
 	 * 活动报名
 	 * @param activityId
 	 * @param communityId
-	 * @param userId
 	 * @param remark
 	 * @return
 	 */
-	ResponseBean findTaUserInfo(UserElement userElement, Integer activityId, Integer communityId, Integer userId, String remark);
+	ResponseBean findTaUserInfo(UserElement userElement, Integer activityId, Integer communityId, String remark);
 
 	/**
 	 * 修改活动报名
@@ -108,15 +107,18 @@ public interface SocialServiceI {
 	/**
 	 * 添加二手租赁帖子
 	 */
-    ResponseBean addAllTransaction(Integer userId, String paramets, Integer userVerifyId)throws IOException;
+    ResponseBean addAllTransaction(UserElement userElement, String paramets);
 
 
 	/**
 	 * 获取当前用户发布所有的帖子
-	 * @param userId
+	 * @param userElement
+	 * @param pageNum
+	 * @param pageSize
+	 * @param type
 	 * @return
 	 */
-	ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer pageSize,Integer type,Integer communityId);
+	ResponseBean selectAllTransaction(UserElement userElement,Integer pageNum,Integer pageSize,Integer type);
 
 	/**
 	 * 修改当前帖子

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

@@ -7,6 +7,7 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
+import com.community.huiju.service.ITaUserService;
 import com.community.huiju.service.ImageServiceI;
 import com.community.huiju.service.SocialServiceI;
 import com.github.pagehelper.Page;
@@ -60,7 +61,7 @@ public class SocialServiceImpl implements SocialServiceI {
     private TaUserMapper taUserMapper;
 
     @Autowired
-    private  TaSysUserRoleMapper taSysUserRoleMapper;
+    private TaSysUserRoleMapper taSysUserRoleMapper;
 
     @Autowired
     private TpTicketRecordMapper tpTicketRecordMapper;
@@ -84,13 +85,13 @@ public class SocialServiceImpl implements SocialServiceI {
     private TpTransactionReportMapper tpTransactionReportMapper;
 
     @Autowired
-    private ToCommunitiesMapper  toCommunitiesMapper;
+    private ToCommunitiesMapper toCommunitiesMapper;
 
     @Autowired
     private TpTransactionReplyMapper tpTransactionReplyMapper;
 
     @Autowired
-    private  TpTransactionLikeMapper tpTransactionLikeMapper;
+    private TpTransactionLikeMapper tpTransactionLikeMapper;
 
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
@@ -99,31 +100,35 @@ public class SocialServiceImpl implements SocialServiceI {
     private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 
     @Autowired
-    private  TpActivitySignInMapper tpActivitySignInMapper;
+    private TpActivitySignInMapper tpActivitySignInMapper;
+
+    @Autowired
+    private ITaUserService iTaUserService;
 
     @Override
     @Transactional
     public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId, Integer userId) {
         //更新此用户的查看次数操作
-        Integer allViewNum = updateSocialView(userId,Constant.ANNOUNCEMENT,communityId,id);
-        if (null != allViewNum){
+        Integer allViewNum = updateSocialView(userId, Constant.ANNOUNCEMENT, communityId, id);
+        if (null != allViewNum) {
             tpAnnouncementMapper.updateByPrimaryKeySelective(id, allViewNum);
         }
         TpAnnouncement tpAnnouncement = tpAnnouncementMapper.selectByPrimaryKey(id, communityId);
         tpAnnouncement.setUserName(tpUserMapper.selectByPrimaryKey(tpAnnouncement.getCreateUser()).getUserName());
 
-        Map<String,Object> map = Maps.newHashMap();
-        map.put("uuid",tpAnnouncement.getId());
-        map.put("type",Constant.ANNOUNCEMENT);
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("uuid", tpAnnouncement.getId());
+        map.put("type", Constant.ANNOUNCEMENT);
         // 查询图片
         List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
-        List<String> imgList = tdImagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
+        List<String> imgList = tdImagesList.stream().map(e -> new String(e.getImageUrl())).collect(Collectors.toList());
         tpAnnouncement.setImgList(imgList);
         return tpAnnouncement;
     }
 
     /**
      * 分页获取公告列表
+     *
      * @param communityId
      * @param title
      * @param pageNum
@@ -132,35 +137,38 @@ public class SocialServiceImpl implements SocialServiceI {
      */
     @Override
     public ResponseBean getAnnouncements(Integer communityId, String title, Integer pageNum, Integer pageSize) {
-        ResponseBean responseBean=new ResponseBean();
+        ResponseBean responseBean = new ResponseBean();
         Map<String, Object> parameter = Maps.newHashMap();
         //使用分页插件
-        Page<TpAnnouncement> pageannouncementList=PageHelper.startPage(pageNum, pageSize);
+        Page<TpAnnouncement> pageannouncementList = PageHelper.startPage(pageNum, pageSize);
         // 获取数据
-        List<TpAnnouncement> announcementList = tpAnnouncementMapper.getAnnouncements(communityId,title);
-        parameter.put("total",pageannouncementList.getTotal());
-        parameter.put("list",announcementList);
+        List<TpAnnouncement> announcementList = tpAnnouncementMapper.getAnnouncements(communityId, title);
+        parameter.put("total", pageannouncementList.getTotal());
+        parameter.put("list", announcementList);
         responseBean.addSuccess(parameter);
         return responseBean;
     }
+
     /**
      * 根据当前小区ID查出轮播图
+     *
      * @param communityId 当前小区ID
      * @return
      */
     @Override
     public List<TpAnnouncement> getAnnouncement(Integer communityId) {
-        Integer num=tpCarouselSettingMapper.getcarouselNum(Constant.ANNOUNCEMENT, communityId);
+        Integer num = tpCarouselSettingMapper.getcarouselNum(Constant.ANNOUNCEMENT, communityId);
         if (null == num) {
             num = 0;
         }
-        List<TpAnnouncement> listAnnouncement=tpAnnouncementMapper.getAnnouncement(communityId,num);
+        List<TpAnnouncement> listAnnouncement = tpAnnouncementMapper.getAnnouncement(communityId, num);
         return listAnnouncement;
     }
 
-    
+
     /**
      * 分页获取活动列表
+     *
      * @param communityId
      * @param title
      * @param pageNum
@@ -169,20 +177,21 @@ public class SocialServiceImpl implements SocialServiceI {
      */
     @Override
     public ResponseBean getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize) {
-        ResponseBean responseBean= new ResponseBean();
+        ResponseBean responseBean = new ResponseBean();
         Map<String, Object> result = Maps.newHashMap();
         //使用分页插件
-        Page<TpActivity> pageactivityList=PageHelper.startPage(pageNum, pageSize);
+        Page<TpActivity> pageactivityList = PageHelper.startPage(pageNum, pageSize);
         // 获取数据
-        List<TpActivity> activityList = tpActivityMapper.getActivitys(communityId,title);
-        result.put("list",activityList);
-        result.put("total",pageactivityList.getTotal());
+        List<TpActivity> activityList = tpActivityMapper.getActivitys(communityId, title);
+        result.put("list", activityList);
+        result.put("total", pageactivityList.getTotal());
         responseBean.addSuccess(result);
         return responseBean;
     }
-    
+
     /**
      * 获取活动帖子详情
+     *
      * @param activityId
      * @param communityId
      * @return
@@ -190,48 +199,49 @@ public class SocialServiceImpl implements SocialServiceI {
     @Override
     public TpActivity findActivityDetail(Integer activityId, Integer communityId, Integer userId) {
         //更新查看次数
-        Integer allViewNum = updateSocialView(userId,Constant.ACTIVITY,communityId,activityId);
-        if (null != allViewNum){
+        Integer allViewNum = updateSocialView(userId, Constant.ACTIVITY, communityId, activityId);
+        if (null != allViewNum) {
             TpActivity activity = new TpActivity();
             activity.setId(activityId);
             activity.setViewCount(allViewNum);
             tpActivityMapper.updateByPrimaryKeySelective(activity);
         }
 
-        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId,communityId);
+        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
         TpUser tpUser = tpUserMapper.selectByPrimaryKey(tpActivity.getCreateUser());
         if (null != tpUser) {
             tpActivity.setUserName(tpUser.getUserName());
         }
         //查看当前人是否签到
-        TpActivitySignIn tpActivitySignIn= tpActivitySignInMapper.selectSing(activityId,userId);
-        Integer signType=tpActivitySignIn==null?0:1;
+        TpActivitySignIn tpActivitySignIn = tpActivitySignInMapper.selectSing(activityId, userId);
+        Integer signType = tpActivitySignIn == null ? 0 : 1;
         tpActivity.setSignType(signType);
 
         //返回报名状态
         Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userId);
         String signStatus = signNum != 0 ? Constant.STATUS_SIGNED : Constant.STATUS_UNSIGN;
         tpActivity.setSignStatus(signStatus);
-        
-        Map<String,Object> map = Maps.newHashMap();
-        map.put("uuid",tpActivity.getId());
-        map.put("type",Constant.ACTIVITY);
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("uuid", tpActivity.getId());
+        map.put("type", Constant.ACTIVITY);
         // 查询图片
         List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
-        List<String> imgList = tdImagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
+        List<String> imgList = tdImagesList.stream().map(e -> new String(e.getImageUrl())).collect(Collectors.toList());
         tpActivity.setImgList(imgList);
 
         return tpActivity;
     }
-    
+
     /**
      * 更新此用户的查看次数操作
+     *
      * @param userId
      * @param socialType
      * @param communityId
      * @param uuid
      */
-    private Integer updateSocialView(Integer userId,String socialType,Integer communityId,Integer uuid) {
+    private Integer updateSocialView(Integer userId, String socialType, Integer communityId, Integer uuid) {
         //检查是否查看过这个帖子
         TpSocialView tpSocialView = new TpSocialView();
         tpSocialView.setTaUserId(userId);
@@ -239,9 +249,9 @@ public class SocialServiceImpl implements SocialServiceI {
         tpSocialView.setCommunityId(communityId);
         tpSocialView.setUuid(uuid);
         Integer viewNum = tpSocialViewMapper.selectViewNum(tpSocialView);
-    
+
         //查看过的话查看次数加一
-        if (viewNum == 0){
+        if (viewNum == 0) {
             tpSocialView.setCreateDate(new Date());
             tpSocialViewMapper.insertSelective(tpSocialView);
             tpSocialView.setTaUserId(null);
@@ -252,72 +262,46 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean findTaUserInfo(UserElement userElement, Integer activityId, Integer communityId, Integer userId,String remark) {
+    public ResponseBean findTaUserInfo(UserElement userElement, Integer activityId, Integer communityId, String remark) {
         ResponseBean responseBean = new ResponseBean();
         TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
         //判断是否已经过了报名截至时间
         Date registrEndTime = tpActivity.getRegistrationEndTime();
-        if (registrEndTime.compareTo(new Date()) < 0){
-             responseBean.addError("9997", "已过报名截止时间");
-             return responseBean;
+        if (registrEndTime.compareTo(new Date()) < 0) {
+            responseBean.addError("9997", "已过报名截止时间");
+            return responseBean;
         }
 
         //报名是否超过人数上限
         Integer signUpNum = tpActivitySignupMapper.sumActivitySignUpNum(activityId, communityId);
-        if (signUpNum >= tpActivity.getSignUpMax() && tpActivity.getSignUpMax().intValue() != 0 ){
+        if (signUpNum >= tpActivity.getSignUpMax() && tpActivity.getSignUpMax().intValue() != 0) {
             responseBean.addError("9998", "报名人数已满");
             return responseBean;
         }
 
-        //已登陆，身份未知，状态未知
-
-
-
         //判断身份是否为业主且状态为已停用
-        TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+        TaUser taUser = taUserMapper.selectByPrimaryKey(userElement.getId());
         if (taUser.getId().intValue() == -1) {
             responseBean.addError("9996", "游客不能报名");
             return responseBean;
         }
-        TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userId);
-        if (Constant.INVALID.equals(taUser.getStatus())
-            && Constant.OWNER.equals(sysRole.getRoleName())){
 
-            responseBean.addError("9996", "您的身份已停用，请联系物业");
-            return responseBean;
-        }
+        // 校验用户
+        iTaUserService.checkBlacklistStatusUser(taUser);
 
-        //身份为家属租客，状态为已停用
-        if (Constant.INVALID.equals(taUser.getStatus())
-            && (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getRoleName()))){
-
-            responseBean.addError("9996", "您的身份已停用，请联系物业");
-            return responseBean;
-        }
-
-        if (Constant.EFFECTIVE.equals(taUser.getVerifyStatus())
-                && Constant.EFFECTIVE.equals(taUser.getStatus())
-                && (Constant.RELATION.equals(sysRole.getRoleName())
-                || Constant.TENANT.equals(sysRole.getRoleName())
-                || Constant.OWNER.equals(sysRole.getRoleName()))){
-
-
-            return insertActivitySignUp(userElement, tpActivity, communityId, userId, remark);
-        }
-        responseBean.addError("9995", "无法确认您的身份，请联系物业");
-        return responseBean;
+        return insertActivitySignUp(userElement, tpActivity, communityId, remark);
     }
 
     @Override
-    public ResponseBean findAllTransaction(Integer communityId,String transactionTitle, String type, Integer pageNum, Integer paeSize) {
+    public ResponseBean findAllTransaction(Integer communityId, String transactionTitle, String type, Integer pageNum, Integer paeSize) {
         Map<String, Object> parameter = Maps.newHashMap();
-       ResponseBean  responseBean= new ResponseBean();
-        Page<TpTransaction> pageList=PageHelper.startPage(pageNum, paeSize);
-        List<TpTransaction> tpTransactions= tpTransactionMapper.findAllTransaction(communityId, transactionTitle,type);
+        ResponseBean responseBean = new ResponseBean();
+        Page<TpTransaction> pageList = PageHelper.startPage(pageNum, paeSize);
+        List<TpTransaction> tpTransactions = tpTransactionMapper.findAllTransaction(communityId, transactionTitle, type);
 
-        tpTransactions.stream().forEach(e->{
+        tpTransactions.stream().forEach(e -> {
 
-            if (null != e.getTaUserVerifyId()){
+            if (null != e.getTaUserVerifyId()) {
                 TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(e.getTaUserVerifyId());
                 e.setRoleId(taSysRole.getId());
                 e.setRoleName(taSysRole.getRoleName());
@@ -326,82 +310,68 @@ public class SocialServiceImpl implements SocialServiceI {
             e.setCreateUserName(taUser.getUserName());
         });
 
-        parameter.put("list",tpTransactions);
-        parameter.put("total",pageList.getTotal());
+        parameter.put("list", tpTransactions);
+        parameter.put("total", pageList.getTotal());
         responseBean.addSuccess(parameter);
         return responseBean;
 
     }
 
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseBean addAllTransaction(Integer userId, String paramets,Integer userVerifyId) throws IOException {
+    public ResponseBean addAllTransaction(UserElement userElement, String paramets) {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(paramets);
-        String transactionTitle = (String) jsonObject.get("title");
-        String transactionContent = (String) jsonObject.get("content");
-        String  type= (String) jsonObject.get("type");
-        String imageUrl = (String) jsonObject.get("imageUrl");
+        String transactionTitle = jsonObject.getString("title");
+        String transactionContent = jsonObject.getString("content");
+        String type = jsonObject.getString("type");
+        String imageUrl = jsonObject.getString("imageUrl");
 
-        TaUser user=taUserMapper.selectByPrimaryKey(userId);
+        TaUser user = taUserMapper.selectByPrimaryKey(userElement.getId());
         TpTransaction tpTransaction = new TpTransaction();
         tpTransaction.setTransactionTitle(transactionTitle);
         tpTransaction.setTransactionContent(transactionContent);
         tpTransaction.setType(type);
-        tpTransaction.setCommunityId(user.getCommunityId());
-        tpTransaction.setTaUserId(userId);
-        tpTransaction.setCreateUser(userId);
+        tpTransaction.setCommunityId(userElement.getCommunityId());
+        tpTransaction.setTaUserId(userElement.getId());
+        tpTransaction.setCreateUser(userElement.getId());
         tpTransaction.setStatus("1");
         tpTransaction.setCreateDate(new Date());
-        tpTransaction.setUpdateUser(userId);
+        tpTransaction.setUpdateUser(userElement.getId());
         tpTransaction.setUpdateDate(new Date());
-        tpTransaction.setTaUserVerifyId(userVerifyId);
+        tpTransaction.setTaUserVerifyId(userElement.getUserVerifyId());
         tpTransaction.setIsReported("0");
+        // 发布者身份  0 APP  1 物业
+        tpTransaction.setReleaseIdentity("0");
+        tpTransaction.setViewCount(0);
+        tpTransaction.setSort("1");
 
-        //判断身份是否为业主且状态为已停用
-        TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userId);
-        TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
-        if (Constant.INVALID.equals(taUser.getStatus())
-                && Constant.OWNER.equals(sysRole.getRoleName())){
-
-            response.addError("9996", "您的身份已停用，请联系物业");
-            return response;
-        }
-
-        //身份为家属租客，状态为已停用
-        if (Constant.INVALID.equals(taUser.getStatus())
-                && ((Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName()))){
+        //判断身份状态是否为已停用
+        iTaUserService.checkBlacklistStatusUser(user);
 
-            response.addError("9996", "您的身份已停用，请联系物业");
-            return response;
-        }
-
-        if (Constant.EFFECTIVE.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getRoleName()) || Constant.OWNER.equals(sysRole.getRoleName()))){
-            tpTransactionMapper.insertSelective(tpTransaction);
-            insertTdImage(tpTransaction, imageUrl, userId,Constant.TRANSACTION);
-            TpTransaction tpTransaction1=tpTransactionMapper.getById(tpTransaction.getId());
-            response.addSuccess(tpTransaction1);
-            return response;
-        }
-        response.addError("9995", "无法确认您的身份，请联系物业");
+        tpTransactionMapper.insertSelective(tpTransaction);
+        insertTdImage(tpTransaction, imageUrl, userElement.getId(), Constant.TRANSACTION);
+        response.addSuccess(tpTransaction);
         return response;
+
     }
 
     /**
      * 图片入库
+     *
      * @param tpTransaction
-     * @param imageUrl 多个图片都好分割
+     * @param imageUrl      多个图片都好分割
      * @param userId
-     * @param type 服务：service, 公告：announcement , 活动：activity  租赁 ： transaction
+     * @param type          服务：service, 公告：announcement , 活动：activity  租赁 ： transaction
      * @throws IOException
      */
-    private void insertTdImage(TpTransaction tpTransaction, String imageUrl, Integer userId,String type) throws IOException {
+    private void insertTdImage(TpTransaction tpTransaction, String imageUrl, Integer userId, String type) {
         if (null == imageUrl || "".equals(imageUrl)) {
             return;
         }
-        String [] imgArr = imageUrl.split(",");
-        for (String url  : imgArr) {
+        String[] imgArr = imageUrl.split(",");
+        for (String url : imgArr) {
             TdImages tdImages = new TdImages();
             Integer uuId = tpTransaction.getId();
             tdImages.setImageUrl(url);
@@ -412,57 +382,40 @@ public class SocialServiceImpl implements SocialServiceI {
             tdImagesMapper.insertSelective(tdImages);
         }
     }
+
     @Override
-    public ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer paeSize,Integer type,Integer communityId) {
+    public ResponseBean selectAllTransaction(UserElement userElement, Integer pageNum, Integer paeSize, Integer type) {
         ResponseBean responseBean = new ResponseBean();
-        TaUser user=taUserMapper.selectByPrimaryKey(userId);
+        TaUser user = taUserMapper.selectByPrimaryKey(userElement.getId());
 
-        //判断身份是否为业主且状态为已停用
-        TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userId);
-        TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
-        if (Constant.INVALID.equals(taUser.getStatus())
-                && Constant.OWNER.equals(sysRole.getRoleName())){
-
-            responseBean.addError("9996", "您的身份已停用，请联系物业");
-            return responseBean;
-        }
-
-        //身份为家属租客，状态为已停用
-        if (Constant.INVALID.equals(taUser.getStatus())
-                && ((Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName()))){
-
-            responseBean.addError("9996", "您的身份已停用，请联系物业");
-            return responseBean;
-        }
+        //判断状态是否为已停用
+        iTaUserService.checkBlacklistStatusUser(user);
 
-        if (Constant.EFFECTIVE.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getRoleName()) || Constant.OWNER.equals(sysRole.getRoleName()))){
-            Map<String, Object> parameter = Maps.newHashMap();
-            Page<TpTransaction> pageLsit=PageHelper.startPage(pageNum, paeSize);
-            List<TpTransaction> tpTransactions=tpTransactionMapper.selectTransaction(userId,communityId,type);
+        Map<String, Object> parameter = Maps.newHashMap();
+        Page<TpTransaction> pageLsit = PageHelper.startPage(pageNum, paeSize);
+        List<TpTransaction> tpTransactions = tpTransactionMapper.selectTransaction(userElement.getId(), userElement.getCommunityId(), type);
+
+        tpTransactions.stream().forEach(e -> {
+            // 角色
+            TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(user.getId());
+            e.setRoleId(taSysRole.getId());
+            e.setRoleName(taSysRole.getRoleName());
+            e.setCreateUserName(user.getUserName());
+        });
 
-            tpTransactions.stream().forEach(e->{
-                // 角色
-                TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(user.getId());
-                e.setRoleId(taSysRole.getId());
-                e.setRoleName(taSysRole.getRoleName());
-                e.setCreateUserName(taUser.getUserName());
-            });
+        parameter.put("list", tpTransactions);
+        parameter.put("total", pageLsit.getTotal());
+        responseBean.addSuccess(parameter);
 
-            parameter.put("list",tpTransactions);
-            parameter.put("total",pageLsit.getTotal());
-            responseBean.addSuccess(parameter);
-            return responseBean;
-        }
-        responseBean.addError("9995", "无法确认您的身份，请联系物业");
         return responseBean;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateTransaction(String paramets,Integer userId,Integer id) {
+    public ResponseBean updateTransaction(String paramets, Integer userId, Integer id) {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(paramets);
-        String imageUrl = (String) jsonObject.get("imageUrl");
+        String imageUrl = jsonObject.getString("imageUrl");
 
         TpTransaction tpTransaction = JSONObject.parseObject(paramets, TpTransaction.class);
         TpTransaction transaction = tpTransactionMapper.getById(id);
@@ -472,16 +425,11 @@ public class SocialServiceImpl implements SocialServiceI {
 
         if (null != transaction && userId.equals(transaction.getTaUserId())) {
             tdImagesMapper.deleteTdImages(Integer.valueOf(id), Constant.TRANSACTION);
-            try {
-                insertTdImage(transaction, imageUrl, userId, Constant.TRANSACTION);
-            } catch (IOException e) {
-                e.printStackTrace();
-                throw new RuntimeException("图片修改异常");
-            }
+
+            insertTdImage(transaction, imageUrl, userId, Constant.TRANSACTION);
             tpTransactionMapper.updateTransaction(Integer.valueOf(id), transaction.getTransactionTitle(), transaction.getTransactionContent(), userId);
             response.addSuccess("修改成功");
             return response;
-
         }
         response.addError("操作失败");
         return response;
@@ -489,16 +437,15 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Override
     public ResponseBean deleteransaction(Integer id, UserElement userElement) {
-        ResponseBean responseBean= new ResponseBean();
-        TpTransaction tpTransaction=tpTransactionMapper.getById(Integer.valueOf(id));
-        if(null!= tpTransaction && userElement.getId().equals(tpTransaction.getTaUserId())) {
+        ResponseBean responseBean = new ResponseBean();
+        TpTransaction tpTransaction = tpTransactionMapper.getById(Integer.valueOf(id));
+        if (null != tpTransaction && userElement.getId().equals(tpTransaction.getTaUserId())) {
             tpTransaction.setStatus("0");
             tpTransaction.setUpdateDate(new Date());
             tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
             responseBean.addSuccess("删除成功");
 
 
-
             // 把消息变为无效
             Map<String, Object> map = new HashMap<>();
             map.put("communityId", userElement.getCommunityId());
@@ -516,13 +463,12 @@ public class SocialServiceImpl implements SocialServiceI {
             }
 
 
-
-        }else {
+        } else {
             responseBean.addSuccess("当前ID不存在");
         }
         return responseBean;
-        }
-    
+    }
+
     /**
      * 获取举报原因列表
      *
@@ -532,7 +478,7 @@ public class SocialServiceImpl implements SocialServiceI {
     public List<Map<String, Object>> getReportReasons() {
         return tpTransactionMapper.getReportReasons();
     }
-    
+
     /**
      * 举报二手交易帖子
      *
@@ -547,8 +493,8 @@ public class SocialServiceImpl implements SocialServiceI {
         Integer transactionId = jsonObject.getInteger("transactionId");
         String reportReasonId = jsonObject.getString("reportReasonId");
         //校验举报的帖子存不存在
-        TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(transactionId,communityId);
-        if (null == tpTransaction){
+        TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(transactionId, communityId);
+        if (null == tpTransaction) {
             responseBean.addError("举报的交易不存在");
             return responseBean;
         }
@@ -559,13 +505,13 @@ public class SocialServiceImpl implements SocialServiceI {
             return responseBean;
         }
         //插入举报表
-        tpTransactionMapper.saveReportReason(userId,communityId,transactionId,reportReasonId);
+        tpTransactionMapper.saveReportReason(userId, communityId, transactionId, reportReasonId);
         //更新交易表的举报状态为被举报
         TpTransaction record = new TpTransaction();
         record.setId(transactionId);
         record.setIsReported("1");
         Integer size = tpTransactionMapper.updateByPrimaryKeySelective(record);
-        if (size > 0){
+        if (size > 0) {
 
             // 举报人
             TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
@@ -584,12 +530,12 @@ public class SocialServiceImpl implements SocialServiceI {
             message.setAdviceType("4");
             message.setModelType("1");
             //超级管理员
-            Integer userID= toCommunitiesMapper.selectAndmin(communityId);
+            Integer userID = toCommunitiesMapper.selectAndmin(communityId);
             message.setUuid(userID);
             message.setModelType("1");
             message.setUuidType("2");
             message.setSource("1");
-            message.setMessageContent("{" + taUser.getUserName() + "}举报了{" + createUser.getUserName() + "}发布的帖子：{" + tpTransaction.getTransactionTitle() +  "}，举报原因：{" + sysReportReason.getReason() + "}，点击责令发布人修改或直接作废帖子");
+            message.setMessageContent("{" + taUser.getUserName() + "}举报了{" + createUser.getUserName() + "}发布的帖子：{" + tpTransaction.getTransactionTitle() + "}，举报原因：{" + sysReportReason.getReason() + "}，点击责令发布人修改或直接作废帖子");
             message.setStatus("1");
             message.setReadStatus("0");
             message.setTransactionId(transactionId);
@@ -598,7 +544,6 @@ public class SocialServiceImpl implements SocialServiceI {
             tpMessageMapper.insertSelective(message);
 
 
-
             responseBean.addSuccess(size);
             return responseBean;
         }
@@ -608,22 +553,22 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Override
     public ResponseBean addTransactionReply(String paramets, UserElement userElement) {
-        ResponseBean response= new ResponseBean();
-        JSONObject object= JSONObject.parseObject(paramets);
-        JSONArray array= object.getJSONArray("imgArr");
+        ResponseBean response = new ResponseBean();
+        JSONObject object = JSONObject.parseObject(paramets);
+        JSONArray array = object.getJSONArray("imgArr");
         String[] reply = null;
-        if (null!=array) {
-            reply= array.toArray(new String[]{});
+        if (null != array) {
+            reply = array.toArray(new String[]{});
         }
-        TpTransactionReply tpTransactionReply= JSONObject.parseObject(paramets,TpTransactionReply.class);
+        TpTransactionReply tpTransactionReply = JSONObject.parseObject(paramets, TpTransactionReply.class);
         tpTransactionReply.setCommunityId(userElement.getCommunityId());
         tpTransactionReply.setTaUserId(userElement.getId());
         tpTransactionReply.setTaUserName(userElement.getUserName());
         //获取被回复的姓名
-        if("".equals(tpTransactionReply.getReplyTaUserId())) {
+        if ("".equals(tpTransactionReply.getReplyTaUserId())) {
             tpTransactionReply.setReplyTaUserId(null);
         }
-        if(null!=tpTransactionReply.getReplyTaUserId()&!"".equals(tpTransactionReply.getReplyTaUserId())) {
+        if (null != tpTransactionReply.getReplyTaUserId() & !"".equals(tpTransactionReply.getReplyTaUserId())) {
             tpTransactionReply.setReplyTaUserName(taUserMapper.selectByPrimaryKey(tpTransactionReply.getReplyTaUserId()).getUserName());
         }
         tpTransactionReply.setReleaseIdentity("0");
@@ -631,7 +576,7 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransactionReply.setCreateDate(new Date());
         tpTransactionReplyMapper.insert(tpTransactionReply);
 
-        if (null!=array) {
+        if (null != array) {
             for (String img : reply) {
                 TdImages tdImages = new TdImages();
                 tdImages.setImageUrl(img);
@@ -648,13 +593,13 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Override
     public ResponseBean addTransactionLike(String paramets, UserElement userElement) {
-      ResponseBean response = new ResponseBean();
-        TpTransactionLike tpTransactionLike= JSONObject.parseObject(paramets,TpTransactionLike.class);
+        ResponseBean response = new ResponseBean();
+        TpTransactionLike tpTransactionLike = JSONObject.parseObject(paramets, TpTransactionLike.class);
         tpTransactionLike.setCommunityId(userElement.getCommunityId());
         tpTransactionLike.setTaUserId(userElement.getId());
         tpTransactionLike.setCreateDate(new Date());
-        TpTransactionLike isUser= tpTransactionLikeMapper.getinvitationId(tpTransactionLike.getTransactionId(),userElement.getCommunityId(),userElement.getId());
-        if (null!=isUser) {
+        TpTransactionLike isUser = tpTransactionLikeMapper.getinvitationId(tpTransactionLike.getTransactionId(), userElement.getCommunityId(), userElement.getId());
+        if (null != isUser) {
             response.addError("您已点赞或踩");
             return response;
         }
@@ -664,46 +609,46 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean userActivityList( UserElement userElement,Integer pageNum,Integer paeSize) {
-        ResponseBean responseBean= new ResponseBean();
+    public ResponseBean userActivityList(UserElement userElement, Integer pageNum, Integer paeSize) {
+        ResponseBean responseBean = new ResponseBean();
         Map<String, Object> parameter = Maps.newHashMap();
-            Page<TpActivity> pageList= PageHelper.startPage(pageNum, paeSize);
-            List<TpActivity> tpActivity= tpActivityMapper.selecttpActivity(userElement.getId(),userElement.getCommunityId());
-        parameter.put("list",tpActivity);
-        parameter.put("total",pageList.getTotal());
+        Page<TpActivity> pageList = PageHelper.startPage(pageNum, paeSize);
+        List<TpActivity> tpActivity = tpActivityMapper.selecttpActivity(userElement.getId(), userElement.getCommunityId());
+        parameter.put("list", tpActivity);
+        parameter.put("total", pageList.getTotal());
         responseBean.addSuccess(parameter);
         return responseBean;
     }
 
     @Override
-    public ResponseBean userTransactionList(UserElement userElement,Integer pageNum,Integer paeSize) {
-        ResponseBean responseBean= new ResponseBean();
+    public ResponseBean userTransactionList(UserElement userElement, Integer pageNum, Integer paeSize) {
+        ResponseBean responseBean = new ResponseBean();
         //拿到我自己所有的帖子
         Map<String, Object> parameter = Maps.newHashMap();
-        Page<TpTransaction> pageList=PageHelper.startPage(pageNum, paeSize);
-        List<TpTransaction> tpTransactionList = tpTransactionMapper.getUserTransactionList(userElement.getId(),userElement.getCommunityId());
-        
-        parameter.put("list",tpTransactionList);
-        parameter.put("total",pageList.getTotal());
+        Page<TpTransaction> pageList = PageHelper.startPage(pageNum, paeSize);
+        List<TpTransaction> tpTransactionList = tpTransactionMapper.getUserTransactionList(userElement.getId(), userElement.getCommunityId());
+
+        parameter.put("list", tpTransactionList);
+        parameter.put("total", pageList.getTotal());
         responseBean.addSuccess(parameter);
         return responseBean;
     }
 
     @Override
     public ResponseBean tpActivitySignInAdd(String paramets, UserElement userElement) {
-        ResponseBean responseBean= new ResponseBean();
-        Integer activityId= JSONObject.parseObject(paramets).getInteger("activityId");
-        TpActivitySignIn tpActivitySignIn= new TpActivitySignIn();
+        ResponseBean responseBean = new ResponseBean();
+        Integer activityId = JSONObject.parseObject(paramets).getInteger("activityId");
+        TpActivitySignIn tpActivitySignIn = new TpActivitySignIn();
         tpActivitySignIn.setActivityId(activityId);
         tpActivitySignIn.setCommunityId(userElement.getCommunityId());
 
-        TaUserVerify taUserVerify= taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        TaUserVerify taUserVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
 
-        String description= taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId()).getDescription();
+        String description = taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId()).getDescription();
         tpActivitySignIn.setUserRole(description);
         tpActivitySignIn.setUserName(userElement.getUserName());
         //期/栋/单/层/户
-        String bu=taUserVerify.getPhaseName()+"期"+taUserVerify.getBuildingName()+"栋"+taUserVerify.getUnitName()+"单"+taUserVerify.getLevelName()+"层"+taUserVerify.getRoomNoName()+"户";
+        String bu = taUserVerify.getPhaseName() + "期" + taUserVerify.getBuildingName() + "栋" + taUserVerify.getUnitName() + "单" + taUserVerify.getLevelName() + "层" + taUserVerify.getRoomNoName() + "户";
         tpActivitySignIn.setBuildingInfo(bu);
         tpActivitySignIn.setTaUserId(userElement.getId());
         tpActivitySignIn.setUserTel(userElement.getLoginName());
@@ -717,16 +662,16 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Override
     public ResponseBean replyAdd(String paramets, UserElement userElement) {
-        ResponseBean response= new ResponseBean();
+        ResponseBean response = new ResponseBean();
 
-        JSONObject object= JSONObject.parseObject(paramets);
-        Integer transactionId= object.getInteger("transactionId");
-        String replyContent= object.getString("replyContent");
-        Integer replyUserId= object.getInteger("replyUserId");
-        String[] imgArr= object.getJSONArray("imgArr").toArray(new String[]{});
+        JSONObject object = JSONObject.parseObject(paramets);
+        Integer transactionId = object.getInteger("transactionId");
+        String replyContent = object.getString("replyContent");
+        Integer replyUserId = object.getInteger("replyUserId");
+        String[] imgArr = object.getJSONArray("imgArr").toArray(new String[]{});
 
-        String userName= taUserMapper.selectByPrimaryKey(replyUserId).getUserName();
-      TpTransactionReply tpTransactionReply=  new TpTransactionReply();
+        String userName = taUserMapper.selectByPrimaryKey(replyUserId).getUserName();
+        TpTransactionReply tpTransactionReply = new TpTransactionReply();
         tpTransactionReply.setCommunityId(userElement.getCommunityId());
         tpTransactionReply.setTransactionId(transactionId);
         tpTransactionReply.setTaUserId(userElement.getId());
@@ -739,8 +684,8 @@ public class SocialServiceImpl implements SocialServiceI {
         response.addSuccess("成功");
         tpTransactionReplyMapper.insert(tpTransactionReply);
         //添加评论图片
-        for(String img:imgArr){
-            TdImages tdImages= new TdImages();
+        for (String img : imgArr) {
+            TdImages tdImages = new TdImages();
             tdImages.setImageUrl(img);
             tdImages.setType("reply");
             tdImages.setUuid(tpTransactionReply.getId());
@@ -774,15 +719,15 @@ public class SocialServiceImpl implements SocialServiceI {
         TpMessage message = new TpMessage();
         message.setCommunityId(communityId);
         message.setTicketId(tpTicket.getId());
-        TpTicket tic= tpTicketMapper.selectByTicketId(String.valueOf(communityId),Integer.valueOf(ticketId));
+        TpTicket tic = tpTicketMapper.selectByTicketId(String.valueOf(communityId), Integer.valueOf(ticketId));
         message.setMessageType(tic.getType());
         message.setAdviceType("4");
         message.setModelType("1");
-        Integer createUser=tpTicketMapper.selectRecordStatus(communityId,tpTicket.getId());
+        Integer createUser = tpTicketMapper.selectRecordStatus(communityId, tpTicket.getId());
         message.setUuid(createUser);
         message.setUuidType("2");
         message.setSource("2");
-        message.setMessageContent("工单“"+tic.getTicketTitle() +"”已经验收并评价，点击查看评分");
+        message.setMessageContent("工单“" + tic.getTicketTitle() + "”已经验收并评价，点击查看评分");
         message.setStatus("1");
         message.setReadStatus("0");
         message.setCreateUser(userId);
@@ -796,10 +741,10 @@ public class SocialServiceImpl implements SocialServiceI {
         if (null == num) {
             num = 0;
         }
-        List<TpActivity> listActivity=tpActivityMapper.getActivity(communityId,num);
+        List<TpActivity> listActivity = tpActivityMapper.getActivity(communityId, num);
         return listActivity;
     }
-    
+
     /**
      * 取消报名接口
      *
@@ -817,17 +762,17 @@ public class SocialServiceImpl implements SocialServiceI {
         tpActivitySignup.setTaUserId(userId);
         tpActivitySignupMapper.deleteSignUp(tpActivitySignup);
         //更新报名人数
-        updateActivitySignUpNum(communityId,activityId);
+        updateActivitySignUpNum(communityId, activityId);
         responseBean.addSuccess("取消报名成功");
         return responseBean;
     }
 
 
-    public ResponseBean insertActivitySignUp(UserElement userElement, TpActivity tpActivity, Integer communityId, Integer userId,String remark){
+    public ResponseBean insertActivitySignUp(UserElement userElement, TpActivity tpActivity, Integer communityId, String remark) {
         ResponseBean responseBean = new ResponseBean();
         //判断是否已经报名
-        Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userId);
-        if (signNum != 0){
+        Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userElement.getId());
+        if (signNum != 0) {
             responseBean.addError("9996", "您已报名，请勿重复报名");
             return responseBean;
         }
@@ -835,7 +780,7 @@ public class SocialServiceImpl implements SocialServiceI {
         TpActivitySignup tpActivitySignup = new TpActivitySignup();
         tpActivitySignup.setActivityId(tpActivity.getId());
         tpActivitySignup.setCommunityId(communityId);
-        tpActivitySignup.setTaUserId(userId);
+        tpActivitySignup.setTaUserId(userElement.getId());
         tpActivitySignup.setSignUpTime(new Date());
         tpActivitySignup.setRemark(remark);
 
@@ -847,18 +792,19 @@ public class SocialServiceImpl implements SocialServiceI {
 
         tpActivitySignupMapper.insertSelective(tpActivitySignup);
         //更新报名人数
-        updateActivitySignUpNum(communityId,tpActivity.getId());
+        updateActivitySignUpNum(communityId, tpActivity.getId());
         responseBean.addSuccess("报名成功");
         return responseBean;
     }
-    
+
     /**
      * 更新报名人数
+     *
      * @param communityId
      * @param activityId
      * @return
      */
-    private Integer updateActivitySignUpNum(Integer communityId,Integer activityId) {
+    private Integer updateActivitySignUpNum(Integer communityId, Integer activityId) {
         TpActivitySignup tpActivitySignup = new TpActivitySignup();
         tpActivitySignup.setActivityId(activityId);
         tpActivitySignup.setCommunityId(communityId);
@@ -873,25 +819,25 @@ public class SocialServiceImpl implements SocialServiceI {
     @Transactional
     @Override
     public TpTransaction findUsedDetails(Integer activityId, Integer communityId, Integer userId) {
-        Integer num = updateSocialView(userId,Constant.LEASE,communityId,activityId);
-        if (null != num){
+        Integer num = updateSocialView(userId, Constant.LEASE, communityId, activityId);
+        if (null != num) {
             TpTransaction transaction = new TpTransaction();
             transaction.setId(activityId);
             transaction.setViewCount(num);
             tpTransactionMapper.updateByPrimaryKeySelective(transaction);
         }
 
-        TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(activityId,communityId);
-        TaUser taUser=taUserMapper.selectByPrimaryKey(tpTransaction.getTaUserId());
+        TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(activityId, communityId);
+        TaUser taUser = taUserMapper.selectByPrimaryKey(tpTransaction.getTaUserId());
         tpTransaction.setTelephone(taUser.getLoginName());
         tpTransaction.setCreateUserName(taUser.getUserName());
 
-        Map<String,Object> map = Maps.newHashMap();
-        map.put("uuid",tpTransaction.getId());
-        map.put("type",Constant.TRANSACTION);
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("uuid", tpTransaction.getId());
+        map.put("type", Constant.TRANSACTION);
         // 查询图片
         List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
-        List<String> imgList = tdImagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
+        List<String> imgList = tdImagesList.stream().map(e -> new String(e.getImageUrl())).collect(Collectors.toList());
         tpTransaction.setImgList(imgList);
 
         /**
@@ -900,15 +846,15 @@ public class SocialServiceImpl implements SocialServiceI {
 
 
         //统计点赞人数的次数
-        Integer likeCount= tpTransactionLikeMapper.likeCount(activityId, communityId);
+        Integer likeCount = tpTransactionLikeMapper.likeCount(activityId, communityId);
         //不喜欢的人数
-        Integer noLikeCount= tpTransactionLikeMapper.nolikeCount(activityId, communityId);
+        Integer noLikeCount = tpTransactionLikeMapper.nolikeCount(activityId, communityId);
         tpTransaction.setLikeCount(likeCount == null ? 0 : likeCount);
         tpTransaction.setNoLikeCount(noLikeCount == null ? 0 : noLikeCount);
 
         // 查询是 点赞 还是 踩
-        TpTransactionLike isUser= tpTransactionLikeMapper.getinvitationId(activityId,communityId, userId);
-        if (null!=isUser){
+        TpTransactionLike isUser = tpTransactionLikeMapper.getinvitationId(activityId, communityId, userId);
+        if (null != isUser) {
             tpTransaction.setBel(isUser.getLikeStatus());
         }
 
@@ -921,7 +867,7 @@ public class SocialServiceImpl implements SocialServiceI {
     public ResponseBean updateActivtiySignUp(Integer activityId, Integer communityId, Integer userId, String remark) {
         ResponseBean responseBean = new ResponseBean();
         TpActivitySignup tpActivitySignup = tpActivitySignupMapper.selectTpActivetitySignByUserId(activityId, communityId, userId);
-        if (null == tpActivitySignup){
+        if (null == tpActivitySignup) {
             responseBean.addError("9996", "您未报名!");
             return responseBean;
         }
@@ -939,7 +885,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
         ResponseBean responseBean = new ResponseBean();
         TpActivitySignup tpActivitySignup = tpActivitySignupMapper.selectTpActivetitySignByUserId(activityId, communityId, userId);
-        if (null == tpActivitySignup){
+        if (null == tpActivitySignup) {
             responseBean.addError("9996", "您未报名!");
             return responseBean;
         }
@@ -950,17 +896,17 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean findUsedDetailsReply(Integer transactionId, UserElement userElement, String order, Integer pageNum, Integer pageSize,Integer type) {
+    public ResponseBean findUsedDetailsReply(Integer transactionId, UserElement userElement, String order, Integer pageNum, Integer pageSize, Integer type) {
         ResponseBean responseBean = new ResponseBean();
         //拿到当前帖子的创建人
-        Integer CreateUser= tpTransactionMapper.getById(transactionId).getCreateUser();
+        Integer CreateUser = tpTransactionMapper.getById(transactionId).getCreateUser();
 
         PageHelper.startPage(pageNum, pageSize, "create_date " + order);
-        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId,userElement.getUnitId(),CreateUser,type);
-        for (TpTransactionReply tpTransactionReply:replies){
-            List<TdImages> tdImagesList= tdImagesMapper.selectImages(tpTransactionReply.getId(),"reply");
-            List<String> list= new ArrayList<>();
-            for (TdImages imageUrl:tdImagesList){
+        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId, userElement.getUnitId(), CreateUser, type);
+        for (TpTransactionReply tpTransactionReply : replies) {
+            List<TdImages> tdImagesList = tdImagesMapper.selectImages(tpTransactionReply.getId(), "reply");
+            List<String> list = new ArrayList<>();
+            for (TdImages imageUrl : tdImagesList) {
                 list.add(imageUrl.getImageUrl());
                 tpTransactionReply.setImgList(list);
             }

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ITicketService;
@@ -58,6 +59,9 @@ public class TicketServiceImpl implements ITicketService {
     @Autowired
     private  ToCommunitiesMapper toCommunitiesMapper;
 
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+
     @Override
     public ResponseBean getList(TpTicket tpTicket, Integer pageNum, Integer pageSize) {
 
@@ -260,7 +264,7 @@ public class TicketServiceImpl implements ITicketService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean addAiTicketService(Integer userId, String parameter) throws IOException {
+    public ResponseBean addAiTicketService(UserElement userElement, String parameter) throws IOException {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         String imageUrl = (String) jsonObject.get("imageUrl");
@@ -273,32 +277,29 @@ public class TicketServiceImpl implements ITicketService {
          * 依次插入相关数据, 该工单默认的第一条数据(待分配), 是工单标题,
          */
 
-
-        TaUser user = taUserMapper.selectByPrimaryKey(userId);
-
-        tpTicket.setCommunityId(user.getCommunityId());
-        tpTicket.setTaUserId(userId);
+        tpTicket.setCommunityId(userElement.getCommunityId());
+        tpTicket.setTaUserId(userElement.getId());
         // 默认待分配
         tpTicket.setStatus("0");
-        tpTicket.setCreateUser(userId);
+        tpTicket.setCreateUser(userElement.getId());
         tpTicket.setCreateDate(new Date());
-        tpTicket.setUpdateUser(userId);
+        tpTicket.setUpdateUser(userElement.getId());
 //        tpTicket.setUpdateDate(new Date());
         // 插入工单
         tpTicketMapper.insertSelective(tpTicket);
-        insertTdImage(tpTicket, imageUrl, userId);
+        insertTdImage(tpTicket, imageUrl, userElement.getId());
 
         Integer id = tpTicket.getId();
         TpTicketRecord tpTicketRecord = new TpTicketRecord();
         //获取当前插入的信息，维护工单记录表
         TpTicket tpTicketReco = tpTicketMapper.selectByPrimaryKey(id);
-        tpTicketRecord.setCommunityId(user.getCommunityId());
+        tpTicketRecord.setCommunityId(userElement.getCommunityId());
         tpTicketRecord.setTicketId(tpTicketReco.getId());
         // 1：投诉   2：报修 3：联系物业
         String typeName = "2".equals(tpTicket.getType()) ? "报修" : "1".equals(tpTicket.getType()) ? "投诉" : "3".equals(tpTicket.getType()) ? "联系工单" : "未知类型";
         tpTicketRecord.setContent("您的" + typeName + "正在分配物业处理人员, 若长时间无人处理, 请联系物业! 联系物业号码簿 >");
         tpTicketRecord.setStatus(tpTicketReco.getStatus());
-        tpTicketRecord.setCreateUser(userId);
+        tpTicketRecord.setCreateUser(userElement.getId());
         tpTicketRecord.setCreateDate(new Date());
         // 插入工单处理表
         tpTicketRecordMapper.insertSelective(tpTicketRecord);
@@ -308,7 +309,7 @@ public class TicketServiceImpl implements ITicketService {
 //        insertTicketMessage(tpTicket, userId);
         //1.5版本维护消息推送
         TpMessage message = new TpMessage();
-        message.setCommunityId(user.getCommunityId());
+        message.setCommunityId(userElement.getCommunityId());
         message.setTicketId(tpTicket.getId());
         message.setModelType("1");
         message.setMessageType(tpTicket.getType());
@@ -316,18 +317,21 @@ public class TicketServiceImpl implements ITicketService {
         message.setUuidType("2");
         message.setSource("1");
         //当前插入为超级管理员
-         Integer uuserID= toCommunitiesMapper.selectAndmin(user.getCommunityId());
+         Integer uuserID= toCommunitiesMapper.selectAndmin(userElement.getCommunityId());
          message.setUuid(uuserID);
-         TaSysUserRole taSysUserRole= taSysUserRoleMapper.selectRole(user.getCommunityId(), userId);
-         String userName = null;
-         if (null != taSysUserRole) {
-             if(1 == taSysUserRole.getRoleId().intValue()){userName="业主"; }
-             if(2 == taSysUserRole.getRoleId().intValue()){userName="家属" ;}
-             if(3 == taSysUserRole.getRoleId().intValue()){userName="租客" ;}
-             message.setMessageContent(userName+user.getUserName()+"发起了一个工单“"+tpTicket.getTicketTitle()+"”，点击受理分配给合适的人处理");
+
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        TaUser taUser = taUserMapper.selectByPrimaryKey(userElement.getId());
+
+        String userName = null;
+         if (null != userVerify) {
+             if(1 == userVerify.getRoleId().intValue()){userName="业主"; }
+             if(2 == userVerify.getRoleId().intValue()){userName="家属" ;}
+             if(3 == userVerify.getRoleId().intValue()){userName="租客" ;}
+             message.setMessageContent(userName+ taUser.getUserName()+"发起了一个工单“"+tpTicket.getTicketTitle()+"”，点击受理分配给合适的人处理");
              message.setStatus("1");
              message.setReadStatus("0");
-             message.setCreateUser(userId);
+             message.setCreateUser(userElement.getId());
              message.setCreateDate(new Date());
              tpMessageMapper.insert(message);
          }

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

@@ -1,36 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.community.huiju.dao.TpTransactionMapper" >
-  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTransaction" >
-    <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="community_id" property="communityId" jdbcType="INTEGER" />
-    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
-    <result column="transaction_title" property="transactionTitle" jdbcType="VARCHAR" />
-    <result column="transaction_content" property="transactionContent" jdbcType="VARCHAR" />
-    <result column="view_count" property="viewCount" jdbcType="INTEGER" />
-    <result column="status" property="status" jdbcType="CHAR" />
-    <result column="type" property="type" jdbcType="CHAR" />
-    <result column="create_user" property="createUser" jdbcType="INTEGER" />
-    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
-    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
-    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
-    <result column="role_id" property="roleId" jdbcType="INTEGER" />
-    <result column="role_name" property="roleName" jdbcType="VARCHAR" />
-    <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
-    <result column="release_identity" property="releaseIdentity" jdbcType="VARCHAR" />
+<mapper namespace="com.community.huiju.dao.TpTransactionMapper">
+    <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTransaction">
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="community_id" property="communityId" jdbcType="INTEGER"/>
+        <result column="ta_user_id" property="taUserId" jdbcType="INTEGER"/>
+        <result column="transaction_title" property="transactionTitle" jdbcType="VARCHAR"/>
+        <result column="transaction_content" property="transactionContent" jdbcType="VARCHAR"/>
+        <result column="sort" property="sort" jdbcType="VARCHAR"/>
+        <result column="view_count" property="viewCount" jdbcType="INTEGER"/>
+        <result column="status" property="status" jdbcType="CHAR"/>
+        <result column="type" property="type" jdbcType="CHAR"/>
+        <result column="create_user" property="createUser" jdbcType="INTEGER"/>
+        <result column="create_date" property="createDate" jdbcType="TIMESTAMP"/>
+        <result column="update_user" property="updateUser" jdbcType="INTEGER"/>
+        <result column="update_date" property="updateDate" jdbcType="TIMESTAMP"/>
+        <result column="role_id" property="roleId" jdbcType="INTEGER"/>
+        <result column="role_name" property="roleName" jdbcType="VARCHAR"/>
+        <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER"/>
+        <result column="release_identity" property="releaseIdentity" jdbcType="VARCHAR"/>
 
-  </resultMap>
-  <sql id="Base_Column_List" >
-    id, community_id, ta_user_id, transaction_title, transaction_content,
+    </resultMap>
+    <sql id="Base_Column_List">
+    id, community_id, ta_user_id, transaction_title, transaction_content, sort,
     view_count, status, type, create_user, create_date, update_user, update_date, ta_user_verify_id, release_identity
   </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpTransaction"  >
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpTransaction">
     SELECT
 	ttr.id,
 	ttr.community_id,
 	ttr.ta_user_id,
 	ttr.transaction_title,
 	ttr.transaction_content,
+	ttr.sort,
 	ttr.view_count,
 	ttr.STATUS,
 	ttr.type,
@@ -48,169 +50,181 @@ LEFT JOIN ta_sys_user_role tsur ON ttr.ta_user_id = tsur.user_id
 LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     where ttr.id = #{id,jdbcType=INTEGER} and ttr.community_id=#{communityId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from tp_transaction
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TpTransaction" >
+    <insert id="insert" parameterType="com.community.huiju.model.TpTransaction">
     insert into tp_transaction (id, community_id,release_identity,
-      ta_user_verify_id，
+      ta_user_verify_id,
       ta_user_id,
       transaction_title, transaction_content,
+      sort,
       view_count, status,
       type, create_user, create_date, 
       update_user, update_date)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER},#{releaseIdentity,jdbcType=VARCHAR},#{taUserVerifyId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER},
-      #{transactionTitle,jdbcType=VARCHAR}, #{transactionContent,jdbcType=VARCHAR},
+      #{transactionTitle,jdbcType=VARCHAR}, #{transactionContent,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR},
        #{viewCount,jdbcType=INTEGER}, #{status,jdbcType=CHAR},
       #{type,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
       #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"  parameterType="com.community.huiju.model.TpTransaction" >
-    insert into tp_transaction
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        id,
-      </if>
-      <if test="communityId != null" >
-        community_id,
-      </if>
-      <if test="taUserId != null" >
-        ta_user_id,
-      </if>
-      <if test="transactionTitle != null" >
-        transaction_title,
-      </if>
-      <if test="transactionContent != null" >
-        transaction_content,
-      </if>
-      <if test="viewCount != null" >
-        view_count,
-      </if>
-      <if test="status != null" >
-        status,
-      </if>
-      <if test="type != null" >
-        type,
-      </if>
-      <if test="isReported != null" >
-        is_reported,
-      </if>
-      <if test="createUser != null" >
-        create_user,
-      </if>
-      <if test="createDate != null" >
-        create_date,
-      </if>
-      <if test="updateUser != null" >
-        update_user,
-      </if>
-      <if test="updateDate != null" >
-        update_date,
-      </if>
-      <if test="taUserVerifyId != null" >
-        ta_user_verify_id,
-      </if>
-      <if test="releaseIdentity != null" >
-        release_identity
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="communityId != null" >
-        #{communityId,jdbcType=INTEGER},
-      </if>
-      <if test="taUserId != null" >
-        #{taUserId,jdbcType=INTEGER},
-      </if>
-      <if test="transactionTitle != null" >
-        #{transactionTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="transactionContent != null" >
-        #{transactionContent,jdbcType=VARCHAR},
-      </if>
-      <if test="viewCount != null" >
-        #{viewCount,jdbcType=INTEGER},
-      </if>
-      <if test="status != null" >
-        #{status,jdbcType=CHAR},
-      </if>
-      <if test="type != null" >
-        #{type,jdbcType=CHAR},
-      </if>
-      <if test="isReported != null" >
-        #{isReported,jdbcType=CHAR},
-      </if>
-      <if test="createUser != null" >
-        #{createUser,jdbcType=INTEGER},
-      </if>
-      <if test="createDate != null" >
-        #{createDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUser != null" >
-        #{updateUser,jdbcType=INTEGER},
-      </if>
-      <if test="updateDate != null" >
-        #{updateDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="taUserVerifyId != null" >
-        #{taUserVerifyId,jdbcType=INTEGER},
-      </if>
-      <if test="releaseIdentity != null" >
-        #{releaseIdentity,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransaction" >
-    update tp_transaction
-    <set >
-      <if test="communityId != null" >
-        community_id = #{communityId,jdbcType=INTEGER},
-      </if>
-      <if test="taUserId != null" >
-        ta_user_id = #{taUserId,jdbcType=INTEGER},
-      </if>
-      <if test="transactionTitle != null" >
-        transaction_title = #{transactionTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="transactionContent != null" >
-        transaction_content = #{transactionContent,jdbcType=VARCHAR},
-      </if>
-      <if test="viewCount != null" >
-        view_count = #{viewCount,jdbcType=INTEGER},
-      </if>
-      <if test="isReported != null and isReported !=''" >
-        is_reported = #{isReported,jdbcType=CHAR},
-      </if>
-      <if test="status != null" >
-        status = #{status,jdbcType=CHAR},
-      </if>
-      <if test="type != null" >
-        type = #{type,jdbcType=CHAR},
-      </if>
-      <if test="createUser != null" >
-        create_user = #{createUser,jdbcType=INTEGER},
-      </if>
-      <if test="createDate != null" >
-        create_date = #{createDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateUser != null" >
-        update_user = #{updateUser,jdbcType=INTEGER},
-      </if>
-      <if test="updateDate != null" >
-        update_date = #{updateDate,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpTransaction" >
+    <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"
+            parameterType="com.community.huiju.model.TpTransaction">
+        insert into tp_transaction
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="communityId != null">
+                community_id,
+            </if>
+            <if test="taUserId != null">
+                ta_user_id,
+            </if>
+            <if test="transactionTitle != null">
+                transaction_title,
+            </if>
+            <if test="transactionContent != null">
+                transaction_content,
+            </if>
+            <if test="sort != null">
+                sort,
+            </if>
+            <if test="viewCount != null">
+                view_count,
+            </if>
+            <if test="status != null">
+                status,
+            </if>
+            <if test="type != null">
+                type,
+            </if>
+            <if test="isReported != null">
+                is_reported,
+            </if>
+            <if test="createUser != null">
+                create_user,
+            </if>
+            <if test="createDate != null">
+                create_date,
+            </if>
+            <if test="updateUser != null">
+                update_user,
+            </if>
+            <if test="updateDate != null">
+                update_date,
+            </if>
+            <if test="taUserVerifyId != null">
+                ta_user_verify_id,
+            </if>
+            <if test="releaseIdentity != null">
+                release_identity
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="communityId != null">
+                #{communityId,jdbcType=INTEGER},
+            </if>
+            <if test="taUserId != null">
+                #{taUserId,jdbcType=INTEGER},
+            </if>
+            <if test="transactionTitle != null">
+                #{transactionTitle,jdbcType=VARCHAR},
+            </if>
+            <if test="transactionContent != null">
+                #{transactionContent,jdbcType=VARCHAR},
+            </if>
+            <if test="sort != null">
+                #{sort,jdbcType=VARCHAR},
+            </if>
+            <if test="viewCount != null">
+                #{viewCount,jdbcType=INTEGER},
+            </if>
+            <if test="status != null">
+                #{status,jdbcType=CHAR},
+            </if>
+            <if test="type != null">
+                #{type,jdbcType=CHAR},
+            </if>
+            <if test="isReported != null">
+                #{isReported,jdbcType=CHAR},
+            </if>
+            <if test="createUser != null">
+                #{createUser,jdbcType=INTEGER},
+            </if>
+            <if test="createDate != null">
+                #{createDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null">
+                #{updateUser,jdbcType=INTEGER},
+            </if>
+            <if test="updateDate != null">
+                #{updateDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="taUserVerifyId != null">
+                #{taUserVerifyId,jdbcType=INTEGER},
+            </if>
+            <if test="releaseIdentity != null">
+                #{releaseIdentity,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransaction">
+        update tp_transaction
+        <set>
+            <if test="communityId != null">
+                community_id = #{communityId,jdbcType=INTEGER},
+            </if>
+            <if test="taUserId != null">
+                ta_user_id = #{taUserId,jdbcType=INTEGER},
+            </if>
+            <if test="transactionTitle != null">
+                transaction_title = #{transactionTitle,jdbcType=VARCHAR},
+            </if>
+            <if test="transactionContent != null">
+                transaction_content = #{transactionContent,jdbcType=VARCHAR},
+            </if>
+            <if test="sort != null">
+                sort = #{sort,jdbcType=VARCHAR},
+            </if>
+            <if test="viewCount != null">
+                view_count = #{viewCount,jdbcType=INTEGER},
+            </if>
+            <if test="isReported != null and isReported !=''">
+                is_reported = #{isReported,jdbcType=CHAR},
+            </if>
+            <if test="status != null">
+                status = #{status,jdbcType=CHAR},
+            </if>
+            <if test="type != null">
+                type = #{type,jdbcType=CHAR},
+            </if>
+            <if test="createUser != null">
+                create_user = #{createUser,jdbcType=INTEGER},
+            </if>
+            <if test="createDate != null">
+                create_date = #{createDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null">
+                update_user = #{updateUser,jdbcType=INTEGER},
+            </if>
+            <if test="updateDate != null">
+                update_date = #{updateDate,jdbcType=TIMESTAMP},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpTransaction">
     update tp_transaction
     set community_id = #{communityId,jdbcType=INTEGER},
       ta_user_id = #{taUserId,jdbcType=INTEGER},
       transaction_title = #{transactionTitle,jdbcType=VARCHAR},
       transaction_content = #{transactionContent,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=VARCHAR},
       view_count = #{viewCount,jdbcType=INTEGER},
       status = #{status,jdbcType=CHAR},
       type = #{type,jdbcType=CHAR},
@@ -221,51 +235,52 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     where id = #{id,jdbcType=INTEGER}
   </update>
 
-  <select id="findAllTransaction" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from tp_transaction
-    where community_id = #{communityId,jdbcType=INTEGER}
-    <if test="type != null and type != ''">
-      and type = #{type,jdbcType=VARCHAR}
-    </if>
-    <if test="transactionTitle != null and transactionTitle !=''">
-      and transaction_title LIKE concat('%',#{transactionTitle,jdbcType=VARCHAR},'%')
-    </if>
-    and status = 1
-    order by update_date DESC, create_date DESC
-  </select>
+    <select id="findAllTransaction" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tp_transaction
+        where community_id = #{communityId,jdbcType=INTEGER}
+        <if test="type != null and type != ''">
+            and type = #{type,jdbcType=VARCHAR}
+        </if>
+        <if test="transactionTitle != null and transactionTitle !=''">
+            and transaction_title LIKE concat('%',#{transactionTitle,jdbcType=VARCHAR},'%')
+        </if>
+        and status = 1
+        order by update_date DESC, create_date DESC
+    </select>
 
-  <select id="selectTransaction" resultMap="BaseResultMap">
-    SELECT
-    <include refid="Base_Column_List" />
-    FROM
-    tp_transaction t
-    WHERE t.create_user=#{id,jdbcType=INTEGER}
-    AND t.community_id=#{communityId,jdbcType=INTEGER}
-    UNION ALL
-    SELECT
-    <include refid="Base_Column_List" />
-    FROM
-    tp_transaction t
-    INNER JOIN(SELECT
-    y.transaction_id
-    FROM
-    tp_transaction_reply y
-    LEFT JOIN tp_transaction t ON y.transaction_id = t.id
-    WHERE
-    y.ta_user_id = #{id,jdbcType=INTEGER}
-    <if test="type != null and type != ''">
-      and  t.type = #{type,jdbcType=INTEGER}
-    </if>
-    AND y.community_id = #{communityId,jdbcType=INTEGER}
-    AND y.transaction_id NOT IN ( SELECT t.id FROM tp_transaction t WHERE t.create_user = #{id,jdbcType=INTEGER} AND t.community_id = #{communityId,jdbcType=INTEGER}  )
-    GROUP BY
-    y.transaction_id) a ON a.transaction_id = t.id
-    order by create_date DESC
-  </select>
+    <select id="selectTransaction" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        tp_transaction t
+        WHERE t.create_user=#{id,jdbcType=INTEGER}
+        AND t.community_id=#{communityId,jdbcType=INTEGER}
+        UNION ALL
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        tp_transaction t
+        INNER JOIN(SELECT
+        y.transaction_id
+        FROM
+        tp_transaction_reply y
+        LEFT JOIN tp_transaction t ON y.transaction_id = t.id
+        WHERE
+        y.ta_user_id = #{id,jdbcType=INTEGER}
+        <if test="type != null and type != ''">
+            and t.type = #{type,jdbcType=INTEGER}
+        </if>
+        AND y.community_id = #{communityId,jdbcType=INTEGER}
+        AND y.transaction_id NOT IN ( SELECT t.id FROM tp_transaction t WHERE t.create_user = #{id,jdbcType=INTEGER} AND
+        t.community_id = #{communityId,jdbcType=INTEGER} )
+        GROUP BY
+        y.transaction_id) a ON a.transaction_id = t.id
+        order by create_date DESC
+    </select>
 
-  <update id="updateTransaction" parameterType="com.community.huiju.model.TpTransaction" >
+    <update id="updateTransaction" parameterType="com.community.huiju.model.TpTransaction">
     update tp_transaction
     set
     ta_user_id = #{userId,jdbcType=INTEGER},
@@ -276,48 +291,49 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     where id = #{id,jdbcType=INTEGER}
   </update>
 
-  <select id="getById" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpTransaction">
-    select
-    <include refid="Base_Column_List" />
-    from tp_transaction
-    where id = #{id,jdbcType=INTEGER} and status = 1
-    order by create_date DESC
-  </select>
+    <select id="getById" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpTransaction">
+        select
+        <include refid="Base_Column_List"/>
+        from tp_transaction
+        where id = #{id,jdbcType=INTEGER} and status = 1
+        order by create_date DESC
+    </select>
 
-  <select id="getReportReasons" resultType="java.util.Map">
+    <select id="getReportReasons" resultType="java.util.Map">
     SELECT id,reason FROM sys_report_reason ORDER BY sort
   </select>
 
-  <insert id="saveReportReason">
+    <insert id="saveReportReason">
     insert into tp_transaction_report (community_id, transaction_id,
       report_reason_id, reporter_id)
     values (#{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER},
       #{reportReasonId,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER})
   </insert>
-  <select id="getUserTransactionList" resultMap="BaseResultMap">
+    <select id="getUserTransactionList" resultMap="BaseResultMap">
 
-SELECT
-    <include refid="Base_Column_List" />
-    FROM
-      tp_transaction t
-    WHERE t.create_user=#{id,jdbcType=INTEGER}
-    AND t.community_id=#{communityId,jdbcType=INTEGER}
-    UNION ALL
-    SELECT
-        <include refid="Base_Column_List" />
-    FROM
-      tp_transaction t
-    INNER JOIN(SELECT
-      y.transaction_id
-    FROM
-      tp_transaction_reply y
-      LEFT JOIN tp_transaction t ON y.transaction_id = t.id
-    WHERE
-      y.ta_user_id = #{id,jdbcType=INTEGER}
-      AND y.community_id = #{communityId,jdbcType=INTEGER}
-      AND y.transaction_id NOT IN ( SELECT t.id FROM tp_transaction t WHERE t.create_user = #{id,jdbcType=INTEGER} AND t.community_id = #{communityId,jdbcType=INTEGER}  )
-    GROUP BY
-      y.transaction_id) a ON a.transaction_id = t.id
-    order by create_date DESC
-  </select>
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        tp_transaction t
+        WHERE t.create_user=#{id,jdbcType=INTEGER}
+        AND t.community_id=#{communityId,jdbcType=INTEGER}
+        UNION ALL
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        tp_transaction t
+        INNER JOIN(SELECT
+        y.transaction_id
+        FROM
+        tp_transaction_reply y
+        LEFT JOIN tp_transaction t ON y.transaction_id = t.id
+        WHERE
+        y.ta_user_id = #{id,jdbcType=INTEGER}
+        AND y.community_id = #{communityId,jdbcType=INTEGER}
+        AND y.transaction_id NOT IN ( SELECT t.id FROM tp_transaction t WHERE t.create_user = #{id,jdbcType=INTEGER} AND
+        t.community_id = #{communityId,jdbcType=INTEGER} )
+        GROUP BY
+        y.transaction_id) a ON a.transaction_id = t.id
+        order by create_date DESC
+    </select>
 </mapper>

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToBannerServiceImpl.java

@@ -208,7 +208,7 @@ public class ToBannerServiceImpl implements IToBannerService {
             // TODO banner位置名称
             //SysDictionary sysDictionary = sysDictionaryMapper.selectByPrimaryKey(e.getBannerPosition());
             //toBannerVO.setBannerPositionName(sysDictionary.getName());
-            toBannerVO.setBannerPositionName(e.getBannerPosition() == 1?"首页banner":"服务banner");
+            toBannerVO.setBannerPositionName(e.getBannerPosition() == 1?"首页banner": e.getBannerPosition() == 2 ? "服务banner" : "广告banner");
 
             ToUser toUser = toUserMapper.selectByPrimaryKey(e.getUpdateUser());
             if (null != toUser) {

VUECODE/smart-operate-manage/src/views/banner/addBanner/index.vue

@@ -167,7 +167,7 @@ export default {
     })
   },
   created() {
-    this.listQuery = this.$route.params.listQuery
+    this.listQuery = this.$route.query.listQuery
     this.getCommuniryList()
   },
   methods: {
@@ -201,7 +201,7 @@ export default {
     },
     dialogForm(isVaule) {
       if (isVaule === '0') {
-        this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
+        this.$router.push({ name: 'banner-index', query: { listQuery: this.listQuery }})
       } else {
         this.createData()
         // console.log('添加banner的数据: ', this.addForm)

VUECODE/smart-operate-manage/src/views/banner/ediBanner/index.vue

@@ -171,8 +171,8 @@ export default {
   },
   created() {
     this.getCommuniryList()
-    this.getByBannerId(this.$route.params.id)
-    this.listQuery = this.$route.params.listQuery
+    this.getByBannerId(this.$route.query.id)
+    this.listQuery = this.$route.query.listQuery
   },
   updated() {
     // console.log('$ref: ', this.$refs.refEditor)
@@ -209,7 +209,7 @@ export default {
     },
     dialogForm(isVaule) {
       if (isVaule === '0') {
-        this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
+        this.$router.push({ name: 'banner-index', query: { listQuery: this.listQuery }})
       } else {
         this.updateData()
       }

VUECODE/smart-operate-manage/src/views/banner/index.vue

@@ -175,9 +175,9 @@ export default {
     })
   },
   created() {
-    const query = this.$route.params.listQuery
+    const query = this.$route.query.listQuery
     if (query !== undefined) {
-      this.listQuery = this.$route.params.listQuery
+      this.listQuery = this.$route.query.listQuery
     }
     this.getList()
     this.getCommuniryList()
@@ -225,13 +225,13 @@ export default {
       })
     },
     dialogAddForm() {
-      this.$router.push({ name: 'banner-add', params: { listQuery: this.listQuery }})
+      this.$router.push({ name: 'banner-add', query: { listQuery: this.listQuery }})
     },
     updateBanner(bannerId) {
-      this.$router.push({ name: 'banner-edi', params: { id: bannerId, listQuery: this.listQuery }})
+      this.$router.push({ name: 'banner-edi', query: { id: bannerId, listQuery: this.listQuery }})
     },
     infoBanner(bannerId) {
-      this.$router.push({ name: 'banner-info', params: { id: bannerId, listQuery: this.listQuery }})
+      this.$router.push({ name: 'banner-info', query: { id: bannerId, listQuery: this.listQuery }})
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -259,10 +259,9 @@ export default {
       this.$store.dispatch('GetBanner', this.listQuery).then(response => {
         this.list = response.item
         this.total = response.total
-        // Just to simulate the time of the request
-        setTimeout(() => {
-          this.listLoading = false
-        }, 1.5 * 1000)
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
       })
     },
     getCommuniryList() {

VUECODE/smart-operate-manage/src/views/banner/infoBanner/index.vue

@@ -131,7 +131,8 @@ export default {
       showURLVisible: true,
       bannerPositionArr: [
         { id: 1, value: '首页banner' },
-        { id: 2, value: '服务banner' }
+        { id: 2, value: '服务banner' },
+        { id: 3, value: '广告banner' }
       ]
     }
   },
@@ -142,12 +143,12 @@ export default {
   },
   created() {
     this.getCommuniryList()
-    this.getByBannerId(this.$route.params.id)
-    this.listQuery = this.$route.params.listQuery
+    this.getByBannerId(this.$route.query.id)
+    this.listQuery = this.$route.query.listQuery
   },
   mounted() {
     window.addEventListener('beforeunload', e => {
-      this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
+      this.$router.push({ name: 'banner-index', query: { listQuery: this.listQuery }})
     })
   },
   methods: {
@@ -181,7 +182,7 @@ export default {
     },
     dialogForm(isVaule) {
       if (isVaule === '0') {
-        this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
+        this.$router.push({ name: 'banner-index', query: { listQuery: this.listQuery }})
       } else {
         this.updateData()
       }
@@ -196,7 +197,7 @@ export default {
       }
     },
     updateBanner() {
-      this.$router.push({ name: 'banner-edi', params: { id: this.form.id, listQuery: this.listQuery }})
+      this.$router.push({ name: 'banner-edi', query: { id: this.form.id, listQuery: this.listQuery }})
     },
     updateData() {
       this.$refs['form'].validate((valid) => {
@@ -207,7 +208,7 @@ export default {
                 message: res.message,
                 type: 'success'
               })
-              this.$router.push({ name: 'banner-index', params: { listQuery: this.listQuery }})
+              this.$router.push({ name: 'banner-index', query: { listQuery: this.listQuery }})
             } else {
               this.$message({
                 message: res.message,

VUECODE/smart-operate-manage/src/views/community/communityTable.vue

@@ -44,7 +44,7 @@
           <span>{{ scope.row.propertyNum }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="已核业主数量" align="center">
+      <el-table-column label="已核户主数量" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.verifyOwnerNum }}</span>
         </template>