Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 (4bdb60f2) · Commits · SUMMER2020 / students / proj-2002251

escheduler-api/src/main/java/cn/escheduler/api/controller/UsersController.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -64,13 +64,14 @@ public class UsersController extends BaseController{
		@RequestParam(value = "userName") String userName,
		@RequestParam(value = "userPassword") String userPassword,
		@RequestParam(value = "tenantId") int tenantId,
		@RequestParam(value = "queue") String queue,
		@RequestParam(value = "email") String email,
		@RequestParam(value = "phone", required = false) String phone) {
		logger.info("login user {}, create user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, proxyUsers: {}",
		loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone);
		logger.info("login user {}, create user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, user queue: {}",
		loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone,queue);

		try {
		Map<String, Object> result = usersService.createUser(loginUser, userName, userPassword, email, tenantId, phone);
		Map<String, Object> result = usersService.createUser(loginUser, userName, userPassword,email,tenantId, phone,queue);
		return returnDataList(result);
		}catch (Exception e){
		logger.error(CREATE_USER_ERROR.getMsg(),e);
		@@ -127,13 +128,14 @@ public class UsersController extends BaseController{
		@RequestParam(value = "id") int id,
		@RequestParam(value = "userName") String userName,
		@RequestParam(value = "userPassword") String userPassword,
		@RequestParam(value = "queue") String queue,
		@RequestParam(value = "email") String email,
		@RequestParam(value = "tenantId") int tenantId,
		@RequestParam(value = "phone", required = false) String phone) {
		logger.info("login user {}, updateProcessInstance user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, proxyUsers: {}",
		loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone);
		logger.info("login user {}, updateProcessInstance user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, user queue: {}",
		loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone,queue);
		try {
		Map<String, Object> result = usersService.updateUser(id,userName,userPassword,email,tenantId,phone);
		Map<String, Object> result = usersService.updateUser(id,userName,userPassword,email,tenantId,phone,queue);
		return returnDataList(result);
		}catch (Exception e){
		logger.error(UPDATE_USER_ERROR.getMsg(),e);

escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -87,7 +87,8 @@ public class UsersService extends BaseService {
		String userPassword,
		String email,
		int tenantId,
		String phone) throws Exception {
		String phone,
		String queue) throws Exception {

		Map<String, Object> result = new HashMap<>(5);
		result = CheckUtils.checkUserParams(userName, userPassword, email, phone);
		@@ -114,6 +115,7 @@ public class UsersService extends BaseService {
		user.setUserType(UserType.GENERAL_USER);
		user.setCreateTime(now);
		user.setUpdateTime(now);
		user.setQueue(queue);

		// save user
		userMapper.insert(user);
		@@ -194,7 +196,13 @@ public class UsersService extends BaseService {
		* @param phone
		* @return
		*/
		public Map<String, Object> updateUser(int userId, String userName, String userPassword, String email, int tenantId, String phone) throws Exception {
		public Map<String, Object> updateUser(int userId,
		String userName,
		String userPassword,
		String email,
		int tenantId,
		String phone,
		String queue) throws Exception {
		Map<String, Object> result = new HashMap<>(5);
		result.put(Constants.STATUS, false);

		@@ -218,6 +226,7 @@ public class UsersService extends BaseService {
		if (StringUtils.isNotEmpty(email)) {
		user.setEmail(email);
		}
		user.setQueue(queue);
		user.setPhone(phone);
		user.setUpdateTime(now);

escheduler-dao/readme.txt

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		alter table t_escheduler_user add queue varchar(64);
		No newline at end of file

escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java

+16 −4

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ public class ProcessDao extends AbstractBaseDao {
		ExecutionStatus.READY_STOP.ordinal()};

		@Autowired
		private ProjectMapper projectMapper;
		private UserMapper userMapper;

		@Autowired
		private ProcessDefinitionMapper processDefineMapper;
		@@ -102,7 +102,7 @@ public class ProcessDao extends AbstractBaseDao {
		*/
		@Override
		protected void init() {
		projectMapper = getMapper(ProjectMapper.class);
		userMapper=getMapper(UserMapper.class);
		processDefineMapper = getMapper(ProcessDefinitionMapper.class);
		processInstanceMapper = getMapper(ProcessInstanceMapper.class);
		dataSourceMapper = getMapper(DataSourceMapper.class);
		@@ -1554,4 +1554,16 @@ public class ProcessDao extends AbstractBaseDao {
		DateUtils.dateToString(dateInterval.getEndTime()),
		stateArray);
		}

		/**
		* query user queue by process instance id
		* @param processInstanceId
		* @return
		*/
		public String queryQueueByProcessInstanceId(int processInstanceId){
		return userMapper.queryQueueByProcessInstanceId(processInstanceId);
		}



		}

escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapper.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -222,4 +222,13 @@ public interface UserMapper {
		})
		@SelectProvider(type = UserMapperProvider.class, method = "queryTenantCodeByUserId")
		User queryTenantCodeByUserId(@Param("userId") int userId);


		/**
		* query user queue by process instance id
		* @param processInstanceId
		* @return
		*/
		@SelectProvider(type = UserMapperProvider.class, method = "queryQueueByProcessInstanceId")
		String queryQueueByProcessInstanceId(@Param("processInstanceId") int processInstanceId);
		}