From ef6b9e9714b6c2621fe4c48ddb236ff84ae43511 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Fri, 10 Nov 2023 07:47:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/components/application.vue |  1 +
 src/views/dashboard/components/sanlianping.vue |  8 ++++----
 src/views/dashboard/components/userinfo.vue    | 10 +++++-----
 src/views/dashboard/index.vue                  |  9 ++++++++-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/dashboard/components/application.vue b/src/views/dashboard/components/application.vue
index 4cb3d1f39..61690a986 100644
--- a/src/views/dashboard/components/application.vue
+++ b/src/views/dashboard/components/application.vue
@@ -4,6 +4,7 @@
 @ 备注: 应用
 -->
 <script lang='ts' setup>
+import { createOneClickLogin } from "@/api/system/roleapi/rolecont";
 import AppContent from '@/views/appstore/appmarket/content.vue'
 const appLoading = ref(false)
 const fits = 'fill'
diff --git a/src/views/dashboard/components/sanlianping.vue b/src/views/dashboard/components/sanlianping.vue
index 40f8b0459..dcfa061c6 100644
--- a/src/views/dashboard/components/sanlianping.vue
+++ b/src/views/dashboard/components/sanlianping.vue
@@ -15,15 +15,15 @@ const targetListAryes = ref<any[]>([])
 
 const targetXingListAry = ref<any[]>([])
 //定性同比环比分析
-const dingXingYear = ref<number>()
+const dingXingYear = ref<any>()
 const dingXingOrg = ref<any>()
 const dingXingTarget = ref<any>()
 //定量指标目标达成
-const dingLiangDaChengYear = ref<number>()
+const dingLiangDaChengYear = ref<any>()
 const dingLiangDaChengOrg = ref<any>()
 const dingLiangDaChengTarget = ref<any>()
 //定量同比环比分析
-const dingLiangYear = ref<number>()
+const dingLiangYear = ref<any>()
 const dingLiangOrg = ref<any>()
 const dingLiangTarget = ref<any>()
 //获取公司下的主部门
@@ -284,7 +284,7 @@ const bdBdtTsMubiao = () =>{
 						  type: data.data.series[2].type,
 						  yAxisIndex: 1,
 						  tooltip: {
-							valueFormatter: function (value) {
+							valueFormatter: function (value:any) {
 							  return value + data.data.series[2].tooltip;
 							}
 						  },
diff --git a/src/views/dashboard/components/userinfo.vue b/src/views/dashboard/components/userinfo.vue
index d58c28beb..46156ca93 100644
--- a/src/views/dashboard/components/userinfo.vue
+++ b/src/views/dashboard/components/userinfo.vue
@@ -56,19 +56,19 @@ const props = defineProps({
 				</el-col>
 			</el-row>
 			<el-row>
-				<el-col :xs="4" :sm="7" :md="6" :lg="5" :xl="4"><span class="fa fa-map-marker span_icon_left"></span>住址</el-col>
-				<el-col :xs="20" :sm="17" :md="18" :lg="19" :xl="20">{{ props.userStore.userInfoCont.currentresidence }}</el-col>
+				<el-col :xs="4" :sm="7" :md="6" :lg="5" :xl="5"><span class="fa fa-map-marker span_icon_left"></span>住址</el-col>
+				<el-col :xs="20" :sm="17" :md="18" :lg="19" :xl="19"><el-text>{{ props.userStore.userInfoCont.currentresidence }}</el-text></el-col>
 			</el-row>
 			<el-row>
-				<el-col :xs="4" :sm="7" :md="6" :lg="5" :xl="4"><span class="fa fa-podcast span_icon_left"></span>职务</el-col>
-				<el-col :xs="20" :sm="17" :md="18" :lg="19" :xl="20"><el-text v-for="(im,index) in props.userStore.userInfoCont.postlist" :key="index">{{im}}</el-text></el-col>
+				<el-col :xs="4" :sm="7" :md="6" :lg="5" :xl="5"><span class="fa fa-podcast span_icon_left"></span>职务</el-col>
+				<el-col :xs="20" :sm="17" :md="18" :lg="19" :xl="19"><el-text v-for="(im,index) in props.userStore.userInfoCont.postlist" :key="index">{{im}}</el-text></el-col>
 			</el-row>
 			
 	</el-card>
 </template>
 <style  lang='scss' scoped>
 .span_icon_left{
-	margin-right:10px;
+	margin-right:5px;
 	
 }
 </style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 5f1cd92be..243ad4436 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -55,7 +55,7 @@ onMounted(() => {
 })
 </script>
 <template>
-		<div ref="masterBody" class="app-container" style="margin-top:10px;">
+		<div ref="masterBody" class="app_container">
 			<el-row :gutter="10">
 				<el-col :xs="24" :sm="16" :md="16" :lg="18" :xl="19" class="readback">
 					<AllOrgYear  :org-list-cont="orgListCont" :education-org-id="educationOrgId" />
@@ -102,9 +102,16 @@ onMounted(() => {
 					
 				</el-col>
 			</el-row>
+			
 		</div>
 </template>
 <style  lang='scss' scoped>
+.app_container{
+	padding: 10px 20px 0px 20px;
+	height: calc(100vh - 90px);
+	overflow: hidden;
+	overflow-y: auto;
+}
 .readback{
 	// background-color:#FF0000;
 	.allOrgAxisCares{

From 441180a03832aff039d6c7cd739cde8e9cab520e Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Tue, 14 Nov 2023 13:23:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Redsis=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/redis/api.ts                   |  24 ++
 src/api/system/redis/types.ts                 |  17 +
 src/views/dashboard/index.vue                 |   2 +-
 .../knowledge/components/KnowledgeContent.vue |   4 +-
 src/views/redismanage/datamigration/index.vue | 373 ++++++++++++++++++
 5 files changed, 417 insertions(+), 3 deletions(-)
 create mode 100644 src/api/system/redis/api.ts
 create mode 100644 src/api/system/redis/types.ts
 create mode 100644 src/views/redismanage/datamigration/index.vue

diff --git a/src/api/system/redis/api.ts b/src/api/system/redis/api.ts
new file mode 100644
index 000000000..f357db73d
--- /dev/null
+++ b/src/api/system/redis/api.ts
@@ -0,0 +1,24 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+import { 
+	redisConfing,
+	copyRedisDatabase
+ } from './types';
+
+ //测试Redis数据库链接
+export const testRedisLink = (data: redisConfing):any => {
+	return request({
+			url: '/systemapi/redis/testRedisLink',
+			method: 'post',
+			data: data
+	})
+}
+ //迁移Redis数据库
+ export const moveOldRedisToNewRedis = (data: copyRedisDatabase):any => {
+	return request({
+			url: '/systemapi/redis/moveOldRedisToNewRedis',
+			method: 'post',
+			data: data
+	})
+}
diff --git a/src/api/system/redis/types.ts b/src/api/system/redis/types.ts
new file mode 100644
index 000000000..7db82a09e
--- /dev/null
+++ b/src/api/system/redis/types.ts
@@ -0,0 +1,17 @@
+export interface redisConfing {
+	ip: string;
+	port: number;
+	pwd: string;
+	state: number;
+}
+//Redis数据及含有的键数量
+export interface redisKeysNumber {
+	dbName:number;
+	dbNumber:number;
+}
+//迁移Redis数据库参数
+export interface copyRedisDatabase  {
+	originRedis:redisConfing;
+	targetRedis:redisConfing;
+	dblist:Number[];
+}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 243ad4436..289265b71 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -51,7 +51,7 @@ onMounted(() => {
 	
 	drawerWidht.value = masterBody.value?.clientWidth
 	getOrgList();
-	console.log("热门新闻----100---->",drawerWidht.value)
+	// console.log("热门新闻----100---->",drawerWidht.value)
 })
 </script>
 <template>
diff --git a/src/views/knowledge/knowledge/components/KnowledgeContent.vue b/src/views/knowledge/knowledge/components/KnowledgeContent.vue
index 802b696f1..6eaebc289 100644
--- a/src/views/knowledge/knowledge/components/KnowledgeContent.vue
+++ b/src/views/knowledge/knowledge/components/KnowledgeContent.vue
@@ -57,7 +57,7 @@ onMounted(() => {
 
 <template>
     <el-dialog v-model="boxShow" class="dialogStyle" :show-close="true">
-        <template #header="{ close, titleId, titleClass }">
+        <template #header="{  titleId, titleClass }">
             <div class="my-header">
                 <h4 :id="titleId" :class="titleClass" style="margin-top: 5px;">{{ props.contentSource?.gTitle }}</h4>
                 <!-- <h4 :id="titleId" :class="titleClass" style="margin-top: 5px;">{{ props.contentSource?.gContent }}</h4> -->
@@ -93,4 +93,4 @@ onMounted(() => {
     margin-top: 0% !important;
     padding-top: 0% !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/redismanage/datamigration/index.vue b/src/views/redismanage/datamigration/index.vue
new file mode 100644
index 000000000..eac84dc36
--- /dev/null
+++ b/src/views/redismanage/datamigration/index.vue
@@ -0,0 +1,373 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2023-11-13 10:44:48
+@ 备注: Redis数据迁移
+-->
+<script lang='ts' setup>
+import { Eleme } from '@element-plus/icons-vue'
+import { redisConfing,redisKeysNumber } from '@/api/system/redis/types'
+import { testRedisLink,moveOldRedisToNewRedis } from '@/api/system/redis/api'
+const svg = `
+        <path class="path" d="
+          M 30 15
+          L 28 17
+          M 25.61 25.61
+          A 15 15, 0, 0, 1, 15 30
+          A 15 15, 0, 1, 1, 27.99 7.5
+          L 15 15
+        " style="stroke-width: 4px; fill: rgba(0, 0, 0, 0)"/>
+	`
+const originConfig = reactive<redisConfing>({
+	ip:"127.0.0.1",
+	port:6379,
+	pwd:"",
+	state:0
+})
+const targetConfig = reactive<redisConfing>({
+	ip:"127.0.0.1",
+	port:6379,
+	pwd:"",
+	state:0
+})
+const originTestLoad = ref(false);	//测试源
+const originTextType = ref<string>("info")
+const originDbNumber = ref<number>(0)
+const originCheckList = ref<number[]>([])
+const originKeyList = reactive<redisKeysNumber[]>([])
+//进行源Redis连接测试
+const originTestLink = () =>{
+	originTestLoad.value=true
+	originConfig.port = originConfig.port*1
+	originConfig.state = originConfig.state*1
+	testRedisLink(originConfig)
+		.then((data:any)=>{
+			if(data.data.isTrue){
+				if(data.data.isTrue == 1){
+					originConfig.state = 1
+					originTextType.value = "success"
+				}else{
+					originConfig.state = 2
+					originTextType.value = "danger"
+				}
+			}else{
+				originConfig.state = 2
+			}
+			if(data.data.dbNumber){
+				originDbNumber.value = data.data.dbNumber
+			}
+			originKeyList.splice(0,originKeyList.length);
+			if(data.data.redisList && data.data.redisList.length > 0){
+				data.data.redisList.forEach((item:any)=>{
+					originKeyList.push({
+						dbName: item.dbName,
+						dbNumber:  item.dbNumber
+					})
+				})
+			}
+			// console.log("进行源Redis连接测试",originConfig,originKeyList)
+		})
+		.finally(()=>{
+			originTestLoad.value=false
+		})
+}
+const targetTestLoad = ref(false);	//测试目标
+const targetTextType = ref<string>("info")
+const targetDbNumber = ref<number>(1)
+const targetKeyList = reactive<redisKeysNumber[]>([])
+//进行目标Redis连接测试
+const targetTestLink = () =>{
+	targetTestLoad.value=true
+	targetConfig.port = targetConfig.port*1
+	targetConfig.state = targetConfig.state*1
+	testRedisLink(targetConfig)
+		.then((data:any)=>{
+			if(data.data.isTrue){
+				if(data.data.isTrue == 1){
+					targetConfig.state = 1
+					targetTextType.value = "success"
+				}else{
+					targetConfig.state = 2
+					targetTextType.value = "danger"
+				}
+			}else{
+				targetConfig.state = 2
+			}
+			// targetDbNumber.value = new Array
+			if(data.data.dbNumber){
+				targetDbNumber.value = data.data.dbNumber
+			}
+			targetKeyList.splice(0,targetKeyList.length);
+			if(data.data.redisList && data.data.redisList.length > 0){
+				data.data.redisList.forEach((item:any)=>{
+					targetKeyList.push({
+						dbName: item.dbName,
+						dbNumber:  item.dbNumber
+					})
+				})
+			}
+			
+		})
+		.finally(()=>{
+			targetTestLoad.value=false
+		})
+}
+//迁移
+const migrateLoad = ref(false)
+const logList = ref<any[]>([])
+const migrateRedisInfo = () =>{
+	migrateLoad.value = true
+	if(originConfig.state != 1){
+		migrateLoad.value = false;
+		ElMessageBox({
+			title: '温馨提示！',
+			// message: "您未进行源Redis连通性测试！为确保迁移正常进行，请先测试一下是否可以连通！",
+			message:h('p', null, [
+				h('span', null, '您未进行'),
+				h('span', { style: 'color: #ff0000' }, '源Redis连通性测试！'),
+				h('span', null, '为确保迁移正常进行，请先测试一下'),
+				h('span', { style: 'color: #ff0000' }, '是否可以连通！'),
+			])
+		})
+		return
+	}
+	if(targetConfig.state != 1){
+		migrateLoad.value = false;
+		ElMessageBox({
+			title: '温馨提示！',
+			// message: "您未进行目标Redis连通性测试！为确保迁移正常进行，请先测试一下是否可以连通！",
+			message:h('p', null, [
+				h('span', null, '您未进行'),
+				h('span', { style: 'color: #ff0000' }, '目标Redis连通性测试！'),
+				h('span', null, '为确保迁移正常进行，请先测试一下'),
+				h('span', { style: 'color: #ff0000' }, '是否可以连通！'),
+			])
+		})
+		return
+	}
+	if(targetConfig.ip == originConfig.ip && targetConfig.port == originConfig.port){
+		migrateLoad.value = false;
+		ElMessageBox({
+			title: '温馨提示！',
+			// message: "您未进行目标Redis连通性测试！为确保迁移正常进行，请先测试一下是否可以连通！",
+			message:h('p', null, [
+				h('span', { style: 'color: #ff0000' }, '源Redis与目标Redis相同！'),
+				h('span', null, '不能进行迁移！'),
+			])
+		})
+		return
+	}
+	let sendInfo = {
+		originRedis:originConfig,	//源
+		targetRedis:targetConfig,	//目标
+		dblist:originCheckList.value	//选择库
+	}
+	moveOldRedisToNewRedis(sendInfo)
+		.then((data)=>{
+			console.log("进行源Redis连接测试",data)
+			logList.value = data.data
+		})
+		.finally(()=>{
+			migrateLoad.value = false;
+		})
+	
+	
+}
+</script>
+<template>
+	<div class="app-main body_cont">
+		<table border="1" class="table_body">
+			<tr>
+				<td rowspan="4" width="10%" align="center">源Redsi</td>
+				<td width="35%">
+					<table border="0">
+						<tr>
+							<td width="60">IP地址</td>
+							<td><el-input v-model="originConfig.ip" clearable  placeholder="请输入Redis源IP"></el-input></td>
+						</tr>
+					</table>
+				</td>
+				<td rowspan="4"  colspan="2"  width="10%" align="center">
+					<el-button :loading-icon="Eleme" :loading="migrateLoad" type="primary" style="width:100%" @click="migrateRedisInfo">迁移</el-button>
+				</td>
+
+				<td  width="35%">
+					<table border="0">
+						<tr>
+							<td width="60">IP地址</td>
+							<td><el-input v-model="targetConfig.ip" clearable  placeholder="请输入Redis源IP"></el-input></td>
+						</tr>
+					</table>
+				</td>
+				<td  rowspan="4"  width="10%" align="center">目标Redis</td>
+			</tr>
+			<tr>
+				<td>
+					<table border="0">
+						<tr>
+							<td width="60">端口</td>
+							<td><el-input v-model="originConfig.port" type="number" clearable  placeholder="请输入Redis源IP"></el-input></td>
+						</tr>
+					</table>
+				</td>
+				
+
+				<td>
+					<table border="0">
+						<tr>
+							<td width="60">端口</td>
+							<td><el-input v-model="targetConfig.port" type="number" clearable  placeholder="请输入Redis源IP"></el-input></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<table border="0">
+						<tr>
+							<td width="60">密码</td>
+							<td><el-input v-model="originConfig.pwd" type="password" show-password clearable  placeholder="请输入Redis源IP"></el-input></td>
+						</tr>
+					</table>
+				</td>
+				
+
+				<td>
+					<table border="0">
+						<tr>
+							<td width="60">密码</td>
+							<td><el-input v-model="targetConfig.pwd" type="password" show-password clearable  placeholder="请输入Redis源IP"></el-input></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<table border="0">
+						<tr>
+							<td  width="50">
+								<el-button :loading-icon="Eleme" :loading="originTestLoad" type="primary" @click="originTestLink">测试链接</el-button>
+							</td>
+							<td align="right">
+								<el-text class="mx-1" :type="originTextType">
+									<i v-if="originConfig.state == 1" class="fa fa-check"></i>
+									<i v-else-if="originConfig.state == 2" class="fa fa-close"></i>
+									<span v-else>未测试</span>
+								</el-text>
+								
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td>
+					<table border="0">
+						<tr>
+							<td align="left">
+								<el-text class="mx-1" :type="targetTextType">
+									<i v-if="targetConfig.state == 1" class="fa fa-check"></i>
+									<i v-else-if="targetConfig.state == 2" class="fa fa-close"></i>
+									<span v-else>未测试</span>
+								</el-text>
+							</td>
+							<td  width="50">
+								<el-button :loading-icon="Eleme" :loading="targetTestLoad" type="primary"  @click="targetTestLink">测试链接</el-button>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td valign="top" align="center">数据库列表</td>
+				<td valign="top"  colspan="2" class="min_td_height"  width="40%" style="table-layout:fixed">
+	
+					<el-checkbox-group v-model="originCheckList">
+						<el-row :gutter="10">
+							<el-col v-for="(item,index) in originKeyList" :key="index" :span="6" class="row_col_body">
+								<el-checkbox :label="item.dbName" border size="small">DB{{item.dbName}}(Keys:{{item.dbNumber}})</el-checkbox>
+							</el-col>
+						</el-row>
+					</el-checkbox-group>
+
+				</td>
+				<td valign="top"  colspan="2" class="min_td_height"  width="40%" style="table-layout:fixed">
+		
+						<el-row :gutter="10">
+							<el-col v-for="(item,index) in targetKeyList" :key="index" :span="6" class="row_col_body">
+								<el-button size="small">DB{{item.dbName}}(Keys:{{item.dbNumber}})</el-button>
+							</el-col>
+						</el-row>
+				
+				</td>
+				<td valign="top" align="center">数据库列表</td>
+			</tr>
+			<tr>
+				<td valign="top" align="center">处理结果</td>
+				<td colspan="5" valign="top">
+					<div 
+						v-loading="migrateLoad"
+						element-loading-text="Loading..."
+						:element-loading-spinner="svg"
+						element-loading-svg-view-box="-10, -10, 50, 50"
+						element-loading-background="rgba(122, 122, 122, 0.8)"
+						class="chuli_jieguo"
+					>
+						<div v-for="(item,index) in logList" :key="index" class="text_width">
+							<el-text type="warning" >开始迁移Rdis:{{ item.dbName }}库</el-text>
+							<el-text  v-for="(logCont,lgindex) in item.msgList" :key="lgindex" :type="logCont.state==1?'success':'warning'"  >{{ logCont.keys }}：{{ logCont.msg }}</el-text>
+							<el-text type="primary"  >Rdis:{{ item.dbName }}库迁移完成</el-text>
+						</div>
+					</div>
+				</td>
+			</tr>
+		</table>
+	</div>
+</template>
+<style  lang='scss' scoped>
+.body_cont{
+	padding:20px;
+}
+.table_body{
+	background-color: #FFFFFF;
+	width:100%;
+	border-collapse: collapse;
+	/*
+       * 设置边框
+       */
+	td,th {
+        border: 1px solid black;
+		padding: 5px;
+		table{
+			width:100%;
+			td,th{
+				border: 0px solid black;
+				padding: 0px;
+			}
+		}
+    }
+}
+.left_border{
+	border-left: 1px solid black;
+}
+.min_td_height{
+	height:150px;
+}
+.chuli_jieguo{
+	height: calc(100vh - 480px);
+	overflow: hidden;
+	overflow-y: auto;
+}
+.checkbox_group{
+	max-width:300px;
+}
+.row_col_body{
+	margin-top:10px;
+}
+.text_width{
+	border-bottom: 1px solid #EEEEEE;
+	padding:5px 0;
+	span {
+		display: block;
+		width: 100%;
+		margin-top: 5px;
+	}
+}
+</style>