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

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

@@ -27,7 +27,7 @@ import java.util.List;
 @RestController
 @RefreshScope
 @RequestMapping("/")
-@Api("app端协议相关的API")
+@Api(value = "协议相关的API", description = "协议相关的API")
 public class AgreementController {
 
     @Autowired

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

@@ -26,7 +26,7 @@ import java.util.List;
 @RestController
 @RefreshScope
 @RequestMapping("/")
-@Api("首页运营banner接口类")
+@Api(value = "首页运营banner的API", description = "首页运营banner的API")
 public class BannerController {
 
     @Autowired

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

@@ -26,7 +26,7 @@ import javax.servlet.http.HttpSession;
 @RestController
 @RequestMapping("/")
 @RefreshScope
-@Api("获取验证码的API")
+@Api(value = "获取验证码的API", description = "获取验证码的API")
 @Slf4j
 public class CodeController {
 

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

@@ -1,7 +1,6 @@
 package com.community.huiju.controller;
 
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.model.ScUser;
 import com.community.huiju.model.ToCommunities;
 import com.community.huiju.service.CommunityServiceI;
 import io.swagger.annotations.Api;
@@ -24,7 +23,7 @@ import java.util.List;
 @RestController
 @RefreshScope
 @RequestMapping("/")
-@Api("app端小区相关的API")
+@Api(value = "小区相关的API",description = "小区相关的API")
 public class CommunityController {
 	
 	@Autowired

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

@@ -27,7 +27,7 @@ import java.util.Map;
 @RestController
 @RefreshScope
 @RequestMapping("/")
-@Api("app端消息相关的API")
+@Api(value = "消息相关的API",description = "消息相关的API")
 public class MessageController {
 	
 	@Autowired

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

@@ -24,7 +24,7 @@ import java.util.List;
 @RestController
 @RefreshScope
 @RequestMapping("/")
-@Api("app端论坛相关的API")
+@Api(value = "app端论坛相关的API", description = "app端论坛相关的API")
 public class SocialController {
 
     @Autowired

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

@@ -1,74 +0,0 @@
-package com.community.huiju.controller;
-
-import com.community.huiju.config.entity.UserElement;
-import com.community.huiju.model.ScUser;
-import com.community.huiju.service.ScUserServiceI;
-import com.community.huiju.microController.MicroTestController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author FXF
- * @date 2018-09-11
- */
-@RestController
-@RefreshScope
-@RequestMapping("/client2")
-@Api("eureka-client2的测试controller的API")
-@Slf4j
-public class TestController {
-    
-    @Autowired
-    private ScUserServiceI scUserService;
-    
-    @Autowired
-    private MicroTestController microTestController;
-    
-    /**
-     * 获取所有的用户信息
-     * @return
-     */
-    @ApiOperation(value = "测试restful接口", notes = "测试接口2")
-    @RequestMapping(value = "/user",method = RequestMethod.GET)
-    @ResponseBody
-    public List<ScUser> getUser(){
-        return scUserService.getUser();
-    }
-    
-    @RequestMapping(value = "/feignUser",method = RequestMethod.GET)
-    @ResponseBody
-    public List<ScUser> getMicroUser(){
-        return microTestController.getUser();
-    }
-
-    /**
-     * 测试session
-     * @param request
-     * @param session
-     * @return
-     */
-    @RequestMapping(value = "/getUserElement",method = RequestMethod.GET)
-    public UserElement getUserElement(HttpServletRequest request, HttpSession session){
-        log.info("sessionId: {}", session.getId());
-        UserElement userElement = new UserElement();
-        userElement.setId(1);
-        userElement.setEmail("907147608@qq.com");
-        userElement.setUserName("weiximei");
-        userElement.setLoginName("weiximei");
-        userElement.setStatus("1");
-        return userElement;
-    }
-}

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

@@ -19,7 +19,7 @@ import javax.servlet.http.HttpSession;
 @RestController
 @RefreshScope
 @RequestMapping("/")
-@Api("工单API")
+@Api(value = "工单相关的API",description = "工单相关的API")
 public class TicketController {
 
     @Autowired

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

@@ -26,7 +26,7 @@ import javax.xml.crypto.dsig.keyinfo.PGPData;
 @RestController
 @RefreshScope
 @RequestMapping("/")
-@Api("用户相关操作")
+@Api(value = "用户相关操作的API",description = "用户相关操作的API")
 public class UserController {
 
     @Autowired

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

@@ -1,11 +0,0 @@
-package com.community.huiju.dao;
-
-import com.community.huiju.model.ScUser;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface ScUserMapper {
-	List<ScUser> find();
-}

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

@@ -15,7 +15,7 @@ public interface TpActivityMapper {
 
     int insertSelective(TpActivity record);
 
-    TpActivity selectByPrimaryKey(Integer id);
+    TpActivity selectByPrimaryKey(@Param("id") Integer id,@Param("communityId") Integer communityId);
 
     int updateByPrimaryKeySelective(TpActivity record);
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/microController/MicroTestController.java

@@ -1,14 +0,0 @@
-package com.community.huiju.microController;
-
-import com.community.huiju.model.ScUser;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import java.util.List;
-
-@FeignClient("eureka-client1")
-public interface MicroTestController {
-	
-	@RequestMapping("/user")
-	List<ScUser> getUser();
-}

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

@@ -1,39 +0,0 @@
-package com.community.huiju.model;
-
-import java.io.Serializable;
-
-/**
- * @author FXF
- * @date 2018-09-19
- */
-public class ScUser implements Serializable {
-	private Integer id;
-	
-	private String userName;
-	
-	private String userPassword;
-	
-	public Integer getId() {
-		return id;
-	}
-	
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	
-	public String getUserName() {
-		return userName;
-	}
-	
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-	
-	public String getUserPassword() {
-		return userPassword;
-	}
-	
-	public void setUserPassword(String userPassword) {
-		this.userPassword = userPassword;
-	}
-}

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

@@ -1,9 +0,0 @@
-package com.community.huiju.service;
-
-import com.community.huiju.model.ScUser;
-
-import java.util.List;
-
-public interface ScUserServiceI {
-	List<ScUser> getUser();
-}

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

@@ -1,25 +0,0 @@
-package com.community.huiju.service.impl;
-
-import com.community.huiju.dao.ScUserMapper;
-import com.community.huiju.model.ScUser;
-import com.community.huiju.service.ScUserServiceI;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author FXF
- * @date 2018-09-19
- */
-@Service("scUserService")
-public class ScUserServiceImpl implements ScUserServiceI {
-	
-	@Autowired
-	private ScUserMapper scUserMapper;
-	
-	@Override
-	public List<ScUser> getUser() {
-		return scUserMapper.find();
-	}
-}

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

@@ -43,19 +43,11 @@ public class SocialServiceImpl implements SocialServiceI {
     @Override
     @Transactional
     public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId) {
-        TpSocialView tpSocialView = new TpSocialView();
         //TODO
-        tpSocialView.setTaUserId(1);
-        tpSocialView.setSocialType(Constant.ANNOUNCEMENT);
-        tpSocialView.setCommunityId(communityId);
-        tpSocialView.setUuid(id);
-        Integer viewNum = tpSocialViewMapper.selectViewNum(tpSocialView);
-
-        if (viewNum == 0){
-            tpSocialView.setCreateDate(new Date());
-            tpSocialViewMapper.insertSelective(tpSocialView);
-            tpSocialView.setTaUserId(null);
-            Integer allViewNum = tpSocialViewMapper.selectViewNum(tpSocialView);
+        Integer userId = 1;
+        //更新此用户的查看次数操作
+        Integer allViewNum = updateSocialView(userId,Constant.ANNOUNCEMENT,communityId,id);
+        if (null != allViewNum){
             tpAnnouncementMapper.updateByPrimaryKeySelective(id, allViewNum);
         }
         return tpAnnouncementMapper.selectByPrimaryKey(id, communityId);
@@ -115,6 +107,43 @@ public class SocialServiceImpl implements SocialServiceI {
      */
     @Override
     public TpActivity findActivityDetail(Integer activityId, Integer communityId) {
+        //TODO
+        Integer userId = 1;
+        //更新查看次数
+        Integer allViewNum = updateSocialView(userId,Constant.ACTIVITY,communityId,activityId);
+        if (null != allViewNum){
+            TpActivity activity = new TpActivity();
+            activity.setId(activityId);
+            activity.setViewCount(allViewNum);
+            tpActivityMapper.updateByPrimaryKeySelective(activity);
+        }
+        return tpActivityMapper.selectByPrimaryKey(activityId,communityId);
+    }
+    
+    /**
+     * 更新此用户的查看次数操作
+     * @param userId
+     * @param socialType
+     * @param communityId
+     * @param uuid
+     */
+    private Integer updateSocialView(Integer userId,String socialType,Integer communityId,Integer uuid) {
+        //检查是否查看过这个帖子
+        TpSocialView tpSocialView = new TpSocialView();
+        tpSocialView.setTaUserId(userId);
+        tpSocialView.setSocialType(socialType);
+        tpSocialView.setCommunityId(communityId);
+        tpSocialView.setUuid(uuid);
+        Integer viewNum = tpSocialViewMapper.selectViewNum(tpSocialView);
+    
+        //查看过的话查看次数加一
+        if (viewNum == 0){
+            tpSocialView.setCreateDate(new Date());
+            tpSocialViewMapper.insertSelective(tpSocialView);
+            tpSocialView.setTaUserId(null);
+            Integer allViewNum = tpSocialViewMapper.selectViewNum(tpSocialView);
+            return allViewNum;
+        }
         return null;
     }
 

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

@@ -1,16 +0,0 @@
-<?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.ScUserMapper">
-
-    <parameterMap id="paramMap" type="ScUser"></parameterMap>
-
-    <resultMap id="resultMap" type="ScUser">
-        <id property="id" column="id"/>
-        <result property="userName" column="user_name"/>
-        <result property="userPassword" column="user_password"/>
-    </resultMap>
-
-    <select id="find" resultMap="resultMap">
-        select * from sc_user
-    </select>
-</mapper>

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

@@ -32,7 +32,7 @@
     select 
     <include refid="Base_Column_List" />
     from tp_activity
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER} and #{communityId,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from tp_activity

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

@@ -117,11 +117,11 @@
 
   <select id="selectViewNum" resultType="java.lang.Integer" parameterType="com.community.huiju.model.TpSocialView">
     select count(*) from tp_social_view
-    where
+    where 1=1
     <if test="taUserId != null" >
-      ta_user_id = #{taUserId} and
+      and ta_user_id = #{taUserId}
     </if>
-    uuid = #{uuid}
+    and uuid = #{uuid}
     and community_id = #{communityId}
     and social_type = #{socialType}
   </select>