|
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.diagbot.client.AuthServiceClient;
|
|
|
-import com.diagbot.client.DiagbotmanService;
|
|
|
+import com.diagbot.client.DiagbotmanClient;
|
|
|
import com.diagbot.dto.GetConsoleUserInfoDTO;
|
|
|
import com.diagbot.dto.LoginDTO;
|
|
|
import com.diagbot.dto.RespDTO;
|
|
@@ -12,7 +12,6 @@ import com.diagbot.dto.UserAndProdutUDTO;
|
|
|
import com.diagbot.dto.UserInfoDTO;
|
|
|
import com.diagbot.dto.UserInfoExportDTO;
|
|
|
import com.diagbot.dto.UserOrgDTO;
|
|
|
-import com.diagbot.dto.UserOrganProductDTO;
|
|
|
import com.diagbot.entity.JWT;
|
|
|
import com.diagbot.entity.Organization;
|
|
|
import com.diagbot.entity.User;
|
|
@@ -43,14 +42,9 @@ import com.diagbot.vo.UserInfoAuditVO;
|
|
|
import com.diagbot.vo.UserInfoOrganizationsVO;
|
|
|
import com.diagbot.vo.UserSaveVO;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.cache.annotation.CacheEvict;
|
|
|
-import org.springframework.cache.annotation.CachePut;
|
|
|
-import org.springframework.cache.annotation.Cacheable;
|
|
|
import org.springframework.security.crypto.factory.PasswordEncoderFactories;
|
|
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
|
|
|
import java.io.Serializable;
|
|
|
import java.util.ArrayList;
|
|
@@ -59,8 +53,6 @@ import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
-import javax.validation.Valid;
|
|
|
-
|
|
|
/**
|
|
|
* @Description: 用户业务层
|
|
|
* @author: gaodm
|
|
@@ -88,7 +80,7 @@ public class UserFacade extends UserServiceImpl {
|
|
|
@Autowired
|
|
|
PermissionFacade permissionFacade;
|
|
|
@Autowired
|
|
|
- DiagbotmanService diagbotmanService;
|
|
|
+ DiagbotmanClient diagbotmanService;
|
|
|
|
|
|
/**
|
|
|
* 注册
|