From 8f8ba3c62d6fc9f4733a408daf59a5badd82e5e2 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 11:42:26 +0800
Subject: [PATCH] 开发8-25人员管理与组织架构对接完成
---
/dev/null | 41 --------------------
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java | 3 -
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 3 -
user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java | 23 +++++++++++
user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java | 3 -
sys/src/main/resources/application-dev.yml | 9 +---
user-server/src/main/resources/mapper/UserMapper.xml | 18 ++-------
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 3 -
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java | 4 +-
9 files changed, 36 insertions(+), 71 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java
index b694c53..56ca1fa 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java
@@ -40,8 +40,8 @@
Map<String, Object> map = new HashMap<>();
List<Map<String, Object>> mapData = new ArrayList<>();
map.put("children", mapList);
- map.put("value", 0);
- map.put("label", firstEnterpriseName);
+ map.put("id", 0);
+ map.put("department", firstEnterpriseName);
mapData.add(map);
return mapData;
}
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index 9e919d2..46a07a9 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -40,10 +40,8 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
-# username: user
- url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
- username: root
+ url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ username: user
password: 123456
druid:
# Druid鏁版嵁婧愰厤缃�
@@ -67,8 +65,7 @@
# redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
database: 0
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
-# host: 192.168.110.209
- host: localhost
+ host: 192.168.110.209
# redis绔彛锛堥粯璁や负6379锛�
port: 6380
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
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 0191900..5f202d2 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
@@ -1,9 +1,18 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.service.RoleService;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
/**
* <p>
@@ -13,8 +22,22 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-07
*/
+@Api(tags = "鐢ㄦ埛妯″潡")
@RestController
@RequestMapping("/role")
public class RoleController {
+ @Autowired
+ private RoleService roleService;
+
+ @ApiOperation("鏂板鐢ㄦ埛-->鑾峰彇鐢ㄦ埛鏉冮檺鍒楄〃")
+ @GetMapping("/list")
+ public Result<?> getUserRoleList(){
+ //鏍规嵁token鑾峰彇鐢ㄦ埛淇℃伅
+// Map<String,Object> data = roleService.getUserRoleList();
+// if (data != null){
+// return Result.success(data);
+// }
+ return Result.fail(202,"鐢ㄦ埛鐧诲綍淇℃伅鏃犳晥锛岃閲嶆柊鐧诲綍");
+ }
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
index 591a8d9..a01ef4c 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
@@ -11,7 +11,6 @@
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.utils.SpringUtil;
import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo;
import com.yuanchu.limslaboratory.vo.Result;
import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
import io.swagger.annotations.*;
@@ -137,7 +136,7 @@
@ApiImplicitParam(name = "status", value = "鍦ㄨ亴鐘舵��", dataTypeClass = Integer.class)
})
public Result<Map<String, Object>> getNewPersonnelPage(Integer pageNo, Integer pageSize, String name, Integer status) {
- IPage<PagePersonnelVo> PageList = userService.getNewPersonnelPage(name, new Page<Objects>(pageNo, pageSize), status);
+ IPage<Map<String, Object>> PageList = userService.getNewPersonnelPage(name, new Page<Objects>(pageNo, pageSize), status);
Map<String, Object> map = new HashMap<>();
map.put("row", PageList.getRecords());
map.put("total", PageList.getTotal());
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
index 357dc53..27aa78b 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo;
import java.util.List;
import java.util.Map;
@@ -20,7 +19,7 @@
public interface UserMapper extends BaseMapper<User> {
Map<String, String> selectUserByUserId(int userId);
- IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page, Integer status);
+ IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status);
List<Map<String,Object>> selectUser();
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PagePersonnelVo.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PagePersonnelVo.java
deleted file mode 100644
index 5e92b47..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PagePersonnelVo.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.yuanchu.limslaboratory.pojo.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="UpdatePersonnelVo瀵硅薄", description="鐢ㄤ簬瀵硅鑹茬鐞嗙殑鏇存柊")
-public class PagePersonnelVo {
-
- @ApiModelProperty(value = "涓婚敭ID", example = "1", required = true)
- private String id;
-
- @ApiModelProperty(value = "濮撳悕", example = "灏忛粦", required = true)
- private String username;
-
- @ApiModelProperty(value = "瑙掕壊鏉冮檺", example = "灏忛粦", required = true)
- private String roleName;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
- private Date createTime;
-
- @ApiModelProperty(value = "骞撮緞", example = "23")
- private String age;
-
- @ApiModelProperty(value = "鎵嬫満鍙�", example = "12345678981")
- private String phone;
-
- @ApiModelProperty(value = "閭", example = "12345678@qq.com")
- private String email;
-
- @ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 姝ｅ父>=1,绂昏亴<=0", example = "0")
- private Integer jobState;
-
- private String department;
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
index 6eb8904..3b7a54e 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
@@ -5,7 +5,6 @@
import com.yuanchu.limslaboratory.pojo.User;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo;
import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
import java.util.List;
@@ -50,7 +49,7 @@
* @param page
* @return
*/
- IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page, Integer status);
+ IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status);
/**
* 鐧诲綍鑾峰彇鐢ㄦ埛鍩烘湰淇℃伅涓庣郴缁熻秴鏃舵椂闂存彁閱�
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index 794b6ab..f18693f 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -12,7 +12,6 @@
import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo;
import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -129,7 +128,7 @@
}
@Override
- public IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page, Integer status) {
+ public IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status) {
MyUtil.PrintLog(name + status + "=============");
return userMapper.getNewPersonnelPage(name, page, status);
}
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 98d4d25..039f57c 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -17,20 +17,10 @@
AND u.id = #{userId}
</select>
- <resultMap id="PagePersonnelVoMap" type="com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo">
- <result property="id" column="id"/>
- <result property="username" column="username"/>
- <result property="roleName" column="roleName"/>
- <result property="createTime" column="create_time"/>
- <result property="age" column="age"/>
- <result property="phone" column="phone"/>
- <result property="email" column="email"/>
- <result property="jobState" column="job_state"/>
- <result property="department" column="department"/>
- </resultMap>
- <select id="getNewPersonnelPage" resultMap="PagePersonnelVoMap">
- SELECT u.`id`, u.`name` username, r.`name` roleName, u.`create_time`, u.`age`,
- u.`phone`, u.`email`, u.`job_state`, o.`department`
+
+ <select id="getNewPersonnelPage" resultType="map">
+ SELECT u.`id`, u.`name` username, r.`name` roleName, DATE_FORMAT(u.`create_time`, '%Y-%m-%d') createTime, u.`age`,
+ u.`phone`, u.`email`, u.`job_state` jobState, o.`department`, u.`account`, o.`id` departmentId
FROM `user` u
LEFT JOIN role r
ON u.`role_id` = r.`id` AND r.`state` = 1
--
Gitblit v1.9.3