From d4e94f635dbe265f10ad614eac7386968ae30c23 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 19 七月 2023 11:25:30 +0800
Subject: [PATCH] 提交代码
---
Document/部署说明文档/部署说明.zip | 0
/dev/null | 85 ----------------------------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 2
Source/UBCS-WEB/src/views/code/code.vue | 2
Document/BladeX/BladeX开发手册-3.0.1.RELEASE/第6章 生产部署/6.2 Linux部署/6.2.3 Docker部署/6.2.3.2 DM安装.md | 2
Source/UBCS-WEB/vue.config.js | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 24 +++++--
Document/BladeX/BladeX开发手册-3.0.1.RELEASE/第6章 生产部署/6.2 Linux部署/6.2.1 Jar部署/6.2.1.1 Jar部署.md | 2
8 files changed, 24 insertions(+), 97 deletions(-)
diff --git "a/Document/BladeX/BladeX\345\274\200\345\217\221\346\211\213\345\206\214-3.0.1.RELEASE/\347\254\2546\347\253\240 \347\224\237\344\272\247\351\203\250\347\275\262/6.2 Linux\351\203\250\347\275\262/6.2.1 Jar\351\203\250\347\275\262/6.2.1.1 Jar\351\203\250\347\275\262.md" "b/Document/BladeX/BladeX\345\274\200\345\217\221\346\211\213\345\206\214-3.0.1.RELEASE/\347\254\2546\347\253\240 \347\224\237\344\272\247\351\203\250\347\275\262/6.2 Linux\351\203\250\347\275\262/6.2.1 Jar\351\203\250\347\275\262/6.2.1.1 Jar\351\203\250\347\275\262.md"
index fe94418..840ce23 100644
--- "a/Document/BladeX/BladeX\345\274\200\345\217\221\346\211\213\345\206\214-3.0.1.RELEASE/\347\254\2546\347\253\240 \347\224\237\344\272\247\351\203\250\347\275\262/6.2 Linux\351\203\250\347\275\262/6.2.1 Jar\351\203\250\347\275\262/6.2.1.1 Jar\351\203\250\347\275\262.md"
+++ "b/Document/BladeX/BladeX\345\274\200\345\217\221\346\211\213\345\206\214-3.0.1.RELEASE/\347\254\2546\347\253\240 \347\224\237\344\272\247\351\203\250\347\275\262/6.2 Linux\351\203\250\347\275\262/6.2.1 Jar\351\203\250\347\275\262/6.2.1.1 Jar\351\203\250\347\275\262.md"
@@ -3,7 +3,7 @@
## 閮ㄧ讲鎵�闇�
* java鐜
-* mysql鏁版嵁搴�
+* mysql鏁版嵁搴� 鎴� 杈炬ⅵ
* redis鏈嶅姟
* nacos鏈嶅姟
diff --git "a/Document/BladeX/BladeX\345\274\200\345\217\221\346\211\213\345\206\214-3.0.1.RELEASE/\347\254\2546\347\253\240 \347\224\237\344\272\247\351\203\250\347\275\262/6.2 Linux\351\203\250\347\275\262/6.2.3 Docker\351\203\250\347\275\262/6.2.3.2 DM\345\256\211\350\243\205.md" "b/Document/BladeX/BladeX\345\274\200\345\217\221\346\211\213\345\206\214-3.0.1.RELEASE/\347\254\2546\347\253\240 \347\224\237\344\272\247\351\203\250\347\275\262/6.2 Linux\351\203\250\347\275\262/6.2.3 Docker\351\203\250\347\275\262/6.2.3.2 DM\345\256\211\350\243\205.md"
new file mode 100644
index 0000000..923215a
--- /dev/null
+++ "b/Document/BladeX/BladeX\345\274\200\345\217\221\346\211\213\345\206\214-3.0.1.RELEASE/\347\254\2546\347\253\240 \347\224\237\344\272\247\351\203\250\347\275\262/6.2 Linux\351\203\250\347\275\262/6.2.3 Docker\351\203\250\347\275\262/6.2.3.2 DM\345\256\211\350\243\205.md"
@@ -0,0 +1,2 @@
+[Docker 瀹夎 | 杈炬ⅵ鎶�鏈枃妗� (dameng.com)](https://eco.dameng.com/document/dm/zh-cn/start/dm-install-docker.html)
+
diff --git "a/Document/BladeX/BladeX\345\274\200\345\217\221\346\211\213\345\206\214-3.0.1.RELEASE/\347\254\2546\347\253\240 \347\224\237\344\272\247\351\203\250\347\275\262/6.2 Linux\351\203\250\347\275\262/6.2.3 Docker\351\203\250\347\275\262/6.2.3.2 mysql\345\256\211\350\243\205.md" "b/Document/BladeX/BladeX\345\274\200\345\217\221\346\211\213\345\206\214-3.0.1.RELEASE/\347\254\2546\347\253\240 \347\224\237\344\272\247\351\203\250\347\275\262/6.2 Linux\351\203\250\347\275\262/6.2.3 Docker\351\203\250\347\275\262/6.2.3.2 mysql\345\256\211\350\243\205.md"
deleted file mode 100644
index 2c8431f..0000000
--- "a/Document/BladeX/BladeX\345\274\200\345\217\221\346\211\213\345\206\214-3.0.1.RELEASE/\347\254\2546\347\253\240 \347\224\237\344\272\247\351\203\250\347\275\262/6.2 Linux\351\203\250\347\275\262/6.2.3 Docker\351\203\250\347\275\262/6.2.3.2 mysql\345\256\211\350\243\205.md"
+++ /dev/null
@@ -1,85 +0,0 @@
-## Centos7涓嬪畨瑁呮楠�
-1.瀹夎鏂扮増mysql涔嬪墠锛屾垜浠渶瑕佸皢绯荤粺鑷甫鐨刴ariadb-lib鍗歌浇
-
-~~~shell
-[root@master ~]# rpm -qa|grep mariadb
-mariadb-libs-5.5.41-2.el7_0.x86_64
-[root@master ~]# rpm -e mariadb-libs-5.5.41-2.el7_0.x86_64 --nodeps
-~~~
-
-2.鍓嶅線mysql瀹樼綉涓嬭浇rpm鍖�,centos閫夋嫨red hat[mysql涓嬭浇鍦板潃](https://dev.mysql.com/downloads/mysql/)
-
-3.涓婁紶`mysql-5.7.17-1.el7.x86_64.rpm-bundle.tar`鍒發inux鏈嶅姟鍣�,骞惰В鍘媡ar鍖�
-
-4.鍏朵腑鏈�绠�鍗曠殑瀹夎mysql-server鏈嶅姟,鍙渶瑕佸畨瑁呭涓�4涓蒋浠跺寘鍗冲彲,鎴戜滑鍙互浣跨敤rpm -ivh鍛戒护杩涜瀹夎
-渚濇瀹夎锛�
-**mysql-community-common-5.7.17-1.el7.x86\_64.rpm
-mysql-community-libs-5.7.17-1.el7.x86\_64.rpm 鈥擄紙渚濊禆浜巆ommon锛�
-mysql-community-client-5.7.17-1.el7.x86\_64.rpm 鈥擄紙渚濊禆浜巐ibs锛�
-mysql-community-server-5.7.17-1.el7.x86\_64.rpm 鈥擄紙渚濊禆浜巆lient銆乧ommon锛�**
-
-5.鎺ヤ笅鏉ユ槸鍒濆鍖栨暟鎹簱锛屾垜浠娇鐢ㄥ涓嬪懡浠ゅ潎鍙�
-
-~~~shell
-[root@master~]# mysqld --initialize
-~~~
-
-`鏂扮増鐨勬帹鑽愭鏂规硶锛屾墽琛岀敓浼氬湪/var/log/mysqld.log鐢熸垚闅忔満瀵嗙爜`
-
-6.鏇存敼mysql鏁版嵁搴撶洰褰曠殑鎵�灞炵敤鎴峰強鍏舵墍灞炵粍锛岀劧鍚庡惎鍔╩ysql鏁版嵁搴�
-
-~~~shell
-[root@master~]# chown mysql:mysql /var/lib/mysql -R
-[root@master~]# systemctl start mysqld.service
-~~~
-
-7.鏍规嵁绗�5姝ヤ腑鐨勫瘑鐮佺櫥褰曞埌mysql,鏇存敼root鐢ㄦ埛鐨勫瘑鐮�,鏂扮増鐨刴ysql鍦ㄧ涓�娆＄櫥褰曞悗鏇存敼瀵嗙爜鍓嶆槸涓嶈兘鎵ц浠讳綍鍛戒护鐨�
-
-~~~shell
-[root@master~]# cat /var/log/mysqld.log | grep 'password'
-~~~
-
-浼氱湅鍒板涓嬩竴娈�:
-
-~~~shell
-[Note] A temporary password is generated for root@localhost: h:#EhtdIr7qg
-~~~
-
-閭ｅ垵濮嬪寲瀵嗙爜灏辨槸瀵瑰簲鐨刞h:#EhtdIr7qg`
-涔嬪悗鐧婚檰mysql骞舵敼瀵嗙爜
-
-~~~shell
-[root@master~]# mysql -uroot -ph:#EhtdIr7qg
-mysql> set password=password('root');
-~~~
-
-8.鏈�鍚庢垜浠繕鍙互鏍规嵁瀹為檯鎯呭喌鍒涘缓鐢ㄦ埛锛屽強浣滄潈闄愬垎閰�
-
-~~~shell
-mysql> create user 'root'@'%' identified by 'root';
-mysql> SELECT DISTINCT CONCAT('User: ''',user,'''@''',host,''';') AS query FROM mysql.user;
-mysql> GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'root' WITH GRANT OPTION;
-mysql> flush privileges;
-mysql> exit
-~~~
-
-9.璁剧疆涓嶅尯鍒嗗ぇ灏忓啓
-
-~~~shell
-[root@master~]# vi /etc/my.cnf
-~~~
-
-鍦╘[mysqld\]鑺傜偣涓嬪鍔�
-`lower_case_table_names = 1`
-`:wq`閫�鍑�
-
-10.閲嶅惎鏈嶅姟骞跺皾璇曠櫥闄�
-
-~~~shell
-[root@master~]# service mysqld restart
-[root@master~]# mysql -u root -p
-~~~
-
-==============================================
-鏈�鍚庨渶瑕佺壒鍒彁閱掓敞鎰忕殑涓�鐐规槸锛屾柊鐗堢殑mysql鏁版嵁搴撲笅鐨剈ser琛ㄤ腑宸茬粡娌℃湁`Password`瀛楁浜嗭紝
-鑰屾槸灏嗗姞瀵嗗悗鐨勭敤鎴峰瘑鐮佸瓨鍌ㄤ簬`authentication_string`瀛楁
diff --git "a/Document/\351\203\250\347\275\262\350\257\264\346\230\216\346\226\207\346\241\243/\351\203\250\347\275\262\350\257\264\346\230\216.zip" "b/Document/\351\203\250\347\275\262\350\257\264\346\230\216\346\226\207\346\241\243/\351\203\250\347\275\262\350\257\264\346\230\216.zip"
new file mode 100644
index 0000000..6a3f788
--- /dev/null
+++ "b/Document/\351\203\250\347\275\262\350\257\264\346\230\216\346\226\207\346\241\243/\351\203\250\347\275\262\350\257\264\346\230\216.zip"
Binary files differ
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 5b4a5a7..b54b160 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1253,7 +1253,9 @@
parentClsParam.classifyDialogLoading = true;
let oid = this.selectionList.length==0 ? this.form.pkCodeRule:this.selectionList[0].oid;
let conditionMaps = {};
+
conditionMaps['conditionMap[pkCodeRule]'] = oid;
+ conditionMaps['conditionMap[oid_notequal]'] = this.form.oid;
refDataGridClassifySec(
page.currentPage,
page.pageSize,
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 0991057..ad43a75 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-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index b600ae7..110603b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -545,7 +545,7 @@
return null;
}
conditionMap.put("secType",(CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue()));
- return refDataGridCodeBasicSec(query.setAscs("ordernum"),conditionMap);
+ return refDataGridCodeBasicSec(query.setAscs("orderNum"),conditionMap);
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index 57abd45..fce6239 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -32,10 +32,7 @@
import com.vci.ubcs.code.mapper.CodeRuleMapper;
import com.vci.ubcs.code.mapper.CodeSerialValueMapper;
import com.vci.ubcs.code.mapper.CommonsMapper;
-import com.vci.ubcs.code.service.ICodeAllCodeService;
-import com.vci.ubcs.code.service.ICodeBasicSecService;
-import com.vci.ubcs.code.service.ICodeClassifyService;
-import com.vci.ubcs.code.service.ICodeRuleService;
+import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
@@ -45,6 +42,7 @@
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.UBCSCondition;
@@ -103,6 +101,8 @@
private ICodeAllCodeService codeAllcodeService;
@Resource
private ICodeBasicSecService codeBasicSecService;
+ @Resource
+ private ICodeClassifyValueService iCodeClassifyValueService;
/**
* 瀵硅薄鐨勬搷浣�
@@ -516,7 +516,7 @@
String secTypes = releaseCodeRule.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.joining(","));
// 鏌ヨ鍑烘墍鏈夊凡鍙戝竷鐨勭紪鐮佽鍒欎腑鐮佹绫诲瀷椤哄簭涓庡綋鍓嶈鍙戝竷鐨勮鍒欓『搴忎竴鑷寸殑缂栫爜瑙勫垯锛屾鏃跺凡杩戣繃婊ゆ帀澶ч儴鍒嗚鍒欙紝杩愮畻閲忓噺灏�
List<CodeRule> codeRuleList = codeRuleMapper.selectList(Wrappers.<CodeRule>query().lambda()
- .eq(CodeRule::getLcStatus, FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED)
+ .eq(CodeRule::getLcStatus, CodeRuleLC.RELEASED.getValue())
.eq(CodeRule::getBasicSecTypes,secTypes)
);
// 涓虹┖锛岃瘉鏄庝笉瀛樺湪绫诲悓鐨勭紪鐮佽鍒欑洿鎺ヨ繑鍥�
@@ -596,16 +596,24 @@
}
break;
}
+ if (flag) {
+ break;
+ }
}
// 婊¤冻鎵�鏈夌爜娈电被鍨嬫瘮瀵规潯浠剁殑瑙勫垯
if (flag) {
lastCodeRule.add(item);
}
});
+ StringBuffer resMsg = new StringBuffer();
+ resMsg.append("瀛樺湪濡備笅鐩镐技瑙勫垯锛屾槸鍚︾户缁彂甯冿紵\n");
// 鏈�鍚庡皢缁撴灉杩涜澶勭悊骞惰繑鍥�
-
-
- return null;
+ lastCodeRule.stream().forEach(item->{
+ resMsg.append(item.getName());
+ resMsg.append(item.getId());
+ resMsg.append("缂栫爜瑙勫垯;\n");
+ });
+ return R.fail(resMsg.toString());
}
/**
--
Gitblit v1.9.3