Skip to content

W
WebPublic
提交 1727a6a9 authored 作者: 钟是志's avatar 钟是志
浏览文件
操作

11794 后勤编外人员库，000013 批量导入报错 数据库 监听器 报错在前端不显示导入什么报错了

上级 15f2e239
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 101 行增加 和 72 行删除
one_stop_public/models/DataObj.js
浏览文件 @ 1727a6a9
import { apiRequest } from '../utils/request'; import {apiRequest} from '../utils/request';
const api = '/DataObjApi'; const api = '/DataObjApi';
import {Base16Encode} from "../Base16/index" import {Base16Encode} from "../Base16/index"
...@@ -18,10 +19,10 @@ export default { ...@@ -18,10 +19,10 @@ export default {
}, },
effects: { effects: {
*importAnalyse({ payload, callback }, { call, put }) { * importAnalyse({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/importAnalyse', payload); const response = yield call(apiRequest, api + '/importAnalyse', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
...@@ -31,10 +32,10 @@ export default { ...@@ -31,10 +32,10 @@ export default {
}); });
if (callback) callback(response); if (callback) callback(response);
}, },
*importDataQuery({ payload, callback }, { call, put }) { * importDataQuery({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/importDataQuery', payload); const response = yield call(apiRequest, api + '/importDataQuery', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
...@@ -44,10 +45,13 @@ export default { ...@@ -44,10 +45,13 @@ export default {
}); });
if (callback) callback(response); if (callback) callback(response);
}, },
*importExecute({ payload, callback }, { call, put }) { * importExecute({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/importExecute', payload); const response = yield call(apiRequest, api + '/importExecute', {
...payload,
customErrMsg: '导入的文件中可能存在字段不一致、字段类型不匹配、唯一性字段冲突,请检查或联系系统管理员', // 自定义errMsg
});
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
...@@ -57,18 +61,18 @@ export default { ...@@ -57,18 +61,18 @@ export default {
}); });
if (callback) callback(response); if (callback) callback(response);
}, },
*getAll({ payload, callback }, { call, put }) { * getAll({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api+'/getAll', payload); const response = yield call(apiRequest, api + '/getAll', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
if (callback) callback(response); if (callback) callback(response);
}, },
*getStatistics({ payload, callback }, { call, put }) { * getStatistics({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/getStatistics', payload); const response = yield call(apiRequest, api + '/getStatistics', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
...@@ -78,10 +82,10 @@ export default { ...@@ -78,10 +82,10 @@ export default {
}); });
if (callback) callback(response); if (callback) callback(response);
}, },
*getExportInfo({ payload, callback }, { call, put }) { * getExportInfo({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/getExportInfo', payload); const response = yield call(apiRequest, api + '/getExportInfo', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
...@@ -91,10 +95,10 @@ export default { ...@@ -91,10 +95,10 @@ export default {
}); });
if (callback) callback(response); if (callback) callback(response);
}, },
*changeCatalogue({ payload, callback }, { call, put }) { * changeCatalogue({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/changeCatalogue', payload); const response = yield call(apiRequest, api + '/changeCatalogue', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
...@@ -104,10 +108,10 @@ export default { ...@@ -104,10 +108,10 @@ export default {
}); });
if (callback) callback(response); if (callback) callback(response);
}, },
*findByCode({ payload, callback }, { call, put }) { * findByCode({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/findByCode', payload); const response = yield call(apiRequest, api + '/findByCode', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
...@@ -117,10 +121,10 @@ export default { ...@@ -117,10 +121,10 @@ export default {
}); });
if (callback) callback(response); if (callback) callback(response);
}, },
*findByName({ payload, callback }, { call, put }) { * findByName({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/findByName', payload); const response = yield call(apiRequest, api + '/findByName', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
yield put({ yield put({
...@@ -129,10 +133,10 @@ export default { ...@@ -129,10 +133,10 @@ export default {
}); });
if (callback) callback(response); if (callback) callback(response);
}, },
*find({ payload, callback }, { call, put }) { * find({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/find', payload); const response = yield call(apiRequest, api + '/find', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
...@@ -142,14 +146,14 @@ export default { ...@@ -142,14 +146,14 @@ export default {
}); });
if (callback) callback(response); if (callback) callback(response);
}, },
*add({ payload, callback }, { call, put }) { * add({payload, callback}, {call, put}) {
if(payload.sqlScript){ if (payload.sqlScript) {
payload.sqlScript=Base16Encode(payload.sqlScript) payload.sqlScript = Base16Encode(payload.sqlScript)
} }
const response = yield call(apiRequest, api + '/add', payload); const response = yield call(apiRequest, api + '/add', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
...@@ -159,33 +163,33 @@ export default { ...@@ -159,33 +163,33 @@ export default {
}); });
if (callback) callback(response); if (callback) callback(response);
}, },
*fetch({ payload, callback }, { call, put }) { * fetch({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/getPage', payload); const response = yield call(apiRequest, api + '/getPage', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
yield put({ yield put({
type: 'page', type: 'page',
payload: { ...response, isMain: payload.isMain }, payload: {...response, isMain: payload.isMain},
}); });
}, },
*getTableList({ payload, callback }, { call, put }) { * getTableList({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/getTableList', payload); const response = yield call(apiRequest, api + '/getTableList', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
yield put({ yield put({
type: 'nom', type: 'nom',
payload: response, payload: response,
}); });
if (callback) callback(response); if (callback) callback(response);
}, },
*createTableByName({ payload, callback }, { call, put }) { * createTableByName({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/createTableByName', payload); const response = yield call(apiRequest, api + '/createTableByName', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
yield put({ yield put({
...@@ -194,10 +198,10 @@ export default { ...@@ -194,10 +198,10 @@ export default {
}); });
if (callback) callback(response); if (callback) callback(response);
}, },
*remove({ payload, callback }, { call, put }) { * remove({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/remove', payload); const response = yield call(apiRequest, api + '/remove', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
yield put({ yield put({
...@@ -208,10 +212,10 @@ export default { ...@@ -208,10 +212,10 @@ export default {
callback(); callback();
} }
}, },
*open({ payload, callback }, { call, put }) { * open({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/open', payload); const response = yield call(apiRequest, api + '/open', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
yield put({ yield put({
...@@ -222,10 +226,10 @@ export default { ...@@ -222,10 +226,10 @@ export default {
callback(); callback();
} }
}, },
*createTabel({ payload, callback }, { call, put }) { * createTabel({payload, callback}, {call, put}) {
const response = yield call(apiRequest, api + '/createTable', payload); const response = yield call(apiRequest, api + '/createTable', payload);
if (!response) { if (!response) {
yield put({ type: 'nom' }); yield put({type: 'nom'});
return; return;
} }
yield put({ yield put({
...@@ -245,7 +249,7 @@ export default { ...@@ -245,7 +249,7 @@ export default {
list: action.payload, list: action.payload,
}; };
}, },
page(state, { payload }) { page(state, {payload}) {
if (payload.isMain) { if (payload.isMain) {
return { return {
...state, ...state,
...@@ -273,7 +277,7 @@ export default { ...@@ -273,7 +277,7 @@ export default {
} }
}, },
nom(state, action) { nom(state, action) {
return { ...state }; return {...state};
}, },
}, },
}; };
one_stop_public/utils/request.js
浏览文件 @ 1727a6a9
...@@ -5,10 +5,16 @@ ...@@ -5,10 +5,16 @@
import { extend } from 'umi-request'; import { extend } from 'umi-request';
import { notification } from 'antd'; import { notification } from 'antd';
import { getToken } from './token'; import { getToken } from './token';
import { queryApiActionPath, queryOauthActionPath, queryPermActionPath, queryDynamicActionPath } from './queryConfig'; import {
queryApiActionPath,
queryOauthActionPath,
queryPermActionPath,
queryDynamicActionPath,
} from './queryConfig';
import { openToast } from '../location/Notification'; import { openToast } from '../location/Notification';
import { showToast } from '../location/Toast'; import { showToast } from '../location/Toast';
import { offline } from '../location/Toast'; import { offline } from '../location/Toast';
const codeMessage = { const codeMessage = {
200: '服务器成功返回请求的数据。', 200: '服务器成功返回请求的数据。',
201: '新建或修改数据成功。', 201: '新建或修改数据成功。',
...@@ -33,7 +39,17 @@ const codeMessage = { ...@@ -33,7 +39,17 @@ const codeMessage = {
* *
* return URL参数字符串 * return URL参数字符串
*/ */
const objectToQuery = function (param, key, encode) {
const qqCw = ({ title = '请求错误', msg = '', customErrMsg = '' }) => {
// 请求错误 增加自定义错误提示信息
notification.error({
message: title,
description: customErrMsg || msg,
});
return undefined;
};
const objectToQuery = function(param, key, encode) {
if (param == null) return ''; if (param == null) return '';
var paramStr = ''; var paramStr = '';
var t = typeof param; var t = typeof param;
...@@ -56,9 +72,8 @@ const errorHandler = error => { ...@@ -56,9 +72,8 @@ const errorHandler = error => {
if (response && response.status) { if (response && response.status) {
const errorText = codeMessage[response.status] || response.statusText; const errorText = codeMessage[response.status] || response.statusText;
notification.error({ qqCw({
message: `请求错误`, msg: errorText,
description: errorText,
}); });
if (response.status === 401) { if (response.status === 401) {
// @HACK // @HACK
...@@ -84,6 +99,9 @@ const errorHandler = error => { ...@@ -84,6 +99,9 @@ const errorHandler = error => {
/** /**
* 配置request请求时的默认参数 * 配置request请求时的默认参数
*/ */
const umiRequest = extend({ const umiRequest = extend({
errorHandler, // 默认错误处理 errorHandler, // 默认错误处理
credentials: 'omit', // 默认请求是否带上cookie credentials: 'omit', // 默认请求是否带上cookie
...@@ -134,8 +152,8 @@ export const request = (url, data, options = {}) => { ...@@ -134,8 +152,8 @@ export const request = (url, data, options = {}) => {
window.location.href = x.mobileAdress window.location.href = x.mobileAdress
? mobileAdress + '?timeVersion=' + time ? mobileAdress + '?timeVersion=' + time
: ul.indexOf('?') > -1 : ul.indexOf('?') > -1
? ul + '&timeVersion=' + time ? ul + '&timeVersion=' + time
: ul + '?timeVersion=' + time; : ul + '?timeVersion=' + time;
} else { } else {
sessionStorage.removeItem('cacheMobile'); sessionStorage.removeItem('cacheMobile');
openToast('error', '版本更新', '检查到最新版本，即将自动更新，更新完成后请重新操作'); openToast('error', '版本更新', '检查到最新版本，即将自动更新，更新完成后请重新操作');
...@@ -143,8 +161,8 @@ export const request = (url, data, options = {}) => { ...@@ -143,8 +161,8 @@ export const request = (url, data, options = {}) => {
window.location.href = x.webAdress window.location.href = x.webAdress
? x.webAdress + '?timeVersion=' + time ? x.webAdress + '?timeVersion=' + time
: ul.indexOf('?') > -1 : ul.indexOf('?') > -1
? ul + '&timeVersion=' + time ? ul + '&timeVersion=' + time
: ul + '?timeVersion=' + time; : ul + '?timeVersion=' + time;
} }
setTimeout(() => location.reload(), 3000); setTimeout(() => location.reload(), 3000);
} }
...@@ -161,16 +179,16 @@ export const request = (url, data, options = {}) => { ...@@ -161,16 +179,16 @@ export const request = (url, data, options = {}) => {
if (!response) return; if (!response) return;
if (response.errCode || response.errMsg) { if (response.errCode || response.errMsg) {
notification.error({ qqCw({
message: `请求错误`, msg: response.errMsg,
description: response.errMsg, customErrMsg: pp.customErrMsg,
}); });
return; return;
} }
if (response.errcode) { if (response.errcode) {
notification.error({ qqCw({
message: `请求错误`, msg: response.errmsg,
description: response.errmsg, customErrMsg: pp.customErrMsg,
}); });
return; return;
} }
...@@ -178,7 +196,11 @@ export const request = (url, data, options = {}) => { ...@@ -178,7 +196,11 @@ export const request = (url, data, options = {}) => {
return response; return response;
}); });
} else { } else {
const pp = { ...data, token: getToken(), version_: version }; const pp = {
...data,
token: getToken(),
version_: version,
};
for (let i in pp) { for (let i in pp) {
if (pp[i] == null) { if (pp[i] == null) {
...@@ -209,8 +231,8 @@ export const request = (url, data, options = {}) => { ...@@ -209,8 +231,8 @@ export const request = (url, data, options = {}) => {
window.location.href = x.mobileAdress window.location.href = x.mobileAdress
? mobileAdress + '?timeVersion=' + time ? mobileAdress + '?timeVersion=' + time
: ul.indexOf('?') > -1 : ul.indexOf('?') > -1
? ul + '&timeVersion=' + time ? ul + '&timeVersion=' + time
: ul + '?timeVersion=' + time; : ul + '?timeVersion=' + time;
} else { } else {
sessionStorage.removeItem('cacheMobile'); sessionStorage.removeItem('cacheMobile');
openToast('error', '版本更新', '检查到最新版本，即将自动更新，更新完成后请重新操作'); openToast('error', '版本更新', '检查到最新版本，即将自动更新，更新完成后请重新操作');
...@@ -218,8 +240,8 @@ export const request = (url, data, options = {}) => { ...@@ -218,8 +240,8 @@ export const request = (url, data, options = {}) => {
window.location.href = x.webAdress window.location.href = x.webAdress
? x.webAdress + '?timeVersion=' + time ? x.webAdress + '?timeVersion=' + time
: ul.indexOf('?') > -1 : ul.indexOf('?') > -1
? ul + '&timeVersion=' + time ? ul + '&timeVersion=' + time
: ul + '?timeVersion=' + time; : ul + '?timeVersion=' + time;
} }
setTimeout(() => location.reload(), 3000); setTimeout(() => location.reload(), 3000);
} }
...@@ -235,17 +257,17 @@ export const request = (url, data, options = {}) => { ...@@ -235,17 +257,17 @@ export const request = (url, data, options = {}) => {
if (!response) return; if (!response) return;
if (response.errCode || response.errMsg) { if (response.errCode || response.errMsg) {
notification.error({ qqCw({
message: `请求错误`, msg: response.errMsg,
description: response.errMsg, customErrMsg: pp.customErrMsg,
}); })
return; return;
} }
if (response.errcode) { if (response.errcode) {
notification.error({ qqCw({
message: `请求错误`, msg: response.errmsg,
description: response.errmsg, customErrMsg: pp.customErrMsg,
}); })
return; return;
} }
canReportError = true; canReportError = true;
...@@ -272,7 +294,10 @@ const createServerRequest = (config = {}) => { ...@@ -272,7 +294,10 @@ const createServerRequest = (config = {}) => {
return setRequestConfig(config); return setRequestConfig(config);
}; };
export const dynamicRequest = createServerRequest({ method: 'POST', prefix: queryDynamicActionPath() }); export const dynamicRequest = createServerRequest({
method: 'POST',
prefix: queryDynamicActionPath(),
});
export const uaaRequest = createServerRequest({ method: 'POST', prefix: queryOauthActionPath() }); export const uaaRequest = createServerRequest({ method: 'POST', prefix: queryOauthActionPath() });
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论