[Feature-1119][admin,web,process] Add process console info (#1120)

Co-authored-by: wenmo <32723967+wenmo@users.noreply.github.com>

dlink-admin/src/main/java/com/dlink/controller/ProcessController.java

@@ -20,6 +20,7 @@
 package com.dlink.controller;
 
 import com.dlink.common.result.ProTableResult;
+import com.dlink.common.result.Result;
 import com.dlink.process.model.ProcessEntity;
 import com.dlink.service.ProcessService;
 
@@ -31,6 +32,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.dev33.satoken.SaManager;
+
 /**
  * ProcessController
  *
@@ -49,4 +52,9 @@ public class ProcessController {
         List<ProcessEntity> processEntities = processService.listAllProcess(active);
         return ProTableResult.<ProcessEntity>builder().success(true).data(processEntities).build();
     }
+
+    @GetMapping("/getConsoleByUserId")
+    public Result<String> getConsoleByUserId() {
+        return Result.data(processService.getConsoleByUserId(SaManager.getStpLogic(null).getLoginIdAsInt()));
+    }
 }

dlink-admin/src/main/java/com/dlink/service/ProcessService.java

@@ -32,4 +32,6 @@ import java.util.List;
 public interface ProcessService {
 
     List<ProcessEntity> listAllProcess(boolean active);
+
+    String getConsoleByUserId(Integer userId);
 }

dlink-admin/src/main/java/com/dlink/service/impl/ProcessServiceImpl.java

@@ -20,6 +20,7 @@
 package com.dlink.service.impl;
 
 import com.dlink.process.model.ProcessEntity;
+import com.dlink.process.pool.ConsolePool;
 import com.dlink.process.pool.ProcessPool;
 import com.dlink.service.ProcessService;
 
@@ -49,4 +50,14 @@ public class ProcessServiceImpl implements ProcessService {
         return processEntityMap.values().stream().sorted(Comparator.comparing(ProcessEntity::getStartTime).reversed())
                 .collect(Collectors.toList());
     }
+
+    @Override
+    public String getConsoleByUserId(Integer userId) {
+        String user = userId.toString();
+        if (ConsolePool.getInstance().exist(user)) {
+            return ConsolePool.getInstance().get(user).toString();
+        } else {
+            return "";
+        }
+    }
 }

dlink-admin/src/main/java/com/dlink/service/impl/StudioServiceImpl.java

@@ -50,6 +50,7 @@ import com.dlink.model.Task;
 import com.dlink.process.context.ProcessContextHolder;
 import com.dlink.process.model.ProcessEntity;
 import com.dlink.process.model.ProcessType;
+import com.dlink.process.pool.ConsolePool;
 import com.dlink.process.pool.ProcessPool;
 import com.dlink.result.DDLResult;
 import com.dlink.result.IResult;
@@ -85,6 +86,8 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import cn.dev33.satoken.SaManager;
+
 /**
  * StudioServiceImpl
  *
@@ -243,8 +246,9 @@ public class StudioServiceImpl implements StudioService {
 
     private List<SqlExplainResult> explainFlinkSql(StudioExecuteDTO studioExecuteDTO) {
         Map<String, ProcessEntity> map = ProcessPool.getInstance().getMap();
+        Map<String, StringBuilder> map2 = ConsolePool.getInstance().getMap();
         ProcessEntity process = ProcessContextHolder.registerProcess(
-                ProcessEntity.init(ProcessType.FLINKEXPLAIN, 1, "admin"));
+                ProcessEntity.init(ProcessType.FLINKEXPLAIN, SaManager.getStpLogic(null).getLoginIdAsInt(), "admin"));
 
         addFlinkSQLEnv(studioExecuteDTO);
 

dlink-process/src/main/java/com/dlink/process/model/ProcessEntity.java

@@ -20,6 +20,7 @@
 package com.dlink.process.model;
 
 import com.dlink.assertion.Asserts;
+import com.dlink.process.pool.ConsolePool;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -120,16 +121,18 @@ public class ProcessEntity {
         if (isNullProcess()) {
             return;
         }
-        steps.get(stepIndex - 1).appendInfo(
-                StrUtil.format("\n[{}] {} CONFIG: {}", type.getValue(), LocalDateTime.now(), str));
+        String message = StrUtil.format("\n[{}] {} CONFIG: {}", type.getValue(), LocalDateTime.now(), str);
+        steps.get(stepIndex - 1).appendInfo(message);
+        ConsolePool.write(message, userId);
     }
 
     public void info(String str) {
         if (isNullProcess()) {
             return;
         }
-        steps.get(stepIndex - 1).appendInfo(
-                StrUtil.format("\n[{}] {} INFO: {}", type.getValue(), LocalDateTime.now(), str));
+        String message = StrUtil.format("\n[{}] {} INFO: {}", type.getValue(), LocalDateTime.now(), str);
+        steps.get(stepIndex - 1).appendInfo(message);
+        ConsolePool.write(message, userId);
     }
 
     public void infoSuccess() {
@@ -137,6 +140,7 @@ public class ProcessEntity {
             return;
         }
         steps.get(stepIndex - 1).appendInfo("Success.");
+        ConsolePool.write("Success.", userId);
     }
 
     public void infoFail() {
@@ -144,16 +148,17 @@ public class ProcessEntity {
             return;
         }
         steps.get(stepIndex - 1).appendInfo("Fail.");
+        ConsolePool.write("Fail.", userId);
     }
 
     public void error(String str) {
         if (isNullProcess()) {
             return;
         }
-        steps.get(stepIndex - 1).appendInfo(
-                StrUtil.format("\n[{}] {} ERROR: {}", type.getValue(), LocalDateTime.now(), str));
-        steps.get(stepIndex - 1).appendError(
-                StrUtil.format("\n[{}] {} ERROR: {}", type.getValue(), LocalDateTime.now(), str));
+        String message = StrUtil.format("\n[{}] {} ERROR: {}", type.getValue(), LocalDateTime.now(), str);
+        steps.get(stepIndex - 1).appendInfo(message);
+        steps.get(stepIndex - 1).appendError(message);
+        ConsolePool.write(message, userId);
     }
 
     public void nextStep() {

dlink-process/src/main/java/com/dlink/process/pool/ConsolePool.java

+/*
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.dlink.process.pool;
+
+import com.dlink.pool.AbstractPool;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * ConsolePool
+ *
+ * @author wenmo
+ * @since 2022/10/18 22:51
+ */
+public class ConsolePool extends AbstractPool<StringBuilder> {
+
+    private static volatile Map<String, StringBuilder> consoleEntityMap = new ConcurrentHashMap<>();
+
+    private static ConsolePool instance = new ConsolePool();
+
+    public static ConsolePool getInstance() {
+        return instance;
+    }
+
+    @Override
+    public Map<String, StringBuilder> getMap() {
+        return consoleEntityMap;
+    }
+
+    @Override
+    public void refresh(StringBuilder entity) {
+
+    }
+
+    public static void write(String str, Integer userId) {
+        String user = userId.toString();
+        if (consoleEntityMap.containsKey(user)) {
+            consoleEntityMap.get(user).append(str);
+        } else {
+            consoleEntityMap.put(user, new StringBuilder(str));
+        }
+    }
+
+}

dlink-web/src/components/Studio/StudioConsole/StudioMsg/index.tsx

@@ -17,125 +17,37 @@
  *
  */
 
-
-import {Badge, Button, Divider, Empty, Modal, Tag, Typography} from "antd";
 import {StateType} from "@/pages/DataStudio/model";
 import {connect} from "umi";
-import {FireOutlined, ZoomInOutlined} from '@ant-design/icons';
-import {isSql} from "@/components/Studio/conf";
-import {useState} from "react";
+import React, {useEffect, useState} from "react";
 import CodeShow from "@/components/Common/CodeShow";
-
-const {Title, Paragraph, Text, Link} = Typography;
+import {getConsoleInfo} from "@/pages/SettingCenter/ProcessList/service";
+import {RedoOutlined} from "@ant-design/icons";
+import {Button} from "antd";
 
 const StudioMsg = (props: any) => {
 
   const {current} = props;
-  const [sqlModalVisit, setSqlModalVisit] = useState(false);
-  const [errorModalVisit, setErrorModalVisit] = useState(false);
-
-  const handleOpenSqlModal = () => {
-    setSqlModalVisit(true);
-  };
-
-  const handleOpenErrorModal = () => {
-    setErrorModalVisit(true);
-  };
-
-  const handleCancel = () => {
-    setSqlModalVisit(false);
-    setErrorModalVisit(false);
-  };
-
-  const renderCommonSqlContent = () => {
-    return (<>
-      <Paragraph>
-        <blockquote><Divider type="vertical"/>{current.console.result.startTime}
-          <Divider type="vertical"/>{current.console.result.endTime}
-          <Divider type="vertical"/>
-          {!(current.console.result.success) ? <><Badge status="error"/><Text type="danger">Error</Text></> :
-            <><Badge status="success"/><Text type="success">Success</Text></>}
-          <Divider type="vertical"/>
-        </blockquote>
-        {current.console.result.statement && (<pre style={{height: '100px'}}>{current.console.result.statement}</pre>)}
-        {current.console.result.error && (<pre style={{height: '100px'}}>{current.console.result.error}</pre>)}
-      </Paragraph>
-    </>)
-  };
+  const [consoleInfo, setConsoleInfo] = useState<string>("");
 
-  const renderFlinkSqlContent = () => {
-    return (<>
-      <Paragraph>
-        <blockquote><Link href={`http://${current.console.result.jobConfig?.address}`} target="_blank">
-          [{current.console.result.jobConfig?.session}:{current.console.result.jobConfig?.address}]
-        </Link> <Divider type="vertical"/>{current.console.result.startTime}
-          <Divider type="vertical"/>{current.console.result.endTime}
-          <Divider type="vertical"/>
-          {!(current.console.result.status === 'SUCCESS') ? <><Badge status="error"/><Text
-              type="danger">Error</Text></> :
-            <><Badge status="success"/><Text type="success">Success</Text></>}
-          <Divider type="vertical"/>
-          {current.console.result.jobConfig?.jobName && <Text code>{current.console.result.jobConfig?.jobName}</Text>}
-          {current.console.result.jobId &&
-            (<>
-              <Divider type="vertical"/>
-              <Tag color="blue" key={current.console.result.jobId}>
-                <FireOutlined/> {current.console.result.jobId}
-              </Tag>
-            </>)}
-          <Button
-            type="text"
-            icon={<ZoomInOutlined/>}
-            onClick={handleOpenSqlModal}
-          >
-            SQL
-          </Button>
-          {current.console.result.error ?
-            <Button
-              type="text"
-              icon={<ZoomInOutlined/>}
-              onClick={handleOpenErrorModal}
-            >
-              Error
-            </Button> : undefined
-          }
-        </blockquote>
-        {current.console.result.statement && (<pre style={{height: '100px'}}>{current.console.result.statement}</pre>)}
-        {current.console.result.error && (<pre style={{height: '100px'}}>{current.console.result.error}</pre>)}
-      </Paragraph>
-    </>)
-  };
+  useEffect(() => {
+    refreshConsoleInfo();
+  }, []);
 
+  const refreshConsoleInfo = () => {
+    const res = getConsoleInfo();
+    res.then((result) => {
+      result.datas && setConsoleInfo(result.datas);
+    });
+  }
 
   return (
-    <>
-      <Typography>
-        {current?.task && current.console.result.startTime ? (isSql(current.task.dialect) ? renderCommonSqlContent() :
-          renderFlinkSqlContent()) : <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>
-        }
-      </Typography>
-      <Modal
-        width={'100%'}
-        visible={sqlModalVisit}
-        destroyOnClose
-        centered
-        footer={false}
-        onCancel={handleCancel}
-      >
-        {current.console.result.statement &&
-          (<CodeShow height={"80vh"} language={"sql"} code={current.console.result.statement} theme={"vs-dark"}/>)}
-      </Modal>
-      <Modal
-        width={'100%'}
-        visible={errorModalVisit}
-        destroyOnClose
-        centered
-        footer={false}
-        onCancel={handleCancel}
-      >
-        {current.console.result.error &&
-          (<CodeShow height={"80vh"} language={"java"} code={current.console.result.error} theme={"vs-dark"}/>)}
-      </Modal>
+    <><Button
+      icon={<RedoOutlined/>}
+      onClick={refreshConsoleInfo}
+    ></Button>
+      <CodeShow code={consoleInfo} language='java'
+                height='500px' theme="vs-dark"/>
     </>
   );
 };

dlink-web/src/components/Studio/StudioConsole/StudioMsg/index2.tsx

+/*
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+
+import {Badge, Button, Divider, Empty, Modal, Tag, Typography} from "antd";
+import {StateType} from "@/pages/DataStudio/model";
+import {connect} from "umi";
+import {FireOutlined, ZoomInOutlined} from '@ant-design/icons';
+import {isSql} from "@/components/Studio/conf";
+import {useState} from "react";
+import CodeShow from "@/components/Common/CodeShow";
+
+const {Title, Paragraph, Text, Link} = Typography;
+
+const StudioMsg = (props: any) => {
+
+  const {current} = props;
+  const [sqlModalVisit, setSqlModalVisit] = useState(false);
+  const [errorModalVisit, setErrorModalVisit] = useState(false);
+
+  const handleOpenSqlModal = () => {
+    setSqlModalVisit(true);
+  };
+
+  const handleOpenErrorModal = () => {
+    setErrorModalVisit(true);
+  };
+
+  const handleCancel = () => {
+    setSqlModalVisit(false);
+    setErrorModalVisit(false);
+  };
+
+  const renderCommonSqlContent = () => {
+    return (<>
+      <Paragraph>
+        <blockquote><Divider type="vertical"/>{current.console.result.startTime}
+          <Divider type="vertical"/>{current.console.result.endTime}
+          <Divider type="vertical"/>
+          {!(current.console.result.success) ? <><Badge status="error"/><Text type="danger">Error</Text></> :
+            <><Badge status="success"/><Text type="success">Success</Text></>}
+          <Divider type="vertical"/>
+        </blockquote>
+        {current.console.result.statement && (<pre style={{height: '100px'}}>{current.console.result.statement}</pre>)}
+        {current.console.result.error && (<pre style={{height: '100px'}}>{current.console.result.error}</pre>)}
+      </Paragraph>
+    </>)
+  };
+
+  const renderFlinkSqlContent = () => {
+    return (<>
+      <Paragraph>
+        <blockquote><Link href={`http://${current.console.result.jobConfig?.address}`} target="_blank">
+          [{current.console.result.jobConfig?.session}:{current.console.result.jobConfig?.address}]
+        </Link> <Divider type="vertical"/>{current.console.result.startTime}
+          <Divider type="vertical"/>{current.console.result.endTime}
+          <Divider type="vertical"/>
+          {!(current.console.result.status === 'SUCCESS') ? <><Badge status="error"/><Text
+              type="danger">Error</Text></> :
+            <><Badge status="success"/><Text type="success">Success</Text></>}
+          <Divider type="vertical"/>
+          {current.console.result.jobConfig?.jobName && <Text code>{current.console.result.jobConfig?.jobName}</Text>}
+          {current.console.result.jobId &&
+            (<>
+              <Divider type="vertical"/>
+              <Tag color="blue" key={current.console.result.jobId}>
+                <FireOutlined/> {current.console.result.jobId}
+              </Tag>
+            </>)}
+          <Button
+            type="text"
+            icon={<ZoomInOutlined/>}
+            onClick={handleOpenSqlModal}
+          >
+            SQL
+          </Button>
+          {current.console.result.error ?
+            <Button
+              type="text"
+              icon={<ZoomInOutlined/>}
+              onClick={handleOpenErrorModal}
+            >
+              Error
+            </Button> : undefined
+          }
+        </blockquote>
+        {current.console.result.statement && (<pre style={{height: '100px'}}>{current.console.result.statement}</pre>)}
+        {current.console.result.error && (<pre style={{height: '100px'}}>{current.console.result.error}</pre>)}
+      </Paragraph>
+    </>)
+  };
+
+
+  return (
+    <>
+      <Typography>
+        {current?.task && current.console.result.startTime ? (isSql(current.task.dialect) ? renderCommonSqlContent() :
+          renderFlinkSqlContent()) : <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>
+        }
+      </Typography>
+      <Modal
+        width={'100%'}
+        visible={sqlModalVisit}
+        destroyOnClose
+        centered
+        footer={false}
+        onCancel={handleCancel}
+      >
+        {current.console.result.statement &&
+          (<CodeShow height={"80vh"} language={"sql"} code={current.console.result.statement} theme={"vs-dark"}/>)}
+      </Modal>
+      <Modal
+        width={'100%'}
+        visible={errorModalVisit}
+        destroyOnClose
+        centered
+        footer={false}
+        onCancel={handleCancel}
+      >
+        {current.console.result.error &&
+          (<CodeShow height={"80vh"} language={"java"} code={current.console.result.error} theme={"vs-dark"}/>)}
+      </Modal>
+    </>
+  );
+};
+
+export default connect(({Studio}: { Studio: StateType }) => ({
+  current: Studio.current,
+}))(StudioMsg);

dlink-web/src/pages/SettingCenter/ProcessList/service.ts

+/*
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+import {getData} from "@/components/Common/crud";
+
+export function getConsoleInfo() {
+  return getData("api/process/getConsoleByUserId");
+}