chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop

This commit is contained in:
chenxudong 2025-01-07 15:13:57 +08:00
parent 219908b0ba 8fe9b3e356
commit d738f72db7
4 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java
View File

@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@RequestMapping("/data/ed/user")
@RestController
@ -80,8 +81,8 @@ public class UserController {
@ApiOperation(value = "人员绑定", notes = "")
@RequestMapping(value = "/bindRoles", method = RequestMethod.POST)
public ElectromagneticResult<?> bindRoles(@RequestBody UserRoleRequest userRoleRequest) {
if (userService.bindRoles(userRoleRequest)) {
public ElectromagneticResult<?> bindRoles(@RequestBody List<UserBindRoleDTO> list) {
if (userService.bindRoles(list)) {
return ElectromagneticResultUtil.success(true);
} else {
return ElectromagneticResultUtil.fail("500", "不可绑定空用户");

12
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/UserRoleRequest.java
View File

@ -1,12 +0,0 @@
package com.electromagnetic.industry.software.manage.pojo.req;
import lombok.Data;
import java.util.List;
@Data
public class UserRoleRequest {
List<UserBindRoleDTO> bindData;
}

4
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserService.java
View File

@ -3,6 +3,8 @@ package com.electromagnetic.industry.software.manage.service;
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
import com.electromagnetic.industry.software.manage.pojo.req.*;
import java.util.List;
public interface UserService {
/**
@ -81,7 +83,7 @@ public interface UserService {
/**
* 人员绑定
*/
Boolean bindRoles(UserRoleRequest userRoleRequest);
Boolean bindRoles(List<UserBindRoleDTO> list);
/**
* 重置密码

6
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
View File

@ -274,11 +274,11 @@ public class UserServiceImpl implements UserService {
* 人员绑定
*/
@Override
public Boolean bindRoles(UserRoleRequest userRolesRequest) {
if (userRolesRequest == null || userRolesRequest.getBindData().isEmpty()) {
public Boolean bindRoles(List<UserBindRoleDTO> list) {
if (list == null || list.isEmpty()) {
throw new BizException(-1, "请勿发布空数据");
}
for (UserBindRoleDTO dto : userRolesRequest.getBindData()) {
for (UserBindRoleDTO dto : list) {
activeRole(dto);
bindRole(dto);
}