WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

文档库--编辑订阅领域管理发消息

Browse Source
This commit is contained in:
zhn
2022-03-11 10:16:16 +08:00
parent 36e444fce2
commit 6a2726d2cc
2 changed files with 83 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+81 -79
View File
@@ -16,7 +16,6 @@ import com.jero.common.constant.enums.MessageTypeEnum;
import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.constant.enums.ModuleEnum;
import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.DateUtils; import com.jero.common.util.DateUtils;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
@@ -135,8 +134,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
@Autowired @Autowired
private SysCategoryServiceImpl sysCategoryService; private SysCategoryServiceImpl sysCategoryService;
@Autowired @Autowired
private ISysBaseAPI sysBaseAPI;
@Autowired
private ISysUserService sysUserService; private ISysUserService sysUserService;
@Resource @Resource
private WebSocket webSocket; private WebSocket webSocket;
@@ -171,8 +168,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
List<OnlCgformField> fieldFileList = fieldList.stream().filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); List<OnlCgformField> fieldFileList = fieldList.stream().filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
//删除文件 //删除文件
List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(StringUtils.join(ids,",")); List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(StringUtils.join(ids, ","));
List<String> connectIdList = new ArrayList<>(); List<String> connectIdList = new ArrayList<>();
@@ -198,7 +194,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
List<String> serialNumberList = new ArrayList<>(); List<String> serialNumberList = new ArrayList<>();
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (Map<String, Object> map : mapList) { for (Map<String, Object> map : mapList) {
if(documentIds.size() != 0 && documentIds.contains((String) map.get("id"))){ if (documentIds.size() != 0 && documentIds.contains((String) map.get("id"))) {
String id = (String) map.get("id"); String id = (String) map.get("id");
String serialNumber = (String) map.get("serial_number"); String serialNumber = (String) map.get("serial_number");
String title = (String) map.get("title"); String title = (String) map.get("title");
@@ -223,12 +219,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
List<SysUser> userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ",")); List<SysUser> userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ","));
List<String> userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); List<String> userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
String content = sysUser.getRealname() + "删除了" + StringUtils.join(serialNumberList,",") + "请知晓"; String content = sysUser.getRealname() + "删除了" + StringUtils.join(serialNumberList, ",") + "请知晓";
String contentInfo = sysUser.getRealname() + "删除了" + sbStr + "请知晓"; String contentInfo = sysUser.getRealname() + "删除了" + sbStr + "请知晓";
//封装消息的实体类 //封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo); SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
sysAnnouncementService.saveAnnouncement(sysAnnouncement); sysAnnouncementService.saveAnnouncement(sysAnnouncement);
sendWebsocket(StringUtils.join(serialNumberList,","), StringUtils.join(serialNumberList,",")); sendWebsocket(StringUtils.join(serialNumberList, ","), StringUtils.join(serialNumberList, ","));
} }
} }
@@ -394,7 +390,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(BussDocumentLibraryEO::getId, id); queryWrapper.eq(BussDocumentLibraryEO::getId, id);
//通过id查询数据 //通过id查询数据
List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);; List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id);
;
//查询所有 //查询所有
List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null); List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null);
//对应标准id //对应标准id
@@ -409,9 +406,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//对应标准处理 //对应标准处理
if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains((String) map.get("id"))) { if (StringUtils.isNotBlank(correspondingStandard) && correspondingStandard.contains((String) map.get("id"))) {
for (String s : correspondingStandard.split(",")) { for (String s : correspondingStandard.split(",")) {
if(s.equals((String) map.get("id"))){ if (s.equals((String) map.get("id"))) {
correspondingStandardNameList.add((String) map.get("serial_number")); correspondingStandardNameList.add((String) map.get("serial_number"));
}else{ } else {
correspondingStandardNameList.add(s); correspondingStandardNameList.add(s);
} }
} }
@@ -419,9 +416,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//代替标准 //代替标准
if (StringUtils.isNotBlank(replaceStandardTemp) && replaceStandardTemp.contains((String) map.get("id"))) { if (StringUtils.isNotBlank(replaceStandardTemp) && replaceStandardTemp.contains((String) map.get("id"))) {
for (String s : replaceStandardTemp.split(",")) { for (String s : replaceStandardTemp.split(",")) {
if(s.equals((String) map.get("id"))){ if (s.equals((String) map.get("id"))) {
replaceStandardNameList.add((String) map.get("serial_number")); replaceStandardNameList.add((String) map.get("serial_number"));
}else{ } else {
replaceStandardNameList.add(s); replaceStandardNameList.add(s);
} }
} }
@@ -646,7 +643,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//对应标准 //对应标准
map.put("value", StringUtils.join(correspondingStandardNameList, ",")); map.put("value", StringUtils.join(correspondingStandardNameList, ","));
map.put("list", listCorrespondingStandard); map.put("list", listCorrespondingStandard);
}else if(FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType())){ } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType())) {
map.put("value", finalValue); map.put("value", finalValue);
} else { } else {
map.put("value", entry.getValue()); map.put("value", entry.getValue());
@@ -701,11 +698,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
public void addInfo(Map<String, Object> map) { public void addInfo(Map<String, Object> map) {
try { try {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String implementTime = (String)map.get("implement_time"); String implementTime = (String) map.get("implement_time");
String issueTime = (String)map.get("issue_time"); String issueTime = (String) map.get("issue_time");
Date implementTimeDate=df.parse(implementTime); Date implementTimeDate = df.parse(implementTime);
Date issueTimeDate=df.parse(issueTime); Date issueTimeDate = df.parse(issueTime);
if(issueTimeDate.after(implementTimeDate)){ if (issueTimeDate.after(implementTimeDate)) {
throw new JeroBootException("发布日期不能大于标准实施日期"); throw new JeroBootException("发布日期不能大于标准实施日期");
} }
} catch (ParseException e) { } catch (ParseException e) {
@@ -800,15 +797,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
public void updateInfo(Map<String, Object> map) { public void updateInfo(Map<String, Object> map) {
try { try {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String implementTime = (String)map.get("implement_time"); String implementTime = (String) map.get("implement_time");
String issueTime = (String)map.get("issue_time"); String issueTime = (String) map.get("issue_time");
Date implementTimeDate=df.parse(implementTime); Date implementTimeDate = df.parse(implementTime);
Date issueTimeDate=df.parse(issueTime); Date issueTimeDate = df.parse(issueTime);
if(issueTimeDate.after(implementTimeDate)){ if (issueTimeDate.after(implementTimeDate)) {
throw new JeroBootException("发布日期不能大于标准实施日期") ; throw new JeroBootException("发布日期不能大于标准实施日期");
} }
} catch (ParseException e) { } catch (ParseException e) {
throw new JeroBootException("编辑失败") ; throw new JeroBootException("编辑失败");
} }
String cut = (String) map.get("cut"); String cut = (String) map.get("cut");
if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) { if (ObjectUtils.isNotEmpty(map.get("replace_standard_id"))) {
@@ -881,7 +878,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//判断文件是否修改 //判断文件是否修改
if ((ObjectUtils.isNotEmpty(dataList.get(0).get(key)) && !dataList.get(0).get(key).equals(value)) if ((ObjectUtils.isNotEmpty(dataList.get(0).get(key)) && !dataList.get(0).get(key).equals(value))
||(ObjectUtils.isEmpty(dataList.get(0).get(key)) && ObjectUtils.isNotEmpty(value))) { || (ObjectUtils.isEmpty(dataList.get(0).get(key)) && ObjectUtils.isNotEmpty(value))) {
String valueTemp = UUID.randomUUID().toString().replace("-", ""); String valueTemp = UUID.randomUUID().toString().replace("-", "");
//修改文件表关联信息connect_id //修改文件表关联信息connect_id
List<OSSFile> oSSFileList = new ArrayList<>(); List<OSSFile> oSSFileList = new ArrayList<>();
@@ -893,7 +890,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} }
iOSSFileService.updateFileInfo(oSSFileList); iOSSFileService.updateFileInfo(oSSFileList);
valuesBuilder.append("'" + valueTemp + "'" + ","); valuesBuilder.append("'" + valueTemp + "'" + ",");
}else{ } else {
valuesBuilder.append("'" + value + "'" + ","); valuesBuilder.append("'" + value + "'" + ",");
} }
// //判断文件是否修改 // //判断文件是否修改
@@ -1015,7 +1012,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//字段中文名 //字段中文名
List<OnlCgformField> fields = fieldList.stream().filter(e -> e.getDbFieldName().equals(key)).collect(Collectors.toList()); List<OnlCgformField> fields = fieldList.stream().filter(e -> e.getDbFieldName().equals(key)).collect(Collectors.toList());
if(fields.size() != 0){ if (fields.size() != 0) {
String dbFieldTxt = fields.get(0).getDbFieldTxt(); String dbFieldTxt = fields.get(0).getDbFieldTxt();
if (value == null) { if (value == null) {
value = ""; value = "";
@@ -1147,32 +1144,37 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String serialNumber = (String) dataList.get(0).get("serial_number"); String serialNumber = (String) dataList.get(0).get("serial_number");
//只要修改了标准,就需要向订阅用户发送消息(内容为-->XXX对“GB 7258 进行了修改请及时查看”) //只要修改了标准,就需要向订阅用户发送消息(内容为-->XXX对“GB 7258 进行了修改请及时查看”)
//项订阅领域管理中订阅了该技术领域的人和文档库中订阅了该条文档的人发送消息
Map<String, Object> mapTemp = new HashMap<>();
mapTemp.put("domainId", map.get("technology_territory"));
mapTemp.put("documentId", map.get("id"));
List<String> userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp);
//1.先判断是否订阅 //1.先判断是否订阅
LambdaQueryWrapper<OnlCgformSubscribe> lambdaQueryWrapper = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<OnlCgformSubscribe> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(OnlCgformSubscribe::getDocumentId, (String) map.get("id")); // lambdaQueryWrapper.in(OnlCgformSubscribe::getDocumentId, (String) map.get("id"));
List<OnlCgformSubscribe> onlCgformSubscribeList = iOnlCgformSubscribeService.list(lambdaQueryWrapper); // List<OnlCgformSubscribe> onlCgformSubscribeList = iOnlCgformSubscribeService.list(lambdaQueryWrapper);
List<String> userNameList = new ArrayList<>(); // List<String> userNameList = new ArrayList<>();
if (onlCgformSubscribeList.size() != 0) { // if (onlCgformSubscribeList.size() != 0) {
for (OnlCgformSubscribe onlCgformSubscribe : onlCgformSubscribeList) { // for (OnlCgformSubscribe onlCgformSubscribe : onlCgformSubscribeList) {
userNameList.add(onlCgformSubscribe.getCreateBy()); // userNameList.add(onlCgformSubscribe.getCreateBy());
} // }
List<SysUser> userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ",")); // List<SysUser> userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ","));
List<String> userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); // List<String> userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
String id = (String) map.get("id"); String id = (String) map.get("id");
String title = (String) map.get("title"); String title = (String) map.get("title");
String href = "<a href='/docManage/library?id:" + id + String href = "<a href='/docManage/library?id:" + id +
"&title:" + title + "&title:" + title +
"&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>"; "&serial_number:" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
String content = sysUser.getRealname() + "对" + serialNumber + "进行了修改请及时查看"; String content = sysUser.getRealname() + "对" + serialNumber + "进行了修改请及时查看";
String contentInfo = sysUser.getRealname() + "修改标准" + href + "中" + sbStr.toString(); String contentInfo = sysUser.getRealname() + "修改标准" + href + "中" + sbStr.toString();
//封装消息的实体类 //封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo); SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
sysAnnouncementService.saveAnnouncement(sysAnnouncement); sysAnnouncementService.saveAnnouncement(sysAnnouncement);
sendWebsocket((String) map.get("id"), (String) map.get("id")); sendWebsocket((String) map.get("id"), (String) map.get("id"));
} // }
//2. 处理修改代替标准的发送消息 //2. 处理修改代替标准的发送消息(法规负责人)
//处理修改代替标准,发送通知 //处理修改代替标准,发送通知
//修改时前端传参 //修改时前端传参
String replaceStandard = (String) map.get("replace_standard"); String replaceStandard = (String) map.get("replace_standard");
@@ -1644,7 +1646,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//订阅 先删后加 //订阅 先删后加
QueryWrapper<OnlCgformSubscribe> deleteSubscribe = new QueryWrapper<>(); QueryWrapper<OnlCgformSubscribe> deleteSubscribe = new QueryWrapper<>();
deleteSubscribe.lambda().eq(OnlCgformSubscribe::getDocumentId,id); deleteSubscribe.lambda().eq(OnlCgformSubscribe::getDocumentId, id);
iOnlCgformSubscribeService.remove(deleteSubscribe); iOnlCgformSubscribeService.remove(deleteSubscribe);
//订阅表中添加数据 //订阅表中添加数据
@@ -2398,9 +2400,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String filenameorg = file.getOriginalFilename().substring(0, pos); String filenameorg = file.getOriginalFilename().substring(0, pos);
//判断上传文件必须是zip //判断上传文件必须是zip
if (!str.equals("zip") && !str.equals("rar")) { if (!str.equals("zip") && !str.equals("rar")) {
throw new JeroBootException("请上传zip格式的文件或rar格式的文件") ; throw new JeroBootException("请上传zip格式的文件或rar格式的文件");
} }
String path = uploadpath + File.separator+"modal"+File.separator + filenameorg; String path = uploadpath + File.separator + "modal" + File.separator + filenameorg;
File saveDirectory = new File(path); File saveDirectory = new File(path);
if (!saveDirectory.isDirectory()) { if (!saveDirectory.isDirectory()) {
saveDirectory.mkdir(); saveDirectory.mkdir();
@@ -2408,9 +2410,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + File.separator + file.getOriginalFilename())); FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path + File.separator + file.getOriginalFilename()));
//解压缩 //解压缩
String zipEntryName = ""; String zipEntryName = "";
if(str.equals("zip")){ if (str.equals("zip")) {
zipEntryName = FileUnZip.unZipFiles(path + File.separator + file.getOriginalFilename(), path); zipEntryName = FileUnZip.unZipFiles(path + File.separator + file.getOriginalFilename(), path);
}else{ } else {
// zipEntryName = FileRarUtils.rarUnCompress(path + File.separator + file.getOriginalFilename(), path); // zipEntryName = FileRarUtils.rarUnCompress(path + File.separator + file.getOriginalFilename(), path);
} }
@@ -2418,7 +2420,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//判断压缩包下是否只有一个文件夹 //判断压缩包下是否只有一个文件夹
File fileTemp = new File(path); File fileTemp = new File(path);
int length = fileTemp.listFiles().length; int length = fileTemp.listFiles().length;
if(length > 2){ if (length > 2) {
//删除原上传文件 //删除原上传文件
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
throw new JeroBootException("压缩包中必须有且仅有一个文件夹,请重新上传"); throw new JeroBootException("压缩包中必须有且仅有一个文件夹,请重新上传");
@@ -2426,18 +2428,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
File fileNew = new File(zipEntryName); File fileNew = new File(zipEntryName);
List<File> fileList = new ArrayList<>(); List<File> fileList = new ArrayList<>();
for (File file1 : fileNew.listFiles()) { for (File file1 : fileNew.listFiles()) {
if(file1.getName().contains(".xls") || file1.getName().contains(".xlsx")){ if (file1.getName().contains(".xls") || file1.getName().contains(".xlsx")) {
fileList.add(file1); fileList.add(file1);
} }
} }
if(fileList.size() ==0 ){ if (fileList.size() == 0) {
//删除原上传文件 //删除原上传文件
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
throw new JeroBootException("压缩包根目录下没有excel作为导入数据,请重新上传"); throw new JeroBootException("压缩包根目录下没有excel作为导入数据,请重新上传");
}else if(fileList.size() > 1){ } else if (fileList.size() > 1) {
//删除原上传文件 //删除原上传文件
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传") ; throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传");
} }
// 数据相关处理, // 数据相关处理,
@@ -2447,7 +2449,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if (excelfilelist.size() < 1) { if (excelfilelist.size() < 1) {
//删除原上传文件 //删除原上传文件
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
throw new JeroBootException( "压缩包内没有上传Excel数据"); throw new JeroBootException("压缩包内没有上传Excel数据");
} else if (excelfilelist.size() > 1) { } else if (excelfilelist.size() > 1) {
//删除原上传文件 //删除原上传文件
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
@@ -2491,7 +2493,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if (StringUtils.isNotBlank(stringCellValue)) { if (StringUtils.isNotBlank(stringCellValue)) {
String replace = stringCellValue.replace("，", ","); String replace = stringCellValue.replace("，", ",");
rowList.put(headerCell.getStringCellValue(), replace); rowList.put(headerCell.getStringCellValue(), replace);
}else{ } else {
rowList.put(headerCell.getStringCellValue(), ""); rowList.put(headerCell.getStringCellValue(), "");
} }
} }
@@ -2507,7 +2509,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} }
} }
} }
if(dataList.size() == 0){ if (dataList.size() == 0) {
//删除原上传文件 //删除原上传文件
FileUnZip.deleteDir(saveDirectory); FileUnZip.deleteDir(saveDirectory);
throw new JeroBootException("请填写必填字段内容,带*的为必填"); throw new JeroBootException("请填写必填字段内容,带*的为必填");
@@ -2537,17 +2539,17 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} }
private void exportDatas(List<Map<String, String>> dataList, private void exportDatas(List<Map<String, String>> dataList,
List<Map<String, Object>> fieldList, List<Map<String, Object>> fieldList,
List<SysCategory> categoryList, List<SysCategory> categoryList,
List<SysDictItem> dictItemList, List<SysDictItem> dictItemList,
String zipEntryName) { String zipEntryName) {
//树形数据字典 //树形数据字典
List<String> treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); List<String> treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList());
//普通数据字典 //普通数据字典
List<String> itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); List<String> itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList());
int i = 2; int i = 2;
List<String> msgList = new ArrayList<>(); List<String> msgList = new ArrayList<>();
List<Map<String,Object>> mapList = new ArrayList<>(); List<Map<String, Object>> mapList = new ArrayList<>();
for (Map<String, String> stringStringMap : dataList) { for (Map<String, String> stringStringMap : dataList) {
Map<String, Object> mapResult = new HashMap<>(); Map<String, Object> mapResult = new HashMap<>();
i++; i++;
@@ -2663,7 +2665,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
countError++; countError++;
} }
//下拉多选 //下拉多选
if(StringUtils.isNotBlank(value)){ if (StringUtils.isNotBlank(value)) {
for (String valueTemp : value.split(",")) { for (String valueTemp : value.split(",")) {
if (!itemNameList.contains(valueTemp)) { if (!itemNameList.contains(valueTemp)) {
errorMsg += key + "中的" + valueTemp + "与数据字典不匹配"; errorMsg += key + "中的" + valueTemp + "与数据字典不匹配";
@@ -2681,8 +2683,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
valueId += collect.get(0).getItemValue() + ","; valueId += collect.get(0).getItemValue() + ",";
} }
} }
if(StringUtils.isNotBlank(valueId)){ if (StringUtils.isNotBlank(valueId)) {
value = valueId.substring(0,valueId.length()-1); value = valueId.substring(0, valueId.length() - 1);
} }
} }
@@ -2745,15 +2747,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
new MockMultipartFile(nowFileList.get(0).getName(), nowFileList.get(0).getName(), "text/plain", input); new MockMultipartFile(nowFileList.get(0).getName(), nowFileList.get(0).getName(), "text/plain", input);
//文件存入文件表 //文件存入文件表
OSSFile ossFile = iOSSFileService.uploadLocal(multipartFile, ""); OSSFile ossFile = iOSSFileService.uploadLocal(multipartFile, "");
if(ObjectUtils.isNotEmpty(ossFile)){ if (ObjectUtils.isNotEmpty(ossFile)) {
sb.append(ossFile.getId()+","); sb.append(ossFile.getId() + ",");
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
} }
if(StringUtils.isNotBlank(sb)){ if (StringUtils.isNotBlank(sb)) {
String substring = sb.substring(0, sb.length() - 1); String substring = sb.substring(0, sb.length() - 1);
value = substring; value = substring;
} }
@@ -2780,7 +2782,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
sb.append((String) stringObjectMap.get("id") + ","); sb.append((String) stringObjectMap.get("id") + ",");
list.add((String) stringObjectMap.get("serial_number")); list.add((String) stringObjectMap.get("serial_number"));
} }
if(StringUtils.isNotBlank(value)){ if (StringUtils.isNotBlank(value)) {
for (String s : value.split(",")) { for (String s : value.split(",")) {
if (!list.contains(s)) { if (!list.contains(s)) {
sb.append(s); sb.append(s);
@@ -2808,9 +2810,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
for (String s : msgList) { for (String s : msgList) {
html += s + "</br>"; html += s + "</br>";
} }
throw new JeroBootException(html) ; throw new JeroBootException(html);
} else { } else {
if(mapList.size() != 0){ if (mapList.size() != 0) {
for (Map<String, Object> map : mapList) { for (Map<String, Object> map : mapList) {
this.addInfo(map); this.addInfo(map);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/domain/service/impl/DomainManageServiceImpl.java
+2 -2
View File
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.domain.entity.DomainUserRel; import com.jero.modules.domain.entity.DomainUserRel;
import com.jero.modules.domain.mapper.DomainUserRelMapper; import com.jero.modules.domain.mapper.DomainUserRelMapper;
import com.jero.modules.domain.service.DomainUserRelService; import com.jero.modules.domain.service.DomainUserRelService;
@@ -21,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -95,7 +95,7 @@ public class DomainManageServiceImpl extends ServiceImpl<DomainUserRelMapper, Do
//获取订阅该领域的所有用户信息 //获取订阅该领域的所有用户信息
if(StringUtils.isNotEmpty(domainId)){ if(StringUtils.isNotEmpty(domainId)){
QueryWrapper<DomainUserRel> queryDomain = new QueryWrapper<>(); QueryWrapper<DomainUserRel> queryDomain = new QueryWrapper<>();
queryDomain.lambda().eq(DomainUserRel::getDomainId,domainId); queryDomain.lambda().in(DomainUserRel::getDomainId, Arrays.asList(domainId.split(",")));
List<DomainUserRel> domainUserRelList = super.baseMapper.selectList(queryDomain); List<DomainUserRel> domainUserRelList = super.baseMapper.selectList(queryDomain);
if(CollectionUtils.isNotEmpty(domainUserRelList)){ if(CollectionUtils.isNotEmpty(domainUserRelList)){
result = domainUserRelList.stream().map(DomainUserRel::getUserId).distinct().collect(Collectors.toList()); result = domainUserRelList.stream().map(DomainUserRel::getUserId).distinct().collect(Collectors.toList());