lims后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
XiaoRuby
2023-08-25 b0b77110b22827d453e9a1580906b3f53add19f9 
 user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java


@@ -8,11 +8,12 @@


import com.yuanchu.limslaboratory.mapper.UserMapper;


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.vo.NewPersonnelVo;


import com.yuanchu.limslaboratory.vo.PagePersonnelVo;


import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;


import org.springframework.beans.factory.annotation.Autowired;


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;




@@ -50,6 +51,7 @@


            }


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


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


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


            data.put("remind", remind);


            return data;


        }


@@ -75,8 +77,15 @@


    }




    @Override


    public List<User> selectUser() {


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


        return userMapper.selectUser();


    }




    @Override


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


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


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


        return userMapper.selectMaps(wrapper);


    }




    @Override


@@ -94,16 +103,13 @@




    @Override


    public Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId) {


        User user = new User()


                .setName(newPersonnelVo.getName())


                .setAccount(newPersonnelVo.getAccount())


                .setAge(newPersonnelVo.getAge())


                .setPhone(newPersonnelVo.getPhone())


                .setEmail(newPersonnelVo.getEmail())


                .setRoleId(newPersonnelVo.getRole_id())


                .setPassword(newPersonnelVo.getPassword())


                .setEnterpriseId(Integer.valueOf(enterpriseId));


        return userMapper.insert(user);


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


        }


    }




    @Override


@@ -111,7 +117,7 @@


        User user = new User()


                .setName(updatePersonnelVo.getName())


                .setAccount(updatePersonnelVo.getAccount())


                .setAge(updatePersonnelVo.getAge())


                .setAge(String.valueOf(updatePersonnelVo.getAge()))


                .setPhone(updatePersonnelVo.getPhone())


                .setEmail(updatePersonnelVo.getEmail())


                .setRoleId(updatePersonnelVo.getRole_id())


@@ -123,7 +129,8 @@


    }




    @Override


    public IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page) {


        return userMapper.getNewPersonnelPage(name, page);


    public IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page, Integer status) {


        MyUtil.PrintLog(name + status + "=============");


        return userMapper.getNewPersonnelPage(name, page, status);


    }


}