Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

# Conflicts:
#	CODE/smart-community/community-common/target/classes/com/community/commom/constant/Constant.class

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

@@ -86,6 +86,18 @@ public class SocialController {
         return responseBean;
     }
 
+    @ApiOperation(value = "获取活动轮播图", notes = "获取活动轮播图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区id")
+    })
+    @RequestMapping(value = "/activity/Img/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getActivity(@PathVariable(value = "communityId") Integer communityId) {
+        ResponseBean responseBean = new ResponseBean();
+        List<TpActivity> agreement = socialServiceI.getActivity(communityId);
+        responseBean.addSuccess(agreement);
+        return responseBean;
+    }
+
 
     @ApiOperation(value = "按小区获取分页活动列表", notes = "按小区获取分页活动列表,公告标题模糊查询")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
@@ -120,7 +132,7 @@ public class SocialController {
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
-    @RequestMapping(value = "/secondHand/{communityId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/getTransaction/{communityId}", method = RequestMethod.GET)
     public ResponseBean findUsedDetails(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
@@ -147,23 +159,23 @@ public class SocialController {
 
     @ApiOperation(value = "添加二手租赁帖子", notes = "添加二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "交易标题"),
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionContent", value = "交易内容"),
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "0:二手 1:求购  2:租赁"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "title:小区标题，content：小区类容, type"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransaction", method = RequestMethod.POST)
     @ResponseBody
-    public ResponseBean addTransaction(TpTransaction tpTransaction, HttpSession session) {
+    public ResponseBean addTransaction(@RequestBody String paramets, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.addAllTransaction(userId, tpTransaction);
+        ResponseBean response = socialServiceI.addAllTransaction(userId, paramets);
         return response;
     }
 
     @ApiOperation(value = "获取我发布所有二手租赁帖子", notes = "获取我发布所有二手租赁帖子")
     @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
@@ -181,20 +193,16 @@ public class SocialController {
 
     @ApiOperation(value = "修改二手租赁帖子", notes = "修改二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "小区标题"),
-            @ApiImplicitParam(paramType = "body", dataType = "String", name = "transactionContent", value = "交易内容"),
-            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "Type", value = "0 代表，1求购，2租赁"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "id:小区id,title:小区标题，content：小区类容"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/updateTransaction/{Id}", method = RequestMethod.PUT)
-    public ResponseBean ubdateTransaction(HttpSession session, @PathVariable(value = "Id") Integer Id,
-                                          @RequestParam(value = "transactionTitle") String transactionTitle,
-                                          @RequestParam(value = "transactionContent") String transactionContent,
-                                          @RequestParam(value = "Type") Integer Type) {
+    public ResponseBean ubdateTransaction(HttpSession session, @RequestBody String paramets) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.updateTransaction(Id, transactionTitle, transactionContent, userId, Type);
+        ResponseBean response = socialServiceI.updateTransaction(paramets, userId);
         return response;
     }
 

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

@@ -61,8 +61,8 @@ public class UserController {
     }
     @ApiOperation(value = "修改手机号", notes = "修改手机号")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "phone",value = "登陆(手机号)"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "code",value = "验证码"),
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "phone",value = "phone：登陆(手机号)，code：(手机验证码)"),
+
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
             @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)

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

@@ -23,4 +23,12 @@ public interface TpActivityMapper {
     int updateByPrimaryKey(TpActivity record);
     
     List<TpActivity> getActivitys(@Param("communityId")Integer communityId,@Param("title") String title);
+
+    /**
+     * 获取活动轮播图
+     * @param communityId
+     * @param num
+     * @return
+     */
+    List<TpActivity> getActivity(@Param("communityId")Integer communityId, @Param("num")Integer num);
 }

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

@@ -17,7 +17,7 @@ public interface TpCarouselSettingMapper {
 
     int updateByPrimaryKey(TpCarouselSetting record);
 
-     int getcarouselNum(String lease);
+     Integer getcarouselNum(String lease);
 
     Integer selectCarouselNum(String carouselType);
 

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

@@ -24,5 +24,7 @@ public interface TpTransactionMapper {
 
     List<TpTransaction> selectTransaction(@Param("userId")Integer userId, @Param("communityId")Integer communityId);
 
-    void updateTransaction(@Param("id")Integer id, @Param("transactionTitle")String transactionTitle, @Param("transactionContent")String transactionContent, @Param("userId")Integer userId,@Param("Type")Integer Type);
+    void updateTransaction(@Param("id")Integer id, @Param("transactionTitle")String transactionTitle, @Param("transactionContent")String transactionContent, @Param("userId")Integer userId);
+
+    TpTransaction getById(@Param("id")Integer id);
 }

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

@@ -69,7 +69,7 @@ public interface SocialServiceI {
 	/**
 	 * 添加二手租赁帖子
 	 */
-    ResponseBean addAllTransaction(Integer userId,  TpTransaction Transaction);
+    ResponseBean addAllTransaction(Integer userId, String paramets);
 
 	/**
 	 * 获取当前用户所有的帖子
@@ -81,7 +81,7 @@ public interface SocialServiceI {
 	/**
 	 * 修改当前帖子
 	 */
-	ResponseBean updateTransaction(Integer Id,String transactionTitle,String transactionContent,Integer userId,Integer Type);
+	ResponseBean updateTransaction(String paramets,Integer userId);
 
 	/**
 	 * 评价工单以及评分
@@ -90,4 +90,11 @@ public interface SocialServiceI {
 	 * @param ticketId
 	 */
 	void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId, Integer userId);
+
+	/**
+	 * 获取活动轮播图
+	 * @param communityId
+	 * @return
+	 */
+	List<TpActivity> getActivity(Integer communityId);
 }

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

@@ -216,11 +216,23 @@ public class SocialServiceImpl implements SocialServiceI {
         return tpTransactionMapper.findAllTransaction(communityId, type);
     }
 
+
     @Transactional
     @Override
-    public ResponseBean addAllTransaction(Integer userId, TpTransaction tpTransaction) {
+    public ResponseBean addAllTransaction(Integer userId, 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");
+
         TaUser user=taUserMapper.selectByPrimaryKey(userId);
+        TpTransaction tpTransaction=new TpTransaction();
+        tpTransaction.setTransactionTitle(transactionTitle);
+        tpTransaction.setTransactionContent(transactionContent);
+        tpTransaction.setType(type);
         tpTransaction.setCommunityId(user.getCommunityId());
         tpTransaction.setTaUserId(userId);
         tpTransaction.setCreateUser(userId);
@@ -228,26 +240,59 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransaction.setCreateDate(new Date());
         tpTransaction.setUpdateUser(userId);
         tpTransaction.setUpdateDate(new Date());
-        tpTransactionMapper.insertSelective(tpTransaction);
-        response.addSuccess("发布成功");
+
+        //判断身份是否为业主且状态为已停用
+        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())){
+
+            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);
+            TpTransaction tpTransaction1=tpTransactionMapper.getById(tpTransaction.getId());
+            response.addSuccess(tpTransaction1);
+        }
+        response.addError("9995", "无法确认您的身份，请联系物业");
         return response;
+
     }
 
     @Override
     public ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer paeSize) {
-        PageHelper.startPage(pageNum, paeSize);
         ResponseBean responseBean = new ResponseBean();
         TaUser user=taUserMapper.selectByPrimaryKey(userId);
          Integer communityId=user.getCommunityId();
+
+        PageHelper.startPage(pageNum, paeSize);
         List<TpTransaction> tpTransactions=tpTransactionMapper.selectTransaction(userId,communityId);
+
         responseBean.addSuccess(tpTransactions);
         return responseBean;
     }
 
     @Override
-    public ResponseBean updateTransaction(Integer Id,String transactionTitle,String transactionContent,Integer userId,Integer Type) {
+    public ResponseBean updateTransaction(String paramets,Integer userId) {
         ResponseBean response = new ResponseBean();
-        tpTransactionMapper.updateTransaction(Id,transactionTitle,transactionContent,userId,Type);
+        JSONObject jsonObject = JSONObject.parseObject(paramets);
+        String id = (String) jsonObject.get("id");
+        String transactionTitle = (String) jsonObject.get("title");
+        String transactionContent = (String) jsonObject.get("content");
+        tpTransactionMapper.updateTransaction(Integer.valueOf(id),transactionTitle,transactionContent,userId);
         response.addSuccess("修改成功");
         return response;
     }
@@ -270,6 +315,13 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTicketRecordMapper.insertSelective(record);
     }
 
+    @Override
+    public List<TpActivity> getActivity(Integer communityId) {
+        Integer Num=tpCarouselSettingMapper.getcarouselNum(Constant.ACTIVITY);
+        List<TpActivity> listActivity=tpActivityMapper.getActivity(communityId,Num);
+        return listActivity;
+    }
+
     public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId, Integer userId){
         ResponseBean responseBean = new ResponseBean();
         //判断是否已经报名

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

@@ -205,6 +205,7 @@ public class TicketServiceImpl implements ITicketService {
         tpTicketRecord.setStatus(tpTicketReco.getStatus());
         tpTicketRecord.setCreateUser(userId);
         tpTicketRecord.setCreateDate(new Date());
+
         tpTicketRecordMapper.insertSelective(tpTicketRecord);
         response.addSuccess("新增成功");
         return response;

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

@@ -271,4 +271,11 @@
       a.activity_end_time DESC,
 	  a.create_date DESC
   </select>
+
+  <select id="getActivity" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tp_activity
+    where community_id = #{communityId,jdbcType=INTEGER}  and status=1 limit  #{num,jdbcType=INTEGER}
+  </select>
 </mapper>

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

@@ -41,7 +41,7 @@
       #{type,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
       #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" 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" >
@@ -200,4 +200,11 @@
     update_date = now()
     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}
+  </select>
 </mapper>