|
@@ -48,6 +48,9 @@ import tk.mybatis.mapper.weekend.Weekend;
|
|
|
import tk.mybatis.mapper.weekend.WeekendCriteria;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import java.io.BufferedReader;
|
|
|
+import java.io.FileReader;
|
|
|
+import java.io.IOException;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -61,39 +64,39 @@ import java.util.stream.Collectors;
|
|
|
@Slf4j
|
|
|
public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser, SysUserDTO> implements SysUserService {
|
|
|
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private SysRoleService sysRoleService;
|
|
|
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private SysMenuService sysMenuService;
|
|
|
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private SysUserRoleService sysUserRoleService;
|
|
|
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private CacheManager cacheManager;
|
|
|
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private RedisTemplate redisTemplate;
|
|
|
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private SysUserDeptService sysUserDeptService;
|
|
|
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private VerifyCodeService verifyCodeService;
|
|
|
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private SysDeptRelationMapper sysDeptRelationMapper;
|
|
|
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private SysDeptService sysDeptService;
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private SysDeptMapper deptMapper;
|
|
|
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private ActivitiBusinessService activitiBusinessService;
|
|
|
|
|
|
- @Autowired
|
|
|
+ @Resource
|
|
|
private SysDeptManagerMapper sysDeptManagerMapper;
|
|
|
|
|
|
@Resource
|
|
@@ -492,7 +495,15 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
|
|
|
public MyPage<SysUserVO> selectVOPageInfo(SysUserDTO record, int pageNum, int pageSize) {
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
List<SysUserVO> sysUserDTOList = mapper.selectVOByKeyword(record);
|
|
|
- return new MyPage<>(sysUserDTOList);
|
|
|
+ MyPage<SysUserVO> pageInfos = new MyPage<>(sysUserDTOList);
|
|
|
+ if(pageInfos != null && pageInfos.getRows() != null && pageInfos.getRows().size() > 0){
|
|
|
+ for(SysUserVO vo : pageInfos.getRows()){
|
|
|
+ // 获取部门和角色
|
|
|
+ vo.setRoleName(sysUserRoleService.selectRoleName(vo.getUserId()));
|
|
|
+ vo.setDeptName(sysDeptService.getModelById(vo.getDept()).getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return pageInfos;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -845,4 +856,30 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
|
|
|
public List<SysUserVO> getUserByRoleOrDept(SysUserDTO model) {
|
|
|
return mapper.getRepairUsers(model);
|
|
|
}
|
|
|
+
|
|
|
+ public static void main(String[] args) throws Exception{
|
|
|
+ String fileName = "C:\\Users\\Administrator\\Desktop\\menu.txt";
|
|
|
+ try (BufferedReader reader = new BufferedReader(new FileReader(fileName))) {
|
|
|
+ String line;
|
|
|
+ while ((line = reader.readLine()) != null) {
|
|
|
+ String[] arr = line.split("\t");
|
|
|
+ StringBuilder sql = new StringBuilder();
|
|
|
+ sql.append("INSERT INTO `t_project` (id,no,name,parent_id,type,flag,fzr) VALUES ('");
|
|
|
+ sql.append(IdGeneratorUtils.getObjectId()).append("','");
|
|
|
+ sql.append(arr[0]).append("','");
|
|
|
+ sql.append(arr[1]).append("','");
|
|
|
+ sql.append("64d1aa12c4e0f44a08e34d28").append("','");
|
|
|
+ sql.append(2).append("',");
|
|
|
+ sql.append(1).append(",'");
|
|
|
+ if("空".equals(arr[4])){
|
|
|
+ sql.append("');");
|
|
|
+ }else{
|
|
|
+ sql.append(arr[4]).append("');");
|
|
|
+ }
|
|
|
+ System.out.println(sql.toString());
|
|
|
+ }
|
|
|
+ } catch (IOException e) {
|
|
|
+ System.out.println("Error reading file: " + e.getMessage());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|