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

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

@@ -267,7 +267,7 @@
     from ta_user_verify tuv
     where tuv.user_id = #{userId,jdbcType=INTEGER}
   </select>
-  <select id="selectCommunityAndAddress" resultMap="BaseResultMap">
+  <select id="selectCommunityAndAddress" resultType="com.community.huiju.model.TaUserVerify">
     select
     <include refid="Base_Column_List"/>
     from ta_user_verify
@@ -281,6 +281,5 @@
     <if test="verifyStatus != null and verifyStatus != ''">
       and verify_status = #{verifyStatus}
     </if>
-
   </select>
 </mapper>

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

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

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

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

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

@@ -47,6 +47,10 @@ public class BuildingTreeController extends BaseController {
 	
 	@ApiOperation(value = "获取树形数据", notes = "获取树形数据")
 	@GetMapping(value = "/trees")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "id", value = "当前节点id(查期时ID为空)")
+	})
 	public ResponseBean getTreeList(@RequestParam(value = "id", required = false) Integer id,@RequestParam("treeType") String treeType,HttpSession session){
 		ResponseBean responseBean = new ResponseBean();UserElement userElement = getUserElement(session);
 

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

@@ -0,0 +1,122 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
+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 extends BaseController {
+    @Autowired
+    private FaceServiceI faceServicel;
+
+    @ApiOperation(value = "添加人脸图片", notes = "添加人脸图片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "phaseName",value = "期名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "buildingName",value = "楼栋名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "unitName",value = "单元名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "levelName",value = "楼层名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "roomNoName",value = "户号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "otherUserId")
+    })
+    
+    @RequestMapping(value = "/addFace",method = RequestMethod.POST)
+    public Object getTaFace(HttpSession session,
+                            @ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
+                            @RequestParam(required = false) Integer otherUserId,
+                            @RequestParam(required = false) String phaseName,
+                            @RequestParam(required = false) String buildingName,
+                            @RequestParam(required = false) String unitName,
+                            @RequestParam(required = false) String levelName,
+                            @RequestParam(required = false) String roomNoName){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = faceServicel.addFace(userElement ,uploadFile,otherUserId,phaseName,buildingName,unitName,levelName,roomNoName);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "修改人脸图片", notes = "修改人脸图片")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "phaseName",value = "期名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "buildingName",value = "楼栋名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "unitName",value = "单元名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "levelName",value = "楼层名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "roomNoName",value = "户号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "otherUserId")
+    })
+    @RequestMapping(value = "/upDateFace",method = RequestMethod.POST)
+    public Object upDateTaFace(HttpSession session,
+                               @ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
+                               @RequestParam(required = false) Integer otherUserId,
+                               @RequestParam(required = false) String phaseName,
+                               @RequestParam(required = false) String buildingName,
+                               @RequestParam(required = false) String unitName,
+                               @RequestParam(required = false) String levelName,
+                               @RequestParam(required = false) String roomNoName){
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+         responseBean = faceServicel.upDateFace(userElement,uploadFile,otherUserId,phaseName,buildingName,unitName,levelName,roomNoName);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "获取当前已录入人脸信息", notes = "获取当前已录入人脸信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "phaseName",value = "期名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "buildingName",value = "楼栋名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "unitName",value = "单元名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "levelName",value = "楼层名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "roomNoName",value = "户号"),
+            @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,
+                                    @RequestParam(required = false) String phaseName,
+                                    @RequestParam(required = false) String buildingName,
+                                    @RequestParam(required = false) String unitName,
+                                    @RequestParam(required = false) String levelName,
+                                    @RequestParam(required = false) String roomNoName){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = faceServicel.getTaFaceByUserId(userElement,otherUserId,phaseName,buildingName,unitName,levelName,roomNoName);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "删除当前人脸信息", notes = "删除当前人脸信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "phaseName",value = "期名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "buildingName",value = "楼栋名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "unitName",value = "单元名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "levelName",value = "楼层名称"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "roomNoName",value = "户号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人")
+    })
+    @RequestMapping(value = "/getUserIdFace",method = RequestMethod.GET)
+    public Object deleteFace(HttpSession session, @RequestParam(required = false) Integer otherUserId,
+                                    @RequestParam(required = false) String phaseName,
+                                    @RequestParam(required = false) String buildingName,
+                                    @RequestParam(required = false) String unitName,
+                                    @RequestParam(required = false) String levelName,
+                                    @RequestParam(required = false) String roomNoName){
+        ResponseBean responseBean = faceServicel.deleteFace(otherUserId,phaseName,buildingName,unitName,levelName,roomNoName);
+        return responseBean;
+    }
+
+}
+
+}

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

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.TaFace;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,12 @@ import com.community.huiju.model.TaFace;
  * @author jobob
  * @since 2019-04-11
  */
+@Mapper
 public interface TaFaceMapper extends BaseMapper<TaFace> {
 
+    TaFace getByUserVerifyId(Integer userVerifyId);
+
+    void insertSelective(TaFace taFace);
+
+    void updateByPrimaryKeySelective(TaFace taFace);
 }

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

@@ -79,4 +79,13 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
             "and role_id = 1")
     TaUserVerify selectCommunityAndAddressName(@Param("communityId") Integer communityId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
 
+
+    List<TaUserVerify> selectUserVerifyCommunityAndAddress(@Param("userId") Integer userId,
+                                                 @Param("communityId") Integer communityId,
+                                                 @Param("phaseId") Integer phaseId,
+                                                 @Param("buildingId") Integer buildingId,
+                                                 @Param("unitId") Integer unitId,
+                                                 @Param("levelId") Integer levelId,
+                                                 @Param("roomNoId") Integer roomNoId,
+                                                 @Param("verifyStatus") Integer verifyStatus);
 }

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

@@ -23,6 +23,10 @@ import java.time.LocalDateTime;
 public class TaFace implements Serializable {
 
     private static final long serialVersionUID = 1L;
+    /**
+     * id
+     */
+    private  Integer id;
 
     /**
      * 小区id

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

@@ -0,0 +1,47 @@
+package com.community.huiju.service;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaUser;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface FaceServiceI {
+    /**
+     * 添加人脸
+     * @param userElement 登入人ID
+     *  @param  uploadFile
+     *  @param otherUserId 关联家属或者租客ID
+     * @return
+     */
+    ResponseBean addFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId,String phaseName,String buildingName,String unitName,String levelName,String roomNoName);
+
+    /**
+     * 更新当前人脸
+     * @param userElement 登入人ID
+     *  @param  uploadFile
+     *  @param otherUserId 关联家属或者租客ID
+     * @return
+     */
+    ResponseBean upDateFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId,String phaseName,String buildingName,String unitName,String levelName,String roomNoName);
+
+    /**
+     * 当前登入人是否有人脸信息
+     * @param userElement
+     * @param otherUserId
+     * @return
+     */
+    ResponseBean getTaFaceByUserId(UserElement userElement, Integer otherUserId,String phaseName,String buildingName,String unitName,String levelName,String roomNoName);
+
+    /**
+     * 删除当前人脸信息
+     * @param otherUserId
+     * @param phaseName
+     * @param buildingName
+     * @param unitName
+     * @param levelName
+     * @param roomNoName
+     * @return
+     */
+    ResponseBean deleteFace(Integer otherUserId, String phaseName, String buildingName, String unitName, String levelName, String roomNoName);
+}

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

@@ -0,0 +1,248 @@
+package com.community.huiju.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.community.commom.ailiyun.AESDecode;
+import com.community.commom.constant.Constant;
+import com.community.commom.hk.HKOpenApi;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.welcome.WelcomeProperties;
+import com.community.huiju.dao.TaFaceMapper;
+import com.community.huiju.dao.TaSysRoleMapper;
+import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.dao.TaUserVerifyMapper;
+import com.community.huiju.exception.WisdomException;
+import com.community.huiju.model.TaFace;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TaUserVerify;
+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.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@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;
+
+    @Autowired
+    private WelcomeProperties welcomeProperties;
+
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean addFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId,String phaseName,String buildingName,String unitName,String levelName,String roomNoName) {
+        ResponseBean responseBean = new ResponseBean();
+        // 当前人脸图片url
+        String faceImg = img(uploadFile);
+        //查看当前期/栋/单元/楼层/户是否存在
+        TaUserVerify taUserVerify= infoExist(phaseName,buildingName,unitName,levelName, roomNoName,otherUserId);
+        if (null==taUserVerify){
+            responseBean.addError("请查看期/栋/单元/楼层/户号是否正确");
+            return responseBean;
+        }
+        // 是否审核通过
+        if (null!=taUserVerify && !taUserVerify.getVerifyStatus().equals("1")){
+            responseBean.addSuccess("当前房产未通过审核");
+            return responseBean;
+        }
+        TaFace taFace = new TaFace();
+        taFace.setFaceImg(faceImg);
+        taFace.setCommunityId(taUserVerify.getCommunityId());
+        taFace.setTaUserVerifyId(taUserVerify.getId());
+        taFace.setCreateUser(userElement.getId());
+        taFace.setCreateDate(LocalDateTime.now());
+        /*推送海康 */
+        boolean isA =true;
+         responseBean = checKout(faceImg, taFace, isA, uploadFile, otherUserId);
+        return responseBean;
+    }
+
+    /**
+     * 修改人脸信息
+     *
+     * @param userElement 登入人ID
+     * @param uploadFile
+     * @param otherUserId 关联家属或者租客ID
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean upDateFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId,String phaseName,String buildingName,String unitName,String levelName,String roomNoName) {
+        ResponseBean responseBean = new ResponseBean();
+        // 人脸图片地址url
+        String faceImg = img(uploadFile);
+
+        //查看当前期/栋/单元/楼层/户是否存在
+        TaUserVerify taUserVerify= infoExist(phaseName,buildingName,unitName,levelName, roomNoName,otherUserId);
+        if (null==taUserVerify){
+            responseBean.addError("请查看期/栋/单元/楼层/户号是否正确");
+            return responseBean;
+        }
+
+        TaFace face = taFaceMapper.getByUserVerifyId(taUserVerify.getId());
+        if (null==face){
+            responseBean.addError("当前信息暂无人脸，请录入");
+            return responseBean;
+        }
+        face.setTaUserVerifyId(taUserVerify.getId());
+        face.setFaceImg(faceImg);
+        face.setUpdateUser(userElement.getId());
+        face.setUpdateDate(LocalDateTime.now());
+        boolean isA=false;
+        ResponseBean resps = checKout(faceImg, face, isA, uploadFile, otherUserId);
+        return resps;
+    }
+
+    /**
+     * 验证图片是否为人脸，推送海康
+     */
+    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
+        TaUser user = taUserMapper.selectById(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.getHkPersonNo(), 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()));
+//                //可视对讲时 指定人员人脸权限下载
+//                List<Integer> userIdList = new ArrayList<>();
+//                userIdList.add(user.getHkUserId());
+//                //临时设备编号
+//                // TODO 根据期楼栋号，来查询出门口机
+//                List<String> visualList = new ArrayList<>();
+//                visualList.add("10010100000");
+//                HKOpenApi.visualIntercom(null, 1, userIdList, visualList);
+            } else {
+                responseBean.addError("请录入正确图片");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("海康人脸推送失敗！ {}", e);
+            throw new RuntimeException("海康人脸推送失敗！");
+        }
+        return responseBean;
+    }
+
+    /**
+     * 当前登入人是否有人脸信息
+     */
+    @Override
+    public ResponseBean getTaFaceByUserId(UserElement userElement, Integer otherUserId,String phaseName,String buildingName,String unitName,String levelName,String roomNoName) {
+        ResponseBean responseBean = new ResponseBean();
+        //查看当前期/栋/单元/楼层/户是否存在
+        TaUserVerify taUserVerify= infoExist(phaseName,buildingName,unitName,levelName, roomNoName,otherUserId);
+        if (null==taUserVerify){
+            responseBean.addError("请查看期/栋/单元/楼层/户号是否正确");
+            return responseBean;
+        }
+
+        TaFace face = taFaceMapper.getByUserVerifyId(taUserVerify.getId());
+        if (null==face){
+            responseBean.addError("当前用户暂无人脸图片");
+            return responseBean;
+        }
+        responseBean.addSuccess(face);
+        return responseBean;
+
+    }
+
+    @Override
+    public ResponseBean deleteFace(Integer otherUserId, String phaseName, String buildingName, String unitName, String levelName, String roomNoName) {
+        TaUserVerify taUserVerify= infoExist(phaseName,buildingName,unitName,levelName, roomNoName,otherUserId);
+        taUserVerify.setVerifyStatus()
+        return null;
+    }
+
+    /**
+     * 得到当前图片
+     */
+    private String img(MultipartFile uploadFile) {
+        String faceImg = null;
+        try {
+            faceImg = imageServiceI.getImageUrl(uploadFile);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return faceImg;
+    }
+
+    /*查询当前期/栋/单元/房间号结果是否存在*/
+    public TaUserVerify infoExist(String phaseName,String buildingName,String unitName,String levelName,String roomNoName,Integer otherUserId){
+        if (null==phaseName){
+            return null;
+        }else if (null==buildingName){
+            return null;
+        }else if (null==unitName){
+            return null;
+        }else if (null==levelName){
+            return null;
+        }else if (null==roomNoName){
+            return null;
+        }
+        /*查询当前的房产ID*/
+        QueryWrapper<TaUserVerify>  queryTaUserVerify= new QueryWrapper<>();
+        queryTaUserVerify.eq("phase_name",phaseName);
+        queryTaUserVerify.eq("building_name",buildingName);
+        queryTaUserVerify.eq("unit_name",unitName);
+        queryTaUserVerify.eq("level_name",levelName);
+        queryTaUserVerify.eq("room_no_name",roomNoName);
+        queryTaUserVerify.eq("user_id",otherUserId);
+        TaUserVerify taUserVerify= taUserVerifyMapper.selectOne(queryTaUserVerify);
+        return taUserVerify;
+    }
+}
+
+

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

@@ -0,0 +1,121 @@
+<?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" >
+
+    <select id="selectByPrimaryKey" resultType="com.community.huiju.model.TaFace">
+        select
+        id, community_id,ta_user_verify_id,face_img,create_user, create_date, update_user,
+        update_date
+        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_verify_id,face_img, create_user, create_date,
+        update_user, update_date)
+        values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER},#{taUserVerifyId,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="taUserVerifyId != null" >
+                ta_user_verify_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="taUserVerifyId != null" >
+                #{taUserVerifyId,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="taUserVerifyId != null" >
+                ta_user_verify_id = #{taUserVerifyId,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 id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <select id="getByUserVerifyId" resultType="com.community.huiju.model.TaFace" parameterType="java.lang.Integer">
+        select
+        id, community_id,ta_user_verify_id,face_img,create_user, create_date, update_user,
+        update_date
+        from ta_face
+        where ta_user_verify_id = #{userVerifyId,jdbcType=INTEGER}
+    </select>
+
+    <select id="getById" resultType="com.community.huiju.model.TaFace"  parameterType="java.lang.Integer" >
+        select
+        id, community_id,ta_user_verify_id,face_img,create_user, create_date, update_user,
+        update_date
+        from ta_face
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TaUserVerifyMapper.xml

@@ -59,4 +59,20 @@
         and user_id = #{userId}
         and role_id = #{roleId}
     </select>
+
+    <select id="selectUserVerifyCommunityAndAddress" resultType="com.community.huiju.model.TaUserVerify">
+        select
+          *
+        from ta_user_verify
+        where community_id = #{communityId,jdbcType=INTEGER}
+        and user_id = #{userId,jdbcType=INTEGER}
+        and phase_id = #{phaseId,jdbcType=INTEGER}
+        and building_id = #{buildingId,jdbcType=INTEGER}
+        and unit_id = #{unitId,jdbcType=INTEGER}
+        and level_id = #{levelId,jdbcType=INTEGER}
+        and room_no_id = #{roomNoId,jdbcType=INTEGER}
+        <if test="verifyStatus != null and verifyStatus != ''">
+            and verify_status = #{verifyStatus}
+        </if>
+    </select>
 </mapper>