优化用户ID查询代码

Api/src/main/java/com/java110/api/listener/owner/ListAppUserBindingOwnersListener.java

@@ -13,6 +13,7 @@ import com.java110.event.service.api.ServiceDataFlowEvent;
 import com.java110.utils.constant.ServiceCodeConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.api.auditAppUserBindingOwner.ApiAuditAppUserBindingOwnerDataVo;
 import com.java110.vo.api.auditAppUserBindingOwner.ApiAuditAppUserBindingOwnerVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,7 +89,12 @@ public class ListAppUserBindingOwnersListener extends AbstractServiceApiListener
         }
 
         OwnerAppUserDto ownerAppUserDto = BeanConvertUtil.covertBean(reqJson, OwnerAppUserDto.class);
-        ownerAppUserDto.setOpenId(openId);
+        if(!StringUtil.isEmpty(openId)) {//这里微信小程序
+            ownerAppUserDto.setOpenId(openId);
+        }else{ //这种是业主注册的
+
+            ownerAppUserDto.setUserId(userId);
+        }
 
         int count = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsersCount(ownerAppUserDto);
 

FrontService/src/main/java/com/java110/front/controller/OwnerAppRegisterController.java

@@ -1,58 +0,0 @@
-package com.java110.front.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.base.controller.BaseController;
-import com.java110.core.context.IPageData;
-import com.java110.core.context.PageData;
-import com.java110.front.smo.common.ICommonGetSMO;
-import com.java110.front.smo.ownerLogin.IOwnerAppLoginSMO;
-import com.java110.front.smo.wxLogin.IWxLoginSMO;
-import com.java110.utils.constant.CommonConstant;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 微信小程序登录处理类
- */
-@RestController
-@RequestMapping(path = "/app")
-public class OwnerAppRegisterController extends BaseController {
-    private final static Logger logger = LoggerFactory.getLogger(OwnerAppRegisterController.class);
-
-    @Autowired
-    private IOwnerAppLoginSMO ownerAppLoginSMOImpl;
-
-
-
-    /**
-     * 注册业主接口
-     *
-     * @param postInfo
-     * @param request
-     */
-    @RequestMapping(path = "/registerOwner", method = RequestMethod.POST)
-    public ResponseEntity<String> loginOwner(@RequestBody String postInfo, HttpServletRequest request) {
-        /*IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);*/
-        IPageData pd = PageData.newInstance().builder("", "", "", postInfo,
-                "login", "", "", "",
-                request.getHeader("APP_ID"));
-        ResponseEntity<String> responseEntity = ownerAppLoginSMOImpl.doLogin(pd);
-        if(responseEntity.getStatusCode() != HttpStatus.OK){
-            return responseEntity;
-        }
-        JSONObject outParam = JSONObject.parseObject(responseEntity.getBody());
-        pd.setToken(outParam.getString("token"));
-        request.setAttribute(CommonConstant.CONTEXT_PAGE_DATA,pd);
-        return responseEntity;
-    }
-
-}

FrontService/src/main/java/com/java110/front/smo/ownerLogin/impl/OwnerAppLoginSMOImpl.java

@@ -54,7 +54,7 @@ public class OwnerAppLoginSMOImpl extends AppAbstractComponentSMO implements IOw
         JSONObject loginInfo = JSONObject.parseObject(pd.getReqData());
 
         loginInfo.put("passwd", AuthenticationFactory.passwdMd5(loginInfo.getString("password")));
-        responseEntity = this.callCenterService(restTemplate, pd, loginInfo.toJSONString(), "http://api.java110.com:8008/api/user.service.login", HttpMethod.POST);
+        responseEntity = this.callCenterService(restTemplate, pd, loginInfo.toJSONString(), ServiceConstant.SERVICE_API_URL +"/api/user.service.login", HttpMethod.POST);
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             return responseEntity;
         }

java110-db/src/main/resources/mapper/user/OwnerAppUserServiceDaoImplMapper.xml

@@ -282,6 +282,9 @@
         <if test="memberId !=null and memberId != ''">
             and t.member_id= #{memberId}
         </if>
+        <if test="userId !=null and userId != ''">
+            , t.user_id= #{userId}
+        </if>
 
 
     </select>