lims后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
value
2023-09-06 8ce578f52d2dc071beb043560baded7803787f07 
 user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java


@@ -4,18 +4,19 @@


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.baomidou.mybatisplus.core.metadata.IPage;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.yuanchu.limslaboratory.mapper.RoleManageMapper;


import com.yuanchu.limslaboratory.mapper.UserMapper;


import com.yuanchu.limslaboratory.pojo.RoleMenu;


import com.yuanchu.limslaboratory.pojo.User;


import com.yuanchu.limslaboratory.mapper.UserMapper;


import com.yuanchu.limslaboratory.pojo.dto.RoleAndMenuDto;


import com.yuanchu.limslaboratory.service.UserService;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.yuanchu.limslaboratory.utils.JackSonUtil;


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.UpdatePersonnelVo;


import com.yuanchu.limslaboratory.service.UserService;


import com.yuanchu.limslaboratory.utils.JackSonUtil;


import com.yuanchu.limslaboratory.utils.JsonUtil;


import com.yuanchu.limslaboratory.utils.MyUtil;


import com.yuanchu.limslaboratory.utils.RedisUtil;


import org.springframework.stereotype.Service;


import org.springframework.util.ObjectUtils;




@@ -49,21 +50,13 @@


        Object obj = RedisUtil.get(token);


        if (!ObjectUtils.isEmpty(obj)){


            Map loginUser = (Map) obj;


            Map map = (Map)loginUser.get("data");


            Object residualTime = map.get("residualTime");


            int i = Integer.parseInt(residualTime.toString());


            String remind = null;


            if (i <= 30) {


                remind = "您所使用的系统即将过期！请联系管理员！";


            }


            Map<String, Object> data = new HashMap<>();


            data.put("name",loginUser.get("name"));


            data.put("account", loginUser.get("account"));


            data.put("id",loginUser.get("id"));


            data.put("remind", remind);


            data.put("roleId",loginUser.get("roleId"));


            data.put("sessionLayerId",loginUser.get("sessionLayerId"));


            RoleAndMenuDto role = getRoleInfo(Long.valueOf(String.valueOf(loginUser.get("roleId"))));


            System.out.println("+++++++++++++++++++++++++++++++++++++++++++++");


            System.out.println(role);


            System.out.println("++++++++++++++++++++++++++++++++++++++++++++++");


            data.put("role",role);


            return data;


        }


@@ -94,10 +87,16 @@


    }




    @Override


    public List<Map<String, Object>> getUserNameAndId() {


    public List<Map<String, Object>>


    getUserNameAndId() {


        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();


        wrapper.select(User::getId, User::getName);


        wrapper.select(User::getId, User::getName).eq(User::getType,1);


        return userMapper.selectMaps(wrapper);


    }




    @Override


    public RoleAndMenuDto getUserRoleInfo(String token) {


        return null;


    }




    @Override


@@ -115,13 +114,9 @@




    @Override


    public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId) {


        try {


            User unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(newPersonnelVo), User.class);


            unmarshal.setEnterpriseId(Integer.valueOf(enterpriseId));


            return userMapper.insert(unmarshal);


        } catch (Exception e) {


            throw new RuntimeException(e);


        }


        User unmarshal = JsonUtil.jsonToPojo(JsonUtil.jsonToString(newPersonnelVo), User.class);


        unmarshal.setEnterpriseId(Integer.valueOf(enterpriseId));


        return userMapper.insert(unmarshal);


    }




    @Override


@@ -145,6 +140,9 @@






    public RoleAndMenuDto getRoleInfo(Long roleId) {


        if(roleId==0){


            return null;


        }


        RoleAndMenuDto roleAndMenuDto = roleManageMapper.selectAllRoleAndMenuByRoleId(roleId);


        List<RoleMenu> collect = roleAndMenuDto.getRoleMenuList()


                .stream()