From ad158f6b0e3befbd70500a22489ef2cf64978b06 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 31 五月 2024 08:53:21 +0800
Subject: [PATCH] 修复标准库和下单
---
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 142 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 126 insertions(+), 16 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
index 4796942..805f6c4 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
@@ -1,48 +1,52 @@
package com.yuanchu.mom.service.impl;
-import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.dto.PersonDto;
import com.yuanchu.mom.dto.UserPageDto;
+import com.yuanchu.mom.exception.ErrorException;
+import com.yuanchu.mom.mapper.RoleMapper;
import com.yuanchu.mom.mapper.UserMapper;
+import com.yuanchu.mom.pojo.Custom;
import com.yuanchu.mom.pojo.User;
+import com.yuanchu.mom.service.CustomService;
import com.yuanchu.mom.service.UserService;
-import com.yuanchu.mom.utils.JackSonUtil;
-import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.utils.QueryWrappers;
-import com.yuanchu.mom.utils.ServletUtils;
-import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.DigestUtils;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
-@AllArgsConstructor
public class UserServiceImp implements UserService {
+ @Resource
UserMapper userMapper;
-
- Jwt jwt;
-
+ @Resource
private GetLook getLook;
+
+ @Resource
+ private RoleMapper roleMapper;
+
+ @Resource
+ private CustomService customService;
@Override
public User selectUserByPwd(String account, String password) {
QueryWrapper<User> wrapper = new QueryWrapper<>();
wrapper.eq("account", account).eq("password", DigestUtils.md5DigestAsHex(password.getBytes())).eq("state", 1);
List<User> list = userMapper.selectList(wrapper);
- return list.size()>0?list.get(0):null;
+ return list.size() > 0 ? list.get(0) : null;
}
//鏍规嵁鐢ㄦ埛id鏌ヨ鐢ㄦ埛鍚�
@@ -57,18 +61,47 @@
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(UserPageDto.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectUserList");
- if(map1.get("look")==1) user.setCreateUser(map1.get("userId"));
- map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
+ if (map1.get("look") == 1) user.setCreateUser(map1.get("userId"));
+ try{
+ if(user.getRoleId()>10000){
+ if(user.getRoleId()!=10001){
+ List<Integer> ids = roleMapper.getRoleByDepart(user.getRoleId());
+ user.setRoleId(null);
+ map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).in("role_id",ids)));
+ return map;
+ }else{
+ user.setRoleId(null);
+ map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
+ return map;
+ }
+ }
+ map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).eq("role_id", user.getRoleId())));
+ return map;
+ }catch (NullPointerException e){
+ map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
+ return map;
+ }
+ }
+
+ @Override
+ public Map<String, Object> selectPersonnelOverview(IPage<UserPageDto> page, UserPageDto user) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(UserPageDto.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectUserList");
+ if (map1.get("look") == 1) user.setCreateUser(map1.get("userId"));
+ map.put("body", userMapper.selectPersonnelOverview(page, QueryWrappers.queryWrappers(user)));
return map;
}
@Override
public int updateUser(User user) {
+ user.setDepartId("1," + user.getDepartId());
return userMapper.updateById(user);
}
@Override
public int addUser(User user) {
+ user.setDepartId("1");
return userMapper.insert(user);
}
@@ -76,4 +109,81 @@
public List<User> getUserMenu() {
return userMapper.selectList(Wrappers.<User>lambdaQuery().eq(User::getState, 1).select(User::getName, User::getId));
}
+
+ //鑾峰彇璁惧璐熻矗浜�
+ @Override
+ public List<User> getDeviceManager() {
+ return userMapper.getDeviceManager();
+ }
+
+ @Override
+ public User getUserNow() {
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
+ return userMapper.getCustom(map1.get("userId"));
+ }
+
+ @Override
+ public User getUserInfo() {
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
+ return userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map1.get("userId")).select(User::getId, User::getCompany, User::getName, User::getCode));
+ }
+
+ @Override
+ public int upUserPassword(String oldPassword, String newPassWord) {
+ Map<String, Integer> map = getLook.selectPowerByMethodAndUserId(null);
+ User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getId, map.get("userId")).eq(User::getPassword, DigestUtils.md5DigestAsHex(oldPassword.getBytes())).select(User::getId));
+ if (BeanUtil.isEmpty(user)) {
+ throw new ErrorException("瀵嗙爜涓嶆纭�");
+ }
+ user.setPassword(DigestUtils.md5DigestAsHex(newPassWord.getBytes()));
+ return userMapper.updateById(user);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int addPersonUser(PersonDto personDto) {
+ personDto.getPerson().forEach(person -> {
+ User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, person.getEmployeeID()));
+ String companyName = personDto.getCompany().stream().filter(a -> a.getCompanyId().equals(person.getCompanyId())).findFirst().get().getCompanyName();
+ Custom custom = customService.getCustomId(companyName);
+ if (BeanUtil.isEmpty(user)) {
+ user = new User();
+ user.setName(person.getName());
+ user.setNameEn("not write");
+ user.setAccount(person.getEmployeeID());
+ user.setPhone(person.getPhoneNumber());
+ user.setEmail(person.getCompanyEmail());
+ user.setIsCustom(person.getCompanyId().equals("SC2463") ? 0 : 1);
+// user.setPassword(DigestUtils.md5DigestAsHex(headerToken.getPassword(person.getEmployeeID()).getBytes()));
+ user.setPassword(DigestUtils.md5DigestAsHex("123456".getBytes()));
+ user.setCompany(BeanUtil.isNotEmpty(custom)?(custom.getId()+""):companyName);
+ user.setAddress("鏈～鍐�");
+ user.setRoleId(personDto.getRoleId()>10000?0:personDto.getRoleId());
+ userMapper.insert(user);
+ } else {
+ user.setName(person.getName());
+ user.setPhone(person.getPhoneNumber());
+ user.setEmail(person.getCompanyEmail());
+ user.setIsCustom(0);
+ user.setCompany(BeanUtil.isNotEmpty(custom)?(custom.getId()+""):companyName);
+ user.setCreateUser(null);
+ user.setCreateTime(null);
+ user.setUpdateUser(null);
+ user.setUpdateTime(null);
+ userMapper.updateById(user);
+ }
+ });
+ return 1;
+ }
+
+ @Override
+ public int upUserDepardLimsId(String ids, String id) {
+ List<Integer> userIds = JSON.parseArray(ids, Integer.class);
+ return userMapper.update(null, Wrappers.<User>lambdaUpdate().in(User::getId, userIds).set(User::getDepartLimsId, id).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
+ }
+
+ @Override
+ public int delUserDepardLimsId(Integer id) {
+ return userMapper.update(null, Wrappers.<User>lambdaUpdate().eq(User::getId, id).set(User::getDepartLimsId, null).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateUser, getLook.selectPowerByMethodAndUserId(null).get("userId")));
+ }
}
--
Gitblit v1.9.3