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

fix(asms): 同步问题调整

Browse Source
This commit is contained in:
yjz
2023-12-29 13:52:51 +08:00
parent 8c95df7554
commit 0da2cb2484
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java
+6 -2
View File
@@ -207,7 +207,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
lawsAsmsOpenApiList.forEach(lawsAsmsOpenApi -> {
Map<String, String> map = null;
Map<String, String> map = new HashMap<>();
if (StringUtils.isNotBlank(lawsAsmsOpenApi.getQueryParamJson())) {
map = (Map<String, String>) JSON.parse(lawsAsmsOpenApi.getQueryParamJson());
}
@@ -573,7 +573,9 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
queryWrapper1.eq(OSSFile::getStandardFileType, "publish_of_original");
queryWrapper1.like(OSSFile::getFileName, ".docx");
OSSFile ossFile = ossFileService.getOne(queryWrapper1);
if (Objects.isNull(ossFile)){
return;
}
SarFileSplitInfoEO sarFileSplitInfoEO = new SarFileSplitInfoEO();
sarFileSplitInfoEO.setStandardId(lawsDomesticStandard.getId());
sarFileSplitInfoEO.setSerialNumber(lawsDomesticStandard.getStandardNumber());
@@ -585,6 +587,8 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
sarFileSplitInfoEO.setCreateTime(getSimpleDate2(eMap.get("createTime")));
sarFileSplitInfoEO.setUpdateTime(getSimpleDate2(eMap.get("updateTime")));
sarFileSplitInfoEO.setIsAsmsImport("1");
sarFileSplitInfoEO.setAuthor("云平台");
sarFileSplitInfoEO.setSplitResult("成功");
sarFileSplitInfoService.save(sarFileSplitInfoEO);
});
laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/SynchronizationAsmsService.java
+1
View File
@@ -341,6 +341,7 @@ public class SynchronizationAsmsService {
sarFileSplitInfoEO.setUpdateTime(getSimpleDate2(eMap.get("updateTime")));
sarFileSplitInfoEO.setIsAsmsImport("1");
sarFileSplitInfoEO.setAuthor("云平台");
sarFileSplitInfoEO.setSplitResult("成功");
sarFileSplitInfoEO.setId(UUIDUtils.randomUUID20());
laws-modules-docking/src/main/java/com/jero/modules/docking/asms/util/AsmsPostUtil.java
-3
View File
@@ -16,10 +16,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.util.*;
/**
laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
-1
View File
@@ -1,6 +1,5 @@
package com.jero.modules.laws.documenttool.controller;
import cn.hutool.core.util.PageUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+3 -1
View File
@@ -1360,10 +1360,12 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
}
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 发布的只有自己可见，发布的数据所有人可见
String roleIds = loginUser.getRoleIds();
queryWrapper.and(qw ->
qw.and(qwi -> qwi.eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS1)
.eq("author", loginUser.calcNameWorkNo()))
.or().eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS2));
.or().eq(SPLIT_STATUS, DocumentSplitCommon.SPLIT_STATUS2)
.or().eq(roleIds.contains("admin"), "author", "云平台"));
// 逻辑删除
queryWrapper.eq("del_flag", 0);
// 排序