Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into f…

…eat/device-new-protocol

@@ -45,6 +45,7 @@ enum DeviceManagerApi {
   DEVICE_PUBLIC = '/customer/public/device',
 
   DEVICE_PRIVATE = '/customer/device',
+  DEVICE_COLLECT = '/device/collect ', //收藏
 
   /**
    * @description 通过设备列表获取设备信息
@@ -61,6 +62,13 @@ export const devicePage = (params: DeviceQueryParam) => {
   });
 };
 
+export const deviceCollect = (params: Array<any>) => {
+  return defHttp.post({
+    url: `${DeviceManagerApi.DEVICE_COLLECT}`,
+    params,
+  });
+};
+
 /**
  * 分页查询设备配置页面
  * @param params pageSize page name

@@ -12,7 +12,7 @@ export const columns: BasicColumn[] = [
   {
     title: '状态',
     dataIndex: 'deviceState',
-    width: 80,
+    width: 110,
     slots: { customRender: 'deviceState' },
   },
   {
@@ -167,4 +167,17 @@ export const searchFormSchema: FormSchema[] = [
       };
     },
   },
+  {
+    field: 'isCollect',
+    label: '是否收藏',
+    component: 'Select',
+    colProps: { span: 6 },
+    componentProps: {
+      options: [
+        { label: '是', value: 1 },
+        { label: '否', value: 0 },
+      ],
+      placeholder: '请选择',
+    },
+  },
 ];

@@ -34,6 +34,11 @@
               批量分配
             </a-button>
           </Authority>
+          <!-- <Authority>
+            <a-button type="primary" @click="handelCollect()" :disabled="!isExistOption">
+              批量收藏
+            </a-button>
+          </Authority> -->
         </template>
         <template #img="{ record }">
           <TableImg
@@ -85,7 +90,13 @@
           </Tag>
         </template>
         <template #deviceState="{ record }">
+          <!-- <HeartOutlined v-if="!record.isCollect" class="mr-1" style="color: red" /> -->
+          <Tooltip>
+            <template #title> 我的收藏</template>
+            <HeartTwoTone v-if="record.isCollect" class="mr-1" twoToneColor="#3B82F6" />
+          </Tooltip>
           <Tag
+            :style="{ marginLeft: !record.isCollect ? '17px' : '' }"
             :color="
               record.deviceState == DeviceState.INACTIVE
                 ? 'warning'
@@ -154,6 +165,18 @@
                 icon: 'ant-design:rise-outlined',
                 onClick: handleUpAndDownRecord.bind(null, record),
               },
+              !record.isCollect
+                ? {
+                    label: '收藏',
+                    icon: 'ant-design:heart-outlined',
+                    onClick: handelCollect.bind(null, record),
+                  }
+                : {
+                    label: '取消收藏',
+                    auth: 'api:yt:device:online:record',
+                    icon: 'ant-design:heart-outlined',
+                    onClick: handelCollect.bind(null, record),
+                  },
               {
                 label: '删除',
                 auth: 'api:yt:device:delete',
@@ -195,10 +218,12 @@
   } from '/@/api/device/model/deviceModel';
   import { BasicTable, useTable, TableAction, TableImg } from '/@/components/Table';
   import { columns, searchFormSchema } from './config/device.data';
-  import { Tag, Popover, Popconfirm, Button } from 'ant-design-vue';
+  import { Tag, Popover, Popconfirm, Button, Tooltip } from 'ant-design-vue';
+  import { HeartTwoTone } from '@ant-design/icons-vue';
   import {
     deleteDevice,
     devicePage,
+    deviceCollect,
     cancelDispatchCustomer,
     getGATEWAY,
     privateDevice,
@@ -244,6 +269,9 @@
       Popconfirm,
       BatchImportModal,
       Button,
+      // HeartOutlined,
+      HeartTwoTone,
+      Tooltip,
     },
     setup(_) {
       const { isCustomer } = useAuthDeviceDetail();
@@ -465,6 +493,26 @@
         } catch (error) {}
       };
 
+      // 收藏 && 批量收藏
+      const handelCollect = async (record?: Recordable) => {
+        let ids: string[] = [];
+        if (record) {
+          ids.push(record.id);
+        } else {
+          ids = await getSelectRowKeys();
+        }
+        try {
+          setLoading(true);
+          await deviceCollect(ids);
+          createMessage.success('操作成功');
+          handleReload();
+        } catch (error) {
+          throw error;
+        } finally {
+          setLoading(false);
+        }
+      };
+
       onMounted(() => {
         const queryParams = ROUTE.query as Record<'deviceProfileId', undefined | string>;
         const { setFieldsValue } = getForm();
@@ -492,6 +540,7 @@
         copySN,
         isExistOption,
         handleDelete,
+        handelCollect,
         // hasBatchDelete,
         // handleDeleteOrBatchDelete,
         handleReload,

@@ -55,10 +55,18 @@
           const { createMessage } = useMessage();
           let config = {};
           if (values.messageType === 'PHONE_MESSAGE') {
-            config = {
-              accessKeyId: values.accessKeyId,
-              accessKeySecret: values.accessKeySecret,
-            };
+            if (values.platformType === 'ALI_CLOUD') {
+              config = {
+                accessKeyId: values.accessKeyId,
+                accessKeySecret: values.accessKeySecret,
+              };
+            } else {
+              config = {
+                appId: values.appId,
+                secretId: values.secretId,
+                secretKey: values.secretKey,
+              };
+            }
           } else if (values.messageType === 'EMAIL_MESSAGE') {
             config = {
               host: values.host,

@@ -79,6 +79,9 @@ export const isMessage = (type: string) => {
 export const isEmail = (type: string) => {
   return type === MessageEnum.IS_EMAIL;
 };
+export const messageTypeIsTencentCloud = (type: string) => {
+  return type === 'TENCENT_CLOUD';
+};
 
 export const formSchema: FormSchema[] = [
   {
@@ -121,15 +124,53 @@ export const formSchema: FormSchema[] = [
     ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
   },
   {
+    field: 'appId',
+    label: 'appId',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入appId',
+    },
+    ifShow: ({ values }) => messageTypeIsTencentCloud(Reflect.get(values, 'platformType')),
+  },
+  {
+    field: 'secretId',
+    label: 'secretId',
+    required: true,
+    component: 'Input',
+    helpMessage: ['腾讯云：API密钥参考地址: https://console.cloud.tencent.com/cam/capi'],
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入secretId',
+    },
+    ifShow: ({ values }) => messageTypeIsTencentCloud(Reflect.get(values, 'platformType')),
+  },
+  {
+    field: 'secretKey',
+    label: 'secretKey',
+    required: true,
+    componentProps: {
+      maxLength: 36,
+      placeholder: '请输入secretKey',
+    },
+
+    component: 'Input',
+    ifShow: ({ values }) => messageTypeIsTencentCloud(Reflect.get(values, 'platformType')),
+  },
+  {
     field: 'accessKeyId',
     label: 'accessKeyId',
     required: true,
     component: 'Input',
+    helpMessage: ['阿里云：API密钥参考地址：https://ram.console.aliyun.com/manage/ak'],
     componentProps: {
       maxLength: 36,
       placeholder: '请输入accessKeyId',
     },
-    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
+    ifShow: ({ values }) =>
+      isMessage(Reflect.get(values, 'messageType')) &&
+      !messageTypeIsTencentCloud(Reflect.get(values, 'platformType')),
   },
   {
     field: 'accessKeySecret',
@@ -141,7 +182,9 @@ export const formSchema: FormSchema[] = [
     },
 
     component: 'Input',
-    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
+    ifShow: ({ values }) =>
+      isMessage(Reflect.get(values, 'messageType')) &&
+      !messageTypeIsTencentCloud(Reflect.get(values, 'platformType')),
   },
   {
     field: 'host',

@@ -6,7 +6,7 @@
   </BasicModal>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
+  import { defineComponent, ref } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { sendSms } from '/@/api/message/template';
@@ -76,7 +76,7 @@
       label: '短信参数',
       required: true,
       componentProps: {
-        placeholder: '示例：{"code":"3654"}',
+        placeholder: '示例：{"code":"1234"}',
       },
       dynamicRules: () => {
         return [
@@ -90,10 +90,10 @@
                   if (typeof JSON.parse(value) == 'object') {
                     return Promise.resolve();
                   }
-                  return Promise.reject('请输入JSON格式例如{"code":"123"}');
+                  return Promise.reject('请输入JSON格式例如{"code":"1234"}');
                 }
               } catch {
-                return Promise.reject('请输入JSON格式例如{"code":"123"}');
+                return Promise.reject('请输入JSON格式例如{"code":"1234"}');
               }
             },
           },
@@ -126,8 +126,9 @@
   export default defineComponent({
     components: { BasicModal, BasicForm },
     setup() {
+      const platformType = ref('');
       const { createMessage } = useMessage();
-      const [registerForm, { validate, resetFields, setFieldsValue }] = useForm({
+      const [registerForm, { validate, resetFields, setFieldsValue, updateSchema }] = useForm({
         labelWidth: 70,
         schemas,
         showActionButtonGroup: false,
@@ -136,6 +137,14 @@
         },
       });
       const [register, { closeModal }] = useModalInner(async (data) => {
+        platformType.value = data.record?.messageConfig?.platformType;
+        updateSchema({
+          field: 'params',
+          componentProps: {
+            placeholder:
+              platformType.value !== 'TENCENT_CLOUD' ? '示例：{"code":"1234"}' : '示例：["123456"]',
+          },
+        });
         await resetFields();
         await setFieldsValue({
           ...data.record,
@@ -143,9 +152,17 @@
       });
 
       async function handleOK() {
+        let smsParams: any = null;
         const values = await validate();
-        //将字符串转为json
-        const smsParams = JSON.parse(Reflect.get(values, 'params'));
+        if (platformType.value === 'TENCENT_CLOUD') {
+          //腾讯云发送格式 将字符串转为数组
+          smsParams = {
+            tencent_param: JSON.parse(Reflect.get(values, 'params')),
+          };
+        } else {
+          //阿里云发送格式 将字符串转为json
+          smsParams = JSON.parse(Reflect.get(values, 'params'));
+        }
         Reflect.set(values, 'params', smsParams);
         await sendSms(values);
         closeModal();

@@ -247,10 +247,11 @@ export const formSchema: FormSchema[] = [
               helpMessage: `告警通知模板平台提供如下参数:
               {
                 "type":"告警类型",
-                "device_name":"设备名称",
+                "deviceName":"设备名称",
                 "severity":"告警等级",
                 "organization":"设备所属组织",
-                "createTime":告警时间
+                "createTime":"告警时间",
+                "triggerValue":"触发值",
               }`,
             });
           } else if (value === 'FOR_SET_PASSWORD') {

@@ -50,6 +50,7 @@
               label: BusinessConvertScriptTextEnum.BUSINESS_EDIT_TEXT.slice(0, 2),
               icon: 'clarity:note-edit-line',
               auth: PermissionConvertScriptEnum.PERMISSION_UPDATE,
+              ifShow: record.status == 0,
               onClick: handleBusinessModal.bind(
                 null,
                 BusinessConvertScriptTextEnum.BUSINESS_EDIT_TEXT,