From 22ec4355183047d0e989346037d4cda6b23a8936 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:05 +0800
Subject: [PATCH] 开发8-26加班
---
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java | 2 +-
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java | 14 ++++++++++++++
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java | 2 +-
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java | 5 +----
user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java | 9 +++------
user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java | 4 ++++
6 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java
index 5f202d2..c5ad7c2 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
import java.util.Map;
/**
@@ -33,11 +34,7 @@
@ApiOperation("鏂板鐢ㄦ埛-->鑾峰彇鐢ㄦ埛鏉冮檺鍒楄〃")
@GetMapping("/list")
public Result<?> getUserRoleList(){
- //鏍规嵁token鑾峰彇鐢ㄦ埛淇℃伅
-// Map<String,Object> data = roleService.getUserRoleList();
-// if (data != null){
-// return Result.success(data);
-// }
- return Result.fail(202,"鐢ㄦ埛鐧诲綍淇℃伅鏃犳晥锛岃閲嶆柊鐧诲綍");
+ List<Map<String,Object>> data = roleService.getUserRoleList();
+ return Result.success(data);
}
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java
index c568112..1a24ca9 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java
@@ -29,7 +29,7 @@
@ApiModelProperty(value = "瑙掕壊id")
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "瑙掕壊鍚�")
private String name;
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
index f434599..d8e38a1 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
-import java.time.LocalDateTime;
import java.util.Date;
-import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -14,7 +12,6 @@
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -73,7 +70,7 @@
private Integer version;
@ApiModelProperty(value = "鍏宠仈 瑙掕壊id")
- private Integer roleId;
+ private Long roleId;
@ApiModelProperty(value = "鍏宠仈 浼佷笟id")
private Integer enterpriseId;
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java
index 954d9f4..dd75f80 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java
@@ -20,7 +20,7 @@
private String account;
@ApiModelProperty(value = "0锛氭棤鏉冮檺锛�1锛氭湁鏉冮檺", example = "1", required = true)
- private Integer role_id;
+ private Long role_id;
@ApiModelProperty(value = "骞撮緞", example = "23")
private Integer age;
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java
index f301dfb..75c12b5 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java
@@ -3,6 +3,9 @@
import com.yuanchu.limslaboratory.pojo.Role;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+import java.util.Map;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -13,4 +16,5 @@
*/
public interface RoleService extends IService<Role> {
+ List<Map<String,Object>> getUserRoleList();
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java
index ba4584e..2d91447 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java
@@ -1,10 +1,15 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yuanchu.limslaboratory.pojo.Role;
import com.yuanchu.limslaboratory.mapper.RoleMapper;
import com.yuanchu.limslaboratory.service.RoleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -17,4 +22,13 @@
@Service
public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
+ @Resource
+ private RoleMapper roleMapper;
+
+ @Override
+ public List<Map<String, Object>> getUserRoleList() {
+ LambdaQueryWrapper<Role> wrapper = new LambdaQueryWrapper<>();
+ wrapper.select(Role::getId, Role::getName);
+ return roleMapper.selectMaps(wrapper);
+ }
}
--
Gitblit v1.9.3