From e5de3cd39be1858161f4947c57c5a470fa128142 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 31 十二月 2025 15:41:55 +0800
Subject: [PATCH] 提交 登陆后多工序选择条件
---
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
index a035b9c..2c6666b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
@@ -2,12 +2,13 @@
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
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.*;
@@ -17,12 +18,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")
@@ -34,6 +31,9 @@
private final PermissionRoleMapper permissionRoleMapper;
private final ProductionSchedulingMapper productionSchedulingMapper;
+
+ @Autowired
+ LogService logService;
public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper, UserRoleMapper userRoleMapper, ProductionSchedulingMapper productionSchedulingMapper) {
this.userMapper = userMapper;
@@ -145,10 +145,22 @@
userDTO.setPass(null);
userDTO.setId(user.getId());
userDTO.setUserName(user.getUserName());
- userDTO.setAddress(user.getAddress());
+ List<String> list = JSON.parseObject(user.getAddress(), new TypeReference<List<String>>() {});
+ if(list!=null && list.size()==1){
+ userDTO.setAddress(list.get(0));
+ }else{
+ userDTO.setAddress(list);
+ }
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;
@@ -196,5 +208,39 @@
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);
+ }
+
}
+
--
Gitblit v1.8.0