提交

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/perproties/LoginCodePerproties.java

@@ -29,4 +29,9 @@ public class LoginCodePerproties {
      */
     private String appUrl;
 
+    /**
+     * 默认的演示账号
+     */
+    private String phone;
+
 }

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

@@ -244,23 +244,14 @@ public class UserController extends BaseController {
 
 
     @ApiOperation(value = "游客登录", notes = "游客登录")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "communityId", value = "小区Id"),
-    })
     @RequestMapping(value = "/user/temporary/{communityId}", method = RequestMethod.POST)
-    @Deprecated
-    public ResponseBean temporaryLogin(@PathVariable Integer communityId, HttpSession session) {
+    public ResponseBean temporaryLogin(HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iTaUserService.temporaryLogin(communityId);
+        responseBean = iTaUserService.temporaryLogin(session);
         TaUserVO userVO = (TaUserVO) responseBean.getData();
         if (null != userVO) {
-            UserElement userElement = new UserElement();
-            BeanUtils.copyProperties(userVO,userElement);
-            userElement.setLoginType(Constant.APP_LOGIN_TYPE);
-            session.setAttribute(Constant.APP_USER_SESSION,userElement);
-            userVO.setToken(session.getId());
+            setUserElement(userVO, session);
         }
-        userVO.setToken(session.getId());
         return responseBean;
     }
 

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

@@ -144,11 +144,9 @@ public interface ITaUserService {
 
     /**
      * 游客登录
-     *
-     * @param communityId
      * @return
      */
-    ResponseBean temporaryLogin(Integer communityId);
+    ResponseBean temporaryLogin(HttpSession session);
 
     /**
      * 迎宾专用 接口  添加人员

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

@@ -256,7 +256,9 @@ public class TaUserServiceImpl implements ITaUserService {
              * 登陆成功后这个 审核id 会存 session
              */
             ResponseBean responseBean = checkHouse(response, taUserVO, userVerify);
-            responseBean.setUrl(responseBean.getUrl() + "&token=" + token);
+            if (!"0".equals(responseBean.getCode())) {
+                responseBean.setUrl(responseBean.getUrl() + "&token=" + token);
+            }
             return responseBean;
         } else if (taUserVerifies.size() >= 2) {
             response.addSuccess(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getCode())  + "&token=" + token);
@@ -943,25 +945,17 @@ public class TaUserServiceImpl implements ITaUserService {
     }
 
     @Override
-    public ResponseBean temporaryLogin(Integer communityId) {
+    public ResponseBean temporaryLogin(HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
-        ToCommunities communities = toCommunitiesMapper.selectByPrimaryKey(communityId);
-        if (null == communities) {
-            responseBean.addError("小区不存在!");
+
+        TaUser currentUser = hasUserPhone(loginCodePerproties.getPhone());
+        if (null == currentUser) {
+            responseBean.addError("账号不存在!");
             return responseBean;
         }
 
-        // 游客用户
-        TaUser user = taUserMapper.selectByPrimaryKey(-1);
-
-        TaUserVO taUserVO = new TaUserVO();
-        BeanUtils.copyProperties(user, taUserVO);
-        taUserVO.setCommunityId(communityId);
-        taUserVO.setRole("游客");
-        taUserVO.setCommunityName(communities.getCommunityName());
-
-        responseBean.addSuccess(taUserVO);
-
+        // 检验登录房产
+        checkLogin(responseBean, currentUser, session);
         return responseBean;
     }
 

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

@@ -15,6 +15,7 @@ import com.community.huiju.vo.TaUserVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -244,6 +245,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean verifyUser(UserElement userElement, Integer userVerifyId, String userVerifyStatus, String remark) {
         ResponseBean responseBean = new ResponseBean();
 

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

@@ -31,6 +31,7 @@ welcome:
 
 # 登陆的状态跳转url配置
 login-code-perproties:
+  phone: 15988888888
   app-url: http://106.14.20.193:8011/#/
   login-code:
     1000: linkBuilding?from=index # 无关联房产