ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(资料中心): 79878

Browse Source
This commit is contained in:
yjz
2024-01-05 17:31:25 +08:00
parent 23f233e14c
commit b230d85a3d
2 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/constant/MessageTemplateCodeCommon.java
+1
View File
@@ -16,6 +16,7 @@ public class MessageTemplateCodeCommon {
public static final String LAWS_STANDARD_SHARING = "laws_standard_sharing"; // 【分享】收到分享
public static final String ES_INSPECT_PLAN = "es_inspect_plan"; // 【企标稽查计划】流程结束
public static final String STANDARD_DECLARE = "standard_declare"; // 【标准宣贯】流程结束
public static final String DATA_CENTER = "data_center"; // 【资料中心】推送范围
public static final String STANDARD_CHANGE_REPLACE = "standard_change_replace"; // 【法规变更】代替/被代替标准变更
public static final String STANDARD_CHANGE_REFERENCE = "standard_change_reference"; // 【法规变更】引用标准变更
public static final String STANDARD_CONSULTATION = "standard_consultation"; // 【征求意见结果提醒】
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
+43 -1
View File
@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.dto.message.SendMessageDTO;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.api.vo.SendMessageAPI;
import com.jero.common.exception.JeroBootException;
import com.jero.modules.laws.common.constant.FieldCommon;
import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon;
import com.jero.modules.laws.common.util.CurrentUserUtil;
import com.jero.modules.laws.common.util.DateUtil;
import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile;
@@ -17,6 +20,7 @@ import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFolderService;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.spire.ms.System.Collections.ArrayList;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +28,9 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@@ -35,12 +41,15 @@ import java.util.List;
*/
@Service
@Transactional(rollbackFor = JeroBootException.class)
@Slf4j
public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFileMapper, LawsDataCenterFile> implements ILawsDataCenterFileService {
@Autowired
private ILawsDataCenterFolderService lawsDataCenterFolderService;
@Autowired
private IOSSFileService ossFileService;
@Autowired
private SendMessageAPI sendMessageAPI;
/**
* 分页查询
@@ -113,6 +122,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
}
List<String> fileIds = Arrays.asList(lawsDataCenterFile.getFileId().split(","));
List<LawsDataCenterFile> fileList = new ArrayList();
List<String> fileNameList = new java.util.ArrayList<>();
fileIds.forEach(fileId -> {
LawsDataCenterFile file = new LawsDataCenterFile();
BeanUtils.copyProperties(lawsDataCenterFile, file);
@@ -121,10 +131,26 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
if (ossFile == null) {
throw new JeroBootException("文件不存在");
}
fileNameList.add(ossFile.getFileName());
file.setFileName(ossFile.getFileName());
fileList.add(file);
});
try {
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.DATA_CENTER);
sendMessageDTO.setToUserId(lawsDataCenterFile.getPushRangeIds());
Map<String, String> sendMap = new HashMap<>();
sendMap.put("fileName", String.join(",", fileNameList));
sendMap.put("fileDescription", lawsDataCenterFile.getFileDescription());
sendMap.put("uploader", lawsDataCenterFile.getUploader());
sendMessageDTO.setMap(sendMap);
sendMessageAPI.sendMessage(sendMessageDTO);
}catch (Exception e){
log.error("发送消息异常：{}", e.getMessage());
}
saveBatch(fileList);
}
@@ -176,7 +202,23 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
if (StringUtils.isBlank(lawsDataCenterFile.getFileId())) {
throw new JeroBootException(ResultCommon.EMPTY_COMMON, "fileId");
}
try {
// 发送消息
LawsDataCenterFile dataCenterFile = getById(lawsDataCenterFile.getId());
if (!dataCenterFile.getPushRangeIds().equals(lawsDataCenterFile.getPushRangeIds())){
SendMessageDTO sendMessageDTO = new SendMessageDTO();
sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.DATA_CENTER);
sendMessageDTO.setToUserId(lawsDataCenterFile.getPushRangeIds());
Map<String, String> sendMap = new HashMap<>();
sendMap.put("fileName", lawsDataCenterFile.getFileName());
sendMap.put("fileDescription", lawsDataCenterFile.getFileDescription());
sendMap.put("uploader", dataCenterFile.getUploader());
sendMessageDTO.setMap(sendMap);
sendMessageAPI.sendMessage(sendMessageDTO);
}
}catch (Exception e){
log.error("发送消息异常：{}", e.getMessage());
}
updateById(lawsDataCenterFile);
}