From 05ffa1a7f490e1e81d6fbf1ee948db50b1fff6fc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 14 二月 2023 16:02:52 +0800
Subject: [PATCH] 修改depcode、dircode值
---
src/main/java/com/lf/server/mapper/data/DirMapper.java | 8
src/main/java/com/lf/server/service/sys/UserService.java | 24 +-
src/main/resources/mapper/data/DirMapper.xml | 47 -----
src/main/java/com/lf/server/entity/data/MetaFileEntity.java | 20 +-
src/main/java/com/lf/server/controller/sys/UserController.java | 18 +-
src/main/resources/mapper/sys/ReportMapper.xml | 6
src/main/java/com/lf/server/controller/data/MetaController.java | 10
src/main/java/com/lf/server/service/data/UploadService.java | 29 ++-
src/main/java/com/lf/server/entity/all/BaseEntity.java | 16 +-
src/main/java/com/lf/server/service/data/MetaService.java | 22 +-
src/main/java/com/lf/server/controller/show/DataLibController.java | 20 +-
src/main/java/com/lf/server/entity/data/MetaEntity.java | 20 +-
src/main/resources/mapper/data/MetaMapper.xml | 64 ++++----
src/main/resources/mapper/show/ApplyMapper.xml | 2
src/main/resources/mapper/sys/DepMapper.xml | 6
src/main/java/com/lf/server/entity/sys/UserEntity.java | 10 +
src/main/java/com/lf/server/service/data/FmeService.java | 2
src/main/java/com/lf/server/controller/data/DirController.java | 8
src/main/java/com/lf/server/mapper/sys/UserMapper.java | 26 +-
src/main/resources/mapper/sys/UserMapper.xml | 46 ++--
src/main/java/com/lf/server/service/all/BaseUploadService.java | 28 +-
src/main/java/com/lf/server/mapper/data/MetaMapper.java | 32 ++--
src/main/java/com/lf/server/service/data/DirService.java | 16 +-
23 files changed, 236 insertions(+), 244 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/DirController.java b/src/main/java/com/lf/server/controller/data/DirController.java
index 1fba8f2..2883279 100644
--- a/src/main/java/com/lf/server/controller/data/DirController.java
+++ b/src/main/java/com/lf/server/controller/data/DirController.java
@@ -46,7 +46,7 @@
entity.setCreateUser(ue.getId());
}
- dirService.insertDir(entity);
+ dirService.insert(entity);
return success(entity.getId());
} catch (Exception ex) {
@@ -67,7 +67,7 @@
entity.setCreateUser(ue.getId());
}
- int count = dirService.insertDirs(list);
+ int count = dirService.inserts(list);
return success(count);
} catch (Exception ex) {
@@ -125,7 +125,7 @@
entity.setUpdateUser(ue.getId());
}
- int count = dirService.updateDir(entity);
+ int count = dirService.update(entity);
return success(count);
} catch (Exception ex) {
@@ -149,7 +149,7 @@
}
}
- int count = dirService.updateDirs(list);
+ int count = dirService.updates(list);
return success(count);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index 0811560..27ef3d3 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -66,26 +66,26 @@
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
- @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
+ @ApiImplicitParam(name = "dircode", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00"),
@ApiImplicitParam(name = "verid", value = "鐗堟湰ID", dataType = "Integer", paramType = "query", example = "0"),
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<MetaEntity>> selectByPageAndCount(Integer depid, Integer dirid, Integer verid, String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<MetaEntity>> selectByPageAndCount(String depcode, String dircode, Integer verid, String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = metaService.selectCount(depid, dirid, verid, name);
+ int count = metaService.selectCount(depcode, dircode, verid, name);
if (count == 0) {
return success(0, null);
}
- List<MetaEntity> rs = metaService.selectByPage(depid, dirid, verid, name, pageSize, pageSize * (pageIndex - 1));
+ List<MetaEntity> rs = metaService.selectByPage(depcode, dircode, verid, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/controller/show/DataLibController.java b/src/main/java/com/lf/server/controller/show/DataLibController.java
index 2225019..ee0fe5d 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -69,26 +69,26 @@
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
- @ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "10"),
+ @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
+ @ApiImplicitParam(name = "dircode", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00"),
@ApiImplicitParam(name = "verid", value = "鐗堟湰ID", dataType = "Integer", paramType = "query", example = "0"),
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageForMeta")
- public ResponseMsg<List<MetaEntity>> selectByPageForMeta(Integer depid, Integer dirid, Integer verid, String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<MetaEntity>> selectByPageForMeta(String depcode, String dircode, Integer verid, String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = metaService.selectCount(depid, dirid, verid, name);
+ int count = metaService.selectCount(depcode, dircode, verid, name);
if (count == 0) {
return success(0, null);
}
- List<MetaEntity> rs = metaService.selectByPage(depid, dirid, verid, name, pageSize, pageSize * (pageIndex - 1));
+ List<MetaEntity> rs = metaService.selectByPage(depcode, dircode, verid, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -122,25 +122,25 @@
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
- @ApiImplicitParam(name = "dirs", value = "鐩綍ID", dataType = "String", paramType = "query", example = "1,10"),
+ @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
+ @ApiImplicitParam(name = "dirs", value = "鐩綍ID", dataType = "String", paramType = "query", example = "00,01"),
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectMetasForPage")
- public ResponseMsg<Object> selectMetasForPage(Integer depid, String dirs, String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<Object> selectMetasForPage(String depcode, String dirs, String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = metaService.selectMetasForCount(depid, dirs, name);
+ int count = metaService.selectMetasForCount(depcode, dirs, name);
if (count == 0) {
return success(0, null);
}
- List<MetaEntity> rs = metaService.selectMetasForPage(depid, dirs, name, pageSize, pageSize * (pageIndex - 1));
+ List<MetaEntity> rs = metaService.selectMetasForPage(depcode, dirs, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/controller/sys/UserController.java b/src/main/java/com/lf/server/controller/sys/UserController.java
index f995541..ec0a7a7 100644
--- a/src/main/java/com/lf/server/controller/sys/UserController.java
+++ b/src/main/java/com/lf/server/controller/sys/UserController.java
@@ -38,23 +38,23 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
@ApiImplicitParam(name = "uname", value = "鐢ㄦ埛鍚�", dataType = "String", paramType = "query", example = "瀹�"),
- @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<UserEntity>> selectByPageAndCount(String uname, Integer depid, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<UserEntity>> selectByPageAndCount(String uname, String depcode, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = userService.selectCount(uname, depid);
+ int count = userService.selectCount(uname, depcode);
if (count == 0) {
return success(0, null);
}
- List<UserEntity> rs = userService.selectByPage(uname, depid, pageSize, pageSize * (pageIndex - 1));
+ List<UserEntity> rs = userService.selectByPage(uname, depcode, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -67,22 +67,22 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "uname", value = "鐢ㄦ埛鍚�", dataType = "String", paramType = "query", example = "瀹�"),
@ApiImplicitParam(name = "roleid", value = "瑙掕壊ID", dataType = "Integer", paramType = "query", example = "1"),
- @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageForRole")
- public ResponseMsg<List<UserEntity>> selectByPageForRole(String uname, Integer roleid, Integer depid, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<UserEntity>> selectByPageForRole(String uname, Integer roleid, String depcode, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = userService.selectCountForRole(uname, roleid, depid);
+ int count = userService.selectCountForRole(uname, roleid, depcode);
if (count == 0) {
return success(0, null);
}
- List<UserEntity> rs = userService.selectByPageForRole(uname, roleid, depid, pageSize, pageSize * (pageIndex - 1));
+ List<UserEntity> rs = userService.selectByPageForRole(uname, roleid, depcode, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -352,7 +352,7 @@
entity.setUpdateUser(ue.getId());
}
- int count = userService.updateUsers(entity);
+ int count = userService.updateUser(entity);
return success(count);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/entity/all/BaseEntity.java b/src/main/java/com/lf/server/entity/all/BaseEntity.java
index f3e7a78..05e6a18 100644
--- a/src/main/java/com/lf/server/entity/all/BaseEntity.java
+++ b/src/main/java/com/lf/server/entity/all/BaseEntity.java
@@ -20,9 +20,9 @@
private String parentid;
- private Integer dirid;
+ private String dirid;
- private Integer depid;
+ private String depid;
private Integer verid;
@@ -34,10 +34,10 @@
private Timestamp updatetime;
- @TableField(value = "fn_rec_query(dirid,'dir')", updateStrategy = FieldStrategy.NEVER)
+ @TableField(value = "fn_get_fullname(dirid, 2)", updateStrategy = FieldStrategy.NEVER)
private String dirName;
- @TableField(value = "fn_rec_query(depid,'dep')", updateStrategy = FieldStrategy.NEVER)
+ @TableField(value = "fn_get_fullname(depid, 1)", updateStrategy = FieldStrategy.NEVER)
private String depName;
@TableField(value = "fn_ver(verid)", updateStrategy = FieldStrategy.NEVER)
@@ -76,19 +76,19 @@
this.parentid = parentid;
}
- public Integer getDirid() {
+ public String getDirid() {
return dirid;
}
- public void setDirid(Integer dirid) {
+ public void setDirid(String dirid) {
this.dirid = dirid;
}
- public Integer getDepid() {
+ public String getDepid() {
return depid;
}
- public void setDepid(Integer depid) {
+ public void setDepid(String depid) {
this.depid = depid;
}
diff --git a/src/main/java/com/lf/server/entity/data/MetaEntity.java b/src/main/java/com/lf/server/entity/data/MetaEntity.java
index 591580a..f2c9536 100644
--- a/src/main/java/com/lf/server/entity/data/MetaEntity.java
+++ b/src/main/java/com/lf/server/entity/data/MetaEntity.java
@@ -16,9 +16,9 @@
private int metaid;
- private int dirid;
+ private String dircode;
- private int depid;
+ private String depcode;
private int verid;
@@ -85,20 +85,20 @@
this.metaid = metaid;
}
- public int getDirid() {
- return dirid;
+ public String getDircode() {
+ return dircode;
}
- public void setDirid(int dirid) {
- this.dirid = dirid;
+ public void setDircode(String dircode) {
+ this.dircode = dircode;
}
- public int getDepid() {
- return depid;
+ public String getDepcode() {
+ return depcode;
}
- public void setDepid(int depid) {
- this.depid = depid;
+ public void setDepcode(String depcode) {
+ this.depcode = depcode;
}
public int getVerid() {
diff --git a/src/main/java/com/lf/server/entity/data/MetaFileEntity.java b/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
index 6baa193..30bf89d 100644
--- a/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
+++ b/src/main/java/com/lf/server/entity/data/MetaFileEntity.java
@@ -12,9 +12,9 @@
private String eventid;
- private int dirid;
+ private String dircode;
- private int depid;
+ private String depcode;
private int verid;
@@ -52,20 +52,20 @@
this.eventid = eventid;
}
- public int getDirid() {
- return dirid;
+ public String getDircode() {
+ return dircode;
}
- public void setDirid(int dirid) {
- this.dirid = dirid;
+ public void setDircode(String dircode) {
+ this.dircode = dircode;
}
- public int getDepid() {
- return depid;
+ public String getDepcode() {
+ return depcode;
}
- public void setDepid(int depid) {
- this.depid = depid;
+ public void setDepcode(String depcode) {
+ this.depcode = depcode;
}
public int getVerid() {
diff --git a/src/main/java/com/lf/server/entity/sys/UserEntity.java b/src/main/java/com/lf/server/entity/sys/UserEntity.java
index 20f23d1..20140a3 100644
--- a/src/main/java/com/lf/server/entity/sys/UserEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/UserEntity.java
@@ -15,6 +15,8 @@
private int depid;
+ private String depcode;
+
private String uid;
private String uname;
@@ -69,6 +71,14 @@
this.depid = depid;
}
+ public String getDepcode() {
+ return depcode;
+ }
+
+ public void setDepcode(String depcode) {
+ this.depcode = depcode;
+ }
+
public String getUid() {
return uid;
}
diff --git a/src/main/java/com/lf/server/mapper/data/DirMapper.java b/src/main/java/com/lf/server/mapper/data/DirMapper.java
index 2f86605..628f8ac 100644
--- a/src/main/java/com/lf/server/mapper/data/DirMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/DirMapper.java
@@ -21,7 +21,7 @@
* @param dirEntity
* @return
*/
- public Integer insertDir(DirEntity dirEntity);
+ public Integer insert(DirEntity dirEntity);
/**
* 鎻掑叆澶氭潯
@@ -29,7 +29,7 @@
* @param list
* @return
*/
- public Integer insertDirs(List<DirEntity> list);
+ public Integer inserts(List<DirEntity> list);
/**
* 鍒犻櫎涓�鏉�
@@ -53,7 +53,7 @@
* @param dirEntity
* @return
*/
- public Integer updateDir(DirEntity dirEntity);
+ public Integer update(DirEntity dirEntity);
/**
* 鏇存柊澶氭潯
@@ -61,7 +61,7 @@
* @param list
* @return
*/
- public Integer updateDirs(List<DirEntity> list);
+ public Integer updates(List<DirEntity> list);
/**
* 鏌ヨ鍗曟潯鏁版嵁
diff --git a/src/main/java/com/lf/server/mapper/data/MetaMapper.java b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
index c2e6f8b..462e859 100644
--- a/src/main/java/com/lf/server/mapper/data/MetaMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
@@ -16,48 +16,48 @@
/**
* 鏌ヨ璁板綍鏁�
*
- * @param depid 鍗曚綅ID
- * @param dirid 鐩綍ID
- * @param verid 鐗堟湰ID
- * @param name 鍚嶇О
+ * @param depcode 鍗曚綅缂栫爜
+ * @param dircode 鐩綍缂栫爜
+ * @param verid 鐗堟湰ID
+ * @param name 鍚嶇О
* @return 璁板綍鏁�
*/
- public Integer selectCount(Integer depid, Integer dirid, Integer verid, String name);
+ public Integer selectCount(String depcode, String dircode, Integer verid, String name);
/**
* 鍒嗛〉鏌ヨ
*
- * @param depid 鍗曚綅ID
- * @param dirid 鐩綍ID
- * @param verid 鐗堟湰ID
- * @param name 鍚嶇О
- * @param limit 璁板綍鏁�
- * @param offset 鍋忕Щ閲�
+ * @param depcode 鍗曚綅缂栫爜
+ * @param dircode 鐩綍缂栫爜
+ * @param verid 鐗堟湰ID
+ * @param name 鍚嶇О
+ * @param limit 璁板綍鏁�
+ * @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<MetaEntity> selectByPage(Integer depid, Integer dirid, Integer verid, String name, Integer limit, Integer offset);
+ public List<MetaEntity> selectByPage(String depcode, String dircode, Integer verid, String name, Integer limit, Integer offset);
/**
* 鏌ヨ璁板綍鏁�
*
- * @param depid
+ * @param depcode
* @param dirs
* @param name
* @return
*/
- public Integer selectMetasForCount(Integer depid, String dirs, String name);
+ public Integer selectMetasForCount(String depcode, String dirs, String name);
/**
* 鍒嗛〉鏌ヨ
*
- * @param depid
+ * @param depcode
* @param dirs
* @param name
* @param limit
* @param offset
* @return
*/
- public List<MetaEntity> selectMetasForPage(Integer depid, String dirs, String name, Integer limit, Integer offset);
+ public List<MetaEntity> selectMetasForPage(String depcode, String dirs, String name, Integer limit, Integer offset);
/**
* 鏌ヨ涓婁紶璁板綍鏁�
diff --git a/src/main/java/com/lf/server/mapper/sys/UserMapper.java b/src/main/java/com/lf/server/mapper/sys/UserMapper.java
index 2591c2e..d94f5df 100644
--- a/src/main/java/com/lf/server/mapper/sys/UserMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/UserMapper.java
@@ -18,22 +18,22 @@
/**
* 鏌ヨ璁板綍鏁�
*
- * @param uname 鐢ㄦ埛鍚�
- * @param depid 鍗曚綅ID
+ * @param uname 鐢ㄦ埛鍚�
+ * @param depcode 鍗曚綅缂栫爜
* @return 璁板綍鏁�
*/
- public Integer selectCount(String uname, Integer depid);
+ public Integer selectCount(String uname, String depcode);
/**
* 鍒嗛〉鏌ヨ
*
- * @param uname 鐢ㄦ埗鍚�
- * @param depid 鍗曚綅ID
- * @param limit 璁板綍鏁�
- * @param offset 鍋忕Щ閲�
+ * @param uname 鐢ㄦ埗鍚�
+ * @param depcode 鍗曚綅缂栫爜
+ * @param limit 璁板綍鏁�
+ * @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<UserEntity> selectByPage(String uname, Integer depid, Integer limit, Integer offset);
+ public List<UserEntity> selectByPage(String uname, String depcode, Integer limit, Integer offset);
/**
* 鏍规嵁token鏈夋晥鏈熸煡璇�
@@ -113,7 +113,7 @@
* @param userEntity
* @return
*/
- public Integer updateUsers(UserEntity userEntity);
+ public Integer updateUser(UserEntity userEntity);
/**
* 鏌ヨ鍗曟潯鏁版嵁
@@ -143,22 +143,22 @@
*
* @param uname
* @param roleid
- * @param depid
+ * @param depcode
* @return
*/
- public Integer selectCountForRole(String uname, Integer roleid, Integer depid);
+ public Integer selectCountForRole(String uname, Integer roleid, String depcode);
/**
* 鏍规嵁瑙掕壊+鍗曚綅鍒嗛〉鏌ヨ
*
* @param uname
* @param roleid
- * @param depid
+ * @param depcode
* @param limit
* @param offset
* @return
*/
- public List<UserEntity> selectByPageForRole(String uname, Integer roleid, Integer depid, Integer limit, Integer offset);
+ public List<UserEntity> selectByPageForRole(String uname, Integer roleid, String depcode, Integer limit, Integer offset);
/**
* 鏇存柊澶氫釜鐢ㄦ埛瀵嗙爜
diff --git a/src/main/java/com/lf/server/service/all/BaseUploadService.java b/src/main/java/com/lf/server/service/all/BaseUploadService.java
index d4d47c0..8e0fdb6 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -197,8 +197,8 @@
List<DirEntity> dirs = dirService.selectDirRecursive(dir.getName());
for (MetaFileEntity meta : metas) {
meta.setEventid(StringHelper.getGuid());
- meta.setDirid(dir.getId());
- meta.setDepid(ue.getDepid());
+ meta.setDircode(dir.getCode());
+ meta.setDepcode(ue.getDepcode());
meta.setVerid(ver.getId());
meta.setCreateUser(ue.getId());
meta.setEpsgCode(epsgCode);
@@ -294,10 +294,10 @@
continue;
}
- int dirid = getDirByPath(f.getPath(), fileName, dir, dirs);
+ String dircode = getDirByPath(f.getPath(), fileName, dir, dirs);
boolean isShp = StaticData.SHP.equals(extName);
if (isGdb) {
- List<MetaFileEntity> rs = getGdbMappers(f, meta, dirid, start);
+ List<MetaFileEntity> rs = getGdbMappers(f, meta, dircode, start);
if (null != rs && rs.size() > 0) {
list.addAll(rs);
}
@@ -305,7 +305,7 @@
}
MetaFileEntity mf = createMetaFileEntity(meta);
- mf.setDirid(dirid);
+ mf.setDircode(dircode);
mf.setEventid(StringHelper.getGuid());
mf.setName(fileName);
mf.setExtName(extName);
@@ -331,8 +331,8 @@
*/
private MetaFileEntity createMetaFileEntity(MetaFileEntity meta) {
MetaFileEntity mf = new MetaFileEntity();
- mf.setDirid(meta.getDirid());
- mf.setDepid(meta.getDepid());
+ mf.setDircode(meta.getDircode());
+ mf.setDepcode(meta.getDepcode());
mf.setVerid(meta.getVerid());
mf.setCreateUser(meta.getCreateUser());
mf.setEpsgCode(meta.getEpsgCode());
@@ -343,9 +343,9 @@
/**
* 鏍规嵁鏂囦欢璺緞鑾峰彇鐩綍ID
*/
- private int getDirByPath(String filePath,String fileName, DirEntity dir, List<DirEntity> dirs) {
+ private String getDirByPath(String filePath,String fileName, DirEntity dir, List<DirEntity> dirs) {
if (0 != dir.getPid() || null == dirs || dirs.isEmpty()) {
- return dir.getId();
+ return dir.getCode();
}
if (StaticData.SLASH.equals(File.separator)) {
filePath = filePath.replace("/", "\\");
@@ -353,17 +353,17 @@
for (DirEntity entity : dirs) {
if (filePath.contains(entity.getFullName() + "\\" + fileName)) {
- return entity.getId();
+ return entity.getCode();
}
}
- return dir.getId();
+ return dir.getCode();
}
/**
* 鑾峰彇SHP鏂囦欢闆嗗悎
*/
- private List<String> getShpFiles(String shpPath) {
+ private List<String> getShpFiles(String shpPath) {
List<String> list = new ArrayList<>();
list.add(shpPath);
@@ -434,7 +434,7 @@
/**
* 鑾峰彇GDB鏂囦欢鏄犲皠
*/
- private List<MetaFileEntity> getGdbMappers(File f, MetaFileEntity meta, int dirid, int start) {
+ private List<MetaFileEntity> getGdbMappers(File f, MetaFileEntity meta, String dircode, int start) {
List<String> tabs = GdbHelper.getTabNames(f.getPath());
if (null == tabs || tabs.size() == 0) {
return null;
@@ -450,7 +450,7 @@
List<MetaFileEntity> list = new ArrayList<>();
for (String tab : tabs) {
MetaFileEntity mf = createMetaFileEntity(meta);
- mf.setDirid(dirid);
+ mf.setDircode(dircode);
mf.setEventid(StringHelper.getGuid());
mf.setName(fileName);
mf.setExtName(extName);
diff --git a/src/main/java/com/lf/server/service/data/DirService.java b/src/main/java/com/lf/server/service/data/DirService.java
index e12183d..3f3a08d 100644
--- a/src/main/java/com/lf/server/service/data/DirService.java
+++ b/src/main/java/com/lf/server/service/data/DirService.java
@@ -19,13 +19,13 @@
DirMapper dirMapper;
@Override
- public Integer insertDir(DirEntity dirEntity) {
- return dirMapper.insertDir(dirEntity);
+ public Integer insert(DirEntity dirEntity) {
+ return dirMapper.insert(dirEntity);
}
@Override
- public Integer insertDirs(List<DirEntity> dirEntity) {
- return dirMapper.insertDirs(dirEntity);
+ public Integer inserts(List<DirEntity> dirEntity) {
+ return dirMapper.inserts(dirEntity);
}
@Override
@@ -39,13 +39,13 @@
}
@Override
- public Integer updateDir(DirEntity dirEntity) {
- return dirMapper.updateDir(dirEntity);
+ public Integer update(DirEntity dirEntity) {
+ return dirMapper.update(dirEntity);
}
@Override
- public Integer updateDirs(List<DirEntity> dirEntity) {
- return dirMapper.updateDirs(dirEntity);
+ public Integer updates(List<DirEntity> dirEntity) {
+ return dirMapper.updates(dirEntity);
}
@Override
diff --git a/src/main/java/com/lf/server/service/data/FmeService.java b/src/main/java/com/lf/server/service/data/FmeService.java
index f549523..69ad926 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -229,7 +229,7 @@
list.add(new NameValueEntity("S_RKBG", meta.getPath()));
list.add(new NameValueEntity("COORDSYS", meta.getEpsgCode()));
list.add(new NameValueEntity("dirid", meta.getName()));
- list.add(new NameValueEntity("depid", meta.getDepid()));
+ list.add(new NameValueEntity("depid", meta.getDepcode()));
list.add(new NameValueEntity("verid", meta.getVerid()));
list.add(new NameValueEntity("createuser", meta.getCreateUser()));
list.add(new NameValueEntity("parentid", meta.getEventid()));
diff --git a/src/main/java/com/lf/server/service/data/MetaService.java b/src/main/java/com/lf/server/service/data/MetaService.java
index 03cb162..e73e42b 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -18,31 +18,37 @@
MetaMapper metaMapper;
@Override
- public Integer selectCount(Integer depid, Integer dirid, Integer verid, String name) {
+ public Integer selectCount(String depcode, String dircode, Integer verid, String name) {
+ depcode = StringHelper.getLeftLike(depcode);
+ dircode = StringHelper.getLeftLike(dircode);
name = StringHelper.getLikeStr(name);
- return metaMapper.selectCount(depid, dirid, verid, name);
+ return metaMapper.selectCount(depcode, dircode, verid, name);
}
@Override
- public List<MetaEntity> selectByPage(Integer depid, Integer dirid, Integer verid, String name, Integer limit, Integer offset) {
+ public List<MetaEntity> selectByPage(String depcode, String dircode, Integer verid, String name, Integer limit, Integer offset) {
+ depcode = StringHelper.getLeftLike(depcode);
+ dircode = StringHelper.getLeftLike(dircode);
name = StringHelper.getLikeStr(name);
- return metaMapper.selectByPage(depid, dirid, verid, name, limit, offset);
+ return metaMapper.selectByPage(depcode, dircode, verid, name, limit, offset);
}
@Override
- public Integer selectMetasForCount(Integer depid, String dirs, String name) {
+ public Integer selectMetasForCount(String depcode, String dirs, String name) {
+ depcode = StringHelper.getLeftLike(depcode);
name = StringHelper.getLikeStr(name);
- return metaMapper.selectMetasForCount(depid, dirs, name);
+ return metaMapper.selectMetasForCount(depcode, dirs, name);
}
@Override
- public List<MetaEntity> selectMetasForPage(Integer depid, String dirs, String name, Integer limit, Integer offset) {
+ public List<MetaEntity> selectMetasForPage(String depcode, String dirs, String name, Integer limit, Integer offset) {
+ depcode = StringHelper.getLeftLike(depcode);
name = StringHelper.getLikeStr(name);
- return metaMapper.selectMetasForPage(depid, dirs, name, limit, offset);
+ return metaMapper.selectMetasForPage(depcode, dirs, name, limit, offset);
}
@Override
diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index f9c9a34..3749d34 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -3,12 +3,14 @@
import com.lf.server.entity.all.BaseEntity;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.data.*;
+import com.lf.server.entity.sys.DepEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.mapper.data.UploadMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.all.BaseUploadService;
+import com.lf.server.service.sys.DepService;
import org.apache.commons.io.FileUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,6 +35,12 @@
@Autowired
MetaService metaService;
+
+ @Autowired
+ DepService depService;
+
+ @Autowired
+ DirService dirService;
@Override
public List<CoordEntity> selectCoords(String zoning) {
@@ -76,7 +84,7 @@
for (MetaFileEntity mf : list) {
mf.setCreateUser(ue.getId());
mf.setCreateTime(createTime);
- mf.setDepid(ue.getDepid());
+ mf.setDepcode(ue.getDepcode());
mf.setPath(tempPath + File.separator + mf.getPath());
mf.setMsg(null);
@@ -144,18 +152,19 @@
String path = copyXlsFile(xlsBasePath, i, mf);
if (null != path) {
pathList.add(path);
- dirList.add(mf.getDirid() + "");
+ dirList.add(mf.getDircode());
pidList.add(mf.getEventid());
}
}
+ MetaFileEntity first = xlsList.get(0);
MetaFileEntity meta = new MetaFileEntity();
meta.setPath(StringHelper.join(pathList, ","));
- meta.setEpsgCode(xlsList.get(0).getEpsgCode());
+ meta.setEpsgCode(first.getEpsgCode());
meta.setName(StringHelper.join(dirList, ";"));
- meta.setDepid(xlsList.get(0).getDepid());
- meta.setVerid(xlsList.get(0).getVerid());
- meta.setCreateUser(xlsList.get(0).getCreateUser());
+ meta.setDepcode(first.getDepcode());
+ meta.setVerid(first.getVerid());
+ meta.setCreateUser(first.getCreateUser());
meta.setEventid(StringHelper.join(pidList, ";"));
return meta;
@@ -274,8 +283,8 @@
BaseEntity be = (BaseEntity) t;
be.setEventid(StringHelper.getGuid());
be.setParentid(mf.getEventid());
- be.setDirid(mf.getDirid());
- be.setDepid(mf.getDepid());
+ be.setDirid(mf.getDircode());
+ be.setDepid(mf.getDepcode());
be.setVerid(mf.getVerid());
be.setCreateuser(mf.getCreateUser());
be.setCreatetime(mf.getCreateTime());
@@ -530,8 +539,8 @@
private MetaEntity createMeta(MetaFileEntity mf) {
MetaEntity me = new MetaEntity();
me.setEventid(mf.getEventid());
- me.setDirid(mf.getDirid());
- me.setDepid(mf.getDepid());
+ me.setDircode(mf.getDircode());
+ me.setDepcode(mf.getDepcode());
me.setVerid(mf.getVerid());
me.setName(mf.getName());
me.setType(mf.getType());
diff --git a/src/main/java/com/lf/server/service/sys/UserService.java b/src/main/java/com/lf/server/service/sys/UserService.java
index 4ab733a..0b1a135 100644
--- a/src/main/java/com/lf/server/service/sys/UserService.java
+++ b/src/main/java/com/lf/server/service/sys/UserService.java
@@ -37,10 +37,11 @@
private final static Log log = LogFactory.getLog(UserService.class);
@Override
- public Integer selectCount(String uname, Integer depid) {
+ public Integer selectCount(String uname, String depcode) {
uname = StringHelper.getLikeStr(uname);
+ depcode = StringHelper.getLeftLike(depcode);
- return userMapper.selectCount(uname, depid);
+ return userMapper.selectCount(uname, depcode);
}
@Override
@@ -59,10 +60,11 @@
}
@Override
- public List<UserEntity> selectByPage(String uname, Integer depid, Integer limit, Integer offset) {
+ public List<UserEntity> selectByPage(String uname, String depcode, Integer limit, Integer offset) {
uname = StringHelper.getLikeStr(uname);
+ depcode = StringHelper.getLeftLike(depcode);
- return userMapper.selectByPage(uname, depid, limit, offset);
+ return userMapper.selectByPage(uname, depcode, limit, offset);
}
@Override
@@ -111,22 +113,24 @@
}
@Override
- public Integer updateUsers(UserEntity userEntity) {
- return userMapper.updateUsers(userEntity);
+ public Integer updateUser(UserEntity userEntity) {
+ return userMapper.updateUser(userEntity);
}
@Override
- public Integer selectCountForRole(String uname, Integer roleid, Integer depid) {
+ public Integer selectCountForRole(String uname, Integer roleid, String depcode) {
uname = StringHelper.getLikeStr(uname);
+ depcode = StringHelper.getLeftLike(depcode);
- return userMapper.selectCountForRole(uname, roleid, depid);
+ return userMapper.selectCountForRole(uname, roleid, depcode);
}
@Override
- public List<UserEntity> selectByPageForRole(String uname, Integer roleid, Integer depid, Integer limit, Integer offset) {
+ public List<UserEntity> selectByPageForRole(String uname, Integer roleid, String depcode, Integer limit, Integer offset) {
uname = StringHelper.getLikeStr(uname);
+ depcode = StringHelper.getLeftLike(depcode);
- return userMapper.selectByPageForRole(uname, roleid, depid, limit, offset);
+ return userMapper.selectByPageForRole(uname, roleid, depcode, limit, offset);
}
@Override
diff --git a/src/main/resources/mapper/data/DirMapper.xml b/src/main/resources/mapper/data/DirMapper.xml
index 7d9a71a..c06654b 100644
--- a/src/main/resources/mapper/data/DirMapper.xml
+++ b/src/main/resources/mapper/data/DirMapper.xml
@@ -2,22 +2,22 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.lf.server.mapper.data.DirMapper">
<select id="selectDir" resultType="com.lf.server.entity.data.DirEntity">
- select a.*, fn_rec_query(a.id, 'dir') fullName from lf.sys_dir a where id = #{id}
+ select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a where id = #{id}
</select>
<select id="selectDirAll" resultType="com.lf.server.entity.data.DirEntity">
- select a.*, fn_rec_query(a.id, 'dir') fullName from lf.sys_dir a order by order_num;
+ select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a order by order_num;
</select>
<select id="selectDirRoot" resultType="com.lf.server.entity.data.DirEntity">
- select a.*, fn_rec_query(a.id, 'dir') fullName from lf.sys_dir a where pid = 0 order by order_num;
+ select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a where pid = 0 order by order_num;
</select>
<select id="selectDirRecursive" resultType="com.lf.server.entity.data.DirEntity">
with recursive rs as(
- select a.*, fn_rec_query(a.id, 'dir') fullName from lf.sys_dir a where name = #{name}
+ select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a where name = #{name}
union
- select b.*, fn_rec_query(b.id, 'dir') fullName from lf.sys_dir b, rs c where b.pid = c.id
+ select b.*, fn_get_fullname(b.code, 2) fullName from lf.sys_dir b, rs c where b.pid = c.id
)
select * from rs order by order_num;
</select>
@@ -39,27 +39,6 @@
values
<foreach collection="list" item="item" index="index" separator=",">
(#{item.pid},#{item.name},#{item.exts},#{item.descr},#{item.level},#{item.orderNum},#{item.createUser},now(),#{item.checks},#{item.bak},#{item.code})
- </foreach>
- </insert>
-
- <insert id="insertDir" parameterType="com.lf.server.entity.data.DirEntity">
- <selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
- select currval('lf.sys_dir_id_seq'::regclass) as id
- </selectKey>
-
- insert into lf.sys_dir
- (pid,name,code,descr,level,order_num,create_user,create_time,bak)
- values
- (#{pid},#{name},#{code},#{descr},#{level} ,#{orderNum},#{createUser},now(),#{bak});
- </insert>
-
- <insert id="insertDirs">
- insert into lf.sys_dir
- (pid,name,code,descr,level,order_num,create_user,create_time,bak)
- values
- <foreach collection="list" item="item" index="index" separator=",">
- (#{item.pid},#{item.name},#{item.code},#{item.descr},#{item.level}
- ,#{item.orderNum},#{item.createUser},now(),#{item.bak})
</foreach>
</insert>
@@ -88,22 +67,6 @@
pid=#{item.pid},name=#{item.name},exts=#{item.exts},descr=#{item.descr},level=#{item.level},order_num=#{item.orderNum},
update_user=#{item.updateUser},update_time=now(),checks=#{item.checks},bak=#{item.bak},code=#{item.code}
</set>
- where id = #{item.id}
- </foreach>
- </update>
-
- <update id="updateDir">
- update lf.sys_dir set pid=#{pid},name=#{name},code=#{code},descr=#{descr},level=#{level},order_num=#{orderNum},
- update_user=#{updateUser},update_time=now(),bak=#{bak} where id=#{id}
- </update>
-
- <update id="updateDirs">
- <foreach collection="list" item="item" index="index" separator=";">
- update lf.sys_dir
- <set>
- pid=#{item.pid},name=#{item.name},code=#{item.code},descr=#{item.descr},level=#{item.level},
- order_num=#{item.orderNum},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak}
- </set>
where id = #{item.id}
</foreach>
</update>
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index 5840278..b491e64 100644
--- a/src/main/resources/mapper/data/MetaMapper.xml
+++ b/src/main/resources/mapper/data/MetaMapper.xml
@@ -5,11 +5,11 @@
select count(*) from lf.sys_meta
<where>
1 = 1
- <if test="depid != null">
- and depid = ANY(fn_rec_array(#{depid}, 'dep'))
+ <if test="depcode != null">
+ and depcode like #{depcode}
</if>
- <if test="dirid != null">
- and dirid = ANY(fn_rec_array(#{dirid}, 'dir'))
+ <if test="dircode != null">
+ and dircode like #{dircode}
</if>
<if test="verid != null">
and verid = #{verid}
@@ -21,16 +21,16 @@
</select>
<select id="selectByPage" resultType="com.lf.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_rec_query(a.depid, 'dep') depName,fn_ver(a.verid) verName,fn_rec_query(a.dirid, 'dir') dirName
+ select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
<where>
1 = 1
- <if test="depid != null">
- and depid = ANY(fn_rec_array(#{depid},'dep'))
- </if>
- <if test="dirid != null">
- and dirid = ANY(fn_rec_array(#{dirid},'dir'))
- </if>
+ <if test="depcode != null">
+ and depcode like #{depcode}
+ </if>
+ <if test="dircode != null">
+ and dircode like #{dircode}
+ </if>
<if test="verid != null">
and verid = #{verid}
</if>
@@ -46,11 +46,11 @@
select count(*) from lf.sys_meta
<where>
1 = 1
- <if test="depid != null">
- and depid = ANY(fn_rec_array(#{depid}, 'dep'))
- </if>
+ <if test="depcode != null">
+ and depcode like #{depcode}
+ </if>
<if test="dirs != null">
- and dirid = ANY(fn_dir_arrs(#{dirs}))
+ and (${dirs})
</if>
<if test="name != null">
and name like #{name}
@@ -59,16 +59,16 @@
</select>
<select id="selectMetasForPage" resultType="com.lf.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_rec_query(a.depid, 'dep') depName,fn_ver(a.verid) verName,fn_rec_query(a.dirid, 'dir') dirName
+ select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
<where>
1 = 1
- <if test="depid != null">
- and depid = ANY(fn_rec_array(#{depid}, 'dep'))
- </if>
+ <if test="depcode != null">
+ and depcode like #{depcode}
+ </if>
<if test="dirs != null">
- and dirid = ANY(fn_dir_arrs(#{dirs}))
- </if>
+ and (${dirs})
+ </if>
<if test="name != null">
and name like #{name}
</if>
@@ -91,7 +91,7 @@
</select>
<select id="selectByPageForUpload" resultType="com.lf.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_rec_query(a.depid, 'dep') depName,fn_ver(a.verid) verName,fn_rec_query(a.dirid, 'dir') dirName
+ select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
<where>
create_user = #{createUser}
@@ -107,18 +107,18 @@
</select>
<select id="selectAll" resultType="com.lf.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_rec_query(a.depid, 'dep') depName,fn_ver(a.verid) verName,fn_rec_query(a.dirid, 'dir') dirName
+ select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
order by id desc
</select>
<select id="selectById" resultType="com.lf.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_rec_query(a.depid, 'dep') depName,fn_ver(a.verid) verName,fn_rec_query(a.dirid, 'dir') dirName
+ select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a where id = #{id}
</select>
<select id="selectByGuid" resultType="com.lf.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_rec_query(a.depid, 'dep') depName,fn_ver(a.verid) verName,fn_rec_query(a.dirid, 'dir') dirName
+ select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
where guid = #{guid}
<if test="tab != null">
@@ -128,7 +128,7 @@
</select>
<select id="selectMetaFiles" resultType="com.lf.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_rec_query(a.depid, 'dep') depName,fn_ver(a.verid) verName,fn_rec_query(a.dirid, 'dir') dirName
+ select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
where id in
<foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
@@ -154,17 +154,17 @@
</selectKey>
insert into lf.sys_meta
- (eventid,metaid,dirid,depid,verid,name,type,guid,path,sizes,tab,layer,rows,create_user,create_time,bak,geom)
+ (eventid,metaid,dircode,depcode,verid,name,type,guid,path,sizes,tab,layer,rows,create_user,create_time,bak,geom)
values
- (#{eventid},#{metaid},#{dirid},#{depid},#{verid},#{name},#{type},#{guid},#{path},#{sizes},#{tab},#{layer},#{rows},#{createUser},#{createTime},#{bak},#{geom})
+ (#{eventid},#{metaid},#{dircode},#{depcode},#{verid},#{name},#{type},#{guid},#{path},#{sizes},#{tab},#{layer},#{rows},#{createUser},#{createTime},#{bak},#{geom})
</insert>
<insert id="inserts">
insert into lf.sys_meta
- (eventid,metaid,dirid,depid,verid,name,type,guid,path,sizes,tab,layer,rows,create_user,create_time,bak,geom)
+ (eventid,metaid,dircode,depcode,verid,name,type,guid,path,sizes,tab,layer,rows,create_user,create_time,bak,geom)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.eventid},#{item.metaid},#{item.dirid},#{item.depid},#{item.verid},#{item.name},#{item.type},#{item.guid},#{item.path},#{item.sizes},#{item.tab},#{item.layer},#{item.rows},#{item.createUser},#{item.createTime},#{item.bak},#{item.geom})
+ (#{item.eventid},#{item.metaid},#{item.dircode},#{item.depcode},#{item.verid},#{item.name},#{item.type},#{item.guid},#{item.path},#{item.sizes},#{item.tab},#{item.layer},#{item.rows},#{item.createUser},#{item.createTime},#{item.bak},#{item.geom})
</foreach>
</insert>
@@ -181,7 +181,7 @@
<update id="update">
update lf.sys_meta
- set eventid=#{eventid},metaid=#{metaid},dirid=#{dirid},depid=#{depid},verid=#{verid},name=#{name},type=#{type},guid=#{guid},path=#{path},sizes=#{sizes},tab=#{tab},layer=#{layer},rows=#{rows},update_user=#{updateUser},update_time=now(),bak=#{bak},geom=#{geom}
+ set eventid=#{eventid},metaid=#{metaid},dircode=#{dircode},depcode=#{depcode},verid=#{verid},name=#{name},type=#{type},guid=#{guid},path=#{path},sizes=#{sizes},tab=#{tab},layer=#{layer},rows=#{rows},update_user=#{updateUser},update_time=now(),bak=#{bak},geom=#{geom}
where id=#{id}
</update>
@@ -189,7 +189,7 @@
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_meta
<set>
- eventid=#{item.eventid},metaid=#{item.metaid},dirid=#{item.dirid},depid=#{item.depid},verid=#{item.verid},name=#{item.name},type=#{item.type},guid=#{item.guid},path=#{item.path},sizes=#{item.sizes},tab=#{item.tab},layer=#{item.layer},rows=#{item.rows},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},geom=#{item.geom}
+ eventid=#{item.eventid},metaid=#{item.metaid},dircode=#{item.dircode},depcode=#{item.depcode},verid=#{item.verid},name=#{item.name},type=#{item.type},guid=#{item.guid},path=#{item.path},sizes=#{item.sizes},tab=#{item.tab},layer=#{item.layer},rows=#{item.rows},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},geom=#{item.geom}
</set>
where id = #{item.id}
</foreach>
diff --git a/src/main/resources/mapper/show/ApplyMapper.xml b/src/main/resources/mapper/show/ApplyMapper.xml
index a7a318f..3d187c7 100644
--- a/src/main/resources/mapper/show/ApplyMapper.xml
+++ b/src/main/resources/mapper/show/ApplyMapper.xml
@@ -73,7 +73,7 @@
</select>
<select id="selectFlows" resultType="com.lf.server.entity.show.FlowEntity">
- select a.*, b.uname, fn_rec_query(a.depid, 'dep') depName
+ select a.*, b.uname, fn_get_fullname(b.depcode, 1) depName
from lf.sys_flow a inner join lf.sys_user b on a.userid = b.id
where a.applyid = #{applyid}
</select>
diff --git a/src/main/resources/mapper/sys/DepMapper.xml b/src/main/resources/mapper/sys/DepMapper.xml
index 9d13493..db59005 100644
--- a/src/main/resources/mapper/sys/DepMapper.xml
+++ b/src/main/resources/mapper/sys/DepMapper.xml
@@ -27,13 +27,13 @@
</select>
<select id="selectDepsByIds" resultType="com.lf.server.entity.ctrl.IdNameEntity">
- select id "id",fn_rec_query(id, 'dep') "name" from lf.sys_dep where id in
+ select id "id",fn_get_fullname(depcode, 1) "name" from lf.sys_dep where id in
<foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
#{id}
</foreach>
</select>
- <insert id="insertDep" parameterType="com.lf.server.entity.sys.DepEntity">
+ <insert id="insertDep" parameterType="com.lf.server.entity.sys.DepEntity">
insert into lf.sys_dep
(pid,name,sname,code,uncode,addr,contact,fax,email,post,website,level,order_num,create_user,create_time,bak)
values
@@ -45,7 +45,7 @@
insert into lf.sys_dep
(pid,name,sname,code,uncode,addr,contact,fax,email,post,website,level,order_num,create_user,create_time,bak)
values
- <foreach collection="list" item="item" index="index" separator="," >
+ <foreach collection="list" item="item" index="index" separator="," >
(#{item.pid},#{item.name},#{item.sname},#{item.code},#{item.uncode},#{item.addr},#{item.contact},#{item.fax},
#{item.email},#{item.post},#{item.website},#{item.level},#{item.orderNum},#{item.createUser},now(),#{item.bak})
</foreach>
diff --git a/src/main/resources/mapper/sys/ReportMapper.xml b/src/main/resources/mapper/sys/ReportMapper.xml
index ccfe7a1..611333b 100644
--- a/src/main/resources/mapper/sys/ReportMapper.xml
+++ b/src/main/resources/mapper/sys/ReportMapper.xml
@@ -74,10 +74,10 @@
<!-- 鏁版嵁閲忕粺璁� -->
<select id="countSizes" resultType="com.lf.server.entity.ctrl.CountEntity">
- select fn_rec_query(depid, 'dep') "m1", count(sizes) "sizes"
+ select fn_get_fullname(depcode, 1) "m1", count(sizes) "sizes"
from lf.sys_meta
- group by depid
- order by depid;
+ group by depcode
+ order by depcode;
</select>
<!-- 鏈嶅姟璋冪敤閲忕粺璁� -->
diff --git a/src/main/resources/mapper/sys/UserMapper.xml b/src/main/resources/mapper/sys/UserMapper.xml
index 0dc4b45..2d1bf33 100644
--- a/src/main/resources/mapper/sys/UserMapper.xml
+++ b/src/main/resources/mapper/sys/UserMapper.xml
@@ -17,21 +17,21 @@
<if test="uname != null">
and uname like #{uname}
</if>
- <if test="depid != null">
- and depid = ANY(fn_rec_array(#{depid}, 'dep'))
+ <if test="depcode != null">
+ and depcode like #{depcode}
</if>
</where>
</select>
<select id="selectByPage" resultMap="resultMap" resultType="com.lf.server.entity.sys.UserEntity">
- select a.*,fn_rec_query(a.depid, 'dep') depName from lf.sys_user a
+ select a.*,fn_get_fullname(a.depcode, 1) depName from lf.sys_user a
<where>
1 = 1
<if test="uname != null">
and uname like #{uname}
</if>
- <if test="depid != null">
- and depid = ANY(fn_rec_array(#{depid}, 'dep'))
+ <if test="depcode != null">
+ and depcode like #{depcode}
</if>
</where>
order by a.id desc
@@ -49,14 +49,14 @@
<if test="uname != null">
and a.uname like #{uname}
</if>
- <if test="depid != null">
- and a.depid = ANY(fn_rec_array(#{depid}, 'dep'))
+ <if test="depcode != null">
+ and depcode like #{depcode}
</if>
</where>
</select>
<select id="selectByPageForRole" resultMap="resultMap" resultType="com.lf.server.entity.sys.UserEntity">
- select a.*,fn_rec_query(a.depid, 'dep') depName from lf.sys_user a
+ select a.*,fn_get_fullname(a.depcode, 1) depName from lf.sys_user a
<where>
not exists (select b.id from lf.sys_role_user b where b.userid = a.id
<if test="roleid != null">
@@ -66,8 +66,8 @@
<if test="uname != null">
and a.uname like #{uname}
</if>
- <if test="depid != null">
- and a.depid = ANY(fn_rec_array(#{depid}, 'dep'))
+ <if test="depcode != null">
+ and depcode like #{depcode}
</if>
</where>
order by a.id desc
@@ -75,11 +75,11 @@
</select>
<select id="selectUserAll" resultMap="resultMap" resultType="com.lf.server.entity.sys.UserEntity">
- select a.*, fn_rec_query(a.depid, 'dep') depName from lf.sys_user a order by a.id desc
+ select a.*, fn_get_fullname(a.depcode, 1) depName from lf.sys_user a order by a.id desc
</select>
<select id="selectUser" resultMap="resultMap" resultType="com.lf.server.entity.sys.UserEntity">
- select a.*, fn_rec_query(a.depid, 'dep') depName from lf.sys_user a where a.id = #{id}
+ select a.*, fn_get_fullname(a.depcode, 1) depName from lf.sys_user a where a.id = #{id}
</select>
<select id="selectByUid" resultMap="resultMap" resultType="com.lf.server.entity.sys.UserEntity">
@@ -99,39 +99,39 @@
</select>
<select id="selectAdminUsers" resultType="com.lf.server.entity.sys.UserEntity">
- select c.*, fn_rec_query(c.depid, 'dep') depName
+ select c.*, fn_get_fullname(b.depcode, 1) depName
from lf.sys_role_user a inner join lf.sys_user b on a.userid = b.id
inner join lf.sys_role c on a.roleid = a.id
where c.is_admin = #{type}
</select>
<select id="selectRoleByUserId" resultType="com.lf.server.entity.sys.RoleEntity">
- select c.*, fn_rec_query(c.depid, 'dep') depName,fn_uname(c.create_user) createName,fn_uname(c.update_user) updateName
+ select c.*, fn_get_fullname(a.depcode, 1) depName,fn_uname(c.create_user) createName,fn_uname(c.update_user) updateName
from lf.sys_user a inner join lf.sys_role_user b on a.id = b.userid
inner join lf.sys_role c on b.roleid = c.id
where a.id = #{id}
</select>
<select id="selectUserByRoleId" resultType="com.lf.server.entity.sys.RoleEntity">
- select a.*, fn_rec_query(a.depid, 'dep') depName
+ select a.*, fn_get_fullname(a.depcode, 1) depName
from lf.sys_user a inner join lf.sys_role_user b on a.id = b.userid inner join lf.sys_role c on b.roleid = c.id
where c.id = #{roleId}
</select>
<insert id="insertUser" parameterType="com.lf.server.entity.sys.UserEntity">
insert into lf.sys_user
- (depid,uid,uname,salt,sex,native,contact,job,email,addr,edu,idcard,status,create_user,create_time,bak)
+ (depid,depcode,uid,uname,salt,sex,native,contact,job,email,addr,edu,idcard,status,create_user,create_time,bak)
values
- (#{depid},#{uid},#{uname},#{salt},#{sex},#{natives},#{contact},#{job},#{email},#{addr},#{edu},#{idcard},
+ (#{depid},#{depcode},#{uid},#{uname},#{salt},#{sex},#{natives},#{contact},#{job},#{email},#{addr},#{edu},#{idcard},
#{status},#{createUser},now(),#{bak})
</insert>
<insert id="insertUsers">
insert into lf.sys_user
- (depid,uid,uname,salt,sex,native,contact,job,email,addr,edu,idcard,status,create_user,create_time,bak)
+ (depid,depcode,uid,uname,salt,sex,native,contact,job,email,addr,edu,idcard,status,create_user,create_time,bak)
values
- <foreach collection="list" item="item" index="index" separator="," >
- (#{item.depid},#{item.uid},#{item.uname},#{item.salt},#{item.sex},#{item.natives},#{item.contact},#{item.job},
+ <foreach collection="list" item="item" index="index" separator="," >
+ (#{item.depid},#{item.depcode},#{item.uid},#{item.uname},#{item.salt},#{item.sex},#{item.natives},#{item.contact},#{item.job},
#{item.email},#{item.addr},#{item.edu},#{item.idcard},#{item.status},#{item.createUser}, now(),#{item.bak})
</foreach>
</insert>
@@ -152,9 +152,9 @@
</foreach>;
</delete>
- <update id="updateUsers">
- update lf.sys_user set depid=#{depid},uid=#{uid},uname=#{uname},salt=#{salt},sex=#{sex},native=#{natives},contact=#{contact},job=#{job},email=#{email},
- addr=#{addr},edu=#{edu},idcard=#{idcard},status=#{status},update_user=#{updateUser},update_time=now(),bak=#{bak} where id=#{id}
+ <update id="updateUser">
+ update lf.sys_user set depid=#{depid},depcode=#{depcode},uid=#{uid},uname=#{uname},salt=#{salt},sex=#{sex},native=#{natives},contact=#{contact},job=#{job},email=#{email},
+ addr=#{addr},edu=#{edu},idcard=#{idcard},status=#{status},update_user=#{updateUser},update_time=now(),bak=#{bak} where id=#{id}
</update>
<update id="updateUsersPwd">
--
Gitblit v1.9.3