feats

.env

@@ -0,0 +1 @@
+PORT=8001

src/pages/Medical/Test/Batch/DoExcel.jsx

@@ -0,0 +1,145 @@
+import React, { useState, useRef } from 'react';
+import { Alert, Button, message, Space, Modal, Table } from 'antd';
+import { FileExcelOutlined, SaveOutlined, RedoOutlined } from '@ant-design/icons';
+import { saveTestExcel } from '@/services/test';
+import Step from './components/Step'
+import { read } from './excel'
+
+const fullWidth = { width: '100%' }
+
+export default (props) => {
+  const { schoolId } = props
+
+  const [visible, setVisible] = useState(false)
+  const [reading, setReading] = useState(false)
+  const [submitting, setSubmitting] = useState(false)
+
+  const workbookRef = useRef()
+  const [dataSource, setDataSource] = useState([])
+
+  const columns = [
+    {
+      key: 'index',
+      title: '序号',
+      width: 200,
+      align: 'center',
+      render: (t,r,i) => i + 1,
+    },
+    {
+      key: 'testNo',
+      dataIndex: 'testNo',
+      title: '体检号',
+      align: 'center',
+    },
+    {
+      key: 'studentNo',
+      dataIndex: 'studentNo',
+      title: '学号',
+      align: 'center',
+    },
+  ]
+
+  const handleFile = () => {
+    const input = document.createElement('input')
+    input.type = 'file'
+    input.accept = 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+    input.onchange = (e) => {
+      const file = e.target.files[0]
+      if (!file) {
+        message.warning('请选择文件')
+      }
+
+      setReading(true)
+      read(file).then((res) => {
+        workbookRef.current = res
+        setReading(false)
+        setVisible(true)
+      }).catch((err) => {
+        console.error(err)
+        setReading(false)
+      })
+    }
+    input.click()
+  }
+  
+
+  const handleSettingChange = (e) => {
+    setVisible(false)
+
+    const { dataStartRow, sheet, cols } = e
+
+    const [, end] = sheet['!ref'].split(':')
+    const maxRow = /\d+/.exec(end)[0] - 0
+    const arr = []
+    for (let i = dataStartRow; i <= maxRow; i += 1) {
+      const testNo = sheet[`${cols.testNoCol}${i}`]?.v
+      const studentNo = sheet[`${cols.studentNoCol}${i}`]?.v
+
+      arr.push({
+        testNo,
+        studentNo,
+        schoolId,
+      })
+    }
+
+    setDataSource(arr)
+  }
+  
+  const handleSubmit = () => {
+    setSubmitting(true)
+    saveTestExcel(dataSource).then(() => {
+      setSubmitting(false)
+      setDataSource([])
+      message.success("保存入库成功");
+    }).catch((err) => {
+      console.error(err);
+      message.error(err.message);
+      setSubmitting(false)
+    })
+  }
+
+  return (
+    <div>
+      <Space direction="vertical" size="large" style={fullWidth}>
+        <Alert description="Excel 文件数据不要超过 200 列, 2000 行。如果出现未知错误, 请退出重试几次" type="warning" closable />
+        <Space direction="horizontal" size="large" style={fullWidth}>
+          <Button
+            ghost
+            type="primary"
+            loading={reading}
+            disabled={!schoolId}
+            icon={<FileExcelOutlined />}
+            onClick={handleFile}
+          >上传 Excel 文件</Button>
+
+          <Button
+            ghost
+            type="primary"
+            disabled={!dataSource.length}
+            icon={<RedoOutlined />}
+            onClick={() => setDataSource([])}
+          >重置</Button>
+          
+          <Button
+            type="primary"
+            loading={submitting}
+            disabled={!dataSource.length}
+            icon={<SaveOutlined />}
+            onClick={handleSubmit}
+          >保存入库</Button>
+        </Space>
+        <Table columns={columns} dataSource={dataSource} rowKey="testNo" pagination={false} />
+      </Space>
+      <Modal
+        title="设置数据内容"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={null}
+        width={480}
+        maskClosable={false}
+      >
+        <Step workbook={workbookRef.current} onChange={handleSettingChange} />
+      </Modal>
+    </div>
+  )
+}

src/pages/Medical/Test/Batch/DoPdf.jsx

@@ -0,0 +1,154 @@
+import React, { useState } from 'react';
+import { Button, Space, Table, Progress, message } from 'antd';
+import { FileZipOutlined, SaveOutlined, RedoOutlined } from '@ant-design/icons';
+import { uploadPdf } from '@/utils/uploadFile';
+import { saveTestPDF } from '@/services/test';
+
+const fullWidth = { width: '100%' }
+
+const getFileName = (url) => {
+  const parts = url.split('/');
+  return parts[parts.length - 1];
+}
+
+export default (props) => {
+  const { schoolId } = props
+  
+  const [loading, setLoading] = useState(false)
+  const [submitting, setSubmitting] = useState(false)
+  const [percent, setPercent] = useState(0)
+  const [dataSource, setDataSource] = useState([])
+
+  const columns = [
+    {
+      key: 'index',
+      title: '序号',
+      width: 200,
+      align: 'center',
+      render: (t,r,i) => i + 1,
+    },
+    {
+      key: 'studentName',
+      dataIndex: 'studentName',
+      title: '姓名',
+      align: 'center',
+    },
+    {
+      key: 'testNo',
+      dataIndex: 'testNo',
+      title: '体检编号',
+      align: 'center',
+    },
+    {
+      key: 'fileName',
+      dataIndex: 'fileName',
+      title: '文件',
+      align: 'center',
+      render: (t, r) => <a href={r.url}>{t}</a>
+    },
+  ];
+
+  const handleFile = () => {
+    const input = document.createElement('input')
+    input.type = 'file'
+    input.accept = 'application/pdf'
+    input.multiple = true
+    input.onchange = (e) => {
+      const { files } = e.target
+      if (!files || !files.length) {
+        message.warning('请选择文件')
+      }
+
+      const len = files.length;
+      const list = [];
+
+      let i = 0;
+      let j = 0;
+      setLoading(true);
+      setPercent(0);
+      const t = setInterval(() => {
+        if (i >= len) {
+          clearInterval(t);
+          const newLst = list.map((url) => {
+            const fileName = getFileName(url)
+            const testNo = /^[^-]+/.exec(fileName)[0]
+            const studentName = /-(.+)\.pdf/.exec(fileName)[1]
+
+            return {
+              schoolId,
+              testNo,
+              studentName: decodeURIComponent(studentName),
+              fileName: decodeURIComponent(fileName),
+              url,
+            }
+          })
+
+          setDataSource([...dataSource, ...newLst])
+          setLoading(false)
+          return;
+        }
+
+        uploadPdf(files[i]).then((url) => {
+          j += 1;
+          setPercent(j * 100 / len)
+          list.push(url);
+        }).catch((err) => {
+          clearInterval(t);
+          console.error(err);
+          message.error(err.message);
+        })
+        i += 1;
+      }, 500);
+    }
+    input.click()
+  }
+
+  const handleSubmit = () => {
+    setSubmitting(true)
+    saveTestPDF(dataSource).then(() => {
+      setSubmitting(false)
+      setDataSource([])
+      message.success("保存入库成功");
+    }).catch((err) => {
+      console.error(err);
+      message.error(err.message);
+      setSubmitting(false)
+    })
+  }
+
+  return (
+    <Space direction="vertical" size="large" style={fullWidth}>
+      <Space direction="horizontal" size="large" style={fullWidth}>
+        <Button
+          ghost
+          type="primary"
+          loading={loading}
+          disabled={!schoolId}
+          icon={<FileZipOutlined />}
+          onClick={handleFile}
+        >上传 PDF 文件</Button>
+
+        <Button
+          ghost
+          type="primary"
+          disabled={!dataSource.length}
+          icon={<RedoOutlined />}
+          onClick={() => setDataSource([])}
+        >重置</Button>
+        
+        <Button
+          type="primary"
+          loading={submitting}
+          disabled={!dataSource.length}
+          icon={<SaveOutlined />}
+          onClick={handleSubmit}
+        >保存入库</Button>
+
+        {
+          loading && <Progress style={{width: '400px'}} percent={percent} showInfo={false}/>
+        }
+      </Space>
+      <Table columns={columns} dataSource={dataSource} rowKey="testNo" pagination={false} />
+    </Space>
+  )
+}

src/pages/Medical/Test/Batch/Step.jsx → src/pages/Medical/Test/Batch/components/Step.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useRef } from 'react'
 import { Row, Col, Button, InputNumber, Select, Carousel, Typography } from 'antd'
-import { getRangeOfSheet, getAllCols } from './excel'
+import { getRangeOfSheet, getAllCols } from '../excel'
 import styles from './style.less'
 
 const { Title } = Typography;

src/pages/Medical/Test/Batch/index.jsx

@@ -1,106 +1,17 @@
 import React, { useRef, useState } from 'react';
 import { PageContainer } from '@ant-design/pro-layout';
-import { Alert, Button, Card, message, Space, Modal, Table } from 'antd';
-import { FileExcelOutlined, SaveOutlined, FileZipOutlined } from '@ant-design/icons';
+import { Card, Space, Tabs } from 'antd';
 import School from '@/components/School';
-import Step from './Step'
-import { read } from './excel'
+import Excel from './DoExcel';
+import Pdf from './DoPdf';
 
 export default (props) => {
   
-  const [visible, setVisible] = useState(false)
   const [schoolId, setSchoolId] = useState()
-  const [reading, setReading] = useState(false)
-
-  const workbookRef = useRef()
-  const [dataSource, setDataSource] = useState([])
-  const [zipFile, setZipFile] = useState()
-
-  const columns = [
-    {
-      key: 'index',
-      title: '序号',
-      width: 200,
-      align: 'center',
-      render: (t,r,i) => i + 1,
-    },
-    {
-      key: 'testNo',
-      dataIndex: 'testNo',
-      title: '体检号',
-      align: 'center',
-    },
-    {
-      key: 'studentNo',
-      dataIndex: 'studentNo',
-      title: '学号',
-      align: 'center',
-    },
-  ]
-
-  const handleFile = () => {
-    const input = document.createElement('input')
-    input.type = 'file'
-    input.accept = 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-    input.onchange = (e) => {
-      const file = e.target.files[0]
-      if (!file) {
-        message.warning('请选择文件')
-      }
-
-      setReading(true)
-      read(file).then((res) => {
-        workbookRef.current = res
-        setReading(false)
-        setVisible(true)
-      }).catch((err) => {
-        console.error(err)
-        setReading(false)
-      })
-    }
-    input.click()
-  }
-
-  const handleZipFile = () => {
-    const input = document.createElement('input')
-    input.type = 'file'
-    input.accept = 'application/zip'
-    input.onchange = (e) => {
-      const file = e.target.files[0]
-      if (!file) {
-        message.warning('请选择文件')
-      }
-      setZipFile(file)
-    }
-    input.click()
-
-  }
-
-  const handleSettingChange = (e) => {
-    setVisible(false)
-
-    const { dataStartRow, sheet, cols } = e
-
-    const [, end] = sheet['!ref'].split(':')
-    const maxRow = /\d+/.exec(end)[0] - 0
-    const arr = []
-    for (let i = dataStartRow; i <= maxRow; i += 1) {
-      const testNo = sheet[`${cols.testNoCol}${i}`]?.v
-      const studentNo = sheet[`${cols.studentNoCol}${i}`]?.v
-
-      arr.push({
-        testNo,
-        studentNo, 
-      })
-    }
-
-    setDataSource(arr)
-  }
 
   return (
     <PageContainer>
       <Space direction="vertical" size="large" style={{width: '100%'}}>
-        <Alert message="友情提示" description="导入文件数据不要超过 200 列, 6000 行。如果出现未知错误, 请退出重试几次" type="info" closable />
         <Card>
           <Space direction="horizontal" size="large">
             <School
@@ -111,46 +22,20 @@ export default (props) => {
               style={{width: '300px'}}
               placeholder="请选择学校"
             ></School>
-
-            <Button
-              ghost
-              type="primary"
-              loading={reading}
-              disabled={!schoolId}
-              icon={<FileExcelOutlined />}
-              onClick={handleFile}
-            >上传 Excel 文件</Button>
-
-            <Button
-              ghost
-              type="primary"
-              disabled={!dataSource ||!dataSource.length}
-              icon={<FileZipOutlined />}
-              onClick={handleZipFile}
-            >上传 ZIP 文件</Button>
-            
-            <Button
-              type="primary"
-              loading={reading}
-              disabled={!zipFile}
-              icon={<SaveOutlined />}
-              onClick={handleFile}
-            >保存入库</Button>
           </Space>
         </Card>
 
-        <Table columns={columns} dataSource={dataSource} rowKey="testNo" pagination={false} />
+        <Card>
+          <Tabs defaultActiveKey="1">
+            <Tabs.TabPane tab="上传 Excel" key="1">
+              <Excel schoolId={schoolId} />
+            </Tabs.TabPane>
+            <Tabs.TabPane tab="上传 pdf"  key="2">
+              <Pdf schoolId={schoolId} />
+            </Tabs.TabPane>
+          </Tabs>
+        </Card>
       </Space>
-      <Modal
-        title="设置数据内容"
-        visible={visible}
-        onCancel={() => setVisible(false)}
-        footer={null}
-        width={480}
-        maskClosable={false}
-      >
-        <Step workbook={workbookRef.current} onChange={handleSettingChange} />
-      </Modal>
     </PageContainer>
   )
 }

src/services/test.js

@@ -0,0 +1,5 @@
+import request from '@/utils/request';
+
+export const saveTestPDF = (formData) => request('/taTestLog/upload/pdf', { data: formData, method: 'POST' } )
+
+export const saveTestExcel = (formData) => request('/taTestLog/upload/excel', { data: formData, method: 'POST' } )

src/utils/request.js

@@ -31,17 +31,17 @@ const errorHandler = (error) => {
       message: `请求错误 ${status}: ${url}`,
       description: errorText,
     });
+    throw new Error(`请求错误 ${status}`);
   } else if (error.code && error.message) {
     throw new Error(error.message);
   } else {
     console.error(error)
     notification.error({
       description: '您的网络发生异常，无法连接服务器',
-      message: '网络异常',
+      message: error?.status || '网络异常',
     });
+    throw new Error('网络异常');
   }
-
-  return response;
 };
 /** 配置request请求时的默认参数 */
 

src/utils/uploadFile.js

@@ -1,4 +1,5 @@
 import OSS from 'ali-oss';
+import moment from 'moment';
 import request from './request';
 
 // 通过 OSS STS 模式上传
@@ -99,3 +100,36 @@ export function uploadImage(file) {
     }
   });
 }
+
+
+export function uploadPdf(file) {
+  return new Promise((resolve, reject) => {
+    const upload = () => {
+      const data = new FormData();
+      data.append('file', file);
+      const today = moment().format('YYYY-MM-DD')
+      const fileName = `${stsInfo.path}/test-pdf/${today}/${file.name}`;
+
+      ossClient
+        .put(fileName, file)
+        .then((res) => {
+          resolve(res.url);
+        })
+        .catch((e2) => {
+          reject(e2);
+        });
+    };
+
+    if (!ossClient) {
+      getOssClient()
+        .then(() => {
+          upload();
+        })
+        .catch((e) => {
+          reject(e);
+        });
+    } else {
+      upload();
+    }
+  });
+}