Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/GovernmentDataResourceCenter

api/app/lib/controllers/dataQuality/index.js

@@ -73,7 +73,7 @@ function getStandardDocFolders (opts) {
 
 
 
-// 标准文档目录新增失败
+
 function postStandardDocFolders (opts) {
    return async function (ctx, next) {
 
@@ -157,6 +157,11 @@ function postBusinessRules (opts) {
 
          const { id, name, description, problemType, problemLevel, ruleBasis } = ctx.request.body;
 
+         let findOne = await models.BusinessRule.findOne({ where: { name: name } })
+         if ((!id && findOne) || (id && findOne && findOne.id != id)) {
+            message = '业务规则名称重复'
+            throw ''
+         }
          if (id) {
             await models.BusinessRule.update({
                name, description, problemType, problemLevel, ruleBasis

web/client/src/sections/dataQuality/components/fileModal.js

@@ -78,7 +78,7 @@ function FileModal ({ loading, parent, user, actions, editData = {}, dispatch, c
                />
             </Form.Item>
             <Form.Item label="标签" name="tags" >
-               <Input allowClear placeholder='请输入标签' style={{ width: 300, marginRight: 16 }} />
+               <Input allowClear placeholder='请输入标签' maxLength={50} style={{ width: 300, marginRight: 16 }} />
             </Form.Item>
             <Form.Item
                label='文件'

web/client/src/sections/dataQuality/components/groupModal.js

@@ -45,7 +45,7 @@ function GroupModal ({ loading, parent, user, actions, dispatch, close, success,
             }}
             autoComplete="off"
          >
-            <Form.Item label="名称" name="name" rules={[{ required: true, message: '请输入分组名称' }]}>
+            <Form.Item label="名称" name="name" rules={[{ required: true, message: '请输入分组名称,最多50字', max: 50 },]}>
                <Input allowClear placeholder='请输入分组名称' style={{ width: 300, }} />
             </Form.Item>
          </Form>

web/client/src/sections/dataQuality/components/ruleModal.js

@@ -52,7 +52,7 @@ function RuleModal ({ loading, parent, user, actions, dispatch, close, success,
             autoComplete="off"
             labelCol={{ span: 4 }} wrapperCol={{ span: 20 }}
          >
-            <Form.Item label="名称" name="name" initialValue={editData?.name} rules={[{ required: true, message: '请输入分组名称' }]}>
+            <Form.Item label="名称" name="name" initialValue={editData?.name} rules={[{ required: true, message: '请输入分组名称,最多50字', max: 50}]}>
                <Input allowClear placeholder='请输入分组名称' style={{ width: 300 }} />
             </Form.Item>
             <Form.Item label="描述" name="description" initialValue={editData?.description} rules={[{ required: true, message: '请输入分组名称' }]}>

web/client/src/sections/dataQuality/containers/documentLibrary.js

@@ -77,7 +77,13 @@ function Approve ({ loading, clientHeight, actions, dispatch, }) {
             <Button type="primary" onClick={() => {
                setFileModal(true)
             }}>上传</Button>
-            <Button type="primary">下载</Button>
+            <Button type="primary" onClick={() => {
+               // let fileUrlList = fileData.filter(d => fileId.current.includes(d.id))?.map(s => s.path)
+
+               // console.log(fileUrlList);
+              
+
+            }}>下载</Button>
 
             <Popconfirm
                title="是否删除文件夹或文件？当有创建的业务规则与标准文档关联时则不允许删除。"
@@ -86,7 +92,7 @@ function Approve ({ loading, clientHeight, actions, dispatch, }) {
                   if (folderId.current?.length || fileId.current?.length) {
                      dispatch(dataQuality.postFolderFile({ folderId: folderId.current, fileId: fileId.current })).then(res => {
                         if (res.success) {
-                           resourceData(parent,keywords)
+                           resourceData(parent, keywords)
                            setCheckAll(false)
                            console.log(res);
                            res.payload.data?.map(v => {
@@ -239,7 +245,7 @@ function Approve ({ loading, clientHeight, actions, dispatch, }) {
                }
                success={
                   () => {
-                     resourceData(parent,keywords)
+                     resourceData(parent, keywords)
                   }
                }
             /> : ""
@@ -252,7 +258,7 @@ function Approve ({ loading, clientHeight, actions, dispatch, }) {
                   setFileModal(false);
                }}
                success={() => {
-                  resourceData(parent,keywords)
+                  resourceData(parent, keywords)
                }}
                remove={url => {
                   RouteRequest.delete(RouteTable.cleanUpUploadTrash, { url: url });

web/client/src/sections/safetySpecification/components/fileModal.js

@@ -10,7 +10,7 @@ import { Tabs, Form, Input, DatePicker, Button, Modal, Select, Tag } from 'antd'
 
 function FileModal ({ loading, parent, user, actions, editData = {}, dispatch, close, success, remove }) {
 
-   const { resourceRetrieval } = actions
+   const { safetySpecification } = actions
    const [tabsKey, setTabsKey] = useState("stay")
    const [query, setQuery] = useState({ page: 0, limit: 10 });
    const [proTableList, setProTableList] = useState({ rows: [], count: 0 });
@@ -46,7 +46,7 @@ function FileModal ({ loading, parent, user, actions, editData = {}, dispatch, c
          onOk={e => {
             form.validateFields().then(v => {
                
-               dispatch(resourceRetrieval.postSpecifications({
+               dispatch(safetySpecification.postSpecifications({
                   ...v,
                   fileName: v?.files[0]?.name,path:v?.files[0]?.url,
                })).then(res => {
@@ -74,7 +74,7 @@ function FileModal ({ loading, parent, user, actions, editData = {}, dispatch, c
             labelCol={{ span: 4 }} wrapperCol={{ span: 20 }}
          >
             <Form.Item label="标签" name="tags" >
-               <Input allowClear placeholder='请输入标签' style={{ width: 300, marginRight: 16 }} />
+               <Input allowClear placeholder='请输入标签' maxLength={50} style={{ width: 300, marginRight: 16 }} />
             </Form.Item>
             <Form.Item
                label='文件'

web/client/src/sections/safetySpecification/containers/specificationLibrary.js

@@ -10,11 +10,12 @@ const { Search } = Input;
 import { CreditCardFilled, FilePdfOutlined } from '@ant-design/icons';
 import { agent } from 'superagent';
 const CheckboxGroup = Checkbox.Group;
-
+import JSZip from 'jszip'
+import { savAes } from 'file-saver'
 
 function SpecificationLibrary ({ loading, clientHeight, actions, dispatch, }) {
 
-   const { resourceRetrieval } = actions
+   const { safetySpecification } = actions
    const [checkAll, setCheckAll] = useState(false)
    const [query, setQuery] = useState({ page: 0, limit: 20 });
    const [fileData, setFileData] = useState({ data: [], count: 0 })
@@ -32,7 +33,7 @@ function SpecificationLibrary ({ loading, clientHeight, actions, dispatch, }) {
 
    let resourceData = (data) => {
       let params = data || query
-      dispatch(resourceRetrieval.getSpecifications({ keyword: keyword, ...params, })).then(res => {
+      dispatch(safetySpecification.getSpecifications({ keyword: keyword, ...params, })).then(res => {
          if (res.success) {
             setFileData({ data: res.payload.data?.rows, count: res.payload.data?.count })
 
@@ -40,6 +41,7 @@ function SpecificationLibrary ({ loading, clientHeight, actions, dispatch, }) {
       })
    }
    
+
    return <>
 
       <div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 20 }}>
@@ -58,10 +60,16 @@ function SpecificationLibrary ({ loading, clientHeight, actions, dispatch, }) {
             <Button type="primary" onClick={() => {
                setFileModal(true)
             }}>上传</Button>
-            <Button type="primary">下载</Button>
+            <Button type="primary" onClick={() => {
+               // let fileUrlList = fileData?.data?.filter(d => fileId.current.includes(d.id))?.map(s => s.path)
+
+               // RouteRequest.post(RouteTable.packBulk, { fileUrl: fileUrlList });
+
+
+            }}>下载</Button>
             <Button type="primary" onClick={() => {
                if (fileId.current?.length) {
-                  dispatch(resourceRetrieval.delSpecifications(fileId.current)).then(res => {
+                  dispatch(safetySpecification.delSpecifications(fileId.current)).then(res => {
                      if (res.success) {
                         let url = []
                         fileData?.data?.map(f => {
@@ -115,7 +123,7 @@ function SpecificationLibrary ({ loading, clientHeight, actions, dispatch, }) {
       >
          {
             fileData?.data?.map((v, i) => {
-               return <div style={{ width: 310, display: 'inline-block', margin:'0 18px 10px 0', }}>
+               return <div style={{ width: 310, display: 'inline-block', margin: '0 18px 10px 0', }}>
                   <div style={{ display: 'flex', padding: '10px 0', border: `1px solid ${fileId.current?.includes(v.id) ? 'rgb(42 207 98)' : '#fff'}` }} onClick={() => {
                      if (fileId.current?.includes(v.id)) {
                         fileId.current = fileId.current?.filter(c => c != v.id)

web/client/src/utils/webapi.js

@@ -88,14 +88,16 @@ export const ApiTable = {
    //数据质量
    standardDocFolders: 'standard-doc-folders',
    standardDocs: 'standard-docs',
-   postFolderFile:'postFolderFile',
-   businessRules:'business-rules',
-   delBusinessRules:'business-rules/{id}',
-   regularBasis:'regular-basis',
+   postFolderFile: 'postFolderFile',
+   businessRules: 'business-rules',
+   delBusinessRules: 'business-rules/{id}',
+   regularBasis: 'regular-basis',
 
    //数据安全规范上传
-   specifications:'data-security/specifications',
-   delSpecifications:'data-security/specifications/{fileIds}',
+   specifications: 'data-security/specifications',
+   delSpecifications: 'data-security/specifications/{fileIds}',
+   packBulk: 'packBulk',
+
    //元数据检索
    searchMetadata: "meta/data/search",
 
@@ -103,12 +105,14 @@ export const ApiTable = {
    getBackupsList: 'meta/backups',
    addBackups: 'meta/backups',
    modifyBackups: 'meta/backups/{id}',
-     restoreBackups:'backups/restore'
+   restoreBackups: 'backups/restore'
 };
 
 export const RouteTable = {
    fileUpload: '/_upload/new',
    cleanUpUploadTrash: '/_upload/cleanup',
+   packBulk: '/packBulk/{}',
+
 };
 
 const resultHandler = (resolve, reject) => (err, res) => {

web/package.json

@@ -83,11 +83,13 @@
         "file-saver": "^2.0.5",
         "fs-attachment": "^1.0.0",
         "fs-web-server-scaffold": "^1.0.6",
+        "jszip": "^3.10.1",
         "koa-better-http-proxy": "^0.2.5",
         "koa-proxy": "^1.0.0-alpha.3",
         "koa-view": "^2.1.4",
         "moment": "^2.22.0",
         "npm": "^7.20.6",
+        "path": "^0.12.7",
         "react-router-breadcrumbs-hoc": "^4.0.1",
         "simplebar-react": "^3.2.4",
         "superagent": "^6.1.0",

web/routes/attachment/index.js

@@ -5,6 +5,7 @@ const path = require('path')
 const fs = require('fs');
 const OSS = require('ali-oss');
 const uuid = require('uuid');
+const JSZip = require('jszip');
 
 const UploadPath = {
    project: ['.txt', '.dwg', '.doc', '.docx', '.xls', '.xlsx', ".csv", '.pdf', '.pptx', '.png', '.jpg', '.svg', '.rar', '.zip', '.jpeg', '.mp4'],
@@ -229,11 +230,70 @@ module.exports = {
          }
       }
 
+      const getFileBlob = (url) => {
+         return new Promise((resolve, reject) => {
+            let request = new XMLHttpRequest()
+            request.open("GET", url, true)
+            request.responseType = "blob"
+            request.onload = (res) => {
+               if (res.target.status == 200) {
+                  resolve(res.target.response)
+
+               } else {
+                  reject(res)
+               }
+            }
+            request.send()
+         })
+      }
+
+      const packBulk = async (ctx) => {
+         console.log(11111,);
+         try {
+            const { fileUrl, folderId } = parse(ctx.req)
+            const zip = new JSZip()
+            let result = []
+            let files = []
+            console.log(22,fileUrl);
+            fileUrl.map(a => {
+            let url = path.join(__dirname, '../../', './client', a);
+
+               files.push({ url, name: 111 })
+            })
+            for (let i in files) {
+               let promise = getFileBlob(files[i].url).then((res) => {
+                  let format = files[i].url.substring(files[i].url.lastIndexOf("."), files[i].url.length)
+                  zip.file(files[i].name + format, res, { binary: true })
+               })
+               result.push(promise)
+               console.log(77, promise);
+            }
+            console.log(33,);
+
+            Promise.all(result).then(() => {
+               zip.generateAsync({ type: "blob" }).then((res) => {
+                  console.log(55,);
+
+                  saveAs(res, `${111}.zip`)
+               })
+            })
+            console.log(44,);
+
+            ctx.status = 200;
+            ctx.body = {};
+         } catch (error) {
+            ctx.status = 400;
+            ctx.fs.logger.error(error);
+            ctx.body = { err: 'download error.' };
+         }
+      }
+
       router.use(download_);
       router.post('/_upload/new', upload);
       router.delete('/_upload/cleanup', remove);
       router.post('/_upload/attachments/ali/:p', uploadAliOSS);
       router.get('/_download/attachments/ali', downloadFromAli);
       router.post('/_upload/attachments/:p', upload_);
+      router.post('/packBulk/:p', packBulk);
    }
 };