From 7f4d0a7a14e75b2c0a5f2ceebf99fe8246415748 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 27 十一月 2022 10:55:48 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/DataLoaderController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/DataLoaderController.java b/src/main/java/com/lf/server/controller/data/DataLoaderController.java
index 9d2f667..287a216 100644
--- a/src/main/java/com/lf/server/controller/data/DataLoaderController.java
+++ b/src/main/java/com/lf/server/controller/data/DataLoaderController.java
@@ -51,6 +51,8 @@
@Autowired
DataLoaderService dataLoaderService;
+ private final static String POINT = ".";
+
private final static String FILE_TYPES = "'xls','shp','gdb','mdb'";
public static List<String> extList = new ArrayList<>(Arrays.asList(".xls", ".xlsx", ".mdb", ".zip"));
@@ -166,19 +168,20 @@
@SysLog()
@ApiOperation(value = "鏌ヨ琛ㄤ腑鏁版嵁")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鍏冩暟鎹甀D", dataType = "Integer", paramType = "query", example = "113"),
+ @ApiImplicitParam(name = "id", value = "鍏冩暟鎹甀D", dataType = "Integer", paramType = "query", example = "115"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10")
})
@GetMapping(value = "/selectDbData")
public ResponseMsg<Object> selectDbData(Integer id, Integer pageIndex, Integer pageSize) {
+ // noinspection AlibabaRemoveCommentedCode
try {
if (null == id || id < 0) {
return fail("鍏冩暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
}
MetaEntity meta = metaService.selectById(id);
- if (null == meta || null == meta.getTab() || !meta.getTab().contains(".")) {
+ if (null == meta || null == meta.getTab() || !meta.getTab().contains(POINT)) {
return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
}
@@ -189,9 +192,10 @@
}
QueryWrapper wrapper = new QueryWrapper();
- wrapper.eq("dirid", meta.getDirid());
- wrapper.eq("depid", meta.getDepid());
- wrapper.eq("verid", meta.getVerid());
+ //wrapper.eq("dirid", meta.getDirid());
+ //wrapper.eq("depid", meta.getDepid());
+ //wrapper.eq("verid", meta.getVerid());
+ wrapper.eq("createuser", meta.getCreateUser());
wrapper.eq("createtime", meta.getCreateTime());
Page<Object> page = new Page<>(pageIndex, pageSize);
--
Gitblit v1.9.3