otherUserId

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

@@ -441,7 +441,7 @@ public class HKOpenApi {
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        parMap.put("deviceUuids","83dfab0eef52411d991d6e621296b60a,dfd80b22f00545b8b36fa981019df83c");
+        parMap.put("deviceUuids","83dfab0eef52411d991d6e621296b60a,dfd80b22f00545b8b36fa981019df83c,6d4b9c4ad10b47bdbdccd8710c4d1d71,765532274ae84f9bb495d801444a7f1e");
         parMap.put("personIds",personIds);
         parMap.put("type",1);
         String params =  JSON.toJSONString(parMap);
@@ -610,10 +610,6 @@ public class HKOpenApi {
     }
     
     public static void main(String[] args) {
-        String data = HKOpenApi.downloadAuthorityByDeviceUuids();
-
-        System.out.println(data);
-
     }
 
 }

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

@@ -26,47 +26,47 @@ public class FaceController {
     @ApiOperation(value = "添加人脸图片", notes = "添加人脸图片")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserID",value = "家属或租户ID,不填为本人")
+            @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){
+                            @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);
+        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,不填为本人")
+            @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
+                               @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);
+         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,不填为本人")
+            @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){
+    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);
+        ResponseBean responseBean = faceServicel.getTaFaceByUserId(userId,otherUserId);
         return responseBean;
     }
 

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

@@ -52,10 +52,10 @@ public interface TaUserMapper {
     /**
      * 判断当前用户的关联关系
      * @param userId
-     * @param otherUserID
+     * @param otherUserId
      * @return
      */
-    TaUser selectTaFaceParentId(@Param("id") Integer userId, @Param("otherUserID")Integer otherUserID);
+    TaUser selectTaFaceParentId(@Param("id") Integer userId, @Param("otherUserId")Integer otherUserId);
 
     /**
      * 查询此电话在小区是否存在

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

@@ -9,24 +9,24 @@ public interface FaceServiceI {
      * 添加人脸
      * @param userId 登入人ID
      *  @param  uploadFile
-     *  @param otherUserID 关联家属或者租客ID
+     *  @param otherUserId 关联家属或者租客ID
      * @return
      */
-    ResponseBean addFace(Integer userId ,MultipartFile uploadFile,Integer otherUserID);
+    ResponseBean addFace(Integer userId ,MultipartFile uploadFile,Integer otherUserId);
 
     /**
      * 更新当前人脸
      * @param userId 登入人ID
      *  @param  uploadFile
-     *  @param otherUserID 关联家属或者租客ID
+     *  @param otherUserId 关联家属或者租客ID
      * @return
      */
-    ResponseBean upDateFace(Integer userId ,MultipartFile uploadFile,Integer otherUserID);
+    ResponseBean upDateFace(Integer userId ,MultipartFile uploadFile,Integer otherUserId);
 
     /**
      * 当前登入人是否有人脸信息
      * @param userId
      * @return
      */
-    ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserID);
+    ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserId);
 }

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

@@ -40,18 +40,18 @@ public class FaceServicelimpl implements FaceServiceI {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean addFace(Integer userid, MultipartFile uploadFile,Integer otherUserID) {
+    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);
+        /**当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;
+            Integer activeUser = otherUserId == null?userid:otherUserId;
             TaUser user = taUserMapper.selectByPrimaryKey(activeUser);
             TaFace taFace = new TaFace();
             taFace.setFaceImg(faceImg);
@@ -63,7 +63,7 @@ public class FaceServicelimpl implements FaceServiceI {
             taFace.setUpdateDate(new Date());
 
         /*验证身份*/
-        responseBean=addVerify( activeUser,  uploadFile, otherUserID, faceImg, taFace) ;
+        responseBean=addVerify( activeUser,  uploadFile, otherUserId, faceImg, taFace) ;
         return responseBean;
     }
 
@@ -71,22 +71,22 @@ public class FaceServicelimpl implements FaceServiceI {
      * 修改人脸信息
       * @param userId 登入人ID
      * @param  uploadFile
-     * @param otherUserID 关联家属或者租客ID
+     * @param otherUserId 关联家属或者租客ID
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean upDateFace(Integer userId, MultipartFile uploadFile,Integer otherUserID) {
+    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 (null!= otherUserId && !userId.equals(otherUserId)) {
+                 responseBean = getTaFaceParentId(userId, otherUserId);
             if ("1".equals(responseBean.getCode())) {
                 responseBean.getMessage();
                 return responseBean;
                }}
-            Integer activeUser = otherUserID == null?userId:otherUserID;
+            Integer activeUser = otherUserId == null?userId:otherUserId;
             //当前修改的id否存在
              TaFace face = taFaceMapper.getByUserId(activeUser);
              if (null == face){
@@ -157,17 +157,17 @@ public class FaceServicelimpl implements FaceServiceI {
      *获得用户，租客，家属，其中一种身份的信息
      */
     @Override
-    public ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserID) {
+    public ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserId) {
         ResponseBean responseBean= new ResponseBean();
-        /**当otherUserID不为空时判断它是否是业主下的租客或者家属*/
-        if (null!= otherUserID && !userId.equals(otherUserID)) {
-            responseBean = getTaFaceParentId(userId, otherUserID);
+        /**当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;
+        Integer id = otherUserId == null?userId:otherUserId;
         TaFace face = taFaceMapper.getByUserId(id);
          if (null!= face){
             responseBean.addSuccess(face);
@@ -181,10 +181,10 @@ public class FaceServicelimpl implements FaceServiceI {
     /**
      *判断当前用户下的人员关系（家属，租客）
      */
-    public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserID){
+    public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserId){
        ResponseBean  responseBean= new ResponseBean();
-/*         TaUser user = taUserMapper.selectTaFaceParentId(userId,otherUserID);*/
-        TaUser  users= taUserMapper.selectByPrimaryKey(otherUserID);
+/*         TaUser user = taUserMapper.selectTaFaceParentId(userId,otherUserId);*/
+        TaUser  users= taUserMapper.selectByPrimaryKey(otherUserId);
         if (null!= users && !users.getParentId().equals(userId)){
             responseBean.addError("您输入的家属或租户ID有误");
             return responseBean;
@@ -208,7 +208,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,Integer otherUserId,String faceImg,TaFace taFace) {
         ResponseBean response = new ResponseBean();
         TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userid);
         TaUser taUser = taUserMapper.selectByPrimaryKey(userid);

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

@@ -314,8 +314,8 @@
       <include refid="Base_Column_List" />
     from ta_user
     where 1=1
-    <if test="otherUserID != null" >
-     and id = #{otherUserID,jdbcType=INTEGER}
+    <if test="otherUserId != null" >
+     and id = #{otherUserId,jdbcType=INTEGER}
     </if>
     <if test="id != null" >
      and parent_id = #{id}
@@ -328,7 +328,7 @@
     <include refid="Base_Column_List" />
     from ta_user
     where community_id = #{communityId,jdbcType=INTEGER}
-    <if test="otherUserID != null" >
+    <if test="otherUserId != null" >
       and login_name = #{phone}
     </if>
 

CODE/smart-community/mq-message/src/main/java/com/community/huiju/runner/MqRunner.java

@@ -23,8 +23,8 @@ import javax.jms.Topic;
 @Component
 public class MqRunner implements ApplicationRunner {
 	
-	//public static final String BROKER_URL = "failover:(tcp://192.168.0.122:61618)?timeout=2000";
-	public static final String BROKER_URL = "failover:(tcp://localhost:8087)?timeout=2000";
+	public static final String BROKER_URL = "failover:(tcp://192.168.0.122:61618)?timeout=2000";
+	//public static final String BROKER_URL = "failover:(tcp://localhost:8087)?timeout=2000";
 	
 	public static final String TARGET = "openapi.acs.topic";
 	

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

@@ -52,10 +52,10 @@ public interface TaUserMapper {
     /**
      * 判断当前用户的关联关系
      * @param userId
-     * @param otherUserID
+     * @param otherUserId
      * @return
      */
-    TaUser selectTaFaceParentId(@Param("id") Integer userId, @Param("otherUserID") Integer otherUserID);
+    TaUser selectTaFaceParentId(@Param("id") Integer userId, @Param("otherUserId") Integer otherUserId);
 
     /**
      * 查询此电话在小区是否存在

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

@@ -314,8 +314,8 @@
       <include refid="Base_Column_List" />
     from ta_user
     where 1=1
-    <if test="otherUserID != null" >
-     and id = #{otherUserID,jdbcType=INTEGER}
+    <if test="otherUserId != null" >
+     and id = #{otherUserId,jdbcType=INTEGER}
     </if>
     <if test="id != null" >
      and parent_id = #{id}
@@ -328,7 +328,7 @@
     <include refid="Base_Column_List" />
     from ta_user
     where community_id = #{communityId,jdbcType=INTEGER}
-    <if test="otherUserID != null" >
+    <if test="otherUserId != null" >
       and login_name = #{phone}
     </if>