From 0574075f3849a18e1b77e17af73b6234c21461e4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 25 八月 2023 11:09:02 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml | 1
Source/UBCS-WEB/src/views/code/code.vue | 10 ++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 14 ++++---
Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java | 1
Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml | 12 ------
Source/UBCS/ubcs-ops/ubcs-flow/src/main/resources/application-prod.yml | 13 ++++++
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml | 22 +++++++++++
Source/UBCS-WEB/vue.config.js | 5 +-
Source/UBCS/service-start.sh | 2
10 files changed, 52 insertions(+), 30 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 48459e6..ff912b9 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1827,11 +1827,11 @@
},
/** 鍙戝竷缂栫爜瑙勫垯 */
async enableOrDeactivatse(oid,update){
- /*if(update==="release"){
+ if(update==="release"){
// 閬垮厤鐢ㄦ埛閲嶅鐐瑰嚮鎸夐挳
this.releadDisabled = true;
await checkLikeCodeRule(oid).then(res => {
- console.log(res)
+ //console.log(res)
if(res.data.success){
this.updateStatus(oid,update);
}else{
@@ -1840,7 +1840,7 @@
confirmButtonText: '缁х画鍙戝竷',
cancelButtonText: '鍙栨秷'
}).then(() => {
- //this.updateStatus();
+ this.updateStatus(oid,update);
})
.catch(action => {
this.$message({
@@ -1851,9 +1851,9 @@
}
})
this.releadDisabled = false;
- }else {*/
+ }else {
this.updateStatus(oid,update);
- //}
+ }
},
/** 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�*/
openCodeRuleDialog() {
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 17e99b5..3ad7c07 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,12 +26,11 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- // target: 'http://localhost',
+ target: 'http://localhost',
// target: 'http://192.168.1.51:37000',
- target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.16:37000',
// target: 'http://192.168.0.105:37000',
- //xiejun
// target: 'http://192.168.43.251:37000',
// target: 'http://192.168.0.103:37000',
// target: 'http://192.168.1.63:37000',
diff --git a/Source/UBCS/service-start.sh b/Source/UBCS/service-start.sh
index 2b0acee..76b0253 100644
--- a/Source/UBCS/service-start.sh
+++ b/Source/UBCS/service-start.sh
@@ -70,7 +70,7 @@
docker run -d -p 36015:36015 --name ubcs-omd vci-ubcs/ubcs-omd:latest
#鍚姩applyjtcodeservice鏈嶅姟
- docker build -f ./ubcs-service/ubcs-webservice/Dockerfile -t vci-ubcs/ubcs-applyjtcodeservice .
+ docker build -f ./ubcs-service/ubcs-applyjtcodeservice/Dockerfile -t vci-ubcs/ubcs-applyjtcodeservice .
docker run -d -p 36016:36016 --name ubcs-applyjtcodeservice vci-ubcs/ubcs-applyjtcodeservice:latest
#鍏朵粬鏈嶅姟璇疯嚜琛屾坊鍔�
diff --git a/Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml
index 1ed6d86..b8eaf54 100644
--- a/Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml
@@ -9,15 +9,3 @@
prior-ip-pattern:
- 192.168.0.*
- 127.0.0.1
-server:
- port: 80
-
-spring:
- cloud:
- gateway:
- discovery:
- locator:
- enabled: true
- loadbalancer:
- retry:
- enabled: true
diff --git a/Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml b/Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml
index 1ed6d86..f47d489 100644
--- a/Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml
+++ b/Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml
@@ -11,7 +11,6 @@
- 127.0.0.1
server:
port: 80
-
spring:
cloud:
gateway:
diff --git a/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml b/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml
index 5c9f4fd..8452e72 100644
--- a/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml
+++ b/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
server:
- port: 80
+ port: 37000
spring:
cloud:
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/resources/application-prod.yml b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/resources/application-prod.yml
index a967e8c..30749a7 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/resources/application-prod.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/resources/application-prod.yml
@@ -4,3 +4,16 @@
url: ${blade.datasource.flow.prod.url}
username: ${blade.datasource.flow.prod.username}
password: ${blade.datasource.flow.prod.password}
+#鏈嶅姟鍣ㄧ鍙�
+server:
+ port: 36004
+
+#flowable閰嶇疆
+flowable:
+ activity-font-name: \u5B8B\u4F53
+ label-font-name: \u5B8B\u4F53
+ annotation-font-name: \u5B8B\u4F53
+ check-process-definitions: false
+ database-schema-update: false
+ async-executor-activate: false
+ async-history-executor-activate: false
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml
index 70e928b..4164439 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application-prod.yml
@@ -4,4 +4,26 @@
url: ${blade.datasource.prod.url}
username: ${blade.datasource.prod.username}
password: ${blade.datasource.prod.password}
+ servlet:
+ multipart:
+ max-file-size: 500MB
+ max-request-size: 500MB
+#鏈嶅姟鍣ㄧ鍙�
+server:
+ port: 36007
+
+#榛樿瀵硅薄瀛樺偍閰嶇疆
+oss:
+ enabled: true
+ name: minio
+ tenant-mode: true
+ endpoint: http://dev.vci-tech.com:39000
+ access-key: TyEeBAJiAKDvHICUVAoH
+ secret-key: Reo4wW8EWF4gSizUmVsNjWfbDZzR3rBYFn5Jehd9
+ bucket-name: vci-ubcs
+
+#鍏抽棴椹煎嘲鍛藉悕鏄犲皠
+mybatis-plus:
+ configuration:
+ map-underscore-to-camel-case: false
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java
index c8eb71f..addcf4a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java
@@ -19,7 +19,6 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.rmi.ServerException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 27aa5a0..35949f6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -36,6 +36,7 @@
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
+import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
import com.vci.ubcs.starter.web.constant.RegExpConstant;
@@ -690,10 +691,9 @@
/**
* 鏍￠獙鍏抽敭灞炴��
*
- * @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param templateVO 妯℃澘鐨勫唴瀹癸紝蹇呴』鍖呭惈妯℃澘灞炴��
* @param orderDTO 缂栫爜鐢宠鐨勭浉鍏崇殑淇℃伅
*/
+ @Override
public List<Map> checkKeyAttrOnOrderFordatas(CodeOrderDTO orderDTO) {
List<Map>dataList=new ArrayList<>();
CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
@@ -2468,10 +2468,12 @@
conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, codeClassifyOid);
} else {
// conditionMap.put(CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY)
-
+ List<BtmTypeVO> classifyData = btmTypeClient.selectByIdCollection(Collections.singletonList(MdmBtmTypeConstant.CODE_CLASSIFY)).getData();
+ if(Func.isEmpty(classifyData)){
+ throw new ServiceException("涓氬姟绫诲瀷閰嶇疆涓嶄竴鑷达紝璇蜂慨鏀硅嫳鏂囧悕绉颁负"+MdmBtmTypeConstant.CODE_CLASSIFY);
+ }
conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " +
- btmTypeClient.selectByIdCollection(Collections.singletonList("classify"))
- .getData().get(0).getTableName() + " where lcstatus='" + FrameWorkDefaultValueConstant
+ classifyData.get(0).getTableName() + " where lcstatus='" + FrameWorkDefaultValueConstant
.FRAMEWORK_DATA_ENABLED + "' start with parentCodeClassifyOid = '" + codeClassifyOid +
"' CONNECT BY PRIOR OID = parentCodeClassifyOid )");
}
@@ -2737,7 +2739,7 @@
CodeClassifyFullInfoBO fullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
return getCodeRuleByClassifyFullInfo(fullInfo);
}
- //鎴戜滑鏌ヨ缂栫爜瑙勫垯
+ //鏌ヨ缂栫爜瑙勫垯
return ruleService.getObjectHasSecByOid(codeRuleOid);
}
--
Gitblit v1.9.3