From 1bccfb0296202ecde9c59fd8a16c3d198210319c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 03 七月 2023 18:53:27 +0800
Subject: [PATCH] 依赖修改，部分不兼容关键字修改，SQL、
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java | 3 +
Source/UBCS/ubcs-auth/pom.xml | 6 +++
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java | 2 -
Source/UBCS-WEB/src/views/code/code.vue | 19 ++++++---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 8 ++--
Source/UBCS/ubcs-ops/pom.xml | 6 +++
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java | 2 +
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 11 +++--
Source/UBCS-WEB/vue.config.js | 4 +-
Source/UBCS-WEB/src/views/system/user.vue | 2
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue | 2 +
Source/UBCS/ubcs-service/pom.xml | 6 +++
12 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index 76e9e0c..eea22b8 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -10,6 +10,8 @@
width="55vw"
style="height: 115vh; margin-top: -10vh; overflow: hidden"
:visible.sync="isShowDialog"
+ lock-scroll
+ :close-on-click-modal="false"
@close="recoverPage">
<div class="search-total">
<!-- 澶撮儴鎸夐挳鍖哄煙 -->
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
index 09c62d1..c5ffdba 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -1205,15 +1205,18 @@
}else{
// 閫夋嫨鏄剧ず瀛楁
data.selectedArrary.forEach(item => {
+ console.log(item);
this.codeShowFieldConfigVOS.push(
{
field: item.id,
- title: item.id,
- fieldType: item.attrType,
- fieldTypeText: item.attrTypeText,
+ title: item.name,
+ // fieldType: item.attrType,
+ // fieldTypeText: item.attrTypeText,
+ fieldType: 'text',
+ fieldTypeText: '鏂囨湰妗�',
sort: false,
attrSortField: item.id,
- width: item.attrLength,
+ width: item.attributeLength,
isquery: false,
$cellEdit: false
}
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index ca5372d..7e47330 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -418,6 +418,8 @@
append-to-body
style="height: 115vh; margin-top: -13vh; overflow: hidden"
destroy-on-close
+ lock-scroll
+ :close-on-click-modal="false"
@close="clearBasicAddForm">
<!-- 绗竴灞傚璇濇,娣诲姞鐮佹淇℃伅瀵硅瘽妗嗕腑鐨勫唴瀹� -->
@@ -1674,14 +1676,17 @@
this.loadBasic(this.selectionList[0]);
}else{
// 鍙兘鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬩細鍙戠敓鏀瑰彉鎵�浠ヨ繖鍎跨洿鎺ュreferConfig鐨刯son杩涜鏀瑰彉
- let referConfig = JSON.parse(this.form.referConfig);
- referConfig.referType = this.form.referBtmId;
- referConfig.referTypeName = this.form.referBtmName;
- this.form.referConfig = JSON.stringify(referConfig);
+ if(this.form.referConfig === "coderefersec"){
+ let referConfig = JSON.parse(this.form.referConfig);
+ referConfig.referType = this.form.referBtmId;
+ referConfig.referTypeName = this.form.referBtmName;
+ this.form.referConfig = JSON.stringify(referConfig);
- let referValueInfo = JSON.parse(this.form.referValueInfo);
- referValueInfo.referType = this.form.referBtmId;
- this.form.referValueInfo = JSON.stringify(referValueInfo);
+ let referValueInfo = JSON.parse(this.form.referValueInfo);
+ referValueInfo.referType = this.form.referBtmId;
+ this.form.referValueInfo = JSON.stringify(referValueInfo);
+ }
+
editSave(this.form).then(() => {
// 鍏抽棴瀵硅瘽妗�
this.addBasicCodeSettingBox = false
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index c7d7358..2214ad6 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -967,7 +967,7 @@
if (this.selectionList.length === 1) {
this.roleTreeObj = this.selectionList[0].roleId.split(",");
}
- getRoleTree().then(res => {
+ getRoleTree(this.selectionList[0].tenantId).then(res => {
this.roleGrantList = res.data.data;
this.roleBox = true;
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 105dee9..3738707 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,10 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- // target: 'http://localhost:37000',
+ target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
// target: 'http://192.168.1.46:37000',
- target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
// target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
diff --git a/Source/UBCS/ubcs-auth/pom.xml b/Source/UBCS/ubcs-auth/pom.xml
index 1d1097a..691329f 100644
--- a/Source/UBCS/ubcs-auth/pom.xml
+++ b/Source/UBCS/ubcs-auth/pom.xml
@@ -100,6 +100,12 @@
<artifactId>orai18n</artifactId>
<version>${orai18n.version}</version>
</dependency>
+ <!--杈炬ⅵ鏁版嵁搴撻┍鍔�-->
+ <dependency>
+ <groupId>com.dameng</groupId>
+ <artifactId>DmJdbcDriver18</artifactId>
+ <optional>true</optional>
+ </dependency>
<!-- 閾捐矾杩借釜銆佹湇鍔＄洃鎺� -->
<!--<dependency>
<groupId>org.springblade</groupId>
diff --git a/Source/UBCS/ubcs-ops/pom.xml b/Source/UBCS/ubcs-ops/pom.xml
index 2e8a252..fdd9db4 100644
--- a/Source/UBCS/ubcs-ops/pom.xml
+++ b/Source/UBCS/ubcs-ops/pom.xml
@@ -31,6 +31,12 @@
<groupId>org.springblade</groupId>
<artifactId>blade-starter-metrics</artifactId>
</dependency>
+ <!--杈炬ⅵ鏁版嵁搴撻┍鍔�-->
+ <dependency>
+ <groupId>com.dameng</groupId>
+ <artifactId>DmJdbcDriver18</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
</project>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
index 89e6ada..74dbcdc 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.omd.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -173,6 +174,7 @@
/**
* 涓氬姟绫诲瀷鎵�灞為鍩�
*/
+ @TableField("\"DOMAIN\"")
private String domain;
/**
diff --git a/Source/UBCS/ubcs-service/pom.xml b/Source/UBCS/ubcs-service/pom.xml
index c1c3f28..b8fb7b9 100644
--- a/Source/UBCS/ubcs-service/pom.xml
+++ b/Source/UBCS/ubcs-service/pom.xml
@@ -55,6 +55,12 @@
<artifactId>ubcs-scope-api</artifactId>
<version>3.0.1.RELEASE</version>
</dependency>
+ <!--杈炬ⅵ鏁版嵁搴撻┍鍔�-->
+ <dependency>
+ <groupId>com.dameng</groupId>
+ <artifactId>DmJdbcDriver18</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
</project>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
index 2865e0f..7ff87cc 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
@@ -14,6 +14,7 @@
import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.*;
@@ -402,7 +403,7 @@
* @param referConfigVO
* @return
*/
- IPage<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject);
+ IPage<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException;
/**
* 鑾峰彇鏍戝舰鐨勫弬鐓�
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 643f036..0606604 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
@@ -3347,7 +3347,7 @@
* @return 鍒楄〃鏁版嵁
*/
@Override
- public IPage<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) {
+ public IPage<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException{
//checkReferConfig(referConfigVO);
//浣跨敤涓氬姟绫诲瀷鏌ヨ
R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
@@ -3389,15 +3389,15 @@
String lcstatusSql = "";
if (StringUtils.isNotBlank(baseQueryObject.getConditionMap().get("lcstatus"))) {
- lcstatusSql = "and lcstatus =" + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lcstatus"));
+ lcstatusSql = "lcstatus =" + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lcstatus"));
}
String num1 = baseQueryObject.getPage() * baseQueryObject.getLimit() + "";
String num2 = ((baseQueryObject.getPage()) - 1) * baseQueryObject.getLimit() + 1 + "";
- List<Map> maps = commonsMapper.selectBySql("select * from ( select rownum rn, t.* from (select * from " + listR.getData().get(0).getTableName()
+ List<Map> maps = commonsMapper.selectBySql("select * from ( select rownum rn, t.* from (select * from " + listR.getData().get(0).getTableName() + SPACE
+ (StringUtils.isNotBlank(listR.getData().get(0).getRevisionRuleId()) ? (" where lastr = " + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastr").toString())
- + "and lastv =" + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())):"")
+ + " and lastv =" + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())):"")
+ lcstatusSql + namesql + codesql + ") t where rownum <=" + num1 + ") where rn >=" + num2
);
List<BaseModel> baseModels = new ArrayList<>();
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
index 0e9b55b..73b1f4b 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
@@ -21,8 +21,6 @@
import com.vci.ubcs.starter.util.MybatisParameterUtil;
import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.web.constant.RegExpConstant;
-import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
-import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.mp.support.Condition;
--
Gitblit v1.9.3