Merge branch 'develop'

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

@@ -114,6 +114,14 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/com.alipay.sdk/alipay-sdk-java -->
+		<dependency>
+			<groupId>com.alipay.sdk</groupId>
+			<artifactId>alipay-sdk-java</artifactId>
+			<version>3.3.49.ALL</version>
+		</dependency>
+
+
 		<!-- log4j -->
 
 		<!--<dependency>-->

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKConstant.java

@@ -35,6 +35,7 @@ public class HKConstant {
     //  public static final String OPENAPI_IP_PORT_HTTPS = "http://192.168.0.122";
     //public static final String OPENAPI_IP_PORT_HTTP = "http://huiju.ngrok.xiaomiqiu.cn";
     public static final String OPENAPI_IP_PORT_HTTP = "http://huifang.vipgz1.idcfengye.com";
+    // public static final String OPENAPI_IP_PORT_HTTP = "192.168.10.200";
 
     /**
      * <p>操作用户UUID，即用户UUID，首次使用操作用户UUID可以通过接口 [获取默认用户UUID]来获取</p>

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/welcome/OkHttpRequestUtils.java

@@ -0,0 +1,236 @@
+package com.community.huiju.common.welcome;
+
+import com.beust.jcommander.internal.Maps;
+import com.fasterxml.jackson.databind.util.ByteBufferBackedInputStream;
+import okhttp3.*;
+
+import java.io.*;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * 封装请求
+ * @author weiximei
+ */
+public class OkHttpRequestUtils {
+
+    // 定义请求客户端
+    private static OkHttpClient client = new OkHttpClient();
+
+    /**
+     * get 请求
+     * @param url 请求URL
+     * @return
+     * @throws Exception
+     */
+    public static String doGet(String url) throws Exception {
+       return doGet(url, Maps.newHashMap());
+    }
+
+
+    /**
+     * get 请求
+     * @param url 请求URL
+     * @param query 携带参数参数
+     * @return
+     * @throws Exception
+     */
+    public static String doGet(String url, Map<String, Object> query) throws Exception {
+
+        return doGet(url, Maps.newHashMap(), query);
+    }
+
+    /**
+     * get 请求
+     * @param url url
+     * @param header 请求头参数
+     * @param query 参数
+     * @return
+     */
+    public static String doGet(String url, Map<String, Object> header, Map<String, Object> query) throws Exception {
+
+        // 创建一个请求 Builder
+        Request.Builder builder = new Request.Builder();
+        // 创建一个 request
+        Request request = builder.url(url).build();
+
+        // 创建一个 HttpUrl.Builder
+        HttpUrl.Builder urlBuilder = request.url().newBuilder();
+        // 创建一个 Headers.Builder
+        Headers.Builder headerBuilder = request.headers().newBuilder();
+
+        // 装载请求头参数
+        Iterator<Map.Entry<String, Object>> headerIterator = header.entrySet().iterator();
+        headerIterator.forEachRemaining(e -> {
+            headerBuilder.add(e.getKey(), (String) e.getValue());
+        });
+
+        // 装载请求的参数
+        Iterator<Map.Entry<String, Object>> queryIterator = query.entrySet().iterator();
+        queryIterator.forEachRemaining(e -> {
+            urlBuilder.addQueryParameter(e.getKey(), (String) e.getValue());
+        });
+
+        // 设置自定义的 builder
+        builder.url(urlBuilder.build()).headers(headerBuilder.build());
+
+        try (Response execute = client.newCall(builder.build()).execute()) {
+            return execute.body().string();
+        }
+    }
+
+    /**
+     * post 请求， 请求参数 并且 携带文件上传
+     * @param url
+     * @param header
+     * @param parameter
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    public static String doPost(String url, Map<String, Object> header, Map<String, Object> parameter, File file) throws Exception {
+
+        // 创建一个请求 Builder
+        Request.Builder builder = new Request.Builder();
+        // 创建一个 request
+        Request request = builder.url(url).build();
+
+        // 创建一个 Headers.Builder
+        Headers.Builder headerBuilder = request.headers().newBuilder();
+
+        // 装载请求头参数
+        Iterator<Map.Entry<String, Object>> headerIterator = header.entrySet().iterator();
+        headerIterator.forEachRemaining(e -> {
+            headerBuilder.add(e.getKey(), (String) e.getValue());
+        });
+
+        MultipartBody.Builder requestBuilder = new MultipartBody.Builder();
+
+        // 状态请求参数
+        Iterator<Map.Entry<String, Object>> queryIterator = parameter.entrySet().iterator();
+        queryIterator.forEachRemaining(e -> {
+            requestBuilder.addFormDataPart(e.getKey(), (String) e.getValue());
+        });
+
+        if (null != file) {
+            // application/octet-stream
+            requestBuilder.addFormDataPart("uploadFiles", file.getName(), RequestBody.create(MediaType.parse("application/octet-stream"), file));
+        }
+
+        // 设置自定义的 builder
+        builder.headers(headerBuilder.build()).post(requestBuilder.build());
+
+        // 然后再 build 一下
+        try (Response execute = client.newCall(builder.build()).execute()) {
+            return execute.body().string();
+        }
+    }
+
+    /**
+     * post 请求， 请求参数 并且 携带文件上传二进制流
+     * @param url
+     * @param header
+     * @param parameter
+     * @param fileName 文件名
+     * @param fileByte 文件的二进制流
+     * @return
+     * @throws Exception
+     */
+    public static String doPost(String url, Map<String, Object> header, Map<String, Object> parameter, String fileName, byte [] fileByte) throws Exception {
+// 创建一个请求 Builder
+        Request.Builder builder = new Request.Builder();
+        // 创建一个 request
+        Request request = builder.url(url).build();
+
+        // 创建一个 Headers.Builder
+        Headers.Builder headerBuilder = request.headers().newBuilder();
+
+        // 装载请求头参数
+        Iterator<Map.Entry<String, Object>> headerIterator = header.entrySet().iterator();
+        headerIterator.forEachRemaining(e -> {
+            headerBuilder.add(e.getKey(), (String) e.getValue());
+        });
+
+        MultipartBody.Builder requestBuilder = new MultipartBody.Builder();
+
+        // 状态请求参数
+        Iterator<Map.Entry<String, Object>> queryIterator = parameter.entrySet().iterator();
+        queryIterator.forEachRemaining(e -> {
+            requestBuilder.addFormDataPart(e.getKey(), (String) e.getValue());
+        });
+
+        if (fileByte.length > 0) {
+            // application/octet-stream
+            requestBuilder.addFormDataPart("uploadFiles", fileName, RequestBody.create(MediaType.parse("application/octet-stream"), fileByte));
+        }
+
+        // 设置自定义的 builder
+        builder.headers(headerBuilder.build()).post(requestBuilder.build());
+
+        try (Response execute = client.newCall(builder.build()).execute()) {
+            return execute.body().string();
+        }
+    }
+
+
+    /**
+     * post 请求  携带文件上传
+     * @param url
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    public static String doPost(String url, File file) throws Exception {
+        return doPost(url, Maps.newHashMap(), Maps.newHashMap(), file);
+    }
+
+    /**
+     * post 请求
+     * @param url
+     * @param header 请求头
+     * @param parameter 参数
+     * @return
+     * @throws Exception
+     */
+    public static String doPost(String url, Map<String, Object> header, Map<String, Object> parameter) throws Exception {
+        return doPost(url, header, parameter, null);
+    }
+
+    /**
+     * post 请求
+     * @param url
+     * @param parameter 参数
+     * @return
+     * @throws Exception
+     */
+    public static String doPost(String url, Map<String, Object> parameter) throws Exception {
+        return doPost(url, Maps.newHashMap(), parameter, null);
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        byte [] fileByte = null;
+
+        File file = new File("C:\\Users\\szc\\Pictures\\file-read-4182.jpg");
+        FileInputStream fileInputStream = new FileInputStream(file);
+
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        byte[] b = new byte[1024];
+        int n;
+        while ((n = fileInputStream.read(b)) != -1)
+        {
+            bos.write(b, 0, n);
+        }
+        fileInputStream.close();
+        bos.close();
+        fileByte = bos.toByteArray();
+
+
+        Map<String, Object> queryMap = Maps.newHashMap();
+        queryMap.put("pageNum","2");
+        queryMap.put("pageSize","50");
+        System.out.println(OkHttpRequestUtils.doPost("http://localhost:8080/uploadImage" , Maps.newHashMap(), Maps.newHashMap(),file.getName(), fileByte));
+
+    }
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/welcome/WelcomeProperties.java

@@ -0,0 +1,26 @@
+package com.community.huiju.common.welcome;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 迎宾系统配置
+ * @author weiximei
+ */
+@ConfigurationProperties(prefix = "welcome")
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WelcomeProperties {
+
+    /** 小区 **/
+    private Integer communityId;
+
+    /** 请求url **/
+    private String url;
+
+}

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

@@ -0,0 +1,109 @@
+package com.community.huiju.controller;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.internal.util.AlipaySignature;
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.wxpay.WXPayConstants;
+import com.community.huiju.common.wxpay.WXPayUtil;
+import com.community.huiju.service.AliPayServiceI;
+import com.community.huiju.service.WxPayServiceI;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import static com.alipay.api.AlipayConstants.CHARSET_UTF8;
+
+/**
+ * @author FXF
+ * @date 2019-03-12
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "支付宝支付 API", description = "支付宝支付 API")
+public class AliPayController {
+	
+	private Logger log = LoggerFactory.getLogger(AliPayController.class);
+	
+	@Autowired
+	private AliPayServiceI aliPayService;
+	
+	@Autowired
+	private WxPayServiceI wxPayService;
+	
+	@Value("${alipay.ALIPAY_PUBLIC_KEY}")
+	private String ALIPAY_PUBLIC_KEY;
+	
+	@ApiOperation(value = "统一下单", notes = "统一下单")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单Id"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
+	@RequestMapping(value = "/aliPayOrder/{billInvoiceId}",method = RequestMethod.GET)
+	public ResponseBean wxUnifiedOrder(@PathVariable("billInvoiceId") Integer billInvoiceId, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		String resp = "";
+		try {
+			resp = aliPayService.AliPayOrder(billInvoiceId,userElement);
+		} catch (Exception e) {
+			e.printStackTrace();
+			responseBean.addError(e.getMessage());
+			return responseBean;
+		}
+		responseBean.addSuccess(resp);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "支付宝手机订单支付完成后回调", notes = "支付宝手机订单支付完成后回调")
+	@RequestMapping(value = "/aliPayNotify",method = RequestMethod.POST)
+	public void aliPayNotify(HttpServletRequest request, HttpServletResponse response){
+		System.out.println("alipay result  start =======");
+		Map<String,String> params = new HashMap<String,String>();
+		Map requestParams = request.getParameterMap();
+		for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext();) {
+			String name = (String) iter.next();
+			String[] values = (String[]) requestParams.get(name);
+			String valueStr = "";
+			for (int i = 0; i < values.length; i++) {
+				valueStr = (i == values.length - 1) ? valueStr + values[i]
+						: valueStr + values[i] + ",";
+			}
+			//乱码解决，这段代码在出现乱码时使用。
+			//valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8");
+			params.put(name, valueStr);
+		}
+		//切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
+		try {
+			boolean flag = AlipaySignature.rsaCheckV1(params, ALIPAY_PUBLIC_KEY, CHARSET_UTF8,"RSA2");
+			if (flag){
+				params.put("pay_type","2");
+				wxPayService.wxNotify(params);
+			}
+		} catch (AlipayApiException e) {
+			e.printStackTrace();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+}

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

@@ -111,4 +111,18 @@ public class MessageController extends BaseController {
 		messageService.updateMessageReadStatus(communityId, userId);
 		return responseBean;
 	}
+
+
+	@ApiOperation(value = "根据消息id进行已读", notes = "根据消息id进行已读")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "messageId", value = "消息id"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+	@RequestMapping(value = "/messageIdreadStatus/{messageId}",method = RequestMethod.PUT)
+	public ResponseBean updateMessageByIdReadStatus(HttpSession session, @PathVariable("messageId") Integer messageId) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		responseBean = messageService.updateMessageByIdReadStatus(userElement, messageId);
+		return responseBean;
+	}
+
+
 }

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

@@ -266,6 +266,35 @@ public class SocialController extends BaseController {
         return responseBean;
     }
 
+
+    @ApiOperation(value = "查询二手租赁回复", notes = "查询二手租赁回复")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "transactionId", value = "活动帖子id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "一页多少行"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "order", value = "asc 正序(默认), desc倒序")
+    })
+    @RequestMapping(value = "/getTransactionReply", method = RequestMethod.GET)
+    public ResponseBean findUsedDetailsReply(@RequestParam("transactionId") Integer transactionId,
+                                             @RequestParam(value = "order", defaultValue = "asc") String order,
+                                             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                             HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+
+        if (!check(userElement.getCommunityId())) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = socialServiceI.findUsedDetailsReply(transactionId, userElement, order, pageNum, pageSize);
+        return responseBean;
+    }
+
+
+
     @ApiOperation(value = "获取所有的二手租赁帖子", notes = "获取所有的二手租赁帖子")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型"),
@@ -367,7 +396,7 @@ public class SocialController extends BaseController {
     public ResponseBean deleteTransaction(HttpSession session, @PathVariable("id") String id) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.deleteransaction(Integer.valueOf(id),userId);
+        ResponseBean response = socialServiceI.deleteransaction(Integer.valueOf(id),userElement);
         return response;
     }
 
@@ -401,4 +430,32 @@ public class SocialController extends BaseController {
         responseBean.addSuccess(reportList);
         return responseBean;
     }
+
+    @ApiOperation(value = "二手帖子对话", notes = "二手帖子对话")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "transactionId:当前帖子ID,replyContent:回复内容，replyTaUserId：被回复的用户ID"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/addTransactionReply", method = RequestMethod.POST)
+    public ResponseBean addTransactionReply(HttpSession session, @RequestBody String paramets) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.addTransactionReply(paramets,userElement);
+        return response;
+    }
+
+    @ApiOperation(value = "添加点赞", notes = "添加点赞")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "transactionId:当前帖子ID，likeStatus：1是喜欢 2是不喜欢"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/addTransactionLike", method = RequestMethod.POST)
+    public ResponseBean addTransactionLike(HttpSession session, @RequestBody String paramets) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.addTransactionLike(paramets,userElement);
+        return response;
+    }
+
+
 }

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

@@ -19,6 +19,7 @@ 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.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpSession;
 import javax.xml.crypto.dsig.keyinfo.PGPData;
@@ -90,9 +91,9 @@ public class UserController extends BaseController {
         responseBean.addSuccess(taUserList);
         return responseBean;
     }
-    @ApiOperation(value = "修改用户名和性别", notes = "修改用户名和性别")
+    @ApiOperation(value = "修改用户名和性别和身份证", notes = "修改用户名和性别和身份证")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户民和gender性别"),
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户民和gender性别和idCard身份证"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
     })
@@ -137,7 +138,8 @@ public class UserController extends BaseController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName(租客或者家属 姓名) " +
                     "phone(租客或者家属 手机号) " +
                     "gender(租客或者家属 性别 1男 2女) " +
-                    "type(2租客 3家属)"),
+                    "type(2租客 3家属)" +
+                    "idCard(身份证号)"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
@@ -151,7 +153,7 @@ public class UserController extends BaseController {
         response = iTaUserService.addTenantsOrDependents(jsonObject.getString("userName"),
                 jsonObject.getString("phone"),jsonObject.getString("gender"),
                 userElement.getId(),
-                jsonObject.getInteger("type"));
+                jsonObject.getInteger("type"), jsonObject.getString("idCard"));
 
         return response;
 
@@ -163,7 +165,8 @@ public class UserController extends BaseController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id(租客或者家属 ID) userName(租客或者家属 姓名) " +
                     "phone(租客或者家属 手机号) " +
                     "gender(租客或者家属 性别 1男 2女) " +
-                    "type(2租客 3家属)"),
+                    "type(2租客 3家属)" +
+                    "idCard(身份证号)"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
@@ -178,7 +181,8 @@ public class UserController extends BaseController {
                 jsonObject.getString("phone"),jsonObject.getString("gender"),
                 userElement.getId(),
                 jsonObject.getInteger("type"),
-                jsonObject.getInteger("id"));
+                jsonObject.getInteger("id"),
+                jsonObject.getString("idCard"));
 
         return response;
 
@@ -247,4 +251,20 @@ public class UserController extends BaseController {
         userVO.setToken(session.getId());
         return responseBean;
     }
+
+    @ApiOperation(value = "迎宾系统添加人员", notes = "迎宾系统添加人员")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataTypeClass = String.class, value = "userName人员名称"),
+            @ApiImplicitParam(paramType = "form", dataTypeClass = MultipartFile.class, name = "file", value = "图片"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/user/welcome/add", method = RequestMethod.POST)
+    public ResponseBean welcomeAddUser(@RequestParam("userName") String userName, @RequestParam("file") MultipartFile file, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        TaUser user = new TaUser();
+        user.setUserName(userName);
+        responseBean = iTaUserService.welcomeFace(userElement, file, user);
+        return responseBean;
+    }
 }

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

@@ -38,7 +38,7 @@ public class VistorController extends BaseController {
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
             @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "parameter", value = "carLicense:车牌(数组),drivingStatus:0 是不开车 1是开车," +
-                    "visitorName:访问人姓名,visitorNum:访问人数,visitorTel:访问人电话,visitorStartTime:访问人开始时间,visitorEndTime:访问人结束时间")})
+                    "visitorName:访问人姓名,visitorNum:访问人数,visitorTel:访问人电话,visitorStartTime:访问人开始时间,visitorEndTime:访问人结束时间,payEntity:支付方式(owmer是由我承担  visitor是访客承担)")})
     public ResponseBean findVistorDetail(@PathVariable("communityId")Integer communityId, @RequestBody String parameter, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
 
@@ -68,8 +68,7 @@ public class VistorController extends BaseController {
 
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        List<TaVisitor> taVisitors = vistorServiceI.invateHis(communityId, userId);
-        responseBean.addSuccess(taVisitors);
+        responseBean = vistorServiceI.invateHis(communityId, userId);
         return  responseBean;
     }
 }

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

@@ -95,6 +95,7 @@ public class WxPayController {
 			Map<String, String> resultMap = WXPayUtil.xmlToMap(result);
 			if (WXPayConstants.SUCCESS.equalsIgnoreCase(resultMap.get("result_code"))) {
 				//处理业务逻辑 修改订单状态等
+				resultMap.put("pay_type","0");
 				String state = wxPayService.wxNotify(resultMap);
 				if (state.equals("success")){
 					log.info("微信支付成功。。");

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

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

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

@@ -3,6 +3,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TaSysUserRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
 
@@ -30,4 +31,11 @@ public interface TaSysUserRoleMapper {
      * @return
      */
     TaSysUserRole selectByCommunityIdAndUserId(Map<String,Object> map);
+
+    /**
+     *查询角色
+     * @param userId
+     * @return
+     */
+    TaSysUserRole selectRole(@Param("communityId") Integer communityId,@Param("userId") Integer userId);
 }

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

@@ -19,7 +19,7 @@ public interface TaVisitorLicenseMapper {
 
     int updateByPrimaryKey(TaVisitorLicense record);
 
-    void insertTaVistorLicense(TaVisitorLicense taVisitorLicense);
+    // void insertTaVistorLicense(TaVisitorLicense taVisitorLicense);
 
     List<String> findTaVistorLicenseById(Integer id);
 }

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

@@ -22,4 +22,11 @@ public interface ToCommunitiesMapper {
     int updateByPrimaryKey(ToCommunities record);
     
     List<ToCommunities> selectByCommunityName(@Param(value="communityName") String communityName);
+
+    /**
+     * 查询超级管理员
+     * @param communityId
+     * @return
+     */
+    Integer selectAndmin(@Param("communityId") Integer communityId);
 }

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

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpCarouselSetting;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface TpCarouselSettingMapper {
@@ -17,7 +18,7 @@ public interface TpCarouselSettingMapper {
 
     int updateByPrimaryKey(TpCarouselSetting record);
 
-     Integer getcarouselNum(String lease);
+     Integer getcarouselNum(@Param("lease") String lease, @Param("communityId") Integer communityId);
 
     Integer selectCarouselNum(String carouselType);
 

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

@@ -36,4 +36,28 @@ public interface TpMessageMapper {
      * @return
      */
     TpMessage selectTicketMessage(TpMessage tpMessage);
+
+    /**
+     * 维护物业端消息推送
+     */
+    void updateTickMessage(@Param("message") TpMessage message);
+
+    /**
+     * 查询工单id是否为空
+     */
+    Integer selectTicket(@Param(value = "communityId") Integer ticketId);
+
+    /**
+     * 根据条件查询消息
+     * @param map
+     * @return
+     */
+    TpMessage selectConditionsTpMessage(Map<String, Object> map);
+
+    /**
+     * 根据条件查询 消息代办
+     * @param map
+     * @return
+     */
+    TpMessage selectBillinvoiceMessage(@Param("map") Map<String, Object> map);
 }

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

@@ -37,4 +37,14 @@ public interface TpTicketMapper {
 	TpTicket selectByTicketId(@Param("communityId") String communityId,@Param("ticketId") Integer ticketId);
 
     void updateTpUserId(@Param("ticketId") Integer ticketId);
+
+    /**
+     * 查看当前工单分配人
+     * @param ticketId
+     * @param communityId
+     * @return
+     */
+    TpTicket getTicketTpUserId(@Param("ticketId") Integer ticketId, @Param("communityId") Integer communityId);
+
+    Integer selectRecordStatus(@Param("communityId") Integer communityId, @Param("ticketId")Integer ticketId);
 }

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

@@ -3,6 +3,7 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TpTicketRecord;
 import com.community.huiju.model.TpTicketRecordComment;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -38,4 +39,12 @@ public interface TpTicketRecordCommentMapper {
      * @return
      */
 	List<TpTicketRecordComment> selectByTicketRecordId(TpTicketRecord tpTicketRecord);
+
+    /**
+     * 查询当前最后回复物业人员1.5需求指定要求
+     * @param communityId
+     * @param ticketId
+     * @return
+     */
+    TpTicketRecordComment getUuID(@Param("communityId") Integer communityId, @Param("ticketId") Integer ticketId);
 }

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

@@ -0,0 +1,45 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpTransactionLike;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+@Mapper
+public interface TpTransactionLikeMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpTransactionLike record);
+
+    int insertSelective(TpTransactionLike record);
+
+    TpTransactionLike selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpTransactionLike record);
+
+    int updateByPrimaryKey(TpTransactionLike record);
+
+    /**
+     * 点赞
+     * @param invitationId
+     * @param communityId
+     * @return
+     */
+    Integer likeCount(@Param("invitationId") Integer invitationId, @Param("communityId") Integer communityId);
+
+    /**
+     * 踩
+     * @param invitationId
+     * @param communityId
+     * @return
+     */
+    Integer nolikeCount(@Param("invitationId") Integer invitationId, @Param("communityId") Integer communityId);
+
+    /**
+     * 查询当前人是否存在数据
+     * @param invitationId
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    TpTransactionLike getinvitationId(@Param("invitationId") Integer invitationId, @Param("communityId") Integer communityId, @Param("userId") Integer userId);
+
+}

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

@@ -0,0 +1,30 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpTransactionReply;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TpTransactionReplyMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpTransactionReply record);
+
+    int insertSelective(TpTransactionReply record);
+
+    TpTransactionReply selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpTransactionReply record);
+
+    int updateByPrimaryKey(TpTransactionReply record);
+
+    /**
+     * 根据 小区id 和 帖子id
+     * @param communityId
+     * @param transactionId
+     * @return
+     */
+    List<TpTransactionReply> getCommunityIdAndTransactionId(@Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId);
+}

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

@@ -0,0 +1,28 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpTransactionReport;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TpTransactionReportMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpTransactionReport record);
+
+    int insertSelective(TpTransactionReport record);
+
+    TpTransactionReport selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpTransactionReport record);
+
+    int updateByPrimaryKey(TpTransactionReport record);
+
+    /**
+     * 根据小区 和 帖子id
+     * @param communityId
+     * @param transactionId
+     * @return
+     */
+    TpTransactionReport selectByCommunityIdAndTransactionId(@Param("userId") Integer userId, @Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId);
+}

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

@@ -0,0 +1,33 @@
+package com.community.huiju.model;
+
+public class SysReportReason {
+    private Integer id;
+
+    private String reason;
+
+    private Integer sort;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason == null ? null : reason.trim();
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+}

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

@@ -39,6 +39,9 @@ public class TaUser {
 
     private Date updateDate;
 
+    // 身份证
+    private String idCard;
+
     // 海康UserId
     private Integer hkUserId;
 
@@ -248,4 +251,12 @@ public class TaUser {
     public void setHkPersonNo(Long hkPersonNo) {
         this.hkPersonNo = hkPersonNo;
     }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
 }

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

@@ -37,6 +37,11 @@ public class TpBillInvoice {
     
     private String billName;
 
+    /**
+     * 缴费方式  0：微信支付  1：线下缴费
+     */
+    private String payType;
+
     public Integer getId() {
         return id;
     }
@@ -172,4 +177,12 @@ public class TpBillInvoice {
     public void setBillName(String billName) {
         this.billName = billName;
     }
+
+    public String getPayType() {
+        return payType;
+    }
+
+    public void setPayType(String payType) {
+        this.payType = payType;
+    }
 }

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

@@ -75,10 +75,25 @@ public class TpMessage {
     
     private String messageIconTitle;
 
+    /**
+     * 举报ID
+     * @return
+     */
+     private  Integer transactionId;
+
+    public Integer getTransactionId() {
+        return transactionId;
+    }
+
+    public void setTransactionId(Integer transactionId) {
+        this.transactionId = transactionId;
+    }
+
     public Integer getId() {
         return id;
     }
 
+
     public void setId(Integer id) {
         this.id = id;
     }

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

@@ -44,6 +44,21 @@ public class TpTransaction {
 
     private  String roleName;
 
+    /**
+     * 顶赞的次数
+     */
+    private Integer likeCount;
+    /**
+     * 踩的人数
+     */
+    private Integer noLikeCount;
+
+    /**
+     * 是否已点赞或者踩
+     */
+    private String bel;
+
+
     public String getRoleName() {
         return roleName;
     }
@@ -184,4 +199,28 @@ public class TpTransaction {
     public void setCreateUserName(String createUserName) {
         this.createUserName = createUserName;
     }
+
+    public Integer getLikeCount() {
+        return likeCount;
+    }
+
+    public void setLikeCount(Integer likeCount) {
+        this.likeCount = likeCount;
+    }
+
+    public Integer getNoLikeCount() {
+        return noLikeCount;
+    }
+
+    public void setNoLikeCount(Integer noLikeCount) {
+        this.noLikeCount = noLikeCount;
+    }
+
+    public String getBel() {
+        return bel;
+    }
+
+    public void setBel(String bel) {
+        this.bel = bel;
+    }
 }

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

@@ -0,0 +1,75 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpTransactionLike {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer taUserId;
+
+    private Integer transactionId;
+
+    private String likeStatus;
+
+    private Date createDate;
+
+    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 Integer getTransactionId() {
+        return transactionId;
+    }
+
+    public void setTransactionId(Integer transactionId) {
+        this.transactionId = transactionId;
+    }
+
+    public String getLikeStatus() {
+        return likeStatus;
+    }
+
+    public void setLikeStatus(String likeStatus) {
+        this.likeStatus = likeStatus == null ? null : likeStatus.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    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/TpTransactionReply.java

@@ -0,0 +1,121 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpTransactionReply {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer transactionId;
+
+    private Integer taUserId;
+
+    private String taUserName;
+
+    private String replyContent;
+
+    private Integer replyTaUserId;
+
+    private String replyTaUserName;
+
+    private Date createDate;
+
+    /**
+     * 住户端 的角色
+     */
+    private String taRoleName;
+
+    /**
+     * 被回复人 的角色
+     */
+    private String replyRoleName;
+
+    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 getTransactionId() {
+        return transactionId;
+    }
+
+    public void setTransactionId(Integer transactionId) {
+        this.transactionId = transactionId;
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public String getTaUserName() {
+        return taUserName;
+    }
+
+    public void setTaUserName(String taUserName) {
+        this.taUserName = taUserName == null ? null : taUserName.trim();
+    }
+
+    public String getReplyContent() {
+        return replyContent;
+    }
+
+    public void setReplyContent(String replyContent) {
+        this.replyContent = replyContent == null ? null : replyContent.trim();
+    }
+
+    public Integer getReplyTaUserId() {
+        return replyTaUserId;
+    }
+
+    public void setReplyTaUserId(Integer replyTaUserId) {
+        this.replyTaUserId = replyTaUserId;
+    }
+
+    public String getReplyTaUserName() {
+        return replyTaUserName;
+    }
+
+    public void setReplyTaUserName(String replyTaUserName) {
+        this.replyTaUserName = replyTaUserName == null ? null : replyTaUserName.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getTaRoleName() {
+        return taRoleName;
+    }
+
+    public void setTaRoleName(String taRoleName) {
+        this.taRoleName = taRoleName;
+    }
+
+    public String getReplyRoleName() {
+        return replyRoleName;
+    }
+
+    public void setReplyRoleName(String replyRoleName) {
+        this.replyRoleName = replyRoleName;
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.community.huiju.model;
+
+public class TpTransactionReport {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer transactionId;
+
+    private String reportReasonId;
+
+    private Integer reporterId;
+
+    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 getTransactionId() {
+        return transactionId;
+    }
+
+    public void setTransactionId(Integer transactionId) {
+        this.transactionId = transactionId;
+    }
+
+    public String getReportReasonId() {
+        return reportReasonId;
+    }
+
+    public void setReportReasonId(String reportReasonId) {
+        this.reportReasonId = reportReasonId == null ? null : reportReasonId.trim();
+    }
+
+    public Integer getReporterId() {
+        return reporterId;
+    }
+
+    public void setReporterId(Integer reporterId) {
+        this.reporterId = reporterId;
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.community.commom.session.UserElement;
+
+import java.util.Map;
+
+public interface AliPayServiceI {
+	/**
+	 * 微信支付统一下单
+	 * @return
+	 * @param billInvoiceId
+	 * @param userElement
+	 */
+	String AliPayOrder(Integer billInvoiceId, UserElement userElement) throws Exception;
+	
+}

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

@@ -2,6 +2,8 @@ package com.community.huiju.service;
 
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaUser;
 import org.springframework.web.multipart.MultipartFile;
 
 public interface FaceServiceI {
@@ -29,4 +31,5 @@ public interface FaceServiceI {
      * @return
      */
     ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserId);
+
 }

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

@@ -1,7 +1,9 @@
 package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.TaUser;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -72,9 +74,10 @@ public interface ITaUserService {
      * @param gender
      * @param currentUserId 当前用户(业主)
      * @param type 2租客 3家属
+     * @param idCard 身份证号
      * @return
      */
-    ResponseBean addTenantsOrDependents(String userName, String phone, String gender,Integer currentUserId,Integer type);
+    ResponseBean addTenantsOrDependents(String userName, String phone, String gender,Integer currentUserId,Integer type, String idCard);
 
     /**
      * 修改租客或者家属
@@ -84,9 +87,10 @@ public interface ITaUserService {
      * @param currentUserId 当前用户(业主)
      * @param type 2租客 3家属
      * @param userId 用户ID
+     * @param idCard 身份证号
      * @return
      */
-    ResponseBean updateTenantsOrDependents(String userName, String phone, String gender,Integer currentUserId,Integer type,Integer userId);
+    ResponseBean updateTenantsOrDependents(String userName, String phone, String gender,Integer currentUserId,Integer type,Integer userId, String idCard);
 
     /**
      * 修改用户头像
@@ -111,4 +115,13 @@ public interface ITaUserService {
      */
     ResponseBean temporaryLogin(Integer communityId);
 
+    /**
+     * 迎宾专用 接口
+     * @param userElement
+     * @param uploadFile
+     * @param user
+     * @return
+     */
+    ResponseBean welcomeFace(UserElement userElement, MultipartFile uploadFile, TaUser user);
+
 }

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

@@ -54,6 +54,7 @@ public interface ITicketService {
 	 * @param tpTicketRecordComment
 	 * @return
 	 */
+	@Deprecated
 	Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment, Integer userId);
 
 	/**

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

@@ -1,5 +1,8 @@
 package com.community.huiju.service;
 
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+
 import java.util.Map;
 
 public interface MessageServiceI {
@@ -24,4 +27,12 @@ public interface MessageServiceI {
 	 * 全部已读
 	 */
 	void updateMessageReadStatus(Integer communityId, Integer userId);
+
+	/**
+	 * 根据消息的id, 进行已读操作
+	 * @param userElement
+	 * @param messageId
+	 * @return
+	 */
+	ResponseBean updateMessageByIdReadStatus(UserElement userElement, Integer messageId);
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.*;
 
 import java.io.IOException;
@@ -151,7 +152,7 @@ public interface SocialServiceI {
  	 * @param id
 	 * @return
 	 */
-	ResponseBean deleteransaction(Integer id,Integer userid);
+	ResponseBean deleteransaction(Integer id, UserElement userElement);
 	
 	/**
 	 * 获取举报原因列表
@@ -167,4 +168,30 @@ public interface SocialServiceI {
 	 * @return
 	 */
 	ResponseBean reportTransaction(Integer userId,Integer communityId, String paramets);
+
+	/**
+	 * 查询 二手交易帖子的回复
+	 * @param transactionId 帖子id
+	 * @param userElement 用户信息体
+	 * @param order asc 正序  desc 倒序
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	ResponseBean findUsedDetailsReply(Integer transactionId, UserElement userElement, String order, Integer pageNum, Integer pageSize);
+	/**
+	 * 二帖子回复
+	 *@param paramets
+	 *@param userElement
+	 *@return
+	 */
+    ResponseBean addTransactionReply(String paramets, UserElement userElement);
+
+	/**
+	 * 添加点赞
+	 * @param paramets
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean addTransactionLike(String paramets, UserElement userElement);
 }

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

@@ -20,5 +20,12 @@ public interface TaVistorServiceI {
      * @return
      */
     ResponseBean insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId);
-    List<TaVisitor> invateHis(Integer communityId, Integer userId);
+
+    /**
+     * 访客邀请记录
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    ResponseBean invateHis(Integer communityId, Integer userId);
 }

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

@@ -0,0 +1,120 @@
+package com.community.huiju.service.impl;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.domain.AlipayTradeAppPayModel;
+import com.alipay.api.request.AlipayTradeAppPayRequest;
+import com.alipay.api.response.AlipayTradeAppPayResponse;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.wxpay.HfWxConfig;
+import com.community.huiju.common.wxpay.WXPay;
+import com.community.huiju.common.wxpay.WXPayConstants;
+import com.community.huiju.common.wxpay.WXPayUtil;
+import com.community.huiju.dao.TaSysRoleMapper;
+import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.dao.TpBillInvoiceMapper;
+import com.community.huiju.dao.TpBillMapper;
+import com.community.huiju.dao.TpBillStatementMapper;
+import com.community.huiju.model.TaSysRole;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TpBillInvoice;
+import com.community.huiju.service.AliPayServiceI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+
+import static com.alipay.api.AlipayConstants.CHARSET_UTF8;
+
+/**
+ * @author FXF
+ * @date 2018-10-25
+ */
+@Service("aliPayService")
+@Transactional(rollbackFor = Exception.class)
+public class AliPayServiceImpl implements AliPayServiceI {
+	private Logger log = LoggerFactory.getLogger(AliPayServiceImpl.class);
+	
+	@Autowired
+	private TpBillInvoiceMapper tpBillInvoiceMapper;
+	
+	@Autowired
+	private TpBillStatementMapper tpBillStatementMapper;
+
+	@Autowired
+	private TpBillMapper tpBillMapper;
+
+	@Autowired
+	private TaUserMapper taUserMapper;
+
+	@Autowired
+	private TaSysRoleMapper taSysRoleMapper;
+	
+	@Value("${alipay.APP_PRIVATE_KEY}")
+	private String APP_PRIVATE_KEY;
+	
+	@Value("${alipay.APP_ID}")
+	private String ALI_APP_ID;
+	
+	@Value("${alipay.ALIPAY_PUBLIC_KEY}")
+	private String ALIPAY_PUBLIC_KEY;
+	
+	/**
+	 * 支付宝统一下单
+	 *
+	 * @return
+	 * @param billInvoiceId
+	 * @param userElement
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public String AliPayOrder(Integer billInvoiceId, UserElement userElement) throws Exception {
+		Integer userId = userElement.getId();
+
+		// 如果是家属/租客, 应该用业主的用户id
+		TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+		TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
+		if (null != taSysRole && taSysRole.getId().intValue() != 1) {
+			TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
+			userId = ownerUser.getId();
+		}
+
+		//获取支付金额
+		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
+		if (null == tpBillInvoice){
+			throw new Exception("订单不存在");
+		}else if (!tpBillInvoice.getBillStatus().equals("3")){
+			throw new Exception("不是正在支付的订单");
+		}
+		
+		//下单
+		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", ALI_APP_ID, APP_PRIVATE_KEY, "json", CHARSET_UTF8, ALIPAY_PUBLIC_KEY, "RSA2");
+		//实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+		AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
+		//SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
+		AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
+		model.setBody(tpBillInvoice.getBillName());
+		model.setSubject(tpBillInvoice.getBillName());
+		model.setOutTradeNo(tpBillInvoice.getOutTradeNo());
+		model.setTimeoutExpress("30m");
+		model.setTotalAmount(BigDecimal.valueOf(Long.valueOf(tpBillInvoice.getPayPrice())).divide(new BigDecimal(100)).toString());
+		model.setProductCode("QUICK_MSECURITY_PAY");
+		request.setBizModel(model);
+		request.setNotifyUrl("http://106.14.20.193:8086/app-api/aliPayNotify");
+		try {
+			//这里和普通的接口调用不同，使用的是sdkExecute
+			AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
+			//就是orderString 可以直接给客户端请求，无需再做处理。
+			System.out.println(response.getBody());
+			return response.getBody();
+		} catch (AlipayApiException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}

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

@@ -1,6 +1,10 @@
 package com.community.huiju.service.impl;
 
+import com.community.huiju.dao.TaSysRoleMapper;
+import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.TpBillInvoiceMapper;
+import com.community.huiju.model.TaSysRole;
+import com.community.huiju.model.TaUser;
 import com.community.huiju.service.BillServiceI;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -20,6 +24,12 @@ public class BillServiceImpl implements BillServiceI {
 	
 	@Autowired
 	private TpBillInvoiceMapper tpBillInvoiceMapper;
+
+	@Autowired
+	private TaUserMapper taUserMapper;
+
+	@Autowired
+	private TaSysRoleMapper taSysRoleMapper;
 	
 	/**
 	 * 根据payType分页获取缴费或未缴费的数据
@@ -33,6 +43,16 @@ public class BillServiceImpl implements BillServiceI {
 	public Map<String, Object> getBillsList(Integer communityId, Integer payType, Integer userId ,Integer pageNum, Integer pageSize) {
 		//使用分页插件
 		Page<Map<String,Object>> page = PageHelper.startPage(pageNum, pageSize);
+
+		TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+
+		TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
+		// 如果不是业主
+		if (null != taSysRole && taSysRole.getId().intValue() != 1) {
+			TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
+			userId = ownerUser.getId();
+		}
+
 		List<Map<String,Object>> billsList = tpBillInvoiceMapper.getBillsList(communityId, userId, payType);
 		billsList.forEach(e-> {
 			String payPrice = String.valueOf(e.get("payPrice"));

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

@@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.community.commom.ailiyun.AESDecode;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.common.hk.HKOpenApi;
 import com.community.huiju.dao.TaFaceMapper;
 import com.community.huiju.dao.TaSysRoleMapper;
@@ -44,6 +45,7 @@ public class FaceServicelimpl implements FaceServiceI {
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addFace(Integer userid, MultipartFile uploadFile,Integer otherUserId) {
         ResponseBean responseBean= new ResponseBean();
+
          String faceImg =img(uploadFile);
         /**当otherUserId不为空时判断它是否是业主下的租客或者家属*/
         if (null!= otherUserId) {
@@ -65,7 +67,7 @@ public class FaceServicelimpl implements FaceServiceI {
             taFace.setUpdateDate(new Date());
 
         /*验证身份*/
-        responseBean=addVerify( activeUser,  uploadFile, otherUserId, faceImg, taFace) ;
+        responseBean=addVerify( activeUser,  uploadFile, faceImg, taFace) ;
         return responseBean;
     }
 
@@ -218,7 +220,7 @@ public class FaceServicelimpl implements FaceServiceI {
     /**
      *各种身份校验
      */
-    public ResponseBean addVerify(Integer userid, MultipartFile uploadFile,Integer otherUserId,String faceImg,TaFace taFace) {
+    public ResponseBean addVerify(Integer userid, MultipartFile uploadFile,String faceImg,TaFace taFace) {
         ResponseBean response = new ResponseBean();
         TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userid);
         TaUser taUser = taUserMapper.selectByPrimaryKey(userid);
@@ -265,8 +267,6 @@ public class FaceServicelimpl implements FaceServiceI {
         response.addError("您的信息已存在");
         return response;
     }
-
-
 }
 
 

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

@@ -1,6 +1,8 @@
 package com.community.huiju.service.impl;
 
 import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.dao.TpBillInvoiceMapper;
 import com.community.huiju.dao.TpBillMapper;
 import com.community.huiju.dao.TpMessageMapper;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -112,4 +115,25 @@ public class MessageServiceImpl implements MessageServiceI {
 	public void updateMessageReadStatus(Integer communityId, Integer userId) {
 		tpMessageMapper.updateReadStatus(communityId, userId);
 	}
+
+	@Override
+	public ResponseBean updateMessageByIdReadStatus(UserElement userElement, Integer messageId) {
+		ResponseBean responseBean = new ResponseBean();
+
+		TpMessage tpMessage = tpMessageMapper.selectByPrimaryKey(messageId);
+		if (null == tpMessage) {
+			responseBean.addError("消息不存在!");
+			return responseBean;
+		}
+		tpMessage.setReadStatus("1");
+		tpMessage.setUpdateDate(new Date());
+		tpMessage.setUpdateUser(userElement.getId());
+		int row = tpMessageMapper.updateByPrimaryKeySelective(tpMessage);
+		if (row > 0) {
+			responseBean.addSuccess("操作成功!");
+			return responseBean;
+		}
+		responseBean.addError("操作失败!");
+		return responseBean;
+	}
 }

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

@@ -3,6 +3,7 @@ package com.community.huiju.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ImageServiceI;
@@ -12,12 +13,15 @@ import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
 import com.sun.org.apache.bcel.internal.generic.NEW;
 import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.swing.plaf.TabbedPaneUI;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -69,6 +73,23 @@ public class SocialServiceImpl implements SocialServiceI {
     @Autowired
     private TpUserMapper tpUserMapper;
 
+    @Autowired
+    private TpMessageMapper tpMessageMapper;
+
+    @Autowired
+    private SysReportReasonMapper sysReportReasonMapper;
+
+    @Autowired
+    private TpTransactionReportMapper tpTransactionReportMapper;
+
+    @Autowired
+    private ToCommunitiesMapper  toCommunitiesMapper;
+
+    @Autowired
+    private TpTransactionReplyMapper tpTransactionReplyMapper;
+
+    @Autowired
+    private  TpTransactionLikeMapper tpTransactionLikeMapper;
 
     @Override
     @Transactional
@@ -119,8 +140,11 @@ public class SocialServiceImpl implements SocialServiceI {
      */
     @Override
     public List<TpAnnouncement> getAnnouncement(Integer communityId) {
-        Integer Num=tpCarouselSettingMapper.getcarouselNum(Constant.ANNOUNCEMENT);
-        List<TpAnnouncement> listAnnouncement=tpAnnouncementMapper.getAnnouncement(communityId,Num);
+        Integer num=tpCarouselSettingMapper.getcarouselNum(Constant.ANNOUNCEMENT, communityId);
+        if (null == num) {
+            num = 0;
+        }
+        List<TpAnnouncement> listAnnouncement=tpAnnouncementMapper.getAnnouncement(communityId,num);
         return listAnnouncement;
     }
 
@@ -165,6 +189,11 @@ public class SocialServiceImpl implements SocialServiceI {
         }
 
         TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId,communityId);
+        TpUser tpUser = tpUserMapper.selectByPrimaryKey(tpActivity.getCreateUser());
+        if (null != tpUser) {
+            tpActivity.setUserName(tpUser.getUserName());
+        }
+
         //返回报名状态
         Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userId);
         String signStatus = signNum != 0 ? Constant.STATUS_SIGNED : Constant.STATUS_UNSIGN;
@@ -442,14 +471,35 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean deleteransaction(Integer id,Integer userId) {
+    public ResponseBean deleteransaction(Integer id, UserElement userElement) {
         ResponseBean responseBean= new ResponseBean();
         TpTransaction tpTransaction=tpTransactionMapper.getById(Integer.valueOf(id));
-        if(null!= tpTransaction && userId.equals(tpTransaction.getTaUserId())) {
+        if(null!= tpTransaction && userElement.getId().equals(tpTransaction.getTaUserId())) {
             tpTransaction.setStatus("0");
             tpTransaction.setUpdateDate(new Date());
             tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
             responseBean.addSuccess("删除成功");
+
+
+
+            // 把消息变为无效
+            Map<String, Object> map = new HashMap<>();
+            map.put("communityId", userElement.getCommunityId());
+            map.put("messageType", "9");
+            map.put("adviceType", "4");
+            map.put("uuidType", "2");
+            map.put("source", "1");
+            map.put("status", "1");
+            map.put("modelType", "1");
+            map.put("transactionId", tpTransaction.getId());
+            TpMessage tpMessage = tpMessageMapper.selectConditionsTpMessage(map);
+            if (null != tpMessage) {
+                tpMessage.setStatus("0");
+                tpMessageMapper.updateByPrimaryKeySelective(tpMessage);
+            }
+
+
+
         }else {
             responseBean.addSuccess("当前ID不存在");
         }
@@ -485,6 +535,12 @@ public class SocialServiceImpl implements SocialServiceI {
             responseBean.addError("举报的交易不存在");
             return responseBean;
         }
+        // 举报原因
+        TpTransactionReport tpTransactionReport = tpTransactionReportMapper.selectByCommunityIdAndTransactionId(userId, communityId, tpTransaction.getId());
+        if (null != tpTransactionReport) {
+            responseBean.addError("您已举报了该帖子!");
+            return responseBean;
+        }
         //插入举报表
         tpTransactionMapper.saveReportReason(userId,communityId,transactionId,reportReasonId);
         //更新交易表的举报状态为被举报
@@ -493,14 +549,84 @@ public class SocialServiceImpl implements SocialServiceI {
         record.setIsReported("1");
         Integer size = tpTransactionMapper.updateByPrimaryKeySelective(record);
         if (size > 0){
+
+            // 举报人
+            TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+            // 发帖人
+            TaUser createUser = taUserMapper.selectByPrimaryKey(tpTransaction.getCreateUser());
+
+            // 举报原因
+            //TpTransactionReport tpTransactionReport = tpTransactionReportMapper.selectByCommunityIdAndTransactionId(communityId, tpTransaction.getId());
+            SysReportReason sysReportReason = sysReportReasonMapper.selectByPrimaryKey(Integer.valueOf(reportReasonId));
+
+
+            // 插入消息表
+            TpMessage message = new TpMessage();
+            message.setCommunityId(communityId);
+            message.setMessageType("9");
+            message.setAdviceType("4");
+            message.setModelType("1");
+            //超级管理员
+            Integer userID= toCommunitiesMapper.selectAndmin(communityId);
+            message.setUuid(userID);
+            message.setModelType("1");
+            message.setUuidType("2");
+            message.setSource("1");
+            message.setMessageContent("{" + taUser.getUserName() + "}举报了{" + createUser.getUserName() + "}发布的帖子：{" + tpTransaction.getTransactionTitle() +  "}，举报原因：{" + sysReportReason.getReason() + "}，点击责令发布人修改或直接作废帖子");
+            message.setStatus("1");
+            message.setReadStatus("0");
+            message.setTransactionId(transactionId);
+            message.setCreateDate(new Date());
+            message.setCreateUser(userId);
+            tpMessageMapper.insertSelective(message);
+
+
+
             responseBean.addSuccess(size);
             return responseBean;
         }
         responseBean.addError("举报出错");
         return responseBean;
     }
-    
-    
+
+    @Override
+    public ResponseBean addTransactionReply(String paramets, UserElement userElement) {
+        ResponseBean response= new ResponseBean();
+        TpTransactionReply tpTransactionReply= JSONObject.parseObject(paramets,TpTransactionReply.class);
+        tpTransactionReply.setCommunityId(userElement.getCommunityId());
+        tpTransactionReply.setTaUserId(userElement.getId());
+        tpTransactionReply.setTaUserName(userElement.getUserName());
+        //获取被回复的姓名
+        if("".equals(tpTransactionReply.getReplyTaUserId())) {
+            tpTransactionReply.setReplyTaUserId(null);
+        }
+        if(null!=tpTransactionReply.getReplyTaUserId()&!"".equals(tpTransactionReply.getReplyTaUserId())) {
+            tpTransactionReply.setReplyTaUserName(taUserMapper.selectByPrimaryKey(tpTransactionReply.getReplyTaUserId()).getUserName());
+        }
+        tpTransactionReply.setCreateDate(new Date());
+        tpTransactionReplyMapper.insert(tpTransactionReply);
+        response.addSuccess("成功");
+        return response;
+    }
+
+    @Override
+    public ResponseBean addTransactionLike(String paramets, UserElement userElement) {
+      ResponseBean response = new ResponseBean();
+        TpTransactionLike tpTransactionLike= JSONObject.parseObject(paramets,TpTransactionLike.class);
+        tpTransactionLike.setCommunityId(userElement.getCommunityId());
+        tpTransactionLike.setTaUserId(userElement.getId());
+        tpTransactionLike.setCreateDate(new Date());
+        TpTransactionLike isUser= tpTransactionLikeMapper.getinvitationId(tpTransactionLike.getTransactionId(),userElement.getCommunityId(),userElement.getId());
+        if (null!=isUser) {
+            response.addError("您已点赞或踩");
+            return response;
+        }
+        tpTransactionLikeMapper.insert(tpTransactionLike);
+        response.addSuccess("成功");
+        return response;
+    }
+
+
     @Override
     public void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId, Integer userId) {
         //修改工单内容和评分
@@ -518,12 +644,34 @@ public class SocialServiceImpl implements SocialServiceI {
         record.setCreateUser(userId);
         record.setCreateDate(new Date());
         tpTicketRecordMapper.insertSelective(record);
+
+        //1.5版本推送消息message
+        TpMessage message = new TpMessage();
+        message.setCommunityId(communityId);
+        message.setTicketId(tpTicket.getId());
+        TpTicket tic= tpTicketMapper.selectByTicketId(String.valueOf(communityId),Integer.valueOf(ticketId));
+        message.setMessageType(tic.getType());
+        message.setAdviceType("4");
+        message.setModelType("1");
+        Integer createUser=tpTicketMapper.selectRecordStatus(communityId,tpTicket.getId());
+        message.setUuid(createUser);
+        message.setUuidType("2");
+        message.setSource("2");
+        message.setMessageContent("工单“"+tic.getTicketTitle() +"”已经验收并评价，点击查看评分");
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(userId);
+        message.setCreateDate(new Date());
+        tpMessageMapper.insert(message);
     }
 
     @Override
     public List<TpActivity> getActivity(Integer communityId) {
-        Integer Num=tpCarouselSettingMapper.getcarouselNum(Constant.ACTIVITY);
-        List<TpActivity> listActivity=tpActivityMapper.getActivity(communityId,Num);
+        Integer num = tpCarouselSettingMapper.getcarouselNum(Constant.ACTIVITY, communityId);
+        if (null == num) {
+            num = 0;
+        }
+        List<TpActivity> listActivity=tpActivityMapper.getActivity(communityId,num);
         return listActivity;
     }
     
@@ -614,6 +762,24 @@ public class SocialServiceImpl implements SocialServiceI {
         List<String> imgList = tdImagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
         tpTransaction.setImgList(imgList);
 
+        /**
+         * 查询点赞和踩的次数
+         */
+
+
+        //统计点赞人数的次数
+        Integer likeCount= tpTransactionLikeMapper.likeCount(activityId, communityId);
+        //不喜欢的人数
+        Integer noLikeCount= tpTransactionLikeMapper.nolikeCount(activityId, communityId);
+        tpTransaction.setLikeCount(likeCount == null ? 0 : likeCount);
+        tpTransaction.setNoLikeCount(noLikeCount == null ? 0 : noLikeCount);
+
+        // 查询是 点赞 还是 踩
+        TpTransactionLike isUser= tpTransactionLikeMapper.getinvitationId(activityId,communityId, userId);
+        if (null!=isUser){
+            tpTransaction.setBel(isUser.getLikeStatus());
+        }
+
         return tpTransaction;
 
     }
@@ -650,4 +816,15 @@ public class SocialServiceImpl implements SocialServiceI {
 
         return responseBean;
     }
+
+    @Override
+    public ResponseBean findUsedDetailsReply(Integer transactionId, UserElement userElement, String order, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+
+        PageHelper.startPage(pageNum, pageSize, "create_date " + order);
+        List<TpTransactionReply> replies = tpTransactionReplyMapper.getCommunityIdAndTransactionId(userElement.getCommunityId(), transactionId);
+
+        responseBean.addSuccess(replies);
+        return responseBean;
+    }
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.BeanTools;
 import com.community.commom.utils.MD5Utils;
@@ -11,9 +12,12 @@ import com.community.commom.uuid.IdGen;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.common.hk.HKConstant;
 import com.community.huiju.common.hk.HKOpenApi;
+import com.community.huiju.common.welcome.OkHttpRequestUtils;
+import com.community.huiju.common.welcome.WelcomeProperties;
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ITaUserService;
+import com.community.huiju.service.ImageServiceI;
 import com.community.huiju.vo.TaUserVO;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -26,7 +30,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -47,6 +53,9 @@ public class TaUserServiceImpl implements ITaUserService {
 
     private IdGen idGen = IdGen.get();
 
+    @Autowired
+    private WelcomeProperties welcomeProperties;
+
     @Autowired
     private TaUserMapper taUserMapper;
 
@@ -71,6 +80,9 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private TpBillInvoiceMapper tpBillInvoiceMapper;
 
+    @Autowired
+    private ImageServiceI imageService;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Deprecated
@@ -488,7 +500,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseBean addTenantsOrDependents(String userName, String phone, String gender, Integer currentUserId, Integer type) {
+    public ResponseBean addTenantsOrDependents(String userName, String phone, String gender, Integer currentUserId, Integer type, String idCard) {
         ResponseBean response = new ResponseBean();
 
         TaUser taUser = taUserMapper.selectByPrimaryKey(currentUserId);
@@ -513,6 +525,11 @@ public class TaUserServiceImpl implements ITaUserService {
             return response;
         }
 
+        if (StringUtils.isEmpty(idCard)) {
+            response.addError("对不起! 身份证不允许为空!");
+            return response;
+        }
+
         Map<String,Object> parUserLogin = Maps.newHashMap();
         parUserLogin.put("loginName",phone);
         TaUser parUser = taUserMapper.selectByLoginName(parUserLogin);
@@ -536,6 +553,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setAcceptAgreementStatus("1");
         user.setFaceStatus("0");
         user.setRemark("这是业主添加的!");
+        user.setIdCard(idCard);
         if (StringUtils.isEmpty(userName)) {
             user.setUserName(user.getLoginName());
         }
@@ -575,7 +593,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateTenantsOrDependents(String userName, String phone, String gender, Integer currentUserId, Integer type,Integer userId) {
+    public ResponseBean updateTenantsOrDependents(String userName, String phone, String gender, Integer currentUserId, Integer type,Integer userId, String idCard) {
         ResponseBean response = new ResponseBean();
 
         TaUser taUser = taUserMapper.selectByPrimaryKey(currentUserId);
@@ -590,13 +608,18 @@ public class TaUserServiceImpl implements ITaUserService {
         // 当前用户的身份
         TaSysRole role = taSysRoleMapper.findRoleByUserId(taUser.getId());
         if (!"OWNER".equals(role.getRoleName())) {
-            response.addError("对不起,您不是业主,不能添加家属或租客!");
+            response.addError("对不起,您不是业主,不能修改家属或租客!");
             return response;
         }
 
         int tempType = type;
         if (tempType != 2 && type != 3) {
-            response.addError("对不起! 您只能添加家属或者租客!");
+            response.addError("对不起! 您只能修改家属或者租客!");
+            return response;
+        }
+
+        if (StringUtils.isEmpty(idCard)) {
+            response.addError("对不起! 身份证不允许为空!");
             return response;
         }
 
@@ -607,6 +630,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setUpdateDate(new Date());
         user.setUpdateUser(currentUserId);
         user.setParentId(currentUserId);
+        user.setIdCard(idCard);
         if (StringUtils.isEmpty(userName)) {
             user.setUserName(user.getLoginName());
         }
@@ -967,4 +991,60 @@ public class TaUserServiceImpl implements ITaUserService {
 
         return responseBean;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean welcomeFace(UserElement userElement, MultipartFile uploadFile, TaUser user) {
+        ResponseBean responseBean = new ResponseBean();
+
+        user.setCommunityId(userElement.getCommunityId());
+        user.setParentId(userElement.getId());
+        user.setCreateDate(new Date());
+        user.setCreateUser(userElement.getId());
+        user.setCommunityId(userElement.getCommunityId());
+        user.setVerifyStatus("1");
+        user.setAcceptAgreementStatus("1");
+        user.setStatus("1");
+
+        int rows = taUserMapper.insertSelective(user);
+        if (rows <= 0) {
+            responseBean.addError("操作失败！");
+            return responseBean;
+        }
+
+        // 角色  2 表示租客
+        addOrUpdateUserRole(2,responseBean,user,true);
+
+        // 开始推送 迎宾系统
+
+        Map<String, Object> parameterMap = Maps.newHashMap();
+        parameterMap.put("userId", user.getId());
+        parameterMap.put("username", user.getUserName());
+        try {
+            OkHttpRequestUtils.doPost(welcomeProperties.getUrl(), Maps.newHashMap(), parameterMap, uploadFile.getOriginalFilename(), uploadFile.getBytes());
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("推送 迎宾系统失败！", e);
+        }
+
+        // 开始存储人脸的图片到本地库
+        TaFace taFace = new TaFace();
+        taFace.setCommunityId(user.getCommunityId());
+        taFace.setCreateDate(new Date());
+        taFace.setCreateUser(user.getId());
+        taFace.setTaUserId(user.getId());
+        taFace.setUpdateDate(new Date());
+        taFace.setUpdateUser(user.getId());
+        try {
+            taFace.setFaceImg(imageService.getImageUrl(uploadFile));
+        } catch (IOException e) {
+            e.printStackTrace();
+            log.error("迎宾系统 人脸图片上传阿里云失败！", e);
+        }
+
+        taFaceMapper.insertSelective(taFace);
+
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
 }

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

@@ -82,7 +82,8 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
     }
 
     @Override
-    public List<TaVisitor> invateHis(Integer communityId, Integer userId) {
+    public ResponseBean invateHis(Integer communityId, Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
         List<TaVisitor> taVisitors = taVisitorMapper.findAllVistors(communityId, userId);
 
         for (TaVisitor taVisitor : taVisitors){
@@ -91,7 +92,8 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
                 taVisitor.setCarLicense(taVisitorLicenses);
             }
         }
-        return taVisitors;
+        responseBean.addSuccess(taVisitors);
+        return responseBean;
     }
 
     /**

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

@@ -52,6 +52,12 @@ public class TicketServiceImpl implements ITicketService {
     @Autowired
     private TpannouncementTelMapper tpannouncementTelMapper;
 
+    @Autowired
+    private TaSysUserRoleMapper taSysUserRoleMapper;
+
+    @Autowired
+    private  ToCommunitiesMapper toCommunitiesMapper;
+
     @Override
     public ResponseBean getList(TpTicket tpTicket, Integer pageNum, Integer pageSize) {
 
@@ -238,6 +244,7 @@ public class TicketServiceImpl implements ITicketService {
             // 把该工单的消息变为 已读
             TpMessage tpMessage = new TpMessage();
             tpMessage.setTicketId(ticket.getId());
+            tpMessage.setSource("1");
             tpMessage.setModelType("1");
             tpMessage.setMessageType(ticket.getType());
 
@@ -298,7 +305,32 @@ public class TicketServiceImpl implements ITicketService {
 
 
         // 把工单信息添加到消息表
-        insertTicketMessage(tpTicket, userId);
+//        insertTicketMessage(tpTicket, userId);
+        //1.5版本维护消息推送
+        TpMessage message = new TpMessage();
+        message.setCommunityId(user.getCommunityId());
+        message.setTicketId(tpTicket.getId());
+        message.setModelType("1");
+        message.setMessageType(tpTicket.getType());
+        message.setAdviceType("4");
+        message.setUuidType("2");
+        message.setSource("1");
+        //当前插入为超级管理员
+         Integer uuserID= toCommunitiesMapper.selectAndmin(user.getCommunityId());
+         message.setUuid(uuserID);
+         TaSysUserRole taSysUserRole= taSysUserRoleMapper.selectRole(user.getCommunityId(), userId);
+         String userName = null;
+         if (null != taSysUserRole) {
+             if(1 == taSysUserRole.getRoleId().intValue()){userName="业主"; }
+             if(2 == taSysUserRole.getRoleId().intValue()){userName="家属" ;}
+             if(3 == taSysUserRole.getRoleId().intValue()){userName="租客" ;}
+             message.setMessageContent(userName+user.getUserName()+"发起了一个工单“"+tpTicket.getTicketTitle()+"”，点击受理分配给合适的人处理");
+             message.setStatus("1");
+             message.setReadStatus("0");
+             message.setCreateUser(userId);
+             message.setCreateDate(new Date());
+             tpMessageMapper.insert(message);
+         }
 
         response.addSuccess(tpTicketReco);
         return response;
@@ -380,11 +412,21 @@ public class TicketServiceImpl implements ITicketService {
         ticket.setTicketContent(tpTicket.getTicketContent());
 
         tpTicketMapper.updateByPrimaryKeySelective(ticket);
+        // 维护1.5版本消息
+        Integer messageTicket= tpMessageMapper.selectTicket(ticketId);
+        if (!"".equals(messageTicket)) {
+            TpMessage tpMessage = new TpMessage();
+            tpMessage.setTicketId(ticketId);
+            tpMessage.setMessageContent("工单“" + tpTicket.getTicketTitle() + "”已被分配给您，点击查看并处理");
+            tpMessage.setUpdateDate(new Date());
+            tpMessage.setUpdateUser(userId);
+            tpMessageMapper.updateTickMessage(tpMessage);
+        }
         responseBean.addSuccess("操作成功!");
         return responseBean;
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseBean stopTpTicketRecord(Integer communityId, Integer ticketId, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
@@ -405,6 +447,31 @@ public class TicketServiceImpl implements ITicketService {
             tpTicketRecord.setCreateUser(userId);
             tpTicketRecord.setCreateDate(new Date());
             tpTicketRecordMapper.insertSelective(tpTicketRecord);
+            //1.5版本需求推送消息
+            TpMessage tpMessage= new TpMessage();
+                      tpMessage.setTicketId(ticketId);
+                      tpMessage.setStatus("0");
+                      tpMessage.setUpdateUser(userId);
+                      tpMessage.setUpdateDate(new Date());
+                      tpMessageMapper.updateTickMessage(tpMessage);
+
+            //1.5版本推送消息message
+            TpMessage message = new TpMessage();
+            message.setCommunityId(communityId);
+            message.setModelType("1");
+            TpTicket tic= tpTicketMapper.selectByTicketId(String.valueOf(communityId),Integer.valueOf(ticketId));
+            message.setMessageType(tic.getType());
+            message.setAdviceType("4");
+            message.setUuid(userId);
+            message.setUuidType("2");
+            message.setSource("2");
+            message.setModelType("1");
+            message.setMessageContent("工单“"+tic.getTicketTitle() +"”被住户终止了，点击查看详情");
+            message.setStatus("1");
+            message.setReadStatus("0");
+            message.setCreateUser(userId);
+            message.setCreateDate(new Date());
+            tpMessageMapper.insert(message);
             return responseBean;
         } catch (Exception e) {
             e.printStackTrace();
@@ -487,6 +554,30 @@ public class TicketServiceImpl implements ITicketService {
                 tdImagesMapper.insert(tdImages);
             }
         }
+        //1.5版本推送消息message
+        //工单消息回复最最后一个物业人员
+
+        TpMessage message = new TpMessage();
+        message.setTicketId(ticketId);
+        message.setCommunityId(communityId);
+        message.setModelType("1");
+        message.setMessageType(tpTicket.getType());
+        message.setAdviceType("4");
+        //查询当前工单水处理
+        TpTicket ticket= tpTicketMapper.getTicketTpUserId(ticketId,communityId);
+        //考虑到工单没有分配，物业人员没有追问，只能塞本小区超级管理员ID
+        TpTicketRecordComment recordComment= tpTicketRecordCommentMapper.getUuID(communityId,ticketId);
+        Integer uuserID= toCommunitiesMapper.selectAndmin(communityId);
+        
+        message.setUuid(recordComment==null?uuserID:recordComment.getUuid());
+        message.setUuidType("2");
+        message.setSource("2");
+        message.setMessageContent("工单“"+ tpTicket.getTicketTitle()+"”发起人发来消息："+content+"，点击查看并处理");
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(id);
+        message.setCreateDate(new Date());
+        tpMessageMapper.insert(message);
         response.addSuccess("成功");
         return response;
     }

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

@@ -5,15 +5,10 @@ import com.community.huiju.common.wxpay.HfWxConfig;
 import com.community.huiju.common.wxpay.WXPay;
 import com.community.huiju.common.wxpay.WXPayConstants;
 import com.community.huiju.common.wxpay.WXPayUtil;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.TpBillInvoiceMapper;
-import com.community.huiju.dao.TpBillMapper;
-import com.community.huiju.dao.TpBillStatementMapper;
-import com.community.huiju.model.TaUser;
-import com.community.huiju.model.TpBill;
-import com.community.huiju.model.TpBillInvoice;
-import com.community.huiju.model.TpBillStatement;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.WxPayServiceI;
+import com.google.common.collect.Maps;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +41,11 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	@Autowired
 	private TaUserMapper taUserMapper;
 
+	@Autowired
+	private TaSysRoleMapper taSysRoleMapper;
+
+	@Autowired
+	private TpMessageMapper tpMessageMapper;
 
 	/**
 	 * 微信支付统一下单
@@ -59,9 +59,19 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	public Map<String, String> wxUnifiedOrder(Integer billInvoiceId, UserElement userElement) throws Exception {
 		HfWxConfig config = new HfWxConfig();
 		WXPay wxpay = new WXPay(config);
+
+		Integer userId = userElement.getId();
+
+		// 如果是家属/租客, 应该用业主的用户id
+		TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+		TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
+		if (null != taSysRole && taSysRole.getId().intValue() != 1) {
+			TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
+			userId = ownerUser.getId();
+		}
 		
 		//获取支付金额
-		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userElement.getId(),userElement.getCommunityId());
+		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
 		if (null == tpBillInvoice){
 			throw new Exception("订单不存在");
 		}else if (!tpBillInvoice.getBillStatus().equals("3")){
@@ -120,16 +130,16 @@ public class WxPayServiceImpl implements WxPayServiceI {
 			return "订单状态出错";
 		}
 
-		// 根据 app 用户id, 查询用户
-		TaUser taUser = taUserMapper.selectByPrimaryKey(tpBillInvoice.getTaUserId());
+
+		// 缴费人在准备支付状态下更新, 这里是微信的回调所有没有 token
 
 		// 更新为正在支付状态
-		// 更改收费单的缴费人, 缴费时间, 修改人, 修改时间
+		// 更改收费单的 缴费时间, 修改人, 修改时间
 		tpBillInvoice.setBillStatus("1");
-		tpBillInvoice.setPayName(taUser.getUserName());
 		tpBillInvoice.setPayDate(new Date());
 		tpBillInvoice.setUpdateDate(new Date());
-		// tpBillInvoice.setUpdateUser(taUser.getId());
+		// 缴费方式  0：微信支付  1：线下缴费 2.支付宝支付
+		tpBillInvoice.setPayType(resultMap.get("pay_type"));
 		tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoice);
 
 		//插入流水账单表
@@ -140,7 +150,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		tpBillStatement.setPayPrice(tpBillInvoice.getPayPrice());
 		tpBillStatement.setPayName(tpBillInvoice.getPayName());
 		tpBillStatement.setPayRemark(tpBillInvoice.getBillName());
-		tpBillStatement.setPayType("0");
+		tpBillStatement.setPayType(resultMap.get("pay_type"));
 		tpBillStatement.setCreateTime(new Date());
 		tpBillStatementMapper.insert(tpBillStatement);
 
@@ -159,6 +169,16 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		}
 		tpBillMapper.updateByPrimaryKeySelective(tpBill);
 
+
+		// 把相对应的APP端, 代办消息设置为无效
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("communityId", tpBillInvoice.getCommunityId());
+		map.put("billInvoiceId", tpBillInvoice.getId());
+		map.put("userId", tpBillInvoice.getTaUserId());
+		TpMessage tpMessage = tpMessageMapper.selectBillinvoiceMessage(map);
+		tpMessage.setStatus("0");
+		tpMessageMapper.updateByPrimaryKeySelective(tpMessage);
+
 		return "success";
 	}
 	
@@ -180,15 +200,27 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void wxStartPay(Integer billInvoiceId, UserElement userElement) throws Exception {
+
+		Integer userId = userElement.getId();
+
+		// 如果是家属/租客, 应该用业主的用户id
+		TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+		TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
+		if (null != taSysRole && taSysRole.getId().intValue() != 1) {
+			TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
+			userId = ownerUser.getId();
+		}
+
 		//获取支付金额
-		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userElement.getId(),userElement.getCommunityId());
+		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
 		if (null == tpBillInvoice){
 			throw new Exception("订单不存在");
 		}else if (!tpBillInvoice.getBillStatus().equals("0")){
 			throw new Exception("正在支付的订单");
 		}
+
 		//更新为正在支付状态
-		updateBillInvoiceBillStatus(billInvoiceId,"3");
+		updateBillInvoiceBillStatus(billInvoiceId, taUser.getUserName(),"3");
 	}
 	
 	/**
@@ -200,8 +232,19 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void wxCancelPay(Integer billInvoiceId, UserElement userElement) throws Exception {
+
+		Integer userId = userElement.getId();
+
+		// 如果是家属/租客, 应该用业主的用户id
+		TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+		TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(userId);
+		if (null != taSysRole && taSysRole.getId().intValue() != 1) {
+			TaUser ownerUser = taUserMapper.selectByPrimaryKey(taUser.getParentId());
+			userId = ownerUser.getId();
+		}
+
 		//获取支付金额
-		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userElement.getId(),userElement.getCommunityId());
+		TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByIdAndUserId(billInvoiceId,userId,userElement.getCommunityId());
 		if (null == tpBillInvoice){
 			throw new Exception("订单不存在");
 		}else if (!tpBillInvoice.getBillStatus().equals("3")){
@@ -222,4 +265,18 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		tpBillInvoiceUpdate.setId(billInvoiceId);
 		tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoiceUpdate);
 	}
+
+	/**
+	 * 更新支付状态
+	 * @param billInvoiceId
+	 * @param userName 缴费人
+	 * @param billStatus
+	 */
+	private void updateBillInvoiceBillStatus(Integer billInvoiceId, String userName, String billStatus) {
+		TpBillInvoice tpBillInvoiceUpdate = new TpBillInvoice();
+		tpBillInvoiceUpdate.setBillStatus(billStatus);
+		tpBillInvoiceUpdate.setId(billInvoiceId);
+		tpBillInvoiceUpdate.setPayName(userName);
+		tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoiceUpdate);
+	}
 }

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

@@ -67,4 +67,7 @@ public class TaUserVO {
     /**业主ID**/
     private Integer proprietorID;
 
+    /** 身份证 **/
+    private String idCard;
+
 }

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

@@ -18,4 +18,14 @@ pagehelper:
 # 打印sql
 logging:
   level:
-    com.community.huiju.dao: debug
+    com.community.huiju.dao: debug
+alipay:
+  APP_ID: 2019021463230548
+  APP_PRIVATE_KEY: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCkrvqeBeJNNeKByYSBq8U+V0STFBh70IGaHi2oPa3TiF6u2WAJ7YlH2h1S4Zj2Ezojckfl0m8y/nqpPay6gSMBOpR38A+94gNiH7BVfyecuuQ9z+2BJdOxN5RkEBBkUqeW4oUbrgY4mRLPRrUKvAu/4Brd0eojkkEW0hJUxqgKj+C4H5tR+6DRowHcO23Q/98+4qlSRjhygLVK4m+u8+zb26RxF4v0ogooF+EAZQLOqz3N4uaZs2ajgnecG0drtei7mxbpyqHMr0idP4U4Lx63yXViRNWpHQ7u7byOBQNV9MFHWPHKt+aNOqZ61LCXpJt777usQPzQJggZj6TpRtT3AgMBAAECggEAHM36Sf+PeJ/PMZJU2fV4d5H+DZe7PJTYxmM26zF2oQQ+Q2kEElh45Zdx/5g0D/6G8cJAbyNijdHTFJ0UBD8oJ0Peyie0KStKGjSevCWUgSZzW5ht22QJZfrpuqLQqyuF4q9WRuQmdGnZz2V3rxv7FiGVsWzQ/k3LkrlFuYxRwh7lpJvHC/ed5o1NI4t+w0lBNp3qonJJ8QYsAGWoJR8iP/XrupErrTivRHkyzEos1DsDdPb5TPV21D+YO7FlqTb6/nqqJH6IOjxMI/PlWGRS3l12TeHqv8W2PWIrZvcTGBqMOiHKGt9Y2ZAIelKBGv+lr2G4yaSnWSXec+6V4x3sWQKBgQDv9r26pbBoEtwGd55zAXTr+0A4jwfgUtVm0Z2b/WG857k+iR5hdLX6PHinbgD7sFpRAhoWGNLPa88ZjPDD0JyFwVMEN176k6zEyrBSbbyoCYJeYbWikebdKdiKNE/WFqZGS3Olm3pdHxwD2Q92H61XHLveWRHmYGAlTi66txPh6wKBgQCvsFr8CUt4Y8RU0RGvBLG7JRpRIaVKF34r6YsHZhpAluQ1WAqJEezmYMTfLi81UNYUZHaw7SyG1O+WiEMpWH0Y+qV/z6OUn+37lll7RsIpy9EGLY4L51emCClBmcUIGp80sA2rfF4U8dc23lwIHpLSUWoKOlcQO4gqzLICTLwKJQKBgGjlCvrUAtD7rYKGN5U+RcYCBoiyvVap3u8bIjJWCKty/97+QXGIeyPv2y4VQAjFhjVzHcQbBcv17InWukheoI03fPqS2cnfU96SW5EstxMdVQe83pE6BhkXebiwNVX4gKapxNvXox2hw7VK5R9VqYgy30zK0rBJ4L1t969W6DIRAoGALGSzmNwAZftPsN7jSQY2osNNUxLdYUtuZkotB0GVgJygLZqBjwEoi04IcRyKcT5r2dtI4owLpEZKBA+KaPgjJByxlQoym2uOBvSGx8+pYEZQGu+H5Rof26RUSG9Cijmv4PBbg+l5HHG/n+2v851GHD7WPJ9hQIjKb4YptMsO+MECgYEAyD8rx2Vk2smh5chVkkiw1QMSoV91B+dJ8+B/G0Moxy9Hzp/s4O8mG4B2ByCkcRgkbMTJmNndk5MTd0gjX4C4C3FKf2vbdqFuCKAPzJ0rTs/rLcjz2/g8I7BMvVd/sEh77iewsVLvSLhF2ZRxD9Mc2qfffU4hq8F4WIyLVgvizFU=
+  ALIPAY_PUBLIC_KEY: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJtkEz+TiJR/KbLDeP0rKQTSrQO7g8sGU0G0RYIN3KF6CiWd+eaT/ioM0BpR1Jx+IuAdpo3DFBqhLA6ABSHXFZPRikcxNlsyz2JgkwzfsRY+DxcPnYYNZFK7pUbku8L/AIxZiFQcbunwz36acazaZpun0zgrQlcBZqBCTCIgkT2fMQbPTm/MrmUKjDTE0VP+1mFyjYUVZWpJEYE5AJ3+x7jAPmuEdSMwKONUtOOTByDrkmXJ60RGE8zCmO/oUmOGxnTQRYfNjvBZ0lbVdP/bAw6qHVFBElzPHjNerbMK/geLuiLs3vkDY9tw7A4GQYMnjKuoetuMUhxZ6nRTH6NCeQIDAQAB
+
+# 迎宾系统
+welcome:
+  communityId: 83
+  url: http://xxxxxxxx
+

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

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

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

@@ -131,6 +131,6 @@
     select
     <include refid="Base_Column_List" />
     from ta_sys_menu
-    where community_id = #{communityId,jdbcType=INTEGER}
+    where community_id = #{communityId,jdbcType=INTEGER} and status = 0
   </select>
 </mapper>

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

@@ -93,4 +93,11 @@
     from ta_sys_user_role
     where community_id = #{communityId,jdbcType=INTEGER} and user_id = #{userId,jdbcType=INTEGER}
   </select>
+
+  <select id="selectRole" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ta_sys_user_role
+    where community_id = #{communityId,jdbcType=INTEGER} and user_id = #{userId,jdbcType=INTEGER}
+  </select>
 </mapper>

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

@@ -24,11 +24,12 @@
     <result column="hk_user_id" property="hkUserId" jdbcType="INTEGER" />
     <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
     <result column="face_status" property="faceStatus" jdbcType="CHAR" />
+    <result column="id_card" property="idCard" jdbcType="INTEGER"/>
   </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, verify_status,
-    create_user, create_date, update_user, update_date, hk_person_no, hk_user_id, hk_card_no, face_status
+    create_user, create_date, update_user, update_date, hk_person_no, hk_user_id, hk_card_no, face_status, id_card
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -47,7 +48,7 @@
       status, remark, parent_id,
       accept_agreement_status, verify_status, create_user,
       create_date, update_user, update_date, hk_person_no,
-      hk_user_id, hk_card_no, face_status
+      hk_user_id, hk_card_no, face_status, id_card
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
       #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
@@ -55,7 +56,8 @@
       #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
       #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
-      #{hkPersonNo,jdbcType=BIGINT}, #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
+      #{hkPersonNo,jdbcType=BIGINT}, #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR},
+      #{idCard,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
@@ -127,6 +129,9 @@
       <if test="faceStatus != null" >
         face_status,
       </if>
+      <if test="idCard != null">
+        id_card,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -195,6 +200,9 @@
       <if test="faceStatus != null" >
         #{faceStatus,jdbcType=CHAR},
       </if>
+      <if test="idCard != null">
+        #{idCard,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUser" >
@@ -263,6 +271,9 @@
       <if test="faceStatus != null" >
         face_status = #{faceStatus,jdbcType=CHAR},
       </if>
+      <if test="idCard != null">
+        id_card = #{idCard,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -288,7 +299,8 @@
       hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
       hk_user_id = #{hkUserId,jdbcType=INTEGER},
       hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
-      face_status = #{faceStatus,jdbcType=CHAR}
+      face_status = #{faceStatus,jdbcType=CHAR},
+      id_card = #{idCard,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

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

@@ -136,4 +136,11 @@
       and community_name like concat('%',#{communityName,jdbcType=VARCHAR},'%')
     </if>
   </select>
+
+  <select id="selectAndmin" resultType="int">
+    SELECT u.id  FROM  tp_user u
+    LEFT JOIN to_communities co ON u.login_name = co.login_name
+    WHERE co.id = #{communityId,jdbcType=VARCHAR}
+    AND u.community_id=#{communityId,jdbcType=VARCHAR}
+  </select>
 </mapper>

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

@@ -17,11 +17,12 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="pay_type" property="payType" jdbcType="CHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, bill_id, building_owner_info_id, ta_user_id, bill_invoice_explain, 
     pay_price, bill_statement_id, bill_status, pay_name, pay_date, create_user, create_date, 
-    update_user, update_date
+    update_user, update_date, pay_type
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -38,13 +39,14 @@
       building_owner_info_id, ta_user_id, bill_invoice_explain, 
       pay_price, bill_statement_id, bill_status, 
       pay_name, pay_date, create_user, 
-      create_date, update_user, update_date
+      create_date, update_user, update_date, pay_type
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{billId,jdbcType=INTEGER}, 
       #{buildingOwnerInfoId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, #{billInvoiceExplain,jdbcType=VARCHAR}, 
       #{payPrice,jdbcType=INTEGER}, #{billStatementId,jdbcType=INTEGER}, #{billStatus,jdbcType=CHAR}, 
       #{payName,jdbcType=VARCHAR}, #{payDate,jdbcType=TIMESTAMP}, #{createUser,jdbcType=INTEGER}, 
-      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
+      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
+      #{payType,jdbcType=CHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpBillInvoice" >
@@ -95,6 +97,9 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="payType != null">
+          pay_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -142,6 +147,9 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="payType != null">
+        #{payType,jdbcType=CHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpBillInvoice" >
@@ -189,6 +197,9 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="payType != null">
+        pay_type = #{payType,jdbcType=CHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -207,7 +218,8 @@
       create_user = #{createUser,jdbcType=INTEGER},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
-      update_date = #{updateDate,jdbcType=TIMESTAMP}
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      pay_type = #{payType,jdbcType=CHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -221,7 +233,8 @@
           b.bill_name AS billName,
           b.bill_explain AS billExplain,
           b.end_date AS endDate,
-          b.create_date AS createDate
+          b.create_date AS createDate,
+          i.out_trade_no AS outTradeNo
       FROM
           tp_bill_invoice i
           LEFT JOIN tp_bill b ON b.id = i.bill_id
@@ -252,7 +265,8 @@
         s.pay_name AS payName,
         s.pay_remark AS payRemark,
         s.pay_type AS payType,
-        s.create_time AS createTime
+        s.create_time AS createTime,
+        i.out_trade_no AS outTradeNo
     FROM
         tp_bill_invoice i
         LEFT JOIN tp_bill b ON b.id = i.bill_id

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

@@ -85,8 +85,12 @@
       carousel_num = #{carouselNum,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <select id="getcarouselNum"  parameterType="java.lang.String" resultType="java.lang.Integer">
-    select carousel_num from tp_carousel_setting where  carousel_type=#{lease,jdbcType=VARCHAR}
+  <select id="getcarouselNum"  resultType="java.lang.Integer">
+    select carousel_num
+    from
+    tp_carousel_setting
+    where  carousel_type=#{lease,jdbcType=VARCHAR}
+    and community_id = #{communityId,jdbcType=INTEGER}
   </select>
 
 

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

@@ -124,7 +124,10 @@
         activity_id,
       </if>
       <if test="announcementId != null" >
-        announcement_id,
+      announcement_id,
+    </if>
+      <if test="transactionId != null" >
+        transaction_id
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -183,13 +186,16 @@
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
       <if test="billId != null" >
-        bill_id,
+        #{billId,jdbcType=TIMESTAMP},
       </if>
       <if test="activityId != null" >
-        activity_id,
+        #{activityId,jdbcType=TIMESTAMP},
       </if>
       <if test="announcementId != null" >
-        announcement_id,
+        #{announcementId,jdbcType=TIMESTAMP},
+      </if>
+      <if test="transactionId != null" >
+        #{transactionId,jdbcType=TIMESTAMP},
       </if>
     </trim>
   </insert>
@@ -287,7 +293,7 @@
   <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
+        count( CASE WHEN model_type = 2 AND status = 1 THEN 1 ELSE NULL END ) AS toDoTotal
     FROM
         tp_message
     WHERE
@@ -340,6 +346,7 @@
         AND t.uuid = #{userId,jdbcType=INTEGER}
         AND t.STATUS = 1
         AND t.advice_type = 1
+        AND t.uuid_type = 1
         AND t.model_type = #{modelType,jdbcType=INTEGER}
     ORDER BY
     t.create_date DESC
@@ -365,6 +372,79 @@
     message_type=#{messageType}
     and ticket_id=#{ticketId}
     and model_type=#{modelType}
+    and source=#{source}
+  </select>
+  <update id="updateTickMessage" parameterType="com.community.huiju.model.TpMessage" >
+    update tp_message
+    set
+    <trim suffixOverrides=",">
+      <if test="message.messageContent!= null" >
+        message_content = #{message.messageContent,jdbcType=VARCHAR},
+      </if>
+      <if test="message.updateUser != null" >
+        update_user = #{message.updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="message.updateDate != null" >
+        update_date = #{message.updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="message.status != null" >
+        status = #{message.status,jdbcType=CHAR}
+      </if>
+    </trim>
+    where ticket_id = #{message.ticketId,jdbcType=INTEGER}
+  </update>
+  <select id="selectTicket" resultType="int">
+    select
+    ticket_id
+    from
+    tp_message
+    when ticket_id=#{ticketId}
+  </select>
+  <select id="selectConditionsTpMessage" resultMap="BaseResultMap" parameterType="map">
+    SELECT
+        *
+    FROM
+        tp_message
+    WHERE
+    <trim prefixOverrides="and | or">
+      <if test="map.communityId != null">
+        and community_id = #{map.communityId}
+      </if>
+      <if test="map.messageType != null">
+        and message_type = #{map.messageType}
+      </if>
+      <if test="map.adviceType != null">
+        and advice_type = #{map.adviceType}
+      </if>
+      <if test="map.uuidType != null">
+        and uuid_type = #{map.uuidType}
+      </if>
+      <if test="map.source != null">
+        and source = #{map.source}
+      </if>
+      <if test="map.status != null">
+        and status = #{map.status}
+      </if>
+      <if test="map.transactionId != null">
+        and transaction_id = #{map.transactionId}
+      </if>
+      <if test="map.modelType != null">
+        and model_type = #{map.modelType}
+      </if>
+    </trim>
   </select>
 
+  <select id="selectBillinvoiceMessage" resultMap="BaseResultMap" parameterType="map">
+    select
+    <include refid="Base_Column_List" />
+    from tp_message
+    where
+    community_id = #{map.communityId}
+    and bill_id = #{map.billInvoiceId}
+    and uuid_type = 1
+    and uuid = #{map.userId}
+    and message_type = 7
+    and advice_type = 1
+    and source = 2
+  </select>
 </mapper>

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

@@ -247,13 +247,25 @@
     WHERE
         t.id = #{ticketId,jdbcType=INTEGER}
         AND t.community_id = #{communityId,jdbcType=INTEGER}
-  </select>
+</select>
   <update id="updateTpUserId" parameterType="int" >
     update tp_ticket
     set
       tp_user_id =null
     where id = #{ticketId,jdbcType=INTEGER}
   </update>
-
-
+  <select id="getTicketTpUserId" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from tp_ticket
+    where id = #{ticketId,jdbcType=INTEGER} and community_id= #{communityId,jdbcType=INTEGER}
+  </select>
+  <select id="selectRecordStatus" resultType="int">
+    select
+    create_user
+    from tp_ticket_record
+    where ticket_id = #{ticketId,jdbcType=INTEGER}
+     and community_id= #{communityId,jdbcType=INTEGER}
+     and status = 4
+  </select>
 </mapper>

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

@@ -168,4 +168,16 @@
         AND ticket_id = #{ticketId,jdbcType=INTEGER}
         AND ticket_record_id = #{id,jdbcType=INTEGER}
   </select>
+  <select id="getUuID" resultType="com.community.huiju.model.TpTicketRecordComment">
+    SELECT
+	*
+    FROM
+        tp_ticket_record_comment
+    WHERE user_type=0
+    and ticket_id= #{ticketId,jdbcType=INTEGER}
+    and  community_id = #{communityId,jdbcType=INTEGER}
+    ORDER BY
+	create_date DESC
+    LIMIT 1
+  </select>
 </mapper>

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

@@ -0,0 +1,140 @@
+<?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.TpTransactionLikeMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTransactionLike" >
+    <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_id" property="transactionId" jdbcType="INTEGER" />
+    <result column="like_status" property="likeStatus" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ta_user_id, transaction_id, like_status, create_date, update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_transaction_like
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_transaction_like
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpTransactionLike" >
+    insert into tp_transaction_like (id, community_id, ta_user_id, 
+      transaction_id, like_status, create_date, 
+      update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
+      #{transactionId,jdbcType=INTEGER}, #{likeStatus,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpTransactionLike" >
+    insert into tp_transaction_like
+    <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="transactionId != null" >
+        transaction_id,
+      </if>
+      <if test="likeStatus != null" >
+        like_status,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </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="transactionId != null" >
+        #{transactionId,jdbcType=INTEGER},
+      </if>
+      <if test="likeStatus != null" >
+        #{likeStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransactionLike" >
+    update tp_transaction_like
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="transactionId != null" >
+        transaction_id = #{transactionId,jdbcType=INTEGER},
+      </if>
+      <if test="likeStatus != null" >
+        like_status = #{likeStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </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.TpTransactionLike" >
+    update tp_transaction_like
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      transaction_id = #{transactionId,jdbcType=INTEGER},
+      like_status = #{likeStatus,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="likeCount" resultType="int">
+    SELECT COUNT(transaction_id) FROM
+    tp_transaction_like
+    WHERE like_status = 1
+    and   community_id = #{communityId,jdbcType=INTEGER}
+    and   transaction_id = #{invitationId,jdbcType=INTEGER}
+  </select>
+
+  <select id="nolikeCount"  resultType="int">
+    SELECT COUNT(transaction_id) FROM
+    tp_transaction_like
+    WHERE like_status = 2
+    and   community_id = #{communityId,jdbcType=INTEGER}
+    and   transaction_id = #{invitationId,jdbcType=INTEGER}
+  </select>
+
+  <select id="getinvitationId" resultMap="BaseResultMap">
+    SELECT * FROM
+    tp_transaction_like
+    WHERE community_id = #{communityId,jdbcType=INTEGER}
+    and   ta_user_id = #{userId,jdbcType=INTEGER}
+    and   transaction_id = #{invitationId,jdbcType=INTEGER}
+  </select>
+</mapper>

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

@@ -0,0 +1,150 @@
+<?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.TpTransactionReplyMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTransactionReply" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="transaction_id" property="transactionId" jdbcType="INTEGER" />
+    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+    <result column="ta_user_name" property="taUserName" jdbcType="VARCHAR" />
+    <result column="reply_content" property="replyContent" jdbcType="VARCHAR" />
+    <result column="reply_ta_user_id" property="replyTaUserId" jdbcType="INTEGER" />
+    <result column="reply_ta_user_name" property="replyTaUserName" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, transaction_id, ta_user_id, ta_user_name, reply_content, reply_ta_user_id, 
+    reply_ta_user_name, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_transaction_reply
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_transaction_reply
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpTransactionReply" >
+    insert into tp_transaction_reply (id, community_id, transaction_id, 
+      ta_user_id, ta_user_name, reply_content, 
+      reply_ta_user_id, reply_ta_user_name, create_date
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER}, 
+      #{taUserId,jdbcType=INTEGER}, #{taUserName,jdbcType=VARCHAR}, #{replyContent,jdbcType=VARCHAR}, 
+      #{replyTaUserId,jdbcType=INTEGER}, #{replyTaUserName,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpTransactionReply" >
+    insert into tp_transaction_reply
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="transactionId != null" >
+        transaction_id,
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
+      <if test="taUserName != null" >
+        ta_user_name,
+      </if>
+      <if test="replyContent != null" >
+        reply_content,
+      </if>
+      <if test="replyTaUserId != null" >
+        reply_ta_user_id,
+      </if>
+      <if test="replyTaUserName != null" >
+        reply_ta_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="transactionId != null" >
+        #{transactionId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserName != null" >
+        #{taUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="replyContent != null" >
+        #{replyContent,jdbcType=VARCHAR},
+      </if>
+      <if test="replyTaUserId != null" >
+        #{replyTaUserId,jdbcType=INTEGER},
+      </if>
+      <if test="replyTaUserName != null" >
+        #{replyTaUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransactionReply" >
+    update tp_transaction_reply
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="transactionId != null" >
+        transaction_id = #{transactionId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserName != null" >
+        ta_user_name = #{taUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="replyContent != null" >
+        reply_content = #{replyContent,jdbcType=VARCHAR},
+      </if>
+      <if test="replyTaUserId != null" >
+        reply_ta_user_id = #{replyTaUserId,jdbcType=INTEGER},
+      </if>
+      <if test="replyTaUserName != null" >
+        reply_ta_user_name = #{replyTaUserName,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.TpTransactionReply" >
+    update tp_transaction_reply
+    set community_id = #{communityId,jdbcType=INTEGER},
+      transaction_id = #{transactionId,jdbcType=INTEGER},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      ta_user_name = #{taUserName,jdbcType=VARCHAR},
+      reply_content = #{replyContent,jdbcType=VARCHAR},
+      reply_ta_user_id = #{replyTaUserId,jdbcType=INTEGER},
+      reply_ta_user_name = #{replyTaUserName,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="getCommunityIdAndTransactionId" resultMap="BaseResultMap">
+    select
+      tr.*,
+      (select tsr.role_name from ta_sys_user_role tsur LEFT JOIN ta_sys_role tsr on tsur.role_id = tsr.id where tsur.user_id = tr.ta_user_id) as taRoleName,
+      (select tsr.role_name from ta_sys_user_role tsur LEFT JOIN ta_sys_role tsr on tsur.role_id = tsr.id where tsur.user_id = tr.reply_ta_user_id) as replyRoleName
+    from tp_transaction_reply tr
+    where tr.community_id = #{communityId,jdbcType=INTEGER} and tr.transaction_id = #{transactionId,jdbcType=INTEGER}
+  </select>
+</mapper>

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

@@ -0,0 +1,100 @@
+<?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.TpTransactionReportMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTransactionReport" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="transaction_id" property="transactionId" jdbcType="INTEGER" />
+    <result column="report_reason_id" property="reportReasonId" jdbcType="VARCHAR" />
+    <result column="reporter_id" property="reporterId" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, transaction_id, report_reason_id, reporter_id
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_transaction_report
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_transaction_report
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpTransactionReport" >
+    insert into tp_transaction_report (id, community_id, transaction_id, 
+      report_reason_id, reporter_id)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{transactionId,jdbcType=INTEGER}, 
+      #{reportReasonId,jdbcType=VARCHAR}, #{reporterId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpTransactionReport" >
+    insert into tp_transaction_report
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="transactionId != null" >
+        transaction_id,
+      </if>
+      <if test="reportReasonId != null" >
+        report_reason_id,
+      </if>
+      <if test="reporterId != null" >
+        reporter_id,
+      </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="transactionId != null" >
+        #{transactionId,jdbcType=INTEGER},
+      </if>
+      <if test="reportReasonId != null" >
+        #{reportReasonId,jdbcType=VARCHAR},
+      </if>
+      <if test="reporterId != null" >
+        #{reporterId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransactionReport" >
+    update tp_transaction_report
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="transactionId != null" >
+        transaction_id = #{transactionId,jdbcType=INTEGER},
+      </if>
+      <if test="reportReasonId != null" >
+        report_reason_id = #{reportReasonId,jdbcType=VARCHAR},
+      </if>
+      <if test="reporterId != null" >
+        reporter_id = #{reporterId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpTransactionReport" >
+    update tp_transaction_report
+    set community_id = #{communityId,jdbcType=INTEGER},
+      transaction_id = #{transactionId,jdbcType=INTEGER},
+      report_reason_id = #{reportReasonId,jdbcType=VARCHAR},
+      reporter_id = #{reporterId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectByCommunityIdAndTransactionId" resultMap="BaseResultMap" >
+    select
+     <include refid="Base_Column_List"/>
+     from tp_transaction_report
+     where reporter_id = #{userId, jdbcType=INTEGER} and community_id = #{communityId,jdbcType=INTEGER} and transaction_id = #{transactionId,jdbcType=INTEGER}
+  </select>
+</mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/utils/AccountValidatorUtil.java

@@ -31,8 +31,34 @@ public class AccountValidatorUtil {
         }
 
 
+    /**
+     * 校验座机号
+     * @param phone
+     * @return
+     */
+    public static boolean isLandline(String phone) {
+        String regex = "/^(\\d{3}-)(\\d{8})$|^(\\d{4}-)(\\d{7})$|^(\\d{4}-)(\\d{8})$/";
+            Pattern p = Pattern.compile(regex);
+            Matcher m = p.matcher(phone);
+            boolean isMatch = m.matches();
+            if (!isMatch) {
+                //MToast.showToast("请填入正确的手机号");
+            }
+            return isMatch;
+    }
+
+    /**
+     * 校验是否全为数字
+     * @param str
+     * @return
+     */
+    public static boolean isNumber(String str) {
+        Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
+        return pattern.matcher(str).matches();
+    }
+
     public static void main(String[] args) {
-        System.out.println(isPhone("15871301059"));
+        System.out.println(isNumber("1"));
     }
 
 }

CODE/smart-community/community-common/src/main/java/com/community/commom/utils/DateUtils.java

@@ -274,4 +274,31 @@ public class DateUtils {
         }
         return presentNum;
     }
+
+
+    /**
+     * 计算两个日期之间的天数
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public static Long getDaysBetween(Date startDate, Date endDate) {
+        Calendar fromCalendar = Calendar.getInstance();
+        fromCalendar.setTime(startDate);
+        fromCalendar.set(Calendar.HOUR_OF_DAY, 0);
+        fromCalendar.set(Calendar.MINUTE, 0);
+        fromCalendar.set(Calendar.SECOND, 0);
+        fromCalendar.set(Calendar.MILLISECOND, 0);
+
+        Calendar toCalendar = Calendar.getInstance();
+        toCalendar.setTime(endDate);
+        toCalendar.set(Calendar.HOUR_OF_DAY, 0);
+        toCalendar.set(Calendar.MINUTE, 0);
+        toCalendar.set(Calendar.SECOND, 0);
+        toCalendar.set(Calendar.MILLISECOND, 0);
+
+        return (toCalendar.getTime().getTime() - fromCalendar.getTime().getTime()) / (1000 * 60 * 60 * 24);
+    }
+
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/TaSysMenuMapper.java

@@ -0,0 +1,20 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaSysMenu;
+import com.community.huiju.model.TaSysMenuImg;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TaSysMenuMapper {
+	
+	List<TaSysMenu> getTaSysMenuListByCommunityId();
+	
+	int insertTaSysMenu(TaSysMenu taSysMenu);
+	
+	List<TaSysMenuImg> selectTaSysMenuImgById(@Param("taMenuId") Integer taMenuId);
+	
+	int batchInsertImg(List<TaSysMenuImg> imgList);
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/TaSysMenu.java

@@ -0,0 +1,72 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * APP端菜单页面
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaSysMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+
+    /**
+     * 菜单链接
+     */
+    private String menuUrl;
+
+    /**
+     * 父级菜单ID
+     */
+    private Integer parentId;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 菜单类型 0 H5  1原生开发
+     */
+    private String menuType;
+
+    /**
+     * 状态 0正常 1 是停用 9 删除
+     */
+    private String status;
+
+    /**
+     * face 代表人脸录入  monitor 代表是 公区监控
+     */
+    private String remark;
+
+    /**
+     * 说明
+     */
+    private String explain;
+
+
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/TaSysMenuImg.java

@@ -0,0 +1,30 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * APP端菜单页面
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaSysMenuImg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    
+    private Integer taMenuId;
+    
+    private String menuIconImg;
+    
+}

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

@@ -1,9 +1,12 @@
 package com.community.huiju.service.impl;
 
 import com.community.commom.constant.Constant;
+import com.community.huiju.dao.TaSysMenuMapper;
 import com.community.huiju.dao.ToCommunitiesMapper;
 import com.community.huiju.dao.TpUserCommunityMapper;
 import com.community.huiju.dao.TpUserMapper;
+import com.community.huiju.model.TaSysMenu;
+import com.community.huiju.model.TaSysMenuImg;
 import com.community.huiju.model.ToCommunities;
 import com.community.huiju.model.TpSysMenu;
 import com.community.huiju.model.TpSysRole;
@@ -28,7 +31,7 @@ import java.util.Map;
  * @date 2018-10-31
  */
 @Service("communityService")
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class CommunityServiceImpl implements CommunityServiceI {
 	
 	@Autowired
@@ -40,6 +43,9 @@ public class CommunityServiceImpl implements CommunityServiceI {
 	@Autowired
 	private TpUserCommunityMapper tpUserCommunityMapper;
 	
+	@Autowired
+	private TaSysMenuMapper taSysMenuMapper;
+	
 	/**
 	 * 分页获取小区列表
 	 * @param toCommunities
@@ -79,9 +85,39 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		tpUserMapper.insertSelective(tpUser);
 		//维护此用户的角色
 		addUserAndRole(tpUser.getId(), toCommunities.getId());
+		//维护这个小区的APP端的图标
+		addAppMenu(toCommunities.getId());
 		return size;
 	}
-
+	
+	/**
+	 * 维护这个小区的APP端的菜单和图标
+	 * @param communityId
+	 */
+	private void addAppMenu(Integer communityId) {
+		List<TaSysMenu>  list = taSysMenuMapper.getTaSysMenuListByCommunityId();
+		list.stream().forEach(e -> {
+			//插入APP菜单
+			TaSysMenu taSysMenu = new TaSysMenu();
+			taSysMenu.setCommunityId(communityId);
+			taSysMenu.setExplain(e.getExplain());
+			taSysMenu.setMenuName(e.getMenuName());
+			taSysMenu.setMenuType(e.getMenuType());
+			taSysMenu.setMenuUrl(e.getMenuUrl());
+			taSysMenu.setRemark(e.getRemark());
+			taSysMenu.setSort(e.getSort());
+			taSysMenu.setStatus("0");
+			taSysMenuMapper.insertTaSysMenu(taSysMenu);
+			//插入图标
+			List<TaSysMenuImg> imgList =  taSysMenuMapper.selectTaSysMenuImgById(e.getId());
+			imgList.stream().forEach(img -> {
+				img.setTaMenuId(taSysMenu.getId());
+			});
+			taSysMenuMapper.batchInsertImg(imgList);
+		});
+		
+	}
+	
 	/**
 	 * 维护住户端用户与社区关系表
 	 * @param tpUserId

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

@@ -15,7 +15,9 @@ import com.community.huiju.vo.ToBannerVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
+import org.apache.commons.httpclient.HttpState;
 import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpStatus;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -190,7 +192,7 @@ public class ToBannerServiceImpl implements IToBannerService {
 
     @Override
     public ResponseBean getBanner(ToBanner banner,Integer pageNum, Integer pageSize) {
-
+        
         ResponseBean response = new ResponseBean();
 
         Page<ToBanner> page = PageHelper.startPage(pageNum,pageSize);

CODE/smart-community/operate-api/src/main/resources/mapper/TaSysMenuMapper.xml

@@ -0,0 +1,48 @@
+<?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.TaSysMenuMapper">
+
+    <select id="getTaSysMenuListByCommunityId" resultType="com.community.huiju.model.TaSysMenu">
+        SELECT
+            t.id,
+            t.community_id AS communityId,
+            t.menu_url AS menuUrl,
+            t.menu_name AS menuName,
+            t.parent_id AS paremtId,
+            t.sort,
+            t.menu_type AS menuType,
+            t.`status`,
+            t.remark,
+            t.`explain`
+        FROM
+            ta_sys_menu t
+        WHERE
+            community_id = '-1'
+    </select>
+
+    <insert id="insertTaSysMenu" parameterType="com.community.huiju.model.TaSysMenu" useGeneratedKeys="true" keyProperty="id">
+        insert into ta_sys_menu (community_id, menu_url, menu_name, sort, menu_type,  `status`, remark, `explain`)
+    values (#{communityId,jdbcType=INTEGER}, #{menuUrl,jdbcType=VARCHAR},
+      #{menuName,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{menuType,jdbcType=VARCHAR},
+      #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{explain,jdbcType=VARCHAR})
+    </insert>
+
+    <select id="selectTaSysMenuImgById" resultType="com.community.huiju.model.TaSysMenuImg">
+        SELECT
+            id,
+            ta_menu_id as taMenuId,
+            menu_icon_img as menuIconImg
+        FROM
+            ta_sys_menu_img
+        WHERE
+            ta_menu_id = #{taMenuId,jdbcType=INTEGER}
+    </select>
+
+    <insert id="batchInsertImg" parameterType="list" >
+        insert into ta_sys_menu_img (ta_menu_id, menu_icon_img)
+        values
+        <foreach collection="list" item="item" index="index" separator="," >
+            (#{item.taMenuId,jdbcType=VARCHAR}, #{item.menuIconImg,jdbcType=VARCHAR})
+        </foreach>
+    </insert>
+</mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/AnnouncementTelController.java

@@ -0,0 +1,200 @@
+package com.community.huiju.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.commom.utils.AccountValidatorUtil;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.AnnouncementTel;
+import com.community.huiju.model.Bill;
+import com.community.huiju.service.IAnnouncementTelService;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 物业号码表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@RestController
+@RequestMapping("/")
+@RefreshScope
+@Api(value = "物业端号码 API", description = "物业端号码 API")
+public class AnnouncementTelController extends BaseController {
+	
+	@Autowired
+	private IAnnouncementTelService announcementTelService;
+	
+	@ApiOperation(value = "根据搜索条件获取物业端号码", notes = "根据搜索条件获取物业端号码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "name", value = "名称（模糊查询）"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "tel", value = "号码（模糊查询）"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "remark", value = "备注（模糊查询）"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tels",method = RequestMethod.GET)
+	public ResponseBean getList(@RequestParam(value = "name", required = false) String name,
+	                            @RequestParam(value = "tel", required = false) String tel,
+	                            @RequestParam(value = "remark", required = false) String remark,
+	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		AnnouncementTel announcementTel = new AnnouncementTel();
+		announcementTel.setCommunityId(userElement.getCommunityId());
+		announcementTel.setName(name);
+		announcementTel.setTel(tel);
+		announcementTel.setRemark(remark);
+		responseBean = announcementTelService.getTelList(announcementTel,pageNum,pageSize);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "添加物业端号码", notes = "添加物业端号码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(dataTypeClass = String.class, paramType = "AnnouncementTel", name = "announcementTel", value = "电话号码实体类"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tel/add",method = RequestMethod.POST)
+	public ResponseBean addTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		boolean isPhone = true;
+		boolean isLandline = true;
+//		if (!AccountValidatorUtil.isLandline(announcementTel.getTel())){
+//			isLandline = false;
+//		}
+//		if (!AccountValidatorUtil.isPhone(announcementTel.getTel())){
+//			isPhone = false;
+//		}
+//		if (isPhone == false && isLandline == false) {
+//			responseBean.addError("输入的号码不正确!");
+//			return responseBean;
+//		}
+		if (!AccountValidatorUtil.isNumber(announcementTel.getTel())) {
+			responseBean.addError("输入的号码不正确!");
+			return responseBean;
+		}
+		UserElement userElement = getUserElement(session);
+		QueryWrapper<AnnouncementTel> announcementTelQueryWrapper = new QueryWrapper<>();
+		announcementTelQueryWrapper.eq("tel", announcementTel.getTel());
+		announcementTelQueryWrapper.eq("community_id", userElement.getCommunityId());
+		AnnouncementTel telServiceOne = announcementTelService.getOne(announcementTelQueryWrapper);
+		if (null != telServiceOne) {
+			responseBean.addError("此号码已存在");
+			return responseBean;
+		}
+		LocalDateTime time = LocalDateTime.now();
+		announcementTel.setCommunityId(userElement.getCommunityId());
+		announcementTel.setCreateUser(userElement.getId());
+		announcementTel.setUpdateUser(userElement.getId());
+		announcementTel.setCreateDate(time);
+		announcementTel.setUpdateDate(time);
+		boolean state = announcementTelService.save(announcementTel);
+		if (state){
+			responseBean.addSuccess("添加物业端号码成功");
+			return responseBean;
+		}
+		responseBean.addError("添加物业端号码失败");
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "根据ID修改物业端号码", notes = "根据ID修改物业端号码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "AnnouncementTel", name = "announcementTel", value = "电话号码实体类"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tel/update", method = RequestMethod.PUT)
+	public ResponseBean updateTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		boolean isPhone = true;
+		boolean isLandline = true;
+//		if (!AccountValidatorUtil.isLandline(announcementTel.getTel())){
+//			isLandline = false;
+//		}
+//		if (!AccountValidatorUtil.isPhone(announcementTel.getTel())){
+//			isPhone = false;
+//		}
+//		if (isPhone == false && isLandline == false) {
+//			responseBean.addError("输入的号码不正确!");
+//			return responseBean;
+//		}
+		if (!AccountValidatorUtil.isNumber(announcementTel.getTel())) {
+			responseBean.addError("输入的号码不正确!");
+			return responseBean;
+		}
+		UserElement userElement = getUserElement(session);
+		QueryWrapper<AnnouncementTel> announcementTelQueryWrapper = new QueryWrapper<>();
+		announcementTelQueryWrapper.eq("tel", announcementTel.getTel());
+		announcementTelQueryWrapper.eq("community_id", userElement.getCommunityId());
+		AnnouncementTel telServiceOne = announcementTelService.getOne(announcementTelQueryWrapper);
+		if (null != telServiceOne && announcementTel.getTel().equals(telServiceOne.getTel()) && announcementTel.getId().equals(telServiceOne.getId())) {
+			responseBean.addSuccess("修改物业端号码成功");
+			return responseBean;
+		}
+		if (null != telServiceOne) {
+			responseBean.addError("此号码已存在");
+			return responseBean;
+		}
+		announcementTel.setUpdateUser(userElement.getId());
+		announcementTel.setUpdateDate(LocalDateTime.now());
+		boolean state = announcementTelService.updateById(announcementTel);
+		if (state){
+			responseBean.addSuccess("修改物业端号码成功");
+			return responseBean;
+		}
+		responseBean.addError("修改物业端号码失败");
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取Id获取物业端号码详情", notes = "获取Id获取物业端号码详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "Path", dataType = "integer", name = "id", value = "主键Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tel/{id}",method = RequestMethod.GET)
+	public ResponseBean getNoticeById(@PathVariable(value ="id") Integer id, HttpServletRequest request){
+		ResponseBean responseBean = new ResponseBean();
+		AnnouncementTel announcementTel = announcementTelService.getById(id);
+		responseBean.addSuccess(announcementTel);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "根据ID批量删除物业端号码", notes = "根据ID批量删除物业端号码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "integer", name = "ids", value = "主键Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tel/delete", method = RequestMethod.POST)
+	public ResponseBean deleteNotice(@RequestBody List<Integer> ids, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		boolean state = announcementTelService.removeByIds(ids);
+		if (state){
+			responseBean.addSuccess("删除物业端号码成功");
+			return responseBean;
+		}
+		responseBean.addError("删除物业端号码失败");
+		return responseBean;
+	}
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BillController.java

@@ -80,9 +80,9 @@ public class BillController extends BaseController {
 
     @ApiOperation(value = "上传缴费项接口, 预览", notes = "上传缴费项接口, 预览")
     @PostMapping(value = "/bill/uploadExcel/get", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-    public ResponseBean getUploadExcel(@RequestParam("file") MultipartFile file, @RequestParam("billExplain") String billExplain) {
+    public ResponseBean getUploadExcel(@RequestParam("file") MultipartFile file) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBillService.getExcelData(file, billExplain);
+        responseBean = iBillService.getExcelData(file);
         return responseBean;
     }
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BillInvoiceController.java

@@ -6,12 +6,14 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.utils.PayPriceUtils;
 import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.BillInvoice;
 import com.community.huiju.service.IBillInvoiceService;
 import com.community.huiju.service.IBillService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -168,6 +170,32 @@ public class BillInvoiceController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "根据缴费单id, 修改收费说明", notes = "根据缴费单id, 修改收费说明")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billInvoiceExplain收费说明"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/bill/invoice/updateBillInvoiceIdBillInvoiceExplain/{billId}", method = RequestMethod.POST)
+    public ResponseBean updateBillInvoiceIdBillInvoiceExplain(HttpSession session,@PathVariable Integer billId, @RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        String billInvoiceExplain = JSONObject.parseObject(parameter).getString("billInvoiceExplain");
+        if (StringUtils.isBlank(billInvoiceExplain)) {
+            responseBean.addError("收费说明不能为空!");
+            return responseBean;
+        }
+        BillInvoice billInvoice = iBillInvoiceService.getById(billId);
+        billInvoice.setBillInvoiceExplain(billInvoiceExplain);
+        boolean b = iBillInvoiceService.updateById(billInvoice);
+        if (b) {
+            responseBean.addSuccess("操作成功!");
+            return responseBean;
+        }
+        responseBean.addError("操作失败!");
+        return responseBean;
+    }
+
 
     @ApiOperation(value = "导出Excel", notes = "导出Excel")
     @ApiImplicitParams({

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/CarouselSettingController.java

@@ -0,0 +1,135 @@
+package com.community.huiju.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TpCarouselSetting;
+import com.community.huiju.service.ICarouselSettingService;
+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.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * 轮播数设置表 前端控制器
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-06
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "轮播数设置表 API", description = "轮播数设置表 API")
+public class CarouselSettingController extends BaseController {
+
+    @Autowired
+    private ICarouselSettingService iCarouselSettingService;
+
+    @ApiOperation(value = "添加/修改公告的Banner数量", notes = "添加/修改公告的Banner数量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "parameter", value = "carouselNum数量值")
+    })
+    @RequestMapping(value = "/carousel/announcement/banner", method = RequestMethod.PUT)
+    public ResponseBean updateAnnouncementBanner(@RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        QueryWrapper<TpCarouselSetting> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("community_id", userElement.getCommunityId());
+        queryWrapper.eq("carousel_type","announcement");
+        TpCarouselSetting one = iCarouselSettingService.getOne(queryWrapper);
+        Integer carouselNum = JSONObject.parseObject(parameter).getInteger("carouselNum");
+        boolean b = false;
+        // 修改
+        if (null != one) {
+            one.setCarouselNum(carouselNum);
+            b = iCarouselSettingService.updateById(one);
+        } else {
+            one = new TpCarouselSetting();
+            one.setCarouselNum(carouselNum);
+            one.setCarouselType("announcement");
+            one.setCommunityId(userElement.getCommunityId());
+            // 添加
+            b = iCarouselSettingService.save(one);
+
+        }
+
+        if (b) {
+            responseBean.addSuccess("操作成功!");
+            return responseBean;
+        }
+        responseBean.addError("操作失败!");
+        return responseBean;
+    }
+
+    @ApiOperation(value = "添加/修改活动的Banner数量", notes = "添加/修改活动的Banner数量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "parameter", value = "carouselNum数量值")
+    })
+    @RequestMapping(value = "/carousel/activity/banner", method = RequestMethod.PUT)
+    public ResponseBean updateActivityBanner(@RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        QueryWrapper<TpCarouselSetting> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("community_id", userElement.getCommunityId());
+        queryWrapper.eq("carousel_type","activity");
+        TpCarouselSetting one = iCarouselSettingService.getOne(queryWrapper);
+        Integer carouselNum = JSONObject.parseObject(parameter).getInteger("carouselNum");
+        boolean b = false;
+        if (null != one) {
+            one.setCarouselNum(carouselNum);
+            b = iCarouselSettingService.updateById(one);
+        } else {
+            one = new TpCarouselSetting();
+            one.setCarouselType("activity");
+            one.setCommunityId(userElement.getCommunityId());
+            one.setCarouselNum(carouselNum);
+            b = iCarouselSettingService.save(one);
+        }
+
+
+        if (b) {
+            responseBean.addSuccess("操作成功!");
+            return responseBean;
+        }
+        responseBean.addError("操作失败!");
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取Banner数量", notes = "获取Banner数量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+    })
+    @RequestMapping(value = "/carousel/getBanner", method = RequestMethod.GET)
+    public ResponseBean getBannerNum(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        QueryWrapper<TpCarouselSetting> activityQueryWrapper = new QueryWrapper<>();
+        activityQueryWrapper.eq("community_id", userElement.getCommunityId());
+        activityQueryWrapper.eq("carousel_type","activity");
+        TpCarouselSetting activityOne = iCarouselSettingService.getOne(activityQueryWrapper);
+
+        QueryWrapper<TpCarouselSetting> announcementQueryWrapper = new QueryWrapper<>();
+        announcementQueryWrapper.eq("community_id", userElement.getCommunityId());
+        announcementQueryWrapper.eq("carousel_type","announcement");
+        TpCarouselSetting announcementOne = iCarouselSettingService.getOne(announcementQueryWrapper);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("activity", activityOne);
+        map.put("announcement", announcementOne);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+}

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

@@ -0,0 +1,73 @@
+package com.community.huiju.controller;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.IMessageService;
+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.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 com.community.huiju.common.base.BaseController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 物业端消息表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "消息通知API", description = "消息通知API")
+public class MessageController extends BaseController {
+
+    @Autowired
+    private IMessageService messageService;
+    @ApiOperation(value = "消息待办", notes = "消息待办")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "messageType:待办消息类型(-1:论坛，-2:工单，-3:缴费),status:(0:无效，1:有效)，createDate：时间，messageContent:内容 ")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/messageLiset", method = RequestMethod.POST)
+    public ResponseBean messageLiset(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = messageService.messageLiset(parameter,userElement.getCommunityId(),userElement.getId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "我的消息", notes = "我的消息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "messageType:消息类型(-1:论坛，-2:工单，-3:缴费),readStatus:(0:未读，1:已读)，createDate：时间，messageContent:内容 ")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/myMessageList", method = RequestMethod.POST)
+    public ResponseBean myMessageList(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = messageService.myMessageList(parameter,userElement.getCommunityId(),userElement.getId());
+        return responseBean;
+    }
+
+    @ApiOperation(value = "消息已读", notes = "消息已读")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:(多个) ")
+    })
+    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    @RequestMapping(value = "/delectRead", method = RequestMethod.POST)
+    public ResponseBean delectRead(@RequestBody String parameter, HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean  responseBean = messageService.delectRead(parameter,userElement.getId());
+        return responseBean;
+    }
+}
+
+

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/SysMenuController.java

@@ -1,6 +1,8 @@
 package com.community.huiju.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
@@ -12,6 +14,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.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -19,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpSession;
+import java.util.List;
 
 /**
  * <p>

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TaSysMenuController.java

@@ -0,0 +1,95 @@
+package com.community.huiju.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TaSysMenu;
+import com.community.huiju.service.ITaSysMenuService;
+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.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;
+
+import javax.servlet.http.HttpSession;
+import java.util.List;
+
+/**
+ * <p>
+ * APP端菜单页面 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "APP菜单 API", description = "APP菜单 API")
+public class TaSysMenuController extends BaseController {
+	
+	@Autowired
+	private ITaSysMenuService taSysMenuService;
+	
+	@ApiOperation(value = "获取菜单列表", notes = "获取菜单列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+	})
+	@RequestMapping(value = "/ta/menu/list",method = RequestMethod.GET)
+	public ResponseBean getList(HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = taSysMenuService.getList(userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "启用菜单", notes = "启用菜单")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "编号id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+	})
+	@RequestMapping(value = "/ta/menu/enable/{id}",method = RequestMethod.POST)
+	public ResponseBean enableMenu(@PathVariable(value = "id") Integer id, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TaSysMenu sysMenu = new TaSysMenu();
+		sysMenu.setId(id);
+		sysMenu.setStatus("0");
+		boolean stste = taSysMenuService.updateById(sysMenu);
+		if (stste){
+			responseBean.addSuccess("启用成功");
+			return responseBean;
+		}
+		responseBean.addSuccess("启用失败");
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "停用菜单", notes = "停用菜单")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "编号id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+	})
+	@RequestMapping(value = "/ta/menu/disable/{id}",method = RequestMethod.POST)
+	public ResponseBean disableMenu(@PathVariable(value = "id") Integer id,HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TaSysMenu sysMenu = new TaSysMenu();
+		sysMenu.setId(id);
+		sysMenu.setStatus("1");
+		boolean stste = taSysMenuService.updateById(sysMenu);
+		if (stste){
+			responseBean.addSuccess("停用成功");
+			return responseBean;
+		}
+		responseBean.addSuccess("停用失败");
+		return responseBean;
+	}
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/AnnouncementTelMapper.java

@@ -0,0 +1,27 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.AnnouncementTel;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物业号码表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+public interface AnnouncementTelMapper extends BaseMapper<AnnouncementTel> {
+	
+	/**
+	 * 分页获取电话号码
+	 * @param page
+	 * @param announcementTel
+	 * @return
+	 */
+	List<AnnouncementTel> selectListByParams(Page page,@Param("announcementTel") AnnouncementTel announcementTel);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java

@@ -0,0 +1,67 @@
+package com.community.huiju.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.Message;
+import com.community.huiju.model.TpTicket;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物业web端用户表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-18
+ */
+@Mapper
+public interface MessageMapper extends BaseMapper<Message> {
+    /**
+     * 消息待办
+     * @param page
+     * @param messageType
+     * @param status
+     * @param createDate
+     * @param messageContent
+     * @param uuid
+     * @return
+     */
+    IPage<Message> messageLiset(Page page, @Param("messageType")String messageType, @Param("status")String status, @Param("createDate") Date createDate, @Param("messageContent")String messageContent,@Param("uuid") Integer uuid);
+
+    /**
+     * 公告消息推送
+     * @param message
+     */
+    void updateMessage(@Param(value = "message") Message message);
+
+    /**
+     * 工单消息推送
+     * @param message
+     */
+    void updateTicketMessage(Message message);
+
+    /**
+     * 关于我的消息
+     * @param page
+     * @param messageType
+     * @param readStatus
+     * @param createDate
+     * @param messageContent
+     * @param uuid
+     * @return
+     */
+    IPage<Message> myMessageList(Page<Message> page, @Param("messageType") String messageType, @Param("readStatus")String readStatus, @Param("createDate")Date createDate, @Param("messageContent")String messageContent, @Param("uuid")Integer uuid);
+
+    /**
+     * 工单分配后改变message的状态
+     * @param ticketId
+     */
+    void updateTickMessageStatus(@Param("ticketId") Integer ticketId);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaSysMenuMapper.java

@@ -0,0 +1,27 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaSysMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * APP端菜单页面 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+@Mapper
+public interface TaSysMenuMapper extends BaseMapper<TaSysMenu> {
+
+    /**
+     * 根据小区查询出APP菜单列表
+     * @param communityId
+     * @return
+     */
+    List<TaSysMenu> selectList(Integer communityId);
+
+}

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

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpCarouselSetting;
+
+/**
+ * <p>
+ * 轮播数设置表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-06
+ */
+public interface TpCarouselSettingMapper extends BaseMapper<TpCarouselSetting> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/AnnouncementTel.java

@@ -0,0 +1,77 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 物业号码表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_announcement_tel")
+public class AnnouncementTel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 电话名称
+     */
+    @NotBlank(message = "请输入名称")
+    private String name;
+
+    @NotBlank(message = "请输入号码")
+    private String tel;
+
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+    
+    /**
+     * 更新人
+     */
+    @TableField(exist = false)
+    private String updateName;
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/BillInvoice.java

@@ -67,7 +67,10 @@ public class BillInvoice implements Serializable {
     private Integer billStatementId;
 
     /**
-     * 缴费状态  0：未缴费  1：已线上缴费 2：已线下缴费
+     * 遗弃: 缴费状态  0：未缴费  1：已线上缴费 2：已线下缴费
+     *
+     * 缴费状态  0：未缴费  1: 已缴费 3: 正在支付中
+     *
      */
     private String billStatus;
 
@@ -111,6 +114,11 @@ public class BillInvoice implements Serializable {
      */
     private String outTradeNo;
 
+    /**
+     * 缴费方式  0：微信支付  1：线下缴费
+     */
+    private String payType;
+
     /**
      * 业主姓名
      */
@@ -151,7 +159,7 @@ public class BillInvoice implements Serializable {
      * 流水账单编号
      */
     @TableField(exist = false)
-    private Integer billStatement;
+    private String billStatement;
 
     /**
      * 创建人姓名

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/Message.java

@@ -0,0 +1,132 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 物业端消息表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_message")
+public class Message implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    /**
+     * 工单id 非工单不填
+     */
+    private Integer ticketId;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 消息类型  1：投诉   2：报修 3：联系物业  4： 访客  5:公告  6:系统通知  7:账单 8:活动
+     */
+    private String messageType;
+
+    /**
+     * 通知方式  1 是app内通知  2是短信通知 3 是通知栏消息  4 是 web端消息
+     */
+    private String adviceType;
+
+    /**
+     * 模板类型 1 是消息模板 2是待办模板
+     */
+    private String modelType;
+
+    /**
+     * 接收人id
+     */
+    private Integer uuid;
+
+    /**
+     * 接收人id的类型  1是app用户 2是物业端用户
+     */
+    private String uuidType;
+
+    /**
+     * 来源 1 是app端  2是物业端
+     */
+    private String source;
+
+    /**
+     * 消息内容
+     */
+    private String messageContent;
+
+    /**
+     * 状态 1 是有效 0是无效
+     */
+    private String status;
+
+    /**
+     * 推送结果
+     */
+    private String result;
+
+    /**
+     * 事件类型表的id 预留字段
+     */
+    private String meaasgeTypeId;
+
+    /**
+     * 阅读状态 0 是未读  1是已读
+     */
+    private String readStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 缴费项ID
+     */
+    private Integer billId;
+
+    /**
+     * 活动Id
+     */
+    private Integer activityId;
+
+    /**
+     * 公告Id
+     */
+    private Integer announcementId;
+
+    /**
+     *二手租赁Id
+     */
+    private Integer transactionId;
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TaSysMenu.java

@@ -0,0 +1,72 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * APP端菜单页面
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaSysMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+
+    /**
+     * 菜单链接
+     */
+    private String menuUrl;
+
+    /**
+     * 父级菜单ID
+     */
+    private Integer parentId;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 菜单类型 0 H5  1原生开发
+     */
+    private String menuType;
+
+    /**
+     * 状态 0正常 1 是停用 9 删除
+     */
+    private String status;
+
+    /**
+     * face 代表人脸录入  monitor 代表是 公区监控
+     */
+    private String remark;
+
+    /**
+     * 说明
+     */
+    private String explain;
+
+
+}

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

@@ -0,0 +1,47 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 轮播数设置表
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_carousel_setting")
+public class TpCarouselSetting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 轮播类型： announcement 表示公告  activity 表示活动  banner表示运营banner
+     */
+    private String carouselType;
+
+    /**
+     * 轮播数量
+     */
+    private Integer carouselNum;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IAnnouncementTelService.java

@@ -0,0 +1,27 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.AnnouncementTel;
+
+/**
+ * <p>
+ * 物业号码表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+public interface IAnnouncementTelService extends IService<AnnouncementTel> {
+	
+	/**
+	 *
+	 * 获取物业号码列表
+	 * @param announcementTel
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	ResponseBean getTelList(AnnouncementTel announcementTel, Integer pageNum, Integer pageSize);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBillService.java

@@ -49,7 +49,7 @@ public interface IBillService extends IService<Bill> {
 	 * @param file
 	 * @return
 	 */
-    ResponseBean getExcelData(MultipartFile file, String billExplain);
+    ResponseBean getExcelData(MultipartFile file);
 
 	/**
 	 * 上传excel, 解析 入库

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ICarouselSettingService.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpCarouselSetting;
+
+/**
+ * <p>
+ * 轮播数设置表 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-06
+ */
+public interface ICarouselSettingService extends IService<TpCarouselSetting> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IMessageService.java

@@ -0,0 +1,40 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.Message;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 物业端消息表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+public interface IMessageService extends IService<Message> {
+    /**
+     * 查询消息待办列表
+     * @param parameter
+     * @param communityId
+     * @return
+     */
+    ResponseBean messageLiset(String parameter, Integer communityId,Integer userID);
+
+    /**
+     * 查询关于我的所有消息
+     * @param parameter
+     * @param communityId
+     * @param id
+     * @return
+     */
+    ResponseBean myMessageList(String parameter, Integer communityId, Integer id);
+
+    /**
+     * 批量删除（已读）
+     * @param parameter
+     * @param id
+     * @return
+     */
+    ResponseBean delectRead(String parameter, Integer id);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITaSysMenuService.java

@@ -0,0 +1,25 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaSysMenu;
+
+/**
+ * <p>
+ * APP端菜单页面 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+public interface ITaSysMenuService extends IService<TaSysMenu> {
+
+    /**
+     * 获取数据列表
+     * @param userElement
+     * @return
+     */
+    ResponseBean getList(UserElement userElement);
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/AnnouncementTelServiceImpl.java

@@ -0,0 +1,52 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.AnnouncementTel;
+import com.community.huiju.dao.AnnouncementTelMapper;
+import com.community.huiju.model.Bill;
+import com.community.huiju.service.IAnnouncementTelService;
+import com.google.common.collect.Maps;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物业号码表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@Service
+public class AnnouncementTelServiceImpl extends ServiceImpl<AnnouncementTelMapper, AnnouncementTel> implements IAnnouncementTelService {
+	
+	@Autowired
+	private AnnouncementTelMapper announcementTelMapper;
+	
+	/**
+	 * 获取物业号码列表
+	 *
+	 * @param announcementTel
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	@Override
+	public ResponseBean getTelList(AnnouncementTel announcementTel, Integer pageNum, Integer pageSize) {
+		ResponseBean responseBean = new ResponseBean();
+		Page page = new Page(pageNum,pageSize);
+		// 分页查询
+		List<AnnouncementTel> list = announcementTelMapper.selectListByParams(page,announcementTel);
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("list",list);
+		map.put("total",page.getTotal());
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillInvoiceServiceImpl.java

@@ -12,6 +12,7 @@ import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.*;
 import com.community.huiju.service.IBillInvoiceService;
+import com.community.huiju.service.IMessageService;
 import com.google.common.collect.Maps;
 import org.apache.poi.hssf.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -55,6 +57,9 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private IMessageService iMessageService;
+
     @Override
     public ResponseBean getBillList(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
@@ -160,7 +165,8 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
                 throw new WisdomException("费用已缴，无法更改");
             }
 
-            billInvoice.setBillStatus("2");
+            billInvoice.setBillStatus("1");
+            billInvoice.setPayType("1");
             int rows = billInvoiceMapper.updateById(billInvoice);
             if (rows > 0) {
                 TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(billInvoice.getBuildingOwnerInfoId());
@@ -195,6 +201,20 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
                 }
                 billMapper.updateById(bill);
 
+                // 把相对应的 APP端用户的代办消息进行设置为无效
+                QueryWrapper<Message> messageQueryWrapper = new QueryWrapper<>();
+                messageQueryWrapper.eq("community_id", userElement.getCommunityId());
+                messageQueryWrapper.eq("bill_id", billInvoice.getId());
+                messageQueryWrapper.eq("uuid_type", "1");
+                messageQueryWrapper.eq("uuid", billInvoice.getTaUserId());
+                messageQueryWrapper.eq("message_type", "7");
+                messageQueryWrapper.eq("advice_type", "1");
+                messageQueryWrapper.eq("source", "2");
+
+                Message one = iMessageService.getOne(messageQueryWrapper);
+                one.setStatus("0");
+                iMessageService.updateById(one);
+
             }
         });
 
@@ -296,6 +316,31 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         if (b == false) {
             throw new WisdomException("操作失败");
         }
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+        List<Message> messageList = billInvoices.stream().map(e -> {
+
+            // 往APP端用户上面的每一个用户推送
+            Message messageModelAPP = new Message();
+            messageModelAPP.setCommunityId(userElement.getCommunityId());
+            messageModelAPP.setMessageType("7");
+            messageModelAPP.setAdviceType("1");
+            messageModelAPP.setModelType("2");
+            messageModelAPP.setUuid(e.getTaUserId());
+            messageModelAPP.setUuidType("1");
+            // 消息是物业端 发过来的, 就是 2
+            messageModelAPP.setSource("2");
+            messageModelAPP.setMessageContent("您有待缴费的账单，点击查看并缴费 " + dateFormat.format(new Date()) + bill.getBillName());
+            messageModelAPP.setStatus("1");
+            messageModelAPP.setCreateDate(LocalDateTime.now());
+            messageModelAPP.setCreateUser(userElement.getId());
+            messageModelAPP.setBillId(e.getId());
+
+            return messageModelAPP;
+        }).collect(Collectors.toList());
+
+        iMessageService.saveBatch(messageList);
+
         responseBean.addSuccess("操作成功");
         return responseBean;
     }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.commom.utils.DateUtils;
 import com.community.commom.utils.PayPriceUtils;
 import com.community.huiju.dao.*;
 import com.community.huiju.exception.WisdomException;
@@ -15,6 +16,7 @@ import com.community.huiju.model.*;
 import com.community.huiju.service.IBillInvoiceService;
 import com.community.huiju.service.IBillService;
 import com.community.huiju.service.IBuildingOwnerInfoService;
+import com.community.huiju.service.IMessageService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.zxing.common.detector.MathUtils;
@@ -35,6 +37,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.*;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -82,6 +85,12 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     @Autowired
     private IBuildingOwnerInfoService iBuildingOwnerInfoService;
 
+    @Autowired
+    private MessageMapper messageMapper;
+
+    @Autowired
+    private IMessageService iMessageService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean updateBillNameAndBillExplainAndEndDate(UserElement userElement, String parameter) {
@@ -143,7 +152,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean getExcelData(MultipartFile file, String billExplain) {
+    public ResponseBean getExcelData(MultipartFile file) {
         ResponseBean responseBean = new ResponseBean();
         if (file == null) {
             responseBean.addError("对象不能为空");
@@ -152,9 +161,6 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
         responseBean = getExcelData(file, responseBean);
         List<TempBill> tempBills = (List<TempBill>) responseBean.getData();
-        tempBills.forEach(e -> {
-            e.setBillExplain(billExplain);
-        });
 
         Map<String, Object> map = Maps.newHashMap();
         map.put("list", tempBills);
@@ -229,7 +235,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
         bill.setPayedNum(0);
         bill.setBillStatus(billStatus);
-        //为草稿时不创建时间
+        //为草稿时不创建时间, 2表示草稿
         if(!"2".equals(billStatus)) {
             bill.setCreateDate(new Date());
             bill.setCreateUser(userElement.getId());
@@ -261,6 +267,65 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         // int rows = billMapper.insert(bill);
         boolean b = this.saveOrUpdate(bill);
         if (b) {
+            // 草稿时插入消息
+            if ("2".equals(bill.getBillStatus())) {
+                Message message = new Message();
+                message.setCommunityId(userElement.getCommunityId());
+                message.setMessageType("7");
+                message.setAdviceType("4");
+                message.setModelType("2");
+                message.setUuid(userElement.getId());
+                message.setUuidType("2");
+                // 消息是物业端发过来的, 就是 2
+                message.setSource("2");
+                message.setMessageContent("收费组“" + bill.getBillName() +  "”还未发布，点击发布");
+                message.setStatus("1");
+                message.setCreateDate(LocalDateTime.now());
+                message.setCreateUser(userElement.getId());
+                message.setBillId(bill.getId());
+
+                messageMapper.insert(message);
+
+            }
+            // 发布时消息为无效
+            if ("0".equals(bill.getBillStatus())) {
+                QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("community_id", userElement.getCommunityId());
+                queryWrapper.eq("message_type", "7");
+                queryWrapper.eq("model_type", "2");
+                queryWrapper.eq("source", "2");
+                queryWrapper.eq("status", "1");
+                queryWrapper.eq("advice_type","4");
+                Message message = messageMapper.selectOne(queryWrapper);
+                if (null != message) {
+                    message.setStatus("0");
+                    message.setUpdateDate(LocalDateTime.now());
+                    message.setUpdateUser(userElement.getId());
+                    messageMapper.updateById(message);
+                }
+
+
+                // 插入消息表, 消息类型为 消息
+                Message messageModel = new Message();
+                messageModel.setCommunityId(userElement.getCommunityId());
+                messageModel.setMessageType("7");
+                messageModel.setAdviceType("4");
+                messageModel.setModelType("1");
+                messageModel.setUuid(userElement.getId());
+                messageModel.setUuidType("2");
+                // 消息是物业端发过来的, 就是 2
+                messageModel.setSource("2");
+
+                messageModel.setMessageContent("收费组“" + bill.getBillName() + "”还有" + DateUtils.getDaysBetween(new Date(), bill.getEndDate()) + "天就到截止日期了，但还有未缴用户，点击去查看");
+                messageModel.setStatus("1");
+                messageModel.setCreateDate(LocalDateTime.now());
+                messageModel.setCreateUser(userElement.getId());
+                messageModel.setBillId(bill.getId());
+
+                messageMapper.insert(messageModel);
+
+
+            }
             List<BillInvoice> billInvoices = tempBills.stream().map(e -> {
                 BillInvoice billInvoice = new BillInvoice();
                 billInvoice.setCommunityId(userElement.getCommunityId());
@@ -294,7 +359,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 if (null != taUser) {
                     billInvoice.setTaUserId(taUser.getId());
                 }
-                billInvoice.setBillInvoiceExplain(bill.getBillExplain());
+                billInvoice.setBillInvoiceExplain(e.getBillExplain());
                 billInvoice.setPayPrice(e.getPayPrice());
                 billInvoice.setBillStatus("0");
                 billInvoice.setCreateUser(userElement.getId());
@@ -303,10 +368,40 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 Random random = new Random();
                 billInvoice.setOutTradeNo(String.valueOf(System.currentTimeMillis()) + random.nextInt());
 
+
                 return billInvoice;
             }).collect(Collectors.toList());
 
-            iBillInvoiceService.saveBatch(billInvoices);
+            boolean batchBool = iBillInvoiceService.saveBatch(billInvoices);
+            if (batchBool) {
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+                // 发布时, 往 APP端推送
+                if ("0".equals(bill.getBillStatus())) {
+                    List<Message> messageList = billInvoices.stream().map(e -> {
+
+                        // 往APP端用户上面的每一个用户推送
+                        Message messageModelAPP = new Message();
+                        messageModelAPP.setCommunityId(userElement.getCommunityId());
+                        messageModelAPP.setMessageType("7");
+                        messageModelAPP.setAdviceType("1");
+                        messageModelAPP.setModelType("2");
+                        messageModelAPP.setUuid(e.getTaUserId());
+                        messageModelAPP.setUuidType("1");
+                        // 消息是物业端 发过来的, 就是 2
+                        messageModelAPP.setSource("2");
+                        messageModelAPP.setMessageContent("您有待缴费的账单，点击查看并缴费 " + dateFormat.format(new Date()) + bill.getBillName());
+                        messageModelAPP.setStatus("1");
+                        messageModelAPP.setCreateDate(LocalDateTime.now());
+                        messageModelAPP.setCreateUser(userElement.getId());
+                        messageModelAPP.setBillId(e.getId());
+
+                        return messageModelAPP;
+
+                    }).collect(Collectors.toList());
+                    iMessageService.saveBatch(messageList);
+                }
+
+            }
         }
         responseBean.addSuccess("操作成功!");
         return responseBean;
@@ -346,37 +441,48 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             Row row = sheetAt.getRow(i);
             Cell cell = getCell(row.getCell(0));
             if (null == cell) {
-                throw new WisdomException("第" + i + "行 期/区 不能为空");
+                throw new WisdomException("第" + i+1 + "行 期/区 不能为空");
             }
             String phase = cell.getStringCellValue().trim();
             cell = getCell(row.getCell(1));
             if (null == cell) {
-                throw new WisdomException("第" + i + "行 楼栋 不能为空");
+                throw new WisdomException("第" + i+1 + "行 楼栋 不能为空");
             }
             String building = cell.getStringCellValue().trim();
             cell = getCell(row.getCell(2));
             if (null == cell) {
-                throw new WisdomException("第" + i + "行 单元 不能为空");
+                throw new WisdomException("第" + i+1 + "行 单元 不能为空");
             }
             String unit = cell.getStringCellValue().trim();
             cell = getCell(row.getCell(3));
             if (null == cell) {
-                throw new WisdomException("第" + i + "行 楼层 不能为空");
+                throw new WisdomException("第" + i+1 + "行 楼层 不能为空");
             }
             String level = cell.getStringCellValue().trim();
             cell = getCell(row.getCell(4));
             if (null == cell) {
-                throw new WisdomException("第" + i + "行 房号 不能为空");
+                throw new WisdomException("第" + i+1 + "行 房号 不能为空");
             }
             String roomNo = cell.getStringCellValue().trim();
             cell = getCell(row.getCell(5));
             if (null == cell) {
-                throw new WisdomException("第" + i + "行 业主姓名 不能为空");
+                throw new WisdomException("第" + i+1 + "行 业主姓名 不能为空");
             }
             String ownerName = cell.getStringCellValue().trim();
+
+            // 收费说明可以为空
             cell = getCell(row.getCell(6));
+            String billExplain = null;
+            if (null != cell) {
+                billExplain = cell.getStringCellValue().trim();
+                if (billExplain.length() > 100) {
+                    throw new WisdomException("第" + i+1 + "行 收费说明超出100字，请精简到100字以内");
+                }
+            }
+
+            cell = getCell(row.getCell(7));
             if (null == cell) {
-                throw new WisdomException("第" + i + "行 金额 不能为空");
+                throw new WisdomException("第" + i+1 + "行 金额 不能为空");
             }
             String money = cell.getStringCellValue().trim();
 
@@ -388,6 +494,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             temp.setUnit(unit);
             temp.setRoomNo(roomNo);
             temp.setOwnerName(ownerName);
+            temp.setBillExplain(billExplain);
 
 
             if (StringUtils.isNotBlank(money)) {
@@ -440,6 +547,22 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             QueryWrapper<BillInvoice> deleteQueryWrapper = new QueryWrapper<>();
             deleteQueryWrapper.eq("bill_id", bill.getId());
             billInvoiceMapper.delete(deleteQueryWrapper);
+
+            // 发布时消息为无效
+            QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("community_id", userElement.getCommunityId());
+            queryWrapper.eq("message_type", "7");
+            queryWrapper.eq("model_type", "2");
+            queryWrapper.eq("source", "2");
+            queryWrapper.eq("status", "1");
+            Message message = messageMapper.selectOne(queryWrapper);
+            if (null != message) {
+                message.setStatus("0");
+                message.setUpdateDate(LocalDateTime.now());
+                message.setUpdateUser(userElement.getId());
+                messageMapper.updateById(message);
+            }
+
         });
 
         responseBean.addSuccess("操作成功!");
@@ -510,9 +633,6 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         List<TpBuildingOwnerInfo> records = infoIPage.getRecords();
         // 总页数
         Long pages = infoIPage.getPages();
-        do {
-
-        } while (false);
 
 
         // 行数 默认从 第 6 行开始
@@ -520,30 +640,32 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         // 记录坐标
         int index = 0;
 
-        do {
-            TpBuildingOwnerInfo buildingOwnerInfo = records.get(index);
-            row = sheet.createRow(currentRow);
-            cell = row.createCell(0);
-            cell.setCellValue(buildingOwnerInfo.getPhase());
-            cell = row.createCell(1);
-            cell.setCellValue(buildingOwnerInfo.getBuilding());
-            cell = row.createCell(2);
-            cell.setCellValue(buildingOwnerInfo.getUnit());
-            cell = row.createCell(3);
-            cell.setCellValue(buildingOwnerInfo.getLevel());
-            cell = row.createCell(4);
-            cell.setCellValue(buildingOwnerInfo.getRoomNo());
-            cell = row.createCell(5);
-            cell.setCellValue(buildingOwnerInfo.getOwnerName());
-            currentRow ++;
-            index ++;
-            if (index == records.size()) {
-                index = 0;
-                page = new Page(infoIPage.getCurrent() + 1,pageSize);
-                infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
-                records = infoIPage.getRecords();
-            }
-        } while (infoIPage.getCurrent() <= pages);
+        if (records.size() > 0) {
+            do {
+                TpBuildingOwnerInfo buildingOwnerInfo = records.get(index);
+                row = sheet.createRow(currentRow);
+                cell = row.createCell(0);
+                cell.setCellValue(buildingOwnerInfo.getPhase());
+                cell = row.createCell(1);
+                cell.setCellValue(buildingOwnerInfo.getBuilding());
+                cell = row.createCell(2);
+                cell.setCellValue(buildingOwnerInfo.getUnit());
+                cell = row.createCell(3);
+                cell.setCellValue(buildingOwnerInfo.getLevel());
+                cell = row.createCell(4);
+                cell.setCellValue(buildingOwnerInfo.getRoomNo());
+                cell = row.createCell(5);
+                cell.setCellValue(buildingOwnerInfo.getOwnerName());
+                currentRow ++;
+                index ++;
+                if (index == records.size()) {
+                    index = 0;
+                    page = new Page(infoIPage.getCurrent() + 1,pageSize);
+                    infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
+                    records = infoIPage.getRecords();
+                }
+            } while (infoIPage.getCurrent() <= pages);
+        }
 
         responseBean.addSuccess(workbook);
         return responseBean;

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

@@ -0,0 +1,107 @@
+package com.community.huiju.service.impl;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.dao.MessageMapper;
+import com.community.huiju.model.Message;
+import com.community.huiju.service.IMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 物业端消息表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@Service
+public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
+    @Autowired
+    private MessageMapper messageMapper;
+    @Override
+    public ResponseBean messageLiset(String parameter, Integer communityId,Integer user) {
+        ResponseBean response= new  ResponseBean();
+        JSONObject  object = JSONObject.parseObject(parameter);
+        //待办消息类型(-1:论坛，-2:工单，-3:缴费)
+        String  messageType = object.getString("messageType");
+        //0:无效，1:有效
+        String  status = object.getString("status");
+        Date createDate = object.getDate("createDate");
+
+        String  messageContent = object.getString("messageContent");
+        Integer pageNum = object.getInteger("pageNum");
+        Integer pageSize = object.getInteger("pageSize");
+
+        Page<Message> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+        IPage<Message> pageInfo = messageMapper.messageLiset(page,messageType,status,createDate,messageContent,user);
+        List<Message> ticketList = pageInfo.getRecords();
+        HashMap map=new HashMap<>();
+        map.put("list",ticketList);
+        map.put("total", pageInfo.getTotal());
+        map.put("pageNum", pageInfo.getCurrent());
+        map.put("pageSize", pageInfo.getSize());
+        response.addSuccess(map);
+        return response;
+    }
+
+    @Override
+    public ResponseBean myMessageList(String parameter, Integer communityId, Integer user) {
+        ResponseBean response= new  ResponseBean();
+        JSONObject  object = JSONObject.parseObject(parameter);
+        //待办消息类型(-1:论坛，-2:工单，-3:缴费)
+        String  messageType = object.getString("messageType");
+        //0:无效，1:有效
+        String  readStatus = object.getString("readStatus");
+        Date createDate = object.getDate("createDate");
+
+        String  messageContent = object.getString("messageContent");
+        Integer pageNum = object.getInteger("pageNum");
+        Integer pageSize = object.getInteger("pageSize");
+
+        Page<Message> page = new Page<>();
+        page.setSize(pageSize == null ? 10 : pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+        IPage<Message> pageInfo = messageMapper.myMessageList(page,messageType,readStatus,createDate,messageContent,user);
+        List<Message> ticketList = pageInfo.getRecords();
+        HashMap map=new HashMap<>();
+        map.put("list",ticketList);
+        map.put("total", pageInfo.getTotal());
+        map.put("pageNum", pageInfo.getCurrent());
+        map.put("pageSize", pageInfo.getSize());
+        response.addSuccess(map);
+        return response;
+    }
+
+    @Override
+    public ResponseBean delectRead(String parameter, Integer userID) {
+        ResponseBean response = new ResponseBean();
+        JSONObject parseObject = JSONObject.parseObject(parameter);
+
+        JSONArray message = parseObject.getJSONArray("id");
+        Integer[] messageListID = message.toArray(new Integer[]{});
+        for (Integer id : messageListID) {
+            Message mes= new Message();
+                    mes.setId(id);
+                    mes.setReadStatus("1");
+                    mes.setUpdateDate(LocalDateTime.now());
+                    mes.setUpdateUser(userID);
+                    messageMapper.updateById(mes);
+        }
+                response.addSuccess("成功");
+                return response;
+    }
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaSysMenuServiceImpl.java

@@ -0,0 +1,36 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaSysMenu;
+import com.community.huiju.dao.TaSysMenuMapper;
+import com.community.huiju.service.ITaSysMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * APP端菜单页面 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+@Service
+public class TaSysMenuServiceImpl extends ServiceImpl<TaSysMenuMapper, TaSysMenu> implements ITaSysMenuService {
+
+    @Autowired
+    private TaSysMenuMapper taSysMenuMapper;
+
+    @Override
+    public ResponseBean getList(UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+
+        List<TaSysMenu> taSysMenus = taSysMenuMapper.selectList(userElement.getCommunityId());
+        responseBean.addSuccess(taSysMenus);
+        return responseBean;
+    }
+}

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

@@ -9,12 +9,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.utils.BeanTools;
+import com.community.huiju.dao.MessageMapper;
+import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.TdImagesMapper;
 import com.community.huiju.dao.TpActivityMapper;
 import com.community.huiju.exception.WisdomException;
-import com.community.huiju.model.TdImages;
-import com.community.huiju.model.TpActivity;
-import com.community.huiju.model.User;
+import com.community.huiju.model.*;
 import com.community.huiju.service.ITdImagesService;
 import com.community.huiju.service.ITpActivityService;
 import com.community.huiju.service.IUserService;
@@ -55,6 +55,11 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
     @Autowired
     private IUserService iUserService;
 
+    @Autowired
+    private MessageMapper messageMapper;
+
+    @Autowired
+    private TaUserMapper taUserMapper;
     @Override
     public ResponseBean listQuery(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
@@ -153,6 +158,62 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
         if (row <= 0) {
             throw new WisdomException("操作失败!");
         } else {
+
+                // 草稿时插入消息
+                Message activityMessage = new Message();
+            activityMessage.setCommunityId(userElement.getCommunityId());
+            activityMessage.setMessageType("8");
+            activityMessage.setAdviceType("4");
+            activityMessage.setModelType("2");
+            activityMessage.setUuid(userElement.getId());
+            activityMessage.setUuidType("2");
+            activityMessage.setSource("2");
+            activityMessage.setMessageContent("活动“{" + tpActivity.getActivityTitle() + "}”还未发布，点击发布");
+            activityMessage.setStatus("1");
+            activityMessage.setActivityId(tpActivity.getId());
+            activityMessage.setCreateDate(LocalDateTime.now());
+            activityMessage.setCreateUser(userElement.getId());
+            activityMessage.setReadStatus("0");
+                //为草稿时
+                if ("2".equals(tpActivity.getStatus())) {
+                    messageMapper.insert(activityMessage);
+                }
+            activityMessage.setModelType("1");
+            activityMessage.setAdviceType("1");
+            activityMessage.setSource("1");
+            activityMessage.setUuidType("1");
+            activityMessage.setMessageContent(tpActivity.getActivityTitle());
+
+            if("1".equals(tpActivity.getStatus())) {
+                QueryWrapper<TaUser> queryWrapperTaUser = new QueryWrapper<>();
+                queryWrapperTaUser.eq("community_id",userElement.getCommunityId());
+                List<TaUser> userList= taUserMapper.selectList(queryWrapperTaUser);
+                for (TaUser taUser:userList){
+                    activityMessage.setUuid(taUser.getId());
+                    messageMapper.insert(activityMessage);
+                }
+
+            }
+                // 发布时消息为无效
+                if ("1".equals(tpActivity.getStatus())) {
+                    QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("community_id", userElement.getCommunityId());
+                    queryWrapper.eq("message_type", "8");
+                    queryWrapper.eq("model_type", "2");
+                    queryWrapper.eq("source", "2");
+                    queryWrapper.eq("status", "1");
+                    Message message = messageMapper.selectOne(queryWrapper);
+                    if (null != message) {
+                        message.setStatus("0");
+                        message.setUpdateDate(LocalDateTime.now());
+                        message.setUpdateUser(userElement.getId());
+                        messageMapper.updateById(message);
+                    }
+
+
+                }
+
+
             responseBean.addSuccess("操作成功!");
         }
 
@@ -212,6 +273,25 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
             selectTpActivity.setUpdateUser(userElement.getId());
         }
 
+        // 发布时消息为无效
+        if ("1".equals(tpActivity.getStatus())) {
+            QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("community_id", userElement.getCommunityId());
+            queryWrapper.eq("message_type", "8");
+            queryWrapper.eq("model_type", "2");
+            queryWrapper.eq("source", "2");
+            queryWrapper.eq("status", "1");
+            queryWrapper.eq("activity_id",tpActivity.getId());
+            Message message = messageMapper.selectOne(queryWrapper);
+            if (null != message) {
+                message.setStatus("0");
+                message.setUpdateDate(LocalDateTime.now());
+                message.setUpdateUser(userElement.getId());
+                messageMapper.updateById(message);
+            }
+
+
+        }
 
         int row = tpActivityMapper.updateById(selectTpActivity);
 
@@ -269,6 +349,24 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
             }
             e.setStatus("0");
             // e.setUpdateUser(userElement.getId());
+            // 作废时消息为无效
+            if ("0".equals(e.getStatus())) {
+                QueryWrapper<Message> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("community_id", userElement.getCommunityId());
+                queryWrapper.eq("message_type", "8");
+                queryWrapper.eq("model_type", "2");
+                queryWrapper.eq("source", "2");
+                queryWrapper.eq("status", "1");
+                Message message = messageMapper.selectOne(queryWrapper);
+                if (null != message) {
+                    message.setStatus("0");
+                    message.setUpdateDate(LocalDateTime.now());
+                    message.setUpdateUser(userElement.getId());
+                    messageMapper.updateById(message);
+                }
+
+
+            }
         });
         updateBatchById(tpActivityList);
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java

@@ -7,12 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.dao.TdImagesMapper;
-import com.community.huiju.dao.TpAnnouncementMapper;
-import com.community.huiju.dao.UserMapper;
-import com.community.huiju.model.TdImages;
-import com.community.huiju.model.TpAnnouncement;
-import com.community.huiju.model.TpBuildingOwnerInfo;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.TpAnnouncementService;
 import com.community.huiju.vo.AnnouncementTable;
 import com.google.common.collect.Maps;
@@ -48,8 +44,11 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
     @Autowired
     private UserMapper userMapper;
 
+    @Autowired
+    private MessageMapper messageMapper;
 
-
+    @Autowired
+    private TaUserMapper taUserMapper;
     @Override
     public ResponseBean tpAnnouncemenList(String paramets, Integer CommunityId) {
         ResponseBean responseBean = new ResponseBean();
@@ -112,8 +111,40 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             return response;
         }
         tpAnnouncementMapper.insert(tpAnnouncement);
-
-
+        //根据1.5需求维护tp_message
+            Message message = new Message();
+            message.setCommunityId(communityId);
+            message.setMessageType("5");
+            message.setModelType("2");
+            message.setAdviceType("4");
+            message.setUuid(userId);
+            message.setUuidType("2");
+            message.setSource("2");
+            message.setMessageContent("公告“" + tpAnnouncement.getAnnouncementTitle() + "”还未发布，查看详情");
+            message.setStatus("1");
+            message.setReadStatus("0");
+            message.setCreateUser(userId);
+            message.setCreateDate(LocalDateTime.now());
+            message.setAnnouncementId(tpAnnouncement.getId());
+            //为草稿的时
+            if ("2".equals(tpAnnouncement.getStatus())) {
+                messageMapper.insert(message);
+            }
+            message.setModelType("1");
+            message.setAdviceType("1");
+            message.setSource("1");
+            message.setUuidType("1");
+            message.setMessageContent(tpAnnouncement.getAnnouncementTitle());
+
+        if ("1".equals(tpAnnouncement.getStatus())) {
+            QueryWrapper<TaUser> queryWrapperTaUser = new QueryWrapper<>();
+            queryWrapperTaUser.eq("community_id",communityId);
+            List<TaUser> userList= taUserMapper.selectList(queryWrapperTaUser);
+            for (TaUser taUser:userList) {
+                message.setUuid(taUser.getId());
+                messageMapper.insert(message);
+            }
+        }
         for (String img : contentImgArray) {
             TdImages tdImages = new TdImages();
             tdImages.setImageUrl(img);
@@ -182,6 +213,15 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
                 tdImages.setCreateUser(userId);
                 imagesMapper.insert(tdImages);
             }
+                // 公告发布成功删除时消息变为无效
+                Message message = new Message();
+                message.setMessageContent("公告“" + tpAnnouncement.getAnnouncementTitle() + "”还未发布，查看详情");
+                message.setAnnouncementId(tpAnnouncement.getId());
+                message.setUpdateDate(LocalDateTime.now());
+                message.setUpdateUser(userId);
+                message.setStatus("0");
+                messageMapper.updateMessage(message);
+
         }
         return response;
     }
@@ -199,6 +239,13 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             tpAnnouncement.setCommunityId(communityId);
             tpAnnouncement.setStatus("0");
             tpAnnouncementMapper.updateTpAnnouncement(tpAnnouncement);
+            //1.5版本维护消息
+            Message message= new Message();
+            message.setStatus("0");
+            message.setAnnouncementId(id);
+            message.setUpdateUser(userId);
+            message.setUpdateDate(LocalDateTime.now());
+            messageMapper.updateMessage(message);
         }
         return response;
     }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpCarouselSettingServiceImpl.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TpCarouselSettingMapper;
+import com.community.huiju.model.TpCarouselSetting;
+import com.community.huiju.service.ICarouselSettingService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 轮播数设置表 服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-06
+ */
+@Service
+public class TpCarouselSettingServiceImpl extends ServiceImpl<TpCarouselSettingMapper, TpCarouselSetting> implements ICarouselSettingService {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java

@@ -49,6 +49,10 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
     @Autowired
     private TaUserMapper taUserMapper;
+
+    @Autowired
+    private MessageMapper messageMapper;
+
     @Override
     public ResponseBean ticketLiset(String parameter,Integer communityId) {
          ResponseBean response= new ResponseBean<>();
@@ -190,12 +194,29 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
                 tdImagesMapper.insert(tdImages);
             }
         }
+        //1.5维护工单对话推送到app消息
+        Message message = new Message();
+        message.setCommunityId(communityId);
+        message.setMessageType("10");
+        message.setTicketId(tpTicket.getId());
+        message.setAdviceType("1");
+        message.setUuid(tpTicket.getCreateUser());
+        message.setModelType("1");
+        message.setUuidType("1");
+        message.setSource("2");
+        message.setMessageContent(content);
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(tpTicket.getCreateUser());
+        message.setCreateDate(LocalDateTime.now());
+        message.setTicketId(ticketId);
         response.addSuccess("成功");
+        messageMapper.insert(message);
         return response;
     }
 
     @Override
-    public ResponseBean addRecord(String parameter, Integer id, Integer communityId) {
+    public ResponseBean addRecord(String parameter, Integer user, Integer communityId) {
         ResponseBean response=new ResponseBean();
 
         JSONObject object= JSONObject.parseObject(parameter);
@@ -217,9 +238,42 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicketRecord.setTicketId(ticketId);
         tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + userName.getUserName()+",联系方式:" + userName.getLoginName());
         tpTicketRecord.setStatus("3");
-        tpTicketRecord.setCreateUser(id);
+        tpTicketRecord.setCreateUser(user);
         tpTicketRecord.setCreateDate(LocalDateTime.now());
         tpTicketRecordMapper.insert(tpTicketRecord);
+
+        //待办模板
+        QueryWrapper<TpTicket> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", ticketId);
+        queryWrapper.eq("community_id", communityId);
+       TpTicket ticket = tpTicketMapper.selectOne(queryWrapper);
+        Message message = new Message();
+        message.setCommunityId(communityId);
+        message.setMessageType(ticket.getType());
+        message.setTicketId(ticket.getId());
+        message.setAdviceType("4");
+        message.setUuid(userID);
+        message.setModelType("2");
+        message.setUuidType("2");
+        message.setSource("2");
+        message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给您，点击查看并处理");
+        message.setStatus("1");
+        message.setReadStatus("0");
+        message.setCreateUser(user);
+        message.setCreateDate(LocalDateTime.now());
+        message.setTicketId(ticketId);
+        messageMapper.insert(message);
+        //如果分配给本人维护消息模板
+        if (null!=userID&userID.equals(user)){
+            message.setModelType("1");
+            messageMapper.insert(message);
+        }
+        //分配成功后推送app
+        message.setUuidType("1");
+        message.setUuid(ticket.getCreateUser());
+        message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给:"+userName.getUserName());
+        message.setAdviceType("1");
+        messageMapper.insert(message);
         response.addSuccess("成功");
         return response;
     }
@@ -259,6 +313,14 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         ticketRecordComment.setCreateDate(LocalDateTime.now());
         response.addSuccess("成功");
         tpTicketRecordCommentMapper.insert(ticketRecordComment);
+
+        //维护1.5版本
+        Message message = new Message();
+        message.setTicketId(ticketId);
+        message.setUpdateUser(id);
+        message.setUpdateDate(LocalDateTime.now());
+        message.setStatus("0");
+        messageMapper.updateTicketMessage(message);
         return response;
     }
 
@@ -310,6 +372,9 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
                 tdImagesMapper.insert(tdImages);
             }
         }
+        //分配成功后这只messgae消息表status为无效
+        messageMapper.updateTickMessageStatus(ticketId);
+
         response.addSuccess("成功");
         return response;
     }