Merge branch 'sqy_dev' into 'main'

fix:修改租户管理：验证，400错误，fix:我的通知显示’无‘问题     fefactor:重构公共组件组织树

See merge request huang/yun-teng-iot-front!43

@@ -72,18 +72,16 @@ export const deleteMessageTemplate = (ids: string[]) =>
  * @param id 配置id
  * @param id 配置id
  * @param status 状态
  * @param status 状态
  */
  */
-export const setMessageTemplateStatus = (
-  id: string,
-  templatePurpose: string,
-  messageType: string,
-  status: number
-) =>
+
+interface dataType {
+  id: string;
+  templatePurpose: string;
+  messageType: string;
+  status: number;
+  tenantId: string;
+}
+export const setMessageTemplateStatus = (data: dataType) =>
   defHttp.put<MessageConfigResultModel>({
   defHttp.put<MessageConfigResultModel>({
     url: MessageTemplateApi.TEMPLATE_URL,
     url: MessageTemplateApi.TEMPLATE_URL,
-    data: {
-      id,
-      status,
-      templatePurpose,
-      messageType,
-    },
+    data,
   });
   });

-<template> 111</template>

@@ -41,7 +41,7 @@
 
 
   import { defineComponent } from 'vue';
   import { defineComponent } from 'vue';
   import { Dropdown, Menu, Popconfirm } from 'ant-design-vue';
   import { Dropdown, Menu, Popconfirm } from 'ant-design-vue';
-  // import { Icon } from '/@/components/Icon';
+  import { Icon } from '/@/components/Icon';
   import { omit } from 'lodash-es';
   import { omit } from 'lodash-es';
   import { isFunction } from '/@/utils/is';
   import { isFunction } from '/@/utils/is';
 
 
@@ -52,7 +52,7 @@
       Menu,
       Menu,
       MenuItem: Menu.Item,
       MenuItem: Menu.Item,
       MenuDivider: Menu.Divider,
       MenuDivider: Menu.Divider,
-      // Icon,
+      Icon,
       Popconfirm,
       Popconfirm,
     },
     },
     props: {
     props: {

@@ -88,7 +88,7 @@
         const wrapEl = unref(wrapRef);
         const wrapEl = unref(wrapRef);
         const map = new BMap.Map(wrapEl);
         const map = new BMap.Map(wrapEl);
         if (record.deviceInfo.address) {
         if (record.deviceInfo.address) {
-          const { name, organizationDTO, updateTime, deviceState } = record;
+          const { name, organizationDTO, updateTime, deviceState, deviceProfile } = record;
           const { longitude, latitude, address } = record.deviceInfo;
           const { longitude, latitude, address } = record.deviceInfo;
           const point = new BMap.Point(longitude, latitude);
           const point = new BMap.Point(longitude, latitude);
           let options = {
           let options = {
@@ -110,7 +110,7 @@
             }
             }
           </div>
           </div>
           <div>所属组织：${organizationDTO.name}</div>
           <div>所属组织：${organizationDTO.name}</div>
-          <div style="margin-top:6px;">接入协议：${address}</div>
+          <div style="margin-top:6px;">接入协议：${deviceProfile.transportType}</div>
           <div style="margin-top:6px;">设备位置：${address}</div>
           <div style="margin-top:6px;">设备位置：${address}</div>
           <div style="margin-top:6px;">下线时间：${updateTime}</div>
           <div style="margin-top:6px;">下线时间：${updateTime}</div>
           <div style="display:flex;justify-content:space-between; margin-top:10px">
           <div style="display:flex;justify-content:space-between; margin-top:10px">

 <template>
 <template>
   <div>
   <div>
     <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
     <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
-      <OrganizationIdTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
+      <OrganizationIdTree
+        class="w-1/4 xl:w-1/5"
+        @select="handleSelect"
+        ref="organizationIdTreeRef"
+      />
       <BasicTable @register="registerTable" :searchInfo="searchInfo" class="w-3/4 xl:w-4/5">
       <BasicTable @register="registerTable" :searchInfo="searchInfo" class="w-3/4 xl:w-4/5">
         <template #toolbar>
         <template #toolbar>
           <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增联系人 </a-button>
           <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增联系人 </a-button>
@@ -47,7 +51,8 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import ContactDrawer from './ContactDrawer.vue';
   import ContactDrawer from './ContactDrawer.vue';
-  import OrganizationIdTree from '../../common/OrganizationIdTree.vue';
+  import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
+
   import { getAlarmContact, deleteAlarmContact } from '/@/api/alarm/contact/alarmContact';
   import { getAlarmContact, deleteAlarmContact } from '/@/api/alarm/contact/alarmContact';
   import { searchFormSchema, columns } from './config.data';
   import { searchFormSchema, columns } from './config.data';
   export default defineComponent({
   export default defineComponent({
@@ -65,6 +70,8 @@
       const onSelectRowChange = (selectedRowKeys: string[]) => {
       const onSelectRowChange = (selectedRowKeys: string[]) => {
         selectedRowIds.value = selectedRowKeys;
         selectedRowIds.value = selectedRowKeys;
       };
       };
+      const searchInfo = reactive<Recordable>({});
+      const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       // 表格hooks
       // 表格hooks
       const [registerTable, { reload }] = useTable({
       const [registerTable, { reload }] = useTable({
         api: getAlarmContact,
         api: getAlarmContact,
@@ -73,6 +80,7 @@
         formConfig: {
         formConfig: {
           labelWidth: 120,
           labelWidth: 120,
           schemas: searchFormSchema,
           schemas: searchFormSchema,
+          resetFunc: resetFn,
         },
         },
         useSearchForm: true,
         useSearchForm: true,
         showTableSetting: true,
         showTableSetting: true,
@@ -93,7 +101,7 @@
       // 弹框
       // 弹框
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [registerDrawer, { openDrawer }] = useDrawer();
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
-      const searchInfo = reactive<Recordable>({});
+
       // 刷新
       // 刷新
       const handleSuccess = () => {
       const handleSuccess = () => {
         reload();
         reload();
@@ -147,6 +155,7 @@
         handleSuccess,
         handleSuccess,
         registerTable,
         registerTable,
         registerDrawer,
         registerDrawer,
+        organizationIdTreeRef,
       };
       };
     },
     },
   });
   });

+/**
+ * 这是一个重置OrganizationIdTree组件的hooks,目的是用于重置分页查询的字段。
+ *
+ * 使用方式 const {organizationIdTreeRef,resetFn} = useResetOrganizationTree()
+ *
+ * organizationIdTreeRef 将ref和organizationIdTreeRef绑定即可,第二个是重置的方法
+ */
+
+import { ref } from 'vue';
+import organizationIdTree from '../OrganizationIdTree.vue';
+export const useResetOrganizationTree = (searchInfo: Recordable) => {
+  const organizationIdTreeRef = ref<InstanceType<typeof organizationIdTree>>();
+  async function resetFn() {
+    organizationIdTreeRef.value.resetOrganization();
+    searchInfo.organizationId = null;
+  }
+  return { organizationIdTreeRef, resetFn };
+};

+import { useResetOrganizationTree } from './hooks/useOrganization';
+import OrganizationIdTree from './src/OrganizationIdTree.vue';
+
+export { OrganizationIdTree, useResetOrganizationTree };

@@ -7,6 +7,7 @@
       :clickRowToExpand="false"
       :clickRowToExpand="false"
       :treeData="treeData"
       :treeData="treeData"
       :replaceFields="{ key: 'id', title: 'name' }"
       :replaceFields="{ key: 'id', title: 'name' }"
+      v-model:selectedKeys="selectedKeys"
       @select="handleSelect"
       @select="handleSelect"
     />
     />
   </div>
   </div>
@@ -24,7 +25,7 @@
     emits: ['select'],
     emits: ['select'],
     setup(_, { emit }) {
     setup(_, { emit }) {
       const treeData = ref<TreeItem[]>([]);
       const treeData = ref<TreeItem[]>([]);
-
+      const selectedKeys = ref<string[]>();
       async function fetch() {
       async function fetch() {
         treeData.value = (await getOrganizationList()) as unknown as TreeItem[];
         treeData.value = (await getOrganizationList()) as unknown as TreeItem[];
       }
       }
@@ -32,11 +33,14 @@
       function handleSelect(keys) {
       function handleSelect(keys) {
         emit('select', keys[0]);
         emit('select', keys[0]);
       }
       }
+      function resetOrganization() {
+        selectedKeys.value = [];
+      }
 
 
       onMounted(() => {
       onMounted(() => {
         fetch();
         fetch();
       });
       });
-      return { treeData, handleSelect };
+      return { treeData, handleSelect, resetOrganization, selectedKeys };
     },
     },
   });
   });
 </script>
 </script>

 <template>
 <template>
   <div>
   <div>
     <PageWrapper dense contentFullHeight contentClass="flex">
     <PageWrapper dense contentFullHeight contentClass="flex">
-      <OrganizationIdTree class="w-1/6 xl:w-1/5" @select="handleSelect" />
+      <OrganizationIdTree
+        class="w-1/6 xl:w-1/5"
+        @select="handleSelect"
+        ref="organizationIdTreeRef"
+      />
       <BasicTable @register="registerTable" class="w-5/6 xl:w-4/5">
       <BasicTable @register="registerTable" class="w-5/6 xl:w-4/5">
         <template #toolbar>
         <template #toolbar>
           <a-button type="primary" @click="handleCreate"> 新增设备 </a-button>
           <a-button type="primary" @click="handleCreate"> 新增设备 </a-button>
@@ -86,7 +90,8 @@
   import { useGo } from '/@/hooks/web/usePage';
   import { useGo } from '/@/hooks/web/usePage';
   import { PageWrapper } from '/@/components/Page';
   import { PageWrapper } from '/@/components/Page';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
-  import OrganizationIdTree from '/@/views/common/OrganizationIdTree.vue';
+  import { OrganizationIdTree, useResetOrganizationTree } from '/@/views/common/organizationIdTree';
+
   import DeviceModal from './cpns/modal/DeviceModal.vue';
   import DeviceModal from './cpns/modal/DeviceModal.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import DeviceDetailDrawer from './cpns/modal/DeviceDetailDrawer.vue';
   import DeviceDetailDrawer from './cpns/modal/DeviceDetailDrawer.vue';
@@ -107,6 +112,7 @@
       const go = useGo();
       const go = useGo();
 
 
       const searchInfo = reactive<Recordable>({});
       const searchInfo = reactive<Recordable>({});
+      const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const [registerModal, { openModal }] = useModal();
       const [registerModal, { openModal }] = useModal();
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
       const [registerDetailDrawer, { openDrawer }] = useDrawer();
       const [registerTable, { reload }] = useTable({
       const [registerTable, { reload }] = useTable({
@@ -116,6 +122,7 @@
         formConfig: {
         formConfig: {
           labelWidth: 120,
           labelWidth: 120,
           schemas: searchFormSchema,
           schemas: searchFormSchema,
+          resetFunc: resetFn,
         },
         },
         useSearchForm: true,
         useSearchForm: true,
         showTableSetting: true,
         showTableSetting: true,
@@ -188,6 +195,7 @@
         DeviceTypeEnum,
         DeviceTypeEnum,
         DeviceState,
         DeviceState,
         searchInfo,
         searchInfo,
+        organizationIdTreeRef,
       };
       };
     },
     },
   });
   });

+import { MessageTypeEnum } from '/@/api/tenant/tenantInfo';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 import { h } from 'vue';
@@ -28,7 +29,13 @@ export const columns: BasicColumn[] = [
     title: '平台类型',
     title: '平台类型',
     dataIndex: 'platformType',
     dataIndex: 'platformType',
     format: (_, record: Recordable) => {
     format: (_, record: Recordable) => {
-      return record.platformType === 'ALI_CLOUD' ? '阿里云平台' : '腾讯云平台';
+      return record.messageType === MessageTypeEnum.EMAIL_MESSAGE
+        ? '无'
+        : record.messageType === MessageTypeEnum.PHONE_MESSAGE
+        ? record.platformType === 'ALI_CLOUD'
+          ? '阿里云平台'
+          : '腾讯云平台'
+        : '无';
     },
     },
     width: 180,
     width: 180,
   },
   },

@@ -39,9 +39,7 @@
           for (const key in config) {
           for (const key in config) {
             Reflect.set(data.record, key + '', config[key]);
             Reflect.set(data.record, key + '', config[key]);
           }
           }
-          await setFieldsValue({
-            ...data.record,
-          });
+          await setFieldsValue(data.record);
         }
         }
       });
       });
 
 

@@ -49,10 +49,17 @@ export const columns: BasicColumn[] = [
         unCheckedChildren: '已禁用',
         unCheckedChildren: '已禁用',
         loading: record.pendingStatus,
         loading: record.pendingStatus,
         onChange(checked: boolean) {
         onChange(checked: boolean) {
+          const { id, templatePurpose, messageType, tenantId } = record;
           record.pendingStatus = true;
           record.pendingStatus = true;
           const newStatus = checked ? 1 : 0;
           const newStatus = checked ? 1 : 0;
           const { createMessage } = useMessage();
           const { createMessage } = useMessage();
-          setMessageTemplateStatus(record.id, record.templatePurpose, record.messageType, newStatus)
+          setMessageTemplateStatus({
+            id,
+            templatePurpose,
+            messageType,
+            tenantId,
+            status: newStatus,
+          })
             .then(() => {
             .then(() => {
               record.status = newStatus;
               record.status = newStatus;
               createMessage.success(`修改成功`);
               createMessage.success(`修改成功`);
@@ -163,4 +170,10 @@ export const formSchema: FormSchema[] = [
       valueField: 'itemValue',
       valueField: 'itemValue',
     },
     },
   },
   },
+  {
+    field: 'tenantId',
+    label: '租户ID',
+    component: 'Input',
+    show: false,
+  },
 ];
 ];

 <template>
 <template>
   <div>
   <div>
-    <PageWrapper dense contentFullHeight fixedHeight contentClass="flex">
-      <OrganizationIdTree class="w-1/4 xl:w-1/5" @select="handleSelect" />
-      <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5" :searchInfo="searchInfo">
+    <PageWrapper dense contentFullHeight contentClass="flex">
+      <OrganizationIdTree
+        class="w-1/4 xl:w-1/5"
+        @select="handleSelect"
+        ref="organizationIdTreeRef"
+      />
+      <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5">
         <template #toolbar>
         <template #toolbar>
           <a-button type="primary" @click="handleCreate">新增账号</a-button>
           <a-button type="primary" @click="handleCreate">新增账号</a-button>
         </template>
         </template>
@@ -63,13 +67,10 @@
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
   import { defineComponent, reactive } from 'vue';
   import { defineComponent, reactive } from 'vue';
-
-  import { TenantCodeEnum } from '/@/enums/codeEnum';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { deleteUser, getAccountList } from '/@/api/system/system';
   import { deleteUser, getAccountList } from '/@/api/system/system';
   import { PageWrapper } from '/@/components/Page';
   import { PageWrapper } from '/@/components/Page';
-
-  import OrganizationIdTree from '../../common/OrganizationIdTree.vue';
+  import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
   import { Tag } from 'ant-design-vue';
   import { Tag } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
   import AccountModal from './AccountModal.vue';
   import AccountModal from './AccountModal.vue';
@@ -85,23 +86,23 @@
       const go = useGo();
       const go = useGo();
       const [registerModal, { openModal }] = useModal();
       const [registerModal, { openModal }] = useModal();
       const { createMessage } = useMessage();
       const { createMessage } = useMessage();
-      const searchInfo = reactive<Recordable>({});
+      let searchInfo = reactive<Recordable>({});
+      const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
       const [registerTable, { reload, updateTableDataRecord }] = useTable({
       const [registerTable, { reload, updateTableDataRecord }] = useTable({
         title: '账号列表',
         title: '账号列表',
         api: getAccountList,
         api: getAccountList,
         rowKey: 'id',
         rowKey: 'id',
         columns,
         columns,
+        searchInfo,
         formConfig: {
         formConfig: {
           labelWidth: 120,
           labelWidth: 120,
           schemas: searchFormSchema,
           schemas: searchFormSchema,
           autoSubmitOnEnter: true,
           autoSubmitOnEnter: true,
+          resetFunc: resetFn,
         },
         },
         useSearchForm: true,
         useSearchForm: true,
         showTableSetting: true,
         showTableSetting: true,
         bordered: true,
         bordered: true,
-        handleSearchInfoFn(info) {
-          return info;
-        },
         actionColumn: {
         actionColumn: {
           width: 220,
           width: 220,
           title: '操作',
           title: '操作',
@@ -115,7 +116,6 @@
           isUpdate: false,
           isUpdate: false,
         });
         });
       }
       }
-
       function handleEdit(record: Recordable) {
       function handleEdit(record: Recordable) {
         openModal(true, {
         openModal(true, {
           record,
           record,
@@ -159,8 +159,7 @@
         handleSuccess,
         handleSuccess,
         handleSelect,
         handleSelect,
         handleView,
         handleView,
-        searchInfo,
-        TenantCodeEnum,
+        organizationIdTreeRef,
       };
       };
     },
     },
   });
   });

@@ -16,7 +16,8 @@
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { saveTenantAdmin } from '/@/api/tenant/tenantApi';
   import { saveTenantAdmin } from '/@/api/tenant/tenantApi';
   import { UserDTO } from '/@/api/tenant/tenantInfo';
   import { UserDTO } from '/@/api/tenant/tenantInfo';
-  import { emailRule, phoneRule } from '/@/utils/rules';
+  import { ChineseRegexp, EmailRegexp, emailRule, phoneRule } from '/@/utils/rules';
+  import { isAccountExist } from '/@/api/system/system';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'TenantAdminFormDrawer',
     name: 'TenantAdminFormDrawer',
@@ -38,8 +39,36 @@
         {
         {
           field: 'username',
           field: 'username',
           label: '账号',
           label: '账号',
-          required: true,
           component: 'Input',
           component: 'Input',
+          dynamicRules: ({ values }) => {
+            return [
+              {
+                validator(_, value) {
+                  return new Promise((resolve, reject) => {
+                    if (value == '') {
+                      reject('请输入账号');
+                    } else if (ChineseRegexp.test(value)) {
+                      reject('账号不能含有中文');
+                    } else if (EmailRegexp.test(value)) {
+                      reject('账号不能为电子邮箱格式');
+                    } else {
+                      if (values.username != undefined && values.id == undefined) {
+                        isAccountExist(value).then((data) => {
+                          if (data.data != null) {
+                            reject('账号已存在');
+                          } else {
+                            resolve();
+                          }
+                        });
+                      } else {
+                        resolve();
+                      }
+                    }
+                  });
+                },
+              },
+            ];
+          },
         },
         },
         {
         {
           field: 'realName',
           field: 'realName',
@@ -86,7 +115,6 @@
           await resetFields();
           await resetFields();
           isUpdate.value = !!data?.isUpdate;
           isUpdate.value = !!data?.isUpdate;
           tenantId.value = data?.tenantId;
           tenantId.value = data?.tenantId;
-
           if (unref(isUpdate)) {
           if (unref(isUpdate)) {
             await updateSchema({ field: 'username', componentProps: { disabled: true } });
             await updateSchema({ field: 'username', componentProps: { disabled: true } });
             await setFieldsValue({
             await setFieldsValue({