diff --git a/extra/data/OBJ_320/param_99.MYD b/extra/data/OBJ_320/param_99.MYD index c89a1d0..ce6c0e4 100644 Binary files a/extra/data/OBJ_320/param_99.MYD and b/extra/data/OBJ_320/param_99.MYD differ diff --git a/extra/data/OBJ_320/param_99.MYI b/extra/data/OBJ_320/param_99.MYI index d1622eb..dfc1e54 100644 Binary files a/extra/data/OBJ_320/param_99.MYI and b/extra/data/OBJ_320/param_99.MYI differ diff --git a/extra/data/OBJ_350/param_99.MYD b/extra/data/OBJ_350/param_99.MYD index 1e2772d..fd65a82 100644 Binary files a/extra/data/OBJ_350/param_99.MYD and b/extra/data/OBJ_350/param_99.MYD differ diff --git a/extra/data/OBJ_350/param_99.MYI b/extra/data/OBJ_350/param_99.MYI index c396248..1007506 100644 Binary files a/extra/data/OBJ_350/param_99.MYI and b/extra/data/OBJ_350/param_99.MYI differ diff --git a/extra/data/OBJ_360/param_99.MYD b/extra/data/OBJ_360/param_99.MYD index d623d90..48d6f7a 100644 Binary files a/extra/data/OBJ_360/param_99.MYD and b/extra/data/OBJ_360/param_99.MYD differ diff --git a/extra/data/OBJ_360/param_99.MYI b/extra/data/OBJ_360/param_99.MYI index 14a195a..1806b16 100644 Binary files a/extra/data/OBJ_360/param_99.MYI and b/extra/data/OBJ_360/param_99.MYI differ diff --git a/extra/data/OMC_PUB/omcPubVarConf.MYD b/extra/data/OMC_PUB/omcPubVarConf.MYD index a1488de..5d98e0d 100644 Binary files a/extra/data/OMC_PUB/omcPubVarConf.MYD and b/extra/data/OMC_PUB/omcPubVarConf.MYD differ diff --git a/extra/data/OMC_PUB/omcPubVarConf.MYI b/extra/data/OMC_PUB/omcPubVarConf.MYI index 74a3091..3d8efc9 100644 Binary files a/extra/data/OMC_PUB/omcPubVarConf.MYI and b/extra/data/OMC_PUB/omcPubVarConf.MYI differ diff --git a/extra/data/OMC_PUB/sysAlarmConf.MYD b/extra/data/OMC_PUB/sysAlarmConf.MYD index 2dc811d..caea2cd 100644 Binary files a/extra/data/OMC_PUB/sysAlarmConf.MYD and b/extra/data/OMC_PUB/sysAlarmConf.MYD differ diff --git a/extra/data/OMC_PUB/sysAlarmConf.MYI b/extra/data/OMC_PUB/sysAlarmConf.MYI index 4f9c399..5861c49 100644 Binary files a/extra/data/OMC_PUB/sysAlarmConf.MYI and b/extra/data/OMC_PUB/sysAlarmConf.MYI differ diff --git a/extra/data/OMC_PUB/sysMenuConf.MYD b/extra/data/OMC_PUB/sysMenuConf.MYD index 6bea1fb..03b2acb 100644 Binary files a/extra/data/OMC_PUB/sysMenuConf.MYD and b/extra/data/OMC_PUB/sysMenuConf.MYD differ diff --git a/extra/data/OMC_PUB/sysMenuConf.MYI b/extra/data/OMC_PUB/sysMenuConf.MYI index d81f9d5..63f70cf 100644 Binary files a/extra/data/OMC_PUB/sysMenuConf.MYI and b/extra/data/OMC_PUB/sysMenuConf.MYI differ diff --git a/extra/emsVersion b/extra/emsVersion index 9ed6f3f..388ae8d 100644 --- a/extra/emsVersion +++ b/extra/emsVersion @@ -1,2 +1,2 @@ -Version:emsInstall r2503.1 -Release Date: 2025-03-27 18:00:00 +Version:emsInstall r2505.1 +Release Date: 2025-05-09 19:28:45 diff --git a/extra/manual_sql_updates.sql b/extra/manual_sql_updates.sql new file mode 100644 index 0000000..5b95318 --- /dev/null +++ b/extra/manual_sql_updates.sql @@ -0,0 +1,32 @@ +---新建表 +USE OMC_PUB; +CREATE TABLE IF NOT EXISTS `sysAlarmInfo` ( + `sysTypeNo` smallint(5) UNSIGNED NOT NULL DEFAULT 0, + `sysNo` smallint(3) UNSIGNED NOT NULL DEFAULT 0, + `subSysNo` smallint(3) UNSIGNED NOT NULL DEFAULT 0, + `compCode` smallint(3) UNSIGNED NOT NULL DEFAULT 0, + `alarmCode` smallint(3) UNSIGNED NOT NULL DEFAULT 0, + `alarmTime` datetime(0) NOT NULL DEFAULT '0000-00-00 00:00:00', + `clearTime` datetime(0) NOT NULL DEFAULT '0000-00-00 00:00:00', + `clearMode` tinyint(4) NOT NULL DEFAULT 0, + `clearInfo` varchar(64) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL, + `clearBy` varchar(20) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL, + `alertCheck` tinyint(1) UNSIGNED NOT NULL DEFAULT 0, + `alarmId` varchar(64) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL, + `alarmInfo` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL, + INDEX `clearTime`(`clearTime`) USING BTREE, + INDEX `alarmTime`(`alarmTime`) USING BTREE, + INDEX `sysTypeNo`(`sysTypeNo`) USING BTREE, + INDEX `sysNo`(`sysNo`) USING BTREE, + INDEX `subSysNo`(`subSysNo`) USING BTREE +) ENGINE = MyISAM CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic; + +---删除表 + +----新增字段 + +---删除字段 + + +---修改字段 +---ALTER TABLE OMC_PUB.omcPubVarConf CHANGE COLUMN IF EXISTS `remark` remark1 VARCHAR(255); \ No newline at end of file diff --git a/extra/wxc2_emsInstall b/extra/wxc2_emsInstall index 051ca74..0fc4c40 100644 --- a/extra/wxc2_emsInstall +++ b/extra/wxc2_emsInstall @@ -11,7 +11,7 @@ encryptionBin=`pwd`"/mssBak/script/encryption" mysql_user=administrator mysql_pw=*86#ROtartsinim - +service mysql stop myShowTitle() { #thisVersion=`cat ./emsVersion |grep Version|awk '{print $2}'` @@ -78,9 +78,14 @@ upGradeDb() chgrp -R mysql $dataDir/ chown -R mysql $dataDir/ chmod -R 755 $dataDir/ - - tableArr=`echo "show tables from $1_BK like '$2';"|$mysqlBinDir/mysql -u$mysql_user -p$mysql_pw | sed -e '1d'` + echo "CREATE DATABASE IF NOT EXISTS $1;" | $mysqlBinDir/mysql -u$mysql_user -p$mysql_pw + # 如果未æ��供表å��，则获å�–æ•°æ�®åº“中的所有表 + if [ -z "$2" ]; then + tableArr=`echo "show tables from $1_BK;" | $mysqlBinDir/mysql -u$mysql_user -p$mysql_pw | sed -e '1d'` + else + tableArr=`echo "show tables from $1_BK like '$2';" | $mysqlBinDir/mysql -u$mysql_user -p$mysql_pw | sed -e '1d'` + fi for table in $tableArr; do if ( test -e "$dataDir/$1/$table.frm" ) then diffFlag_frm=`diff $dataDir/$1/$table.frm $dataDir/$1_BK/$table.frm` @@ -103,6 +108,11 @@ upGradeDb() fi done + # 如果是 CSTA_DB，则跳过数æ�®æ�’å…¥ + if [ $1 == "CSTA_DB" ]; then + #echo "Skipping data insertion for $1.$table" + continue + fi #echo "$tmpStr" rm -f /tmp/tmpContent @@ -112,6 +122,11 @@ upGradeDb() #cat /tmp/tmpContent | sed -e s/'\\\N'/NULL/g | sed -e s/\'NULL\'/NULL/g |awk '{print "replace into " "'$1'" "." "'$table'" " (" "'$tmpStr'" ") values (" "'$tmpChar'" $0 "'$tmpChar'" ");"}' cat /tmp/tmpContent | sed -e s/'\\\N'/NULL/g | sed -e s/\'NULL\'/NULL/g |awk '{print "replace into " "'$1'" "." "'$table'" " (" "'$tmpStr'" ") values (" "'$tmpChar'" $0 "'$tmpChar'" ");"}' |$mysqlBinDir/mysql -u$mysql_user -p$mysql_pw else + # 如果是 CSTA_DB，则跳过数æ�®æ�’å…¥ + if [ "$1" == "CSTA_DB" ]; then + #echo "Skipping data insertion for $1.$table" + continue + fi echo "replace into $1.$table select * from $1_BK.$table" |$mysqlBinDir/mysql -u$mysql_user -p$mysql_pw fi echo -n "." @@ -549,25 +564,25 @@ find $dstDataDir -type f ! -path "$dstDataDir/OMC_PUB/sysUser.MYD" ! -path "$dst needCopyDirList=`ls $srcDataDir` #echo $needCopyDirList; -#for tmpDir in $needCopyDirList ; do -# cp -Rf $srcDataDir/$tmpDir $dstDataDir/ -# echo -n "." -#done +for tmpDir in $needCopyDirList ; do + cp -Rf $srcDataDir/$tmpDir $dstDataDir/ + echo -n "." +done # by 2024/08/30 lai:order to keep sysUser -for tmpDir in $needCopyDirList; do - if [[ $tmpDir == "OMC_PUB" ]]; then - mkdir -p "$dstDataDir/$tmpDir" - if [[ ! -e "$dstDataDir/$tmpDir/sysUser.MYD" && ! -e "$dstDataDir/$tmpDir/sysUser.MYI" && ! -e "$dstDataDir/$tmpDir/sysUser.frm" && ! -e "$dstDataDir/$tmpDir/omcPubVarConf.MYD" && ! -e "$dstDataDir/$tmpDir/omcPubVarConf.MYI" && ! -e "$dstDataDir/$tmpDir/omcPubVarConf.frm" ]]; then - cp -Rf "$srcDataDir/$tmpDir/"* "$dstDataDir/$tmpDir/" - else - find "$srcDataDir/$tmpDir" -type f ! -name 'sysUser.MYD' ! -name 'sysUser.MYI' ! -name 'sysUser.frm' ! -name 'omcPubVarConf.MYD' ! -name 'omcPubVarConf.MYI' ! -name 'omcPubVarConf.frm' -exec cp -Rf {} "$dstDataDir/$tmpDir/" \; - fi - else - cp -Rf "$srcDataDir/$tmpDir" "$dstDataDir/" - fi - echo -n "." -done +# for tmpDir in $needCopyDirList; do +# if [[ $tmpDir == "OMC_PUB" ]]; then +# mkdir -p "$dstDataDir/$tmpDir" +# if [[ ! -e "$dstDataDir/$tmpDir/sysUser.MYD" && ! -e "$dstDataDir/$tmpDir/sysUser.MYI" && ! -e "$dstDataDir/$tmpDir/sysUser.frm" ]]; then +# cp -Rf "$srcDataDir/$tmpDir/"* "$dstDataDir/$tmpDir/" +# else +# find "$srcDataDir/$tmpDir" -type f ! -name 'sysUser.MYD' ! -name 'sysUser.MYI' ! -name 'sysUser.frm' -exec cp -Rf {} "$dstDataDir/$tmpDir/" \; +# fi +# else +# cp -Rf "$srcDataDir/$tmpDir" "$dstDataDir/" +# fi +# echo -n "." +# done if [ "$esme_exist" == 1 ] ;then @@ -622,44 +637,44 @@ if [ "$installMode" == "2" ] ; then #upGradeDb CDR_DB cdrSource #Upgrade CSTA_DB - rm -rf $dstDataDir/CSTA_DB_BK - cp -r $omcBakDir/data/CSTA_DB $dstDataDir/CSTA_DB_BK - chmod -R 755 $dstDataDir/CSTA_DB_BK + # rm -rf $dstDataDir/CSTA_DB_BK + # cp -r $omcBakDir/data/CSTA_DB $dstDataDir/CSTA_DB_BK + # chmod -R 755 $dstDataDir/CSTA_DB_BK - rm -f $dstDataDir/CSTA_DB/*Detail_* - rm -f $dstDataDir/CSTA_DB/*Sum_* + # rm -f $dstDataDir/CSTA_DB/*Detail_* + # rm -f $dstDataDir/CSTA_DB/*Sum_* - tableArr=`echo "show tables from CSTA_DB_BK like '%Detail';"|$mysqlBinDir/mysql -u$mysql_user -p$mysql_pw | sed -e '1d'` + # tableArr=`echo "show tables from CSTA_DB_BK like '%Detail';"|$mysqlBinDir/mysql -u$mysql_user -p$mysql_pw | sed -e '1d'` - for table in $tableArr ; do - table_=$table"_" + # for table in $tableArr ; do + # table_=$table"_" - #detail - tmpTableArr=`echo "show tables from CSTA_DB_BK like '$table_%';"|$mysqlBinDir/mysql -u$mysql_user -p$mysql_pw | sed -e '1d'` - for tmpTable in $tmpTableArr ;do - rm -f $dstDataDir/CSTA_DB/$tmpTable.* - cp $dstDataDir/CSTA_DB/$table.frm $dstDataDir/CSTA_DB/$tmpTable.frm - cp $dstDataDir/CSTA_DB/$table.MYI $dstDataDir/CSTA_DB/$tmpTable.MYI - cp $dstDataDir/CSTA_DB/$table.MYD $dstDataDir/CSTA_DB/$tmpTable.MYD - done + # #detail + # tmpTableArr=`echo "show tables from CSTA_DB_BK like '$table_%';"|$mysqlBinDir/mysql -u$mysql_user -p$mysql_pw | sed -e '1d'` + # for tmpTable in $tmpTableArr ;do + # rm -f $dstDataDir/CSTA_DB/$tmpTable.* + # cp $dstDataDir/CSTA_DB/$table.frm $dstDataDir/CSTA_DB/$tmpTable.frm + # cp $dstDataDir/CSTA_DB/$table.MYI $dstDataDir/CSTA_DB/$tmpTable.MYI + # cp $dstDataDir/CSTA_DB/$table.MYD $dstDataDir/CSTA_DB/$tmpTable.MYD + # done - #sum - sumTable=`echo "$table" | sed -e s/Detail/Sum/g` - table_=`echo "$table_" | sed -e s/Detail/Sum/g` - tmpTableArr=`echo "show tables from CSTA_DB_BK like '$table_%';"|$mysqlBinDir/mysql -u$mysql_user -p$mysql_pw | sed -e '1d'` - for tmpTable in $tmpTableArr ;do - rm -f $dstDataDir/CSTA_DB/$tmpTable.* - cp $dstDataDir/CSTA_DB/$sumTable.frm $dstDataDir/CSTA_DB/$tmpTable.frm - cp $dstDataDir/CSTA_DB/$sumTable.MYI $dstDataDir/CSTA_DB/$tmpTable.MYI - cp $dstDataDir/CSTA_DB/$sumTable.MYD $dstDataDir/CSTA_DB/$tmpTable.MYD - done - done + # #sum + # sumTable=`echo "$table" | sed -e s/Detail/Sum/g` + # table_=`echo "$table_" | sed -e s/Detail/Sum/g` + # tmpTableArr=`echo "show tables from CSTA_DB_BK like '$table_%';"|$mysqlBinDir/mysql -u$mysql_user -p$mysql_pw | sed -e '1d'` + # for tmpTable in $tmpTableArr ;do + # rm -f $dstDataDir/CSTA_DB/$tmpTable.* + # cp $dstDataDir/CSTA_DB/$sumTable.frm $dstDataDir/CSTA_DB/$tmpTable.frm + # cp $dstDataDir/CSTA_DB/$sumTable.MYI $dstDataDir/CSTA_DB/$tmpTable.MYI + # cp $dstDataDir/CSTA_DB/$sumTable.MYD $dstDataDir/CSTA_DB/$tmpTable.MYD + # done + # done - rm -rf $dstDataDir/CSTA_DB_BK + # rm -rf $dstDataDir/CSTA_DB_BK - chown -R mysql $dstDataDir/ - chgrp -R mysql $dstDataDir/ - chmod -R 755 $dstDataDir/ + # chown -R mysql $dstDataDir/ + # chgrp -R mysql $dstDataDir/ + # chmod -R 755 $dstDataDir/ upGradeDb CSTA_DB %Detail_% upGradeDb CSTA_DB %Sum_% @@ -684,6 +699,11 @@ if [ "$installMode" == "2" ] ; then upGradeDb SMCLI subscriber upGradeDb OBJ_330 subsParamConf_1 + upGradeDb HLR_DB '' + upGradeDb PPS_DB daily_report + upGradeDb PPS_DB user_info + upGradeDb VLR_DB '' + # update "OBJ_360.subsParamConf_1" field setTemplate_2 to empty #echo "update OBJ_360.subsParamConf_1 set setTemplate_2 to empty" echo "update OBJ_360.subsParamConf_1 set setTemplate_2='' where keyId=1" |$mysqlBinDir/mysql -u$mysql_user -p$mysql_pw @@ -693,6 +713,16 @@ if [ "$installMode" == "2" ] ; then upGradeDb $tmp_file subsParamConf_% done + + + manualSqlFile="$srcDir/manual_sql_updates.sql" + if [ -f "$manualSqlFile" ]; then + #echo "Executing manual SQL updates from $manualSqlFile..." + $mysqlBinDir/mysql -u$mysql_user -p$mysql_pw < $manualSqlFile + else + echo "No manual SQL updates found." + fi + chown -R mysql $dstDataDir/ chgrp -R mysql $dstDataDir/ chmod -R 755 $dstDataDir/ @@ -911,18 +941,6 @@ UPDATE OMC_PUB.omcPubVarConf SET pubVarValue='15' WHERE pubVarName='HTTPSessionT UPDATE OMC_PUB.omcPubVarConf SET pubVarValue='60' WHERE pubVarName='GenerateCDRFileInterval'; UPDATE OMC_PUB.omcPubVarConf SET pubVarValue='0' WHERE pubVarName='ExternalRCM'; DELETE FROM BssOmcDb.OMCR_BSSTABLE; -INSERT INTO BssOmcDb.OMCR_BSSTABLE(bssid,ip,name,remark,connected,alarmed,uploaded)VALUES(0,'','','',0,0,0); -INSERT INTO BssOmcDb.OMCR_BSSTABLE(bssid,ip,name,remark,connected,alarmed,uploaded)VALUES(1,'','','',0,0,0); -INSERT INTO BssOmcDb.OMCR_BSSTABLE(bssid,ip,name,remark,connected,alarmed,uploaded)VALUES(2,'','','',0,0,0); -INSERT INTO BssOmcDb.OMCR_BSSTABLE(bssid,ip,name,remark,connected,alarmed,uploaded)VALUES(3,'','','',0,0,0); -INSERT INTO BssOmcDb.OMCR_BSSTABLE(bssid,ip,name,remark,connected,alarmed,uploaded)VALUES(4,'','','',0,0,0); -INSERT INTO BssOmcDb.OMCR_BSSTABLE(bssid,ip,name,remark,connected,alarmed,uploaded)VALUES(5,'','','',0,0,0); -INSERT INTO BssOmcDb.OMCR_BSSTABLE(bssid,ip,name,remark,connected,alarmed,uploaded)VALUES(6,'','','',0,0,0); -INSERT INTO BssOmcDb.OMCR_BSSTABLE(bssid,ip,name,remark,connected,alarmed,uploaded)VALUES(7,'','','',0,0,0); -INSERT INTO BssOmcDb.OMCR_BSSTABLE(bssid,ip,name,remark,connected,alarmed,uploaded)VALUES(8,'','','',0,0,0); -INSERT INTO BssOmcDb.OMCR_BSSTABLE(bssid,ip,name,remark,connected,alarmed,uploaded)VALUES(9,'','','',0,0,0); -INSERT INTO BssOmcDb.OMCR_BSSTABLE(bssid,ip,name,remark,connected,alarmed,uploaded)VALUES(10,'','','',0,0,0); -INSERT INTO BssOmcDb.OMCR_BSSTABLE(bssid,ip,name,remark,connected,alarmed,uploaded)VALUES(11,'','','',0,0,0); _EOF_ fi