完成 迎宾系统 推送

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

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

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

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

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

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

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

@@ -19,6 +19,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpSession;
 import javax.xml.crypto.dsig.keyinfo.PGPData;
@@ -250,4 +251,20 @@ public class UserController extends BaseController {
         userVO.setToken(session.getId());
         return responseBean;
     }
+
+    @ApiOperation(value = "迎宾系统添加人员", notes = "迎宾系统添加人员")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "form", dataTypeClass = String.class, value = "userName人员名称"),
+            @ApiImplicitParam(paramType = "form", dataTypeClass = MultipartFile.class, name = "file", value = "图片"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/user/welcome/add", method = RequestMethod.POST)
+    public ResponseBean welcomeAddUser(@RequestParam("userName") String userName, @RequestParam("file") MultipartFile file, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        TaUser user = new TaUser();
+        user.setUserName(userName);
+        responseBean = iTaUserService.welcomeFace(userElement, file, user);
+        return responseBean;
+    }
 }

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

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

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

@@ -1,7 +1,9 @@
 package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.model.TaUser;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -113,4 +115,13 @@ public interface ITaUserService {
      */
     ResponseBean temporaryLogin(Integer communityId);
 
+    /**
+     * 迎宾专用 接口
+     * @param userElement
+     * @param uploadFile
+     * @param user
+     * @return
+     */
+    ResponseBean welcomeFace(UserElement userElement, MultipartFile uploadFile, TaUser user);
+
 }

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

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

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.BeanTools;
 import com.community.commom.utils.MD5Utils;
@@ -11,9 +12,12 @@ import com.community.commom.uuid.IdGen;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.common.hk.HKConstant;
 import com.community.huiju.common.hk.HKOpenApi;
+import com.community.huiju.common.welcome.OkHttpRequestUtils;
+import com.community.huiju.common.welcome.WelcomeProperties;
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ITaUserService;
+import com.community.huiju.service.ImageServiceI;
 import com.community.huiju.vo.TaUserVO;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -26,7 +30,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -47,6 +53,9 @@ public class TaUserServiceImpl implements ITaUserService {
 
     private IdGen idGen = IdGen.get();
 
+    @Autowired
+    private WelcomeProperties welcomeProperties;
+
     @Autowired
     private TaUserMapper taUserMapper;
 
@@ -71,6 +80,9 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private TpBillInvoiceMapper tpBillInvoiceMapper;
 
+    @Autowired
+    private ImageServiceI imageService;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Deprecated
@@ -979,4 +991,57 @@ public class TaUserServiceImpl implements ITaUserService {
 
         return responseBean;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean welcomeFace(UserElement userElement, MultipartFile uploadFile, TaUser user) {
+        ResponseBean responseBean = new ResponseBean();
+
+        user.setCommunityId(userElement.getCommunityId());
+        user.setParentId(userElement.getId());
+        user.setCreateDate(new Date());
+        user.setCreateUser(userElement.getId());
+        user.setCommunityId(userElement.getCommunityId());
+
+        int rows = taUserMapper.insertSelective(user);
+        if (rows <= 0) {
+            responseBean.addError("操作失败！");
+            return responseBean;
+        }
+
+        // 角色  2 表示租客
+        addOrUpdateUserRole(2,responseBean,user,true);
+
+        // 开始推送 迎宾系统
+
+        Map<String, Object> parameterMap = Maps.newHashMap();
+        parameterMap.put("userId", user.getId());
+        parameterMap.put("username", user.getUserName());
+        try {
+            OkHttpRequestUtils.doPost(welcomeProperties.getUrl(), Maps.newHashMap(), parameterMap, uploadFile.getOriginalFilename(), uploadFile.getBytes());
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("推送 迎宾系统失败！", e);
+        }
+
+        // 开始存储人脸的图片到本地库
+        TaFace taFace = new TaFace();
+        taFace.setCommunityId(user.getCommunityId());
+        taFace.setCreateDate(new Date());
+        taFace.setCreateUser(user.getId());
+        taFace.setTaUserId(user.getId());
+        taFace.setUpdateDate(new Date());
+        taFace.setUpdateUser(user.getId());
+        try {
+            taFace.setFaceImg(imageService.getImageUrl(uploadFile));
+        } catch (IOException e) {
+            e.printStackTrace();
+            log.error("迎宾系统 人脸图片上传阿里云失败！", e);
+        }
+
+        taFaceMapper.insertSelective(taFace);
+
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
 }

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

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