资产编号判断

src/model/assetmanage.js

@@ -49,6 +49,10 @@ export function* addOrUpdateDataAsset(payload) {
   return yield call(service.addOrUpdateDataAsset, payload);
 }
 
+export function* checkCodeIsExist(payload) {
+  return yield call(service.checkCodeIsExist, payload);
+}
+
 export function* addDataAssetByDirIds(payload) {
   return yield call(service.addDataAssetByDirIds, payload);
 }

src/service/dataassetmanager.js

-import { PostJSON, GetJSON, PostFile } from "../util/axios"
+import { PostJSON, GetJSON, PostFile, Post } from "../util/axios"
 
 export function importElement(payload) {
   return PostFile("/dataassetmanager/elementApi/import", payload);
@@ -48,6 +48,10 @@ export function addOrUpdateDataAsset(payload) {
   return PostJSON("/dataassetmanager/dataAssetApi/addOrUpdateDataAsset", payload);
 }
 
+export function checkCodeIsExist(payload) {
+  return Post("/dataassetmanager/dataAssetApi/checkDataAssetCodeIsExist", payload);
+}
+
 export function addDataAssetByDirIds(payload) {
   return PostJSON("/dataassetmanager/dataAssetApi/addDataAssetByDirIds", payload);
 }

src/util/index.js

@@ -11,7 +11,7 @@ import { DataModelerRoleAdmin, DataModelerRoleUser, DataModelerRoleReader } from
 
 //内网深交所环境 isSzseEnv true
 //元曜公网环境 isSzseEnv false
-export const isSzseEnv = true;
+export const isSzseEnv = false;
 
 export const inputWidth = isSzseEnv?360:240;
 

src/view/Manage/AssetManage/Component/AddAssetModel.jsx

@@ -45,15 +45,31 @@ const AddAssetModel = (props) => {
       setConfirmLoading(true);
 
       dispatch({
-        type: 'assetmanage.addOrUpdateDataAsset',
+        type: 'assetmanage.checkCodeIsExist',
         payload: { 
-          params,
           data: { elements: newElements } 
         },
-        callback: () => {
-          setConfirmLoading(false);
-          showMessage("success","新增成功");
-          onCancel && onCancel(true);
+        callback: isExist => {
+          if (isExist) {
+            setConfirmLoading(false);
+            showMessage('warn', '已存在相同的资产编号,请重新输入');
+          } else {
+            dispatch({
+              type: 'assetmanage.addOrUpdateDataAsset',
+              payload: { 
+                params,
+                data: { elements: newElements } 
+              },
+              callback: () => {
+                setConfirmLoading(false);
+                showMessage("success","新增成功");
+                onCancel && onCancel(true);
+              },
+              error: () => {
+                setConfirmLoading(false);
+              }
+            })
+          }
         },
         error: () => {
           setConfirmLoading(false);

src/view/Manage/AssetManage/Component/AssetAction.jsx

@@ -259,17 +259,33 @@ const AssetAction = (props) => {
       setConfirmLoading(true);
 
       dispatch({
-        type: 'assetmanage.addOrUpdateDataAsset',
+        type: 'assetmanage.checkCodeIsExist',
         payload: { 
-          params,
-          data: action==='add' ? { elements: newElements } : { ...assets, elements: newElements } 
+          data: { elements: newElements } 
         },
-        callback: () => {
-          setConfirmLoading(false);
-          setCurrentAction('detail');
-          getAsset();
-          showMessage("success",(action==='add')?"新增成功":"修改成功");
-          onChange && onChange();
+        callback: isExist => {
+          if (isExist) {
+            setConfirmLoading(false);
+            showMessage('warn', '已存在相同的资产编号,请重新输入');
+          } else {
+            dispatch({
+              type: 'assetmanage.addOrUpdateDataAsset',
+              payload: { 
+                params,
+                data: action==='add' ? { elements: newElements } : { ...assets, elements: newElements } 
+              },
+              callback: () => {
+                setConfirmLoading(false);
+                setCurrentAction('detail');
+                getAsset();
+                showMessage("success",(action==='add')?"新增成功":"修改成功");
+                onChange && onChange();
+              },
+              error: () => {
+                setConfirmLoading(false);
+              }
+            })
+          }
         },
         error: () => {
           setConfirmLoading(false);

src/view/Manage/AssetManage/Component/AssetTagModal.jsx

@@ -3,6 +3,7 @@ import { Modal, Form, Input, Space, Button, Select } from 'antd';
 import { dispatch } from '../../../../model';
 import { AppContext } from '../../../../App';
 import MetadataInfo from './MetadataInfo';
+import { showMessage } from '../../../../util';
 
 const { Option } = Select;
 
@@ -150,35 +151,51 @@ const AssetTagModal = (props) => {
       setConfirmLoading(true);
 
       dispatch({
-        type: 'assetmanage.addOrUpdateDataAsset',
+        type: 'assetmanage.checkCodeIsExist',
         payload: { 
-          params,
-          data: { ...asset, elements: newElements } 
+          data: { elements: newElements } 
         },
-        callback: data => {
-          const ids = [id];
-          if (data && ((data?.id||'')!=='') && (data?.id!==id)) {
-            ids.push(data?.id);
-          }
-
-          dispatch({
-            type: 'tag.batchAddTagResourceByTagList',
-            payload: {
-              params: {
-                tagIds: tag?.tagId,
-                resourceIds: ids.join(','),
-                type: 'dataAsset',
-                creator
+        callback: isExist => {
+          if (isExist) {
+            setConfirmLoading(false);
+            showMessage('warn', '已存在相同的资产编号,请重新输入');
+          } else {
+            dispatch({
+              type: 'assetmanage.addOrUpdateDataAsset',
+              payload: { 
+                params,
+                data: { ...asset, elements: newElements } 
+              },
+              callback: data => {
+                const ids = [id];
+                if (data && ((data?.id||'')!=='') && (data?.id!==id)) {
+                  ids.push(data?.id);
+                }
+      
+                dispatch({
+                  type: 'tag.batchAddTagResourceByTagList',
+                  payload: {
+                    params: {
+                      tagIds: tag?.tagId,
+                      resourceIds: ids.join(','),
+                      type: 'dataAsset',
+                      creator
+                    }
+                  },
+                  callback: () => {
+                    reset();
+                    onCancel && onCancel(true);
+                  },
+                  error: () => {
+                    setConfirmLoading(false);
+                  }
+                })
+              },
+              error: () => {
+                setConfirmLoading(false);
               }
-            },
-            callback: () => {
-              reset();
-              onCancel && onCancel(true);
-            },
-            error: () => {
-              setConfirmLoading(false);
-            }
-          })
+            })
+          }
         },
         error: () => {
           setConfirmLoading(false);