合并

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

@@ -6,6 +6,7 @@ import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.ToCommunities;
 import com.community.huiju.service.CommunityServiceI;
 import com.community.huiju.vo.TaUserVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -14,6 +15,7 @@ import javax.servlet.http.HttpSession;
 /**
  * 公共 controller
  */
+@Slf4j
 public class BaseController {
 
     @Autowired
@@ -41,6 +43,7 @@ public class BaseController {
             throw new WisdomException("用户信息不能为空!");
         }
 
+        log.info("用户当前sessionId：{}", session.getId());
         UserElement userElement = new UserElement();
         BeanUtils.copyProperties(userVO,userElement);
         userElement.setLoginType(Constant.APP_LOGIN_TYPE);
@@ -54,6 +57,7 @@ public class BaseController {
      * @return
      */
     protected UserElement getUserElement(HttpSession session) {
+        log.info("用户当前sessionId：{}", session.getId());
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         if (null == userElement) {
             throw new WisdomException("用户 session 不存在！");

CODE/smart-community/app-api/src/main/java/com/community/huiju/enums/BuildingOwnerInfoEnum.java

@@ -1,8 +1,45 @@
 package com.community.huiju.enums;
 
+
 /**
- * 楼栋资料库
+ * 楼栋资料库 枚举
  * @author weiximei
  */
 public enum BuildingOwnerInfoEnum {
-}
+
+    NO_AUDIT_REAL_ESTATE(0, "无关联房产"),
+
+    A_AUDIT_REAL_ESTATE(1, "关联一个审核通过的房产"),
+
+    A_TO_AUDIT_REAL_ESTATE(2, "关联一个待审核房产"),
+
+    A_AUDIT_FAILED_REAL_ESTATE(3, "关联一个审核未通过房产"),
+
+    A_MULTIPLE_REAL_ESTATE(3, "有多个关联房产"),
+
+    ;
+
+    BuildingOwnerInfoEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    private Integer code;
+
+    private String msg;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }}