修改迎宾推送接口

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

@@ -255,16 +255,15 @@ public class UserController extends BaseController {
     @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")
+            @ApiImplicitParam(paramType = "header",dataType = "String",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) {
+    public ResponseBean welcomeAddUser(@RequestParam("userName") String userName, 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);
+        responseBean = iTaUserService.addWelcomeUser(userElement, user);
         return responseBean;
     }
 }

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

@@ -32,4 +32,12 @@ public interface FaceServiceI {
      */
     ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserId);
 
+    /**
+     * 迎宾人员 添加人脸
+     * @param uploadFile
+     * @param user
+     * @return
+     */
+    ResponseBean addWelcomeFace(MultipartFile uploadFile, TaUser user);
+
 }

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

@@ -116,12 +116,12 @@ public interface ITaUserService {
     ResponseBean temporaryLogin(Integer communityId);
 
     /**
-     * 迎宾专用 接口
+     * 迎宾专用 接口  添加人员
      * @param userElement
-     * @param uploadFile
+     * @param user
      * @param user
      * @return
      */
-    ResponseBean welcomeFace(UserElement userElement, MultipartFile uploadFile, TaUser user);
+    ResponseBean addWelcomeUser(UserElement userElement,TaUser user);
 
 }

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

@@ -5,9 +5,11 @@ 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.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.exception.WisdomException;
 import com.community.huiju.model.TaFace;
 import com.community.huiju.model.TaSysRole;
 import com.community.huiju.model.TaUser;
@@ -15,8 +17,13 @@ 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.util.ArrayList;
@@ -41,11 +48,23 @@ public class FaceServicelimpl implements FaceServiceI {
     @Autowired
     private ImageServiceI imageServiceI;
 
+    @Autowired
+    private WelcomeProperties welcomeProperties;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addFace(Integer userid, MultipartFile uploadFile,Integer otherUserId) {
         ResponseBean responseBean= new ResponseBean();
 
+        // 判断是否是迎宾系统人员
+        TaUser welcomeUser = taUserMapper.selectByPrimaryKey(otherUserId);
+        if (null != welcomeUser && null != welcomeProperties.getCommunityId() && welcomeUser.getCommunityId().intValue() == welcomeProperties.getCommunityId()) {
+            // 开始推送迎宾
+            responseBean = addWelcomeFace(uploadFile, welcomeUser);
+            return responseBean;
+        }
+
+
          String faceImg =img(uploadFile);
         /**当otherUserId不为空时判断它是否是业主下的租客或者家属*/
         if (null!= otherUserId) {
@@ -267,6 +286,59 @@ public class FaceServicelimpl implements FaceServiceI {
         response.addError("您的信息已存在");
         return response;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean addWelcomeFace(MultipartFile uploadFile, TaUser user) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 开始推送 迎宾系统
+        String result = "";
+        try {
+//            Map<String, Object> parameterMap = Maps.newHashMap();
+//            parameterMap.put("userName", user.getUserName());
+//            String welcomeUrl = welcomeProperties.getUrl() + "/" + user.getId();
+//            OkHttpRequestUtils.doPost(welcomeUrl, Maps.newHashMap(), parameterMap, uploadFile.getOriginalFilename(), uploadFile.getBytes());
+
+            RestTemplate restTemplate = new RestTemplate();
+            String faceUrl = welcomeProperties.getUrl() + "/" + user.getId() + "?userName=" + user.getUserName();
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
+            HttpEntity httpEntity = new HttpEntity(uploadFile.getBytes());
+            result = restTemplate.exchange(faceUrl, HttpMethod.POST, httpEntity, String.class).getBody();
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("推送 迎宾系统失败！", e);
+            throw new WisdomException("推送 迎宾系统失败！");
+        }
+
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        if (!jsonObject.get("code").equals(200)){
+            String message = jsonObject.get("message").toString();
+            log.error(" 推送 迎宾系统失败！ {}",message);
+            throw new WisdomException(message);
+        }
+
+        // 开始存储人脸的图片到本地库
+        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(imageServiceI.getImageUrl(uploadFile));
+        } catch (IOException e) {
+            e.printStackTrace();
+            log.error("迎宾系统 人脸图片上传阿里云失败！", e);
+        }
+
+        taFaceMapper.insertSelective(taFace);
+
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
 }
 
 

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

@@ -999,10 +999,12 @@ public class TaUserServiceImpl implements ITaUserService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    public ResponseBean welcomeFace(UserElement userElement, MultipartFile uploadFile, TaUser user) {
+    public ResponseBean addWelcomeUser(UserElement userElement, TaUser user) {
         ResponseBean responseBean = new ResponseBean();
 
+        TaUser currentUser = taUserMapper.selectByPrimaryKey(userElement.getId());
+
+        user.setBuildingOwnerInfoId(currentUser.getBuildingOwnerInfoId());
         user.setCommunityId(userElement.getCommunityId());
         user.setParentId(userElement.getId());
         user.setCreateDate(new Date());
@@ -1010,6 +1012,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setCommunityId(userElement.getCommunityId());
         user.setVerifyStatus("1");
         user.setAcceptAgreementStatus("1");
+        user.setFaceStatus("0");
         user.setStatus("1");
 
         int rows = taUserMapper.insertSelective(user);
@@ -1020,53 +1023,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
         // 角色  2 表示租客
         addOrUpdateUserRole(2,responseBean,user,true);
-
-        // 开始推送 迎宾系统
-
-        String result = "";
-
-        try {
-//            Map<String, Object> parameterMap = Maps.newHashMap();
-//            parameterMap.put("userName", user.getUserName());
-//            String welcomeUrl = welcomeProperties.getUrl() + "/" + user.getId();
-//            OkHttpRequestUtils.doPost(welcomeUrl, Maps.newHashMap(), parameterMap, uploadFile.getOriginalFilename(), uploadFile.getBytes());
-
-            RestTemplate restTemplate = new RestTemplate();
-            String faceUrl = welcomeProperties.getUrl() + "/" + user.getId() + "?userName=" + user.getUserName();
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-            HttpEntity httpEntity = new HttpEntity(uploadFile.getBytes());
-            result = restTemplate.exchange(faceUrl, HttpMethod.POST, httpEntity, String.class).getBody();
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("推送 迎宾系统失败！", e);
-        }
-
-        JSONObject jsonObject = JSONObject.parseObject(result);
-        if (!jsonObject.get("code").equals(200)){
-            String message = jsonObject.get("message").toString();
-            log.error(" 推送 迎宾系统失败！ {}",message);
-            throw new WisdomException(message);
-        }
-
-        // 开始存储人脸的图片到本地库
-        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("操作成功！");
+        responseBean.addSuccess(user);
         return responseBean;
     }
 }