diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java index bb2c8280b..47722dd22 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java @@ -24,6 +24,8 @@ public interface IOSSFileService extends IService { public List getFileInfos(String id); + public List getFileInfoAll(String id); + public List getFileInfosByConnectId(String connectId); boolean delete(OSSFile ossFile); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index 31b01c9ab..c812e6a41 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -290,6 +290,19 @@ public class OSSFileServiceImpl extends ServiceImpl impl } return list; } + @Override + public List getFileInfoAll(String id) { + if (com.jero.modules.system.util.StringUtils.isEmpty(id)) { + return new ArrayList<>(); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(OSSFile::getId, id.split(",")); + List list = this.list(wrapper); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(OSSFile::getConnectId, id.split(",")); + list.addAll(this.list(lambdaQueryWrapper)); + return list; + } @Override public List getFileInfosByConnectId(String connectId) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 5257f4a84..0fc2f46ea 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2032,6 +2032,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); String serialNumber = (String)map.get("serial_number"); String id = (String) map.get("id"); + String title = (String) map.get("title"); //通过id查询数据 List> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id); if(dataList.size() != 0){ @@ -2040,6 +2041,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + //普通数据字典 + List dictItemList = sysDictItemServiceImpl.selectItemsAll(); + //编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件 + homeDocumentDynamic(cut,map, serialNumber, id, title, dataList, fieldList,dictItemList); + try { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); @@ -2063,27 +2071,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); - //标准选择字段 -// List standardOnlCgformFieldList = fieldList.stream() -// .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); -// if(standardOnlCgformFieldList.size() != 0){ -// List collect = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); -// List standardList = new ArrayList<>(); -// for (Map.Entry entry : map.entrySet()) { -// String key = entry.getKey(); -// if(collect.contains(key)){ -// standardList.add(key); -// } -// } -// if(standardList.size() != 0){ -// for (String standard : standardList) { -// map.put(standard, map.get(standard+"_id")); -// map.remove(standard+"_id"); -// } -// } -// } + + map.remove("cut"); //获取搜索中心字段 @@ -2121,8 +2110,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); - //普通数据字典 - List dictItemList = sysDictItemServiceImpl.selectItemsAll(); //查询所有 List> listMap = bussDocumentLibraryEOMapper.selectMapsAll(null); @@ -2360,6 +2347,145 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map, + String serialNumber, + String id, String title, + List> dataList, + List fieldList, + List dictItemList) { + //文件类型字段 + List onlCgformFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); + + List fileFieldList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + + //编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件 + String href = "" + serialNumber + ","; + + StringBuilder msgContentSb = new StringBuilder("标准" + serialNumber); + StringBuilder msgContentInfoSb = new StringBuilder("标准" + href); + + List fileIdLIstTemp = new ArrayList<>(); + for (Map.Entry entry : dataList.get(0).entrySet()) { + String key = entry.getKey(); + String value = String.valueOf(entry.getValue()); + //文件 + if(fileFieldList.contains(key)&& !"null".equals(value) && StringUtils.isNotBlank(value)){ + fileIdLIstTemp.addAll(Arrays.asList(value.split(","))); + } + } + List fileIdLIst = new ArrayList<>(); + for (Map.Entry entry : map.entrySet()) { + String key = entry.getKey(); + String value = String.valueOf(entry.getValue()); + //文件 + if(fileFieldList.contains(key) && !"null".equals(value) && StringUtils.isNotBlank(value)){ + fileIdLIst.addAll(Arrays.asList(value.split(","))); + } + } + //之前的文件 + List fileListTemp = new ArrayList<>(); + if(fileIdLIstTemp.size() != 0){ + fileListTemp = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIstTemp,",")); + } + List fileNameListTemp = fileListTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + + + //编辑的文件 + List fileList = new ArrayList<>(); + if(fileIdLIst.size() != 0){ + fileList = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIst,",")); + } + List fileNameList = fileList.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + //删除的文件 + + List deleteFileList = new ArrayList<>(); + for (String fileName : fileNameListTemp) { + if(fileNameList.size() != 0 && !fileNameList.contains(fileName)){ + deleteFileList.add(fileName); + } + } + //上传的文件 + List upFileList = new ArrayList<>(); + for (String fileName : fileNameList) { + if(!fileNameListTemp.contains(fileName)){ + upFileList.add(fileName); + } + } + int count = 0; + + for (Map.Entry entry : map.entrySet()) { + String key = entry.getKey(); + String value = String.valueOf(entry.getValue()); + //状态 + if("state".equals(key) && !value.equals((String)dataList.get(0).get("state"))){ + count++; + //数据字典转换 dictItemList + String finalValue = value; + List stateDictItemList = dictItemList.stream() + .filter(e -> "state".equals(e.getDictCode()) && finalValue.equals(e.getItemValue())) + .collect(Collectors.toList()); + if(stateDictItemList.size() != 0){ + if(CutEnum.CN.getValue().equals(cut)){ + value = stateDictItemList.get(0).getItemText(); + }else{ + value = stateDictItemList.get(0).getEnName(); + } + } + msgContentSb.append("状态改为" + value + ","); + msgContentInfoSb.append("状态改为" + value + ","); + } + //适用车型 car_type + if("shi4_yong4_che1_xing2".equals(key) && !value.equals((String)dataList.get(0).get("shi4_yong4_che1_xing2"))){ + count++; + //数据字典转换 dictItemList + List stateDictItemList = dictItemList.stream() + .filter(e -> "car_type".equals(e.getDictCode())) + .collect(Collectors.toList()); + + StringBuilder sb = new StringBuilder(); + for (String s : value.split(",")) { + List collect = stateDictItemList.stream().filter(e -> s.equals(e.getItemValue())).collect(Collectors.toList()); + if(collect.size() != 0){ + if(CutEnum.CN.getValue().equals(cut)){ + sb.append(collect.get(0).getItemText()+","); + }else{ + sb.append(collect.get(0).getEnName()+","); + } + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + value = substring; + } + + msgContentSb.append("适用车型改为" + value + ","); + msgContentInfoSb.append("适用车型改为" + value + ","); + } + } + if(upFileList.size() != 0){ + count++; + msgContentSb.append("上传了" + StringUtils.join(upFileList,",") + ","); + msgContentInfoSb.append("上传了" + StringUtils.join(upFileList,",") + ","); + } + if(deleteFileList.size() != 0){ + count++; + msgContentSb.append("删除了" + StringUtils.join(deleteFileList,",") + ","); + msgContentInfoSb.append("删除了" + StringUtils.join(deleteFileList,",") + ","); + } + if(count > 0){ + String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1); + String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1); + HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO(); + homeDocumentDynamicEO.setMsgContent(msgContent); + homeDocumentDynamicEO.setMsgContentInfo(msgContentInfo); + homeDocumentDynamicEOService.save(homeDocumentDynamicEO); + } + } + private String updateEsInfo(Map map, List searchFieldList, StringBuilder sbCn, StringBuilder sbEn, List fileInfos, List> mapListTempCn, List> mapListTempEn, String cutCn, String cutEn) { Map mapBaseDateCn = new HashMap<>(); Map mapBaseDateEn = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java index 544850663..5b7e571b5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java @@ -53,6 +53,7 @@ public class HomeDocumentDynamicEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(homeDocumentDynamicEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = homeDocumentDynamicEOService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java index a84d94b8f..195b8a586 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java @@ -76,8 +76,8 @@ public class HomeFunctionModuleEOController extends JeroController> queryList() { - List list = homeFunctionModuleEOService.queryList(); + public Result> queryList(String cut) { + List list = homeFunctionModuleEOService.queryList(cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java index ae22e63d8..b798f06be 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java @@ -59,5 +59,5 @@ public interface IHomeFunctionModuleEOService extends IService queryList(); + List queryList(String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java index 6eeac2d66..ee0d28743 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.home.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; import com.jero.modules.home.entity.HomeFunctionModuleEO; import com.jero.modules.home.mapper.HomeFunctionModuleEOMapper; @@ -99,7 +100,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl queryList() { + public List queryList(String cut) { LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //所有的图表(state=0) @@ -111,9 +112,19 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl wrapperTemp = new LambdaQueryWrapper<>(); wrapperTemp.in(HomeFunctionModuleEO::getCreateBy,loginUser.getUsername()).orderByAsc(HomeFunctionModuleEO::getState).orderByAsc(HomeFunctionModuleEO::getSort); List homeFunctionModuleEOS = this.list(wrapperTemp); - if(homeFunctionModuleEOS.size() == 0){ + if(homeFunctionModuleEOList.size() == 0){ + if(CutEnum.EN.getValue().equals(cut)){ + for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOList) { + homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn()); + } + } return homeFunctionModuleEOList; }else{ + if(CutEnum.EN.getValue().equals(cut)){ + for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOS) { + homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn()); + } + } return homeFunctionModuleEOS; }