Merge pull request #578 from urmyfaith/patch-1

648540858

2022-08-22 ecd14d6757eb12e66d7668eff509c10875abf855

 src/main/java/com/genersoft/iot/vmp/vmanager/user/RoleController.java

@@ -2,26 +2,21 @@

import com.genersoft.iot.vmp.conf.security.SecurityUtils;
import com.genersoft.iot.vmp.service.IRoleService;
import com.genersoft.iot.vmp.service.IUserService;
import com.genersoft.iot.vmp.storager.dao.dto.Role;
import com.genersoft.iot.vmp.storager.dao.dto.User;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.util.DigestUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

import java.text.SimpleDateFormat;
import java.util.List;

@Api(tags = "角色管理")
@Tag(name  = "角色管理")
@CrossOrigin
@RestController
@RequestMapping("/api/role")
@@ -30,14 +25,10 @@
    @Autowired
    private IRoleService roleService;

    private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

    @ApiOperation("添加角色")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "name", required = true, value = "角色名", dataTypeClass = String.class),
            @ApiImplicitParam(name = "authority", required = true, value = "权限（自行定义内容，目前未使用）", dataTypeClass = String.class),
    })
    @PostMapping("/add")
    @Operation(summary = "添加角色")
    @Parameter(name = "name", description = "角色名", required = true)
    @Parameter(name = "authority", description = "权限（自行定义内容，目前未使用）", required = true)
    public ResponseEntity<WVPResult<Integer>> add(@RequestParam String name,
                                                  @RequestParam(required = false) String authority){
        WVPResult<Integer> result = new WVPResult<>();
@@ -53,8 +44,8 @@
        Role role = new Role();
        role.setName(name);
        role.setAuthority(authority);
        role.setCreateTime(format.format(System.currentTimeMillis()));
        role.setUpdateTime(format.format(System.currentTimeMillis()));
        role.setCreateTime(DateUtil.getNow());
        role.setUpdateTime(DateUtil.getNow());

        int addResult = roleService.add(role);

@@ -64,11 +55,9 @@
        return new ResponseEntity<>(result, HttpStatus.OK);
    }

    @ApiOperation("删除角色")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", required = true, value = "用户Id", dataTypeClass = Integer.class),
    })
    @DeleteMapping("/delete")
    @Operation(summary = "删除角色")
    @Parameter(name = "id", description = "用户Id", required = true)
    public ResponseEntity<WVPResult<String>> delete(@RequestParam Integer id){
        // 获取当前登录用户id
        int currenRoleId = SecurityUtils.getUserInfo().getRole().getId();
@@ -86,9 +75,8 @@
        return new ResponseEntity<>(result, HttpStatus.OK);
    }

    @ApiOperation("查询角色")
    @ApiImplicitParams({})
    @GetMapping("/all")
    @Operation(summary = "查询角色")
    public ResponseEntity<WVPResult<List<Role>>> all(){
        // 获取当前登录用户id
        List<Role> allRoles = roleService.getAll();