修改租户类型

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

@@ -482,7 +482,7 @@ public class UserController implements IBaseController {
             brief.setSex(Optional.ofNullable(userDetail.getGender()).orElse(cn.quantgroup.xyqb.model.Gender.UNKNOWN).ordinal() + "");
             brief.setPhoneNo(userDetail.getPhoneNo().substring(0, 3) + "****" + userDetail.getPhoneNo().substring(7, 11));
         }
-        String tenantId = getCurrentTenantIdRedis();
+        Integer tenantId = Integer.parseInt(getCurrentTenantIdRedis());
         if (tenantId != null) {
             brief = tenantService.getTenantCustomerInfo(userDetail, tenantId);
         }

src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java

@@ -133,7 +133,7 @@ public class InnerController implements IBaseController {
 	 */
     @RequestMapping("/user/search/phoneNo")
     @ApiOperation(httpMethod = "GET", value = "根据手机号查询用户信息")
-    public JsonResult findByPhoneNo(String phoneNo, String tenantId) {
+    public JsonResult findByPhoneNo(String phoneNo, Integer tenantId) {
         User user = userService.findByPhoneInDb(phoneNo);
         if (user == null) {
             return JsonResult.buildErrorStateResult("", null);
@@ -154,7 +154,7 @@ public class InnerController implements IBaseController {
 	 */
     @RequestMapping("/user/search/uuid")
     @ApiOperation(httpMethod = "POST", value = "根据UUID查询用户信息")
-    public JsonResult findByUuid(String uuid, String tenantId) {
+    public JsonResult findByUuidInfo(String uuid, Integer tenantId) {
         User user = userService.findByUuidWithCache(uuid);
         if (user == null) {
             return JsonResult.buildErrorStateResult("", null);
@@ -393,7 +393,7 @@ public class InnerController implements IBaseController {
      */
     @RequestMapping("/user_detail/search/userId")
     @ApiOperation(httpMethod = "POST", value = "查询用户详情")
-    public JsonResult findUserDetailByUserId(Long userId, String tenantId) {
+    public JsonResult findUserDetailByUserId(Long userId, Integer tenantId) {
         UserDetail userDetail = null;
         // 增加容错性，防备DB中存在的脏数据触发异常
         if (userId != null && userId > 0) {
@@ -417,7 +417,7 @@ public class InnerController implements IBaseController {
 	 */
     @RequestMapping("/user/search/userId")
     @ApiOperation(httpMethod = "POST", value = "查询用户基本信息")
-    public JsonResult findUserByUserId(Long userId, String tenantId) {
+    public JsonResult findUserByUserId(Long userId, Integer tenantId) {
         User user = userService.findById(userId);
         if (user != null) {
             if (tenantId != null) {
@@ -438,7 +438,7 @@ public class InnerController implements IBaseController {
 	 */
     @RequestMapping("/user_detail/search/phone")
     @ApiOperation(httpMethod = "POST", value = "查询用户详情")
-    public JsonResult findUserDetailByPhone(String phoneNo, String tenantId) {
+    public JsonResult findUserDetailByPhone(String phoneNo, Integer tenantId) {
         UserDetail userDetail = null;
         userDetail = userDetailService.findSlaveByPhoneNo(phoneNo);
         if (userDetail != null) {

src/main/java/cn/quantgroup/xyqb/controller/internal/user/center/OauthClientDetailsController.java

 package cn.quantgroup.xyqb.controller.internal.user.center;
 
-import cn.quantgroup.xyqb.entity.OauthClientDetailsEntity;
-import cn.quantgroup.xyqb.entity.User;
-import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.service.user.IOauthClientDetailsService;
 import cn.quantgroup.xyqb.service.user.IOauthLoginInfoService;
 import cn.quantgroup.xyqb.service.user.ISmsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -28,25 +24,6 @@ public class OauthClientDetailsController {
     @Autowired
     private ISmsService smsService;
 
-    @PostMapping("/getOauthClient")
-    public JsonResult getOauthClient(String clientId) {
-        OauthClientDetailsEntity oauthClientDetailsEntity = oauthClientDetailsService.findFirstByClientId(clientId);
-        return JsonResult.buildSuccessResultGeneric(oauthClientDetailsEntity);
-    }
 
-    @PostMapping("/addLoginInfo")
-    public JsonResult addLoginInfo(String tenantId, String phoneNo) {
-        User user = new User();
-        user.setPhoneNo(phoneNo);
-        user.setId(new Long("111111"));
-        oauthLoginInfoService.addLoginInfo(user, tenantId);
-        return JsonResult.buildSuccessResultGeneric("12");
-    }
-
-    @PostMapping("/sendSms")
-    public JsonResult sendSms(Long tenantId, String phoneNo) {
-        String code = smsService.sendSms(tenantId, "login", phoneNo);
-        return JsonResult.buildSuccessResultGeneric(code);
-    }
 
 }

src/main/java/cn/quantgroup/xyqb/entity/OauthClientDetailsEntity.java

@@ -28,7 +28,7 @@ public class OauthClientDetailsEntity extends OptimisticEntity implements Serial
 
     @Id
     @Column(name = "CLIENT_ID", nullable = false)
-    private String clientId;
+    private Long clientId;
 
     @Column(name = "INSTITUTION_ID", nullable = false, length = 4)
     private String institutionId;
@@ -76,11 +76,11 @@ public class OauthClientDetailsEntity extends OptimisticEntity implements Serial
     private String smsRegisterTemplate;
 
 
-    public String getClientId() {
+    public Long getClientId() {
         return clientId;
     }
 
-    public void setClientId(String clientId) {
+    public void setClientId(Long clientId) {
         this.clientId = clientId;
     }
 

src/main/java/cn/quantgroup/xyqb/repository/IOauthClientDetailsRepository.java

@@ -9,8 +9,8 @@ import org.springframework.stereotype.Repository;
  * Created by hechao on 2020/2/17.
  */
 @Repository
-public interface IOauthClientDetailsRepository extends JpaRepository<OauthClientDetailsEntity, String> {
-    OauthClientDetailsEntity findFirstByClientId(String clientID);
+public interface IOauthClientDetailsRepository extends JpaRepository<OauthClientDetailsEntity, Long> {
+    OauthClientDetailsEntity findFirstByClientId(Integer clientID);
 
     OauthClientDetailsEntity findFirstByInstitutionIdAndProductId(String institutionId, String productId);
 }
\ No newline at end of file

src/main/java/cn/quantgroup/xyqb/service/user/IOauthClientDetailsService.java

@@ -7,5 +7,5 @@ import cn.quantgroup.xyqb.entity.OauthClientDetailsEntity;
  */
 public interface IOauthClientDetailsService {
 
-    OauthClientDetailsEntity findFirstByClientId(String clientId);
+    OauthClientDetailsEntity findFirstByClientId(Integer clientId);
 }

src/main/java/cn/quantgroup/xyqb/service/user/IOauthLoginInfoService.java

@@ -6,5 +6,5 @@ import cn.quantgroup.xyqb.entity.User;
  * Created by Li Jianhua on 2017/1/3.
  */
 public interface IOauthLoginInfoService {
-    void addLoginInfo(User user, String tenantId);
+    void addLoginInfo(User user, Integer tenantId);
 }

src/main/java/cn/quantgroup/xyqb/service/user/ITenantService.java

@@ -9,9 +9,9 @@ import cn.quantgroup.xyqb.model.UserBrief;
  */
 public interface ITenantService {
 
-    User getTenantUser(User user, String tenantId);
+    User getTenantUser(User user, Integer tenantId);
 
-    UserDetail getTenantUserDetail(UserDetail userDetail, String tenantId);
+    UserDetail getTenantUserDetail(UserDetail userDetail, Integer tenantId);
 
-    UserBrief getTenantCustomerInfo(UserDetail userDetail, String tenantId);
+    UserBrief getTenantCustomerInfo(UserDetail userDetail, Integer tenantId);
 }

src/main/java/cn/quantgroup/xyqb/service/user/impl/OauthClientDetailsServiceImpl.java

@@ -18,7 +18,7 @@ public class OauthClientDetailsServiceImpl implements IOauthClientDetailsService
 
 
     @Override
-    public OauthClientDetailsEntity findFirstByClientId(String clientId) {
+    public OauthClientDetailsEntity findFirstByClientId(Integer clientId) {
         OauthClientDetailsEntity oauthClientDetailsEntity = oauthClientDetailsRepository.findFirstByClientId(clientId);
         return oauthClientDetailsEntity;
     }

src/main/java/cn/quantgroup/xyqb/service/user/impl/OauthLoginInfoServiceImpl.java

@@ -39,7 +39,7 @@ public class OauthLoginInfoServiceImpl implements IOauthLoginInfoService {
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW)
-    public void addLoginInfo(User user, String tenantId) {
+    public void addLoginInfo(User user, Integer tenantId) {
         System.out.println(atomicSequencer.nextId());
         OauthClientDetailsEntity oauthClientDetailsEntity = oauthClientDetailsRepository.findFirstByClientId(tenantId);
         if (oauthClientDetailsEntity != null) {

src/main/java/cn/quantgroup/xyqb/service/user/impl/TenantServiceImpl.java

@@ -29,7 +29,7 @@ public class TenantServiceImpl implements ITenantService {
     private IOauthClientDetailsService oauthClientDetailsService;
 
     @Override
-    public User getTenantUser(User user, String tenantId) {
+    public User getTenantUser(User user, Integer tenantId) {
         OauthClientDetailsEntity oauthClientDetails = oauthClientDetailsService.findFirstByClientId(tenantId);
         if (oauthClientDetails != null) {
             ProductLoginEntity productLogin = productLoginService.findSlaveByPloginInfo(oauthClientDetails.getInstitutionId(), oauthClientDetails.getProductId(), user.getId());
@@ -45,7 +45,7 @@ public class TenantServiceImpl implements ITenantService {
     }
 
     @Override
-    public UserDetail getTenantUserDetail(UserDetail userDetail, String tenantId) {
+    public UserDetail getTenantUserDetail(UserDetail userDetail, Integer tenantId) {
         OauthClientDetailsEntity oauthClientDetails = oauthClientDetailsService.findFirstByClientId(tenantId);
         if (oauthClientDetails != null) {
             ProductLoginEntity productLogin = productLoginService.findSlaveByPloginInfo(oauthClientDetails.getInstitutionId(), oauthClientDetails.getProductId(), userDetail.getUserId());
@@ -73,7 +73,7 @@ public class TenantServiceImpl implements ITenantService {
     }
 
     @Override
-    public UserBrief getTenantCustomerInfo(UserDetail userDetail, String tenantId) {
+    public UserBrief getTenantCustomerInfo(UserDetail userDetail, Integer tenantId) {
         OauthClientDetailsEntity oauthClientDetails = oauthClientDetailsService.findFirstByClientId(tenantId);
         if (oauthClientDetails != null) {
             ProductLoginEntity productLogin = productLoginService.findSlaveByPloginInfo(oauthClientDetails.getInstitutionId(), oauthClientDetails.getProductId(), userDetail.getUserId());