|
@@ -4,19 +4,16 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.github.pagehelper.PageInfo;
|
|
|
|
|
+import com.ytpm.agent.enums.UserTypeEnum;
|
|
|
import com.ytpm.constant.StrConstant;
|
|
import com.ytpm.constant.StrConstant;
|
|
|
import com.ytpm.general.RepMessage;
|
|
import com.ytpm.general.RepMessage;
|
|
|
import com.ytpm.general.Result;
|
|
import com.ytpm.general.Result;
|
|
|
import com.ytpm.general.ResultTable;
|
|
import com.ytpm.general.ResultTable;
|
|
|
import com.ytpm.middle.dao.MiddleUserMapper;
|
|
import com.ytpm.middle.dao.MiddleUserMapper;
|
|
|
-import com.ytpm.middle.model.YtMiddleRole;
|
|
|
|
|
-import com.ytpm.middle.model.YtMiddleUser;
|
|
|
|
|
-import com.ytpm.middle.model.YtMiddleUserRole;
|
|
|
|
|
import com.ytpm.middle.param.MiddleUserListParam;
|
|
import com.ytpm.middle.param.MiddleUserListParam;
|
|
|
import com.ytpm.middle.param.MiddleUserParam;
|
|
import com.ytpm.middle.param.MiddleUserParam;
|
|
|
import com.ytpm.middle.service.UserService;
|
|
import com.ytpm.middle.service.UserService;
|
|
|
import com.ytpm.middle.util.RedisUtil;
|
|
import com.ytpm.middle.util.RedisUtil;
|
|
|
-import com.ytpm.middle.view.MiddleRoleVO;
|
|
|
|
|
import com.ytpm.middle.view.MiddleUserInfo;
|
|
import com.ytpm.middle.view.MiddleUserInfo;
|
|
|
import com.ytpm.oauth.model.YtPlatformUser;
|
|
import com.ytpm.oauth.model.YtPlatformUser;
|
|
|
import com.ytpm.util.IDUtil;
|
|
import com.ytpm.util.IDUtil;
|
|
@@ -27,9 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
|
|
import java.util.Objects;
|
|
import java.util.Objects;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
|
public class UserServiceImpl implements UserService {
|
|
public class UserServiceImpl implements UserService {
|
|
@@ -62,7 +57,7 @@ public class UserServiceImpl implements UserService {
|
|
|
YtPlatformUser user = new YtPlatformUser();
|
|
YtPlatformUser user = new YtPlatformUser();
|
|
|
BeanUtils.copyProperties(param, user);
|
|
BeanUtils.copyProperties(param, user);
|
|
|
user.setUserId(IDUtil.generateFlowID("middle_"));
|
|
user.setUserId(IDUtil.generateFlowID("middle_"));
|
|
|
- user.setUserType(99);
|
|
|
|
|
|
|
+ user.setUserType(UserTypeEnum.PLATFORM_USER.getCode());
|
|
|
user.setRegistryTime(new Date());
|
|
user.setRegistryTime(new Date());
|
|
|
BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
|
|
BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
|
|
|
user.setEncryptPwd(encoder.encode(param.getPassword()));
|
|
user.setEncryptPwd(encoder.encode(param.getPassword()));
|