|
|
|
@ -25,6 +25,7 @@ import org.jeecg.modules.system.model.SysDepartTreeModel;
|
|
|
|
import org.jeecg.modules.system.service.ISysDepartService;
|
|
|
|
import org.jeecg.modules.system.service.ISysDepartService;
|
|
|
|
import org.jeecg.modules.system.service.ISysUserDepartService;
|
|
|
|
import org.jeecg.modules.system.service.ISysUserDepartService;
|
|
|
|
import org.jeecg.modules.system.service.ISysUserService;
|
|
|
|
import org.jeecg.modules.system.service.ISysUserService;
|
|
|
|
|
|
|
|
import org.jeecg.modules.system.vo.SysDepartExportVo;
|
|
|
|
import org.jeecg.modules.system.vo.lowapp.ExportDepartVo;
|
|
|
|
import org.jeecg.modules.system.vo.lowapp.ExportDepartVo;
|
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
|
|
@ -350,25 +351,34 @@ public class SysDepartController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
// Step.1 组装查询条件
|
|
|
|
//update-begin---author:wangshuai---date:2023-10-19---for:【QQYUN-5482】系统的部门导入导出也可以改成敲敲云模式的部门路径---
|
|
|
|
QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, request.getParameterMap());
|
|
|
|
//// Step.1 组装查询条件
|
|
|
|
//Step.2 AutoPoi 导出Excel
|
|
|
|
//QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, request.getParameterMap());
|
|
|
|
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
|
|
|
//Step.1 AutoPoi 导出Excel
|
|
|
|
List<SysDepart> pageList = sysDepartService.list(queryWrapper);
|
|
|
|
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
|
|
|
|
|
|
|
//List<SysDepart> pageList = sysDepartService.list(queryWrapper);
|
|
|
|
//按字典排序
|
|
|
|
//按字典排序
|
|
|
|
Collections.sort(pageList, new Comparator<SysDepart>() {
|
|
|
|
//Collections.sort(pageList, new Comparator<SysDepart>() {
|
|
|
|
@Override
|
|
|
|
//@Override
|
|
|
|
public int compare(SysDepart arg0, SysDepart arg1) {
|
|
|
|
//public int compare(SysDepart arg0, SysDepart arg1) {
|
|
|
|
return arg0.getOrgCode().compareTo(arg1.getOrgCode());
|
|
|
|
//return arg0.getOrgCode().compareTo(arg1.getOrgCode());
|
|
|
|
}
|
|
|
|
//}
|
|
|
|
});
|
|
|
|
//});
|
|
|
|
|
|
|
|
//step.2 组装导出数据
|
|
|
|
|
|
|
|
List<SysDepartExportVo> sysDepartExportVos = sysDepartService.getExportDepart(sysDepart.getTenantId());
|
|
|
|
//导出文件名称
|
|
|
|
//导出文件名称
|
|
|
|
mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表");
|
|
|
|
mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表");
|
|
|
|
mv.addObject(NormalExcelConstants.CLASS, SysDepart.class);
|
|
|
|
mv.addObject(NormalExcelConstants.CLASS, SysDepartExportVo.class);
|
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("部门列表数据", "导出人:"+user.getRealname(), "导出信息"));
|
|
|
|
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("导入规则：\n" +
|
|
|
|
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
|
|
|
|
"1、标题为第三行，部门路径和部门名称的标题不允许修改，否则会匹配失败；第四行为数据填写范围;\n" +
|
|
|
|
return mv;
|
|
|
|
"2、部门路径用英文字符/分割，部门名称为部门路径的最后一位;\n" +
|
|
|
|
|
|
|
|
"3、部门从一级名称开始创建，如果有同级就需要多添加一行，如研发部/研发一部;研发部/研发二部;\n" +
|
|
|
|
|
|
|
|
"4、自定义的部门编码需要满足规则才能导入。如一级部门编码为A01,那么子部门为A01A01,同级子部门为A01A02,编码固定为三位，首字母为A-Z,后两位为数字0-99，依次递增;", "导出人:"+user.getRealname(), "导出信息"));
|
|
|
|
|
|
|
|
mv.addObject(NormalExcelConstants.DATA_LIST, sysDepartExportVos);
|
|
|
|
|
|
|
|
//update-end---author:wangshuai---date:2023-10-19---for:【QQYUN-5482】系统的部门导入导出也可以改成敲敲云模式的部门路径---
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return mv;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@ -386,7 +396,8 @@ public class SysDepartController {
|
|
|
|
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
|
|
|
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
|
|
|
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
|
|
|
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
|
|
|
List<String> errorMessageList = new ArrayList<>();
|
|
|
|
List<String> errorMessageList = new ArrayList<>();
|
|
|
|
List<SysDepart> listSysDeparts = null;
|
|
|
|
//List<SysDepart> listSysDeparts = null;
|
|
|
|
|
|
|
|
List<SysDepartExportVo> listSysDeparts = null;
|
|
|
|
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
|
|
|
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
|
|
|
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
|
|
|
|
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
|
|
|
|
// 获取上传文件对象
|
|
|
|
// 获取上传文件对象
|
|
|
|
@ -396,51 +407,59 @@ public class SysDepartController {
|
|
|
|
params.setHeadRows(1);
|
|
|
|
params.setHeadRows(1);
|
|
|
|
params.setNeedSave(true);
|
|
|
|
params.setNeedSave(true);
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
// orgCode编码长度
|
|
|
|
//update-begin---author:wangshuai---date:2023-10-20---for: 注释掉原来的导入部门的逻辑---
|
|
|
|
int codeLength = YouBianCodeUtil.ZHANWEI_LENGTH;
|
|
|
|
// // orgCode编码长度
|
|
|
|
listSysDeparts = ExcelImportUtil.importExcel(file.getInputStream(), SysDepart.class, params);
|
|
|
|
// int codeLength = YouBianCodeUtil.ZHANWEI_LENGTH;
|
|
|
|
//按长度排序
|
|
|
|
// listSysDeparts = ExcelImportUtil.importExcel(file.getInputStream(), SysDepart.class, params);
|
|
|
|
Collections.sort(listSysDeparts, new Comparator<SysDepart>() {
|
|
|
|
// //按长度排序
|
|
|
|
@Override
|
|
|
|
// Collections.sort(listSysDeparts, new Comparator<SysDepart>() {
|
|
|
|
public int compare(SysDepart arg0, SysDepart arg1) {
|
|
|
|
// @Override
|
|
|
|
return arg0.getOrgCode().length() - arg1.getOrgCode().length();
|
|
|
|
// public int compare(SysDepart arg0, SysDepart arg1) {
|
|
|
|
}
|
|
|
|
// return arg0.getOrgCode().length() - arg1.getOrgCode().length();
|
|
|
|
});
|
|
|
|
// }
|
|
|
|
|
|
|
|
// });
|
|
|
|
int num = 0;
|
|
|
|
//
|
|
|
|
for (SysDepart sysDepart : listSysDeparts) {
|
|
|
|
// int num = 0;
|
|
|
|
String orgCode = sysDepart.getOrgCode();
|
|
|
|
// for (SysDepart sysDepart : listSysDeparts) {
|
|
|
|
if(orgCode.length() > codeLength) {
|
|
|
|
// String orgCode = sysDepart.getOrgCode();
|
|
|
|
String parentCode = orgCode.substring(0, orgCode.length()-codeLength);
|
|
|
|
// if(orgCode.length() > codeLength) {
|
|
|
|
QueryWrapper<SysDepart> queryWrapper = new QueryWrapper<SysDepart>();
|
|
|
|
// String parentCode = orgCode.substring(0, orgCode.length()-codeLength);
|
|
|
|
queryWrapper.eq("org_code", parentCode);
|
|
|
|
// QueryWrapper<SysDepart> queryWrapper = new QueryWrapper<SysDepart>();
|
|
|
|
try {
|
|
|
|
// queryWrapper.eq("org_code", parentCode);
|
|
|
|
SysDepart parentDept = sysDepartService.getOne(queryWrapper);
|
|
|
|
// try {
|
|
|
|
if(!parentDept.equals(null)) {
|
|
|
|
// SysDepart parentDept = sysDepartService.getOne(queryWrapper);
|
|
|
|
sysDepart.setParentId(parentDept.getId());
|
|
|
|
// if(!parentDept.equals(null)) {
|
|
|
|
//更新父级部门不是叶子结点
|
|
|
|
// sysDepart.setParentId(parentDept.getId());
|
|
|
|
sysDepartService.updateIzLeaf(parentDept.getId(),CommonConstant.NOT_LEAF);
|
|
|
|
// //更新父级部门不是叶子结点
|
|
|
|
} else {
|
|
|
|
// sysDepartService.updateIzLeaf(parentDept.getId(),CommonConstant.NOT_LEAF);
|
|
|
|
sysDepart.setParentId("");
|
|
|
|
// } else {
|
|
|
|
}
|
|
|
|
// sysDepart.setParentId("");
|
|
|
|
}catch (Exception e) {
|
|
|
|
// }
|
|
|
|
//没有查找到parentDept
|
|
|
|
// }catch (Exception e) {
|
|
|
|
}
|
|
|
|
// //没有查找到parentDept
|
|
|
|
}else{
|
|
|
|
// }
|
|
|
|
sysDepart.setParentId("");
|
|
|
|
// }else{
|
|
|
|
}
|
|
|
|
// sysDepart.setParentId("");
|
|
|
|
//update-begin---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------
|
|
|
|
// }
|
|
|
|
sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+"");
|
|
|
|
// //update-begin---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------
|
|
|
|
//update-end---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------
|
|
|
|
// sysDepart.setOrgType(sysDepart.getOrgCode().length()/codeLength+"");
|
|
|
|
sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
|
|
|
|
// //update-end---author:liusq Date:20210223 for：批量导入部门以后，不能追加下一级部门 #2245------------
|
|
|
|
//update-begin---author:wangshuai ---date:20220105 for：[JTC-363]部门导入 机构类别没有时导入失败，赋默认值------------
|
|
|
|
// sysDepart.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
|
|
|
|
if(oConvertUtils.isEmpty(sysDepart.getOrgCategory())){
|
|
|
|
// //update-begin---author:wangshuai ---date:20220105 for：[JTC-363]部门导入 机构类别没有时导入失败，赋默认值------------
|
|
|
|
sysDepart.setOrgCategory("1");
|
|
|
|
// if(oConvertUtils.isEmpty(sysDepart.getOrgCategory())){
|
|
|
|
}
|
|
|
|
// sysDepart.setOrgCategory("1");
|
|
|
|
//update-end---author:wangshuai ---date:20220105 for：[JTC-363]部门导入 机构类别没有时导入失败，赋默认值------------
|
|
|
|
// }
|
|
|
|
ImportExcelUtil.importDateSaveOne(sysDepart, ISysDepartService.class, errorMessageList, num, CommonConstant.SQL_INDEX_UNIQ_DEPART_ORG_CODE);
|
|
|
|
// //update-end---author:wangshuai ---date:20220105 for：[JTC-363]部门导入 机构类别没有时导入失败，赋默认值------------
|
|
|
|
num++;
|
|
|
|
// ImportExcelUtil.importDateSaveOne(sysDepart, ISysDepartService.class, errorMessageList, num, CommonConstant.SQL_INDEX_UNIQ_DEPART_ORG_CODE);
|
|
|
|
}
|
|
|
|
// num++;
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
//update-end---author:wangshuai---date:2023-10-20---for: 注释掉原来的导入部门的逻辑---
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//update-begin---author:wangshuai---date:2023-10-19---for:【QQYUN-5482】系统的部门导入导出也可以改成敲敲云模式的部门路径---
|
|
|
|
|
|
|
|
listSysDeparts = ExcelImportUtil.importExcel(file.getInputStream(), SysDepartExportVo.class, params);
|
|
|
|
|
|
|
|
sysDepartService.importSysDepart(listSysDeparts,errorMessageList);
|
|
|
|
|
|
|
|
//update-end---author:wangshuai---date:2023-10-19---for:【QQYUN-5482】系统的部门导入导出也可以改成敲敲云模式的部门路径---
|
|
|
|
|
|
|
|
|
|
|
|
//清空部门缓存
|
|
|
|
//清空部门缓存
|
|
|
|
Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*");
|
|
|
|
Set keys3 = redisTemplate.keys(CacheConstant.SYS_DEPARTS_CACHE + "*");
|
|
|
|
Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*");
|
|
|
|
Set keys4 = redisTemplate.keys(CacheConstant.SYS_DEPART_IDS_CACHE + "*");
|
|
|
|
@ -544,7 +563,7 @@ public class SysDepartController {
|
|
|
|
* @return
|
|
|
|
* @return
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@RequestMapping(value = "/queryByIds", method = RequestMethod.GET)
|
|
|
|
@RequestMapping(value = "/queryByIds", method = RequestMethod.GET)
|
|
|
|
public Result<Collection<SysDepart>> queryByIds(@RequestParam String deptIds) {
|
|
|
|
public Result<Collection<SysDepart>> queryByIds(@RequestParam(name = "deptIds") String deptIds) {
|
|
|
|
Result<Collection<SysDepart>> result = new Result<>();
|
|
|
|
Result<Collection<SysDepart>> result = new Result<>();
|
|
|
|
String[] ids = deptIds.split(",");
|
|
|
|
String[] ids = deptIds.split(",");
|
|
|
|
Collection<String> idList = Arrays.asList(ids);
|
|
|
|
Collection<String> idList = Arrays.asList(ids);
|
|
|
|
|
zhangdaiscott
2 years ago