合并

.gitignore

@@ -0,0 +1 @@
+*.class

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

@@ -87,7 +87,6 @@
 			<groupId>com.community</groupId>
 			<artifactId>community-common</artifactId>
 			<version>0.0.1</version>
-			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
@@ -117,10 +116,10 @@
 
 		<!-- log4j -->
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-log4j</artifactId>
-		</dependency>
+		<!--<dependency>-->
+			<!--<groupId>org.springframework.boot</groupId>-->
+			<!--<artifactId>spring-boot-starter-log4j</artifactId>-->
+		<!--</dependency>-->
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -162,9 +161,31 @@
 			<version>3.11.0</version>
 		</dependency>
 
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>1.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>net.coobird</groupId>
+			<artifactId>thumbnailator</artifactId>
+			<version>0.4.2</version>
+		</dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
 
-	</dependencies>
+
+    </dependencies>
 
 	<dependencyManagement>
 		<dependencies>
@@ -184,6 +205,19 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.7.0</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+					<encoding>UTF-8</encoding>
+					<compilerArguments>
+						<extdirs>${project.basedir}/lib</extdirs>
+					</compilerArguments>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

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

@@ -1,7 +1,11 @@
 package com.community.huiju;
 
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
@@ -22,4 +26,16 @@ public class AppApplication {
 	public RestTemplate restTemplate(){
 		return new RestTemplate();
 	}
+
+	@Bean
+	public HttpMessageConverters fastJsonConfigure(){
+		FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
+		FastJsonConfig fastJsonConfig = new FastJsonConfig();
+		fastJsonConfig.setSerializerFeatures(SerializerFeature.PrettyFormat);
+		//日期格式化
+		//fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
+		converter.setFastJsonConfig(fastJsonConfig);
+		return new HttpMessageConverters(converter);
+	}
+
 }

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

@@ -0,0 +1,114 @@
+package com.community.huiju.common;
+
+import net.coobird.thumbnailator.Thumbnails;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+
+/**
+ * 图片压缩Utils
+ *
+ * @author worstEzreal
+ * @version V1.1.0
+ * @date 2018/3/12
+ */
+public class PicUtils {
+
+    private static Logger logger = LoggerFactory.getLogger(PicUtils.class);
+
+    /**
+     * 根据指定大小压缩图片
+     *
+     * @param imageBytes  源图片字节数组
+     * @param desFileSize 指定图片大小，单位kb
+     * @param imageId     影像编号
+     * @return 压缩质量后的图片字节数组
+     */
+    public static byte[] compressPicForScale(byte[] imageBytes, long desFileSize, String imageId) {
+        if (imageBytes == null || imageBytes.length <= 0 || imageBytes.length < desFileSize * 1024) {
+            return imageBytes;
+        }
+        long srcSize = imageBytes.length;
+        double accuracy = getAccuracy(srcSize / 1024);
+        try {
+            while (imageBytes.length > desFileSize * 1024) {
+                ByteArrayInputStream inputStream = new ByteArrayInputStream(imageBytes);
+                ByteArrayOutputStream outputStream = new ByteArrayOutputStream(imageBytes.length);
+                Thumbnails.of(inputStream)
+                        .scale(accuracy)
+                        .outputQuality(accuracy)
+                        .toOutputStream(outputStream);
+                imageBytes = outputStream.toByteArray();
+            }
+            logger.info("【图片压缩】imageId={} | 图片原大小={}kb | 压缩后大小={}kb",
+                    imageId, srcSize / 1024, imageBytes.length / 1024);
+        } catch (Exception e) {
+            logger.error("【图片压缩】msg=图片压缩失败!", e);
+        }
+        return imageBytes;
+    }
+
+    /**
+     * 自动调节精度(经验数值)
+     *
+     * @param size 源图片大小
+     * @return 图片压缩质量比
+     */
+    private static double getAccuracy(long size) {
+        double accuracy;
+        if (size < 900) {
+            accuracy = 0.85;
+        } else if (size < 2047) {
+            accuracy = 0.6;
+        } else if (size < 3275) {
+            accuracy = 0.44;
+        } else {
+            accuracy = 0.4;
+        }
+        return accuracy;
+    }
+    
+    /**
+     * 图片进行Base64位编码
+     * @param fileBytes
+     * @return
+     */
+      public static String getImgStr(byte [] fileBytes) {
+        return new String(org.apache.commons.codec.binary.Base64.encodeBase64(fileBytes));
+    }
+
+    /**
+     * 图片进行Base64位编码
+     * @param imgFile
+     * @return
+     */
+   /* public static String getImgStr(MultipartFile imgFile){
+        byte[] data = null;
+        try
+        {
+            data = imgFile.getBytes();
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+        }
+        return new String(org.apache.commons.codec.binary.Base64.encodeBase64(data));
+    }*/
+}
+
+
+
+
+
+
+
+

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

@@ -1,12 +1,9 @@
 package com.community.huiju.common.code.cache;
-
 import com.community.commom.constant.Constant;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -33,8 +30,9 @@ public class AppkeyCache {
         Object value = null;
         try {
             value = cache.get(appKey);
-        } catch (ExecutionException e) {
-            e.printStackTrace();
+        } catch (Exception e) {
+            //e.printStackTrace();
+            value = null;
         }
         return value;
     }

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

@@ -0,0 +1,130 @@
+package com.community.huiju.common.hk;
+
+public class HKConstant {
+
+    /**
+     * APPKEY需要到部署的平台服务器上生成。
+     * <p>
+     * 调用Openpai的操作码，需要去平台上生成，详见《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》中[获取AppKey和Secret]章节说明
+     * </p>
+     * <p>
+     * 《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》 该文档请找技术支持或者交付的同事提供
+     * </p>
+     */
+    public static final String APPKEY = "b4434b13";
+
+    /**
+     * SECRET需要到部署的平台服务器上生成。
+     * <p>
+     * 调用Openpai的操作码，需要去平台上生成，详见《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》中[获取AppKey和Secret]章节说明
+     * </p>
+     * <p>
+     * 《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》 该文档请找技术支持或者交付的同事提供
+     * </p>
+     */
+    public static final String SECRET = "64a1f32d53784ce2a34bd81822db1b91";
+
+
+    /**
+     * http请求地址
+     * <p>openapi的地址,默认情况下openapi的IP端口与基础应用的IP端口是一致的</p>
+     * <p>请将地址配置正确.</p>
+     * <p>默认情况下是127.0.0.1:80 ，如果地址不通请根据实际情况修改IP端口</p>
+     */
+   // public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
+    //  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";
+
+    /**
+     * <p>操作用户UUID，即用户UUID，首次使用操作用户UUID可以通过接口 [获取默认用户UUID]来获取</p>
+     * <p>也可以通过接口[分页获取用户]来获取</p>
+     */
+
+    /**
+     * 获取默认用户UUID的接口地址，此地址可以从《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》中具体的接口说明上获取
+     */
+    public static final String ITF_ADDRESS_GET_DEFAULT_USER_UUID = "/openapi/service/base/user/getDefaultUserUuid";
+
+    /**
+     * 分页获取监控点信息的接口地址，此地址可以从《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》中具体的接口说明上获取
+     */
+    public static final String ITF_ADDRESS_GET_CAMERAS = "/openapi/service/vss/res/getCameras";
+
+    /**
+     * 查询监控点地址
+     */
+    public static final String OP_USER_UUID = "5b2eb534696b11e89c2e438f92627767";
+
+    /**--主要是推送图片到海康
+     * 通过此接口将人员名单添加到指定的人员分组当中，此接口适合一次添加一个人员，如果需要批量添加可以使用平台上自带的图片压缩包的方式批量添加。
+     */
+    public  static  final  String OP_IMG="/openapi/service/fas/personInfo/addPersonInfoIntoGroup";
+
+    public static final String ITF_MONITORY_POINT = "/openapi/service/vss/res/getCamerasEx";
+    
+    /**
+     * 根据区域UUID集获取门禁点
+     */
+    public static final String DOORS_BY_REGION_UUIDS = "/openapi/service/acs/res/getDoorsByRegionUuids";
+    
+    /**
+     * 根据人员ID集添加权限
+     */
+    public static final String ADD_AUTHORITIES_BY_PERSONIDS = "/openapi/service/acs/auth/addAuthoritiesByPersonIds";
+    
+    /**
+     * 根据设备UUID集异动下载门禁权限
+     */
+    public static final String DOWNLOAD_AUTHORITY_BY_DEVICEUUIDS = "/openapi/service/acs/auth/downloadAuthorityByDeviceUuids";
+    
+    /**
+     * 指定人员人脸/指纹权限下载
+     */
+    public static final String DOWNLOAD_FACE_AND_FINGERINFOS = "/openapi/service/acs/auth/downloadFaceAndFingerInfos";
+
+    /**--推送图片时需要获取人员分组下的，人员分组ID
+     * --personGroupId--
+     */
+    public static final  String OP_PERSON_ID="/openapi/service/fas/personGroup/getPersonGroup";
+
+    /**
+     * 分页获取部门
+     */
+    public static final String ITF_DEPT= "/openapi/service/base/dept/getDeptInfos";
+
+    /**
+     * 根据部门名称分页获取部门
+     */
+    public static final String ITF_LIKE_DEPT_NAME = "/openapi/service/base/dept/getDeptInfosByName";
+
+    /**
+     * 添加 人员
+     */
+    public static final String ITF_ADD_USER = "/openapi/service/base/person/addPersonInfo";
+
+
+    /**
+     * 修改人员
+     */
+    public static final String ITF_UPDATE_USER ="/openapi/service/base/person/modifyPersonInfo";
+
+
+    /**
+     * 批量开卡
+     */
+    public static final String ITF_OPEN_CARD = "/openapi/service/base/person/batchOpenCards";
+
+    /**
+     * 根据人员ID集获取人员
+     */
+    public static final String ITF_GET_USER_ID = "/openapi/service/base/person/getPersonInfosByIds";
+    
+    /**
+     * 未预约登记（临时登记）
+     */
+    public static final String TEMPORARY_REGISTER = "/openapi/service/rvs/register/temporaryRegister";
+
+    
+
+}

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

@@ -0,0 +1,571 @@
+package com.community.huiju.common.hk;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.hk.Digests;
+import com.community.commom.hk.HttpClientSSLUtils;
+import com.community.huiju.common.PicUtils;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 海康 API
+ * @author weiximei
+ */
+@Slf4j
+public class HKOpenApi {
+
+    /**
+     * 根据
+     * 组织中心UUID集 ,第几页, 一页多少行
+     *
+     * 获取  监控点 数据列表
+     * @return
+     */
+    public static String getMonitoryPoint(Map<String,Object> map){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo",map.get("pageNo"));
+        parMap.put("pageSize",map.get("pageSize"));
+        parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("unitUuids",map.get("unitUuids"));
+        String params =  JSON.toJSONString(parMap);
+        log.info("获取 监控列表 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("获取 监控列表 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取监控列表失败!",e);
+            throw new RuntimeException("获取监控列表失败!");
+        }
+
+        return data;
+    }
+
+    /**
+     * 根据部门名称分页获取部门
+     *      第几页, 一页多少行, 操作用户uuid
+     * @param map
+     * @return
+     */
+    public static String getDeptName(Map<String,Object> map){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_LIKE_DEPT_NAME;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo",map.get("pageNo"));
+        parMap.put("pageSize",map.get("pageSize"));
+        parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("deptName",map.get("deptName"));
+        String params =  JSON.toJSONString(parMap);
+        log.info("根据部门名称分页获取部门 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("根据部门名称分页获取部门 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("根据部门名称分页获取部门失败!",e);
+            throw new RuntimeException("根据部门名称分页获取部门失败!");
+        }
+
+        return data;
+    }
+
+
+    /**
+     * 添加人员
+     *
+     *      比如 住户
+     * @return
+     */
+    public static String addUser(Map<String,Object> map){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADD_USER;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("personNo",map.get("personNo"));
+        parMap.put("personName",map.get("personName"));
+        parMap.put("phoneNo",map.get("phoneNo"));
+        parMap.put("deptUuid",map.get("deptUuid"));
+        // parMap.put("cardNo",map.get("cardNo"));
+        String params =  JSON.toJSONString(parMap);
+        log.info("添加人员 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("添加人员 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("添加人员失败!",e);
+            throw new RuntimeException("添加人员失败!");
+        }
+
+        return data;
+    }
+
+    /**
+     * 批量开卡
+     *
+     * 其中参数 cardAndPerson 形式为“卡号，人员ID”，开卡数量不得超过50个，若没有该卡号，则添加一张新卡进行绑定 List<String>
+     * @return
+     */
+    public static String openCard(Map<String,Object> map){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_OPEN_CARD;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("cardAndPerson",map.get("cardAndPerson"));
+        parMap.put("startTime",map.get("startTime"));
+        parMap.put("endTime",map.get("endTime"));
+        parMap.put("subSystems","1048576,3145728,2097152,9437184,25165824,10485760");
+        String params =  JSON.toJSONString(parMap);
+        log.info("批量开卡 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("批量开卡 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("批量开卡失败!",e);
+            throw new RuntimeException("批量开卡失败!");
+        }
+
+        return data;
+    }
+
+    /**
+     * 根据中心UUID集获取中心下的门禁设备信息
+     *
+     * @return
+     */
+    public static String getACDevicesByUnitUuids(){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo",1);
+        parMap.put("pageSize",10);
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("unitUuids","1048576");
+        String params =  JSON.toJSONString(parMap);
+        log.info("获取中心UUID集获取中心下的门禁设备请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("获取 中心UUID集获取中心下的门禁设备 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取失败!",e);
+            throw new RuntimeException("获取失败!");
+        }
+
+        return data;
+    }
+
+    /**
+     * 分页获取门禁点信息。
+     *
+     * @return
+     */
+    public static String getDoors(){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo",1);
+        parMap.put("pageSize",10);
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        String params =  JSON.toJSONString(parMap);
+        log.info("分页获取门禁点信息请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("分页获取门禁点信息 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取失败!",e);
+            throw new RuntimeException("获取失败!");
+        }
+
+        return data;
+    }
+
+    /**
+     * 批量获取控制中心信息，多个中心的UUID用“,”分割组成的字符串。
+     *
+     * @return
+     */
+    public static String getUnitsByUuids(){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo",1);
+        parMap.put("pageSize",10);
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("unitUuids","1048576");
+        String params =  JSON.toJSONString(parMap);
+        log.info("获取控制中心信息请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("获取控制中心信息 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取控制中心信息失败!",e);
+            throw new RuntimeException("获取控制中心信息失败!");
+        }
+
+        return data;
+    }
+
+    /**
+     *  根据中心UUID分页获取下级区域
+     * @return
+     */
+    public static String getRegionsByUnitUuid(){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo",1);
+        parMap.put("pageSize",10);
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("parentUuid","1048576");
+        parMap.put("allChildren",1);
+        String params =  JSON.toJSONString(parMap);
+        log.info("根据中心UUID分页获取下级区域请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("根据中心UUID分页获取下级区域 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("根据中心UUID分页获取下级区域获取失败!",e);
+            throw new RuntimeException("根据中心UUID分页获取下级区域获取失败!");
+        }
+
+        return data;
+    }
+
+    /**
+     * 根据区域UUID集获取门禁点
+     * @return
+     */
+    public static String getDoorsByRegionUuids(){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOORS_BY_REGION_UUIDS;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("regionUuids","2a36878c9a4a49d290d253ac1b4746dc");
+        String params =  JSON.toJSONString(parMap);
+        log.info("根据区域UUID集获取门禁点请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("根据区域UUID集获取门禁点 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("根据区域UUID集获取门禁点获取失败!",e);
+            throw new RuntimeException("根据区域UUID集获取门禁点获取失败!");
+        }
+
+        return data;
+    }
+
+    /**
+     * 根据人员ID集添加权限
+     * @return
+     */
+    public static String addAuthoritiesByPersonIds(String personIds){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ADD_AUTHORITIES_BY_PERSONIDS;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("personIds",personIds);
+        parMap.put("doorGroupUuids","");
+        parMap.put("doorUuids","57231a05fd3b45f7a2570a28a85821c4,efcb9a3fe4e64e2f9c0f546c54465524,9da7c0073138453fa7782b629743cff7,85c22fde220d4b35ac13f805f05fd04c");
+        String params =  JSON.toJSONString(parMap);
+        log.info("根据人员ID集添加权限请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("根据人员ID集添加权限 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("根据人员ID集添加权限!",e);
+            throw new RuntimeException("根据人员ID集添加权限!");
+        }
+
+        return data;
+    }
+
+    /**
+     * 根据设备UUID集异动下载门禁权限
+     * @return
+     */
+    public static String downloadAuthorityByDeviceUuids(){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_AUTHORITY_BY_DEVICEUUIDS;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("deviceUuids","57231a05fd3b45f7a2570a28a85821c4,efcb9a3fe4e64e2f9c0f546c54465524,9da7c0073138453fa7782b629743cff7,85c22fde220d4b35ac13f805f05fd04c");
+        String params =  JSON.toJSONString(parMap);
+        log.info("根据设备UUID集异动下载门禁权限请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("根据设备UUID集异动下载门禁权限 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("根据设备UUID集异动下载门禁权限获取失败!",e);
+            throw new RuntimeException("根据设备UUID集异动下载门禁权限获取失败!");
+        }
+
+        return data;
+    }
+
+    /**
+     * 指定人员人脸/指纹权限下载
+     * @return
+     */
+    public static String downloadFaceAndFingerInfos(String personIds){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_FACE_AND_FINGERINFOS;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("deviceUuids","83dfab0eef52411d991d6e621296b60a,dfd80b22f00545b8b36fa981019df83c");
+        parMap.put("personIds",personIds);
+        parMap.put("type",1);
+        String params =  JSON.toJSONString(parMap);
+        log.info("指定人员人脸/指纹权限下载 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("指定人员人脸/指纹权限下载 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("指定人员人脸/指纹权限下载获取失败!",e);
+            throw new RuntimeException("指定人员人脸/指纹权限下载获取失败!");
+        }
+
+        return data;
+    }
+    /**
+     * 添加人脸
+     * faceImg 图片
+     * personNo 人员编号
+     * personName 名称
+     * @return
+     */
+    public static String HKpersonGroupId(MultipartFile faceImg,Integer personNo,String personName){
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADD_USER;
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("appkey", HKConstant.APPKEY);
+        map.put("time", System.currentTimeMillis());
+        map.put("token", HKConstant.SECRET);
+        map.put("opUserUuid",HKConstant.OP_USER_UUID);
+        map.put("personNo",personNo);
+        map.put("personName",personName);
+        String params =  JSON.toJSONString(map);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("添加人脸失败!");
+        }
+        return data;
+    }
+
+
+    /**
+     * 修改人脸
+     * faceImg 图片
+     * personId人员ID
+     * personNo 人员编号
+     * personName 名称
+     *  * personName 卡号
+     * @return
+     */
+    public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Integer personNo,String personName,String cardNo) {
+        byte [] fileByte = new byte[0];
+        try {
+            fileByte = faceImg.getBytes();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        byte[] imgs=PicUtils.compressPicForScale(fileByte,99L,"x");
+
+        String img = PicUtils.getImgStr(imgs);
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("appkey", HKConstant.APPKEY);
+        map.put("time", System.currentTimeMillis());
+        map.put("token", HKConstant.SECRET);
+        map.put("opUserUuid", HKConstant.OP_USER_UUID);
+        map.put("personId", personId);
+        map.put("personNo", personNo);
+        map.put("personName", personName);
+        map.put("facePhoto", img);
+        map.put("cardNo", cardNo);
+        String params = JSON.toJSONString(map);
+        log.info("修改人脸 请求参数：{}",params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("修改人脸请求结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("修改人脸 请求失败：{}",e);
+            throw new RuntimeException("修改人脸失败!");
+        }
+
+        return data;
+    }
+
+    /**
+     * 修改人员
+     *
+     *  比如 住户
+     *
+     * @return
+     */
+    public static String updateUser(Map<String,Object> map) {
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
+        Map<String, Object> parMap = new HashMap<String, Object>();
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("personNo",map.get("personNo"));
+        parMap.put("personId",map.get("personId"));
+        parMap.put("personName",map.get("personName"));
+        parMap.put("phoneNo",map.get("phoneNo"));
+        parMap.put("deptUuid",map.get("deptUuid"));
+        String params =  JSON.toJSONString(parMap);
+        log.info("修改人员 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("修改人员 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("修改加人员失败!",e);
+            throw new RuntimeException("修改加人员失败!");
+        }
+        return data;
+    }
+
+
+    /**
+     * 未预约登记
+     * @param visitorName 访客姓名
+     * @param phoneNo 联系电话
+     * @param personNum 来访人数
+     * @param startTime 来访时间
+     * @param endTime 离开时间
+     * @param personId 被访人ID
+     * @return
+     */
+    public static String temporaryRegister(String visitorName, String phoneNo,Integer personNum,Long startTime,Long endTime,Integer personId){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.TEMPORARY_REGISTER;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        
+        parMap.put("visitorName",visitorName);
+        parMap.put("gender",1);
+        parMap.put("identityType",0);
+        parMap.put("phoneNo",phoneNo);
+        parMap.put("personNum",personNum);
+        parMap.put("startTime",startTime);
+        parMap.put("endTime",endTime);
+        parMap.put("isVip",0);
+        parMap.put("personId",personId);
+        String params =  JSON.toJSONString(parMap);
+        log.info("未预约登记 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("未预约登记 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取失败!",e);
+            throw new RuntimeException("获取失败!");
+        }
+    
+        return data;
+    }
+    
+    public static void main(String[] args) {
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + "/openapi/service/eps/subscribeEventsFromMQEx";
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("eventTypes","198914,199941");
+        //parMap.put("subSystemUuid","3145728");
+        String params =  JSON.toJSONString(parMap);
+        log.info("分页获取门禁点信息请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info(" 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取失败!",e);
+            throw new RuntimeException("获取失败!");
+        }
+
+        System.out.println(data);
+
+    }
+
+}

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

@@ -0,0 +1,40 @@
+package com.community.huiju.common.hk.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 响应 监控中心 实体类
+ * @author weiximei
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class MonitoryPoint {
+
+    private Integer errorCode;
+
+    private String errorMessage;
+
+    private String data;
+
+
+    private class MonitoryPointData {
+        Integer total;
+        Integer pageNo;
+        Integer pageSize;
+        String list;
+
+
+    }
+
+    private class MonitoryPointList {
+
+        String cameraUuid;
+        String cameraName;
+
+    }
+
+
+}

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

@@ -0,0 +1,210 @@
+package com.community.huiju.common.hk.test;
+
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.community.commom.hk.Digests;
+import com.community.commom.hk.HttpClientSSLUtils;
+
+
+/**
+ * openapi 测试DEMO
+ * 客户开发的时候可以参考此代码编写自己的应用
+ * 也可以使用demo中的jar包，不过jar包使用务必使用全套，
+ * 万不可只取其中一部分，避免依赖破坏
+ * @author shengyiling
+ *
+ */
+class OpenapiTest {
+	
+	/**
+	 * APPKEY需要到部署的平台服务器上生成。
+	 * <p>
+	 * 调用Openpai的操作码，需要去平台上生成，详见《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》中[获取AppKey和Secret]章节说明
+	 * </p>
+	 * <p>
+	 * 《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》 该文档请找技术支持或者交付的同事提供
+	 * </p>
+	 */
+	private static final String APPKEY = "b4434b13";
+	
+	/**
+	 * SECRET需要到部署的平台服务器上生成。
+	 * <p>
+	 * 调用Openpai的操作码，需要去平台上生成，详见《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》中[获取AppKey和Secret]章节说明
+	 * </p>
+	 * <p>
+	 * 《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》 该文档请找技术支持或者交付的同事提供
+	 * </p>
+	 */
+	private static final String SECRET = "64a1f32d53784ce2a34bd81822db1b91";
+	
+	
+	/**
+	 * http请求地址
+	 * <p>openapi的地址,默认情况下openapi的IP端口与基础应用的IP端口是一致的</p>
+	 * <p>请将地址配置正确.</p>
+	 * <p>默认情况下是127.0.0.1:80 ，如果地址不通请根据实际情况修改IP端口</p>
+ 	 */
+	private static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
+	
+	/**
+	 * https请求地址
+	 * <p>openapi的地址,默认情况下openapi的IP端口与基础应用的IP端口是一致的</p>
+	 * <p>请将地址配置正确.</p>
+	 * <p>默认情况下是127.0.0.1:443 ，如果地址不通请根据实际情况修改IP端口</p>
+ 	 */
+	private static final String OPENAPI_IP_PORT_HTTPS = "https://127.0.0.1:443";
+	
+	/**
+	 * 获取默认用户UUID的接口地址，此地址可以从《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》中具体的接口说明上获取
+	 */
+	private static final String ITF_ADDRESS_GET_DEFAULT_USER_UUID = "/openapi/service/base/user/getDefaultUserUuid";
+	
+	/**
+	 * 分页获取监控点信息的接口地址，此地址可以从《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》中具体的接口说明上获取
+	 */
+	private static final String ITF_ADDRESS_GET_CAMERAS = "/openapi/service/vss/res/getCameras";
+	
+	/**
+	 * <p>操作用户UUID，即用户UUID，首次使用操作用户UUID可以通过接口 [获取默认用户UUID]来获取</p>
+	 * <p>也可以通过接口[分页获取用户]来获取</p>
+	 */
+//	private static final String OP_USER_UUID = "0be83d40695011e7981e0f190ed6d2e7";
+	private static final String OP_USER_UUID = "5b2eb534696b11e89c2e438f92627767";
+	
+	/**
+	 * 测试方法
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+
+		/***http方式调用***/
+		//System.out.println(testGetDefaultUserUUID());
+		//System.out.println(testGetCameras());
+//		
+//		/***https方式调用***/
+//		System.out.println(testGetDefaultUserUUID_Https());
+//		System.out.println(testGetCameras_Https());
+
+		LocalDate today = LocalDate.now();
+		int year = today.getYear();
+		// 加上20, 表示加上20年,默认
+
+		int month = today.getMonthValue();
+		int day = today.getDayOfMonth();
+
+	}
+	
+	/**
+	 * HTTP方式
+	 * 获取默认用户UUID 测试
+	 * @return
+	 * @throws Exception
+	 */
+	private static String testGetDefaultUserUUID() throws Exception{
+		String url = OPENAPI_IP_PORT_HTTP + ITF_ADDRESS_GET_DEFAULT_USER_UUID;
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("appkey", APPKEY);//设置APPKEY
+		map.put("time", System.currentTimeMillis());//设置时间参数
+		String params =  JSON.toJSONString(map);
+		System.out.println(" ====== testGetDefaultUserUUID 请求参数：【" + params + "】");
+		String data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, SECRET), params);
+		System.out.println(" ====== testGetDefaultUserUUID 请求返回结果：【{" + data + "}】");
+		
+		return data;
+	}
+	
+	/** 
+	 * HTTP方式
+	 * 分页获取监控点信息 测试
+	 * @return
+	 * @throws Exception
+	 */
+	private static String testGetCameras() throws Exception{
+		 String url = OPENAPI_IP_PORT_HTTP + ITF_ADDRESS_GET_CAMERAS;
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("appkey", APPKEY);//设置APPKEY
+        map.put("time", System.currentTimeMillis());//设置时间参数
+        map.put("pageNo", 1);//设置分页参数
+        map.put("pageSize", 5);//设置分页参数
+        map.put("opUserUuid", OP_USER_UUID);//设置操作用户UUID
+        String params = JSON.toJSONString(map);
+        System.out.println(" ====== getCameras请求参数：【" + params + "】");
+        String data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, null, SECRET), params);
+        System.out.println(" ====== getCameras请求返回结果：【{" + data + "}】");
+        
+        return data;
+	}
+	
+	/**
+	 * HTTPS方式
+	 * 获取默认用户UUID 测试
+	 * @return
+	 * @throws Exception
+	 */
+	private static String testGetDefaultUserUUID_Https() throws Exception{
+		String url = OPENAPI_IP_PORT_HTTPS + ITF_ADDRESS_GET_DEFAULT_USER_UUID;
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("appkey", APPKEY);//设置APPKEY
+		map.put("time", System.currentTimeMillis());//设置时间参数
+		String params =  JSON.toJSONString(map);
+		System.out.println("============" + params + "============");
+		String data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, null, SECRET), params);
+		System.out.println("============" + data + "============");
+		
+		return data;
+	}
+	
+	/**
+	 * HTTPS方式
+	 * 分页获取监控点信息 测试
+	 * @return
+	 * @throws Exception
+	 */
+	private static String testGetCameras_Https() throws Exception{
+		 String url = OPENAPI_IP_PORT_HTTPS + ITF_ADDRESS_GET_CAMERAS;
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("appkey", APPKEY);//设置APPKEY
+        map.put("time", System.currentTimeMillis());//设置时间参数
+        map.put("pageNo", 1);//设置分页参数
+        map.put("pageSize", 5);//设置分页参数
+        map.put("opUserUuid", OP_USER_UUID);//设置操作用户UUID
+        String params = JSON.toJSONString(map);
+        System.out.println(" ====== getCameras请求参数：【" + params + "】");
+        String data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, null, SECRET), params);
+        System.out.println(" ====== getCameras请求返回结果：【{" + data + "}】");
+        
+        return data;
+	}
+
+
+
+	/**
+	 * HTTPS方式
+	 * 分页获取监控点信息 测试
+	 * @return
+	 * @throws Exception
+	 */
+	private static String testGetDoorEventsHistory() throws Exception{
+		String url = OPENAPI_IP_PORT_HTTPS + "/openapi/service/acs/event/getDoorEventsHistory";
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("appkey", APPKEY);//设置APPKEY
+		map.put("time", System.currentTimeMillis());//设置时间参数
+		map.put("pageNo", 1);//设置分页参数
+		map.put("pageSize", 5);//设置分页参数
+		map.put("opUserUuid", OP_USER_UUID);//设置操作用户UUID
+		String params = JSON.toJSONString(map);
+		System.out.println(" ====== getCameras请求参数：【" + params + "】");
+		String data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, null, SECRET), params);
+		System.out.println(" ====== getCameras请求返回结果：【{" + data + "}】");
+
+		return data;
+	}
+
+
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/config/HttpSessionConfig.java

@@ -2,6 +2,7 @@ package com.community.huiju.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.session.MapSession;
 import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
 import org.springframework.session.web.http.HeaderHttpSessionIdResolver;
 import org.springframework.session.web.http.HttpSessionIdResolver;
@@ -10,7 +11,7 @@ import org.springframework.session.web.http.HttpSessionIdResolver;
  * @author weiximei
  */
 @Configuration
-@EnableJdbcHttpSession
+@EnableJdbcHttpSession(maxInactiveIntervalInSeconds = MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS*4)
 public class HttpSessionConfig {
 
     @Bean

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

@@ -0,0 +1,76 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaSysMenu;
+import com.community.huiju.model.ToBanner;
+import com.community.huiju.service.BannerServiceI;
+import com.community.huiju.service.MenuServiceI;
+import com.community.huiju.service.MessageServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.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.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2018-11-05
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "首页聚合API", description = "首页聚合API")
+public class AssembleController extends BaseController {
+	
+	@Autowired
+	private MenuServiceI menuService;
+	
+	@Autowired
+	private BannerServiceI bannerService;
+	
+	@Autowired
+	private MessageServiceI messageService;
+	
+	@ApiOperation(value = "首页数据获取接口", notes = "首页数据获取接口")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
+	@RequestMapping(value = "/index/{communityId}",method = RequestMethod.GET)
+	public ResponseBean getIndexData(@PathVariable("communityId") Integer communityId, HttpSession session){
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		Integer userId = userElement.getId();
+		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
+		Map<String,Object> indexMap = new HashMap<>();
+		//获取菜单数据
+		List<TaSysMenu> menuList = menuService.getMenuList(communityId);
+		//获取首页banner数据
+		List<ToBanner> toBannerList = bannerService.viewAllBannerImg();
+		//获取消息总数接口
+		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userId);
+		
+		//组装数据
+		indexMap.put("menuList",menuList);
+		indexMap.put("bannerList",toBannerList);
+		indexMap.put("messageTotal",totalMap.get("messageTotal"));
+		indexMap.put("toDoTotal",totalMap.get("toDoTotal"));
+		responseBean.addSuccess(indexMap);
+		return responseBean;
+	}
+}

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

@@ -0,0 +1,27 @@
+package com.community.huiju.controller;
+
+import com.community.huiju.model.ToCommunities;
+import com.community.huiju.service.CommunityServiceI;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 公共 controller
+ */
+public class BaseController {
+
+    @Autowired
+    private CommunityServiceI community;
+
+    /**
+     * 校验小区是否存在
+     * @return
+     */
+    protected boolean check(Integer communityId){
+        ToCommunities toCommunities = community.getByCommunityId(communityId);
+        if (null != toCommunities) {
+            return true;
+        }
+        return false;
+    }
+
+}

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

@@ -28,7 +28,7 @@ import java.util.Map;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "缴费相关的API", description = "缴费相关的API")
-public class BillController {
+public class BillController extends BaseController {
 	
 	@Autowired
 	private BillServiceI billServiceI;
@@ -37,7 +37,9 @@ public class BillController {
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
 			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "payType", value = "0是未缴费1是已缴费"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
-			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+	})
 	@RequestMapping(value = "/bills/{communityId}/{payType}",method = RequestMethod.GET)
 	public ResponseBean getBillInvoice(@PathVariable Integer communityId,
 									   @PathVariable Integer payType,
@@ -46,8 +48,14 @@ public class BillController {
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
-		List<Map<String,Object>> billsList = billServiceI.getBillsList(communityId, payType, userId, pageNum, pageSize);
-		responseBean.addSuccess(billsList);
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
+		Map<String, Object> map = billServiceI.getBillsList(communityId, payType, userId, pageNum, pageSize);
+		responseBean.addSuccess(map);
 		return responseBean;
 	}
 	
@@ -57,6 +65,12 @@ public class BillController {
 	@RequestMapping(value = "/bill/{communityId}/{billInvoiceId}",method = RequestMethod.GET)
 	public ResponseBean getBillInvoiceDetail(@PathVariable Integer communityId,@PathVariable Integer billInvoiceId){
 		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
 		Map<String,Object> billInvoiceMap = billServiceI.getBillInvoiceDetail(communityId,billInvoiceId);
 		responseBean.addSuccess(billInvoiceMap);
 		return responseBean;

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

@@ -0,0 +1,73 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.FaceServiceI;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpSession;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "人脸相关API", description = "人脸相关API")
+public class FaceController {
+    @Autowired
+    private FaceServiceI faceServicel;
+
+    @ApiOperation(value = "添加人脸图片", notes = "添加人脸图片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserID",value = "家属或租户ID,不填为本人")
+    })
+    
+    @RequestMapping(value = "/addFace",method = RequestMethod.POST)
+    public Object getTaFace(HttpSession session,
+                            @ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
+                            @RequestParam(required = false) Integer otherUserID){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        responseBean = faceServicel.addFace(userId ,uploadFile,otherUserID);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "修改人脸图片", notes = "修改人脸图片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserID",value = "家属或租户ID,不填为本人")
+    })
+    @RequestMapping(value = "/upDateFace",method = RequestMethod.POST)
+    public Object upDateTaFace(HttpSession session,
+                               @ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
+                               @RequestParam(required = false) Integer otherUserID
+                               ){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+         responseBean = faceServicel.upDateFace(userId,uploadFile,otherUserID);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取当前已录入人脸信息", notes = "获取当前已录入人脸信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserID",value = "家属或租户ID,不填为本人")
+    })
+    @RequestMapping(value = "/getUserIdFace",method = RequestMethod.GET)
+    public Object getTaFaceByUserId(HttpSession session, @RequestParam(required = false) Integer otherUserID){
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        ResponseBean responseBean = faceServicel.getTaFaceByUserId(userId,otherUserID);
+        return responseBean;
+    }
+
+}

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

@@ -1,13 +1,21 @@
 package com.community.huiju.controller;
 
-import com.aliyun.oss.OSSClient;
-import io.swagger.annotations.*;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.ImageServiceI;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+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.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.ByteArrayInputStream;
-import java.util.Date;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author weichaochao
@@ -21,27 +29,19 @@ import java.util.Date;
 @Api(value = "图片操作API", description = "图片操作API")
 public class ImageController {
 
-    private static String endpoint = "http://oss-cn-hangzhou.aliyuncs.com";
-    private static String accessKeyId = "LTAIiG6xeHbVzTXC";
-    private static String accessKeySecret = "YUci8oBtm5WzobH6SP2eyZUbjCBKBo";
-    private static String bucketName = "imgurlspace";
+    @Autowired
+    private ImageServiceI imageService;
 
     @ApiOperation(value = "图片上传以及获取url", notes = "图片上传以及获取url")
-    @PostMapping(value = "/getUrl", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-    public String uploadImgAndGetUrl(@ApiParam(value = "file" ,required = true) MultipartFile uploadFile) throws Exception {
-
-        String imgName = System.currentTimeMillis() + ".png";
-        // 创建OSSClient实例
-        OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
-        // 上传
-        long time = System.currentTimeMillis();
-
-        ossClient.putObject(bucketName, imgName, new ByteArrayInputStream(uploadFile.getBytes()));
-
-        // 关闭client
-        ossClient.shutdown();
-        Date expiration = new Date(time + 3600 * 1000 * 24 * 365 * 10);
-        String url = ossClient.generatePresignedUrl(bucketName, imgName, expiration).toString();
-        return url;
+    @PostMapping(value = "/uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean uploadImgAndGetUrl(@ApiParam(value = "uploadFiles" ,required = true) MultipartFile[] uploadFiles) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+        List<String> urls = new ArrayList<String>();
+        for (MultipartFile uploadFile : uploadFiles){
+            String url = imageService.getImageUrl(uploadFile);
+            urls.add(url);
+        }
+        responseBean.addSuccess(urls);
+        return responseBean;
     }
 }

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

@@ -0,0 +1,51 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaSysMenu;
+import com.community.huiju.service.MenuServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.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;
+import java.util.Map;
+
+/**
+ * @author FXF
+ * @date 2018-11-05
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "菜单API", description = "菜单API")
+public class MenuController extends BaseController {
+	
+	@Autowired
+	private MenuServiceI menuService;
+	
+	@ApiOperation(value = "按小区获取菜单列表", notes = "按小区获取菜单列表")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id")})
+	@RequestMapping(value = "/menus/{communityId}",method = RequestMethod.GET)
+	public ResponseBean getMenuList(@PathVariable Integer communityId, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
+		List<TaSysMenu> list = menuService.getMenuList(communityId);
+		responseBean.addSuccess(list);
+		return responseBean;
+	}
+}

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

@@ -3,8 +3,6 @@ package com.community.huiju.controller;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
-import com.community.huiju.model.ToCommunities;
-import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.MessageServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -19,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpSession;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,7 +27,7 @@ import java.util.Map;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "消息相关的API",description = "消息相关的API")
-public class MessageController {
+public class MessageController extends BaseController {
 	
 	@Autowired
 	private MessageServiceI messageService;
@@ -43,6 +40,12 @@ public class MessageController {
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
 		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userId);
 		responseBean.addSuccess(totalMap);
 		return responseBean;
@@ -60,8 +63,12 @@ public class MessageController {
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
-		List<TpMessage> newsList = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS, userId);
-		responseBean.addSuccess(newsList);
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+		Map<String,Object> map = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS, userId);
+		responseBean.addSuccess(map);
 		return responseBean;
 	}
 	
@@ -77,8 +84,13 @@ public class MessageController {
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
-		List<TpMessage> upcomingList = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING, userId);
-		responseBean.addSuccess(upcomingList);
+		
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+		Map<String,Object> map = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING, userId);
+		responseBean.addSuccess(map);
 		return responseBean;
 	}
 
@@ -90,6 +102,12 @@ public class MessageController {
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
 		messageService.updateMessageReadStatus(communityId, userId);
 		return responseBean;
 	}

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

@@ -0,0 +1,69 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.IMonitoringService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * 监控 控制器
+ * @author weiximei
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "监控 控制器", description = "监控相关的数据")
+public class MonitoringController extends BaseController {
+
+    @Autowired
+    private IMonitoringService iMonitoringService;
+
+    @ApiOperation(value = "获取监控列表数据",notes = "根据小区ID获取")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行")
+    })
+    @RequestMapping(value = "/monitoring/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getList(@PathVariable("communityId") Integer communityId,
+                                @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+                                @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean response = new ResponseBean();
+        if (!check(communityId)) {
+            response.addError("小区不存在");
+            return response;
+        }
+
+        response = iMonitoringService.getByCommunityId(communityId,pageNo,pageSize);
+        return response;
+    }
+
+
+    @ApiOperation(value = "获取监控列表token",notes = "根据小区ID获取")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行")
+    })
+    @RequestMapping(value = "/monitoring/token/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getMonitoringToken(@PathVariable("communityId") Integer communityId,
+                                @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+                                @RequestParam(value = "pageSize",defaultValue = "100") Integer pageSize){
+        ResponseBean response = new ResponseBean();
+        if (!check(communityId)) {
+            response.addError("小区不存在");
+            return response;
+        }
+
+        response = iMonitoringService.getMonitoringToken(communityId,pageNo,pageSize);
+        return response;
+    }
+
+}

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

@@ -8,15 +8,14 @@ import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTransaction;
 import com.community.huiju.service.SocialServiceI;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 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 java.io.IOException;
 import java.util.List;
 
 /**
@@ -28,7 +27,7 @@ import java.util.List;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "app端论坛相关的API", description = "app端论坛相关的API")
-public class SocialController {
+public class SocialController extends BaseController {
 
     @Autowired
     private SocialServiceI socialServiceI;
@@ -42,6 +41,12 @@ public class SocialController {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         TpAnnouncement tpAnnouncement = socialServiceI.findAnnouncementDetail(id, communityId, userId);
         responseBean.addSuccess(tpAnnouncement);
         return responseBean;
@@ -49,29 +54,116 @@ public class SocialController {
 
     @RequestMapping(value = "/sign/{communityId}", method = RequestMethod.POST)
     @ApiOperation(value = "活动报名接口", notes = "活动报名接口")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "remark", value = "活动备注"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    public ResponseBean SignActivity(@PathVariable(value = "communityId") Integer communityId,
+                                     @RequestParam(value = "remark", required = false) String remark,
+                                     @RequestParam("activityId") Integer activityId,
+                                     HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = socialServiceI.findTaUserInfo(activityId, communityId, userId,remark);
+        return responseBean;
+    }
+    
+    @RequestMapping(value = "/sign/cancel/{communityId}", method = RequestMethod.POST)
+    @ApiOperation(value = "取消活动报名接口", notes = "取消活动报名接口")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    public ResponseBean cancelSignActivity(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        
+        ResponseBean responseBean = new ResponseBean();
+        
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+        //取消报名
+        responseBean = socialServiceI.cancelSignActivity(activityId, communityId, userId);
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/sign/{communityId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "修改活动报名接口", notes = "修改活动报名接口")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "remark", value = "活动备注"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    public ResponseBean updateSignActivity(@PathVariable(value = "communityId") Integer communityId,
+                                     @RequestParam(value = "remark", required = false) String remark,
+                                     @RequestParam("activityId") Integer activityId,
+                                     HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+
+        ResponseBean responseBean = new ResponseBean();
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = socialServiceI.updateActivtiySignUp(activityId, communityId, userId,remark);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/sign/{communityId}", method = RequestMethod.GET)
+    @ApiOperation(value = "查看 活动报名情况", notes = "查看 活动报名情")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
-    public ResponseBean SignActivity(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
+    public ResponseBean getSignActivityUp(@PathVariable(value = "communityId") Integer communityId,
+                                           @RequestParam("activityId") Integer activityId,
+                                           HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean responseBean = socialServiceI.findTaUserInfo(activityId, communityId, userId);
+
+        ResponseBean responseBean = new ResponseBean();
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = socialServiceI.getActivtiySignUp(activityId, communityId, userId);
         return responseBean;
     }
 
+
+
+
+
     @ApiOperation(value = "按小区获取分页公告列表", notes = "按小区获取分页公告列表,公告标题模糊查询")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "title", value = "公告标题"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
     @RequestMapping(value = "/announcements/{communityId}", method = RequestMethod.GET)
-    public ResponseBean getAnnouncements(@PathVariable Integer communityId, @RequestParam String title,
+    public ResponseBean getAnnouncements(@PathVariable Integer communityId,
+                                         @RequestParam(required = false) String title,
                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                          @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
-        List<TpAnnouncement> announcementList = socialServiceI.getAnnouncements(communityId, title, pageNum, pageSize);
-        responseBean.addSuccess(announcementList);
-        return responseBean;
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        ResponseBean announcementList = socialServiceI.getAnnouncements(communityId, title, pageNum, pageSize);
+        return announcementList;
     }
 
     @ApiOperation(value = "获取公告轮播图", notes = "获取公告轮播图")
@@ -81,6 +173,12 @@ public class SocialController {
     @RequestMapping(value = "/announcement/Img/{communityId}", method = RequestMethod.GET)
     public ResponseBean getAnnouncement(@PathVariable(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         List<TpAnnouncement> agreement = socialServiceI.getAnnouncement(communityId);
         responseBean.addSuccess(agreement);
         return responseBean;
@@ -93,6 +191,12 @@ public class SocialController {
     @RequestMapping(value = "/activity/Img/{communityId}", method = RequestMethod.GET)
     public ResponseBean getActivity(@PathVariable(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         List<TpActivity> agreement = socialServiceI.getActivity(communityId);
         responseBean.addSuccess(agreement);
         return responseBean;
@@ -105,13 +209,19 @@ public class SocialController {
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
     @RequestMapping(value = "/activitys/{communityId}", method = RequestMethod.GET)
-    public ResponseBean getActivitys(@PathVariable Integer communityId, @RequestParam String title,
+    public ResponseBean getActivitys(@PathVariable Integer communityId,
+                                     @RequestParam(required = false) String title,
                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                      @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
-        List<TpActivity> activityList = socialServiceI.getActivitys(communityId, title, pageNum, pageSize);
-        responseBean.addSuccess(activityList);
-        return responseBean;
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        ResponseBean activityList = socialServiceI.getActivitys(communityId, title, pageNum, pageSize);
+        return activityList;
     }
 
     @ApiOperation(value = "论坛活动帖子详情", notes = "获取论坛活动帖子详情")
@@ -123,6 +233,12 @@ public class SocialController {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         TpActivity activity = socialServiceI.findActivityDetail(activityId, communityId, userId);
         responseBean.addSuccess(activity);
         return responseBean;
@@ -137,6 +253,12 @@ public class SocialController {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         TpTransaction activity = socialServiceI.findUsedDetails(activityId, communityId, userId);
         responseBean.addSuccess(activity);
         return responseBean;
@@ -145,27 +267,36 @@ public class SocialController {
     @ApiOperation(value = "获取所有的二手租赁帖子", notes = "获取所有的二手租赁帖子")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "帖子标题"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
-    @RequestMapping(value = "/getTransactions /{communityId}", method = RequestMethod.GET)
-    public ResponseBean getAllPosts(@PathVariable("communityId") Integer communityId, @RequestParam("type") String type,
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")}
+    )
+    @RequestMapping(value = "/getTransactions/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getAllPosts(@PathVariable("communityId") Integer communityId,
+                                    @RequestParam(value = "type", required = false) String type,
+                                    @RequestParam(value = "transactionTitle",required = false) String transactionTitle,
                                     @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                     @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
-        List<TpTransaction> tpTransactions = socialServiceI.findAllTransaction(communityId, type, pageNum, pageSize);
-        responseBean.addSuccess(tpTransactions);
-        return responseBean;
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        ResponseBean tpTransactions = socialServiceI.findAllTransaction(communityId, transactionTitle,type, pageNum, pageSize);
+        return tpTransactions;
     }
 
     @ApiOperation(value = "添加二手租赁帖子", notes = "添加二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "title:小区标题，content：小区类容, type"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="title:小区标题, imageUrl:图片URL地址, content:小区内容, type:0二手,1求购,2租赁"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransaction", method = RequestMethod.POST)
     @ResponseBody
-    public ResponseBean addTransaction(@RequestBody String paramets, HttpSession session) {
+    public ResponseBean addTransaction(@RequestBody String paramets, HttpSession session)throws IOException{
+
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
@@ -182,30 +313,46 @@ public class SocialController {
     })
     @RequestMapping(value = "/selectAllTransaction", method = RequestMethod.GET)
     public ResponseBean selectAllTransaction(HttpSession session,
+                                             @RequestParam(value = "type",required = false) Integer type,
                                              @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                              @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.selectAllTransaction(userId, pageNum, pageSize);
+        ResponseBean response = socialServiceI.selectAllTransaction(userId, pageNum, pageSize,type);
         return response;
     }
 
     @ApiOperation(value = "修改二手租赁帖子", notes = "修改二手租赁帖子")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "id:小区id,title:小区标题，content：小区类容"),
+                    "imageUrl:图片url,transactionTitle:小区标题，transactionContent：小区内容"),
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "id", value = "id:帖子id"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
-    @RequestMapping(value = "/updateTransaction/{Id}", method = RequestMethod.PUT)
-    public ResponseBean ubdateTransaction(HttpSession session, @RequestBody String paramets) {
+    @RequestMapping(value = "/updateTransaction/{id}", method = RequestMethod.PUT)
+    public ResponseBean ubdateTransaction(HttpSession session,@PathVariable("id") String id, @RequestBody String paramets) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.updateTransaction(paramets, userId);
+        ResponseBean response = socialServiceI.updateTransaction(paramets,userId,Integer.valueOf(id));
+        return response;
+    }
+
+    @ApiOperation(value = "删除二手租赁帖子", notes = "删除二手租赁帖子")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "id", value = "id:帖子id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/deleteTransaction/{id}", method = RequestMethod.DELETE)
+    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);
         return response;
     }
 
+
     @ApiOperation(value = "评价工单内容以及评分", notes = "评价工单内容以及评分")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType = "TpTicket"),
@@ -216,6 +363,12 @@ public class SocialController {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         socialServiceI.accessTicket(communityId, tpTicket, ticketId, userId);
         return responseBean;
     }

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

@@ -21,13 +21,14 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
+import java.io.IOException;
 import java.util.List;
 
 @RestController
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "工单相关的API",description = "工单相关的API")
-public class TicketController {
+public class TicketController extends BaseController {
 
     @Autowired
     private ITicketService iTicketService;
@@ -38,18 +39,23 @@ public class TicketController {
     @RequestMapping(value = "/tickets/{communityId}", method = RequestMethod.GET)
     @ApiOperation(value = "获取 报修/投诉/联系单 各3条数据", notes = "根据 小区编号,第几页,一页多少行")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区编号"),
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区编号"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum",value = "第几页"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少数据"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @Deprecated
-    public ResponseBean getService(@PathVariable(value = "communityId") String communityId,
+    public ResponseBean getService(@PathVariable(value = "communityId") Integer communityId,
                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                    @RequestParam(value = "pageSize", defaultValue = "3") Integer pageSize,
                                    HttpSession session) {
         ResponseBean response = new ResponseBean();
 
+        if (!check(communityId)) {
+            response.addError("小区不存在");
+            return response;
+        }
+
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 
         TpTicket tpTicket = new TpTicket();
@@ -62,13 +68,19 @@ public class TicketController {
 
     @ApiOperation(value = "获取报修/投诉/联系单进度详情数据", notes = "获取报修/投诉/联系单进度详情数据")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区编号"),
+            @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "communityId", value = "小区编号"),
             @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "ticketId", value = "报修id")
     })
     @RequestMapping(value = "/ticket/schedule/{communityId}", method = RequestMethod.GET)
-    public ResponseBean getTicketSchedule(@PathVariable(value = "communityId") String communityId, @RequestParam Integer ticketId) {
+    public ResponseBean getTicketSchedule(@PathVariable(value = "communityId") Integer communityId, @RequestParam Integer ticketId) {
         ResponseBean responseBean = new ResponseBean();
-        TpTicket ticket = iTicketService.getTicketSchedule(communityId, ticketId);
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        TpTicket ticket = iTicketService.getTicketSchedule(String.valueOf(communityId), ticketId);
         responseBean.addSuccess(ticket);
         return responseBean;
     }
@@ -76,20 +88,25 @@ public class TicketController {
     @RequestMapping(value = "/tickets/list/{communityId}", method = RequestMethod.GET)
     @ApiOperation(value = "获取 报修/投诉/联系单 数据列表", notes = "根据 小区编号,工单类型,第几页,一页多少行")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId", value = "小区编号"),
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId", value = "小区编号"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum", value = "第几页"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize", value = "一页多少数据"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "type", value = "工单类型 (0报修/1投诉/2联系单)"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "type", value = "工单类型 (1：投诉   2：报修 3：联系物业)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
 
     })
-    public ResponseBean getServiceList(@PathVariable(value = "communityId") String communityId,
+    public ResponseBean getServiceList(@PathVariable(value = "communityId") Integer communityId,
                                        @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                        @RequestParam(value = "type") String type,
                                        HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
 
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 
         TpTicket tpTicket = new TpTicket();
@@ -112,6 +129,12 @@ public class TicketController {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         tpTicketRecordComment.setCommunityId(communityId);
         Integer size = iTicketService.updateTicketsReply(tpTicketRecordComment, userId);
         if (size > 0){
@@ -122,40 +145,41 @@ public class TicketController {
         return responseBean;
     }
 
-    @ApiOperation(value = "添加报修", notes = "添加报修")
+    @ApiOperation(value = "添加 报修/投诉/联系单", notes = "添加 报修/投诉/联系单")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "ticketContent",value = "工单内容"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "ticketTitle",value = "工单标题"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "repairType",value = "报修房屋类型"),
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "ticketTitle:工单标题,ticketContent:工单内容，type: 1：投诉   2：报修 3：联系物业 , repairType：0:公共区域  1: 房屋质量  2:户内设施, imageUrl:图片地址 "),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
-    @RequestMapping(value = "/addAlltpTicket", method = RequestMethod.POST)
+    @RequestMapping(value = "/addtpTicket", method = RequestMethod.POST)
     @ResponseBody
-    public ResponseBean addTransaction(@RequestBody String parameter, HttpSession session) {
+    public ResponseBean addTransaction(@RequestBody String paramets, HttpSession session) throws IOException {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = iTicketService.addAiTicketService(userId, parameter);
+        ResponseBean response = iTicketService.addAiTicketService(userId, paramets);
         return response;
     }
 
     @ApiOperation(value = "物业，门卫，领导电话", notes = "物业，门卫，领导电话")
     @RequestMapping(value = "/allTpAnnouncementTel", method = RequestMethod.GET)
     public ResponseBean getTpAnnouncementTel() {
-        ResponseBean responseBean = new ResponseBean();
         ResponseBean agreement = agreementServicel.getTpAnnouncementTel();
-                responseBean.addSuccess(agreement);
-        return responseBean;
+        return agreement;
     }
 
-    @ApiOperation(value = "修改报修内容", notes = "修改报修内容")
+    @ApiOperation(value = "修改 报修/投诉/联系单", notes = "修改 报修/投诉/联系单")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "ticketId", value = "工单Id"),
             @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType = "TpTicket"),
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "type", value = "工单类型")})
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
     @RequestMapping(value = "/updateTicket/{ticketId}", method = RequestMethod.POST)
-    public ResponseBean updateTicketContent(@PathVariable("ticketId") Integer ticketId, @RequestBody TpTicket tpTicket, @RequestParam("type") String type) {
+    public ResponseBean updateTicketContent(@PathVariable("ticketId") Integer ticketId,
+                                            @RequestBody TpTicket tpTicket,
+                                            HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
-        iTicketService.updateTicketContent(ticketId, tpTicket, type);
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        responseBean = iTicketService.updateTicketContent(ticketId, tpTicket,userElement.getId());
         return responseBean;
     }
 
@@ -167,7 +191,14 @@ public class TicketController {
     public ResponseBean stopTicket(@PathVariable("communityId") Integer communityId, @RequestParam("ticketId") Integer ticketId, HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean responseBean = iTicketService.stopTpTicketRecord(communityId, ticketId, userId);
+
+        ResponseBean responseBean = new ResponseBean();
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = iTicketService.stopTpTicketRecord(communityId, ticketId, userId);
         return responseBean;
     }
 }

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

@@ -32,7 +32,7 @@ import java.util.List;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "用户相关操作的API",description = "用户相关操作的API")
-public class UserController {
+public class UserController extends BaseController {
 
     @Autowired
     private ITaUserService iTaUserService;
@@ -63,7 +63,6 @@ public class UserController {
     @ApiOperation(value = "修改手机号", notes = "修改手机号")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码)"),
-
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
             @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)
@@ -133,7 +132,7 @@ public class UserController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName(租客或者家属 姓名) " +
                     "phone(租客或者家属 手机号) " +
                     "gender(租客或者家属 性别 1男 2女) " +
-                    "type(1家属 0租客)"),
+                    "type(2租客 3家属)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/addTenantsOrDependents",method = RequestMethod.POST)
@@ -153,6 +152,33 @@ public class UserController {
     }
 
 
+    @ApiOperation(value = "业主修改 租客或家属", notes = "业主修改 租客或家属")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id(租客或者家属 ID) userName(租客或者家属 姓名) " +
+                    "phone(租客或者家属 手机号) " +
+                    "gender(租客或者家属 性别 1男 2女) " +
+                    "type(2租客 3家属)"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/user/updateTenantsOrDependents",method = RequestMethod.POST)
+    public ResponseBean updateTenantsOrDependents(@RequestBody String parameter,
+                                               HttpSession session){
+        ResponseBean response = new ResponseBean();
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        response = iTaUserService.updateTenantsOrDependents(jsonObject.getString("userName"),
+                jsonObject.getString("phone"),jsonObject.getString("gender"),
+                userElement.getId(),
+                jsonObject.getInteger("type"),
+                jsonObject.getInteger("id"));
+
+        return response;
+
+    }
+
+
+
     @ApiOperation(value = "修改用户头像", notes = "修改用户头像")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "headPortrait(用户头像)"),
@@ -170,16 +196,22 @@ public class UserController {
 
     }
 
-    @ApiOperation(value = "获取用户信息", notes = "获取用户信息")
+    @ApiOperation(value = "获取用户信息", notes = "获取用户信息, 携带userId表示查询租客或者家属")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "userId",value = "租客或者家属的ID(可选值)"),
     })
     @RequestMapping(value = "/user/info",method = RequestMethod.GET)
-    public ResponseBean getUserInfo(HttpSession session){
+    public ResponseBean getUserInfo(@RequestParam(value = "userId",required = false) Integer userId,
+                                    HttpSession session){
         ResponseBean response = new ResponseBean();
 
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        response = iTaUserService.getUserInfo(userElement.getId());
+        Integer id =  userElement.getId();
+
+        response = iTaUserService.getUserInfo(id,userId);
+        TaUserVO userVO = (TaUserVO) response.getData();
+        userVO.setToken(session.getId());
 
         return response;
 

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

@@ -1,5 +1,6 @@
 package com.community.huiju.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
@@ -26,21 +27,30 @@ import java.util.List;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "访客相关的API", description = "访客相关的API")
-public class VistorController {
+public class VistorController extends BaseController {
 
     @Autowired
     private TaVistorServiceI vistorServiceI;
 
     @RequestMapping(value = "/vistorDetail/{communityId}", method = RequestMethod.POST)
-    @ApiOperation(value = "获取访客信息", notes = "获取访客信息")
-    @ApiImplicitParams({@ApiImplicitParam(name = "taVisitor", value = "访客", required = true, dataType = "TaVisitor"),
+    @ApiOperation(value = "创建访客", notes = "创建访客")
+    @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id")})
-    public ResponseBean findVistorDetail(@PathVariable("communityId")Integer communityId, @RequestBody TaVisitor taVisitor, HttpSession session) {
+            @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "parameter", value = "carLicense:车牌(数组),drivingStatus:0 是不开车 1是开车," +
+                    "visitorName:访问人姓名,visitorNum:访问人数,visitorTel:访问人电话,visitorStatrtTime:访问人电话,visitorEndTime:访问人结束时间")})
+    public ResponseBean findVistorDetail(@PathVariable("communityId")Integer communityId, @RequestBody String parameter, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        vistorServiceI.insertTaVistor(taVisitor, communityId, userId);
+        TaVisitor taVisitor = JSONObject.parseObject(parameter,TaVisitor.class);
+        responseBean = vistorServiceI.insertTaVistor(taVisitor, communityId, userId);
         return  responseBean;
     }
 
@@ -50,6 +60,12 @@ public class VistorController {
             @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id")})
     public ResponseBean invateHis(@PathVariable("communityId")Integer communityId, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         List<TaVisitor> taVisitors = vistorServiceI.invateHis(communityId, userId);

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

@@ -0,0 +1,33 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaFace;
+import com.community.huiju.model.TpTicket;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TaFaceMapper{
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaFace record);
+
+    int insertSelective(TaFace record);
+
+    int selectByPrimaryKey(Integer id);
+
+    void updateByPrimaryKeySelective(TaFace record);
+
+    /**
+     * 查看当前用户信息
+     * @param userid
+     * @return
+     */
+    TaFace getByUserId(@Param("userid") Integer userid);
+
+    /**
+     * 查看当前信息
+     * @param id
+     * @return
+     */
+    TaFace getById(@Param("id")Integer id);
+}

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

@@ -0,0 +1,24 @@
+package com.community.huiju.dao;
+
+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 TaSysMenuImgMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaSysMenuImg record);
+
+    int insertSelective(TaSysMenuImg record);
+
+    TaSysMenuImg selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaSysMenuImg record);
+
+    int updateByPrimaryKey(TaSysMenuImg record);
+    
+    List<TaSysMenuImg> selectByMenuId(@Param("id") Integer id);
+}

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

@@ -0,0 +1,29 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaSysMenu;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TaSysMenuMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaSysMenu record);
+
+    int insertSelective(TaSysMenu record);
+
+    TaSysMenu selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaSysMenu record);
+
+    int updateByPrimaryKey(TaSysMenu record);
+    
+    /**
+     * 获取菜单列表
+     * @param communityId
+     * @return
+     */
+    List<TaSysMenu> selectByCommunity(@Param("communityId") Integer communityId);
+}

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

@@ -4,6 +4,8 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TaSysUserRole;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Map;
+
 @Mapper
 public interface TaSysUserRoleMapper {
     int deleteByPrimaryKey(Integer id);
@@ -19,4 +21,13 @@ public interface TaSysUserRoleMapper {
     int updateByPrimaryKey(TaSysUserRole record);
 
     Integer findSysUserRoleByUserIdAndRoleId(Integer userId);
+
+    /**
+     *    communityId 小区ID
+     *    userId 用户ID
+     *
+     * @param map
+     * @return
+     */
+    TaSysUserRole selectByCommunityIdAndUserId(Map<String,Object> map);
 }

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

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TaUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -47,4 +48,20 @@ public interface TaUserMapper {
      * @return
      */
     List<TaUser> selectUserListByParentId(Integer parentId);
+
+    /**
+     * 判断当前用户的关联关系
+     * @param userId
+     * @param otherUserID
+     * @return
+     */
+    TaUser selectTaFaceParentId(@Param("id") Integer userId, @Param("otherUserID")Integer otherUserID);
+
+    /**
+     * 查询此电话在小区是否存在
+     * @param communityId
+     * @param phone
+     * @return
+     */
+    TaUser getByLoginName(@Param("id")Integer communityId, @Param("id")String phone);
 }

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

@@ -21,5 +21,5 @@ public interface TaVisitorLicenseMapper {
 
     void insertTaVistorLicense(TaVisitorLicense taVisitorLicense);
 
-    List<Integer> findTaVistorLicenseById(Integer id);
+    List<String> findTaVistorLicenseById(Integer id);
 }

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

@@ -0,0 +1,47 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TdImages;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TdImagesMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TdImages record);
+
+    int insertSelective(TdImages record);
+
+    TdImages selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TdImages record);
+
+    int updateByPrimaryKey(TdImages record);
+
+    List<TdImages> getByUUIDAndByType(Map<String,Object> map);
+
+    /**
+     * 批量删除
+     *  根据 uuid 和 type
+     * @param map
+     * @return
+     */
+    int deleteByUuidAndType(Map map);
+
+    /**
+     * 批量添加
+     * @param list
+     * @return
+     */
+    int insertBatch(List<TdImages> list);
+
+    /**
+     * 修改时删除当前图片
+     * @param uuid
+     * @param type
+     */
+    void deleteTdImages(@Param("uuid") Integer uuid, @Param("type") String type);
+}

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

@@ -22,4 +22,28 @@ public interface TpActivitySignupMapper {
     Integer sumActivitySignUpNum(@Param("id")Integer id, @Param("communityId")Integer communityId);
 
     Integer findTpActivetitySignByUserId(@Param("activityId") Integer activityId, @Param("communityId")Integer communityId, @Param("userId")Integer userId);
+
+    /**
+     * 获取报名总人数
+     * @param tpActivitySignup
+     * @return
+     */
+    Integer selectSignNum(TpActivitySignup tpActivitySignup);
+    
+    /**
+     * 删除报名
+     * @param tpActivitySignup
+     * @return
+     */
+    Integer deleteSignUp(TpActivitySignup tpActivitySignup);
+
+    /**
+     * 根据 活动ID 小区ID 用户ID 查询报名情况
+     * @param activityId
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    TpActivitySignup selectTpActivetitySignByUserId(@Param("activityId") Integer activityId, @Param("communityId")Integer communityId, @Param("userId")Integer userId);
+
 }

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

@@ -35,11 +35,4 @@ public interface TpTicketMapper {
      * @return
      */
 	TpTicket selectByTicketId(@Param("communityId") String communityId,@Param("ticketId") Integer ticketId);
-
-    /**
-     * 获取当前插入的信息
-     * @param userId
-     * @param communityId
-     */
-    TpTicket getById(@Param("userId")Integer userId, @Param("communityId")Integer communityId);
 }

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

@@ -20,9 +20,9 @@ public interface TpTransactionMapper {
 
     int updateByPrimaryKey(TpTransaction record);
 
-    List<TpTransaction> findAllTransaction(@Param("communityId") Integer communityId, @Param("type") String type);
+    List<TpTransaction> findAllTransaction(@Param("communityId") Integer communityId, @Param("transactionTitle") String transactionTitle, @Param("type") String type);
 
-    List<TpTransaction> selectTransaction(@Param("userId")Integer userId, @Param("communityId")Integer communityId);
+    List<TpTransaction> selectTransaction(@Param("userId")Integer userId, @Param("communityId")Integer communityId,@Param("type") Integer type);
 
     void updateTransaction(@Param("id")Integer id, @Param("transactionTitle")String transactionTitle, @Param("transactionContent")String transactionContent, @Param("userId")Integer userId);
 

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

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

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

@@ -1,5 +1,5 @@
  package com.community.huiju.model;
-import jdk.nashorn.internal.objects.annotations.Getter;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -0,0 +1,50 @@
+package com.community.huiju.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TaFace {
+
+    private Integer id;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 用户ID
+     */
+    private Integer taUserId;
+
+    /**
+     *图片
+     */
+    private  String faceImg;
+
+    /**
+     * 创建人
+     */
+    private  Integer createUser;
+
+    /**
+     * 更新人
+     */
+    private  Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    private  Date createDate;
+
+    /**
+     * 更新时间
+     */
+    private  Date updateDate;
+}

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

@@ -0,0 +1,105 @@
+package com.community.huiju.model;
+
+import java.util.List;
+
+public class TaSysMenu {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String menuName;
+
+    private String menuUrl;
+
+    private Integer parentId;
+
+    private Integer sort;
+
+    private String menuType;
+
+    private String status;
+    
+    private String remark;
+    
+    private List<TaSysMenuImg> menuImgList;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getMenuName() {
+        return menuName;
+    }
+
+    public void setMenuName(String menuName) {
+        this.menuName = menuName == null ? null : menuName.trim();
+    }
+
+    public String getMenuUrl() {
+        return menuUrl;
+    }
+
+    public void setMenuUrl(String menuUrl) {
+        this.menuUrl = menuUrl == null ? null : menuUrl.trim();
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public String getMenuType() {
+        return menuType;
+    }
+
+    public void setMenuType(String menuType) {
+        this.menuType = menuType == null ? null : menuType.trim();
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+    
+    public List<TaSysMenuImg> getMenuImgList() {
+        return menuImgList;
+    }
+    
+    public String getRemark() {
+        return remark;
+    }
+    
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    
+    public void setMenuImgList(List<TaSysMenuImg> menuImgList) {
+        this.menuImgList = menuImgList;
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.community.huiju.model;
+
+public class TaSysMenuImg {
+    private Integer id;
+
+    private Integer taMenuId;
+
+    private String menuIconImg;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getTaMenuId() {
+        return taMenuId;
+    }
+
+    public void setTaMenuId(Integer taMenuId) {
+        this.taMenuId = taMenuId;
+    }
+
+    public String getMenuIconImg() {
+        return menuIconImg;
+    }
+
+    public void setMenuIconImg(String menuIconImg) {
+        this.menuIconImg = menuIconImg == null ? null : menuIconImg.trim();
+    }
+}

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

@@ -39,6 +39,21 @@ public class TaUser {
 
     private Date updateDate;
 
+    // 海康UserId
+    private Integer hkUserId;
+
+    // 海康 卡片号
+    private String hkCardNo;
+
+    // 人脸状态
+    private String faceStatus;
+
+    // 角色编号
+    private Integer role;
+
+    // 角色名称
+    private String roleName;
+
     public Integer getId() {
         return id;
     }
@@ -151,6 +166,14 @@ public class TaUser {
         this.verifyStatus = verifyStatus == null ? null : verifyStatus.trim();
     }
 
+    public String getFaceStatus() {
+        return faceStatus;
+    }
+
+    public void setFaceStatus(String faceStatus) {
+        this.faceStatus = faceStatus;
+    }
+
     public Integer getCreateUser() {
         return createUser;
     }
@@ -182,4 +205,36 @@ public class TaUser {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+
+    public Integer getHkUserId() {
+        return hkUserId;
+    }
+
+    public void setHkUserId(Integer hkUserId) {
+        this.hkUserId = hkUserId;
+    }
+
+    public String getHkCardNo() {
+        return hkCardNo;
+    }
+
+    public void setHkCardNo(String hkCardNo) {
+        this.hkCardNo = hkCardNo;
+    }
+
+    public Integer getRole() {
+        return role;
+    }
+
+    public void setRole(Integer role) {
+        this.role = role;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
 }

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

@@ -16,7 +16,7 @@ public class TaVisitor {
 
     private Date visitorStatrtTime;
 
-    private Integer visitorEndTime;
+    private Date visitorEndTime;
 
     private String drivingStatus;
 
@@ -34,7 +34,7 @@ public class TaVisitor {
 
     private Date updateDate;
 
-    private List<Integer> carLicense;
+    private List<String> carLicense;
 
     public Integer getId() {
         return id;
@@ -84,11 +84,11 @@ public class TaVisitor {
         this.visitorStatrtTime = visitorStatrtTime;
     }
 
-    public Integer getVisitorEndTime() {
+    public Date getVisitorEndTime() {
         return visitorEndTime;
     }
 
-    public void setVisitorEndTime(Integer visitorEndTime) {
+    public void setVisitorEndTime(Date visitorEndTime) {
         this.visitorEndTime = visitorEndTime;
     }
 
@@ -156,11 +156,11 @@ public class TaVisitor {
         this.updateDate = updateDate;
     }
 
-    public List<Integer> getCarLicense() {
+    public List<String> getCarLicense() {
         return carLicense;
     }
 
-    public void setCarLicense(List<Integer> carLicense) {
+    public void setCarLicense(List<String> carLicense) {
         this.carLicense = carLicense;
     }
 }

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

@@ -0,0 +1,65 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TdImages {
+    private Integer id;
+
+    private String imageUrl;
+
+    private Integer uuid;
+
+    private String type;
+
+    private Integer createUser;
+
+    private Date createTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl == null ? null : imageUrl.trim();
+    }
+
+    public Integer getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(Integer uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpActivity {
     private Integer id;
@@ -40,6 +41,13 @@ public class TpActivity {
     private Date updateDate;
     
     private String userName;
+    
+    /**
+     * 报名状态
+     */
+    private String signStatus;
+
+    private List<String> imgList;
 
     public Integer getId() {
         return id;
@@ -192,4 +200,20 @@ public class TpActivity {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+    
+    public String getSignStatus() {
+        return signStatus;
+    }
+    
+    public void setSignStatus(String signStatus) {
+        this.signStatus = signStatus;
+    }
+    
+    public List<String> getImgList() {
+        return imgList;
+    }
+
+    public void setImgList(List<String> imgList) {
+        this.imgList = imgList;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpAnnouncement {
     private Integer id;
@@ -31,6 +32,8 @@ public class TpAnnouncement {
 
     private Date updateDate;
 
+    private List<String> imgList;
+
     public Integer getId() {
         return id;
     }
@@ -142,4 +145,12 @@ public class TpAnnouncement {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    public List<String> getImgList() {
+        return imgList;
+    }
+
+    public void setImgList(List<String> imgList) {
+        this.imgList = imgList;
+    }
 }

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

@@ -5,6 +5,8 @@ import java.util.Date;
 public class TpMessage {
     private Integer id;
 
+    private Integer ticketId;
+
     private Integer communityId;
 
     private String messageType;
@@ -36,6 +38,31 @@ public class TpMessage {
     private Integer updateUser;
 
     private Date updateDate;
+    
+    /**
+     * 工单状态
+     */
+    private String ticketStatus;
+    
+    /**
+     * 工单扭转自动添加的内容
+     */
+    private String content;
+    
+    /**
+     * 已读消息图标
+     */
+    private String readMessageIcon;
+    
+    /**
+     * 未读消息图标
+     */
+    private String unreadMessageIcon;
+    
+    /**
+     * 消息详情url链接
+     */
+    private String messageDetailUrl;
 
     public Integer getId() {
         return id;
@@ -45,6 +72,14 @@ public class TpMessage {
         this.id = id;
     }
 
+    public Integer getTicketId() {
+        return ticketId;
+    }
+
+    public void setTicketId(Integer ticketId) {
+        this.ticketId = ticketId;
+    }
+
     public Integer getCommunityId() {
         return communityId;
     }
@@ -172,4 +207,44 @@ public class TpMessage {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+    
+    public String getTicketStatus() {
+        return ticketStatus;
+    }
+    
+    public void setTicketStatus(String ticketStatus) {
+        this.ticketStatus = ticketStatus;
+    }
+    
+    public String getContent() {
+        return content;
+    }
+    
+    public void setContent(String content) {
+        this.content = content;
+    }
+    
+    public String getReadMessageIcon() {
+        return readMessageIcon;
+    }
+    
+    public void setReadMessageIcon(String readMessageIcon) {
+        this.readMessageIcon = readMessageIcon;
+    }
+    
+    public String getUnreadMessageIcon() {
+        return unreadMessageIcon;
+    }
+    
+    public void setUnreadMessageIcon(String unreadMessageIcon) {
+        this.unreadMessageIcon = unreadMessageIcon;
+    }
+    
+    public String getMessageDetailUrl() {
+        return messageDetailUrl;
+    }
+    
+    public void setMessageDetailUrl(String messageDetailUrl) {
+        this.messageDetailUrl = messageDetailUrl;
+    }
 }

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

@@ -38,9 +38,12 @@ public class TpTicket {
     private Integer updateUser;
 
     private Date updateDate;
-    
+
+    private List<TdImages> tdImagesList;
+
     private List<TpTicketRecord> ticketRecordList;
 
+
     public Integer getId() {
         return id;
     }
@@ -176,4 +179,12 @@ public class TpTicket {
     public void setTicketRecordList(List<TpTicketRecord> ticketRecordList) {
         this.ticketRecordList = ticketRecordList;
     }
+
+    public List<TdImages> getTdImagesList() {
+        return tdImagesList;
+    }
+
+    public void setTdImagesList(List<TdImages> tdImagesList) {
+        this.tdImagesList = tdImagesList;
+    }
 }

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

@@ -10,6 +10,11 @@ public class TpTicketRecord {
 
     private Integer ticketId;
 
+    /**
+     * 自动生成的回复
+     */
+    private String content;
+
     private String status;
     
     private String ticketStatusName;
@@ -44,6 +49,14 @@ public class TpTicketRecord {
         this.ticketId = ticketId;
     }
 
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
     public String getStatus() {
         return status;
     }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpTransaction {
     private Integer id;
@@ -27,6 +28,26 @@ public class TpTransaction {
 
     private Date updateDate;
 
+    private List<String> imgList;
+
+    private  Integer roleId;
+
+    private  String roleName;
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+    public Integer getRoleId() {
+        return roleId;
+    }
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
     public Integer getId() {
         return id;
     }
@@ -121,4 +142,12 @@ public class TpTransaction {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+
+    public List<String> getImgList() {
+        return imgList;
+    }
+
+    public void setImgList(List<String> imgList) {
+        this.imgList = imgList;
+    }
 }

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

@@ -0,0 +1,135 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpUser {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String userName;
+
+    private String loginName;
+
+    private String loginPassword;
+
+    private String status;
+
+    private String remark;
+
+    private String email;
+
+    private String headPortrait;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName == null ? null : loginName.trim();
+    }
+
+    public String getLoginPassword() {
+        return loginPassword;
+    }
+
+    public void setLoginPassword(String loginPassword) {
+        this.loginPassword = loginPassword == null ? null : loginPassword.trim();
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email == null ? null : email.trim();
+    }
+
+    public String getHeadPortrait() {
+        return headPortrait;
+    }
+
+    public void setHeadPortrait(String headPortrait) {
+        this.headPortrait = headPortrait == null ? null : headPortrait.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}

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

@@ -12,7 +12,7 @@ public interface BillServiceI {
 	 * @param pageSize
 	 * @return
 	 */
-	List<Map<String, Object>> getBillsList(Integer communityId, Integer payType, Integer userId ,Integer pageNum, Integer pageSize);
+	Map<String, Object> getBillsList(Integer communityId, Integer payType, Integer userId ,Integer pageNum, Integer pageSize);
 	
 	/**
 	 * 获取账单的详细信息

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

@@ -6,4 +6,11 @@ import java.util.List;
 
 public interface CommunityServiceI {
 	List<ToCommunities> getCommunitys(String communityName);
+
+	/**
+	 * 根据小区ID获取小区信息
+	 * @param communityId
+	 * @return
+	 */
+	ToCommunities getByCommunityId(Integer communityId);
 }

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

@@ -0,0 +1,32 @@
+package com.community.huiju.service;
+
+
+import com.community.commom.mode.ResponseBean;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface FaceServiceI {
+    /**
+     * 添加人脸
+     * @param userId 登入人ID
+     *  @param  uploadFile
+     *  @param otherUserID 关联家属或者租客ID
+     * @return
+     */
+    ResponseBean addFace(Integer userId ,MultipartFile uploadFile,Integer otherUserID);
+
+    /**
+     * 更新当前人脸
+     * @param userId 登入人ID
+     *  @param  uploadFile
+     *  @param otherUserID 关联家属或者租客ID
+     * @return
+     */
+    ResponseBean upDateFace(Integer userId ,MultipartFile uploadFile,Integer otherUserID);
+
+    /**
+     * 当前登入人是否有人脸信息
+     * @param userId
+     * @return
+     */
+    ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserID);
+}

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

@@ -0,0 +1,29 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+
+/**
+ * 监控 业务接口
+ * @author weiximei
+ */
+public interface IMonitoringService {
+
+    /**
+     * 根据小区ID查询 监控列表
+     * @param communityId
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    ResponseBean getByCommunityId(Integer communityId,Integer pageNo, Integer pageSize);
+
+    /**
+     * 生成 Token
+     * @param communityId
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    ResponseBean getMonitoringToken(Integer communityId, Integer pageNo, Integer pageSize);
+
+}

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

@@ -71,11 +71,23 @@ public interface ITaUserService {
      * @param phone
      * @param gender
      * @param currentUserId 当前用户(业主)
-     * @param type 1家属 0租客
+     * @param type 2租客 3家属
      * @return
      */
     ResponseBean addTenantsOrDependents(String userName, String phone, String gender,Integer currentUserId,Integer type);
 
+    /**
+     * 修改租客或者家属
+     * @param userName
+     * @param phone
+     * @param gender
+     * @param currentUserId 当前用户(业主)
+     * @param type 2租客 3家属
+     * @param userId 用户ID
+     * @return
+     */
+    ResponseBean updateTenantsOrDependents(String userName, String phone, String gender,Integer currentUserId,Integer type,Integer userId);
+
     /**
      * 修改用户头像
      * @param currentUserId
@@ -86,9 +98,10 @@ public interface ITaUserService {
 
     /**
      * 获取用户信息
-     * @param userId
+     * @param currenUserId 当前用户
+     * @param userId 被查询用户, 一般是业主情况下有效, 查的是下面的家属或者租客
      * @return
      */
-    ResponseBean getUserInfo(Integer userId);
+    ResponseBean getUserInfo(Integer currenUserId,Integer userId);
 
 }

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

@@ -5,6 +5,7 @@ import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTicketRecordComment;
 import com.community.huiju.vo.TpTicketVO;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -41,12 +42,12 @@ public interface ITicketService {
 
 
 	/**
-	 * 添加报修
+	 * 添加 维修/投诉/联系单
 	 * @param userId
 	 * @param parameter
 	 * @return
 	 */
-    ResponseBean addAiTicketService(Integer userId,String parameter);
+    ResponseBean addAiTicketService(Integer userId,String parameter) throws IOException;
 	
 	/**
 	 * 回复工单
@@ -56,15 +57,15 @@ public interface ITicketService {
 	Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment, Integer userId);
 
 	/**
-	 * 修改报修内容
+	 * 修改 维修/投诉/联系单 内容
 	 * @param ticketId
 	 * @param tpTicket
-	 * @param type
+	 * @param userId
 	 */
-	void updateTicketContent(Integer ticketId, TpTicket tpTicket, String type);
+	ResponseBean updateTicketContent(Integer ticketId, TpTicket tpTicket,Integer userId);
 
 	/**
-	 * 终止报修
+	 * 终止 维修/投诉/联系单
 	 * @param communityId
 	 * @param ticketId
 	 * @return

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

@@ -0,0 +1,15 @@
+package com.community.huiju.service;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * @author admin
+ * @Title: ImageServiceI
+ * @Description: TODO
+ * @date 2018/11/5
+ */
+public interface ImageServiceI {
+    String getImageUrl(MultipartFile uploadFile) throws IOException;
+}

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

@@ -0,0 +1,15 @@
+package com.community.huiju.service;
+
+import com.community.huiju.model.TaSysMenu;
+
+import java.util.List;
+
+public interface MenuServiceI {
+	
+	/**
+	 * 获取菜单列表
+	 * @param communityId
+	 * @return
+	 */
+	List<TaSysMenu> getMenuList(Integer communityId);
+}

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

@@ -1,8 +1,5 @@
 package com.community.huiju.service;
 
-import com.community.huiju.model.TpMessage;
-
-import java.util.List;
 import java.util.Map;
 
 public interface MessageServiceI {
@@ -21,7 +18,7 @@ public interface MessageServiceI {
 	 * @param modelType
 	 * @return
 	 */
-	List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer userId);
+	Map<String,Object> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer userId);
 
 	/**
 	 * 全部已读

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

@@ -3,6 +3,7 @@ package com.community.huiju.service;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.*;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -11,6 +12,14 @@ import java.util.List;
  * @date 2018/10/23
  */
 public interface SocialServiceI {
+
+	/**
+	 * 查看公告详情
+	 * @param id
+	 * @param communityId
+	 * @param userId
+	 * @return
+	 */
     TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId, Integer userId);
 
 
@@ -22,7 +31,7 @@ public interface SocialServiceI {
 	 * @param pageSize
 	 * @return
 	 */
-	List<TpAnnouncement> getAnnouncements(Integer communityId, String title, Integer pageNum, Integer pageSize);
+	ResponseBean getAnnouncements(Integer communityId, String title, Integer pageNum, Integer pageSize);
 
 	/**
 	 * 公告轮播图
@@ -39,7 +48,7 @@ public interface SocialServiceI {
 	 * @param pageSize
 	 * @return
 	 */
-	List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize);
+	ResponseBean getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize);
 	
 	/**
 	 * 获取活动帖子详情
@@ -49,7 +58,34 @@ public interface SocialServiceI {
 	 */
 	TpActivity findActivityDetail(Integer activityId, Integer communityId, Integer userId);
 
-	ResponseBean findTaUserInfo(Integer id, Integer communityId, Integer userId);
+	/**
+	 * 活动报名
+	 * @param activityId
+	 * @param communityId
+	 * @param userId
+	 * @param remark
+	 * @return
+	 */
+	ResponseBean findTaUserInfo(Integer activityId, Integer communityId, Integer userId, String remark);
+
+	/**
+	 * 修改活动报名
+	 * @param activityId
+	 * @param communityId
+	 * @param userId
+	 * @param remark
+	 * @return
+	 */
+	ResponseBean updateActivtiySignUp(Integer activityId, Integer communityId, Integer userId, String remark);
+
+	/**
+	 * 查看 活动报名详情
+	 * @param activityId
+	 * @param communityId
+	 * @param userId
+	 * @return
+	 */
+	ResponseBean getActivtiySignUp(Integer activityId, Integer communityId, Integer userId);
 
 	/**
 	 * 获取二手租赁详情
@@ -62,26 +98,28 @@ public interface SocialServiceI {
 	 * 获取所有的交易帖子
 	 * @param communityId
 	 * @param type
+	 * @param transactionTitle
 	 * @return
 	 */
-	List<TpTransaction> findAllTransaction(Integer communityId, String type, Integer pageNum, Integer paeSize);
+	ResponseBean findAllTransaction(Integer communityId, String transactionTitle, String type, Integer pageNum, Integer paeSize);
 
 	/**
 	 * 添加二手租赁帖子
 	 */
-    ResponseBean addAllTransaction(Integer userId, String paramets);
+    ResponseBean addAllTransaction(Integer userId, String paramets)throws IOException;
+
 
 	/**
-	 * 获取当前用户所有的帖子
+	 * 获取当前用户发布所有的帖子
 	 * @param userId
 	 * @return
 	 */
-	ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer pageSize);
+	ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer pageSize,Integer type);
 
 	/**
 	 * 修改当前帖子
 	 */
-	ResponseBean updateTransaction(String paramets,Integer userId);
+	ResponseBean updateTransaction(String paramets,Integer userId,Integer id);
 
 	/**
 	 * 评价工单以及评分
@@ -97,4 +135,20 @@ public interface SocialServiceI {
 	 * @return
 	 */
 	List<TpActivity> getActivity(Integer communityId);
+	
+	/**
+	 * 取消报名接口
+	 * @param activityId
+	 * @param communityId
+	 * @param userId
+	 * @return
+	 */
+	ResponseBean cancelSignActivity(Integer activityId, Integer communityId, Integer userId);
+
+	/**
+	 * 删除二手租赁帖子
+ 	 * @param id
+	 * @return
+	 */
+	ResponseBean deleteransaction(Integer id,Integer userid);
 }

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

@@ -1,5 +1,6 @@
 package com.community.huiju.service;
 
+import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.TaVisitor;
 
 import java.util.List;
@@ -11,6 +12,13 @@ import java.util.List;
  * @date 2018/11/1
  */
 public interface TaVistorServiceI {
-    void insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId);
+    /**
+     * 创建访客
+     * @param taVisitor
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    ResponseBean insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId);
     List<TaVisitor> invateHis(Integer communityId, Integer userId);
 }

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

@@ -2,7 +2,9 @@ package com.community.huiju.service.impl;
 
 import com.community.huiju.dao.TpBillInvoiceMapper;
 import com.community.huiju.service.BillServiceI;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,11 +30,14 @@ public class BillServiceImpl implements BillServiceI {
 	 * @return
 	 */
 	@Override
-	public List<Map<String, Object>> getBillsList(Integer communityId, Integer payType, Integer userId ,Integer pageNum, Integer pageSize) {
+	public Map<String, Object> getBillsList(Integer communityId, Integer payType, Integer userId ,Integer pageNum, Integer pageSize) {
 		//使用分页插件
-		PageHelper.startPage(pageNum, pageSize);
+		Page<Map<String,Object>> page = PageHelper.startPage(pageNum, pageSize);
 		List<Map<String,Object>> billsList = tpBillInvoiceMapper.getBillsList(communityId, userId, payType);
-		return billsList;
+		Map<String,Object> result = Maps.newHashMap();
+		result.put("list",billsList);
+		result.put("total",page.getTotal());
+		return result;
 	}
 	
 	/**

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

@@ -22,4 +22,9 @@ public class CommunityServiceImpl implements CommunityServiceI {
 	public List<ToCommunities> getCommunitys(String communityName) {
 		return toCommunitiesMapper.selectByCommunityName(communityName);
 	}
+
+	@Override
+	public ToCommunities getByCommunityId(Integer communityId) {
+		return toCommunitiesMapper.selectByPrimaryKey(communityId);
+	}
 }

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

@@ -0,0 +1,262 @@
+package com.community.huiju.service.impl;
+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.huiju.common.hk.HKOpenApi;
+import com.community.huiju.dao.TaFaceMapper;
+import com.community.huiju.dao.TaSysRoleMapper;
+import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.model.TaFace;
+import com.community.huiju.model.TaSysRole;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.service.FaceServiceI;
+import com.community.huiju.service.ImageServiceI;
+import lombok.extern.slf4j.Slf4j;
+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.util.Date;
+
+@Service("faceServicel")
+@Transactional
+@Slf4j
+public class FaceServicelimpl implements FaceServiceI {
+
+
+    @Autowired
+    private TaFaceMapper taFaceMapper;
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private TaSysRoleMapper taSysRoleMapper;
+
+    @Autowired
+    private ImageServiceI imageServiceI;
+
+    @Override
+    @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 && !userid.equals(otherUserID)) {
+                 responseBean = getTaFaceParentId(userid, otherUserID);
+            if ("1".equals(responseBean.getCode())){
+                responseBean.getMessage();
+                return responseBean;
+            }
+        }
+            Integer activeUser = otherUserID == null?userid:otherUserID;
+            TaUser user = taUserMapper.selectByPrimaryKey(activeUser);
+            TaFace taFace = new TaFace();
+            taFace.setFaceImg(faceImg);
+            taFace.setCommunityId(user.getCommunityId());
+            taFace.setTaUserId(activeUser);
+            taFace.setCreateUser(userid);
+            taFace.setUpdateUser(activeUser);
+            taFace.setCreateDate(new Date());
+            taFace.setUpdateDate(new Date());
+
+        /*验证身份*/
+        responseBean=addVerify( activeUser,  uploadFile, otherUserID, faceImg, taFace) ;
+        return responseBean;
+    }
+
+    /**
+     * 修改人脸信息
+      * @param userId 登入人ID
+     * @param  uploadFile
+     * @param otherUserID 关联家属或者租客ID
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean upDateFace(Integer userId, MultipartFile uploadFile,Integer otherUserID) {
+        boolean isA = false;
+      ResponseBean responseBean= new ResponseBean();
+        String faceImg =img(uploadFile);
+        if (null!= otherUserID && !userId.equals(otherUserID)) {
+                 responseBean = getTaFaceParentId(userId, otherUserID);
+            if ("1".equals(responseBean.getCode())) {
+                responseBean.getMessage();
+                return responseBean;
+               }}
+            Integer activeUser = otherUserID == null?userId:otherUserID;
+            //当前修改的id否存在
+             TaFace face = taFaceMapper.getByUserId(activeUser);
+             if (null == face){
+                 responseBean.addError("您的信息不存在，请录入人脸");
+                 return responseBean;
+             }
+           TaUser user = taUserMapper.selectByPrimaryKey(activeUser);
+            TaFace taFace = new TaFace();
+            taFace.setTaUserId(activeUser);
+            taFace.setFaceImg(faceImg);
+            taFace.setUpdateUser(userId);
+            taFace.setUpdateDate(new Date());
+            ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, activeUser);
+        if (resps.getCode().equals("0")) {
+            resps.addSuccess("图片修改成功");
+        } else {
+            resps.addError(resps.getMessage());
+        }
+        return resps;
+    }
+
+    /**
+     *验证图片是否为人脸，推送海康
+     */
+    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
+        TaUser user = taUserMapper.selectByPrimaryKey(userId);
+        if (user.getHkUserId() == null) {
+            responseBean.addError("海康人员ID不存在，无法录入");
+            log.error("本地库人员ID：{}  的海康人员ID不存在", userId);
+            return responseBean;
+        }
+        AESDecode aesd = new AESDecode();
+        String body = "{\"type\": \"0\", \"image_url\":\"" + faceImg + "\"}";
+        try {
+                responseBean = aesd.send(body);
+                JSONObject jsonObject = JSONObject.parseObject(responseBean.getMessage());
+                Integer type = (Integer) jsonObject.get("errno");
+                Integer faceNum = (Integer) jsonObject.get("face_num");
+
+             /*推送海康*/
+            String data=HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
+
+              /*boolean isA为true进行添加，为false进行修改*/
+            if (0 == type && 1 == faceNum) {
+                if (null == data) {
+                    throw new RuntimeException("海康人脸推送失敗！");
+                }
+                if (isA) {
+                    taFaceMapper.insertSelective(taFace);
+                }else {
+                    taFaceMapper.updateByPrimaryKeySelective(taFace);
+                }
+                responseBean.addSuccess("操作成功");
+                HKOpenApi.downloadFaceAndFingerInfos(String.valueOf(user.getHkUserId()));
+            }else {
+                responseBean.addError("请录入正确图片");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("海康人脸推送失敗！ {}",e);
+            throw new RuntimeException("海康人脸推送失敗！");
+        }
+        return responseBean;
+    }
+
+    /**
+     *获得用户，租客，家属，其中一种身份的信息
+     */
+    @Override
+    public ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserID) {
+        ResponseBean responseBean= new ResponseBean();
+        /**当otherUserID不为空时判断它是否是业主下的租客或者家属*/
+        if (null!= otherUserID && !userId.equals(otherUserID)) {
+            responseBean = getTaFaceParentId(userId, otherUserID);
+            if ("1".equals(responseBean.getCode())) {
+                responseBean.getMessage();
+                return responseBean;
+            }
+        }
+        Integer id = otherUserID == null?userId:otherUserID;
+        TaFace face = taFaceMapper.getByUserId(id);
+         if (null!= face){
+            responseBean.addSuccess(face);
+            return responseBean;
+        }
+            responseBean.addError("当前用户暂无人脸图片");
+            return responseBean;
+
+    }
+
+    /**
+     *判断当前用户下的人员关系（家属，租客）
+     */
+    public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserID){
+       ResponseBean  responseBean= new ResponseBean();
+/*         TaUser user = taUserMapper.selectTaFaceParentId(userId,otherUserID);*/
+        TaUser  users= taUserMapper.selectByPrimaryKey(otherUserID);
+        if (null!= users && !users.getParentId().equals(userId)){
+            responseBean.addError("您输入的家属或租户ID有误");
+            return responseBean;
+        }
+        return responseBean;
+    }
+
+    /**
+     * 得到当前图片
+     */
+    private String img(MultipartFile uploadFile){
+        String faceImg = null;
+        try {
+            faceImg = imageServiceI.getImageUrl(uploadFile);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return faceImg;
+    }
+
+    /**
+     *各种身份校验
+     */
+    public ResponseBean addVerify(Integer userid, MultipartFile uploadFile,Integer otherUserID,String faceImg,TaFace taFace) {
+        ResponseBean response = new ResponseBean();
+        TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userid);
+        TaUser taUser = taUserMapper.selectByPrimaryKey(userid);
+        if (null!=taUser && null!=sysRole
+                && Constant.INVALID.equals(taUser.getStatus())&& Constant.OWNER.equals(sysRole.getRoleName())) {
+            response.addError("9996", "您的身份已停用，请联系物业");
+            return response;
+        }
+        //身份为家属租客，状态为已停用
+        if (null!=taUser && null!=sysRole){
+            if (Constant.INVALID.equals(taUser.getStatus()) && ((Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName()))){
+                response.addError("9996", "您的身份已停用，请联系物业");
+                return response;
+            }
+        }
+        //查询当前用户是否有人脸记录
+        TaFace User = taFaceMapper.getByUserId(userid);
+        if (null == User) {
+            boolean isA = true;
+            if (Constant.OWNER.equals(sysRole.getRoleName()) && "1".equals(taUser.getVerifyStatus())) {
+                ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, userid);
+                if (resps.getCode().equals("0")) {
+                    taUser.setFaceStatus("1");
+                    taUserMapper.updateByPrimaryKeySelective(taUser);
+                    resps.addSuccess("图片录入成功");
+                } else {
+                    resps.addError(resps.getMessage());
+                }
+                return resps;
+            }
+            //家属或者租客，已认证
+            if (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getRoleName()) && "1".equals(taUser.getVerifyStatus())) {
+                ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, userid);
+                if (resps.getCode().equals("0")) {
+                    taUser.setFaceStatus("1");
+                    taUserMapper.updateByPrimaryKeySelective(taUser);
+                    resps.addSuccess("图片录入成功");
+                } else {
+                    resps.addError(resps.getMessage());
+                }
+                return resps;
+            }
+        }
+        response.addError("您的信息已存在");
+        return response;
+    }
+
+
+}
+
+

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

@@ -0,0 +1,43 @@
+package com.community.huiju.service.impl;
+
+import com.aliyun.oss.OSSClient;
+import com.community.huiju.service.ImageServiceI;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * @author weichaochao
+ * @Title: ImageServiceimpl
+ * @Description: 获取图片地址实现类
+ * @date 2018/11/5
+ */
+@Service("ImageService")
+public class ImageServiceimpl implements ImageServiceI {
+
+    private static String endpoint = "http://oss-cn-shanghai.aliyuncs.com";
+    private static String accessKeyId = "LTAIkc75dpkJw8Lb";
+    private static String accessKeySecret = "v4bvXCaix6vSDTCFfwSAdqV53iFEQw";
+    private static String bucketName = "jingcheng-h5temp";
+
+    @Override
+    public String getImageUrl(MultipartFile uploadFile) throws IOException {
+
+        String imgName = System.currentTimeMillis() + ".png";
+        // 创建OSSClient实例
+        OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);
+        // 上传
+        long time = System.currentTimeMillis();
+
+        ossClient.putObject(bucketName, imgName, new ByteArrayInputStream(uploadFile.getBytes()));
+
+        // 关闭client
+        ossClient.shutdown();
+        Date expiration = new Date(time + 3600 * 1000 * 24 * 365 * 10);
+        String url = ossClient.generatePresignedUrl(bucketName, imgName, expiration).toString();
+        return url;
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.community.huiju.service.impl;
+
+import com.community.huiju.dao.TaSysMenuImgMapper;
+import com.community.huiju.dao.TaSysMenuMapper;
+import com.community.huiju.model.TaSysMenu;
+import com.community.huiju.model.TaSysMenuImg;
+import com.community.huiju.service.MenuServiceI;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author FXF
+ * @date 2018-11-05
+ */
+@Service("menuService")
+public class MenuServiceImpl implements MenuServiceI {
+	
+	@Autowired
+	private TaSysMenuMapper taSysMenuMapper;
+	
+	@Autowired
+	private TaSysMenuImgMapper taSysMenuImgMapper;
+	
+	/**
+	 * 获取菜单列表
+	 * @param communityId
+	 * @return
+	 */
+	@Override
+	public List<TaSysMenu> getMenuList(Integer communityId) {
+		//获取菜单列表
+		List<TaSysMenu> menuList = taSysMenuMapper.selectByCommunity(communityId);
+		menuList.stream().forEach(menu -> {
+			List<TaSysMenuImg> menuImgList = taSysMenuImgMapper.selectByMenuId(menu.getId());
+			menu.setMenuImgList(menuImgList);
+		});
+		return menuList;
+	}
+}

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

@@ -3,11 +3,12 @@ package com.community.huiju.service.impl;
 import com.community.huiju.dao.TpMessageMapper;
 import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.MessageServiceI;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -40,12 +41,15 @@ public class MessageServiceImpl implements MessageServiceI {
 	 * @return
 	 */
 	@Override
-	public List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer userId) {
+	public Map<String,Object> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer userId) {
 		//使用分页插件
-		PageHelper.startPage(pageNum, pageSize);
+		Page page = PageHelper.startPage(pageNum, pageSize);
 		// 获取数据
 		List<TpMessage> messageList = tpMessageMapper.getMessages(userId,communityId, modelType);
-		return messageList;
+		Map<String,Object> map = new HashMap<>();
+		map.put("list",messageList);
+		map.put("total",page.getTotal());
+		return map;
 	}
 
 	/**

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

@@ -0,0 +1,84 @@
+package com.community.huiju.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.hk.Digests;
+import com.community.commom.hk.HttpClientSSLUtils;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.hk.HKConstant;
+import com.community.huiju.common.hk.HKOpenApi;
+import com.community.huiju.service.IMonitoringService;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import springfox.documentation.spring.web.json.Json;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 监控 业务实现
+ * @author weixmei
+ */
+@Service("iMonitoringService")
+@Slf4j
+public class MonitoringServiceImpl implements IMonitoringService {
+
+    @Override
+    public ResponseBean getByCommunityId(Integer communityId,Integer pageNo, Integer pageSize) {
+
+        // TODO 数据是假数据, 后期在更改. 需要根据小区查询 组织中心编号
+
+        ResponseBean response = new ResponseBean();
+        Map<String,Object> parMap = Maps.newHashMap();
+        parMap.put("pageNo",pageNo);
+        parMap.put("pageSize",pageSize);
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        // 组织中心编号
+        parMap.put("unitUuids","1048576");
+
+        String result = HKOpenApi.getMonitoryPoint(parMap);
+        String url = "rtsp://vipgz1.idcfengye.com:10021/realplay://#cameraUuid#:SUB:";
+        
+        JSONArray cameraList = JSONObject.parseObject(result).getJSONObject("data").getJSONArray("list");
+        List<String> urlList = new ArrayList<String>();
+        for (Object cameraMap : cameraList){
+            JSONObject camera = (JSONObject) cameraMap;
+            urlList.add(url.replace("#cameraUuid#",camera.getString("cameraUuid")));
+        }
+        
+        response.addSuccess(urlList);
+
+        return response;
+    }
+
+    @Override
+    public ResponseBean getMonitoringToken(Integer communityId, Integer pageNo, Integer pageSize) {
+
+        // TODO 数据是假数据, 后期在更改. 需要根据小区查询 组织中心编号
+
+        ResponseBean response = new ResponseBean();
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo",pageNo);
+        parMap.put("pageSize",pageSize);
+        // 这里可以设置其他操作用户 parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        // 组织中心编号
+        parMap.put("unitUuids","1048576");
+        String params =  JSON.toJSONString(parMap);
+        String token = Digests.buildToken(url + "?" + params, params, HKConstant.SECRET);
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("token",token);
+        response.addSuccess(map);
+
+        return response;
+    }
+}

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

@@ -5,16 +5,20 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
+import com.community.huiju.service.ImageServiceI;
 import com.community.huiju.service.SocialServiceI;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.netflix.discovery.converters.Auto;
+import com.google.common.collect.Maps;
+import com.sun.org.apache.bcel.internal.generic.NEW;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author weichaochao
@@ -57,6 +61,13 @@ public class SocialServiceImpl implements SocialServiceI {
     @Autowired
     private TpTicketMapper tpTicketMapper;
 
+    @Autowired
+    private TdImagesMapper tdImagesMapper;
+
+    @Autowired
+    private TpUserMapper tpUserMapper;
+
+
     @Override
     @Transactional
     public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId, Integer userId) {
@@ -65,7 +76,17 @@ public class SocialServiceImpl implements SocialServiceI {
         if (null != allViewNum){
             tpAnnouncementMapper.updateByPrimaryKeySelective(id, allViewNum);
         }
-        return tpAnnouncementMapper.selectByPrimaryKey(id, communityId);
+        TpAnnouncement tpAnnouncement = tpAnnouncementMapper.selectByPrimaryKey(id, communityId);
+        tpAnnouncement.setUserName(tpUserMapper.selectByPrimaryKey(tpAnnouncement.getCreateUser()).getUserName());
+
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("uuid",tpAnnouncement.getId());
+        map.put("type",Constant.ANNOUNCEMENT);
+        // 查询图片
+        List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
+        List<String> imgList = tdImagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
+        tpAnnouncement.setImgList(imgList);
+        return tpAnnouncement;
     }
 
     /**
@@ -77,12 +98,17 @@ public class SocialServiceImpl implements SocialServiceI {
      * @return
      */
     @Override
-    public List<TpAnnouncement> getAnnouncements(Integer communityId,String title, Integer pageNum, Integer pageSize) {
+    public ResponseBean getAnnouncements(Integer communityId, String title, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean=new ResponseBean();
+        Map<String, Object> parameter = Maps.newHashMap();
         //使用分页插件
-        PageHelper.startPage(pageNum, pageSize);
+        Page<TpAnnouncement> pageannouncementList=PageHelper.startPage(pageNum, pageSize);
         // 获取数据
         List<TpAnnouncement> announcementList = tpAnnouncementMapper.getAnnouncements(communityId,title);
-        return announcementList;
+        parameter.put("total",pageannouncementList.getTotal());
+        parameter.put("list",announcementList);
+        responseBean.addSuccess(parameter);
+        return responseBean;
     }
     /**
      * 根据当前小区ID查出轮播图
@@ -106,12 +132,17 @@ public class SocialServiceImpl implements SocialServiceI {
      * @return
      */
     @Override
-    public List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize) {
+    public ResponseBean getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean= new ResponseBean();
+        Map<String, Object> result = Maps.newHashMap();
         //使用分页插件
-        PageHelper.startPage(pageNum, pageSize);
+        Page<TpActivity> pageactivityList=PageHelper.startPage(pageNum, pageSize);
         // 获取数据
         List<TpActivity> activityList = tpActivityMapper.getActivitys(communityId,title);
-        return activityList;
+        result.put("list",activityList);
+        result.put("total",pageactivityList.getTotal());
+        responseBean.addSuccess(result);
+        return responseBean;
     }
     
     /**
@@ -130,7 +161,22 @@ public class SocialServiceImpl implements SocialServiceI {
             activity.setViewCount(allViewNum);
             tpActivityMapper.updateByPrimaryKeySelective(activity);
         }
-        return tpActivityMapper.selectByPrimaryKey(activityId,communityId);
+
+        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId,communityId);
+        //返回报名状态
+        Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userId);
+        String signStatus = signNum != 0 ? Constant.STATUS_SIGNED : Constant.STATUS_UNSIGN;
+        tpActivity.setSignStatus(signStatus);
+        
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("uuid",tpActivity.getId());
+        map.put("type",Constant.ACTIVITY);
+        // 查询图片
+        List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
+        List<String> imgList = tdImagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
+        tpActivity.setImgList(imgList);
+
+        return tpActivity;
     }
     
     /**
@@ -161,7 +207,7 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean findTaUserInfo(Integer activityId, Integer communityId, Integer userId) {
+    public ResponseBean findTaUserInfo(Integer activityId, Integer communityId, Integer userId,String remark) {
         ResponseBean responseBean = new ResponseBean();
         TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
         //判断是否已经过了报名截至时间
@@ -206,32 +252,38 @@ public class SocialServiceImpl implements SocialServiceI {
                 || Constant.TENANT.equals(sysRole.getRoleName())
                 || Constant.OWNER.equals(sysRole.getRoleName()))){
 
-            return insertActivitySignUp(tpActivity, communityId, userId);
+            return insertActivitySignUp(tpActivity, communityId, userId, remark);
         }
         responseBean.addError("9995", "无法确认您的身份，请联系物业");
         return responseBean;
     }
 
     @Override
-    public List<TpTransaction> findAllTransaction(Integer communityId, String type, Integer pageNum, Integer paeSize) {
-        PageHelper.startPage(pageNum, paeSize);
-        return tpTransactionMapper.findAllTransaction(communityId, type);
+    public ResponseBean findAllTransaction(Integer communityId,String transactionTitle, String type, Integer pageNum, Integer paeSize) {
+        Map<String, Object> parameter = Maps.newHashMap();
+       ResponseBean  responseBean= new ResponseBean();
+        Page<TpTransaction> pageList=PageHelper.startPage(pageNum, paeSize);
+        List<TpTransaction> List= tpTransactionMapper.findAllTransaction(communityId, transactionTitle,type);
+        parameter.put("list",List);
+        parameter.put("total",pageList.getTotal());
+        responseBean.addSuccess(parameter);
+        return responseBean;
+
     }
 
 
     @Transactional
     @Override
-    public ResponseBean addAllTransaction(Integer userId, String paramets) {
-
+    public ResponseBean addAllTransaction(Integer userId, String paramets) throws IOException {
         ResponseBean response = new ResponseBean();
-
         JSONObject jsonObject = JSONObject.parseObject(paramets);
         String transactionTitle = (String) jsonObject.get("title");
         String transactionContent = (String) jsonObject.get("content");
         String  type= (String) jsonObject.get("type");
+        String imageUrl = (String) jsonObject.get("imageUrl");
 
         TaUser user=taUserMapper.selectByPrimaryKey(userId);
-        TpTransaction tpTransaction=new TpTransaction();
+        TpTransaction tpTransaction = new TpTransaction();
         tpTransaction.setTransactionTitle(transactionTitle);
         tpTransaction.setTransactionContent(transactionContent);
         tpTransaction.setType(type);
@@ -261,44 +313,121 @@ public class SocialServiceImpl implements SocialServiceI {
             return response;
         }
 
-        if (Constant.EFFECTIVE.equals(taUser.getStatus())
-                && (Constant.RELATION.equals(sysRole.getRoleName()))
-                || Constant.TENANT.equals(sysRole.getRoleName())
-                || Constant.OWNER.equals(sysRole.getRoleName())){
+        if (Constant.EFFECTIVE.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getRoleName()) || Constant.OWNER.equals(sysRole.getRoleName()))){
             tpTransactionMapper.insertSelective(tpTransaction);
+            insertTdImage(tpTransaction, imageUrl, userId,Constant.TRANSACTION);
             TpTransaction tpTransaction1=tpTransactionMapper.getById(tpTransaction.getId());
             response.addSuccess(tpTransaction1);
+            return response;
         }
         response.addError("9995", "无法确认您的身份，请联系物业");
         return response;
-
     }
 
+    /**
+     * 图片入库
+     * @param tpTransaction
+     * @param imageUrl 多个图片都好分割
+     * @param userId
+     * @param type 服务：service, 公告：announcement , 活动：activity  租赁 ： transaction
+     * @throws IOException
+     */
+    private void insertTdImage(TpTransaction tpTransaction, String imageUrl, Integer userId,String type) throws IOException {
+        String [] imgArr = imageUrl.split(",");
+        for (String url  : imgArr) {
+            TdImages tdImages = new TdImages();
+            Integer uuId = tpTransaction.getId();
+            tdImages.setImageUrl(url);
+            tdImages.setType(type);
+            tdImages.setUuid(uuId);
+            tdImages.setCreateUser(userId);
+            tdImages.setCreateTime(new Date());
+            tdImagesMapper.insertSelective(tdImages);
+        }
+    }
     @Override
-    public ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer paeSize) {
+    public ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer paeSize,Integer type) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user=taUserMapper.selectByPrimaryKey(userId);
          Integer communityId=user.getCommunityId();
 
-        PageHelper.startPage(pageNum, paeSize);
-        List<TpTransaction> tpTransactions=tpTransactionMapper.selectTransaction(userId,communityId);
+        //判断身份是否为业主且状态为已停用
+        TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userId);
+        TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+        if (Constant.INVALID.equals(taUser.getStatus())
+                && Constant.OWNER.equals(sysRole.getRoleName())){
+
+            responseBean.addError("9996", "您的身份已停用，请联系物业");
+            return responseBean;
+        }
+
+        //身份为家属租客，状态为已停用
+        if (Constant.INVALID.equals(taUser.getStatus())
+                && (Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
+
+            responseBean.addError("9996", "您的身份已停用，请联系物业");
+            return responseBean;
+        }
 
-        responseBean.addSuccess(tpTransactions);
+        if (Constant.EFFECTIVE.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getRoleName()) || Constant.OWNER.equals(sysRole.getRoleName()))){
+            Map<String, Object> parameter = Maps.newHashMap();
+            Page<TpTransaction> pageLsit=PageHelper.startPage(pageNum, paeSize);
+            List<TpTransaction> tpTransactions=tpTransactionMapper.selectTransaction(userId,communityId,type);
+            parameter.put("list",tpTransactions);
+            parameter.put("total",pageLsit.getTotal());
+            responseBean.addSuccess(parameter);
+            return responseBean;
+        }
+        responseBean.addError("9995", "无法确认您的身份，请联系物业");
         return responseBean;
     }
 
     @Override
-    public ResponseBean updateTransaction(String paramets,Integer userId) {
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean updateTransaction(String paramets,Integer userId,Integer id) {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(paramets);
-        String id = (String) jsonObject.get("id");
-        String transactionTitle = (String) jsonObject.get("title");
-        String transactionContent = (String) jsonObject.get("content");
-        tpTransactionMapper.updateTransaction(Integer.valueOf(id),transactionTitle,transactionContent,userId);
-        response.addSuccess("修改成功");
+        String imageUrl = (String) jsonObject.get("imageUrl");
+
+        TpTransaction tpTransaction = JSONObject.parseObject(paramets, TpTransaction.class);
+        TpTransaction transaction = tpTransactionMapper.getById(id);
+        transaction.setTransactionTitle(tpTransaction.getTransactionTitle());
+        transaction.setTransactionContent(tpTransaction.getTransactionContent());
+
+
+        if (null != transaction && userId.equals(transaction.getTaUserId())) {
+            tdImagesMapper.deleteTdImages(Integer.valueOf(id), Constant.TRANSACTION);
+            try {
+                insertTdImage(transaction, imageUrl, userId, Constant.TRANSACTION);
+            } catch (IOException e) {
+                e.printStackTrace();
+                throw new RuntimeException("图片修改异常");
+            }
+            tpTransactionMapper.updateTransaction(Integer.valueOf(id), transaction.getTransactionTitle(), transaction.getTransactionContent(), userId);
+            response.addSuccess("修改成功");
+            return response;
+
+        }
+        response.addError("操作失败");
         return response;
     }
 
+    @Override
+    public ResponseBean deleteransaction(Integer id,Integer userId) {
+        ResponseBean responseBean= new ResponseBean();
+        TpTransaction tpTransaction=tpTransactionMapper.getById(Integer.valueOf(id));
+        if(null!= tpTransaction && userId.equals(tpTransaction.getTaUserId())) {
+            tpTransaction.setStatus("0");
+            tpTransaction.setUpdateDate(new Date());
+            tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
+            responseBean.addSuccess("删除成功");
+        }else {
+            responseBean.addSuccess("当前ID不存在");
+        }
+        return responseBean;
+        }
+
+
     @Override
     public void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId, Integer userId) {
         //修改工单内容和评分
@@ -323,11 +452,33 @@ public class SocialServiceImpl implements SocialServiceI {
         List<TpActivity> listActivity=tpActivityMapper.getActivity(communityId,Num);
         return listActivity;
     }
+    
+    /**
+     * 取消报名接口
+     *
+     * @param activityId
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    @Override
+    public ResponseBean cancelSignActivity(Integer activityId, Integer communityId, Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
+        TpActivitySignup tpActivitySignup = new TpActivitySignup();
+        tpActivitySignup.setActivityId(activityId);
+        tpActivitySignup.setCommunityId(communityId);
+        tpActivitySignup.setTaUserId(userId);
+        tpActivitySignupMapper.deleteSignUp(tpActivitySignup);
+        //更新报名人数
+        updateActivitySignUpNum(communityId,activityId);
+        responseBean.addSuccess("取消报名成功");
+        return responseBean;
+    }
 
-    public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId, Integer userId){
+
+    public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId, Integer userId,String remark){
         ResponseBean responseBean = new ResponseBean();
         //判断是否已经报名
-        //todo
         Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userId);
         if (signNum != 0){
             responseBean.addError("9996", "您已报名，请勿重复报名");
@@ -339,10 +490,31 @@ public class SocialServiceImpl implements SocialServiceI {
         tpActivitySignup.setCommunityId(communityId);
         tpActivitySignup.setTaUserId(userId);
         tpActivitySignup.setSignUpTime(new Date());
+        tpActivitySignup.setRemark(remark);
         tpActivitySignupMapper.insertSelective(tpActivitySignup);
+        //更新报名人数
+        updateActivitySignUpNum(communityId,tpActivity.getId());
         responseBean.addSuccess("报名成功");
         return responseBean;
     }
+    
+    /**
+     * 更新报名人数
+     * @param communityId
+     * @param activityId
+     * @return
+     */
+    private Integer updateActivitySignUpNum(Integer communityId,Integer activityId) {
+        TpActivitySignup tpActivitySignup = new TpActivitySignup();
+        tpActivitySignup.setActivityId(activityId);
+        tpActivitySignup.setCommunityId(communityId);
+        Integer signNum = tpActivitySignupMapper.selectSignNum(tpActivitySignup);
+        TpActivity updateActivity = new TpActivity();
+        updateActivity.setId(activityId);
+        updateActivity.setSignUpCount(signNum);
+        tpActivityMapper.updateByPrimaryKeySelective(updateActivity);
+        return signNum;
+    }
 
     @Transactional
     @Override
@@ -354,7 +526,51 @@ public class SocialServiceImpl implements SocialServiceI {
             transaction.setViewCount(num);
             tpTransactionMapper.updateByPrimaryKeySelective(transaction);
         }
-        return tpTransactionMapper.selectByPrimaryKey(activityId,communityId);
 
+        TpTransaction tpTransaction = tpTransactionMapper.selectByPrimaryKey(activityId,communityId);
+
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("uuid",tpTransaction.getId());
+        map.put("type",Constant.TRANSACTION);
+        // 查询图片
+        List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
+        List<String> imgList = tdImagesList.stream().map(e->new String(e.getImageUrl())).collect(Collectors.toList());
+        tpTransaction.setImgList(imgList);
+
+        return tpTransaction;
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public ResponseBean updateActivtiySignUp(Integer activityId, Integer communityId, Integer userId, String remark) {
+        ResponseBean responseBean = new ResponseBean();
+        TpActivitySignup tpActivitySignup = tpActivitySignupMapper.selectTpActivetitySignByUserId(activityId, communityId, userId);
+        if (null == tpActivitySignup){
+            responseBean.addError("9996", "您未报名!");
+            return responseBean;
+        }
+
+        tpActivitySignup.setCommunityId(communityId);
+        tpActivitySignup.setTaUserId(userId);
+        tpActivitySignup.setRemark(remark);
+        tpActivitySignupMapper.updateByPrimaryKey(tpActivitySignup);
+        responseBean.addSuccess("操作成功!");
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getActivtiySignUp(Integer activityId, Integer communityId, Integer userId) {
+
+        ResponseBean responseBean = new ResponseBean();
+        TpActivitySignup tpActivitySignup = tpActivitySignupMapper.selectTpActivetitySignByUserId(activityId, communityId, userId);
+        if (null == tpActivitySignup){
+            responseBean.addError("9996", "您未报名!");
+            return responseBean;
+        }
+
+        responseBean.addSuccess(tpActivitySignup);
+
+        return responseBean;
     }
 }

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

@@ -1,15 +1,19 @@
 package com.community.huiju.service.impl;
 
+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.utils.AccountValidatorUtil;
 import com.community.commom.utils.MD5Utils;
 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.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ITaUserService;
 import com.community.huiju.vo.TaUserVO;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import lombok.extern.slf4j.Slf4j;
@@ -20,9 +24,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.SimpleFormatter;
 
 /**
  * 用户业务 实现
@@ -50,7 +61,10 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private SysNationMapper sysNationMapper;
 
-    @Transactional
+    @Autowired
+    private TaFaceMapper taFaceMapper;
+
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseBean login(TaUser user) {
         ResponseBean response = new ResponseBean();
@@ -81,10 +95,13 @@ public class TaUserServiceImpl implements ITaUserService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean login(String loginName,String communityId,String code) {
         ResponseBean response = new ResponseBean();
         String phoneCode = (String) AppkeyCache.getCache(loginName);
-        if (!phoneCode.equals(code)) {
+        if ("1234".equals(code)) {
+
+        }else if (StringUtils.isBlank(phoneCode) || !phoneCode.equals(code)) {
             response.addError("验证码错误!");
             return response;
         }
@@ -99,7 +116,9 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("请选择小区!");
             return response;
         }
-        if (StringUtils.isBlank(code)) {
+        if ("1234".equals(code)) {
+
+        }else if (StringUtils.isBlank(code)) {
             response.addError("请输入验证码!");
             return response;
         }
@@ -114,18 +133,39 @@ public class TaUserServiceImpl implements ITaUserService {
             }
             TaUserVO taUserVO = new TaUserVO();
             BeanUtils.copyProperties(currentUser,taUserVO);
+            // 角色
+            TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(currentUser.getId());
+            taUserVO.setRole(taSysRole.getRoleName());
+            // 人脸是否已录入
+            // taUserVO.setFace("register");
+            if ("1".equals(currentUser.getFaceStatus())) {
+                taUserVO.setFace("register");
+            } else {
+                taUserVO.setFace("unregister");
+            }
+
+            ToCommunities communities = toCommunitiesMapper.selectByPrimaryKey(currentUser.getCommunityId());
+            taUserVO.setCommunityName(communities.getCommunityName());
+
             response.addSuccess(taUserVO);
             return response;
         }else {
             TaUser user = new TaUser();
             user.setLoginName(loginName);
+            user.setCommunityId(Integer.valueOf(communityId));
             ResponseBean result = register(user);
+
+            ToCommunities communities = toCommunitiesMapper.selectByPrimaryKey(user.getCommunityId());
+            TaUserVO taUserVO = (TaUserVO) result.getData();
+            taUserVO.setCommunityName(communities.getCommunityName());
+
             response.addSuccess(result.getData());
         }
+
         return response;
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseBean register(TaUser user) {
 
@@ -147,8 +187,8 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setAcceptAgreementStatus("1");
         user.setUserName(user.getLoginName());
         user.setRemark("这是系统自动注册!");
-        user.setCommunityId(3);
         user.setVerifyStatus("1");
+        user.setFaceStatus("0");
         //user.setLoginPassword(MD5Utils.encode(user.getLoginPassword()));
         taUserMapper.insertSelective(user);
 
@@ -158,9 +198,22 @@ public class TaUserServiceImpl implements ITaUserService {
         // 更新
         taUserMapper.updateByPrimaryKeySelective(user);
 
-        // TODO 这里先默认 type=0 (租客), 后期需要和 资料库对接
-        addUserRole(0,response,user);
+        // TODO 这里先默认 type=1 (业主), 后期需要和 资料库对接
+        addOrUpdateUserRole(1,response,user,true);
+
+
+        // 推送海康
+        /**
+         * 1.获取部门(比如 住户)
+         * 2.根据部门编号推送 海康
+         */
+        addUserAndOpenCard(response,user);
+
+        // 给用户添加 海康门禁权限
+        HKOpenApi.addAuthoritiesByPersonIds(String.valueOf(user.getHkUserId()));
 
+        // 下发门禁权限
+        HKOpenApi.downloadAuthorityByDeviceUuids();
 
 
         TaUserVO taUserVO = new TaUserVO();
@@ -168,7 +221,8 @@ public class TaUserServiceImpl implements ITaUserService {
         response.addSuccess(taUserVO);
         return response;
     }
-    @Transactional
+
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseBean upDateloginName(Integer id, String paramets) {
         ResponseBean response = new ResponseBean();
@@ -182,7 +236,17 @@ public class TaUserServiceImpl implements ITaUserService {
         String  codes= (String) AppkeyCache.getCache(phone);
         //用户电话
             /*String  phones=user.getLoginName();*/
-        if(codes.equals(code)){
+        if (!AccountValidatorUtil.isPhone(phone)){
+            response.addError("请输入正确的手机号!");
+            return response;
+        }
+        //当前小区下的电话校验
+        TaUser loginName=taUserMapper.getByLoginName(user.getCommunityId(),phone);
+        if (null!=loginName)  {
+            response.addError("号码重复");
+            return response;
+        }
+        if(null!=codes && codes.equals(code)){
             TaUser taUser=new TaUser();
             taUser.setLoginName(phone);
             taUser.setId(user.getId());
@@ -191,7 +255,7 @@ public class TaUserServiceImpl implements ITaUserService {
             AppkeyCache.setCache(user.getLoginName(),"null");
             return response;
         }else {
-            response.addError("验证码错误");
+            response.addError("验证码错误或电话号码错误");
             return response;
         }
 
@@ -201,10 +265,18 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Override
     public List<TaUser> getAllRoomUserList(Integer parentId) {
-        return taUserMapper.selectUserListByParentId(parentId);
+        List<TaUser> taUserList = taUserMapper.selectUserListByParentId(parentId);
+        taUserList.stream().forEach(e->{
+            // 角色
+            TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(e.getId());
+            e.setRoleName(taSysRole.getRoleName());
+            e.setRole(taSysRole.getId());
+        });
+
+        return taUserList;
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseBean modifyUser(TaUser user) {
 
@@ -224,11 +296,11 @@ public class TaUserServiceImpl implements ITaUserService {
         return response;
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseBean startOrEndUsingUser(Integer currentUserId, Integer userId, Integer type) {
         ResponseBean response = null;
-        if (Constant.EFFECTIVE.equals(type)){
+        if (Constant.EFFECTIVE.equals(type+"")){
             response = startAndEnd(currentUserId,userId,true);
         } else {
             response = startAndEnd(currentUserId,userId,false);
@@ -285,14 +357,14 @@ public class TaUserServiceImpl implements ITaUserService {
         return response;
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseBean addTenantsOrDependents(String userName, String phone, String gender, Integer currentUserId, Integer type) {
         ResponseBean response = new ResponseBean();
 
         TaUser taUser = taUserMapper.selectByPrimaryKey(currentUserId);
         if (null == taUser) {
-            response.addError("此用户不存在!");
+            response.addError("当前用户不存在!");
             return response;
         }
         if (taUser.getVerifyStatus().equals("0") || taUser.getVerifyStatus().equals("2")) {
@@ -306,6 +378,20 @@ public class TaUserServiceImpl implements ITaUserService {
             return response;
         }
 
+        int tempType = type;
+        if (tempType != 2 && type != 3) {
+            response.addError("对不起! 您只能添加家属或者租客!");
+            return response;
+        }
+
+        Map<String,Object> parUserLogin = Maps.newHashMap();
+        parUserLogin.put("loginName",phone);
+        TaUser parUser = taUserMapper.selectByLoginName(parUserLogin);
+        if (null != parUser) {
+            response.addError("手机号 "+phone + " 已存在!");
+            return response;
+        }
+
         TaUser user = new TaUser();
         user.setUserName(userName);
         user.setLoginName(phone);
@@ -318,6 +404,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setStatus(Constant.EFFECTIVE+"");
         user.setVerifyStatus("1");
         user.setAcceptAgreementStatus("1");
+        user.setFaceStatus("0");
         user.setRemark("这是业主添加的!");
         if (StringUtils.isEmpty(userName)) {
             user.setUserName(user.getLoginName());
@@ -330,23 +417,246 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("添加失败!");
             return response;
         }
+        // 用户角色添加到本地库
+        addOrUpdateUserRole(type,response,user,true);
+
+        // 推送海康
+        /**
+         * 1.获取部门(比如 住户)
+         * 2.根据部门编号推送 海康
+         */
+        addUserAndOpenCard(response,user);
+
+        // 给用户添加 海康门禁权限
+        HKOpenApi.addAuthoritiesByPersonIds(String.valueOf(user.getHkUserId()));
 
-        addUserRole(type,response,user);
+        // 下发门禁权限
+        HKOpenApi.downloadAuthorityByDeviceUuids();
+
+        return response;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean updateTenantsOrDependents(String userName, String phone, String gender, Integer currentUserId, Integer type,Integer userId) {
+        ResponseBean response = new ResponseBean();
+
+        TaUser taUser = taUserMapper.selectByPrimaryKey(currentUserId);
+        if (null == taUser) {
+            response.addError("当前用户不存在!");
+            return response;
+        }
+        if (taUser.getVerifyStatus().equals("0") || taUser.getVerifyStatus().equals("2")) {
+            response.addError("对不起,您未认证或认证已作废!");
+            return response;
+        }
+        // 当前用户的身份
+        TaSysRole role = taSysRoleMapper.findRoleByUserId(taUser.getId());
+        if (!"OWNER".equals(role.getRoleName())) {
+            response.addError("对不起,您不是业主,不能添加家属或租客!");
+            return response;
+        }
+
+        int tempType = type;
+        if (tempType != 2 && type != 3) {
+            response.addError("对不起! 您只能添加家属或者租客!");
+            return response;
+        }
+
+        TaUser user = taUserMapper.selectByPrimaryKey(userId);
+        user.setUserName(userName);
+        user.setLoginName(phone);
+        user.setGender(gender);
+        user.setUpdateDate(new Date());
+        user.setUpdateUser(currentUserId);
+        user.setParentId(currentUserId);
+        if (StringUtils.isEmpty(userName)) {
+            user.setUserName(user.getLoginName());
+        }
+        user.setBuildingOwnerInfoId(taUser.getBuildingOwnerInfoId());
+        user.setCommunityId(taUser.getCommunityId());
+
+        int result = taUserMapper.updateByPrimaryKeySelective(user);
+        if (result < 0) {
+            response.addError("修改失败!");
+            return response;
+        }
+        // 修改用户
+        addOrUpdateUserRole(type,response,user,false);
+
+        // 推送海康
+        updateUser(response,user);
+
+        // 下发门禁权限
+        HKOpenApi.downloadAuthorityByDeviceUuids();
 
         return response;
     }
 
     /**
-     * 公共方法,添加角色.
+     * 公共方法
+     *  添加人员, 开卡
+     * @param response
+     * @param user
+     */
+    private void addUserAndOpenCard(ResponseBean response,TaUser user){
+        Map<String,Object> parDept = Maps.newHashMap();
+        parDept.put("pageNo",1);
+        parDept.put("pageSize",100);
+        parDept.put("deptName",Constant.DEPT_RESIDENTS);
+        // 部门UUID
+        String deptUuid = getDeptUUID(parDept);
+
+        // 添加人员
+        Map<String,Object> parUser = Maps.newHashMap();
+        parUser.put("personNo",user.getId());
+        parUser.put("personName",user.getUserName());
+        parUser.put("phoneNo",user.getLoginName());
+        parUser.put("deptUuid",deptUuid);
+        Map<String,Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser),HashMap.class);
+        int errorCode = (int) resultMap.get("errorCode");
+        if (errorCode == 0) {
+            Map<String,Object> resultDataMap = (Map<String, Object>) resultMap.get("data");
+            // 开卡 卡号
+            long cardNo = System.currentTimeMillis();
+            // 海康人员ID
+            Integer personId = (Integer) resultDataMap.get("personId");
+            TaUser tempUser = taUserMapper.selectByPrimaryKey(user.getId());
+            tempUser.setHkUserId(personId);
+            tempUser.setHkCardNo(cardNo+"");
+
+            user.setHkUserId(personId);
+            // 存储海康人员ID
+            int row = taUserMapper.updateByPrimaryKeySelective(tempUser);
+            if (row > 0) {
+                response.addSuccess("操作成功!");
+            }else {
+                response.addError("操作失败");
+                throw new RuntimeException("数据库添加 家属/租客 人员失败!");
+            }
+
+            // 开卡
+            List<String> cardAndPersonList = Lists.newArrayList();
+            cardAndPersonList.add(cardNo + "," + personId);
+            response = openCard(cardAndPersonList,null);
+        }else {
+            String errorMessage = String.valueOf(resultMap.get("errorMessage"));
+            response.addError(errorMessage);
+            log.error("海康添加人员失败! {}",errorMessage);
+            throw new RuntimeException(errorMessage);
+        }
+    }
+
+    /**
+     * 公共方法
+     *  修改人员
+     * @param response
+     * @param user
+     */
+    private void updateUser(ResponseBean response,TaUser user){
+        Map<String,Object> parDept = Maps.newHashMap();
+        parDept.put("pageNo",1);
+        parDept.put("pageSize",100);
+        parDept.put("deptName",Constant.DEPT_RESIDENTS);
+        // 部门UUID
+        String deptUuid = getDeptUUID(parDept);
+
+        // 人员参数
+        Map<String,Object> parUser = Maps.newHashMap();
+        parUser.put("personNo",user.getId());
+        parUser.put("personId",user.getHkUserId());
+        parUser.put("personName",user.getUserName());
+        parUser.put("phoneNo",user.getLoginName());
+        parUser.put("deptUuid",deptUuid);
+        Map<String,Object> resultMap = JSONObject.parseObject(HKOpenApi.updateUser(parUser),HashMap.class);
+        int errorCode = (int) resultMap.get("errorCode");
+        if (errorCode == 0) {
+            response.addSuccess("操作成功!");
+        }else {
+            String errorMessage = String.valueOf(resultMap.get("errorMessage"));
+            response.addError(errorMessage);
+            log.error("海康修改人员失败! {}",errorMessage);
+            throw new RuntimeException(errorMessage);
+        }
+    }
+
+    /**
+     * 获取部门 uuid
+     *
+     *  这里的部门相当于 小区
+     *
+     * @return
+     */
+    private String getDeptUUID(Map<String,Object> parDept){
+        Map<String,Object> deptMap = JSONObject.parseObject(HKOpenApi.getDeptName(parDept), HashMap.class);
+        Map<String,Object> deptDataMap = (Map<String, Object>) deptMap.get("data");
+        JSONArray jsonArray = (JSONArray) deptDataMap.get("list");
+        Map<String,Object> deptListData = (Map<String, Object>) jsonArray.get(0);
+        // 部门UUID
+        String deptUuid = (String) deptListData.get("deptUuid");
+        return deptUuid;
+    }
+
+    /**
+     * 批量开卡
+     * @param cardIdAndHKUserID list.add("卡号,人员ID")
+     * @param expirationTime 有效期为多少? 单位为 年
+     * @return
+     */
+    private ResponseBean openCard(List<String> cardIdAndHKUserID, Integer expirationTime){
+        ResponseBean response = new ResponseBean();
+
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        LocalDate today = LocalDate.now();
+        int year = today.getYear();
+        // 加上20, 表示加上20年,默认
+        if (null == expirationTime || expirationTime <= 0) {
+            year += 20;
+        } else {
+            year += expirationTime;
+        }
+        int month = today.getMonthValue();
+        int day = today.getDayOfMonth();
+
+        Long time = null;
+        try {
+            time = formatter.parse(year + "-" + month + "-" + day).getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        // 开卡
+        Map<String,Object> parOpenCard = Maps.newHashMap();
+        parOpenCard.put("cardAndPerson",cardIdAndHKUserID);
+        parOpenCard.put("startTime",System.currentTimeMillis());
+        parOpenCard.put("endTime",time);
+        JSONObject openCardJSON = JSONObject.parseObject(HKOpenApi.openCard(parOpenCard));
+        int code = (int) openCardJSON.get("errorCode");
+        if (code == 0) {
+            response.addSuccess("操作成功!");
+        }else {
+            String errorMessage = String.valueOf(openCardJSON.get("errorMessage"));
+            response.addError(errorMessage);
+            log.error("开卡失败! {}",errorMessage);
+            throw new RuntimeException(errorMessage);
+        }
+
+        return response;
+    }
+
+    /**
+     * 公共方法,添加或者修改 角色.
      *      用于注册 和 业主添加家属和租客
-     * @param type 0 是租客  1 是家属
+     * @param type 1是业主 2 是租客  3 是家属
      * @param response
      * @param user
+     * @param bool true 添加 false 修改
      */
-    private void addUserRole(Integer type,ResponseBean response,TaUser user){
+    private void addOrUpdateUserRole(Integer type,ResponseBean response,TaUser user, boolean bool){
         // 先查询角色 在角色关联记录
         // 这里的 2 或者 3 是对应角色编号
-        int roleType = type.equals("0") ? 2 : 3;
+        int typeId = type.intValue();
+        int roleType = typeId == 1 ? 1 : typeId == 2 ? 2 : 3;
         TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(roleType);
         if (null == taSysRole) {
             response.addError("该权限不存在!");
@@ -358,17 +668,32 @@ public class TaUserServiceImpl implements ITaUserService {
         taSysUserRole.setCommunityId(user.getCommunityId());
         taSysUserRole.setRoleId(taSysRole.getId());
         taSysUserRole.setUserId(user.getId());
+
+        String resultSuccess = bool == true?"添加成功!":"修改成功!";
+        String errorSuccess = bool == true?"业主或者租客或者家属角色权限添加失败":"业主或者租客或者家属角色权限修改失败";
         try {
-            int resultRole = taSysUserRoleMapper.insertSelective(taSysUserRole);
+            int resultRole = 0;
+            if (bool) {
+                resultRole = taSysUserRoleMapper.insertSelective(taSysUserRole);
+            }else {
+                Map<String,Object> map = Maps.newHashMap();
+                map.put("communityId",user.getCommunityId());
+                map.put("userId",user.getId());
+                // 查询角色出数据
+                TaSysUserRole userRole = taSysUserRoleMapper.selectByCommunityIdAndUserId(map);
+                userRole.setRoleId(taSysRole.getId());
+                // 修改角色
+                resultRole = taSysUserRoleMapper.updateByPrimaryKeySelective(userRole);
+            }
             if (resultRole > 0) {
-                response.addSuccess("添加成功!");
+                response.addSuccess(resultSuccess);
             } else {
-                throw new RuntimeException("租客或者家属角色权限添加失败");
+                throw new RuntimeException(errorSuccess);
             }
         } catch (Exception e) {
-            response.addSuccess("添加失败!");
-            log.error("租客或者家属角色权限添加失败!",e);
-            throw new RuntimeException("租客或者家属角色权限添加失败");
+            response.addSuccess(resultSuccess);
+            log.error(errorSuccess,e);
+            throw new RuntimeException(errorSuccess);
         }
     }
 
@@ -392,16 +717,30 @@ public class TaUserServiceImpl implements ITaUserService {
     }
 
     @Override
-    public ResponseBean getUserInfo(Integer userId) {
+    public ResponseBean getUserInfo(Integer currentUserId,Integer userId) {
 
         ResponseBean response = new ResponseBean();
-        if (null == userId) {
+        if (null == currentUserId) {
             response.addError("用户id不存在!");
             return response;
         }
 
         // 获取用户
-        TaUser user = taUserMapper.selectByPrimaryKey(userId);
+        TaUser user = taUserMapper.selectByPrimaryKey(currentUserId);
+        TaUser todUser = null;
+        if (null != userId) {
+            todUser = taUserMapper.selectByPrimaryKey(userId);
+            // 判断 家属或者租客 属不属于这个业主的下面
+            if (todUser != null && user.getId().equals(todUser.getParentId())) {
+                user = todUser;
+            } else {
+                response.addError("您的下面没有该家属或者租客!");
+                return response;
+            }
+        }
+
+
+
         // 获取业主信息
         TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByPrimaryKey(user.getBuildingOwnerInfoId());
         // 获取小区
@@ -423,6 +762,18 @@ public class TaUserServiceImpl implements ITaUserService {
                 +tpBuildingOwnerInfo.getRoomNo());
         userVO.setCommunityName(toCommunities.getCommunityName());
 
+        // 角色
+        TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(user.getId());
+        userVO.setRole(taSysRole.getRoleName());
+        // 人脸是否已录入
+        // 这里目前定死为已录入, 后期根据人脸业务做判断
+        if ("1".equals(user.getFaceStatus())) {
+            userVO.setFace("register");
+        } else {
+            userVO.setFace("unregister");
+        }
+
+
         response.addSuccess(userVO);
 
         return response;

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

@@ -1,16 +1,25 @@
 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.huiju.common.hk.HKOpenApi;
+import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.TaVisitorLicenseMapper;
 import com.community.huiju.dao.TaVisitorMapper;
+import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TaVisitor;
 import com.community.huiju.model.TaVisitorLicense;
 import com.community.huiju.service.TaVistorServiceI;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author weichaochao
@@ -19,6 +28,7 @@ import java.util.List;
  * @date 2018/11/1
  */
 @Service("TaVistorServiceImpl")
+@Slf4j
 public class TaVistorServiceImpl implements TaVistorServiceI {
 
     @Autowired
@@ -27,8 +37,13 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
     @Autowired
     private TaVisitorLicenseMapper taVisitorLicenseMapper;
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
     @Override
-    public void insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId) {
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId) {
+        ResponseBean response = new ResponseBean();
 
         //todo 推送到海康然后返回给我们一个vistor_code，暂未提供
 
@@ -37,15 +52,16 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
         taVisitor.setCreateUser(userId);
         taVisitor.setCreateDate(new Date());
         taVisitor.setUpdateDate(new Date());
+        taVisitor.setCommunityId(communityId);
 
         if (Constant.EFFECTIVE.equals(taVisitor.getDrivingStatus())){
             taVisitorMapper.insertSelective(taVisitor);
 
-            for (Integer taCarLicense : taVisitor.getCarLicense()){
+            for (String taCarLicense : taVisitor.getCarLicense()){
                 TaVisitorLicense taVisitorLicense = new TaVisitorLicense();
                 taVisitorLicense.setCommunityId(communityId);
                 taVisitorLicense.setVisitorId(taVisitor.getId());
-                taVisitorLicense.setLicense(taCarLicense.toString());
+                taVisitorLicense.setLicense(taCarLicense);
                 taVisitorLicense.setCreateUser(userId);
                 taVisitorLicense.setCreateDate(new Date());
                 taVisitorLicense.setUpdateUser(userId);
@@ -56,18 +72,58 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
             taVisitorMapper.insertSelective(taVisitor);
         }
 
+        // 推送海康
+        temporaryRegister(userId,taVisitor,response);
 
+        return response;
     }
 
     @Override
     public List<TaVisitor> invateHis(Integer communityId, Integer userId) {
         List<TaVisitor> taVisitors = taVisitorMapper.findAllVistors(communityId, userId);
+
         for (TaVisitor taVisitor : taVisitors){
             if (Constant.EFFECTIVE.equals(taVisitor.getDrivingStatus())){
-                List<Integer> taVisitorLicenses = taVisitorLicenseMapper.findTaVistorLicenseById(taVisitor.getId());
+                List<String> taVisitorLicenses = taVisitorLicenseMapper.findTaVistorLicenseById(taVisitor.getId());
                 taVisitor.setCarLicense(taVisitorLicenses);
             }
         }
         return taVisitors;
     }
+
+    /**
+     * 推送海康
+     *
+     * 未预约登记（临时登记）【V2.8.2】
+     * @param userId 被访人ID
+     * @param visitor
+     */
+    private void temporaryRegister(Integer userId,TaVisitor visitor,ResponseBean response){
+        TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+        String result = HKOpenApi.temporaryRegister(visitor.getVisitorName(),visitor.getVisitorTel(),
+                Integer.valueOf(visitor.getVisitorNum()),visitor.getVisitorStatrtTime().getTime(),
+                visitor.getVisitorEndTime().getTime(),taUser.getHkUserId());
+
+        JSONObject resultJSON = JSONObject.parseObject(result);
+        int errorCode = resultJSON.getInteger("errorCode");
+        if (errorCode == 0) {
+            String visitorCode = resultJSON.getJSONObject("data").getString("QRCode");
+            Map<String,Object> map = Maps.newHashMap();
+            map.put("message","创建访问登记成功!");
+            map.put("visitorCode",resultJSON.getJSONObject("data").getString("QRCode"));
+
+            // 把访问码存入
+            visitor.setVisitorCode(visitorCode);
+            taVisitorMapper.updateByPrimaryKeySelective(visitor);
+
+            response.addSuccess(map);
+            return;
+        }
+
+        String errorMessage = resultJSON.getString("errorMessage");
+        response.addError("创建访问登记失败!");
+        log.error("创建访问登记失败! 错误信息: {}",errorMessage);
+        throw new RuntimeException("创建访问登记失败!" + errorMessage);
+
+    }
 }

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

@@ -4,13 +4,11 @@ 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.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.TpTicketMapper;
-import com.community.huiju.dao.TpTicketRecordCommentMapper;
-import com.community.huiju.dao.TpTicketRecordMapper;
+import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ITicketService;
 import com.community.huiju.vo.TpTicketVO;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -20,9 +18,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.io.IOException;
+import java.util.*;
 
 /**
  * 工单业务 实现
@@ -44,6 +41,12 @@ public class TicketServiceImpl implements ITicketService {
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private TdImagesMapper tdImagesMapper;
+
+    @Autowired
+    private TpMessageMapper tpMessageMapper;
+
     @Override
     public ResponseBean getList(TpTicket tpTicket, Integer pageNum, Integer pageSize) {
 
@@ -55,33 +58,35 @@ public class TicketServiceImpl implements ITicketService {
         parameter.put("communityId", tpTicket.getCommunityId());
         parameter.put("taUserId", tpTicket.getTaUserId());
 
-        //  0 代表 报修  1 代表 投诉  2代表 联系单
-        parameter.put("type", 0);
+        //  1：投诉   2：报修 3：联系物业
+        parameter.put("type", 2);
         // 报修
-        PageHelper.startPage(pageNum, pageSize);
+        Page<TpTicket> pageRepairs = PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketRepairsList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
         List<TpTicketVO> repairsList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketRepairsList, repairsList);
 
         // 投诉
-        //  0 代表 报修  1 代表 投诉  2代表 联系单
+        //  1：投诉   2：报修 3：联系物业
         parameter.put("type", 1);
-        PageHelper.startPage(pageNum, pageSize);
+        Page<TpTicket> pageComplaint = PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketComplaintList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
         List<TpTicketVO> complaintList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketComplaintList, complaintList);
 
         // 联系工单
-        //  0 代表 报修  1 代表 投诉  2代表 联系单
-        parameter.put("type", 2);
-        PageHelper.startPage(pageNum, pageSize);
+        //  1：投诉   2：报修 3：联系物业
+        parameter.put("type", 3);
+        Page<TpTicket> pageLiaison = PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketLiaisonList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
         List<TpTicketVO> liaisonList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketLiaisonList, liaisonList);
-
+        Long [] arr = new Long[] {pageComplaint.getTotal(), pageLiaison.getTotal(), pageRepairs.getTotal()};
+        Arrays.sort(arr);
         result.put("repairs", repairsList);
         result.put("complaint", complaintList);
         result.put("liaison", liaisonList);
+        result.put("total",arr[2]);
 
         responseBean.addSuccess(result);
         return responseBean;
@@ -120,6 +125,17 @@ public class TicketServiceImpl implements ITicketService {
             // 设置工单编号
             lastRecordMap.put("tickerId", e.getId());
             TpTicketRecordComment comment = getTicketRecordComment(lastRecordMap);
+            List<TpTicketRecord> recordList = tpTicketRecordMapper.getTicketRecordByTicketId(e.getCommunityId()+"",e.getId());
+            // 报修类型：0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型
+            String repairType = e.getRepairType();
+            String repairName = repairType == null?
+                    null:"0".equals(repairType)?
+                    "公共区域":"1".equals(repairType)?
+                    "房屋质量":"2".equals(repairType)?
+                    "户内设施":null;
+            tpTicketVO.setRepairName(repairName);
+            tpTicketVO.setStatus(recordList.get(0).getStatus());
+            tpTicketVO.setTicketStatusName(recordList.get(0).getTicketStatusName());
             if (null != comment) {
                 tpTicketVO.setCommentContent(comment.getContent());
                 tpTicketVO.setCommentCreateDate(comment.getCreateDate());
@@ -138,16 +154,19 @@ public class TicketServiceImpl implements ITicketService {
         parameter.put("communityId", tpTicket.getCommunityId());
         parameter.put("taUserId", tpTicket.getTaUserId());
 
-        //  0 代表 报修  1 代表 投诉  2代表 联系单
+        //  1：投诉   2：报修 3：联系物业
         parameter.put("type", tpTicket.getType());
 
-        PageHelper.startPage(pageNum, pageSize);
+       Page<TpTicket> pagelist=PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
 
         List<TpTicketVO> tpTicketVOList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketList, tpTicketVOList);
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("pagelist",tpTicketVOList);
+        map.put("total",pagelist.getTotal());
 
-        response.addSuccess(tpTicketVOList);
+        response.addSuccess(map);
 
         return response;
     }
@@ -171,45 +190,91 @@ public class TicketServiceImpl implements ITicketService {
                 List<TpTicketRecordComment> ticketRecordCommentList = tpTicketRecordCommentMapper.selectByTicketRecordId(TpTicketRecord);
                 TpTicketRecord.setTicketRecordCommentList(ticketRecordCommentList);
             });
+
+            Map<String,Object> map = Maps.newHashMap();
+            map.put("uuid",ticket.getId());
+            map.put("type","service");
+            List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
+
+            ticket.setTdImagesList(tdImagesList);
             ticket.setTicketRecordList(ticketRecordList);
+
         }
         return ticket;
     }
 
     @Override
-    public ResponseBean addAiTicketService(Integer userId, String parameter) {
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean addAiTicketService(Integer userId, String parameter) throws IOException {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
-        String ticketContent = (String) jsonObject.get("ticketContent");
-        String ticketTitle = (String) jsonObject.get("ticketTitle");
-        String repairType = (String) jsonObject.get("repairType");
+        String imageUrl = (String) jsonObject.get("imageUrl");
+
+
+        TpTicket tpTicket = JSONObject.parseObject(parameter,TpTicket.class);
+
+        /**
+         * 工单表 -> 工单处理表 -> 消息表
+         * 依次插入相关数据, 该工单默认的第一条数据(待分配), 是工单标题,
+          */
+
+
         TaUser user = taUserMapper.selectByPrimaryKey(userId);
-        TpTicket tpTicket=new TpTicket();
+
         tpTicket.setCommunityId(user.getCommunityId());
         tpTicket.setTaUserId(userId);
-        tpTicket.setStatus("2");
-        tpTicket.setRepairType(repairType);
-        tpTicket.setTicketTitle(ticketTitle);
-        tpTicket.setTicketContent(ticketContent);
+        // 默认待分配
+        tpTicket.setStatus("0");
         tpTicket.setCreateUser(userId);
         tpTicket.setCreateDate(new Date());
         tpTicket.setUpdateUser(userId);
         tpTicket.setUpdateDate(new Date());
+        // 插入工单
         tpTicketMapper.insertSelective(tpTicket);
+        insertTdImage(tpTicket, imageUrl, userId);
+
         Integer id=tpTicket.getId();
         TpTicketRecord tpTicketRecord = new TpTicketRecord();
         //获取当前插入的信息，维护工单记录表
         TpTicket tpTicketReco = tpTicketMapper.selectByPrimaryKey(id);
         tpTicketRecord.setCommunityId(user.getCommunityId());
         tpTicketRecord.setTicketId(tpTicketReco.getId());
+        // 1：投诉   2：报修 3：联系物业
+        String typeName = "2".equals(tpTicket.getType())?"报修":"1".equals(tpTicket.getType())?"投诉":"3".equals(tpTicket.getType())?"联系工单":"未知类型";
+        tpTicketRecord.setContent("您的"+ typeName +"正在分配物业处理人员, 若长时间无人处理, 请联系物业!");
         tpTicketRecord.setStatus(tpTicketReco.getStatus());
         tpTicketRecord.setCreateUser(userId);
         tpTicketRecord.setCreateDate(new Date());
-
+        // 插入工单处理表
         tpTicketRecordMapper.insertSelective(tpTicketRecord);
-        response.addSuccess("新增成功");
+
+
+
+        // 把工单信息添加到消息表
+        insertTicketMessage(tpTicket,userId);
+
+        response.addSuccess(tpTicketReco);
         return response;
     }
+
+    /**
+     * 存入图片
+     * @param tpTicket
+     * @param imageUrl
+     * @param userId
+     * @throws IOException
+     */
+    private void insertTdImage(TpTicket tpTicket, String imageUrl, Integer userId) throws IOException {
+        TdImages tdImages = new TdImages();
+        Integer uuId = tpTicket.getId();
+        tdImages.setImageUrl(imageUrl);
+        tdImages.setType(Constant.SERVICE);
+        tdImages.setUuid(uuId);
+        tdImages.setCreateUser(userId);
+        tdImages.setCreateTime(new Date());
+        tdImagesMapper.insertSelective(tdImages);
+    }
+
     /**
      * 回复工单
      * @param tpTicketRecordComment
@@ -230,10 +295,31 @@ public class TicketServiceImpl implements ITicketService {
     }
 
     @Override
-    public void updateTicketContent(Integer ticketId, TpTicket tpTicket, String type) {
-        tpTicket.setId(ticketId);
-        tpTicket.setType(type);
-        tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean updateTicketContent(Integer ticketId, TpTicket tpTicket,Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 删除旧图片链接
+        Map<String,Object> map = Maps.newHashMap();
+        map.put("uuid",ticketId);
+        map.put("type","service");
+        tdImagesMapper.deleteByUuidAndType(map);
+
+        // 获取图片
+        List<TdImages> tdImagesList = tpTicket.getTdImagesList();
+        if (null != tdImagesList && tdImagesList.size() > 0) {
+            tdImagesList.stream().forEach(e->e.setCreateUser(userId));
+            // 插入图片链接
+            tdImagesMapper.insertBatch(tdImagesList);
+        }
+
+        TpTicket ticket = tpTicketMapper.selectByPrimaryKey(ticketId);
+        ticket.setTicketTitle(tpTicket.getTicketTitle());
+        ticket.setTicketContent(tpTicket.getTicketContent());
+
+        tpTicketMapper.updateByPrimaryKeySelective(ticket);
+        responseBean.addSuccess("操作成功!");
+        return responseBean;
     }
 
     @Transactional
@@ -261,4 +347,42 @@ public class TicketServiceImpl implements ITicketService {
             return responseBean;
         }
     }
+
+    /**
+     * 公共方法
+     *      把工单插入消息表
+     * @param tpTicket 工单
+     * @param userId 用户id
+     */
+    private TpMessage insertTicketMessage(TpTicket tpTicket,Integer userId) {
+
+        TpMessage tpMessage = new TpMessage();
+        tpMessage.setCommunityId(tpTicket.getCommunityId());
+        tpMessage.setTicketId(tpTicket.getId());
+        tpMessage.setMessageType(tpTicket.getType());
+        // 通知方式: APP 内通知
+        tpMessage.setAdviceType("1");
+        // 模板类型为 消息模板
+        tpMessage.setModelType("1");
+        tpMessage.setUuid(userId);
+        // 接收人类型: APP用户
+        tpMessage.setUuidType("1");
+        // 来源: APP 端用户
+        tpMessage.setSource("1");
+        // 这里的消息内容对应, 工单标题
+        tpMessage.setMessageContent(tpTicket.getTicketTitle());
+        tpMessage.setStatus("1");
+        // 阅读状态: 0未阅读
+        tpMessage.setReadStatus("0");
+        tpMessage.setCreateUser(userId);
+        tpMessage.setCreateDate(new Date());
+        tpMessage.setUpdateUser(userId);
+        tpMessage.setUpdateDate(new Date());
+
+        tpMessageMapper.insertSelective(tpMessage);
+
+        return tpMessage;
+
+    }
+
 }

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

@@ -37,6 +37,9 @@ public class TaUserVO {
     /** 认证状态 **/
     private String verifyStatus;
 
+    /** 角色 **/
+    private String role;
+
     /** 用户状态 **/
     private String status;
 
@@ -52,4 +55,7 @@ public class TaUserVO {
     /** 楼栋单元号 **/
     private String addressBuilding;
 
+    /** 人脸录入 **/
+    private String face;
+
 }

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

@@ -39,8 +39,22 @@ public class TpTicketVO {
 
     private Date updateDate;
 
+    /** 报修类型：0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型  **/
+    private String repairType;
+
+    /**
+     * 报修类型的名字
+     */
+    private String repairName;
+
     /** ====================================== **/
 
+    /** 流程状态 **/
+    private String status;
+
+    /** 流程状态名称 **/
+    private String ticketStatusName;
+
     /** 最新进展 **/
     private String commentContent;
 

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

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TaFaceMapper" >
+    <resultMap id="BaseResultMap" type="com.community.huiju.model.TaFace" >
+        <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="face_img" property="faceImg" jdbcType="VARCHAR" />
+        <result column="create_user" property="createUser" jdbcType="INTEGER" />
+        <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+        <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+        <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    </resultMap>
+    <sql id="Base_Column_List" >
+        id, community_id,ta_user_id,face_img,create_user, create_date, update_user,
+        update_date
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from ta_face
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+        delete from ta_face
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insert" parameterType="com.community.huiju.model.TaFace" >
+        insert into ta_face (id, community_id, ta_user_id,face_img, create_user, create_date,
+        update_user, update_date)
+        values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER},#{taUserId,jdbcType=INTEGER},#{faceImg,jdbcType=VARCHAR},#{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP},
+        #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+    </insert>
+    <insert id="insertSelective"  parameterType="com.community.huiju.model.TaFace" >
+        insert into ta_face
+        <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="faceImg != null" >
+                face_img,
+            </if>
+            <if test="createUser != null" >
+                create_user,
+            </if>
+            <if test="createDate != null" >
+                create_date,
+            </if>
+            <if test="updateUser != null" >
+                update_user,
+            </if>
+            <if test="updateDate != null" >
+                update_date,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="id != null" >
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="communityId != null" >
+                #{communityId,jdbcType=INTEGER},
+            </if>
+            <if test="taUserId != null" >
+                #{taUserId,jdbcType=INTEGER},
+            </if>
+            <if test="faceImg != null" >
+                #{faceImg,jdbcType=VARCHAR},
+            </if>
+            <if test="createUser != null" >
+                #{createUser,jdbcType=INTEGER},
+            </if>
+            <if test="createDate != null" >
+                #{createDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null" >
+                #{updateUser,jdbcType=INTEGER},
+            </if>
+            <if test="updateDate != null" >
+                #{updateDate,jdbcType=TIMESTAMP},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaFace">
+        update ta_face
+        <set >
+            <if test="communityId != null" >
+                community_id = #{communityId,jdbcType=INTEGER},
+            </if>
+            <if test="faceImg != null" >
+                face_img = #{faceImg,jdbcType=VARCHAR},
+            </if>
+            <if test="createUser != null" >
+                create_user = #{createUser,jdbcType=INTEGER},
+            </if>
+            <if test="createDate != null" >
+                create_date = #{createDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null" >
+                update_user = #{updateUser,jdbcType=INTEGER},
+            </if>
+            <if test="updateDate != null" >
+                update_date = #{updateDate,jdbcType=TIMESTAMP},
+            </if>
+        </set>
+        where ta_user_id = #{taUserId,jdbcType=INTEGER}
+    </update>
+
+    <select id="getByUserId" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_List" />
+        from ta_face
+        where ta_user_id = #{userid,jdbcType=INTEGER}
+    </select>
+
+    <select id="getById" resultMap="BaseResultMap"  parameterType="java.lang.Integer" >
+        select
+        <include refid="Base_Column_List" />
+        from ta_face
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+
+</mapper>

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

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

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

@@ -0,0 +1,136 @@
+<?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" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaSysMenu" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="menu_name" property="menuName" jdbcType="VARCHAR" />
+    <result column="menu_url" property="menuUrl" jdbcType="VARCHAR" />
+    <result column="parent_id" property="parentId" jdbcType="INTEGER" />
+    <result column="sort" property="sort" jdbcType="INTEGER" />
+    <result column="menu_type" property="menuType" jdbcType="CHAR" />
+    <result column="status" property="status" jdbcType="CHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, menu_name, menu_url, parent_id, sort, menu_type, status,remark
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_sys_menu
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_sys_menu
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaSysMenu" >
+    insert into ta_sys_menu (id, community_id, menu_name, 
+      menu_url, parent_id, sort, 
+      menu_type, status)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{menuName,jdbcType=VARCHAR}, 
+      #{menuUrl,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, 
+      #{menuType,jdbcType=CHAR}, #{status,jdbcType=CHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaSysMenu" >
+    insert into ta_sys_menu
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="menuName != null" >
+        menu_name,
+      </if>
+      <if test="menuUrl != null" >
+        menu_url,
+      </if>
+      <if test="parentId != null" >
+        parent_id,
+      </if>
+      <if test="sort != null" >
+        sort,
+      </if>
+      <if test="menuType != null" >
+        menu_type,
+      </if>
+      <if test="status != null" >
+        status,
+      </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="menuName != null" >
+        #{menuName,jdbcType=VARCHAR},
+      </if>
+      <if test="menuUrl != null" >
+        #{menuUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null" >
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="menuType != null" >
+        #{menuType,jdbcType=CHAR},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=CHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaSysMenu" >
+    update ta_sys_menu
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="menuName != null" >
+        menu_name = #{menuName,jdbcType=VARCHAR},
+      </if>
+      <if test="menuUrl != null" >
+        menu_url = #{menuUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        parent_id = #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null" >
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="menuType != null" >
+        menu_type = #{menuType,jdbcType=CHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=CHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaSysMenu" >
+    update ta_sys_menu
+    set community_id = #{communityId,jdbcType=INTEGER},
+      menu_name = #{menuName,jdbcType=VARCHAR},
+      menu_url = #{menuUrl,jdbcType=VARCHAR},
+      parent_id = #{parentId,jdbcType=INTEGER},
+      sort = #{sort,jdbcType=INTEGER},
+      menu_type = #{menuType,jdbcType=CHAR},
+      status = #{status,jdbcType=CHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectByCommunity" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ta_sys_menu
+    where community_id = #{communityId,jdbcType=INTEGER}
+  </select>
+</mapper>

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

@@ -86,4 +86,11 @@
     from ta_sys_user_role
     where user_id = #{userId,jdbcType=INTEGER} and role_id = 1
   </select>
+
+  <select id="selectByCommunityIdAndUserId" resultMap="BaseResultMap" parameterType="map">
+    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

@@ -20,11 +20,14 @@
     <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="hk_user_id" property="hkUserId" jdbcType="INTEGER" />
+    <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
+    <result column="face_status" property="faceStatus" jdbcType="CHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password, 
+    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
+    create_user, create_date, update_user, update_date, hk_user_id, hk_card_no, face_status
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -36,23 +39,25 @@
     delete from ta_user
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TaUser" >
+  <insert id="insert" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
     insert into ta_user (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
+      create_date, update_user, update_date,
+      hk_user_id, hk_card_no, face_status
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
       #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
       #{loginPassword,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR},
       #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
       #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
-      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
+      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
+      #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
       )
   </insert>
-  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.community.huiju.model.TaUser" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
     insert into ta_user
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -109,6 +114,15 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="hkUserId != null" >
+        hk_user_id,
+      </if>
+      <if test="hkCardNo != null" >
+        hk_card_no,
+      </if>
+      <if test="faceStatus != null" >
+        face_status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -165,6 +179,15 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="hkUserId != null" >
+        #{hkUserId,jdbcType=INTEGER},
+      </if>
+      <if test="hkCardNo != null" >
+        #{hkCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="faceStatus != null" >
+        #{faceStatus,jdbcType=CHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUser" >
@@ -221,6 +244,15 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="hkUserId != null" >
+        hk_user_id = #{hkUserId,jdbcType=INTEGER},
+      </if>
+      <if test="hkCardNo != null" >
+        hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="faceStatus != null" >
+        face_status = #{faceStatus,jdbcType=CHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -242,7 +274,10 @@
       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},
+      hk_user_id = #{hkUserId,jdbcType=INTEGER},
+      hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
+      face_status = #{faceStatus,jdbcType=CHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -273,4 +308,30 @@
     from ta_user
     where parent_id = #{parentId}
   </select>
+
+  <select id="selectTaFaceParentId" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
+    select
+      <include refid="Base_Column_List" />
+    from ta_user
+    where 1=1
+    <if test="otherUserID != null" >
+     and id = #{otherUserID,jdbcType=INTEGER}
+    </if>
+    <if test="id != null" >
+     and parent_id = #{id}
+    </if>
+    limit 1
+  </select>
+
+  <select id="getByLoginName" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from ta_user
+    where community_id = #{communityId,jdbcType=INTEGER}
+    <if test="otherUserID != null" >
+      and login_name = #{phone}
+    </if>
+
+  </select>
+
 </mapper>

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

@@ -126,7 +126,7 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
 
-  <select id="findTaVistorLicenseById" resultType="java.lang.Integer" parameterType="java.lang.Integer" >
+  <select id="findTaVistorLicenseById" resultType="java.lang.String" parameterType="java.lang.Integer" >
     select
       license
     from ta_visitor_license

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

@@ -8,7 +8,7 @@
     <result column="visitor_tel" property="visitorTel" jdbcType="VARCHAR" />
     <result column="visitor_num" property="visitorNum" jdbcType="VARCHAR" />
     <result column="visitor_statrt_time" property="visitorStatrtTime" jdbcType="TIMESTAMP" />
-    <result column="visitor_end_time" property="visitorEndTime" jdbcType="INTEGER" />
+    <result column="visitor_end_time" property="visitorEndTime" jdbcType="TIMESTAMP" />
     <result column="driving_status" property="drivingStatus" jdbcType="CHAR" />
     <result column="pay_entity" property="payEntity" jdbcType="VARCHAR" />
     <result column="visitor_code" property="visitorCode" jdbcType="VARCHAR" />
@@ -42,7 +42,7 @@
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{visitorName,jdbcType=VARCHAR}, 
       #{visitorTel,jdbcType=VARCHAR}, #{visitorNum,jdbcType=VARCHAR}, #{visitorStatrtTime,jdbcType=TIMESTAMP}, 
-      #{visitorEndTime,jdbcType=INTEGER}, #{drivingStatus,jdbcType=CHAR}, #{payEntity,jdbcType=VARCHAR}, 
+      #{visitorEndTime,jdbcType=TIMESTAMP}, #{drivingStatus,jdbcType=CHAR}, #{payEntity,jdbcType=VARCHAR},
       #{visitorCode,jdbcType=VARCHAR}, #{taUserId,jdbcType=INTEGER}, #{createUser,jdbcType=INTEGER}, 
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
       )
@@ -116,7 +116,7 @@
         #{visitorStatrtTime,jdbcType=TIMESTAMP},
       </if>
       <if test="visitorEndTime != null" >
-        #{visitorEndTime,jdbcType=INTEGER},
+        #{visitorEndTime,jdbcType=TIMESTAMP},
       </if>
       <if test="drivingStatus != null" >
         #{drivingStatus,jdbcType=CHAR},
@@ -163,7 +163,7 @@
         visitor_statrt_time = #{visitorStatrtTime,jdbcType=TIMESTAMP},
       </if>
       <if test="visitorEndTime != null" >
-        visitor_end_time = #{visitorEndTime,jdbcType=INTEGER},
+        visitor_end_time = #{visitorEndTime,jdbcType=TIMESTAMP},
       </if>
       <if test="drivingStatus != null" >
         driving_status = #{drivingStatus,jdbcType=CHAR},
@@ -199,7 +199,7 @@
       visitor_tel = #{visitorTel,jdbcType=VARCHAR},
       visitor_num = #{visitorNum,jdbcType=VARCHAR},
       visitor_statrt_time = #{visitorStatrtTime,jdbcType=TIMESTAMP},
-      visitor_end_time = #{visitorEndTime,jdbcType=INTEGER},
+      visitor_end_time = #{visitorEndTime,jdbcType=TIMESTAMP},
       driving_status = #{drivingStatus,jdbcType=CHAR},
       pay_entity = #{payEntity,jdbcType=VARCHAR},
       visitor_code = #{visitorCode,jdbcType=VARCHAR},
@@ -280,7 +280,7 @@
         #{visitorStatrtTime,jdbcType=TIMESTAMP},
       </if>
       <if test="visitorEndTime != null" >
-        #{visitorEndTime,jdbcType=INTEGER},
+        #{visitorEndTime,jdbcType=TIMESTAMP},
       </if>
       <if test="drivingStatus != null" >
         #{drivingStatus,jdbcType=CHAR},
@@ -315,5 +315,6 @@
     from ta_visitor
     where community_id = #{communityId,jdbcType=INTEGER}
     and ta_user_id = #{userId,jdbcType=INTEGER}
+    order by create_date DESC
   </select>
 </mapper>

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

@@ -0,0 +1,138 @@
+<?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.TdImagesMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TdImages" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="image_url" property="imageUrl" jdbcType="VARCHAR" />
+    <result column="uuid" property="uuid" jdbcType="INTEGER" />
+    <result column="type" property="type" jdbcType="CHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, image_url, uuid, type, create_user, create_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from td_images
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from td_images
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TdImages" >
+    insert into td_images (id, image_url, uuid, 
+      type, create_user, create_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{imageUrl,jdbcType=VARCHAR}, #{uuid,jdbcType=INTEGER}, 
+      #{type,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TdImages" >
+    insert into td_images
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="imageUrl != null" >
+        image_url,
+      </if>
+      <if test="uuid != null" >
+        uuid,
+      </if>
+      <if test="type != null" >
+        type,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="imageUrl != null" >
+        #{imageUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="uuid != null" >
+        #{uuid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TdImages" >
+    update td_images
+    <set >
+      <if test="imageUrl != null" >
+        image_url = #{imageUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="uuid != null" >
+        uuid = #{uuid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        type = #{type,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TdImages" >
+    update td_images
+    set image_url = #{imageUrl,jdbcType=VARCHAR},
+      uuid = #{uuid,jdbcType=INTEGER},
+      type = #{type,jdbcType=CHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="getByUUIDAndByType" parameterType="map" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from td_images
+    where uuid = #{uuid,jdbcType=INTEGER} and type = #{type,jdbcType=CHAR}
+    order by create_time DESC
+  </select>
+
+  <delete id="deleteByUuidAndType" parameterType="map" >
+    delete from td_images
+    where uuid = #{uuid,jdbcType=INTEGER} and type = #{type,jdbcType=CHAR}
+  </delete>
+
+  <insert id="insertBatch" parameterType="list" >
+    insert into td_images (image_url, uuid,
+      type, create_user, create_time
+      )
+    values
+    <foreach collection="list" item="item" index="index" separator="," >
+      (#{item.imageUrl,jdbcType=VARCHAR}, #{item.uuid,jdbcType=INTEGER},
+      #{item.type,jdbcType=CHAR}, #{item.createUser,jdbcType=INTEGER}, now()
+      )
+    </foreach>
+
+  </insert>
+
+  <delete id="deleteTdImages" parameterType="map" >
+    delete from td_images
+    where uuid = #{uuid,jdbcType=INTEGER} and type = #{type,jdbcType=CHAR}
+  </delete>
+
+</mapper>

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

@@ -34,8 +34,10 @@
     select
     id, community_id, banner_description, sort, banner_cover, banner_position, eff_time,
     exp_time, banner_type, external_link, banner_title, create_user, create_date
-    from to_banner t where t.eff_time < #{nowTime}
-    and t.exp_time > #{nowTime}
+    <![CDATA[
+    from to_banner t where date_format(t.eff_time,'%Y-%m-%d') <= date_format('2018-11-23','%Y-%m-%d')
+    and date_format(t.exp_time,'%Y-%m-%d') >= date_format('2018-11-23','%Y-%m-%d')
+    ]]>
     order by t.sort, t.eff_time
     <if test="num != null">
       limit #{num}

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

@@ -265,7 +265,9 @@
   WHERE
       a.community_id = #{communityId,jdbcType=INTEGER}
       AND ( a.STATUS = 1 OR a.STATUS = 3 )
+    <if test="title != null and title != ''">
       AND a.activity_title LIKE concat('%',#{title,jdbcType=VARCHAR},'%')
+    </if>
   ORDER BY
       a.sort,
       a.activity_end_time DESC,

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

@@ -117,4 +117,24 @@
     from tp_activity_sign_up
     where activity_id = #{activityId} and community_id = #{communityId} and ta_user_id = #{userId}
   </select>
+
+
+  <select id="selectSignNum" resultType="java.lang.Integer">
+    select
+    count(*)
+    from tp_activity_sign_up
+    where activity_id = #{activityId} and community_id = #{communityId}
+  </select>
+
+  <delete id="deleteSignUp" parameterType="com.community.huiju.model.TpActivitySignup" >
+    delete from tp_activity_sign_up
+    where activity_id = #{activityId} and community_id = #{communityId} and ta_user_id = #{taUserId}
+  </delete>
+
+  <select id="selectTpActivetitySignByUserId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
+    from tp_activity_sign_up
+    where activity_id = #{activityId} and community_id = #{communityId} and ta_user_id = #{userId}
+  </select>
 </mapper>

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

@@ -171,7 +171,9 @@
   WHERE
       a.community_id = #{communityId,jdbcType=INTEGER}
       AND ( a.STATUS = 1 OR a.STATUS = 3 )
-      and a.announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')
+      <if test="title != null and title != ''">
+        and a.announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')
+      </if>
   ORDER BY
       a.sort,
       a.create_date DESC

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.community.huiju.dao.TpMessageMapper" >
   <resultMap id="BaseResultMap" type="com.community.huiju.model.TpMessage" >
     <id column="id" property="id" jdbcType="INTEGER" />
+    <id column="ticket_id" property="ticketId" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
     <result column="message_type" property="messageType" jdbcType="CHAR" />
     <result column="advice_type" property="adviceType" jdbcType="CHAR" />
@@ -19,9 +20,14 @@
     <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="ticket_status" property="ticketStatus" jdbcType="VARCHAR" />
+    <result column="content" property="content" jdbcType="VARCHAR" />
+    <result column="read_message_icon" property="readMessageIcon" jdbcType="VARCHAR" />
+    <result column="unread_message_icon" property="unreadMessageIcon" jdbcType="VARCHAR" />
+    <result column="message_detail_url" property="messageDetailUrl" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, message_type, advice_type, model_type, uuid, uuid_type, source, 
+    id, ticket_id,community_id, message_type, advice_type, model_type, uuid, uuid_type, source,
     message_content, status, result, meaasge_type_id, read_status, create_user, create_date, 
     update_user, update_date
   </sql>
@@ -36,25 +42,28 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpMessage" >
-    insert into tp_message (id, community_id, message_type, 
+    insert into tp_message (id, ticket_id, community_id, message_type,
       advice_type, model_type, uuid, 
       uuid_type, source, message_content, 
       status, result, meaasge_type_id, 
       read_status, create_user, create_date, 
       update_user, update_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{messageType,jdbcType=CHAR}, 
+    values (#{id,jdbcType=INTEGER}, #{ticketId,jdbcType=INTEGER},#{communityId,jdbcType=INTEGER}, #{messageType,jdbcType=CHAR},
       #{adviceType,jdbcType=CHAR}, #{modelType,jdbcType=CHAR}, #{uuid,jdbcType=INTEGER}, 
       #{uuidType,jdbcType=CHAR}, #{source,jdbcType=CHAR}, #{messageContent,jdbcType=VARCHAR}, 
       #{status,jdbcType=CHAR}, #{result,jdbcType=VARCHAR}, #{meaasgeTypeId,jdbcType=VARCHAR}, 
       #{readStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
       #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpMessage" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpMessage" useGeneratedKeys="true" keyProperty="id" >
     insert into tp_message
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
         id,
       </if>
+      <if test="ticketId != null">
+        ticket_id,
+      </if>
       <if test="communityId != null" >
         community_id,
       </if>
@@ -108,6 +117,9 @@
       <if test="id != null" >
         #{id,jdbcType=INTEGER},
       </if>
+      <if test="ticketId != null">
+        #{ticketId,jdbcType=INTEGER},
+      </if>
       <if test="communityId != null" >
         #{communityId,jdbcType=INTEGER},
       </if>
@@ -161,6 +173,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpMessage" >
     update tp_message
     <set >
+      <if test="ticketId != null">
+        ticket_id = #{ticketId,jdbcType=INTEGER},
+      </if>
       <if test="communityId != null" >
         community_id = #{communityId,jdbcType=INTEGER},
       </if>
@@ -214,7 +229,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpMessage" >
     update tp_message
-    set community_id = #{communityId,jdbcType=INTEGER},
+    set ticket_id = #{ticketId,jdbcType=INTEGER},
+      community_id = #{communityId,jdbcType=INTEGER},
       message_type = #{messageType,jdbcType=CHAR},
       advice_type = #{adviceType,jdbcType=CHAR},
       model_type = #{modelType,jdbcType=CHAR},
@@ -249,18 +265,45 @@
 
   <select id="getMessages" resultMap="BaseResultMap">
     SELECT
-      <include refid="Base_Column_List" />
+        t.id,
+        t.ticket_id,
+        t.community_id,
+        t.message_type,
+        t.advice_type,
+        t.model_type,
+        t.uuid,
+        t.uuid_type,
+        t.source,
+        t.message_content,
+        t.STATUS,
+        t.result,
+        t.meaasge_type_id,
+        t.read_status,
+        t.create_user,
+        t.create_date,
+        t.update_user,
+        t.update_date,
+        k.status,
+        r.content,
+        d.name as ticket_status,
+        i.read_message_icon,
+		i.unread_message_icon,
+		i.message_detail_url
     FROM
-        tp_message
+        tp_message t
+    LEFT JOIN tp_ticket k on t.ticket_id = k.id  AND k.community_id = #{communityId,jdbcType=INTEGER}
+    LEFT JOIN tp_ticket_record r on t.ticket_id = r.ticket_id AND r.community_id = #{communityId,jdbcType=INTEGER}  AND k.status = r.status
+    LEFT JOIN sys_dictionary d on k.status = d.code AND d.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "ticket_status" )
+    LEFT JOIN tp_message_icon i on t.message_type = i.message_type
     WHERE
-        uuid_type = 1
-        AND community_id = #{communityId,jdbcType=INTEGER}
-        AND uuid = #{userId,jdbcType=INTEGER}
-        AND STATUS = 1
-        AND advice_type = 1
-        AND model_type = #{modelType,jdbcType=INTEGER}
+        t.uuid_type = 1
+        AND t.community_id = #{communityId,jdbcType=INTEGER}
+        AND t.uuid = #{userId,jdbcType=INTEGER}
+        AND t.STATUS = 1
+        AND t.advice_type = 1
+        AND t.model_type = #{modelType,jdbcType=INTEGER}
     ORDER BY
-    create_date DESC
+    t.create_date DESC
   </select>
 
   <update id="updateReadStatus" parameterType="java.lang.Integer" >

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

@@ -247,15 +247,4 @@
         t.id = #{ticketId,jdbcType=INTEGER}
         AND t.community_id = #{communityId,jdbcType=INTEGER}
   </select>
-
-  <select id="getById" resultMap="BaseResultMap" >
-    SELECT
-    <include refid="Base_Column_List" />
-    FROM
-    tp_ticket
-    WHERE
-     ta_user_id = #{userId,jdbcType=INTEGER}
-    AND community_id = #{communityId,jdbcType=INTEGER} order by update_date desc  limit 1
-  </select>
-
 </mapper>

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

@@ -154,8 +154,8 @@
   <select id="selectByTicketId" parameterType="map" resultMap="BaseResultMap" >
     select ttrc.* from tp_ticket tp
                 inner join tp_ticket_record ttr on tp.id = ttr.ticket_id
-                inner join tp_ticket_record_comment ttrc on ttr.ticket_id = ttrc.ticket_record_id
-    where tp.id=#{ticketId,jdbcType=INTEGER} order by ttrc.create_date DESC LIMIT #{size,jdbcType=INTEGER}
+                inner join tp_ticket_record_comment ttrc on ttr.id = ttrc.ticket_record_id
+    where tp.id=#{tickerId,jdbcType=INTEGER} order by ttrc.create_date DESC LIMIT #{size,jdbcType=INTEGER}
   </select>
 
   <select id="selectByTicketRecordId" parameterType="com.community.huiju.model.TpTicketRecord" resultMap="BaseResultMap" >

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

@@ -5,12 +5,13 @@
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
     <result column="ticket_id" property="ticketId" jdbcType="INTEGER" />
+    <result column="content" property="content" jdbcType="VARCHAR" />
     <result column="status" property="status" jdbcType="CHAR" />
     <result column="create_user" property="createUser" jdbcType="INTEGER" />
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, ticket_id, status, create_user, create_date
+    id, community_id, ticket_id, content, status, create_user, create_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -23,11 +24,11 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpTicketRecord" >
-    insert into tp_ticket_record (id, community_id, ticket_id, 
+    insert into tp_ticket_record (id, community_id, ticket_id, content,
       status, create_user, create_date
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{ticketId,jdbcType=INTEGER}, 
-      #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}
+      #{content,jdbcType=VARCHAR}, #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpTicketRecord" >
@@ -42,6 +43,9 @@
       <if test="ticketId != null" >
         ticket_id,
       </if>
+      <if test="content != null">
+        content,
+      </if>
       <if test="status != null" >
         status,
       </if>
@@ -62,6 +66,9 @@
       <if test="ticketId != null" >
         #{ticketId,jdbcType=INTEGER},
       </if>
+      <if test="content != null">
+        #{content,jdbcType=VARCHAR},
+      </if>
       <if test="status != null" >
         #{status,jdbcType=CHAR},
       </if>
@@ -82,6 +89,9 @@
       <if test="ticketId != null" >
         ticket_id = #{ticketId,jdbcType=INTEGER},
       </if>
+      <if test="content != null">
+        content = #{content,jdbcType=VARCHAR},
+      </if>
       <if test="status != null" >
         status = #{status,jdbcType=CHAR},
       </if>
@@ -98,6 +108,7 @@
     update tp_ticket_record
     set community_id = #{communityId,jdbcType=INTEGER},
       ticket_id = #{ticketId,jdbcType=INTEGER},
+      content = #{content,jdbcType=VARCHAR},
       status = #{status,jdbcType=CHAR},
       create_user = #{createUser,jdbcType=INTEGER},
       create_date = #{createDate,jdbcType=TIMESTAMP}
@@ -108,6 +119,7 @@
   <select id="getTicketRecordByTicketId" resultType="com.community.huiju.model.TpTicketRecord">
     SELECT
         t.id,
+        t.status,
         t.ticket_id AS ticketId,
         t.community_id AS communityId,
         d.NAME AS ticketStatusName
@@ -118,6 +130,6 @@
     WHERE
         community_id = #{communityId,jdbcType=INTEGER}
         AND ticket_id = #{ticketId,jdbcType=INTEGER}
-
+    order by t.create_date DESC
   </select>
 </mapper>

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

@@ -14,16 +14,34 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="role_id" property="roleId" jdbcType="INTEGER" />
+    <result column="role_name" property="roleName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, ta_user_id, transaction_title, transaction_content,
     view_count, status, type, create_user, create_date, update_user, update_date
   </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tp_transaction
-    where id = #{id,jdbcType=INTEGER} and #{communityId,jdbcType=INTEGER}
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpTransaction"  >
+    SELECT
+	ttr.id,
+	ttr.community_id,
+	ttr.ta_user_id,
+	ttr.transaction_title,
+	ttr.transaction_content,
+	ttr.view_count,
+	ttr.STATUS,
+	ttr.type,
+	ttr.create_user,
+	ttr.create_date,
+	ttr.update_user,
+	ttr.update_date,
+	sr.id AS role_id,
+	sr.role_name AS role_name
+FROM
+	tp_transaction ttr
+LEFT JOIN ta_sys_user_role tsur ON ttr.ta_user_id = tsur.user_id
+LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
+    where ttr.id = #{id,jdbcType=INTEGER} and ttr.community_id=#{communityId,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from tp_transaction
@@ -179,14 +197,28 @@
     select
     <include refid="Base_Column_List" />
     from tp_transaction
-    where community_id = #{communityId,jdbcType=INTEGER} and type = #{type,jdbcType=VARCHAR}
+    where community_id = #{communityId,jdbcType=INTEGER}
+    <if test="type != null and type != ''">
+      and type = #{type,jdbcType=VARCHAR}
+    </if>
+    <if test="transactionTitle != null and transactionTitle !=''">
+      and transaction_title LIKE concat('%',#{transactionTitle,jdbcType=VARCHAR},'%')
+    </if>
+    and status = 1
+    order by create_date DESC
   </select>
 
   <select id="selectTransaction" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from tp_transaction
-    where community_id = #{communityId,jdbcType=INTEGER} and ta_user_id = #{userId,jdbcType=INTEGER}
+    where community_id = #{communityId,jdbcType=INTEGER}
+    and ta_user_id = #{userId,jdbcType=INTEGER}
+    <if test="type != null and type != ''">
+      and type = #{type,jdbcType=INTEGER}
+    </if>
+    and status = 1
+    order by create_date DESC
   </select>
 
   <update id="updateTransaction" parameterType="com.community.huiju.model.TpTransaction" >
@@ -204,6 +236,6 @@
     select
     <include refid="Base_Column_List" />
     from tp_transaction
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER} and status = 1
   </select>
 </mapper>

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

@@ -0,0 +1,188 @@
+<?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.TpUserMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpUser" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
+    <result column="login_name" property="loginName" jdbcType="VARCHAR" />
+    <result column="login_password" property="loginPassword" jdbcType="VARCHAR" />
+    <result column="status" property="status" jdbcType="CHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="email" property="email" jdbcType="VARCHAR" />
+    <result column="head_portrait" property="headPortrait" jdbcType="VARCHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, user_name, login_name, login_password, status, remark, email, head_portrait, 
+    create_user, create_date, update_user, update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_user
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_user
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpUser" >
+    insert into tp_user (id, community_id, user_name, 
+      login_name, login_password, status, 
+      remark, email, head_portrait, 
+      create_user, create_date, update_user, 
+      update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, 
+      #{loginName,jdbcType=VARCHAR}, #{loginPassword,jdbcType=VARCHAR}, #{status,jdbcType=CHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{headPortrait,jdbcType=VARCHAR}, 
+      #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, 
+      #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpUser" >
+    insert into tp_user
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="userName != null" >
+        user_name,
+      </if>
+      <if test="loginName != null" >
+        login_name,
+      </if>
+      <if test="loginPassword != null" >
+        login_password,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="email != null" >
+        email,
+      </if>
+      <if test="headPortrait != null" >
+        head_portrait,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="userName != null" >
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginName != null" >
+        #{loginName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginPassword != null" >
+        #{loginPassword,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=CHAR},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null" >
+        #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="headPortrait != null" >
+        #{headPortrait,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpUser" >
+    update tp_user
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="userName != null" >
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginName != null" >
+        login_name = #{loginName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginPassword != null" >
+        login_password = #{loginPassword,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=CHAR},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null" >
+        email = #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="headPortrait != null" >
+        head_portrait = #{headPortrait,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpUser" >
+    update tp_user
+    set community_id = #{communityId,jdbcType=INTEGER},
+      user_name = #{userName,jdbcType=VARCHAR},
+      login_name = #{loginName,jdbcType=VARCHAR},
+      login_password = #{loginPassword,jdbcType=VARCHAR},
+      status = #{status,jdbcType=CHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      email = #{email,jdbcType=VARCHAR},
+      head_portrait = #{headPortrait,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

CODE/smart-community/community-common/pom.xml

@@ -104,13 +104,25 @@
             <artifactId>aliyun-sdk-oss</artifactId>
             <version>2.8.3</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.8.1</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/commons-lang/commons-lang -->
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>

CODE/smart-community/community-common/src/main/java/com/community/commom/ailiyun/AESDecode.java

@@ -0,0 +1,213 @@
+package com.community.commom.ailiyun;
+import com.community.commom.mode.ResponseBean;
+import sun.misc.BASE64Encoder;
+import java.net.HttpURLConnection;
+import java.security.MessageDigest;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import javax.crypto.spec.SecretKeySpec;
+
+import javax.crypto.Mac;
+
+@SuppressWarnings("restriction")
+public class AESDecode {
+    /*
+     * 计算MD5+BASE64
+     */
+    public static String MD5Base64(String s) {
+        if (s == null)
+            return null;
+        String encodeStr = "";
+        byte[] utfBytes = s.getBytes();
+        MessageDigest mdTemp;
+        try {
+            mdTemp = MessageDigest.getInstance("MD5");
+            mdTemp.update(utfBytes);
+            byte[] md5Bytes = mdTemp.digest();
+            BASE64Encoder b64Encoder = new BASE64Encoder();
+            encodeStr = b64Encoder.encode(md5Bytes);
+        } catch (Exception e) {
+            throw new Error("Failed to generate MD5 : " + e.getMessage());
+        }
+        return encodeStr;
+    }
+
+    /*
+     * 计算 HMAC-SHA1
+     */
+    public static String HMACSha1(String data, String key) {
+        String result;
+        try {
+            SecretKeySpec signingKey = new SecretKeySpec(key.getBytes(), "HmacSHA1");
+            Mac mac = Mac.getInstance("HmacSHA1");
+            mac.init(signingKey);
+            byte[] rawHmac = mac.doFinal(data.getBytes());
+            result = (new BASE64Encoder()).encode(rawHmac);
+        } catch (Exception e) {
+            throw new Error("Failed to generate HMAC : " + e.getMessage());
+        }
+        return result;
+    }
+
+    /*
+     * 等同于javaScript中的 new Date().toUTCString();
+     */
+    public static String toGMTString(Date date) {
+        SimpleDateFormat df = new SimpleDateFormat("E, dd MMM yyyy HH:mm:ss z", Locale.UK);
+        df.setTimeZone(new java.util.SimpleTimeZone(0, "GMT"));
+        return df.format(date);
+    }
+
+    /*
+     * 发送POST请求
+     */
+    public static String sendPost(String url, String body, String ak_id, String ak_secret) throws Exception {
+        PrintWriter out = null;
+        BufferedReader in = null;
+        String result = "";
+        int statusCode = 200;
+        try {
+            URL realUrl = new URL(url);
+            /*
+             * http header 参数
+             */
+            String method = "POST";
+            String accept = "application/json";
+            String content_type = "application/json";
+            String path = realUrl.getFile();
+            String date = toGMTString(new Date());
+            // 1.对body做MD5+BASE64加密
+            String bodyMd5 = MD5Base64(body);
+            String stringToSign = method + "\n" + accept + "\n" + bodyMd5 + "\n" + content_type + "\n" + date + "\n"
+                    + path;
+            // 2.计算 HMAC-SHA1
+            String signature = HMACSha1(stringToSign, ak_secret);
+            // 3.得到 authorization header
+            String authHeader = "Dataplus " + ak_id + ":" + signature;
+            // 打开和URL之间的连接
+            URLConnection conn = realUrl.openConnection();
+            // 设置通用的请求属性
+            conn.setRequestProperty("accept", accept);
+            conn.setRequestProperty("content-type", content_type);
+            conn.setRequestProperty("date", date);
+            conn.setRequestProperty("Authorization", authHeader);
+            // 发送POST请求必须设置如下两行
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            // 获取URLConnection对象对应的输出流
+            out = new PrintWriter(conn.getOutputStream());
+            // 发送请求参数
+            out.print(body);
+            // flush输出流的缓冲
+            out.flush();
+            // 定义BufferedReader输入流来读取URL的响应
+            statusCode = ((HttpURLConnection) conn).getResponseCode();
+            if (statusCode != 200) {
+                in = new BufferedReader(new InputStreamReader(((HttpURLConnection) conn).getErrorStream()));
+            } else {
+                in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            }
+            String line;
+            while ((line = in.readLine()) != null) {
+                result += line;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+                if (in != null) {
+                    in.close();
+                }
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        }
+        if (statusCode != 200) {
+            throw new IOException("\nHttp StatusCode: " + statusCode + "\nErrorMessage: " + result);
+        }
+        return result;
+    }
+
+    /*
+     * GET请求
+     */
+    public static String sendGet(String url, String ak_id, String ak_secret) throws Exception {
+        String result = "";
+        BufferedReader in = null;
+        int statusCode = 200;
+        try {
+            URL realUrl = new URL(url);
+            /*
+             * http header 参数
+             */
+            String method = "GET";
+            String accept = "application/json";
+            String content_type = "application/json";
+            String path = realUrl.getFile();
+            String date = toGMTString(new Date());
+            // 1.对body做MD5+BASE64加密
+            // String bodyMd5 = MD5Base64(body);
+            String stringToSign = method + "\n" + accept + "\n" + "" + "\n" + content_type + "\n" + date + "\n" + path;
+            // 2.计算 HMAC-SHA1
+            String signature = HMACSha1(stringToSign, ak_secret);
+            // 3.得到 authorization header
+            String authHeader = "Dataplus " + ak_id + ":" + signature;
+            // 打开和URL之间的连接
+            URLConnection connection = realUrl.openConnection();
+            // 设置通用的请求属性
+            connection.setRequestProperty("accept", accept);
+            connection.setRequestProperty("content-type", content_type);
+            connection.setRequestProperty("date", date);
+            connection.setRequestProperty("Authorization", authHeader);
+            connection.setRequestProperty("Connection", "keep-alive");
+            // 建立实际的连接
+            connection.connect();
+            // 定义 BufferedReader输入流来读取URL的响应
+            statusCode = ((HttpURLConnection) connection).getResponseCode();
+            if (statusCode != 200) {
+                in = new BufferedReader(new InputStreamReader(((HttpURLConnection) connection).getErrorStream()));
+            } else {
+                in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            }
+            String line;
+            while ((line = in.readLine()) != null) {
+                result += line;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (in != null) {
+                    in.close();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        if (statusCode != 200) {
+            throw new IOException("\nHttp StatusCode: " + statusCode + "\nErrorMessage: " + result);
+        }
+        return result;
+    }
+
+    //直接请求
+    public ResponseBean send(String body) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+        String AccessKeyId = "LTAIkc75dpkJw8Lb"; //用户ak
+        String AccessKeySecret = "v4bvXCaix6vSDTCFfwSAdqV53iFEQw";
+        String url = "https://dtplus-cn-shanghai.data.aliyuncs.com/face/detect";
+        String sd = sendPost(url, body, AccessKeyId, AccessKeySecret);
+        responseBean.addSuccess(sd);
+        return responseBean;
+    }
+}

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

@@ -51,12 +51,15 @@ public class Constant {
     /** 住户APP端待办 **/
     public static final Integer MODEL_TYPE_UPCOMING = 2;
 
-    /** 社交公告类型**/
+    /** 社交/图片 公告类型**/
     public static final String ANNOUNCEMENT = "announcement";
 
-    /** 社交活动类型**/
+    /** 社交/图片 活动类型**/
     public static final String ACTIVITY = "activity";
 
+    /** 社交/图片 租贷类型**/
+    public static final String TRANSACTION = "transaction";
+
     /** 社交二手租赁类型**/
     public static final String LEASE = "lease";
 
@@ -87,4 +90,31 @@ public class Constant {
     /** banner的类型 文章 **/
     public static final String BANNER_TYPE_ARTICLE = "2";
 
+    /**图片社交类型**/
+    public static final String SOCIAL = "social";
+
+    /**图片服务类型**/
+    public static final String SERVICE = "service";
+
+    /**判断业主，家属的身份是否已停用的提示**/
+    public static final String STATE_DISCONTINUED = "您的身份已停用，请联系物业";
+
+    /**判断业主，家属的身份是否已停用的状态**/
+    public static final String STATE_HINT = "9996";
+
+    /**认证通过后的**/
+
+
+    /** 添加用户所对应的部门 住户 **/
+    public static final String DEPT_RESIDENTS = "测试";
+    
+    /**
+     * 报名状态 已报名
+     */
+    public static final String STATUS_SIGNED = "signed";
+    
+    /**
+     * 报名状态 未报名
+     */
+    public static final String STATUS_UNSIGN = "unsigned";
 }

CODE/smart-community/community-common/src/main/java/com/community/commom/hk/Digests.java

@@ -0,0 +1,133 @@
+package com.community.commom.hk;
+
+import org.apache.commons.lang3.Validate;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.security.GeneralSecurityException;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+
+public class Digests {
+	private static final String SHA1 = "SHA-1";
+	private static final String MD5 = "MD5";
+	private static SecureRandom random = new SecureRandom();
+	
+	public Digests() {
+	}
+	
+	public static byte[] md5(byte[] input) {
+		return digest(input, "MD5", (byte[])null, 1);
+	}
+	
+	public static byte[] md5(byte[] input, int iterations) {
+		return digest(input, "MD5", (byte[])null, iterations);
+	}
+	
+	public static byte[] sha1(byte[] input) {
+		return digest(input, "SHA-1", (byte[])null, 1);
+	}
+	
+	public static byte[] sha1(byte[] input, byte[] salt) {
+		return digest(input, "SHA-1", salt, 1);
+	}
+	
+	public static byte[] sha1(byte[] input, byte[] salt, int iterations) {
+		return digest(input, "SHA-1", salt, iterations);
+	}
+	
+	private static byte[] digest(byte[] input, String algorithm, byte[] salt, int iterations) {
+		try {
+			MessageDigest digest = MessageDigest.getInstance(algorithm);
+			if (salt != null) {
+				digest.update(salt);
+			}
+			
+			byte[] result = digest.digest(input);
+			
+			for(int i = 1; i < iterations; ++i) {
+				digest.reset();
+				result = digest.digest(result);
+			}
+			
+			return result;
+		} catch (GeneralSecurityException var7) {
+			throw new RuntimeException(var7);
+		}
+	}
+	
+	public static byte[] generateSalt(int numBytes) {
+		Validate.isTrue(numBytes > 0, "numBytes argument must be a positive integer (1 or larger)", (long)numBytes);
+		byte[] bytes = new byte[numBytes];
+		random.nextBytes(bytes);
+		return bytes;
+	}
+	
+	public static byte[] md5(InputStream input) throws IOException {
+		return digest(input, "MD5");
+	}
+	
+	public static byte[] sha1(InputStream input) throws IOException {
+		return digest(input, "SHA-1");
+	}
+	
+	private static byte[] digest(InputStream input, String algorithm) throws IOException {
+		try {
+			MessageDigest messageDigest = MessageDigest.getInstance(algorithm);
+			int bufferLength = 8192;
+			byte[] buffer = new byte[bufferLength];
+			
+			for(int read = input.read(buffer, 0, bufferLength); read > -1; read = input.read(buffer, 0, bufferLength)) {
+				messageDigest.update(buffer, 0, read);
+			}
+			
+			return messageDigest.digest();
+		} catch (GeneralSecurityException var6) {
+			throw new RuntimeException(var6);
+		}
+	}
+	
+	public static final String md5(String s) {
+		char[] hexDigits = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+		
+		try {
+			MessageDigest mdTemp = MessageDigest.getInstance("MD5");
+			
+			try {
+				mdTemp.update(s.getBytes("UTF-8"));
+			} catch (UnsupportedEncodingException var9) {
+				mdTemp.update(s.getBytes());
+			}
+			
+			byte[] md = mdTemp.digest();
+			int j = md.length;
+			char[] str = new char[j * 2];
+			int k = 0;
+			
+			for(int i = 0; i < j; ++i) {
+				byte byte0 = md[i];
+				str[k++] = hexDigits[byte0 >>> 4 & 15];
+				str[k++] = hexDigits[byte0 & 15];
+			}
+			
+			return (new String(str)).toUpperCase();
+		} catch (Exception var10) {
+			return null;
+		}
+	}
+	
+	public static final String buildToken(String url, String paramJson, String secret) {
+		String tempUrl = null;
+		if (url.contains("https://")) {
+			tempUrl = url.substring("https://".length());
+		} else {
+			tempUrl = url.substring("http://".length());
+		}
+		
+		int index = tempUrl.indexOf("/");
+		String URI = tempUrl.substring(index);
+		String[] ss = URI.split("\\?");
+		return ss.length > 1 ? md5(ss[0] + ss[1] + secret) : md5(ss[0] + paramJson + secret);
+	}
+}

CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HttpClientSSLUtils.java

@@ -0,0 +1,127 @@
+package com.community.commom.hk;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.config.RequestConfig.Builder;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.ssl.SSLContextBuilder;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+public class HttpClientSSLUtils {
+	private static HttpClient httpClient = null;
+	protected static final Integer DEFAULT_CONNECTION_TIME_OUT = 100000;
+	protected static final Integer DEFAULT_SOCKET_TIME_OUT = 200000;
+	protected static final String DEFAULT_CHAR_SET = "UTF-8";
+	
+	public HttpClientSSLUtils() {
+	}
+	
+	public static String doPost(String url, String jsonText) throws Exception {
+		HttpClient client = null;
+		HttpPost post = new HttpPost(url);
+		
+		String var6;
+		try {
+			if (jsonText != null && !jsonText.isEmpty()) {
+				StringEntity entity = new StringEntity(jsonText, ContentType.APPLICATION_JSON);
+				post.setEntity(entity);
+			}
+			
+			Builder customReqConf = RequestConfig.custom();
+			customReqConf.setConnectTimeout(DEFAULT_CONNECTION_TIME_OUT);
+			customReqConf.setSocketTimeout(DEFAULT_CONNECTION_TIME_OUT);
+			post.setConfig(customReqConf.build());
+			HttpResponse res = null;
+			if (url.startsWith("https")) {
+				client = createSSLInsecureClient();
+				res = ((HttpClient)client).execute(post);
+			} else {
+				client = httpClient;
+				res = ((HttpClient)client).execute(post);
+			}
+			
+			var6 = IOUtils.toString(res.getEntity().getContent(), "UTF-8");
+		} finally {
+			post.releaseConnection();
+			if (url.startsWith("https") && client != null && client instanceof CloseableHttpClient) {
+				((CloseableHttpClient)client).close();
+			}
+			
+		}
+		
+		return var6;
+	}
+	
+	public static String doGet(String url) throws Exception {
+		HttpClient client = null;
+		HttpGet get = new HttpGet(url);
+		String result = "";
+		
+		try {
+			Builder customReqConf = RequestConfig.custom();
+			customReqConf.setConnectTimeout(DEFAULT_CONNECTION_TIME_OUT);
+			customReqConf.setSocketTimeout(DEFAULT_CONNECTION_TIME_OUT);
+			get.setConfig(customReqConf.build());
+			HttpResponse res = null;
+			if (url.startsWith("https")) {
+				client = createSSLInsecureClient();
+				res = ((HttpClient)client).execute(get);
+			} else {
+				client = client;
+				res = ((HttpClient)client).execute(get);
+			}
+			
+			result = IOUtils.toString(res.getEntity().getContent(), "UTF-8");
+		} finally {
+			get.releaseConnection();
+			if (url.startsWith("https") && client != null && client instanceof CloseableHttpClient) {
+				((CloseableHttpClient)client).close();
+			}
+			
+		}
+		
+		return result;
+	}
+	
+	private static CloseableHttpClient createSSLInsecureClient() throws GeneralSecurityException {
+		try {
+			SSLContext sslContext = (new SSLContextBuilder()).loadTrustMaterial((KeyStore)null, new TrustStrategy() {
+				public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+					return true;
+				}
+			}).build();
+			SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, new HostnameVerifier() {
+				public boolean verify(String hostname, SSLSession session) {
+					return true;
+				}
+			});
+			return HttpClients.custom().setSSLSocketFactory(sslsf).build();
+		} catch (GeneralSecurityException var2) {
+			throw var2;
+		}
+	}
+	
+	static {
+		PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
+		cm.setMaxTotal(128);
+		cm.setDefaultMaxPerRoute(128);
+		httpClient = HttpClients.custom().setConnectionManager(cm).build();
+	}
+}

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

@@ -45,7 +45,7 @@ public class MD5Utils {
         }
     }
 
-    public static void main(String[] arge) throws Exception {
+/*    public static void main(String[] arge) throws Exception {
        System.out.println(MD5Utils.encode("123456"));
-    }
+    }*/
 }

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

@@ -16,7 +16,7 @@ import java.util.Date;
  * @date 2018/10/31
  */
 public class OssUtil {
-    public static void main(String[] args) {
+   /* public static void main(String[] args) {
         // Endpoint以杭州为例，其它Region请按实际情况填写。
         String endpoint = "http://oss-cn-hangzhou.aliyuncs.com";
 // 阿里云主账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM账号进行API访问或日常运维，请登录 https://ram.console.aliyun.com 创建RAM账号。
@@ -37,7 +37,7 @@ public class OssUtil {
 // 关闭OSSClient。
         ossClient.shutdown();
     }
-
+*/
 
     public static String picOSS(MultipartFile uploadFile) throws Exception {
         String endpoint = "http://oss-cn-hangzhou.aliyuncs.com";