开发8-25人员管理与组织架构对接完成

XiaoRuby

2023-08-26 8f8ba3c62d6fc9f4733a408daf59a5badd82e5e2

开发8-25人员管理与组织架构对接完成

 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;
    }

 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访问密码（默认为空）

 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,"用户登录信息无效，请重新登录");
    }
}

 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());

 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();


 user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PagePersonnelVo.java

ÎļþÒÑɾ³ý

 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);

    /**
     * ç™»å½•èŽ·å–用户基本信息与系统超时时间提醒

 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);
    }

 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