合并到主分支

CODE/smart-community/app-api/pom.xml

@@ -71,6 +71,12 @@
 			<version>1.3.2</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.github.pagehelper</groupId>
+			<artifactId>pagehelper-spring-boot-starter</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
@@ -149,6 +155,13 @@
 			<version>2.6</version>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>3.11.0</version>
+		</dependency>
+
 
 
 	</dependencies>

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/code/cache/AppkeyCache.java

@@ -0,0 +1,48 @@
+package com.community.huiju.common.code.cache;
+
+import com.community.commom.constant.Constant;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 缓存
+ * @author weiximei
+ */
+@Slf4j
+public class AppkeyCache {
+
+    // .refreshAfterWrite(3, TimeUnit.HOURS)// 给定时间内没有被读/写访问，则回收。
+    static LoadingCache<String, Object> cache = CacheBuilder.newBuilder()
+            .expireAfterAccess(Constant.CACHE_EXPIRE, TimeUnit.HOURS)// 缓存过期时间和redis缓存时长一样
+            .maximumSize(Constant.CACHE_SIZE).// 设置缓存个数
+            build(new CacheLoader<String, Object>() {
+            @Override
+            /** 当本地缓存命没有中时，调用load方法获取结果并将结果缓存 **/
+            public String load(String appKey) throws Exception {
+                return null;
+            }
+
+    });
+
+    public static Object getCache(String appKey) {
+        Object value = null;
+        try {
+            value = cache.get(appKey);
+        } catch (ExecutionException e) {
+            e.printStackTrace();
+        }
+        return value;
+    }
+
+    public static void setCache(String appKey,Object appValue){
+        log.info("缓存的key-value: {}-{}", appKey,appValue);
+        cache.put(appKey,appValue);
+    }
+
+
+}

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

@@ -1,15 +1,16 @@
 package com.community.huiju.common.code.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.huiju.common.code.ICode;
-import com.community.huiju.common.code.entity.CodeEntity;
-import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
 /**
  * 手机验证码
  * @author weiximei
@@ -18,25 +19,46 @@ import org.springframework.web.client.RestTemplate;
 @Slf4j
 public class PhoneCodeImpl implements ICode {
 
+    public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+
     @Autowired
     private RestTemplate restTemplate;
 
+    public OkHttpClient getClient() {
+        OkHttpClient client  = new OkHttpClient.Builder()
+                .connectTimeout(10, TimeUnit.SECONDS)
+                .writeTimeout(10,TimeUnit.SECONDS)
+                .readTimeout(20, TimeUnit.SECONDS)
+                .build();
+        return client;
+    }
 
     @Override
     public boolean sendCode(String phone, String code) {
         boolean bool = false;
-        CodeEntity codeEntity = new CodeEntity();
-        codeEntity.setCode(Constant.CODE);
-        codeEntity.setTel(phone);
-        codeEntity.setParams("[\""+code+"\"]");
         try {
-            String result = restTemplate.postForObject(Constant.REQUEST_URL, JSONObject.toJSONString(codeEntity),String.class);
+            String result = null;
+            OkHttpClient client = getClient();
+            RequestBody body = RequestBody.create(JSON, "{\"code\":\""+Constant.CODE+"\"," + "\"tel\":\""+phone+"\"," + "\"params\":[\""+code+"\"]}");
+            Request request = new Request.Builder()
+                    .url(Constant.REQUEST_URL)
+                    .post(body)
+                    .build();
+            Response response = client.newCall(request).execute();
+            if (response.isSuccessful()) {
+                result = response.body().string();
+            } else {
+                throw new IOException("Unexpected code " + response);
+            }
+
+
+
             if ("发送成功".equals(result)) {
                 bool = true;
                 log.info("手机号 {} 验证码 {} 发送成功!",phone,code);
             }else {
                 bool = false;
-                log.error("短信发送验证码失败!{}",result);
+                log.error("短信发送验证码失败!{}", result);
             }
         } catch (Exception e){
             e.printStackTrace();

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

@@ -4,10 +4,13 @@ import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.ToBanner;
 import com.community.huiju.service.BannerServiceI;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,10 +33,11 @@ public class BannerController {
     private BannerServiceI bannerService;
 
     @ApiOperation(value = "首页运营banner接口", notes = "获取首页运营banner")
-    @RequestMapping(value = "/banners", method = RequestMethod.GET)
-    public ResponseBean selectToBannerImg(){
+    @RequestMapping(value = "/banner/{bannerId}", method = RequestMethod.GET)
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "bannerId", value = "运营banner图Id") })
+    public ResponseBean selectToBannerImg(@PathVariable("bannerId")Integer bannerId){
         ResponseBean responseBean = new ResponseBean();
-        List<ToBanner> toBannerList = bannerService.viewBannerImg();
+        ToBanner toBannerList = bannerService.viewBannerImg(bannerId);
         responseBean.addSuccess(toBannerList);
         return responseBean;
     }

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

@@ -1,17 +1,22 @@
 package com.community.huiju.controller;
 
+import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.common.code.ICode;
+import com.community.huiju.common.code.cache.AppkeyCache;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import sun.rmi.runtime.Log;
 
 import javax.servlet.http.HttpSession;
 
@@ -19,9 +24,10 @@ import javax.servlet.http.HttpSession;
  * @author weiximei
  */
 @RestController
-@RequestMapping("/code")
+@RequestMapping("/")
 @RefreshScope
 @Api("获取验证码的API")
+@Slf4j
 public class CodeController {
 
     @Autowired
@@ -30,12 +36,17 @@ public class CodeController {
 
     @ApiOperation(value = "获取手机验证码", notes = "根据手机号发送验证码")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "query",dataType = "String",name = "phone",value = "手机号")})
-    @RequestMapping(value = "/sendCode",method = RequestMethod.GET)
-    public ResponseBean sendCode(String phone, HttpSession session) {
+    @RequestMapping(value = "/code/sendCode",method = RequestMethod.POST)
+    public ResponseBean sendCode(@RequestParam String phone, HttpSession session) {
         ResponseBean response = new ResponseBean();
         int code = (int) ((Math.random()*9+1)*1000);
-        boolean result = iCode.sendCode(phone,String.valueOf(code));
+        //boolean result = iCode.sendCode(phone,String.valueOf(code));
+        boolean result = true;
         if (result) {
+            log.info("{} 验证码: {}",phone,code);
+            // 设置缓存
+            AppkeyCache.setCache(phone,String.valueOf(code));
+            //session.setAttribute(Constant.SESSION_PHONE_CODE,String.valueOf(code));
             response.addSuccess("发送成功!");
         } else {
             response.addError("发送失败!");

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

@@ -1,7 +1,9 @@
 package com.community.huiju.controller;
 
+import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.ToCommunities;
+import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.MessageServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -9,6 +11,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,12 +33,37 @@ public class MessageController {
 	@Autowired
 	private MessageServiceI messageService;
 	
-	@ApiOperation(value = "根据小区名获取小区列表", notes = "根据小区名获取小区列表")
-	@RequestMapping(value = "/message/total",method = RequestMethod.GET)
-	public ResponseBean getMessageTotal(){
+	@ApiOperation(value = "按小区获取消息总数", notes = "按小区获取个人消息总数")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id") })
+	@RequestMapping(value = "/message/{communityId}/total",method = RequestMethod.GET)
+	public ResponseBean getMessageTotal(@PathVariable Integer communityId){
 		ResponseBean responseBean = new ResponseBean();
-		Map<String,Object> totalMap = messageService.getMessageTotal();
+		Map<String,Object> totalMap = messageService.getMessageTotal(communityId);
 		responseBean.addSuccess(totalMap);
 		return responseBean;
 	}
+	
+	@ApiOperation(value = "按小区获取分页消息", notes = "按小区获取分页消息")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+	@RequestMapping(value = "/message/{communityId}/news",method = RequestMethod.GET)
+	public ResponseBean getNews(@PathVariable Integer communityId,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+		ResponseBean responseBean = new ResponseBean();
+		List<TpMessage> newsList = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS);
+		responseBean.addSuccess(newsList);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "按小区获取分页待办", notes = "按小区获取分页待办")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+	@RequestMapping(value = "/message/{communityId}/upcoming",method = RequestMethod.GET)
+	public ResponseBean getUpcoming(@PathVariable Integer communityId,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+		ResponseBean responseBean = new ResponseBean();
+		List<TpMessage> upcomingList = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING);
+		responseBean.addSuccess(upcomingList);
+		return responseBean;
+	}
 }

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

@@ -0,0 +1,91 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.TpActivity;
+import com.community.huiju.model.TpAnnouncement;
+import com.community.huiju.model.TpMessage;
+import com.community.huiju.service.SocialServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author weichaochao
+ * @Title: SocialController
+ * @date 2018/10/23
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api("app端论坛相关的API")
+public class SocialController {
+
+    @Autowired
+    private SocialServiceI socialServiceI;
+
+    @RequestMapping(value = "/announcement/{communityId}", method = RequestMethod.GET)
+    @ApiOperation(value = "论坛公告帖子详情", notes = "获取论坛公告帖子详情")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "id", value = "公告帖子id")})
+    public ResponseBean findAnnouncementDetail(@PathVariable(value = "communityId")Integer communityId, @RequestParam("id") Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        TpAnnouncement tpAnnouncement = socialServiceI.findAnnouncementDetail(id, communityId);
+        responseBean.addSuccess(tpAnnouncement);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/sign", method = RequestMethod.GET)
+    @ApiOperation(value = "活动报名接口", notes = "活动报名接口")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "communityId", value = "小区Id") })
+    public ResponseBean SignActivity(@PathVariable(value = "communityId")Integer communityId){
+        ResponseBean responseBean = new ResponseBean();
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "按小区获取分页公告列表", notes = "按小区获取分页公告列表,公告标题模糊查询")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "title", value = "公告标题"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+    @RequestMapping(value = "/announcements/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getAnnouncements(@PathVariable Integer communityId,@RequestParam String title,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        List<TpAnnouncement> announcementList = socialServiceI.getAnnouncements(communityId,title,pageNum,pageSize);
+        responseBean.addSuccess(announcementList);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取公告轮播图", notes = "获取公告轮播图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "communityId",value = "小区id"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "sum",value = "显示的条数")
+    })
+    @RequestMapping(value = "/announcement/announcementCarouselImg/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getAnnouncement(@PathVariable(value = "communityId")Integer communityId ,@RequestParam("sum") Integer sum){
+        ResponseBean responseBean = new ResponseBean();
+        List<TpAnnouncement> agreement = socialServiceI.getAnnouncement(communityId,sum);
+        responseBean.addSuccess(agreement);
+        return responseBean;
+    }
+
+    
+    @ApiOperation(value = "按小区获取分页活动列表", notes = "按小区获取分页活动列表,公告标题模糊查询")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "title", value = "活动标题"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+    @RequestMapping(value = "/activitys/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getActivitys(@PathVariable Integer communityId,@RequestParam String title,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        List<TpActivity> activityList = socialServiceI.getActivitys(communityId,title,pageNum,pageSize);
+        responseBean.addSuccess(activityList);
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.config.entity.UserElement;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TpTicket;
+import com.community.huiju.service.ITicketService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api("工单API")
+public class TicketController {
+
+    @Autowired
+    private ITicketService iTicketService;
+
+    @RequestMapping(value = "/ticket/service/{communityId}",method = RequestMethod.GET)
+    @ApiOperation(value = "获取 报修/投诉/联系单 各3条数据",notes = "根据 小区编号,第几页,一页多少行")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "communityId",value = "小区编号"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "pageCode",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "pageSize",value = "一页多少数据"),
+    })
+    public ResponseBean getService(@PathVariable(value = "communityId") String communityId,
+                                   @RequestParam(value = "pageCode",defaultValue = "1") Integer pageCode,
+                                   @RequestParam(value = "pageSize",defaultValue = "3") Integer pageSize,
+                                   HttpSession session) {
+        ResponseBean response = new ResponseBean();
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+
+        TpTicket tpTicket = new TpTicket();
+        tpTicket.setCommunityId(Integer.valueOf(communityId));
+        tpTicket.setTaUserId(userElement.getId());
+
+        response = iTicketService.getList(tpTicket,pageCode,pageSize);
+        return response;
+    }
+
+}

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

@@ -2,9 +2,11 @@ package com.community.huiju.controller;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.config.entity.UserElement;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.service.ITaUserService;
+import com.community.huiju.vo.TaUserVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -12,12 +14,10 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
+import javax.xml.crypto.dsig.keyinfo.PGPData;
 
 /**
  * 用户控制器
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpSession;
  */
 @RestController
 @RefreshScope
-@RequestMapping("/user")
+@RequestMapping("/")
 @Api("用户相关操作")
 public class UserController {
 
@@ -34,27 +34,28 @@ public class UserController {
 
     @ApiOperation(value = "登录", notes = "根据登录名和密码")
     @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "communityId",value = "小区"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "loginName",value = "手机号"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "loginPassword",value = "密码")
     })
-    @RequestMapping(value = "/login",method = RequestMethod.POST)
-    public ResponseBean login(@RequestBody TaUser user, HttpSession session){
-        ResponseBean responseBean = iTaUserService.login(user);
-        TaUser taUser = (TaUser) responseBean.getData();
-
-//        userElement.setStatus(taUser.getStatus());
-//        userElement.setLoginName(taUser.getLoginName());
-//        userElement.setUserName(taUser.getUserName());
-//        userElement.setEmail(taUser.getEmail());
-//        userElement.setId(taUser.getId());
-        if (null != taUser) {
+    @RequestMapping(value = "/user/login/{communityId}",method = RequestMethod.POST)
+    public ResponseBean login(@RequestParam(value = "loginName") String loginName,
+                              @RequestParam(value = "code",defaultValue = "") String code,
+                              @PathVariable(value = "communityId") String communityId,
+                              HttpSession session){
+        ResponseBean responseBean = iTaUserService.login(loginName,communityId,code);
+        TaUserVO userVO = (TaUserVO) responseBean.getData();
+
+        if (null != userVO) {
             UserElement userElement = new UserElement();
-            BeanUtils.copyProperties(taUser,userElement);
+            BeanUtils.copyProperties(userVO,userElement);
             session.setAttribute(Constant.APP_USER_SESSION,userElement);
+            userVO.setToken(session.getId());
         }
-
         return responseBean;
 
     }
 
+
+
 }

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

@@ -2,12 +2,13 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.ToBanner;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 @Mapper
 public interface ToBannerMapper {
 
-    List<ToBanner> selectByCommunityId(String nowTime);
+    ToBanner selectByCommunityId(@Param("bannerId") Integer bannerId, @Param("nowTime") String nowTime);
 
 }

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

@@ -0,0 +1,25 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TpActivity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TpActivityMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpActivity record);
+
+    int insertSelective(TpActivity record);
+
+    TpActivity selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpActivity record);
+
+    int updateByPrimaryKey(TpActivity record);
+    
+    List<TpActivity> getActivitys(@Param("communityId")Integer communityId,@Param("title") String title);
+}

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

@@ -0,0 +1,27 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TpAnnouncement;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TpAnnouncementMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpAnnouncement record);
+
+    int insertSelective(TpAnnouncement record);
+
+    TpAnnouncement selectByPrimaryKey(@Param("id") Integer id, @Param("communityId") Integer communityId);
+
+    int updateByPrimaryKeySelective(@Param("id")Integer id, @Param("viewCount")Integer viewCount);
+
+    int updateByPrimaryKey(TpAnnouncement record);
+	
+	List<TpAnnouncement> getAnnouncements(@Param("communityId") Integer communityId,@Param("title") String title);
+
+    List<TpAnnouncement> getAnnouncement(@Param("communityId")Integer communityId, @Param("sum")Integer sum);
+}

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

@@ -0,0 +1,17 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpCarouselSetting;
+
+public interface TpCarouselSettingMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpCarouselSetting record);
+
+    int insertSelective(TpCarouselSetting record);
+
+    TpCarouselSetting selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpCarouselSetting record);
+
+    int updateByPrimaryKey(TpCarouselSetting record);
+}

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

@@ -4,6 +4,7 @@ import com.community.huiju.model.TpMessage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 @Mapper
@@ -20,5 +21,7 @@ public interface TpMessageMapper {
 
     int updateByPrimaryKey(TpMessage record);
     
-    Map<String, Object> getMessageTotal(@Param(value="userId") Integer userId);
+    Map<String, Object> getMessageTotal(@Param(value = "userId") Integer userId,@Param(value = "communityId") Integer communityId);
+    
+    List<TpMessage> getMessages(@Param(value = "userId") Integer userId,@Param(value = "communityId") Integer communityId, @Param(value = "modelType") Integer modelType);
 }

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

@@ -0,0 +1,21 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpSocialView;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TpSocialViewMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpSocialView record);
+
+    int insertSelective(TpSocialView record);
+
+    TpSocialView selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpSocialView record);
+
+    int updateByPrimaryKey(TpSocialView record);
+
+    Integer selectViewNum(TpSocialView tpSocialView);
+}

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

@@ -0,0 +1,29 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpTicket;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TpTicketMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpTicket record);
+
+    int insertSelective(TpTicket record);
+
+    TpTicket selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpTicket record);
+
+    int updateByPrimaryKey(TpTicket record);
+
+    /**
+     * 根据 小区ID 用户ID 类型 查询数据
+     * @param map
+     * @return
+     */
+    List<TpTicket> selectByCommuniytIdAndByTaUserIdAndByType(Map map);
+}

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

@@ -0,0 +1,33 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpTicketRecordComment;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TpTicketRecordCommentMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpTicketRecordComment record);
+
+    int insertSelective(TpTicketRecordComment record);
+
+    TpTicketRecordComment selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpTicketRecordComment record);
+
+    int updateByPrimaryKey(TpTicketRecordComment record);
+
+    /**
+     * 根据工单ID,最新的几条 查询出最新的追答记录
+     *
+     *  size 表示最新几条
+     *  tickerId 工单ID
+     *
+     * @param map
+     * @return
+     */
+    List<TpTicketRecordComment> selectByTicketId(Map map);
+}

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

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpTicketRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TpTicketRecordMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpTicketRecord record);
+
+    int insertSelective(TpTicketRecord record);
+
+    TpTicketRecord selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpTicketRecord record);
+
+    int updateByPrimaryKey(TpTicketRecord record);
+}

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

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpTransaction;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TpTransactionMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpTransaction record);
+
+    int insertSelective(TpTransaction record);
+
+    TpTransaction selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpTransaction record);
+
+    int updateByPrimaryKey(TpTransaction record);
+}

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

@@ -1,7 +1,5 @@
 package com.community.huiju.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 import java.util.Date;
 
@@ -32,6 +30,8 @@ public class TaUser {
 
     private String acceptAgreementStatus;
 
+    private String verifyStatus;
+
     private Integer createUser;
 
     private Date createDate;
@@ -144,6 +144,14 @@ public class TaUser {
         this.acceptAgreementStatus = acceptAgreementStatus == null ? null : acceptAgreementStatus.trim();
     }
 
+    public String getVerifyStatus() {
+        return verifyStatus;
+    }
+
+    public void setVerifyStatus(String verifyStatus) {
+        this.verifyStatus = verifyStatus;
+    }
+
     public Integer getCreateUser() {
         return createUser;
     }

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

@@ -0,0 +1,195 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpActivity {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String activityTitle;
+
+    private String activityCarouselImg;
+
+    private String activityContent;
+
+    private Integer sort;
+
+    private Integer signUpCount;
+
+    private Integer signUpMax;
+
+    private Integer viewCount;
+
+    private Date registrationStartTime;
+
+    private Date registrationEndTime;
+
+    private Date activityStartTime;
+
+    private Date activityEndTime;
+
+    private String status;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+    
+    private String userName;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getActivityTitle() {
+        return activityTitle;
+    }
+
+    public void setActivityTitle(String activityTitle) {
+        this.activityTitle = activityTitle == null ? null : activityTitle.trim();
+    }
+
+    public String getActivityCarouselImg() {
+        return activityCarouselImg;
+    }
+
+    public void setActivityCarouselImg(String activityCarouselImg) {
+        this.activityCarouselImg = activityCarouselImg == null ? null : activityCarouselImg.trim();
+    }
+
+    public String getActivityContent() {
+        return activityContent;
+    }
+
+    public void setActivityContent(String activityContent) {
+        this.activityContent = activityContent == null ? null : activityContent.trim();
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public Integer getSignUpCount() {
+        return signUpCount;
+    }
+
+    public void setSignUpCount(Integer signUpCount) {
+        this.signUpCount = signUpCount;
+    }
+
+    public Integer getSignUpMax() {
+        return signUpMax;
+    }
+
+    public void setSignUpMax(Integer signUpMax) {
+        this.signUpMax = signUpMax;
+    }
+
+    public Integer getViewCount() {
+        return viewCount;
+    }
+
+    public void setViewCount(Integer viewCount) {
+        this.viewCount = viewCount;
+    }
+
+    public Date getRegistrationStartTime() {
+        return registrationStartTime;
+    }
+
+    public void setRegistrationStartTime(Date registrationStartTime) {
+        this.registrationStartTime = registrationStartTime;
+    }
+
+    public Date getRegistrationEndTime() {
+        return registrationEndTime;
+    }
+
+    public void setRegistrationEndTime(Date registrationEndTime) {
+        this.registrationEndTime = registrationEndTime;
+    }
+
+    public Date getActivityStartTime() {
+        return activityStartTime;
+    }
+
+    public void setActivityStartTime(Date activityStartTime) {
+        this.activityStartTime = activityStartTime;
+    }
+
+    public Date getActivityEndTime() {
+        return activityEndTime;
+    }
+
+    public void setActivityEndTime(Date activityEndTime) {
+        this.activityEndTime = activityEndTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+    
+    public String getUserName() {
+        return userName;
+    }
+    
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}

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

@@ -0,0 +1,145 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpAnnouncement {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String announcementTitle;
+
+    private String announcementCarouselImg;
+
+    private String announcementContent;
+
+    private Integer sort;
+
+    private Integer viewCount;
+
+    private String setUpCarousel;
+
+    private String status;
+
+    private Integer createUser;
+    
+    private String userName;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getAnnouncementTitle() {
+        return announcementTitle;
+    }
+
+    public void setAnnouncementTitle(String announcementTitle) {
+        this.announcementTitle = announcementTitle == null ? null : announcementTitle.trim();
+    }
+
+    public String getAnnouncementCarouselImg() {
+        return announcementCarouselImg;
+    }
+
+    public void setAnnouncementCarouselImg(String announcementCarouselImg) {
+        this.announcementCarouselImg = announcementCarouselImg == null ? null : announcementCarouselImg.trim();
+    }
+
+    public String getAnnouncementContent() {
+        return announcementContent;
+    }
+
+    public void setAnnouncementContent(String announcementContent) {
+        this.announcementContent = announcementContent == null ? null : announcementContent.trim();
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public Integer getViewCount() {
+        return viewCount;
+    }
+
+    public void setViewCount(Integer viewCount) {
+        this.viewCount = viewCount;
+    }
+
+    public String getSetUpCarousel() {
+        return setUpCarousel;
+    }
+
+    public void setSetUpCarousel(String setUpCarousel) {
+        this.setUpCarousel = setUpCarousel == null ? null : setUpCarousel.trim();
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+    
+    public String getUserName() {
+        return userName;
+    }
+    
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.community.huiju.model;
+
+public class TpCarouselSetting {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String carouselType;
+
+    private Integer carouselNum;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getCarouselType() {
+        return carouselType;
+    }
+
+    public void setCarouselType(String carouselType) {
+        this.carouselType = carouselType == null ? null : carouselType.trim();
+    }
+
+    public Integer getCarouselNum() {
+        return carouselNum;
+    }
+
+    public void setCarouselNum(Integer carouselNum) {
+        this.carouselNum = carouselNum;
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpSocialView {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer uuid;
+
+    private String socialType;
+
+    private Integer taUserId;
+
+    private String remark;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(Integer uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getSocialType() {
+        return socialType;
+    }
+
+    public void setSocialType(String socialType) {
+        this.socialType = socialType == null ? null : socialType.trim();
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -0,0 +1,205 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpTicket {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer taUserId;
+
+    private String ticketTitle;
+
+    private String ticketContent;
+
+    private String status;
+
+    private String type;
+
+    private String repairType;
+
+    private String ticketMatchImg1;
+
+    private String ticketMatchImg2;
+
+    private String ticketMatchImg3;
+
+    private String ticketMatchImg4;
+
+    private String ticketMatchImg5;
+
+    private Integer tpUserId;
+
+    private String score;
+
+    private String comment;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public String getTicketTitle() {
+        return ticketTitle;
+    }
+
+    public void setTicketTitle(String ticketTitle) {
+        this.ticketTitle = ticketTitle == null ? null : ticketTitle.trim();
+    }
+
+    public String getTicketContent() {
+        return ticketContent;
+    }
+
+    public void setTicketContent(String ticketContent) {
+        this.ticketContent = ticketContent == null ? null : ticketContent.trim();
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    public String getRepairType() {
+        return repairType;
+    }
+
+    public void setRepairType(String repairType) {
+        this.repairType = repairType == null ? null : repairType.trim();
+    }
+
+    public String getTicketMatchImg1() {
+        return ticketMatchImg1;
+    }
+
+    public void setTicketMatchImg1(String ticketMatchImg1) {
+        this.ticketMatchImg1 = ticketMatchImg1 == null ? null : ticketMatchImg1.trim();
+    }
+
+    public String getTicketMatchImg2() {
+        return ticketMatchImg2;
+    }
+
+    public void setTicketMatchImg2(String ticketMatchImg2) {
+        this.ticketMatchImg2 = ticketMatchImg2 == null ? null : ticketMatchImg2.trim();
+    }
+
+    public String getTicketMatchImg3() {
+        return ticketMatchImg3;
+    }
+
+    public void setTicketMatchImg3(String ticketMatchImg3) {
+        this.ticketMatchImg3 = ticketMatchImg3 == null ? null : ticketMatchImg3.trim();
+    }
+
+    public String getTicketMatchImg4() {
+        return ticketMatchImg4;
+    }
+
+    public void setTicketMatchImg4(String ticketMatchImg4) {
+        this.ticketMatchImg4 = ticketMatchImg4 == null ? null : ticketMatchImg4.trim();
+    }
+
+    public String getTicketMatchImg5() {
+        return ticketMatchImg5;
+    }
+
+    public void setTicketMatchImg5(String ticketMatchImg5) {
+        this.ticketMatchImg5 = ticketMatchImg5 == null ? null : ticketMatchImg5.trim();
+    }
+
+    public Integer getTpUserId() {
+        return tpUserId;
+    }
+
+    public void setTpUserId(Integer tpUserId) {
+        this.tpUserId = tpUserId;
+    }
+
+    public String getScore() {
+        return score;
+    }
+
+    public void setScore(String score) {
+        this.score = score == null ? null : score.trim();
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment == null ? null : comment.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpTicketRecord {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer ticketId;
+
+    private String status;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTicketId() {
+        return ticketId;
+    }
+
+    public void setTicketId(Integer ticketId) {
+        this.ticketId = ticketId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -0,0 +1,105 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpTicketRecordComment {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer tickerId;
+
+    private Integer ticketRecordId;
+
+    private Integer uuid;
+
+    private String userType;
+
+    private String content;
+
+    private Integer parentId;
+
+    private String userName;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTickerId() {
+        return tickerId;
+    }
+
+    public void setTickerId(Integer tickerId) {
+        this.tickerId = tickerId;
+    }
+
+    public Integer getTicketRecordId() {
+        return ticketRecordId;
+    }
+
+    public void setTicketRecordId(Integer ticketRecordId) {
+        this.ticketRecordId = ticketRecordId;
+    }
+
+    public Integer getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(Integer uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType == null ? null : userType.trim();
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -0,0 +1,175 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpTransaction {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer taUserId;
+
+    private String transactionTitle;
+
+    private String transactionContent;
+
+    private String transactionMatchImg1;
+
+    private String activityMatchImg3;
+
+    private String activityMatchImg4;
+
+    private String activityMatchImg5;
+
+    private String activityMatchImg6;
+
+    private Integer viewCount;
+
+    private String status;
+
+    private String type;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public String getTransactionTitle() {
+        return transactionTitle;
+    }
+
+    public void setTransactionTitle(String transactionTitle) {
+        this.transactionTitle = transactionTitle == null ? null : transactionTitle.trim();
+    }
+
+    public String getTransactionContent() {
+        return transactionContent;
+    }
+
+    public void setTransactionContent(String transactionContent) {
+        this.transactionContent = transactionContent == null ? null : transactionContent.trim();
+    }
+
+    public String getTransactionMatchImg1() {
+        return transactionMatchImg1;
+    }
+
+    public void setTransactionMatchImg1(String transactionMatchImg1) {
+        this.transactionMatchImg1 = transactionMatchImg1 == null ? null : transactionMatchImg1.trim();
+    }
+
+    public String getActivityMatchImg3() {
+        return activityMatchImg3;
+    }
+
+    public void setActivityMatchImg3(String activityMatchImg3) {
+        this.activityMatchImg3 = activityMatchImg3 == null ? null : activityMatchImg3.trim();
+    }
+
+    public String getActivityMatchImg4() {
+        return activityMatchImg4;
+    }
+
+    public void setActivityMatchImg4(String activityMatchImg4) {
+        this.activityMatchImg4 = activityMatchImg4 == null ? null : activityMatchImg4.trim();
+    }
+
+    public String getActivityMatchImg5() {
+        return activityMatchImg5;
+    }
+
+    public void setActivityMatchImg5(String activityMatchImg5) {
+        this.activityMatchImg5 = activityMatchImg5 == null ? null : activityMatchImg5.trim();
+    }
+
+    public String getActivityMatchImg6() {
+        return activityMatchImg6;
+    }
+
+    public void setActivityMatchImg6(String activityMatchImg6) {
+        this.activityMatchImg6 = activityMatchImg6 == null ? null : activityMatchImg6.trim();
+    }
+
+    public Integer getViewCount() {
+        return viewCount;
+    }
+
+    public void setViewCount(Integer viewCount) {
+        this.viewCount = viewCount;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}

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

@@ -11,6 +11,6 @@ import java.util.List;
  */
 public interface BannerServiceI {
 
-    List<ToBanner> viewBannerImg();
+    ToBanner viewBannerImg(Integer bannerId);
 
 }

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

@@ -2,6 +2,7 @@ package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.TaUser;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 用户业务 接口
@@ -16,6 +17,15 @@ public interface ITaUserService {
      */
     ResponseBean login(TaUser user);
 
+    /**
+     * 用户登录
+     * @param loginName
+     * @param communityId 小区id
+     * @param code 验证码
+     * @return 用户对象
+     */
+    ResponseBean login(String loginName,String communityId,String code);
+
     /**
      * 注册用户
      * @param user

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

@@ -0,0 +1,25 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.TpTicket;
+import com.community.huiju.vo.TpTicketVO;
+
+import java.util.List;
+
+/**
+ * 工单业务
+ * @author weiximei
+ */
+public interface ITicketService {
+
+    /**
+     * 根据 小区ID 用户ID 类型 查询数据
+     * @param tpTicket
+     * @param pageCode
+     * @param pageSize
+     * @return
+     */
+    ResponseBean getList(TpTicket tpTicket,Integer pageCode, Integer pageSize);
+
+
+}

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

@@ -1,7 +1,25 @@
 package com.community.huiju.service;
 
+import com.community.huiju.model.TpMessage;
+
+import java.util.List;
 import java.util.Map;
 
 public interface MessageServiceI {
-	Map<String, Object> getMessageTotal();
+	/**
+	 * 获取消息数量
+	 * @param communityId
+	 * @return
+	 */
+	Map<String, Object> getMessageTotal(Integer communityId);
+	
+	/**
+	 * 分页获取消息或待办
+	 * @param communityId
+	 * @param pageNum
+	 * @param pageSize
+	 * @param modelType
+	 * @return
+	 */
+	List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType);
 }

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

@@ -0,0 +1,44 @@
+package com.community.huiju.service;
+
+import com.community.huiju.model.TpActivity;
+import com.community.huiju.model.TpAnnouncement;
+import com.community.huiju.model.TpSocialView;
+
+import java.util.List;
+
+/**
+ * @author weichaochao
+ * @Title: SocialServiceI
+ * @date 2018/10/23
+ */
+public interface SocialServiceI {
+    TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId);
+
+	/**
+	 * 分页获取公告列表
+	 * @param communityId
+	 * @param title
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	List<TpAnnouncement> getAnnouncements(Integer communityId, String title, Integer pageNum, Integer pageSize);
+
+	/**
+	 * 公告轮播图
+	 * @param communityId
+	 * @param sum
+	 * @return
+	 */
+	List<TpAnnouncement> getAnnouncement(Integer communityId, Integer sum);
+	
+	/**
+	 * 分页获取活动列表
+	 * @param communityId
+	 * @param title
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize);
+}

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

@@ -0,0 +1,10 @@
+package com.community.huiju.service;
+
+/**
+ * @author weichaochao
+ * @Title: TpActivityServiceI
+ * @date 2018/10/23
+ */
+public interface TpActivityServiceI {
+
+}

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

@@ -21,8 +21,8 @@ public class BannerServiceImpl implements BannerServiceI {
     private ToBannerMapper toBannerMapper;
 
     @Override
-    public List<ToBanner> viewBannerImg() {
+    public ToBanner viewBannerImg(Integer bannerId) {
         String nowTime = DateUtils.getDate("yyyy-MM-dd");
-        return toBannerMapper.selectByCommunityId(nowTime);
+        return toBannerMapper.selectByCommunityId(bannerId, nowTime);
     }
 }

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

@@ -1,10 +1,13 @@
 package com.community.huiju.service.impl;
 
 import com.community.huiju.dao.TpMessageMapper;
+import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.MessageServiceI;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,9 +20,36 @@ public class MessageServiceImpl implements MessageServiceI {
 	@Autowired
 	private TpMessageMapper tpMessageMapper;
 	
+	/**
+	 * 获取消息数量
+	 * @param communityId
+	 * @return
+	 */
 	@Override
-	public Map<String, Object> getMessageTotal() {
+	public Map<String, Object> getMessageTotal(Integer communityId) {
+		//todo
 		Integer userId = 1;
-		return tpMessageMapper.getMessageTotal(userId);
+		return tpMessageMapper.getMessageTotal(userId,communityId);
+	}
+	
+	/**
+	 * 分页获取消息或待办
+	 * @param communityId
+	 * @param pageNum
+	 * @param pageSize
+	 * @param modelType
+	 * @return
+	 */
+	@Override
+	public List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType) {
+		//todo
+		Integer userId = 1;
+		pageNum = null == pageNum ? 1 : pageNum;
+		pageSize = null == pageSize ? 10 : pageSize;
+		//使用分页插件
+		PageHelper.startPage(pageNum, pageSize);
+		// 获取数据
+		List<TpMessage> messageList = tpMessageMapper.getMessages(userId,communityId, modelType);
+		return messageList;
 	}
 }

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

@@ -0,0 +1,111 @@
+package com.community.huiju.service.impl;
+
+import com.community.commom.constant.Constant;
+import com.community.huiju.dao.TpAnnouncementMapper;
+import com.community.huiju.dao.TpSocialViewMapper;
+import com.community.huiju.model.TpAnnouncement;
+import com.community.huiju.model.TpSocialView;
+import com.community.huiju.service.SocialServiceI;
+import com.community.huiju.dao.TpActivityMapper;
+import com.community.huiju.dao.TpAnnouncementMapper;
+import com.community.huiju.model.TpActivity;
+import com.community.huiju.model.TpAnnouncement;
+import com.community.huiju.model.TpMessage;
+import com.community.huiju.service.SocialServiceI;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+import java.util.List;
+
+/**
+ * @author weichaochao
+ * @Title: SocialServiceImpl
+ * @date 2018/10/23
+ */
+@Service("SocialService")
+public class SocialServiceImpl implements SocialServiceI {
+
+    @Autowired
+    private TpAnnouncementMapper tpAnnouncementMapper;
+
+    @Autowired
+    private TpSocialViewMapper tpSocialViewMapper;
+
+    @Autowired
+    private TpActivityMapper tpActivityMapper;
+    
+    @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);
+            tpAnnouncementMapper.updateByPrimaryKeySelective(id, allViewNum);
+        }
+        return tpAnnouncementMapper.selectByPrimaryKey(id, communityId);
+    }
+
+    /**
+     * 分页获取公告列表
+     * @param communityId
+     * @param title
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public List<TpAnnouncement> getAnnouncements(Integer communityId,String title, Integer pageNum, Integer pageSize) {
+        pageNum = null == pageNum ? 1 : pageNum;
+        pageSize = null == pageSize ? 10 : pageSize;
+        //使用分页插件
+        PageHelper.startPage(pageNum, pageSize);
+        // 获取数据
+        List<TpAnnouncement> announcementList = tpAnnouncementMapper.getAnnouncements(communityId,title);
+        return announcementList;
+    }
+    /**
+     * 根据当前小区ID查出轮播图
+     * @param communityId 当前小区ID
+     * @param sum 当前查询总数
+     * @return
+     */
+    @Override
+    public List<TpAnnouncement> getAnnouncement(Integer communityId, Integer sum) {
+        List<TpAnnouncement> listAnnouncement=tpAnnouncementMapper.getAnnouncement(communityId ,sum);
+        return listAnnouncement;
+    }
+
+    
+    /**
+     * 分页获取活动列表
+     * @param communityId
+     * @param title
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize) {
+        pageNum = null == pageNum ? 1 : pageNum;
+        pageSize = null == pageSize ? 10 : pageSize;
+        //使用分页插件
+        PageHelper.startPage(pageNum, pageSize);
+        // 获取数据
+        List<TpActivity> activityList = tpActivityMapper.getActivitys(communityId,title);
+        return activityList;
+    }
+}

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

@@ -3,11 +3,15 @@ package com.community.huiju.service.impl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.MD5Utils;
+import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.service.ITaUserService;
+import com.community.huiju.vo.TaUserVO;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,7 +23,7 @@ import java.util.Map;
  * 用户业务 实现
  * @author weiximei
  */
-@Service("iToUserService")
+@Service("iTaUserService")
 @Slf4j
 public class TaUserServiceImpl implements ITaUserService {
 
@@ -56,10 +60,66 @@ public class TaUserServiceImpl implements ITaUserService {
         return response;
     }
 
+    @Override
+    public ResponseBean login(String loginName,String communityId,String code) {
+        ResponseBean response = new ResponseBean();
+        String phoneCode = (String) AppkeyCache.getCache(loginName);
+        if (!phoneCode.equals(code)) {
+            response.addError("验证码错误!");
+            return response;
+        }
+        // 设置验证码为null字符
+        AppkeyCache.setCache(loginName,"null");
+        log.info("{} 手机号校验结果: {}",loginName,AccountValidatorUtil.isPhone(loginName));
+        if (!AccountValidatorUtil.isPhone(loginName)){
+            response.addError("请输入正取的手机号!");
+            return response;
+        }
+        if (StringUtils.isBlank(communityId)) {
+            response.addError("请选择小区!");
+            return response;
+        }
+        if (StringUtils.isBlank(code)) {
+            response.addError("请输入验证码!");
+            return response;
+        }
+
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("loginName",loginName);
+        TaUser currentUser = taUserMapper.selectByLoginName(map);
+        if (null != currentUser){
+            if (!communityId.equals(currentUser.getCommunityId()+"")) {
+                response.addError("用户不在此小区!");
+                return response;
+            }
+            TaUserVO taUserVO = new TaUserVO();
+            BeanUtils.copyProperties(currentUser,taUserVO);
+            response.addSuccess(taUserVO);
+            return response;
+        }else {
+            TaUser user = new TaUser();
+            user.setLoginName(loginName);
+            ResponseBean result = register(user);
+            response.addSuccess(result.getData());
+        }
+        return response;
+    }
+
     @Transactional
     @Override
     public ResponseBean register(TaUser user) {
-        ResponseBean<TaUser> response = new ResponseBean();
+
+        // TODO 注册逻辑需要完善
+        /**
+         * 1.自动生成账号的基本信息
+         * 2.匹配资料库 已认证 未认证
+         * 2.角色类型
+         *
+         * 具体看原型图
+         *
+         */
+
+        ResponseBean<TaUserVO> response = new ResponseBean();
         // 开始注册
         user.setCreateDate(new Date());
         user.setUpdateDate(new Date());
@@ -67,10 +127,14 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setAcceptAgreementStatus("1");
         user.setUserName(user.getLoginName());
         user.setRemark("这是系统自动注册!");
-        user.setLoginPassword(MD5Utils.encode(user.getLoginPassword()));
+        user.setCommunityId(3);
+        user.setVerifyStatus("1");
+        //user.setLoginPassword(MD5Utils.encode(user.getLoginPassword()));
         taUserMapper.insertSelective(user);
 
-        response.addSuccess(user);
+        TaUserVO taUserVO = new TaUserVO();
+        BeanUtils.copyProperties(user,taUserVO);
+        response.addSuccess(taUserVO);
         return response;
     }
 }

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

@@ -0,0 +1,164 @@
+package com.community.huiju.service.impl;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.dao.TpTicketMapper;
+import com.community.huiju.dao.TpTicketRecordCommentMapper;
+import com.community.huiju.model.TpTicket;
+import com.community.huiju.model.TpTicketRecordComment;
+import com.community.huiju.service.ITicketService;
+import com.community.huiju.vo.TpTicketVO;
+import com.github.pagehelper.PageHelper;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.ListUtils;
+import org.apache.commons.lang.ObjectUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import sun.security.krb5.internal.Ticket;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 工单业务 实现
+ * @author weiximei
+ */
+@Service("iTicketService")
+@Slf4j
+public class TicketServiceImpl implements ITicketService {
+
+    @Autowired
+    private TpTicketMapper tpTicketMapper;
+
+    @Autowired
+    private TpTicketRecordCommentMapper tpTicketRecordCommentMapper;
+
+    @Override
+    public ResponseBean getList(TpTicket tpTicket,Integer pageCode, Integer pageSize) {
+
+        ResponseBean<Map<String,Object>> responseBean = new ResponseBean();
+        // 最终返回值
+        Map<String,Object> result = Maps.newHashMap();
+
+        // 查询参数
+        Map<String,Object> lastRecordMap = Maps.newHashMap();
+        lastRecordMap.put("size",1);
+
+
+        Map<String,Object> parameter = Maps.newHashMap();
+        parameter.put("communityId",tpTicket.getCommunityId());
+        parameter.put("taUserId",tpTicket.getTaUserId());
+        //  0 代表 报修  1 代表 投诉  2代表 联系单
+        parameter.put("type",0);
+
+
+        // 报修
+        PageHelper.startPage(pageCode,pageSize);
+        List<TpTicket> tpTicketRepairsList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
+
+        List<TpTicketVO> repairsList = Lists.newArrayList();
+        tpTicketRepairsList.stream().forEach(e->{
+            TpTicketVO tpTicketVO = new TpTicketVO();
+            BeanUtils.copyProperties(e,tpTicketVO);
+            // 设置工单编号
+            lastRecordMap.put("tickerId",e.getId());
+            TpTicketRecordComment comment = getTicketRecordComment(lastRecordMap);
+            if (null != comment) {
+                tpTicketVO.setCommentContent(comment.getContent());
+                tpTicketVO.setCommentCreateDate(comment.getCreateDate());
+            }
+
+
+            repairsList.add(tpTicketVO);
+        });
+
+        // 投诉
+        //  0 代表 报修  1 代表 投诉  2代表 联系单
+        parameter.put("type",1);
+        PageHelper.startPage(pageCode,pageSize);
+        List<TpTicket> tpTicketComplaintList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
+
+        List<TpTicketVO> complaintList = Lists.newArrayList();
+        tpTicketComplaintList.stream().forEach(e->{
+            TpTicketVO tpTicketVO = new TpTicketVO();
+            BeanUtils.copyProperties(e,tpTicketVO);
+            // 设置工单编号
+            lastRecordMap.put("tickerId",e.getId());
+            TpTicketRecordComment comment = getTicketRecordComment(lastRecordMap);
+            if (null != comment) {
+                tpTicketVO.setCommentContent(comment.getContent());
+                tpTicketVO.setCommentCreateDate(comment.getCreateDate());
+            }
+
+            complaintList.add(tpTicketVO);
+        });
+
+        // 联系工单
+        //  0 代表 报修  1 代表 投诉  2代表 联系单
+        parameter.put("type",2);
+        PageHelper.startPage(pageCode,pageSize);
+        List<TpTicket> tpTicketLiaisonList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
+
+        List<TpTicketVO> liaisonList = Lists.newArrayList();
+        tpTicketLiaisonList.stream().forEach(e->{
+            TpTicketVO tpTicketVO = new TpTicketVO();
+            BeanUtils.copyProperties(e,tpTicketVO);
+            // 设置工单编号
+            lastRecordMap.put("tickerId",e.getId());
+            TpTicketRecordComment comment = getTicketRecordComment(lastRecordMap);
+            if (null != comment) {
+                tpTicketVO.setCommentContent(comment.getContent());
+                tpTicketVO.setCommentCreateDate(comment.getCreateDate());
+            }
+
+            liaisonList.add(tpTicketVO);
+        });
+
+        result.put("repairs",repairsList);
+        result.put("complaint",complaintList);
+        result.put("liaison",liaisonList);
+
+        responseBean.addSuccess(result);
+        return responseBean;
+    }
+
+    /**
+     * 公共方法, 获取一条数据
+     * @param map
+     * @return
+     */
+    private TpTicketRecordComment getTicketRecordComment(Map map){
+        List<TpTicketRecordComment> list = tpTicketRecordCommentMapper.selectByTicketId(map);
+        return null==list
+                ?null:list.size()==0
+                ?null:list.get(0);
+    }
+
+//    public <T> List<T> setTicketData(T t, List<Ticket> source, Map map){
+//        List<T> list = Lists.newArrayList();
+//
+//        // 查询参数
+//        Map<String,Object> lastRecordMap = Maps.newHashMap();
+//        lastRecordMap.put("size",1);
+//
+//        source.stream().forEach(e->{
+//            TpTicketVO tpTicketVO = new TpTicketVO();
+//            BeanUtils.copyProperties(e,tpTicketVO);
+//            // 设置工单编号
+//            lastRecordMap.put("tickerId",e.getId());
+//            TpTicketRecordComment comment = getTicketRecordComment(lastRecordMap);
+//            if (null != comment) {
+//                tpTicketVO.setCommentContent(comment.getContent());
+//                tpTicketVO.setCommentCreateDate(comment.getCreateDate());
+//            }
+//
+//            liaisonList.add(tpTicketVO);
+//        });
+
+
+        //return list;
+    //}
+
+}

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

@@ -0,0 +1,15 @@
+package com.community.huiju.service.impl;
+
+import com.community.huiju.service.TpActivityServiceI;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author admin
+ * @Title: TpActivityServiceImpl
+ * @Description: TODO
+ * @date 2018/10/23
+ */
+@Service("TpActivityService")
+public class TpActivityServiceImpl implements TpActivityServiceI {
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TaUserVO.java

@@ -0,0 +1,45 @@
+package com.community.huiju.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author weiximei
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TaUserVO {
+
+    /** 编号 **/
+    private Integer id;
+
+    /** 小区编号 **/
+    private Integer communityId;
+
+    /** 头像 **/
+    private String headPortrait;
+
+    /** 用户名 **/
+    private String userName;
+
+    /** 登录名 **/
+    private String loginName;
+
+    /** 邮箱 **/
+    private String email;
+
+    /** 性别 **/
+    private String gender;
+
+    /** 认证状态 **/
+    private String verifyStatus;
+
+    /** 用户状态 **/
+    private String status;
+
+    /** 用户token **/
+    private String token;
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketInfoVO.java

@@ -0,0 +1,44 @@
+package com.community.huiju.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author weiximei
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TpTicketInfoVO extends TpTicketVO {
+
+
+    /** 工单内容 **/
+    private String ticketContent;
+
+    /** 流转状态 **/
+    private String status;
+
+    /** 报修类型 0:公共区域  1: 房屋质量  2::户内设施   **/
+    private String repairType;
+
+    private String ticketMatchImg1;
+
+    private String ticketMatchImg2;
+
+    private String ticketMatchImg3;
+
+    private String ticketMatchImg4;
+
+    private String ticketMatchImg5;
+
+    /** 评分 **/
+    private String score;
+
+    /** 评语 **/
+    private String comment;
+
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketVO.java

@@ -0,0 +1,48 @@
+package com.community.huiju.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author weiximei
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TpTicketVO {
+
+    /** 编号 **/
+    private Integer id;
+
+    /** 小区编号 **/
+    private Integer communityId;
+
+    /** 用户appd的id **/
+    private Integer taUserId;
+
+    /** ================================ **/
+
+    /** 工单标题 **/
+    private String ticketTitle;
+
+    /** 类型 报修/投诉/联系单 **/
+    private String type;
+
+    /** 受理人的id **/
+    private Integer tpUserId;
+
+    private Date createDate;
+
+    private Date updateDate;
+
+    /** ====================================== **/
+
+    /** 最新进展 **/
+    private String commentContent;
+
+    /** 最新进展的时间 **/
+    private Date commentCreateDate;
+}

CODE/smart-community/app-api/src/main/resources/application.yml

@@ -6,4 +6,14 @@ management:
 ## Mybatis
 mybatis:
   typeAliasesPackage: com.community.huiju.model
-  mapperLocations: classpath:mapper/*.xml
+  mapperLocations: classpath:mapper/*.xml
+# 分页配置
+pagehelper:
+  helper-dialect: mysql
+  reasonable: true
+  support-methods-arguments: true
+  params: count=countSql
+# 打印sql
+logging:
+  level:
+    com.community.huiju.dao: debug

CODE/smart-community/app-api/src/main/resources/log4j.properties

@@ -17,3 +17,15 @@ log4j.logger.org.springframework.transaction.support.TransactionSynchronizationM
 log4j.logger.java.sql.Connection=DEBUG
 log4j.logger.java.sql.Statement=DEBUG
 log4j.logger.java.sql.PreparedStatement=DEBUG
+
+###############Log4j 4 SQL Output start################# #DEBUG
+log4j.logger.com.**.dao=INFO
+log4j.logger.com.springframework=DEBUG
+log4j.logger.com.ibatis=DEBUG  
+log4j.logger.com.ibatis.common.jdbc.SimpleDataSource=DEBUG  
+log4j.logger.com.ibatis.common.jdbc.ScriptRunner=DEBUG  
+log4j.logger.com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate=DEBUG
+log4j.logger.java.sql.ResultSet=DEBUG
+log4j.logger.org.apache.ibatis.logging.commons.JakartaCommonsLoggingImpl=DEBUG
+log4j.logger.java.sql=DEBUG,CONSOLE 
+###############Log4j 4 SQL Output end###################

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

@@ -15,6 +15,7 @@
     <result column="remark" property="remark" jdbcType="VARCHAR" />
     <result column="parent_id" property="parentId" jdbcType="INTEGER" />
     <result column="accept_agreement_status" property="acceptAgreementStatus" jdbcType="CHAR" />
+    <result column="verify_status" property="verifyStatus" 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" />
@@ -22,7 +23,7 @@
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password, 
-    email, gender, status, remark, parent_id, accept_agreement_status, create_user, create_date, 
+    email, gender, status, remark, parent_id, accept_agreement_status, verify_status,create_user, create_date,
     update_user, update_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -40,13 +41,13 @@
       head_portrait, user_name, login_name, 
       login_password, email, gender, 
       status, remark, parent_id, 
-      accept_agreement_status, create_user, create_date, 
+      accept_agreement_status, verify_status, create_user, create_date,
       update_user, update_date)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER}, 
       #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR}, 
       #{loginPassword,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR}, 
       #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, 
-      #{acceptAgreementStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR},#{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP},
       #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" >
@@ -91,6 +92,9 @@
       <if test="acceptAgreementStatus != null" >
         accept_agreement_status,
       </if>
+      <if test="verifyStatus != null">
+        verify_status,
+      </if>
       <if test="createUser != null" >
         create_user,
       </if>
@@ -144,6 +148,9 @@
       <if test="acceptAgreementStatus != null" >
         #{acceptAgreementStatus,jdbcType=CHAR},
       </if>
+      <if test="verifyStatus != null">
+        #{verifyStatus,jdbcType=CHAR},
+      </if>
       <if test="createUser != null" >
         #{createUser,jdbcType=INTEGER},
       </if>
@@ -197,6 +204,9 @@
       <if test="acceptAgreementStatus != null" >
         accept_agreement_status = #{acceptAgreementStatus,jdbcType=CHAR},
       </if>
+      <if test="verifyStatus != null">
+        verify_status = #{verifyStatus,jdbcType=CHAR},
+      </if>
       <if test="createUser != null" >
         create_user = #{createUser,jdbcType=INTEGER},
       </if>
@@ -226,6 +236,7 @@
       remark = #{remark,jdbcType=VARCHAR},
       parent_id = #{parentId,jdbcType=INTEGER},
       accept_agreement_status = #{acceptAgreementStatus,jdbcType=CHAR},
+      verify_status = #{verifyStatus,jdbcType=CHAR},
       create_user = #{createUser,jdbcType=INTEGER},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},

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

@@ -21,9 +21,9 @@
     id, community_id, banner_description, sort, banner_cover, banner_position, eff_time, 
     exp_time, banner_type, external_link, banner_title, banner_content, create_user, create_date
   </sql>
-  <select id="selectByCommunityId" resultMap="BaseResultMap" parameterType="java.lang.String">
+  <select id="selectByCommunityId" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List"></include>
-    from to_banner t where t.eff_time &lt; #{nowTime} and t.exp_time &gt; #{nowTime} order by t.sort, t.eff_time
+    from to_banner t where id = #{bannerId} and t.eff_time &lt; #{nowTime} and t.exp_time &gt; #{nowTime} order by t.sort, t.eff_time
   </select>
 </mapper>

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

@@ -0,0 +1,273 @@
+<?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.TpActivityMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpActivity" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="activity_title" property="activityTitle" jdbcType="VARCHAR" />
+    <result column="activity_carousel_img" property="activityCarouselImg" jdbcType="VARCHAR" />
+    <result column="activity_content" property="activityContent" jdbcType="VARCHAR" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
+    <result column="sort" property="sort" jdbcType="INTEGER" />
+    <result column="sign_up_count" property="signUpCount" jdbcType="INTEGER" />
+    <result column="sign_up_max" property="signUpMax" jdbcType="INTEGER" />
+    <result column="view_count" property="viewCount" jdbcType="INTEGER" />
+    <result column="registration_start_time" property="registrationStartTime" jdbcType="TIMESTAMP" />
+    <result column="registration_end_time" property="registrationEndTime" jdbcType="TIMESTAMP" />
+    <result column="activity_start_time" property="activityStartTime" jdbcType="TIMESTAMP" />
+    <result column="activity_end_time" property="activityEndTime" jdbcType="TIMESTAMP" />
+    <result column="status" property="status" 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" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, activity_title, activity_carousel_img, activity_content, sort, 
+    sign_up_count, sign_up_max, view_count, registration_start_time, registration_end_time, 
+    activity_start_time, activity_end_time, status, create_user, create_date, update_user, 
+    update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_activity
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_activity
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpActivity" >
+    insert into tp_activity (id, community_id, activity_title, 
+      activity_carousel_img, activity_content, sort, 
+      sign_up_count, sign_up_max, view_count, 
+      registration_start_time, registration_end_time, 
+      activity_start_time, activity_end_time, 
+      status, create_user, create_date, 
+      update_user, update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{activityTitle,jdbcType=VARCHAR}, 
+      #{activityCarouselImg,jdbcType=VARCHAR}, #{activityContent,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, 
+      #{signUpCount,jdbcType=INTEGER}, #{signUpMax,jdbcType=INTEGER}, #{viewCount,jdbcType=INTEGER}, 
+      #{registrationStartTime,jdbcType=TIMESTAMP}, #{registrationEndTime,jdbcType=TIMESTAMP}, 
+      #{activityStartTime,jdbcType=TIMESTAMP}, #{activityEndTime,jdbcType=TIMESTAMP}, 
+      #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpActivity" >
+    insert into tp_activity
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="activityTitle != null" >
+        activity_title,
+      </if>
+      <if test="activityCarouselImg != null" >
+        activity_carousel_img,
+      </if>
+      <if test="activityContent != null" >
+        activity_content,
+      </if>
+      <if test="sort != null" >
+        sort,
+      </if>
+      <if test="signUpCount != null" >
+        sign_up_count,
+      </if>
+      <if test="signUpMax != null" >
+        sign_up_max,
+      </if>
+      <if test="viewCount != null" >
+        view_count,
+      </if>
+      <if test="registrationStartTime != null" >
+        registration_start_time,
+      </if>
+      <if test="registrationEndTime != null" >
+        registration_end_time,
+      </if>
+      <if test="activityStartTime != null" >
+        activity_start_time,
+      </if>
+      <if test="activityEndTime != null" >
+        activity_end_time,
+      </if>
+      <if test="status != null" >
+        status,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="activityTitle != null" >
+        #{activityTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="activityCarouselImg != null" >
+        #{activityCarouselImg,jdbcType=VARCHAR},
+      </if>
+      <if test="activityContent != null" >
+        #{activityContent,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="signUpCount != null" >
+        #{signUpCount,jdbcType=INTEGER},
+      </if>
+      <if test="signUpMax != null" >
+        #{signUpMax,jdbcType=INTEGER},
+      </if>
+      <if test="viewCount != null" >
+        #{viewCount,jdbcType=INTEGER},
+      </if>
+      <if test="registrationStartTime != null" >
+        #{registrationStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="registrationEndTime != null" >
+        #{registrationEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="activityStartTime != null" >
+        #{activityStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="activityEndTime != null" >
+        #{activityEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null" >
+        #{status,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpActivity" >
+    update tp_activity
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="activityTitle != null" >
+        activity_title = #{activityTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="activityCarouselImg != null" >
+        activity_carousel_img = #{activityCarouselImg,jdbcType=VARCHAR},
+      </if>
+      <if test="activityContent != null" >
+        activity_content = #{activityContent,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="signUpCount != null" >
+        sign_up_count = #{signUpCount,jdbcType=INTEGER},
+      </if>
+      <if test="signUpMax != null" >
+        sign_up_max = #{signUpMax,jdbcType=INTEGER},
+      </if>
+      <if test="viewCount != null" >
+        view_count = #{viewCount,jdbcType=INTEGER},
+      </if>
+      <if test="registrationStartTime != null" >
+        registration_start_time = #{registrationStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="registrationEndTime != null" >
+        registration_end_time = #{registrationEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="activityStartTime != null" >
+        activity_start_time = #{activityStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="activityEndTime != null" >
+        activity_end_time = #{activityEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null" >
+        status = #{status,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.TpActivity" >
+    update tp_activity
+    set community_id = #{communityId,jdbcType=INTEGER},
+      activity_title = #{activityTitle,jdbcType=VARCHAR},
+      activity_carousel_img = #{activityCarouselImg,jdbcType=VARCHAR},
+      activity_content = #{activityContent,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=INTEGER},
+      sign_up_count = #{signUpCount,jdbcType=INTEGER},
+      sign_up_max = #{signUpMax,jdbcType=INTEGER},
+      view_count = #{viewCount,jdbcType=INTEGER},
+      registration_start_time = #{registrationStartTime,jdbcType=TIMESTAMP},
+      registration_end_time = #{registrationEndTime,jdbcType=TIMESTAMP},
+      activity_start_time = #{activityStartTime,jdbcType=TIMESTAMP},
+      activity_end_time = #{activityEndTime,jdbcType=TIMESTAMP},
+      status = #{status,jdbcType=CHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="getActivitys" resultMap="BaseResultMap">
+    SELECT
+      a.id,
+      a.activity_title,
+      a.activity_content,
+      a.create_date,
+      u.user_name AS user_name,
+      a.sort,
+      a.view_count,
+      a.sign_up_count
+  FROM
+      tp_activity a
+      LEFT JOIN tp_user u ON a.create_user = u.id
+      AND u.community_id = #{communityId,jdbcType=INTEGER}
+  WHERE
+      a.community_id = #{communityId,jdbcType=INTEGER}
+      AND ( a.STATUS = 1 OR a.STATUS = 3 )
+      AND a.activity_title LIKE concat('%',#{title,jdbcType=VARCHAR},'%')
+  ORDER BY
+      a.sort,
+      a.create_date DESC
+  </select>
+</mapper>

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

@@ -0,0 +1,186 @@
+<?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.TpAnnouncementMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpAnnouncement" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="announcement_title" property="announcementTitle" jdbcType="VARCHAR" />
+    <result column="announcement_carousel_img" property="announcementCarouselImg" jdbcType="VARCHAR" />
+    <result column="announcement_content" property="announcementContent" jdbcType="VARCHAR" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
+    <result column="sort" property="sort" jdbcType="INTEGER" />
+    <result column="view_count" property="viewCount" jdbcType="INTEGER" />
+    <result column="set_up_carousel" property="setUpCarousel" jdbcType="CHAR" />
+    <result column="status" property="status" 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" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, announcement_title, announcement_carousel_img, announcement_content, 
+    sort, view_count, set_up_carousel, status, create_user, create_date, update_user, 
+    update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tp_announcement
+    where id = #{id,jdbcType=INTEGER} and community_id = #{communityId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_announcement
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpAnnouncement" >
+    insert into tp_announcement (id, community_id, announcement_title, 
+      announcement_carousel_img, announcement_content, 
+      sort, view_count, set_up_carousel, 
+      status, create_user, create_date, 
+      update_user, update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{announcementTitle,jdbcType=VARCHAR}, 
+      #{announcementCarouselImg,jdbcType=VARCHAR}, #{announcementContent,jdbcType=VARCHAR}, 
+      #{sort,jdbcType=INTEGER}, #{viewCount,jdbcType=INTEGER}, #{setUpCarousel,jdbcType=CHAR}, 
+      #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpAnnouncement" >
+    insert into tp_announcement
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="announcementTitle != null" >
+        announcement_title,
+      </if>
+      <if test="announcementCarouselImg != null" >
+        announcement_carousel_img,
+      </if>
+      <if test="announcementContent != null" >
+        announcement_content,
+      </if>
+      <if test="sort != null" >
+        sort,
+      </if>
+      <if test="viewCount != null" >
+        view_count,
+      </if>
+      <if test="setUpCarousel != null" >
+        set_up_carousel,
+      </if>
+      <if test="status != null" >
+        status,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="announcementTitle != null" >
+        #{announcementTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="announcementCarouselImg != null" >
+        #{announcementCarouselImg,jdbcType=VARCHAR},
+      </if>
+      <if test="announcementContent != null" >
+        #{announcementContent,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="viewCount != null" >
+        #{viewCount,jdbcType=INTEGER},
+      </if>
+      <if test="setUpCarousel != null" >
+        #{setUpCarousel,jdbcType=CHAR},
+      </if>
+      <if test="status != null" >
+        #{status,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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" >
+    update tp_announcement
+    <set >
+      <if test="viewCount != null" >
+        view_count = #{viewCount,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpAnnouncement" >
+    update tp_announcement
+    set community_id = #{communityId,jdbcType=INTEGER},
+      announcement_title = #{announcementTitle,jdbcType=VARCHAR},
+      announcement_carousel_img = #{announcementCarouselImg,jdbcType=VARCHAR},
+      announcement_content = #{announcementContent,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=INTEGER},
+      view_count = #{viewCount,jdbcType=INTEGER},
+      set_up_carousel = #{setUpCarousel,jdbcType=CHAR},
+      status = #{status,jdbcType=CHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="getAnnouncements" resultMap="BaseResultMap">
+    SELECT
+      a.id,
+      a.announcement_title,
+      a.announcement_content,
+      a.create_date,
+      u.user_name as user_name,
+      a.sort,
+      a.view_count
+  FROM
+      tp_announcement a
+      LEFT JOIN tp_user u ON a.create_user = u.id
+      AND u.community_id = #{communityId,jdbcType=INTEGER}
+  WHERE
+      a.community_id = #{communityId,jdbcType=INTEGER}
+      AND ( a.STATUS = 1 OR a.STATUS = 3 )
+      and a.announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')
+  ORDER BY
+      a.sort,
+      a.create_date DESC
+  </select>
+
+  <select id="getAnnouncement" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpAnnouncement">
+    select
+    <include refid="Base_Column_List" />
+    from tp_announcement
+    where community_id = #{communityId,jdbcType=INTEGER}  and status=1 limit  #{sum,jdbcType=INTEGER}
+  </select>
+</mapper>

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

@@ -0,0 +1,82 @@
+<?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.TpCarouselSettingMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpCarouselSetting" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="carousel_type" property="carouselType" jdbcType="VARCHAR" />
+    <result column="carousel_num" property="carouselNum" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, carousel_type, carousel_num
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_carousel_setting
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_carousel_setting
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpCarouselSetting" >
+    insert into tp_carousel_setting (id, community_id, carousel_type, 
+      carousel_num)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{carouselType,jdbcType=VARCHAR}, 
+      #{carouselNum,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpCarouselSetting" >
+    insert into tp_carousel_setting
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="carouselType != null" >
+        carousel_type,
+      </if>
+      <if test="carouselNum != null" >
+        carousel_num,
+      </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="carouselType != null" >
+        #{carouselType,jdbcType=VARCHAR},
+      </if>
+      <if test="carouselNum != null" >
+        #{carouselNum,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpCarouselSetting" >
+    update tp_carousel_setting
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="carouselType != null" >
+        carousel_type = #{carouselType,jdbcType=VARCHAR},
+      </if>
+      <if test="carouselNum != null" >
+        carousel_num = #{carouselNum,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpCarouselSetting" >
+    update tp_carousel_setting
+    set community_id = #{communityId,jdbcType=INTEGER},
+      carousel_type = #{carouselType,jdbcType=VARCHAR},
+      carousel_num = #{carouselNum,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -233,7 +233,7 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
 
-  <select id="getMessageTotal" resultType="map" parameterType="java.lang.Integer" >
+  <select id="getMessageTotal" resultType="map">
     SELECT
         count( CASE WHEN model_type = 1 AND read_status = 0 THEN 1 ELSE NULL END ) AS messageTotal,
         count( CASE WHEN model_type = 2 THEN 1 ELSE NULL END ) AS toDoTotal
@@ -241,8 +241,25 @@
         tp_message
     WHERE
         uuid_type = 1
+        AND community_id = #{communityId,jdbcType=INTEGER}
         AND uuid = #{userId,jdbcType=INTEGER}
         AND STATUS = 1
         AND advice_type = 1
   </select>
+
+  <select id="getMessages" resultMap="BaseResultMap">
+    SELECT
+      <include refid="Base_Column_List" />
+    FROM
+        tp_message
+    WHERE
+        uuid_type = 1
+        AND community_id = #{communityId,jdbcType=INTEGER}
+        AND uuid = #{userId,jdbcType=INTEGER}
+        AND STATUS = 1
+        AND advice_type = 1
+        AND model_type = #{modelType,jdbcType=INTEGER}
+    ORDER BY
+    create_date DESC
+  </select>
 </mapper>

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

@@ -0,0 +1,128 @@
+<?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.TpSocialViewMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpSocialView" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="uuid" property="uuid" jdbcType="INTEGER" />
+    <result column="social_type" property="socialType" jdbcType="VARCHAR" />
+    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, uuid, social_type, ta_user_id, remark, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_social_view
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_social_view
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpSocialView" >
+    insert into tp_social_view (id, community_id, uuid, 
+      social_type, ta_user_id, remark, 
+      create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{uuid,jdbcType=INTEGER}, 
+      #{socialType,jdbcType=VARCHAR}, #{taUserId,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpSocialView" >
+    insert into tp_social_view
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="uuid != null" >
+        uuid,
+      </if>
+      <if test="socialType != null" >
+        social_type,
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </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="uuid != null" >
+        #{uuid,jdbcType=INTEGER},
+      </if>
+      <if test="socialType != null" >
+        #{socialType,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpSocialView" >
+    update tp_social_view
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="uuid != null" >
+        uuid = #{uuid,jdbcType=INTEGER},
+      </if>
+      <if test="socialType != null" >
+        social_type = #{socialType,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpSocialView" >
+    update tp_social_view
+    set community_id = #{communityId,jdbcType=INTEGER},
+      uuid = #{uuid,jdbcType=INTEGER},
+      social_type = #{socialType,jdbcType=VARCHAR},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectViewNum" resultType="java.lang.Integer" parameterType="com.community.huiju.model.TpSocialView">
+    select count(*) from tp_social_view
+    where
+    <if test="taUserId != null" >
+      ta_user_id = #{taUserId} and
+    </if>
+    uuid = #{uuid}
+    and community_id = #{communityId}
+    and social_type = #{socialType}
+  </select>
+</mapper>

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

@@ -0,0 +1,287 @@
+<?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.TpTicketMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTicket" >
+    <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="ticket_title" property="ticketTitle" jdbcType="VARCHAR" />
+    <result column="ticket_content" property="ticketContent" jdbcType="VARCHAR" />
+    <result column="status" property="status" jdbcType="CHAR" />
+    <result column="type" property="type" jdbcType="CHAR" />
+    <result column="repair_type" property="repairType" jdbcType="CHAR" />
+    <result column="ticket_match_img1" property="ticketMatchImg1" jdbcType="VARCHAR" />
+    <result column="ticket_match_img2" property="ticketMatchImg2" jdbcType="VARCHAR" />
+    <result column="ticket_match_img3" property="ticketMatchImg3" jdbcType="VARCHAR" />
+    <result column="ticket_match_img4" property="ticketMatchImg4" jdbcType="VARCHAR" />
+    <result column="ticket_match_img5" property="ticketMatchImg5" jdbcType="VARCHAR" />
+    <result column="tp_user_id" property="tpUserId" jdbcType="INTEGER" />
+    <result column="score" property="score" jdbcType="VARCHAR" />
+    <result column="comment" property="comment" jdbcType="VARCHAR" />
+    <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" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ta_user_id, ticket_title, ticket_content, status, type, repair_type, 
+    ticket_match_img1, ticket_match_img2, ticket_match_img3, ticket_match_img4, ticket_match_img5, 
+    tp_user_id, score, comment, create_user, create_date, update_user, update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_ticket
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_ticket
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpTicket" >
+    insert into tp_ticket (id, community_id, ta_user_id, 
+      ticket_title, ticket_content, status, 
+      type, repair_type, ticket_match_img1, 
+      ticket_match_img2, ticket_match_img3, ticket_match_img4, 
+      ticket_match_img5, tp_user_id, score, 
+      comment, create_user, create_date, 
+      update_user, update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
+      #{ticketTitle,jdbcType=VARCHAR}, #{ticketContent,jdbcType=VARCHAR}, #{status,jdbcType=CHAR}, 
+      #{type,jdbcType=CHAR}, #{repairType,jdbcType=CHAR}, #{ticketMatchImg1,jdbcType=VARCHAR}, 
+      #{ticketMatchImg2,jdbcType=VARCHAR}, #{ticketMatchImg3,jdbcType=VARCHAR}, #{ticketMatchImg4,jdbcType=VARCHAR}, 
+      #{ticketMatchImg5,jdbcType=VARCHAR}, #{tpUserId,jdbcType=INTEGER}, #{score,jdbcType=VARCHAR}, 
+      #{comment,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpTicket" >
+    insert into tp_ticket
+    <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="ticketTitle != null" >
+        ticket_title,
+      </if>
+      <if test="ticketContent != null" >
+        ticket_content,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="type != null" >
+        type,
+      </if>
+      <if test="repairType != null" >
+        repair_type,
+      </if>
+      <if test="ticketMatchImg1 != null" >
+        ticket_match_img1,
+      </if>
+      <if test="ticketMatchImg2 != null" >
+        ticket_match_img2,
+      </if>
+      <if test="ticketMatchImg3 != null" >
+        ticket_match_img3,
+      </if>
+      <if test="ticketMatchImg4 != null" >
+        ticket_match_img4,
+      </if>
+      <if test="ticketMatchImg5 != null" >
+        ticket_match_img5,
+      </if>
+      <if test="tpUserId != null" >
+        tp_user_id,
+      </if>
+      <if test="score != null" >
+        score,
+      </if>
+      <if test="comment != null" >
+        comment,
+      </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>
+    </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="ticketTitle != null" >
+        #{ticketTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="ticketContent != null" >
+        #{ticketContent,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=CHAR},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=CHAR},
+      </if>
+      <if test="repairType != null" >
+        #{repairType,jdbcType=CHAR},
+      </if>
+      <if test="ticketMatchImg1 != null" >
+        #{ticketMatchImg1,jdbcType=VARCHAR},
+      </if>
+      <if test="ticketMatchImg2 != null" >
+        #{ticketMatchImg2,jdbcType=VARCHAR},
+      </if>
+      <if test="ticketMatchImg3 != null" >
+        #{ticketMatchImg3,jdbcType=VARCHAR},
+      </if>
+      <if test="ticketMatchImg4 != null" >
+        #{ticketMatchImg4,jdbcType=VARCHAR},
+      </if>
+      <if test="ticketMatchImg5 != null" >
+        #{ticketMatchImg5,jdbcType=VARCHAR},
+      </if>
+      <if test="tpUserId != null" >
+        #{tpUserId,jdbcType=INTEGER},
+      </if>
+      <if test="score != null" >
+        #{score,jdbcType=VARCHAR},
+      </if>
+      <if test="comment != null" >
+        #{comment,jdbcType=VARCHAR},
+      </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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTicket" >
+    update tp_ticket
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="ticketTitle != null" >
+        ticket_title = #{ticketTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="ticketContent != null" >
+        ticket_content = #{ticketContent,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=CHAR},
+      </if>
+      <if test="type != null" >
+        type = #{type,jdbcType=CHAR},
+      </if>
+      <if test="repairType != null" >
+        repair_type = #{repairType,jdbcType=CHAR},
+      </if>
+      <if test="ticketMatchImg1 != null" >
+        ticket_match_img1 = #{ticketMatchImg1,jdbcType=VARCHAR},
+      </if>
+      <if test="ticketMatchImg2 != null" >
+        ticket_match_img2 = #{ticketMatchImg2,jdbcType=VARCHAR},
+      </if>
+      <if test="ticketMatchImg3 != null" >
+        ticket_match_img3 = #{ticketMatchImg3,jdbcType=VARCHAR},
+      </if>
+      <if test="ticketMatchImg4 != null" >
+        ticket_match_img4 = #{ticketMatchImg4,jdbcType=VARCHAR},
+      </if>
+      <if test="ticketMatchImg5 != null" >
+        ticket_match_img5 = #{ticketMatchImg5,jdbcType=VARCHAR},
+      </if>
+      <if test="tpUserId != null" >
+        tp_user_id = #{tpUserId,jdbcType=INTEGER},
+      </if>
+      <if test="score != null" >
+        score = #{score,jdbcType=VARCHAR},
+      </if>
+      <if test="comment != null" >
+        comment = #{comment,jdbcType=VARCHAR},
+      </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.TpTicket" >
+    update tp_ticket
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      ticket_title = #{ticketTitle,jdbcType=VARCHAR},
+      ticket_content = #{ticketContent,jdbcType=VARCHAR},
+      status = #{status,jdbcType=CHAR},
+      type = #{type,jdbcType=CHAR},
+      repair_type = #{repairType,jdbcType=CHAR},
+      ticket_match_img1 = #{ticketMatchImg1,jdbcType=VARCHAR},
+      ticket_match_img2 = #{ticketMatchImg2,jdbcType=VARCHAR},
+      ticket_match_img3 = #{ticketMatchImg3,jdbcType=VARCHAR},
+      ticket_match_img4 = #{ticketMatchImg4,jdbcType=VARCHAR},
+      ticket_match_img5 = #{ticketMatchImg5,jdbcType=VARCHAR},
+      tp_user_id = #{tpUserId,jdbcType=INTEGER},
+      score = #{score,jdbcType=VARCHAR},
+      comment = #{comment,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectByCommuniytIdAndByTaUserIdAndByType" parameterType="map" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from tp_ticket
+      <trim prefix="where" prefixOverrides="and">
+        <if test="communityId != null" >
+          and community_id = #{communityId,jdbcType=INTEGER}
+        </if>
+        <if test="taUserId != null" >
+          and ta_user_id = #{taUserId,jdbcType=INTEGER}
+        </if>
+        <if test="type != null" >
+          and type = #{type,jdbcType=CHAR}
+        </if>
+      </trim>
+  </select>
+</mapper>

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

@@ -0,0 +1,160 @@
+<?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.TpTicketRecordCommentMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTicketRecordComment" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="ticker_id" property="tickerId" jdbcType="INTEGER" />
+    <result column="ticket_record_id" property="ticketRecordId" jdbcType="INTEGER" />
+    <result column="uuid" property="uuid" jdbcType="INTEGER" />
+    <result column="user_type" property="userType" jdbcType="CHAR" />
+    <result column="content" property="content" jdbcType="VARCHAR" />
+    <result column="parent_id" property="parentId" jdbcType="INTEGER" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ticker_id, ticket_record_id, uuid, user_type, content, parent_id, 
+    user_name, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_ticket_record_comment
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_ticket_record_comment
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpTicketRecordComment" >
+    insert into tp_ticket_record_comment (id, community_id, ticker_id, 
+      ticket_record_id, uuid, user_type, 
+      content, parent_id, user_name, 
+      create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{tickerId,jdbcType=INTEGER}, 
+      #{ticketRecordId,jdbcType=INTEGER}, #{uuid,jdbcType=INTEGER}, #{userType,jdbcType=CHAR}, 
+      #{content,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpTicketRecordComment" >
+    insert into tp_ticket_record_comment
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="tickerId != null" >
+        ticker_id,
+      </if>
+      <if test="ticketRecordId != null" >
+        ticket_record_id,
+      </if>
+      <if test="uuid != null" >
+        uuid,
+      </if>
+      <if test="userType != null" >
+        user_type,
+      </if>
+      <if test="content != null" >
+        content,
+      </if>
+      <if test="parentId != null" >
+        parent_id,
+      </if>
+      <if test="userName != null" >
+        user_name,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </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="tickerId != null" >
+        #{tickerId,jdbcType=INTEGER},
+      </if>
+      <if test="ticketRecordId != null" >
+        #{ticketRecordId,jdbcType=INTEGER},
+      </if>
+      <if test="uuid != null" >
+        #{uuid,jdbcType=INTEGER},
+      </if>
+      <if test="userType != null" >
+        #{userType,jdbcType=CHAR},
+      </if>
+      <if test="content != null" >
+        #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="userName != null" >
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTicketRecordComment" >
+    update tp_ticket_record_comment
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="tickerId != null" >
+        ticker_id = #{tickerId,jdbcType=INTEGER},
+      </if>
+      <if test="ticketRecordId != null" >
+        ticket_record_id = #{ticketRecordId,jdbcType=INTEGER},
+      </if>
+      <if test="uuid != null" >
+        uuid = #{uuid,jdbcType=INTEGER},
+      </if>
+      <if test="userType != null" >
+        user_type = #{userType,jdbcType=CHAR},
+      </if>
+      <if test="content != null" >
+        content = #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        parent_id = #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="userName != null" >
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpTicketRecordComment" >
+    update tp_ticket_record_comment
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ticker_id = #{tickerId,jdbcType=INTEGER},
+      ticket_record_id = #{ticketRecordId,jdbcType=INTEGER},
+      uuid = #{uuid,jdbcType=INTEGER},
+      user_type = #{userType,jdbcType=CHAR},
+      content = #{content,jdbcType=VARCHAR},
+      parent_id = #{parentId,jdbcType=INTEGER},
+      user_name = #{userName,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectByTicketId" parameterType="map" resultMap="BaseResultMap" >
+    select ttrc.* from tp_ticket tp
+                inner join tp_ticket_record ttr on tp.id = ttr.ticket_id
+                inner join tp_ticket_record_comment ttrc on ttr.ticket_id = ttrc.ticket_record_id
+    where tp.id=#{tickerId,jdbcType=INTEGER} order by ttrc.create_date DESC LIMIT #{size,jdbcType=INTEGER}
+  </select>
+</mapper>

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

@@ -0,0 +1,106 @@
+<?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.TpTicketRecordMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTicketRecord" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="ticket_id" property="ticketId" jdbcType="INTEGER" />
+    <result column="status" property="status" jdbcType="CHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ticket_id, status, create_user, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_ticket_record
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_ticket_record
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpTicketRecord" >
+    insert into tp_ticket_record (id, community_id, ticket_id, 
+      status, create_user, create_date
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{ticketId,jdbcType=INTEGER}, 
+      #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpTicketRecord" >
+    insert into tp_ticket_record
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="ticketId != null" >
+        ticket_id,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </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="ticketId != null" >
+        #{ticketId,jdbcType=INTEGER},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTicketRecord" >
+    update tp_ticket_record
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="ticketId != null" >
+        ticket_id = #{ticketId,jdbcType=INTEGER},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpTicketRecord" >
+    update tp_ticket_record
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ticket_id = #{ticketId,jdbcType=INTEGER},
+      status = #{status,jdbcType=CHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,235 @@
+<?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="transaction_match_img1" property="transactionMatchImg1" jdbcType="VARCHAR" />
+    <result column="activity_match_img3" property="activityMatchImg3" jdbcType="VARCHAR" />
+    <result column="activity_match_img4" property="activityMatchImg4" jdbcType="VARCHAR" />
+    <result column="activity_match_img5" property="activityMatchImg5" jdbcType="VARCHAR" />
+    <result column="activity_match_img6" property="activityMatchImg6" 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" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ta_user_id, transaction_title, transaction_content, transaction_match_img1, 
+    activity_match_img3, activity_match_img4, activity_match_img5, activity_match_img6, 
+    view_count, status, type, create_user, create_date, update_user, update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_transaction
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <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 into tp_transaction (id, community_id, ta_user_id, 
+      transaction_title, transaction_content, transaction_match_img1, 
+      activity_match_img3, activity_match_img4, activity_match_img5, 
+      activity_match_img6, view_count, status, 
+      type, create_user, create_date, 
+      update_user, update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
+      #{transactionTitle,jdbcType=VARCHAR}, #{transactionContent,jdbcType=VARCHAR}, #{transactionMatchImg1,jdbcType=VARCHAR}, 
+      #{activityMatchImg3,jdbcType=VARCHAR}, #{activityMatchImg4,jdbcType=VARCHAR}, #{activityMatchImg5,jdbcType=VARCHAR}, 
+      #{activityMatchImg6,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" 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="transactionMatchImg1 != null" >
+        transaction_match_img1,
+      </if>
+      <if test="activityMatchImg3 != null" >
+        activity_match_img3,
+      </if>
+      <if test="activityMatchImg4 != null" >
+        activity_match_img4,
+      </if>
+      <if test="activityMatchImg5 != null" >
+        activity_match_img5,
+      </if>
+      <if test="activityMatchImg6 != null" >
+        activity_match_img6,
+      </if>
+      <if test="viewCount != null" >
+        view_count,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="type != null" >
+        type,
+      </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>
+    </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="transactionMatchImg1 != null" >
+        #{transactionMatchImg1,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg3 != null" >
+        #{activityMatchImg3,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg4 != null" >
+        #{activityMatchImg4,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg5 != null" >
+        #{activityMatchImg5,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg6 != null" >
+        #{activityMatchImg6,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="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>
+    </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="transactionMatchImg1 != null" >
+        transaction_match_img1 = #{transactionMatchImg1,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg3 != null" >
+        activity_match_img3 = #{activityMatchImg3,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg4 != null" >
+        activity_match_img4 = #{activityMatchImg4,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg5 != null" >
+        activity_match_img5 = #{activityMatchImg5,jdbcType=VARCHAR},
+      </if>
+      <if test="activityMatchImg6 != null" >
+        activity_match_img6 = #{activityMatchImg6,jdbcType=VARCHAR},
+      </if>
+      <if test="viewCount != null" >
+        view_count = #{viewCount,jdbcType=INTEGER},
+      </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},
+      transaction_match_img1 = #{transactionMatchImg1,jdbcType=VARCHAR},
+      activity_match_img3 = #{activityMatchImg3,jdbcType=VARCHAR},
+      activity_match_img4 = #{activityMatchImg4,jdbcType=VARCHAR},
+      activity_match_img5 = #{activityMatchImg5,jdbcType=VARCHAR},
+      activity_match_img6 = #{activityMatchImg6,jdbcType=VARCHAR},
+      view_count = #{viewCount,jdbcType=INTEGER},
+      status = #{status,jdbcType=CHAR},
+      type = #{type,jdbcType=CHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -24,5 +24,25 @@ public class Constant {
     /** 请求发送验证码的远程服务器地址 **/
     public static final String REQUEST_URL = "http://micservice.ycjcjy.com/sms";
 
+    /** 本地缓存过期时间 单位秒 **/
+    public static final Long CACHE_EXPIRE = 60L;
+
+    /** 本地緩存最大个数 **/
+    public static final Long CACHE_SIZE = 1000L;
+
+    /** 住户APP端消息 **/
+    public static final Integer MODEL_TYPE_NEWS = 1;
+    
+    /** 住户APP端待办 **/
+    public static final Integer MODEL_TYPE_UPCOMING = 2;
+
+    /** 社交公告类型**/
+    public static final String ANNOUNCEMENT = "announcement";
+
+    /** 社交活动类型**/
+    public static final String ACTIVITY = "activity";
+
+    /** 社交二手租赁类型**/
+    public static final String LEASE = "lease";
 
 }

CODE/smart-community/zuul/src/main/resources/bootstrap.yml

@@ -24,3 +24,6 @@ eureka:
     service-url:
       defaultZone: http://localhost:8080/eureka/
 
+zuul:
+  host:
+    connect-timeout-millis: 200000

文档/MYSQL/smartCommunity.pdb

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<<<<<<< HEAD
 <?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540265676" Name="smartCommunity" Objects="588" Symbols="68" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+=======
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540286027" Name="smartCommunity" Objects="595" Symbols="69" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+>>>>>>> develop
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,7 +16,7 @@
 <a:Code>smartCommunity</a:Code>
 <a:CreationDate>1539048464</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1540189341</a:ModificationDate>
+<a:ModificationDate>1540285906</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:PackageOptionsText>[FolderOptions]
 
@@ -3698,7 +3702,7 @@ PhysOpts=</a:ModelOptionsText>
 <a:Code>PhysicalDiagram_1</a:Code>
 <a:CreationDate>1539048464</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1540189341</a:ModificationDate>
+<a:ModificationDate>1540285906</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:DisplayPreferences>[DisplayPreferences]
 
@@ -7920,13 +7924,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Table>
 <o:Table Id="o113">
 <a:ObjectID>E1A7CF79-7543-479E-B18A-516582F0951D</a:ObjectID>
-<a:Name>tp_social_setting</a:Name>
-<a:Code>tp_social_setting</a:Code>
+<a:Name>tp_carousel_setting</a:Name>
+<a:Code>tp_carousel_setting</a:Code>
 <a:CreationDate>1539140281</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1539141938</a:ModificationDate>
+<a:ModificationDate>1540286027</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>物业端社交设置表 （设置住户端公告和活动轮播数）</a:Comment>
+<a:Comment>轮播数设置表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
 <o:Column Id="o293">
@@ -7956,13 +7960,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o295">
 <a:ObjectID>6571CBA9-911D-4751-9D38-280D5CDC1641</a:ObjectID>
-<a:Name>social_type</a:Name>
-<a:Code>social_type</a:Code>
+<a:Name>carousel_type</a:Name>
+<a:Code>carousel_type</a:Code>
 <a:CreationDate>1539141779</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1539142002</a:ModificationDate>
+<a:ModificationDate>1540285970</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>社交类型： announcement 表示公告  activity 表示活动</a:Comment>
+<a:Comment>轮播类型： announcement 表示公告  activity 表示活动  banner表示运营banner</a:Comment>
 <a:DataType>varchar(80)</a:DataType>
 <a:Length>80</a:Length>
 </o:Column>

文档/MYSQL/smartCommunity.pdm

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<<<<<<< HEAD
 <?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540273523" Name="smartCommunity" Objects="577" Symbols="68" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+=======
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540286027" Name="smartCommunity" Objects="595" Symbols="69" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+>>>>>>> develop
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,7 +16,7 @@
 <a:Code>smartCommunity</a:Code>
 <a:CreationDate>1539048464</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1540189341</a:ModificationDate>
+<a:ModificationDate>1540285906</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:PackageOptionsText>[FolderOptions]
 
@@ -3698,7 +3702,7 @@ PhysOpts=</a:ModelOptionsText>
 <a:Code>PhysicalDiagram_1</a:Code>
 <a:CreationDate>1539048464</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1540189341</a:ModificationDate>
+<a:ModificationDate>1540285906</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
 <a:DisplayPreferences>[DisplayPreferences]
 
@@ -7920,13 +7924,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Table>
 <o:Table Id="o113">
 <a:ObjectID>E1A7CF79-7543-479E-B18A-516582F0951D</a:ObjectID>
-<a:Name>tp_social_setting</a:Name>
-<a:Code>tp_social_setting</a:Code>
+<a:Name>tp_carousel_setting</a:Name>
+<a:Code>tp_carousel_setting</a:Code>
 <a:CreationDate>1539140281</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1539141938</a:ModificationDate>
+<a:ModificationDate>1540286027</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>物业端社交设置表 （设置住户端公告和活动轮播数）</a:Comment>
+<a:Comment>轮播数设置表</a:Comment>
 <a:TotalSavingCurrency/>
 <c:Columns>
 <o:Column Id="o293">
@@ -7956,13 +7960,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o295">
 <a:ObjectID>6571CBA9-911D-4751-9D38-280D5CDC1641</a:ObjectID>
-<a:Name>social_type</a:Name>
-<a:Code>social_type</a:Code>
+<a:Name>carousel_type</a:Name>
+<a:Code>carousel_type</a:Code>
 <a:CreationDate>1539141779</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1539142002</a:ModificationDate>
+<a:ModificationDate>1540285970</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>社交类型： announcement 表示公告  activity 表示活动</a:Comment>
+<a:Comment>轮播类型： announcement 表示公告  activity 表示活动  banner表示运营banner</a:Comment>
 <a:DataType>varchar(80)</a:DataType>
 <a:Length>80</a:Length>
 </o:Column>