ERP_override.git

			@@ -5,10 +5,10 @@
			import com.baomidou.dynamic.datasource.annotation.DS;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.example.erp.controller.dto.UserDTO;
			import com.example.erp.entity.userInfo.PermissionBasic;
			import com.example.erp.entity.userInfo.Log;
			import com.example.erp.entity.userInfo.Role;
			import com.example.erp.entity.userInfo.SysError;
			import com.example.erp.entity.userInfo.User;
			import com.example.erp.mapper.pp.ProductionSchedulingMapper;
			import com.example.erp.mapper.userInfo.*;
			import com.example.erp.tools.TokenTools;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -16,12 +16,8 @@
			import org.springframework.cache.annotation.Cacheable;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.transaction.interceptor.TransactionAspectSupport;

			import java.util.Collections;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.*;

			@Service
			@DS("user_info")
			@@ -32,12 +28,17 @@
			private final UserRoleMapper userRoleMapper;

			private final PermissionRoleMapper permissionRoleMapper;
			private final ProductionSchedulingMapper productionSchedulingMapper;

			public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper, UserRoleMapper userRoleMapper) {
			@Autowired
			LogService logService;

			public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper, UserRoleMapper userRoleMapper, ProductionSchedulingMapper productionSchedulingMapper) {
			this.userMapper = userMapper;
			this.roleMapper = roleMapper;
			this.permissionRoleMapper = permissionRoleMapper;
			this.userRoleMapper = userRoleMapper;
			this.productionSchedulingMapper = productionSchedulingMapper;
			}


			@@ -146,6 +147,13 @@
			userDTO.setToken(StpUtil.getTokenValue());
			Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId());
			userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));

			Log log = new Log();
			log.setOperator(user.getUserName());
			log.setOperatorId(userDTO.getUserId());
			log.setContent(userDTO.toString());
			log.setFunction("用户登录");
			logService.saveLog(log);
			return userDTO;
			}else{
			return null;
			@@ -183,5 +191,49 @@

			return userMapper.userDelete(id);
			}

			public Map<String, Object> selectProcessSv() {
			Map<String, Object> map = new HashMap<>();
			map.put("process", productionSchedulingMapper.selectProcess());
			return map;
			}

			public Boolean updateProcessSv(Integer id, String process) {
			return userMapper.updateProcessMp(id,process);
			}

			public Object findByAddress(Map<String,String> userName) {
			if(Objects.equals(userName.get("userName"), "")){
			userName.put("userName", null) ;
			}
			List<User> users = userMapper.findByAddress(userName.get("userName"));
			List<Map<String,Object>> userList = new ArrayList<>();
			users.forEach(user -> {
			Map<String,Object> userMap = new HashMap<>();
			userMap.put("value", user.getLoginName());
			userMap.put("text", user.getUserName());
			userList.add(userMap);
			});
			Map<String,List<Object>> map = new HashMap<>();

			map.put("users", Collections.singletonList(userList));
			return map;
			}

			public Object getUserLog() {
			Map<String, Object> map = new HashMap<>();
			map.put("data", userMapper.getUserLog());
			return map;
			}


			//查询用户优化参数
			public String getOptimizeParms(String username) {
			// 获取当前登录用户

			return userMapper.selectOptimizeParmsById(username);
			}

			}