lind 3 лет назад
Родитель
Сommit
1869315288

+ 33 - 4
src/pages/rule-engine/Alarm/Config/index.tsx

@@ -53,8 +53,36 @@ const Config = () => {
     [],
   );
 
-  const inputForm = useMemo(() => createForm(), []);
-  const outputForm = useMemo(() => createForm(), []);
+  const inputForm = useMemo(
+    () =>
+      createForm({
+        validateFirst: true,
+        effects() {
+          onFormInit(async () => {
+            const resp = await service.getDataExchange('consume');
+            if (resp.status === 200) {
+              console.log(resp, 'resp');
+            }
+          });
+        },
+      }),
+    [],
+  );
+  const outputForm = useMemo(
+    () =>
+      createForm({
+        validateFirst: true,
+        effects() {
+          onFormInit(async () => {
+            const resp = await service.getDataExchange('producer');
+            if (resp.status === 200) {
+              console.log(resp, 'producer');
+            }
+          });
+        },
+      }),
+    [],
+  );
 
   const levelSchema: ISchema = {
     type: 'object',
@@ -174,16 +202,17 @@ const Config = () => {
     const outputConfig: IOConfigItem = await outputForm.submit();
     const inputResp = await service.saveOutputData({
       config: {
-        type: 'kafka',
         config: inputConfig,
       },
+      sourceType: 'kafka',
       exchangeType: 'producer',
     });
     const outputResp = await service.saveOutputData({
       config: {
-        type: 'kafka',
+        sourceType: 'kafka',
         config: outputConfig,
       },
+      sourceType: 'kafka',
       exchangeType: 'consume',
     });
 

+ 3 - 0
src/pages/rule-engine/Alarm/Config/service.ts

@@ -21,6 +21,9 @@ class Service extends BaseService<IOConfigItem> {
       method: 'PATCH',
       data,
     });
+
+  getDataExchange = (type: 'consume' | 'producer') =>
+    request(`/${SystemConst.API_BASE}/alarm/config/${type}/data-exchange`, { method: 'GET' });
 }
 
 export default Service;

+ 13 - 4
src/pages/rule-engine/Alarm/Configuration/Save/index.tsx

@@ -60,8 +60,11 @@ const Save = (props: Props) => {
 
   const getScene = () => {
     return service.getScene().then((resp) => {
-      Store.set('scene-data', resp);
-      return resp;
+      Store.set('scene-data', resp.result);
+      return resp.result.map((item: { id: string; name: string }) => ({
+        label: item.name,
+        value: item.id,
+      }));
     });
   };
   const form = useMemo(
@@ -89,8 +92,14 @@ const Save = (props: Props) => {
   const handleSave = async () => {
     const data: any = await form.submit();
     const list = Store.get('scene-data');
-    const scene = list.find((item: any) => item.value === data.sceneId);
-    const resp: any = await service.update({ ...data, sceneName: scene.label, state: 'disable' });
+    const scene = list.find((item: any) => item.id === data.sceneId);
+
+    const resp: any = await service.update({
+      ...data,
+      sceneTriggerType: scene.triggerType,
+      sceneName: scene.name,
+    });
+
     if (resp.status === 200) {
       message.success('操作成功');
       props.close();

+ 0 - 5
src/pages/rule-engine/Alarm/Configuration/service.ts

@@ -16,11 +16,6 @@ class Service extends BaseService<ConfigItem> {
   public getScene = () =>
     request(`/${SystemConst.API_BASE}/scene/_query/no-paging?paging=false`, {
       method: 'GET',
-    }).then((resp) => {
-      return resp.result.map((item: { id: string; name: string }) => ({
-        label: item.name,
-        value: item.id,
-      }));
     });
 
   public _enable = (id: string) =>