From 4efa19136b1a538d80b44a37ee36633c28049e87 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Tue, 28 Mar 2023 16:23:55 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=8E=A8=E9=80=81=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.vue                                 |   0
 .../message.data.ts                           |   0
 .../UserManageModal.vue                       |   0
 .../{pushUserManage => pushConcern}/index.vue |   0
 .../userManage.data.ts                        |   0
 .../ThirdPartyModal.vue                       |   0
 .../index.vue                                 |   0
 .../thirdParty.data.ts                        |   0
 .../ThirdPartyModal.vue                       |   0
 .../index.vue                                 |   0
 .../thirdParty.data.ts                        |   0
 .../UserManageModal.vue}                      |  34 ++---
 .../push/{pushWhitelist => pushFan}/index.vue |  41 ++++--
 .../userManage.data.ts                        |   0
 .../UserManageModal.vue                       |   0
 .../index.vue                                 |   0
 .../push/pushFriendAudit/userManage.data.ts   | 132 ++++++++++++++++++
 .../{pushFile => pushRingtone}/file.data.ts   |   0
 .../push/{pushFile => pushRingtone}/index.vue |   0
 .../push/pushWhitelist/passList.data.ts       |  71 ----------
 .../setting/entCertification/Step1.vue        |   2 +-
 .../setting/entCertification/Step3.vue        |   2 +-
 22 files changed, 177 insertions(+), 105 deletions(-)
 rename src/views/common/push/{pushMessage => pushChatMessage}/index.vue (100%)
 rename src/views/common/push/{pushMessage => pushChatMessage}/message.data.ts (100%)
 rename src/views/common/push/{pushUserManage => pushConcern}/UserManageModal.vue (100%)
 rename src/views/common/push/{pushUserManage => pushConcern}/index.vue (100%)
 rename src/views/common/push/{pushTodoUserManage => pushConcern}/userManage.data.ts (100%)
 rename src/views/common/push/{pushThirdParty => pushEnterprise}/ThirdPartyModal.vue (100%)
 rename src/views/common/push/{pushThirdParty => pushEnterprise}/index.vue (100%)
 rename src/views/common/push/{pushThirdParty => pushEnterprise}/thirdParty.data.ts (100%)
 rename src/views/common/push/{pushTodoThirdParty => pushEnterpriseAudit}/ThirdPartyModal.vue (100%)
 rename src/views/common/push/{pushTodoThirdParty => pushEnterpriseAudit}/index.vue (100%)
 rename src/views/common/push/{pushTodoThirdParty => pushEnterpriseAudit}/thirdParty.data.ts (100%)
 rename src/views/common/push/{pushWhitelist/PassListModal.vue => pushFan/UserManageModal.vue} (64%)
 rename src/views/common/push/{pushWhitelist => pushFan}/index.vue (77%)
 rename src/views/common/push/{pushUserManage => pushFan}/userManage.data.ts (100%)
 rename src/views/common/push/{pushTodoUserManage => pushFriendAudit}/UserManageModal.vue (100%)
 rename src/views/common/push/{pushTodoUserManage => pushFriendAudit}/index.vue (100%)
 create mode 100644 src/views/common/push/pushFriendAudit/userManage.data.ts
 rename src/views/common/push/{pushFile => pushRingtone}/file.data.ts (100%)
 rename src/views/common/push/{pushFile => pushRingtone}/index.vue (100%)
 delete mode 100644 src/views/common/push/pushWhitelist/passList.data.ts

diff --git a/src/views/common/push/pushMessage/index.vue b/src/views/common/push/pushChatMessage/index.vue
similarity index 100%
rename from src/views/common/push/pushMessage/index.vue
rename to src/views/common/push/pushChatMessage/index.vue
diff --git a/src/views/common/push/pushMessage/message.data.ts b/src/views/common/push/pushChatMessage/message.data.ts
similarity index 100%
rename from src/views/common/push/pushMessage/message.data.ts
rename to src/views/common/push/pushChatMessage/message.data.ts
diff --git a/src/views/common/push/pushUserManage/UserManageModal.vue b/src/views/common/push/pushConcern/UserManageModal.vue
similarity index 100%
rename from src/views/common/push/pushUserManage/UserManageModal.vue
rename to src/views/common/push/pushConcern/UserManageModal.vue
diff --git a/src/views/common/push/pushUserManage/index.vue b/src/views/common/push/pushConcern/index.vue
similarity index 100%
rename from src/views/common/push/pushUserManage/index.vue
rename to src/views/common/push/pushConcern/index.vue
diff --git a/src/views/common/push/pushTodoUserManage/userManage.data.ts b/src/views/common/push/pushConcern/userManage.data.ts
similarity index 100%
rename from src/views/common/push/pushTodoUserManage/userManage.data.ts
rename to src/views/common/push/pushConcern/userManage.data.ts
diff --git a/src/views/common/push/pushThirdParty/ThirdPartyModal.vue b/src/views/common/push/pushEnterprise/ThirdPartyModal.vue
similarity index 100%
rename from src/views/common/push/pushThirdParty/ThirdPartyModal.vue
rename to src/views/common/push/pushEnterprise/ThirdPartyModal.vue
diff --git a/src/views/common/push/pushThirdParty/index.vue b/src/views/common/push/pushEnterprise/index.vue
similarity index 100%
rename from src/views/common/push/pushThirdParty/index.vue
rename to src/views/common/push/pushEnterprise/index.vue
diff --git a/src/views/common/push/pushThirdParty/thirdParty.data.ts b/src/views/common/push/pushEnterprise/thirdParty.data.ts
similarity index 100%
rename from src/views/common/push/pushThirdParty/thirdParty.data.ts
rename to src/views/common/push/pushEnterprise/thirdParty.data.ts
diff --git a/src/views/common/push/pushTodoThirdParty/ThirdPartyModal.vue b/src/views/common/push/pushEnterpriseAudit/ThirdPartyModal.vue
similarity index 100%
rename from src/views/common/push/pushTodoThirdParty/ThirdPartyModal.vue
rename to src/views/common/push/pushEnterpriseAudit/ThirdPartyModal.vue
diff --git a/src/views/common/push/pushTodoThirdParty/index.vue b/src/views/common/push/pushEnterpriseAudit/index.vue
similarity index 100%
rename from src/views/common/push/pushTodoThirdParty/index.vue
rename to src/views/common/push/pushEnterpriseAudit/index.vue
diff --git a/src/views/common/push/pushTodoThirdParty/thirdParty.data.ts b/src/views/common/push/pushEnterpriseAudit/thirdParty.data.ts
similarity index 100%
rename from src/views/common/push/pushTodoThirdParty/thirdParty.data.ts
rename to src/views/common/push/pushEnterpriseAudit/thirdParty.data.ts
diff --git a/src/views/common/push/pushWhitelist/PassListModal.vue b/src/views/common/push/pushFan/UserManageModal.vue
similarity index 64%
rename from src/views/common/push/pushWhitelist/PassListModal.vue
rename to src/views/common/push/pushFan/UserManageModal.vue
index 8cb7e0f..d8bcae0 100644
--- a/src/views/common/push/pushWhitelist/PassListModal.vue
+++ b/src/views/common/push/pushFan/UserManageModal.vue
@@ -9,19 +9,19 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-/**
- * 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
- * 采用vben-动态表格表单封装组件编写,采用 setup 写法
- * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
- * author entfrm开发团队-王翔
- */
-import {ref, unref} from 'vue';
-import {BasicForm, useForm} from '/@/components/Form/index';
-import {formSchema} from './passList.data';
-import {addPushPassList, editPushPassList, getPushPassList} from '/@/api/platform/common/controller/pushPassList';
-import {BasicModal, ModalProps, useModalInner} from '/@/components/Modal';
+  /**
+   * 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
+   * 采用vben-动态表格表单封装组件编写,采用 setup 写法
+   * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
+   * author entfrm开发团队-王翔
+   */
+  import { ref, unref } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema } from './userManage.data';
+  import { addPushUserManage, editPushUserManage, getPushUserManage } from '/@/api/platform/common/controller/pushUserManage';
+  import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
 
-/** 通用变量统一声明区域 */
+  /** 通用变量统一声明区域 */
   const tag = ref<Nullable<string>>('');
   /** https://v3.cn.vuejs.org/api/options-data.html#emits */
   const emit = defineEmits(['success', 'register']);
@@ -42,11 +42,11 @@ import {BasicModal, ModalProps, useModalInner} from '/@/components/Modal';
     // 采用tag标签区分操作
     switch (unref(tag)) {
       case 'add':
-        props.title = '新增白名单';
+        props.title = '新增推送';
         break;
       case 'edit':
-        props.title = '编辑白名单';
-        await setFieldsValue(await getPushPassList(refId));
+        props.title = '编辑推送';
+        await setFieldsValue(await getPushUserManage(refId));
         break;
     }
     // 尾部:设置处理后的最终配置数据
@@ -63,10 +63,10 @@ import {BasicModal, ModalProps, useModalInner} from '/@/components/Modal';
       // 采用tag标签区分操作
       switch (unref(tag)) {
         case 'add':
-          await addPushPassList(formData);
+          await addPushUserManage(formData);
           break;
         case 'edit':
-          await editPushPassList(formData);
+          await editPushUserManage(formData);
           break;
       }
       // 处理提交完成之后逻辑
diff --git a/src/views/common/push/pushWhitelist/index.vue b/src/views/common/push/pushFan/index.vue
similarity index 77%
rename from src/views/common/push/pushWhitelist/index.vue
rename to src/views/common/push/pushFan/index.vue
index 67b5faa..2f51039 100644
--- a/src/views/common/push/pushWhitelist/index.vue
+++ b/src/views/common/push/pushFan/index.vue
@@ -7,20 +7,26 @@
       <template #toolbar>
         <!--<a-button type="primary"
                   @click="handleAdd()"
-        >新增白名单</a-button>
-        <a-button type="primary"
-                  :disabled="state.single"
-                  @click="handleEdit()"
-        >修改白名单</a-button>-->
+        >新增推送</a-button>-->
+        <a-button
+          type="primary"
+          :disabled="state.single"
+          @click="handleEdit()"
+        >修改推送</a-button>
         <a-button
           type="primary"
           :disabled="state.multiple"
           @click="handleDel()"
-        >移除白名单</a-button>
+        >移除推送</a-button>
       </template>
       <template #action="{ record }">
         <TableAction
           :actions="[
+            {
+              label: '编辑',
+              icon: 'fa6-regular:pen-to-square',
+              onClick: handleEdit.bind(null, record)
+            },
             {
               label: '移除',
               icon: 'ant-design:delete-outlined',
@@ -31,7 +37,7 @@
       </template>
     </BasicTable>
     <!--弹出窗体区域-->
-    <PassListModal @register="registerModal" @success="handleRefreshTable"/>
+    <UserManageModal @register="registerModal" @success="handleRefreshTable"/>
   </div>
 </template>
 
@@ -44,11 +50,15 @@
    */
   import { reactive, toRaw } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { listPushPassList, delPushPassList } from '/@/api/platform/common/controller/pushPassList';
+  import { listPushUserManage, delPushUserManage } from '/@/api/platform/common/controller/pushUserManage';
   import { useModal } from '/@/components/Modal';
-  import PassListModal from './PassListModal.vue';
-  import { columns, searchFormSchema } from './passList.data';
+  import UserManageModal from './UserManageModal.vue';
+  import { columns, searchFormSchema } from './userManage.data';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import {useUserStore} from '/@/store/modules/user';
+
+  const userStore = useUserStore();
+  const userInfoStore = userStore.getUserInfo;
 
   /** 类型规范统一声明定义区域 */
   interface TableState {
@@ -66,13 +76,13 @@
   const { createConfirm, createMessage } = useMessage();
   const [registerModal, { openModal }] = useModal();
   const [registerTable, { reload, clearSelectedRowKeys, getSelectRowKeys }] = useTable({
-    title: '白名单列表',
-    api: listPushPassList,
+    title: '推送列表',
+    api: listPushUserManage,
     rowKey: 'id',
     columns,
     formConfig: {
       compact: true,
-      labelWidth: 100,
+      labelWidth: 80,
       schemas: searchFormSchema,
       autoSubmitOnEnter: true,
       showAdvancedButton: true,
@@ -92,7 +102,8 @@
       fixed: false
     },
     searchInfo: {
-      type: '1'
+      status: '1',
+      fromUserId: userInfoStore.id
     },
     handleSearchInfoFn: () => clearSelectedRowKeys()
   });
@@ -123,7 +134,7 @@
       title: '警告',
       content: `是否确认移除编号为${ids}的数据?`,
       onOk: async () => {
-        await delPushPassList(ids);
+        await delPushUserManage(ids);
         createMessage.success('移除成功!');
         handleRefreshTable();
       }
diff --git a/src/views/common/push/pushUserManage/userManage.data.ts b/src/views/common/push/pushFan/userManage.data.ts
similarity index 100%
rename from src/views/common/push/pushUserManage/userManage.data.ts
rename to src/views/common/push/pushFan/userManage.data.ts
diff --git a/src/views/common/push/pushTodoUserManage/UserManageModal.vue b/src/views/common/push/pushFriendAudit/UserManageModal.vue
similarity index 100%
rename from src/views/common/push/pushTodoUserManage/UserManageModal.vue
rename to src/views/common/push/pushFriendAudit/UserManageModal.vue
diff --git a/src/views/common/push/pushTodoUserManage/index.vue b/src/views/common/push/pushFriendAudit/index.vue
similarity index 100%
rename from src/views/common/push/pushTodoUserManage/index.vue
rename to src/views/common/push/pushFriendAudit/index.vue
diff --git a/src/views/common/push/pushFriendAudit/userManage.data.ts b/src/views/common/push/pushFriendAudit/userManage.data.ts
new file mode 100644
index 0000000..9ca4141
--- /dev/null
+++ b/src/views/common/push/pushFriendAudit/userManage.data.ts
@@ -0,0 +1,132 @@
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+
+/** 表格列配置 */
+export const columns: BasicColumn[] = [
+  {
+    title: '名称',
+    dataIndex: 'userName'
+  },
+  {
+    title: '是否播放声音',
+    dataIndex: 'playSound',
+    customRender: ({record}) => {
+      return  ~~record?.playSound === 0 ? '是' : '否';
+    }
+  },
+  {
+    title: '是否震动',
+    dataIndex: 'playVibrate',
+    customRender: ({record}) => {
+      return  ~~record?.playVibrate === 0 ? '是' : '否';
+    }
+  },
+  {
+    title: '是否闪光',
+    dataIndex: 'playLights',
+    customRender: ({record}) => {
+      return  ~~record?.playLights === 0 ? '是' : '否';
+    }
+  },
+  {
+    title: '创建人',
+    dataIndex: 'createByName'
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 200
+  }
+];
+
+/** 搜索表单配置 */
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'userName',
+    label: '名称',
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入名称',
+    },
+    colProps: { span: 6 }
+  }
+];
+
+/** 表单配置 */
+export const formSchema: FormSchema[] = [
+  {
+    field: 'id',
+    label: 'ID',
+    component: 'Input',
+    show: false
+  },
+  {
+    field: 'toUserId',
+    label: '对方用户id',
+    component: 'Input',
+    show: false
+  },
+  {
+    field: 'fromUserId',
+    label: '发送方用户id',
+    component: 'Input',
+    show: false
+  },
+  {
+    field: 'userName',
+    label: '名称',
+    component: 'Input',
+    required: true,
+    componentProps: {
+      disabled: true
+    },
+  },
+  {
+    field: 'playSound',
+    label: '是否播放声音',
+    component: 'RadioGroup',
+    required: true,
+    defaultValue: '0',
+    componentProps: {
+      options: [
+        { label: '是', value: '0' },
+        { label: '否', value: '1' }
+      ]
+    },
+    colProps: {
+      span: 12
+    }
+  },
+  {
+    field: 'playVibrate',
+    label: '是否震动',
+    component: 'RadioGroup',
+    required: true,
+    defaultValue: '0',
+    componentProps: {
+      options: [
+        { label: '是', value: '0' },
+        { label: '否', value: '1' }
+      ]
+    },
+    colProps: {
+      span: 12
+    }
+  },
+  {
+    field: 'playLights',
+    label: '是否闪光',
+    component: 'RadioGroup',
+    required: true,
+    defaultValue: '0',
+    componentProps: {
+      options: [
+        { label: '是', value: '0' },
+        { label: '否', value: '1' }
+      ]
+    },
+    colProps: {
+      span: 12
+    }
+  },
+];
diff --git a/src/views/common/push/pushFile/file.data.ts b/src/views/common/push/pushRingtone/file.data.ts
similarity index 100%
rename from src/views/common/push/pushFile/file.data.ts
rename to src/views/common/push/pushRingtone/file.data.ts
diff --git a/src/views/common/push/pushFile/index.vue b/src/views/common/push/pushRingtone/index.vue
similarity index 100%
rename from src/views/common/push/pushFile/index.vue
rename to src/views/common/push/pushRingtone/index.vue
diff --git a/src/views/common/push/pushWhitelist/passList.data.ts b/src/views/common/push/pushWhitelist/passList.data.ts
deleted file mode 100644
index 151ff9f..0000000
--- a/src/views/common/push/pushWhitelist/passList.data.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { BasicColumn } from '/@/components/Table';
-import { FormSchema } from '/@/components/Table';
-
-/** 表格列配置 */
-export const columns: BasicColumn[] = [
-  {
-    title: '发送方用户id',
-    dataIndex: 'fromPushId'
-  },
-  {
-    title: '对方用户id',
-    dataIndex: 'toPushId'
-  },
-  {
-    title: '创建人',
-    dataIndex: 'createByName'
-  },
-  {
-    title: '创建时间',
-    dataIndex: 'createTime',
-    width: 200
-  }
-];
-
-/** 搜索表单配置 */
-export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'fromPushId',
-    label: '发送方用户id',
-    component: 'Input',
-    componentProps: {
-      placeholder: '请输入发送方用户id',
-    },
-    colProps: { span: 6 }
-  }
-];
-
-/** 表单配置 */
-export const formSchema: FormSchema[] = [
-  {
-    field: 'id',
-    label: 'ID',
-    component: 'Input',
-    show: false
-  },
-  {
-    field: 'type',
-    label: '白名单类型',
-    component: 'Input',
-    defaultValue: '1',
-    show: false
-  },
-  {
-    field: 'fromPushId',
-    label: '发送方用户id',
-    component: 'Input',
-    required: true,
-    colProps: {
-      span: 24
-    }
-  },
-  {
-    field: 'toPushId',
-    label: '对方用户id',
-    component: 'Input',
-    required: true,
-    colProps: {
-      span: 24
-    }
-  },
-];
diff --git a/src/views/system/user/account/setting/entCertification/Step1.vue b/src/views/system/user/account/setting/entCertification/Step1.vue
index 3afca2c..d394ba5 100644
--- a/src/views/system/user/account/setting/entCertification/Step1.vue
+++ b/src/views/system/user/account/setting/entCertification/Step1.vue
@@ -6,7 +6,7 @@
 <script lang="ts">
   import { defineComponent, ref, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { formSchema } from '/@/views/common/push/pushThirdParty/thirdParty.data';
+  import { formSchema } from '/@/views/common/push/pushEnterprise/thirdParty.data';
   import { addPushThirdParty } from '/@/api/platform/common/controller/pushThirdParty';
   import { useMessage } from '/@/hooks/web/useMessage';
 
diff --git a/src/views/system/user/account/setting/entCertification/Step3.vue b/src/views/system/user/account/setting/entCertification/Step3.vue
index ead8e7d..2b8f311 100644
--- a/src/views/system/user/account/setting/entCertification/Step3.vue
+++ b/src/views/system/user/account/setting/entCertification/Step3.vue
@@ -12,7 +12,7 @@
   import { Result } from 'ant-design-vue';
   const AResult = Result;
   import { useModal } from '/@/components/Modal';
-  import ThirdPartyModal from '/@/views/common/push/pushThirdParty/ThirdPartyModal.vue';
+  import ThirdPartyModal from '/@/views/common/push/pushEnterprise/ThirdPartyModal.vue';
   import { useUserStore } from '/@/store/modules/user';
 
   const userStore = useUserStore();