fix:修复设备配置点击默认新增返回400问题，fix:修改通知管理status为0,1，和添加按钮权限

@@ -6,6 +6,7 @@
     v-bind="$attrs"
     @register="registerModal"
     @ok="handleSubmit"
+    :draggable="false"
   >
     <div
       style="

@@ -53,9 +53,9 @@ export const columns: BasicColumn[] = [
             .then(() => {
               record.status = newStatus;
               if (record.status == 1) {
-                createMessage.success(`配置成功`);
+                createMessage.success(`已配置`);
               } else {
-                createMessage.error('未配置成功');
+                createMessage.error('未配置');
               }
             })
             .finally(() => {
@@ -131,7 +131,7 @@ export const formSchema: FormSchema[] = [
     field: 'organizationId',
     label: '所属组织',
     component: 'ApiTreeSelect',
-    // required: true,
+    required: true,
     componentProps: {
       api: async () => {
         const data = await getOrganizationList();

@@ -77,7 +77,7 @@
       let transportTypeObj = reactive({
         transportType: '',
       });
-      const profileDataObj = reactive({
+      let profileDataObj = reactive({
         profileData: null,
       });
 
@@ -142,7 +142,8 @@
         let getPic = null;
         getStepTwoData = await proxy.$refs.DeviceProfileStep2Ref?.getStep2DataFunc();
         profileDataObj.profileData = getStepTwoData;
-        transportTypeObj.transportType = getStepTwoData.transportConfiguration.type;
+        transportTypeObj.transportType = getStepTwoData?.transportConfiguration?.transportType;
+        delete profileDataObj?.profileData?.transportConfiguration?.transportType;
         //没有点击下一步
         if (!isNextStatus.value) {
           const getStep1Obj = await proxy.$refs.DeviceProfileStep1Ref?.getStep1Func();
@@ -153,6 +154,10 @@
           };
         }
         const id = isUpdate.value == 1 ? '' : postEditId.value;
+
+        if (Object.keys(getStepTwoData?.transportConfiguration).length == 0) {
+          profileDataObj.profileData = null;
+        }
         postDeviceConfogData = {
           ...getStepOneData,
           ...profileDataObj,
@@ -162,6 +167,7 @@
         if (isUpdate.value == 1) {
           delete postDeviceConfogData.id;
         }
+
         await deviceConfigAddOrEdit(postDeviceConfogData);
         createMessage.success(isUpdate.value == 1 ? '新增' + '成功' : '编辑' + '成功');
         closeModal();

@@ -81,7 +81,7 @@
       async function customResetFunc() {
         emit('prev');
       }
-      watch(isChangeType, async (v) => {
+      watch(isChangeType, (v) => {
         isMqttType.value = v;
       });
       const getStep2DataFunc = async () => {
@@ -92,6 +92,7 @@
         step2Data.transportConfiguration = {
           ...getMqttVal,
           ...getCoapVal,
+          ...val,
         };
         return step2Data;
       };

@@ -254,3 +254,51 @@ export const CoapSchemas: FormSchema[] = [
       isProtobuf(values.transportPayloadType) && !isEfentoNb(values.coapDeviceType),
   },
 ];
+
+export const deviceTelemetryProtoSchemaData = `
+syntax ="proto3";
+package telemetry;
+
+message SensorDataReading {
+  optional double temperature = 1;
+  optional double humidity = 2;
+  InnerObject innerObject = 3;
+  message InnerObject {
+    optional string key1 = 1;
+    optional bool key2 = 2;
+    optional double key3 = 3;
+    optional int32 key4 = 4;
+    optional string key5 = 5;
+  }
+}
+`;
+
+export const deviceAttributesProtoSchemaData = `
+syntax ="proto3";
+package attributes;
+
+message SensorConfiguration {
+  optional string firmwareVersion = 1;
+  optional string serialNumber = 2;
+}
+`;
+
+export const deviceRpcRequestProtoSchemaData = `
+syntax ="proto3";
+package rpc;
+
+message RpcRequestMsg {
+  optional string method = 1;
+  optional int32 requestId = 2;
+  optional string params = 3;
+}
+`;
+
+export const deviceRpcResponseProtoSchemaData = `
+syntax ="proto3";
+package rpc;
+
+message RpcResponseMsg {
+  optional string payload = 1;
+}
+`;

@@ -16,7 +16,13 @@
 <script lang="ts">
   import { defineComponent, reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { CoapSchemas } from './Coap';
+  import {
+    CoapSchemas,
+    deviceTelemetryProtoSchemaData,
+    deviceAttributesProtoSchemaData,
+    deviceRpcRequestProtoSchemaData,
+    deviceRpcResponseProtoSchemaData,
+  } from './Coap';
   import { Alert, Divider, Descriptions } from 'ant-design-vue';
 
   export default defineComponent({
@@ -69,16 +75,28 @@
           pagingTransmissionWindow: v.clientSettings?.pagingTransmissionWindow,
           deviceTelemetryProtoSchema:
             v?.coapDeviceTypeConfiguration?.transportPayloadTypeConfiguration
-              ?.deviceTelemetryProtoSchema,
+              ?.deviceTelemetryProtoSchema == null
+              ? deviceTelemetryProtoSchemaData
+              : v?.coapDeviceTypeConfiguration?.transportPayloadTypeConfiguration
+                  ?.deviceTelemetryProtoSchema,
           deviceAttributesProtoSchema:
             v?.coapDeviceTypeConfiguration?.transportPayloadTypeConfiguration
-              ?.deviceAttributesProtoSchema,
+              ?.deviceAttributesProtoSchema == null
+              ? deviceAttributesProtoSchemaData
+              : v?.coapDeviceTypeConfiguration?.transportPayloadTypeConfiguration
+                  ?.deviceAttributesProtoSchema,
           deviceRpcRequestProtoSchema:
             v?.coapDeviceTypeConfiguration?.transportPayloadTypeConfiguration
-              ?.deviceRpcRequestProtoSchema,
+              ?.deviceRpcRequestProtoSchema == null
+              ? deviceRpcRequestProtoSchemaData
+              : v?.coapDeviceTypeConfiguration?.transportPayloadTypeConfiguration
+                  ?.deviceRpcRequestProtoSchema,
           deviceRpcResponseProtoSchema:
             v?.coapDeviceTypeConfiguration?.transportPayloadTypeConfiguration
-              ?.deviceRpcResponseProtoSchema,
+              ?.deviceRpcResponseProtoSchema == null
+              ? deviceRpcResponseProtoSchemaData
+              : v?.coapDeviceTypeConfiguration?.transportPayloadTypeConfiguration
+                  ?.deviceRpcResponseProtoSchema,
         });
       };
       const customClearStepTwoValueFunc = () => {

@@ -57,7 +57,7 @@ export const MqttSchemas: FormSchema[] = [
   {
     field: 'transportPayloadType',
     component: 'Select',
-    label: '设备Payload',
+    label: '设备信息',
     defaultValue: 'JSON',
     componentProps: {
       options: [
@@ -180,3 +180,51 @@ export const MqttSchemas: FormSchema[] = [
     ifShow: ({ values }) => isProtobuf(values.transportPayloadType),
   },
 ];
+
+export const deviceTelemetryProtoSchemaData = `
+syntax ="proto3";
+package telemetry;
+
+message SensorDataReading {
+  optional double temperature = 1;
+  optional double humidity = 2;
+  InnerObject innerObject = 3;
+  message InnerObject {
+    optional string key1 = 1;
+    optional bool key2 = 2;
+    optional double key3 = 3;
+    optional int32 key4 = 4;
+    optional string key5 = 5;
+  }
+}
+`;
+
+export const deviceAttributesProtoSchemaData = `
+syntax ="proto3";
+package attributes;
+
+message SensorConfiguration {
+  optional string firmwareVersion = 1;
+  optional string serialNumber = 2;
+}
+`;
+
+export const deviceRpcRequestProtoSchemaData = `
+syntax ="proto3";
+package rpc;
+
+message RpcRequestMsg {
+  optional string method = 1;
+  optional int32 requestId = 2;
+  optional string params = 3;
+}
+`;
+
+export const deviceRpcResponseProtoSchemaData = `
+syntax ="proto3";
+package rpc;
+
+message RpcResponseMsg {
+  optional string payload = 1;
+}
+`;

@@ -16,7 +16,13 @@
 <script lang="ts">
   import { defineComponent, reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
-  import { MqttSchemas } from './Mqtt';
+  import {
+    MqttSchemas,
+    deviceTelemetryProtoSchemaData,
+    deviceAttributesProtoSchemaData,
+    deviceRpcRequestProtoSchemaData,
+    deviceRpcResponseProtoSchemaData,
+  } from './Mqtt';
   import { Alert, Divider, Descriptions } from 'ant-design-vue';
 
   export default defineComponent({
@@ -56,13 +62,21 @@
         setFieldsValue({
           transportPayloadType: v?.transportPayloadTypeConfiguration?.transportPayloadType,
           deviceTelemetryProtoSchema:
-            v?.transportPayloadTypeConfiguration?.deviceTelemetryProtoSchema,
+            v?.transportPayloadTypeConfiguration?.deviceTelemetryProtoSchema == null
+              ? deviceTelemetryProtoSchemaData
+              : v?.transportPayloadTypeConfiguration?.deviceTelemetryProtoSchema,
           deviceAttributesProtoSchema:
-            v?.transportPayloadTypeConfiguration?.deviceAttributesProtoSchema,
+            v?.transportPayloadTypeConfiguration?.deviceAttributesProtoSchema == null
+              ? deviceAttributesProtoSchemaData
+              : v?.transportPayloadTypeConfiguration?.deviceAttributesProtoSchema,
           deviceRpcRequestProtoSchema:
-            v?.transportPayloadTypeConfiguration?.deviceRpcRequestProtoSchema,
+            v?.transportPayloadTypeConfiguration?.deviceRpcRequestProtoSchema == null
+              ? deviceRpcRequestProtoSchemaData
+              : v?.transportPayloadTypeConfiguration?.deviceRpcRequestProtoSchema,
           deviceRpcResponseProtoSchema:
-            v?.transportPayloadTypeConfiguration?.deviceRpcResponseProtoSchema,
+            v?.transportPayloadTypeConfiguration?.deviceRpcResponseProtoSchema == null
+              ? deviceRpcResponseProtoSchemaData
+              : v?.transportPayloadTypeConfiguration?.deviceRpcResponseProtoSchema,
           enableCompatibilityWithJsonPayloadFormat:
             v?.transportPayloadTypeConfiguration?.enableCompatibilityWithJsonPayloadFormat,
           useJsonPayloadFormatForDefaultDownlinkTopics:

@@ -6,7 +6,7 @@ import { copyTransFun } from '/@/utils/fnUtils';
 import { Tag } from 'ant-design-vue';
 
 export enum IsOrgEnum {
-  IS_ORG_ENUM = '1',
+  IS_ORG_ENUM = 1,
 }
 export const isOrg = (type: string) => {
   return type === IsOrgEnum.IS_ORG_ENUM;
@@ -46,7 +46,7 @@ export const columns: BasicColumn[] = [
     width: 200,
     customRender: ({ record }) => {
       const status = record.status;
-      const enable = status === '已发布' ? '已发布' : status === '草稿' ? '草稿' : '其他';
+      const enable = status === 0 ? '已发布' : status === 1 ? '草稿' : '其他';
       const color = enable === '已发布' ? 'green' : enable === '草稿' ? 'yellow' : 'red';
       const text = enable === '已发布' ? '已发布' : enable === '草稿' ? '草稿' : '其他';
       return h(Tag, { color }, () => text);
@@ -113,8 +113,8 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       placeholder: '接收者',
       options: [
-        { label: '全部', value: '0' },
-        { label: '组织', value: '1' },
+        { label: '全部', value: 0 },
+        { label: '组织', value: 1 },
       ],
     },
   },

@@ -15,21 +15,23 @@
               icon: 'ant-design:eye-outlined',
               onClick: handleView.bind(null, record),
               ifShow: (_action) => {
-                return record.status === '已发布';
+                return record.status === 1 && rolePermission == 'CUSTOMER_USER';
               },
             },
             {
               label: '编辑',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
+              // auth: 'isTenant' || 'isCustomer',
               ifShow: (_action) => {
-                return record.status === '草稿';
+                return record.status === 0 && record.creator == userId;
               },
             },
             {
               label: '删除',
               icon: 'ant-design:delete-outlined',
               color: 'error',
+              ifShow: record.creator == userId || record.tenantId == tenantId,
               popConfirm: {
                 title: '是否确认删除',
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
@@ -48,7 +50,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref } from 'vue';
+  import { defineComponent, ref, computed } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
   import NotifyManagerDrawer from './useDrawer.vue';
@@ -56,13 +58,26 @@
   import { columns, searchFormSchema } from './config.d';
   import { notifyGetTableApi, notifyDeleteApi } from '/@/api/stationnotification/stationnotifyApi';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
+  import { RoleEnum } from '/@/enums/roleEnum';
+  import { usePermission } from '/@/hooks/web/usePermission';
+  import { useUserStore } from '/@/store/modules/user';
+
   export default defineComponent({
     name: 'Notificationmannager',
     components: { BasicTable, NotifyManagerDrawer, TableAction, tableViewChild },
     setup() {
+      const { hasPermission } = usePermission();
+      const userStore = useUserStore();
+      const isTenant = computed(() => userStore.getRoleList.includes(RoleEnum.TENANT_ADMIN));
+      const isCustomer = computed(() => userStore.getRoleList.includes(RoleEnum.CUSTOMER_USER));
+      const userInfo: any = getAuthCache(USER_INFO_KEY);
+      const userId = userInfo.userId;
+      const tenantId = userInfo.tenantId;
+      const rolePermission: string = userInfo.roles[0];
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [registerAdd, { openDrawer: openDrawerAdd }] = useDrawer();
-
       // 批量删除
       const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
         notifyDeleteApi,
@@ -123,6 +138,12 @@
         handleSuccess,
         handleDeleteOrBatchDelete,
         NotifyManagerDrawerRef,
+        rolePermission,
+        userId,
+        tenantId,
+        hasPermission,
+        isTenant,
+        isCustomer,
       };
     },
   });

@@ -46,8 +46,8 @@
         //编辑
         if (data.isUpdate) {
           noticeId.value = data.record.id;
-          Reflect.set(data.record, 'receiverType', data.record.receiverType === '全部' ? '0' : '1');
-          if (data.record.receiverType === '1') {
+          Reflect.set(data.record, 'receiverType', data.record.receiverType === '全部' ? 0 : 1);
+          if (data.record.receiverType === 1) {
             if (!data.record.pointId.length) return;
             const organizationId = data.record.pointId.split(',');
             Reflect.set(data.record, 'organizationId', organizationId);
@@ -60,7 +60,7 @@
         const valid = await validate();
         if (!valid) return;
         const field = getFieldsValue();
-        const pointId = field.receiverType === '1' ? field.organizationId + '' : null;
+        const pointId = field.receiverType === 1 ? field.organizationId + '' : null;
         // 新增情况
         try {
           const editNotice = {
@@ -78,7 +78,7 @@
       const handleSaveDraft = async () => {
         await validate();
         const field = getFieldsValue();
-        const pointId = field.receiverType === '1' ? field.organizationId + '' : null;
+        const pointId = field.receiverType === 1 ? field.organizationId + '' : null;
         if (!unref(isUpdate)) {
           const saveDraft = {
             ...field,