生成计算模型给看看推送的消息的userId改成以四维看看的为准

fdkanfang-domain/src/main/java/com/fdkanfang/domain/backend/UserEntity.java

@@ -51,4 +51,7 @@ public class UserEntity extends BaseModel implements Serializable {
 
 
     private String nickname; //昵称
+
+    //用户在四维看看的用户ID
+    private Integer kankanUserId;
 }

fdkanfang-web/src/main/java/com/fdkanfang/web/backend/HouseController.java

@@ -1113,7 +1113,8 @@ public class HouseController extends BaseController {
         return new R(MsgCode.SUCCESS_CODE, house);
     }
 
-    private Map<String, Object> formatMqReq(HouseEntity house , SceneProEntity sceneProEntity , String path, String callbackQueue){
+    private Map<String, Object> formatMqReq(HouseEntity house , SceneProEntity sceneProEntity ,
+                                            String path, String callbackQueue){
         Map<String ,Object> result = new HashMap<>();
         if(null == house){
             return result;
@@ -1121,7 +1122,15 @@ public class HouseController extends BaseController {
         result.put("sceneName" , house.getDistrictName());
         result.put("sceneNum" , house.getSceneCode());
         result.put("sceneScheme" , sceneProEntity.getSceneScheme());
-        result.put("userId" , house.getUserId());
+        if(null != house.getUserId()){
+            UserEntity user =  userService2.findById(house.getUserId());
+            int kankanUserId = -1;
+            if(null != user && null != user.getKankanUserId()){
+                kankanUserId = user.getKankanUserId();
+            }
+            result.put("userId" , kankanUserId);
+        }
+
         result.put("dataSource" , path);
         result.put("callbackQueue" , callbackQueue);
         return  result;

fdkanfang-web/src/main/java/com/fdkanfang/web/backend/IndexController.java

@@ -188,12 +188,13 @@ public class IndexController extends BaseController {
                             String nickName = (String) user.get("nickName");
                             String userName = (String) user.get("userName");
                             String password = (String) user.get("password");
+                            int kankanUserId = null != user.get("id") ? (int) user.get("id") : -1;
                             if (StringUtils.isBlank(userName)) {
                                 throw new CommonBaseException(ResultCodeEnum.D101, "看看返回用户名为空");
                             }
                             UserEntity dbUser = userService2.findByUserName(userName);
                             if (null == dbUser) {
-                                userUtils.addNewUserByPhone(userName, password);
+                                userUtils.addNewUserByPhone(userName, password , kankanUserId);
                                 dbUser = userService2.findByUserName(adminRegisterVo.getPhoneNum());
                                 if (null == dbUser) {
                                     log.error("新插入的用户:{}重新捞取失败", adminRegisterVo.getPhoneNum());
@@ -206,6 +207,13 @@ public class IndexController extends BaseController {
                                     log.info("用户[{}]不可用", dbUser.getUserName());
                                     throw new CommonBaseException(ResultCodeEnum.D101, "用户已经不可用");
                                 }
+                                if(kankanUserId != -1 && null == dbUser.getKankanUserId()){
+                                    dbUser.setKankanUserId(kankanUserId);
+                                    int update = userService2.update(dbUser);
+                                    if(update != 1){
+                                        log.warn("更新用户的看看用户ID失败");
+                                    }
+                                }
                                 Set<String> roles = userService2.findRoleByUserId(dbUser.getId());
                                 if (null == roles || !roles.contains("upload")) {
                                     //默认给上传权限

fdkanfang-web/src/main/java/com/fdkanfang/web/backend/utils/UserUtils.java

@@ -56,7 +56,7 @@ public class UserUtils {
        return user;
     }
 
-    public int  addNewUserByPhone(String phoneNum , String password){
+    public int  addNewUserByPhone(String phoneNum , String password , int kankanUserId){
         if(StringUtils.isBlank(phoneNum)){
             return -1;
         }
@@ -64,6 +64,7 @@ public class UserUtils {
         userEntity.setUserName(phoneNum);
         userEntity.setPhone(phoneNum);
         userEntity.setRealName(phoneNum);
+        userEntity.setKankanUserId(kankanUserId);
         if(StringUtils.isNotBlank(password)){
             userEntity.setPassword(password);
         }