XMPoleManager.git

			@@ -6,6 +6,7 @@
			import com.github.pagehelper.PageHelper;
			import com.sandu.common.domain.ResponseVO;
			import com.sandu.common.enums.ResponseStatusEnums;
			import com.sandu.common.execption.BusinessException;
			import com.sandu.common.log.Log;
			import com.sandu.common.object.BaseConditionVO;
			import com.sandu.common.security.LoginUserInfo;
			@@ -15,12 +16,16 @@
			import com.sandu.common.util.IpUtil;
			import com.sandu.common.util.ResponseUtil;
			import com.sandu.ximon.admin.dto.ClientDto;
			import com.sandu.ximon.admin.param.*;
			import com.sandu.ximon.admin.param.AddClientPrarm;
			import com.sandu.ximon.admin.param.AdminLoginParam;
			import com.sandu.ximon.admin.param.UpdateClientPrarm;
			import com.sandu.ximon.admin.param.UserPwsParm;
			import com.sandu.ximon.admin.security.PermissionConfig;
			import com.sandu.ximon.admin.security.SecurityUtils;
			import com.sandu.ximon.admin.service.ClientRoleRelationService;
			import com.sandu.ximon.admin.service.ClientService;
			import com.sandu.ximon.admin.service.RoleService;
			import com.sandu.ximon.admin.utils.RedisUtils;
			import com.sandu.ximon.dao.domain.Client;
			import com.sandu.ximon.dao.domain.ClientRoleRelation;
			import com.sandu.ximon.dao.enums.AdministratorEnums;
			@@ -31,6 +36,7 @@
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;

			import javax.servlet.http.HttpServletRequest;
			import java.time.LocalDateTime;
			import java.util.*;
			import java.util.stream.Collectors;
			@@ -53,6 +59,9 @@

			@PostMapping("/add")
			public ResponseVO<Object> addClient(@RequestBody @Validated AddClientPrarm addClientPrarm) {
			if (!permissionConfig.check(MenuEnum.CLIENT_ADD.getCode())) {
			return ResponseUtil.fail("缺少对应用户权限");
			}
			boolean b = clientService.addClient(addClientPrarm);
			if (b) {
			return ResponseUtil.success("添加成功");
			@@ -64,6 +73,9 @@

			@PostMapping("/update/{id}")
			public ResponseVO<Object> updateClient(@PathVariable Long id, @RequestBody @Validated UpdateClientPrarm updateClientPrarm) {
			if (!permissionConfig.check(MenuEnum.CLIENT_INFO_UPDATE.getCode())) {
			return ResponseUtil.fail("缺少对应用户权限");
			}
			boolean b = clientService.updateClient(id, updateClientPrarm);
			if (b) {
			return ResponseUtil.success("更新成功");
			@@ -78,17 +90,37 @@
			@Log("修改普通用户的密码")
			@PostMapping("/updateClientPassword")
			public ResponseVO<Object> updateClientPassword(@Validated @RequestBody UserPwsParm param) {
			boolean result = clientService.updateAdminPassword(param);
			boolean result;

			//超管直接修改
			if (SecurityUtils.getUserDetails().getAdministratorType().equals(AdministratorEnums.ADMIN.getCode())) {
			result = clientService.updateAdminPassword(param);
			} else {
			//当前登录账号ID
			Long userId = SecurityUtils.getUserId();
			//要修要密码的用户的上级ID
			Client client = clientService.getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, param.getUserid()));
			//为其下属才能修改
			if (client != null && userId.equals(client.getSuperiorId())) {
			result = clientService.updateAdminPassword(param);
			} else {
			throw new BusinessException("非超级管理员或该用户不是您下属用户，无法修改密码！");
			}
			}

			if (result) {
			return ResponseUtil.success("修改成功");
			} else {
			return ResponseUtil.fail("修改失败");
			}

			}

			@PostMapping("/delete/{id}")
			public ResponseVO<Object> deleteClient(@PathVariable Long id) {
			if (!permissionConfig.check(MenuEnum.CLIENT_DELETE.getCode())) {
			return ResponseUtil.fail("缺少对应用户权限");
			}
			boolean b = clientService.deleteClient(id);
			if (b) {
			return ResponseUtil.success("删除成功");
			@@ -105,13 +137,15 @@

			PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
			LambdaQueryWrapper<Client> wrapper = Wrappers.lambdaQuery(Client.class);
			if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
			wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId());
			if (AdministratorEnums.NORMAL.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
			wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId()).or(w -> w.eq(
			Client::getId, SecurityUtils.getUserId()
			));
			}
			if (keyword != null && !keyword.isEmpty()) {
			wrapper.like(Client::getClientName, keyword)
			.or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile, keyword))
			.or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan, keyword));
			.or(w1 -> w1.like(Client::getMobile, keyword))
			.or(w2 -> w2.like(Client::getLinkMan, keyword));
			}
			List<Client> clientList = clientService.list(wrapper);
			List<ClientDto> clientDtoList = new ArrayList<>();
			@@ -133,11 +167,17 @@

			@AnonymousAccess
			@PostMapping(value = "/login")
			public ResponseVO<Object> longin(@RequestBody @Validated AdminLoginParam loginParam) {
			public ResponseVO<Object> longin(HttpServletRequest request, @RequestBody @Validated AdminLoginParam loginParam) {
			Client client = clientService.getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, loginParam.getUsername()).last("limit 1"));
			if (client == null) {
			return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
			}
			String s = RedisUtils.getBean().get(loginParam.getKey());
			System.out.println(s+"===========================");
			if (!loginParam.getVlue().equals(s)) {
			return ResponseUtil.error(ResponseStatusEnums.BAD_AUTHENTICATION.getCode(), ResponseStatusEnums.BAD_AUTHENTICATION.getMessage());
			}
			RedisUtils.getBean().delete(loginParam.getKey());
			if (!passwordEncoder.matches(loginParam.getPassword(), client.getPassword())) {
			return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
			}