支持异常消息的回显;

增加了一些规则验证
beetlsql3-dev
Mlxa0324 2 years ago
parent 5f092374fc
commit 18c2928be9

@ -169,7 +169,7 @@ public class ExcelUtil {
createCell(sheet, size, columnIndex, nameString); createCell(sheet, size, columnIndex, nameString);
if (CollectionUtils.isNotEmpty(data)) { if (CollectionUtils.isNotEmpty(data)) {
for (Object val : data) { for (Object val : data) {
createCell(sheet, size, ++columnIndex, String.valueOf(val)); createCell(sheet, size, ++columnIndex, replaceNameName(String.valueOf(val)));
} }
} }
} }
@ -181,7 +181,7 @@ public class ExcelUtil {
*/ */
public static String replaceNameName(String nameName) { public static String replaceNameName(String nameName) {
// 首字母必须是中文,支持有限的符号 // 首字母必须是中文,支持有限的符号
return ReUtil.replaceAll(nameName, "[^\\u4e00-\\u9fa5_0-9a-zA-Z]", ""); return "_" + ReUtil.replaceAll(nameName, "[^\\u4e00-\\u9fa5_0-9a-zA-Z]", "");
} }
private static String getCellColumnFlag(int num) { private static String getCellColumnFlag(int num) {

@ -5312,8 +5312,10 @@ layui.define("layer", function (e) {
success: function (t) { success: function (t) {
i++, d(e, t), u() i++, d(e, t), u()
}, },
error: function () { error: function (e) {
n++, a.msg("请求上传接口出现异常"), m(e), u() // n++, a.msg("请求上传接口出现异常"), m(e), u()
// TODO 这里修改了layui的源码该文件不能被替换
n++, a.msg((e.responseJSON && e.responseJSON.msg && e.responseJSON.code != 200) ? e.responseJSON.msg : "请求上传接口出现异常"), m(e), u()
} }
}; };
"function" == typeof l.progress && (c.xhr = function () { "function" == typeof l.progress && (c.xhr = function () {

@ -321,24 +321,37 @@ public class SchoolClassController extends BaseController {
// 判断错误的结果集 // 判断错误的结果集
Assert.isTrue(CollectionUtil.isEmpty(listener.getFailMessage()), JSONUtil.toJsonStr(listener.getFailMessage())); Assert.isTrue(CollectionUtil.isEmpty(listener.getFailMessage()), JSONUtil.toJsonStr(listener.getFailMessage()));
// 类型转换 // 类型转换
List<SchoolClass> classList = listener.getData().stream() List<SchoolClass> list = listener.getData().stream()
// .map(item -> SchoolClassBatchImportDTO.pojo(item, (e) -> e)) // .map(item -> SchoolClassBatchImportDTO.pojo(item, (e) -> e))
.map(SchoolClassBatchImportDTO::pojo) .map(SchoolClassBatchImportDTO::pojo)
.collect(Collectors.toList()); .collect(Collectors.toList());
// 设置机构ID // 设置机构ID
setObjectOrgId(classList, (e) -> { setObjectOrgId(list, (e) -> {
UniversitiesColleges universitiesColleges = new UniversitiesColleges(); UniversitiesColleges params = new UniversitiesColleges();
universitiesColleges.setUniversitiesCollegesId(e.getUniversitiesCollegesId()); params.setUniversitiesCollegesId(e.getUniversitiesCollegesId());
UniversitiesColleges uc = universitiesCollegesDao.templateOne(universitiesColleges); UniversitiesColleges sc = universitiesCollegesDao.templateOne(params);
if (uc != null) { if (sc != null) {
return uc.getOrgId(); if (coreUser.isAdmin()) {
return sc.getOrgId();
}
// 告知前端,异常信息
if (!coreUser.getOrgId().equals(sc.getOrgId())) {
listener.putFailMessage(StrUtil.format("异常的院校ID{},无权限上传到其他学校", e.getUniversitiesCollegesId()));
}
if (sc.getUniversitiesCollegesStatus() != 1) {
listener.putFailMessage(StrUtil.format("异常的院校ID{},该院校已删除状态", e.getUniversitiesCollegesId()));
}
return sc.getOrgId();
}
else {
listener.putFailMessage(StrUtil.format("异常的院校ID{},未查询到院校信息,请联系管理员", e.getUniversitiesCollegesId()));
} }
return null; return null;
}, true); }, true);
try { try {
schoolClassService.validateClassSnListIsExistsThrow(classList, classList.get(0).getOrgId().toString()); schoolClassService.validateClassSnListIsExistsThrow(list, list.get(0).getOrgId().toString());
} }
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {
listener.putFailMessage(e.getMessage()); listener.putFailMessage(e.getMessage());
@ -349,7 +362,7 @@ public class SchoolClassController extends BaseController {
Assert.isTrue(CollectionUtil.isEmpty(listener.getFailMessage()), JSONUtil.toJsonStr(listener.getFailMessage())); Assert.isTrue(CollectionUtil.isEmpty(listener.getFailMessage()), JSONUtil.toJsonStr(listener.getFailMessage()));
} }
schoolClassService.insertBatch(classList); schoolClassService.insertBatch(list);
} }
catch (IllegalArgumentException exception) { catch (IllegalArgumentException exception) {
return JsonResult.failMessage(exception.getMessage()).setCode(DIY_ERROR.getCode()); return JsonResult.failMessage(exception.getMessage()).setCode(DIY_ERROR.getCode());

@ -1539,8 +1539,6 @@ public class TeacherController extends BaseController {
/** /**
* : <br> * : <br>
*
* excel
* @param file * @param file
* @return {@link JsonResult} * @return {@link JsonResult}
* @Author: 87966 * @Author: 87966
@ -1568,11 +1566,23 @@ public class TeacherController extends BaseController {
setObjectOrgId(list, (e) -> { setObjectOrgId(list, (e) -> {
UniversitiesColleges params = new UniversitiesColleges(); UniversitiesColleges params = new UniversitiesColleges();
params.setUniversitiesCollegesId(e.getUniversitiesCollegesId()); params.setUniversitiesCollegesId(e.getUniversitiesCollegesId());
params.setUniversitiesCollegesStatus(1);
UniversitiesColleges sc = universitiesCollegesDao.templateOne(params); UniversitiesColleges sc = universitiesCollegesDao.templateOne(params);
if (sc != null) { if (sc != null) {
if (coreUser.isAdmin()) {
return sc.getOrgId();
}
// 告知前端,异常信息
if (!coreUser.getOrgId().equals(sc.getOrgId())) {
listener.putFailMessage(StrUtil.format("异常的院校ID{},无权限上传到其他学校", e.getUniversitiesCollegesId()));
}
if (sc.getUniversitiesCollegesStatus() != 1) {
listener.putFailMessage(StrUtil.format("异常的院校ID{},该院校已删除状态", e.getUniversitiesCollegesId()));
}
return sc.getOrgId(); return sc.getOrgId();
} }
else {
listener.putFailMessage(StrUtil.format("异常的院校ID{},未查询到院校信息,请联系管理员", e.getUniversitiesCollegesId()));
}
return null; return null;
}, true); }, true);

Loading…
Cancel
Save