QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 20240913

Browse Source 
# Conflicts:
#	laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
This commit is contained in:
梁琦涛
2024-09-13 21:10:13 +08:00
parent baa7f35623 d9a099f92d
commit 358acbafc7
5 changed files with 99728 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/prod/laws_chery_rsm_prod_0909.sql
+99689
View File
File diff suppressed because one or more lines are too long
laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
+9 -6
View File
@@ -961,12 +961,15 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
throw new JeroBootException("The list cannot import data！");
}
}
List<ProcessStandardInterpretClause> processStandardInterpretClauseList =
standardInterpretDTO.getProcessStandardInterpretClauseList();
if(!CollectionUtils.isEmpty(processStandardInterpretClauseList)){
standardInterpretDTO.setProcessStandardInterpretClauseSublistList(
JSON.parseArray(JSON.toJSONString(processStandardInterpretClauseList),
ProcessStandardInterpretClauseSublist.class));
if(CollectionUtils.isEmpty(standardInterpretDTO.getProcessStandardInterpretClauseSublistList())){
List<ProcessStandardInterpretClause> processStandardInterpretClauseList =
standardInterpretDTO.getProcessStandardInterpretClauseList();
if(!CollectionUtils.isEmpty(processStandardInterpretClauseList)){
standardInterpretDTO.setProcessStandardInterpretClauseSublistList(
JSON.parseArray(JSON.toJSONString(processStandardInterpretClauseList),
ProcessStandardInterpretClauseSublist.class));
}
}
List<ProcessStandardInterpretClauseSublist> processStandardInterpretClauseSublistList =
standardInterpretDTO.getProcessStandardInterpretClauseSublistList();
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+5 -4
View File
@@ -1334,11 +1334,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
}
});
List<LawsNodeRelation> lawsNodeRelationListAll = lawsNodeRelationService.list(query);
if (!CollectionUtils.isEmpty(lawsNodeRelationListAll)) {
String ids = lawsNodeRelationListAll.stream().map(LawsNodeRelation::getUniqueRelationFlag)
.collect(Collectors.joining(","));
selectionBoxVO.setIds(ids);
if(CollectionUtils.isEmpty(lawsNodeRelationListAll)){
return new Page<>();
}
String ids = lawsNodeRelationListAll.stream().map(LawsNodeRelation::getUniqueRelationFlag)
.collect(Collectors.joining(","));
selectionBoxVO.setIds(ids);
} else {
return new Page<>();
}
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+13 -4
View File
@@ -1487,10 +1487,19 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
if (StringUtils.isNotBlank(splitFileInfo.getStandardSystem())){
List<String> list = Arrays.asList(splitFileInfo.getStandardSystem().split(","));
List<LawsTreeNode> lawsTreeNodeList = lawsTreeNodeService.listByIds(list);
List<LawsNodeRelation> lawsNodeRelationList = lawsNodeRelationService.list(new LambdaQueryWrapper<LawsNodeRelation>()
.in(LawsNodeRelation::getNodeId, lawsTreeNodeList.stream().map(LawsTreeNode::getId)
.collect(Collectors.toList())));
if (lawsNodeRelationList.isEmpty()){
if(CollectionUtils.isEmpty(lawsTreeNodeList)){
return new Page<>();
}
List<String> nodeCode = lawsTreeNodeList.stream().map(LawsTreeNode::getNodeCode).collect(Collectors.toList());
LambdaQueryWrapper<LawsNodeRelation> query = new LambdaQueryWrapper<>();
for (int i = 0; i < nodeCode.size(); i++) {
query.likeRight(LawsNodeRelation::getNodeCode, nodeCode.get(i));
if(i != nodeCode.size() - 1){
query.or();
}
}
List<LawsNodeRelation> lawsNodeRelationList = lawsNodeRelationService.list(query);
if (CollectionUtils.isEmpty(lawsNodeRelationList)){
return new Page<>();
}
List<String> idList = lawsNodeRelationList.stream().map(LawsNodeRelation::getUniqueRelationFlag).collect(Collectors.toList());
laws-single-startup/src/main/resources/application-prod.yml
+12 -12
View File
@@ -215,7 +215,7 @@ jero:
backUrl: http://localhost:3000
backUrlPhone: http://localhost:3000
#拆分图片展示地址 域名
splitUrl: http://10.2.16.37:3344/laws-chery/sys/split/file/getImage?fileName=
splitUrl: https://cgrsm.mychery.com:3344/laws-chery/sys/split/file/getImage?fileName=
#公式转换图片url
mathToImgUrl: http://localhost:9998/mathToImg
# 拆分标准类型
@@ -247,7 +247,7 @@ jero:
endPoint: https://obsv3.wh-yd-01.mychery.com
accessKey: 1NENLYHKWGCHNTKCBTWJ
secretKey: wnLuaLGfyIw2HQGCNGepyA3Oob0TwUhIN15Vodlu
bucketName: obs-ccos-test
bucketName: obs-cgrsm
# ElasticSearch 6设置
elasticsearch:
username:
@@ -309,12 +309,12 @@ jero:
# 文件限制后缀黑名单
fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA
# 跨站白名单 域名
whiteUrls: localhost:62345,localhost:8188,localhost:3344,localhost:3435,localhost:3408,10.2.16.33:8188,10.2.16.33:3344,10.2.16.37:3344,10.2.16.34:8188,10.2.16.34:3344,10.2.16.33:8012,cgrsmuat.mychery.com:8188,cgrsmuat.mychery.com:3344,cgrsmuat.mychery.com:8012
whiteUrls: localhost:62345,localhost:8188,localhost:3344,localhost:3435,localhost:3408,10.2.16.33:8188,10.2.16.33:3344,10.2.16.37:3344,10.2.16.34:8188,10.2.16.34:3344,10.2.16.33:8012,cgrsm.mychery.com:8188,cgrsm.mychery.com:3344,cgrsm.mychery.com:8012
xssExcludedPages: /login,/updatePassword
# cors白名单
notFilter:
# origin地址 域名
originIp: http://localhost:62345,http://localhost:8188,http://localhost:3344,http://localhost:3435,http://localhost:3408,http://10.2.16.33:8188,http://10.2.16.33:3344,http://10.2.16.34:8188,http://10.2.16.34:3344,http://10.2.16.37:3344,http://10.2.16.33:8012,https://cgrsmuat.mychery.com:8188,https://cgrsmuat.mychery.com:3344,https://cgrsmuat.mychery.com:8012
originIp: http://localhost:62345,http://localhost:8188,http://localhost:3344,http://localhost:3435,http://localhost:3408,http://10.2.16.33:8188,http://10.2.16.33:3344,http://10.2.16.34:8188,http://10.2.16.34:3344,http://10.2.16.37:3344,http://10.2.16.33:8012,https://cgrsm.mychery.com:8188,https://cgrsm.mychery.com:3344,https://cgrsm.mychery.com:8012
# 加密默认值
password:
pbe:
@@ -406,10 +406,10 @@ hiwork:
# 是否推送统一待办
isWorkflow: true
# 前端调用地址
url: https://iamuat.mychery.com:5443/idp/oauth2/authorize?state=123&client_id=CGRSM&redirect_uri=
url: https://iam.mychery.com:6443/idp/oauth2/authorize?state=123&client_id=CGRSM&redirect_uri=
# 域名
fontUrl: http://10.2.16.37:3344{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
fontAppUrl: http://10.2.16.37:3344/mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
fontUrl: https://cgrsm.mychery.com:3344/{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
fontAppUrl: https://cgrsm.mychery.com:3344//mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
#hiwork单点登录
appkey: dingshfclphtivrd0r7k
appsecret: dqhom_17n6BC8pmLeaf5wNp4aV_4XSt_aYn-dNBo8z__-79NjVvZhDJ_M2REdxRc
@@ -429,15 +429,15 @@ asms:
# 单点登录配置(所有配置信息需要协调注册，现在都为假)
oauth:
# 客户端应用注册ID--客户申请的：CGRSM
clientId: CGRSM
clientId: qr-cgrsm
# 客户端应用注册密钥 客户申请的：58a1001438de462193bec307826463c2
clientSecret: a0792bc797794ff89e5628498cce0912
clientSecret: 769878b6d4914c848337211ed2936a03
# 授权码验证
grantType: authorization_code
# 通过授权码获取accessToken请求地址
accessTokenUrl: https://iamuat.mychery.com:5443/idp/oauth2/getToken
accessTokenUrl: https://iam.mychery.com:6443/idp/oauth2/getToken
# 通过accessToken获取账号信息请求地址
userInfoUrl: https://iamuat.mychery.com:5443/idp/oauth2/getUserInfo
userInfoUrl: https://iam.mychery.com:6443/idp/oauth2/getUserInfo
# 防止跨站请求伪造（CSRF）标识（暂时不用）
state: zhongQi
@@ -553,7 +553,7 @@ OCR:
#OCR请求识别URL地址
handleFileUrl: http://61.136.1.103:8091/WebService.asmx/FileConversion
# OCR回调接口地址 配置客户本地的IP及端口号 域名
callBackUrl: http://10.2.16.37:3344/laws-chery/laws/ocr/OCRRestful/OcrHandleResult
callBackUrl: https://cgrsm.mychery.com:3344/laws-chery/laws/ocr/OCRRestful/OcrHandleResult
userId: dayuzhou1234
authCode: 123456
publicKey: EC4KKA6ZDTCPAOCRBC5M