Bug pr jobhistory field null (#756)

* fix:dlink平台详情查看信息对象兼容为null问题

* job history null

* fix:blink域名问题

* } add

* dlink文件问题

* superfluous dir remove
Co-authored-by: songshilian <songshilian@qiangungun.com>

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

@@ -32,6 +32,8 @@ import com.dlink.service.JobHistoryService;
 import com.dlink.utils.JSONUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 
+import java.util.Objects;
+
 /**
  * JobHistoryServiceImpl
  *
@@ -92,7 +94,8 @@ public class JobHistoryServiceImpl extends SuperServiceImpl<JobHistoryMapper, Jo
         try {
             JsonNode jobInfo = FlinkAPI.build(jobManagerHost).getJobInfo(jobId);
             if(jobInfo.has(FlinkRestResultConstant.ERRORS)){
-                return jobHistory;
+                final JobHistory dbHistory = getById(id);
+                return Objects.isNull(dbHistory) ? jobHistory : dbHistory;
             }
             JsonNode exception = FlinkAPI.build(jobManagerHost).getException(jobId);
             JsonNode checkPoints = FlinkAPI.build(jobManagerHost).getCheckPoints(jobId);

dlink-web/src/pages/DevOps/JobInfo/CheckPoints/index.tsx

@@ -45,7 +45,7 @@ const CheckPoints = (props: any) => {
   const {job} = props;
   const actionRef = useRef<ActionType>();
 
-  const JsonParseObject = (item : any ) =>{
+  const JsonParseObject = (item: any) => {
     return JSON.parse(JSON.stringify(item))
   }
 
@@ -57,9 +57,11 @@ const CheckPoints = (props: any) => {
 
     return (
       <>
+        {JSON.stringify(job?.jobHistory?.checkpoints).includes("errors") ?
+          <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/> :
           <Descriptions bordered size="small" column={1}>
             <Descriptions.Item label="CheckPoint Counts">
-              <Tag color="blue" title={"Total"} >
+              <Tag color="blue" title={"Total"}>
                 <RocketOutlined/> Total: {counts.total}
               </Tag>
               <Tag color="red" title={"Failed"}>
@@ -94,7 +96,7 @@ const CheckPoints = (props: any) => {
                     {"id： " + JsonParseObject(latest.failed).id}
                   </Tag>
                   <Tag color="red" title={"Latest Failed CheckPoint"}>
-                    { "Fail Time： " + moment(JsonParseObject(latest.failed).failure_timestamp).format('YYYY-MM-DD HH:mm:ss')}
+                    {"Fail Time： " + moment(JsonParseObject(latest.failed).failure_timestamp).format('YYYY-MM-DD HH:mm:ss')}
                   </Tag>
                   <Tag color="red" title={"Latest Failed CheckPoint"}>
                     {"Cause： " + JsonParseObject(latest.failed).failure_message}
@@ -118,12 +120,12 @@ const CheckPoints = (props: any) => {
               </Tag>
             </Descriptions.Item>
           </Descriptions>
+        }
       </>
     )
   }
 
-
-  const getSummary = (checkpoints : any) => {
+  const getSummary = (checkpoints: any) => {
 
     let end_to_end_duration = JsonParseObject(JsonParseObject(checkpoints.summary)).end_to_end_duration
     let state_size = JsonParseObject(JsonParseObject(checkpoints.summary)).state_size
@@ -133,6 +135,8 @@ const CheckPoints = (props: any) => {
 
     return (
       <>
+        {JSON.stringify(job?.jobHistory?.checkpoints).includes("errors") ?
+          <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/> :
           <Descriptions bordered size="small" column={1}>
             <Descriptions.Item label="End to End Duration">
               <Tag color="blue" title={"Max"}>
@@ -194,6 +198,7 @@ const CheckPoints = (props: any) => {
               </Tag>
             </Descriptions.Item>
           </Descriptions>
+        }
       </>
     )
   }
@@ -219,7 +224,7 @@ const CheckPoints = (props: any) => {
     });
   }
 
-  const getHistory = (checkpoints : any) => {
+  const getHistory = (checkpoints: any) => {
 
     const checkPointsList: CheckPointsDetailInfo[] = [];
     checkpoints?.history?.forEach((entity: CheckPointsDetailInfo) => {
@@ -330,10 +335,12 @@ const CheckPoints = (props: any) => {
   }
 
 
-  const getConfiguration = (checkpointsConfig : any) => {
+  const getConfiguration = (checkpointsConfig: any) => {
     let checkpointsConfigInfo = JsonParseObject(checkpointsConfig)
     return (
       <>
+        {JSON.stringify(job?.jobHistory?.checkpointsConfig).includes("errors") ?
+          <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/> :
           <Descriptions bordered size="small" column={1}>
             <Descriptions.Item label="Checkpointing Mode">
               <Tag color="blue" title={"Checkpointing Mode"}>
@@ -355,7 +362,7 @@ const CheckPoints = (props: any) => {
 
             <Descriptions.Item label="Interval">
               <Tag color="blue" title={"Interval"}>
-                {checkpointsConfigInfo.interval }
+                {checkpointsConfigInfo.interval}
               </Tag>
             </Descriptions.Item>
 
@@ -391,7 +398,7 @@ const CheckPoints = (props: any) => {
             {JsonParseObject(checkpointsConfigInfo.externalization).enabled && (
               <Descriptions.Item label="Delete On Cancellation">
                 <Tag color="blue" title={"Delete On Cancellation"}>
-                  { JsonParseObject(checkpointsConfigInfo.externalization).delete_on_cancellation ? 'Enabled' : 'Disabled'}
+                  {JsonParseObject(checkpointsConfigInfo.externalization).delete_on_cancellation ? 'Enabled' : 'Disabled'}
                 </Tag>
               </Descriptions.Item>
             )}
@@ -403,6 +410,7 @@ const CheckPoints = (props: any) => {
               </Tag>
             </Descriptions.Item>
           </Descriptions>
+        }
       </>
     )
   }
@@ -454,7 +462,11 @@ const CheckPoints = (props: any) => {
         <ProTable<SavePointTableListItem>
           columns={columns}
           style={{width: '100%'}}
-          request={(params, sorter, filter) => queryData(url, {taskId: job?.instance.taskId, ...params, sorter, filter})}
+          request={(params, sorter, filter) => queryData(url, {
+            taskId: job?.instance.taskId, ...params,
+            sorter,
+            filter
+          })}
           actionRef={actionRef}
           rowKey="id"
           pagination={{
@@ -468,11 +480,12 @@ const CheckPoints = (props: any) => {
   }
 
   return (<>
+    {(job?.jobHistory?.checkpoints || job?.jobHistory?.checkpointsConfig) &&
     <Tabs defaultActiveKey="overview" size="small" tabPosition="top" style={{
       border: "1px solid #f0f0f0",
     }}>
       <TabPane tab={<span>&nbsp; Overview &nbsp;</span>} key="overview">
-        { !JSON.stringify(job?.jobHistory?.checkpoints).includes("errors") ?
+        {!JSON.stringify(job?.jobHistory?.checkpoints).includes("errors") ?
           getOverview(JsonParseObject(job?.jobHistory?.checkpoints)) :
           <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>}
       </TabPane>
@@ -482,14 +495,14 @@ const CheckPoints = (props: any) => {
       </TabPane>
 
       <TabPane tab={<span>&nbsp; Summary &nbsp;</span>} key="summary">
-        { !JSON.stringify(job?.jobHistory?.checkpoints).includes("errors") ?
+        {!JSON.stringify(job?.jobHistory?.checkpoints).includes("errors") ?
           getSummary(JsonParseObject(job?.jobHistory?.checkpoints)) :
           <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>
         }
       </TabPane>
 
       <TabPane tab={<span>&nbsp; Configuration &nbsp;</span>} key="configuration">
-        { !JSON.stringify(job?.jobHistory?.checkpointsConfig).includes("errors") ?
+        {!JSON.stringify(job?.jobHistory?.checkpointsConfig).includes("errors") ?
           getConfiguration(JsonParseObject(job?.jobHistory?.checkpointsConfig)) :
           <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>
         }
@@ -498,8 +511,7 @@ const CheckPoints = (props: any) => {
       <TabPane tab={<span>&nbsp; SavePoint &nbsp;</span>} key="savepoint">
         {getSavePoint()}
       </TabPane>
-    </Tabs>
+    </Tabs>}
   </>)
 };
-
 export default CheckPoints;

dlink-web/src/pages/DevOps/JobInfo/Config/index.tsx

@@ -26,8 +26,9 @@ const {Text, Link} = Typography;
 const Config = (props: any) => {
 
   const {job} = props;
-
   return (<>
+    {
+      job?.jobHistory?.config && <>
         <>
           <Descriptions bordered size="small" title={"Dinky Job Configuration"}>
             <Descriptions.Item label="执行模式">{job?.history?.type ? (
@@ -66,7 +67,7 @@ const Config = (props: any) => {
         </>
         <br/><br/>
         <>
-      { ! JSON.stringify(job?.jobHistory?.config).includes("errors") &&
+          {!JSON.stringify(job?.jobHistory?.config).includes("errors") &&
           <Descriptions bordered size="small" title={"Flink Job Configuration"}>
             <Descriptions.Item label="Execution Mode">
               <Tag color="blue" title={"Execution Mode"}>
@@ -98,6 +99,8 @@ const Config = (props: any) => {
           </Descriptions>
           }
         </>
+      </>
+    }
   </>)
 };
 

dlink-web/src/pages/DevOps/JobInfo/DataMap/index.tsx

@@ -33,7 +33,7 @@ const DataMap = (props: any) => {
     setData(undefined);
     const res = getLineage(job.instance?.id);
     res.then((result)=>{
-      result.datas.tables.forEach(table => {
+      result.datas?.tables.forEach(table => {
         table.isExpand = true;
         table.isFold = false;
       });

dlink-web/src/pages/DevOps/JobInfo/Exception/index.tsx

@@ -28,16 +28,17 @@ const Exception = (props: any) => {
   const {job} = props;
 
   return (<>
-    <Tabs defaultActiveKey="RootException" size="small" tabPosition="top" style={{
+    {job.jobHistory?.exceptions && <Tabs defaultActiveKey="RootException" size="small" tabPosition="top" style={{
       border: "1px solid #f0f0f0"
     }}>
+
       <TabPane tab={<span>Root Exception</span>} key="RootException">
         <CodeShow code={job.jobHistory?.exceptions['root-exception'] as string} language='java' height='500px'/>
       </TabPane>
       <TabPane tab={<span>Exception History</span>} key="ExceptionHistory">
         <Empty image={Empty.PRESENTED_IMAGE_SIMPLE}/>
       </TabPane>
-    </Tabs>
+    </Tabs>}
   </>)
 };