From ac15c2882303c3b7a3043e9c7fd2829ee076d872 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 21 二月 2023 14:42:13 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/mapper/data/DirMapper.java | 8 ++++++++
src/main/resources/mapper/data/DirMapper.xml | 3 +++
src/main/java/com/lf/server/service/data/FmeService.java | 9 +++++----
src/main/java/com/lf/server/controller/all/CrdsController.java | 17 ++++++++---------
data/update.sql | 5 +++--
src/main/java/com/lf/server/service/data/DirService.java | 5 +++++
6 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/data/update.sql b/data/update.sql
index c7ddac6..8a5108e 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -219,9 +219,10 @@
select * from lf.sys_report order by code
select * from lf.sys_layer
select * from lf.sys_meta;
-select a.* from lf.sys_dir a where code not like '00%' order by code;
+select a.* from lf.sys_dir a where pid = 0;
+select a.* from lf.sys_dir a where code = '06' order by code;
-
+select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a where code = '01'
diff --git a/src/main/java/com/lf/server/controller/all/CrdsController.java b/src/main/java/com/lf/server/controller/all/CrdsController.java
index 704fde6..d2b7bfc 100644
--- a/src/main/java/com/lf/server/controller/all/CrdsController.java
+++ b/src/main/java/com/lf/server/controller/all/CrdsController.java
@@ -82,17 +82,13 @@
@SysLog()
@ApiOperation(value = "璇锋眰鎵撳寘")
@ApiImplicitParams({
- @ApiImplicitParam(name = "dirId", value = "鐩綍ID", dataType = "Integer", paramType = "57"),
+ @ApiImplicitParam(name = "dirCode", value = "鐩綍缂栫爜", dataType = "String", paramType = "01"),
@ApiImplicitParam(name = "major", value = "涓撲笟", dataType = "String", paramType = "绌胯法瓒�"),
@ApiImplicitParam(name = "isCut", value = "鏄惁瑁佸壀", dataType = "String", paramType = "NO")
})
@GetMapping(value = "/uploadReqPackaging")
- public ResponseMsg<Object> uploadReqPackaging(Integer dirId, String major, String isCut, HttpServletRequest req) {
+ public ResponseMsg<Object> uploadReqPackaging(String dirCode, String major, String isCut, HttpServletRequest req) {
try {
- if (null == dirId || dirId < StaticData.TWO) {
- return fail("鐩綍ID涓嶈兘涓虹┖涓斿ぇ浜�1");
- }
-
boolean isMajor = StaticData.CROSSING.equals(major) || StaticData.ROUTE.equals(major);
if (!isMajor) {
return fail("涓撲笟鍙兘鏄�滅┛璺ㄨ秺鈥濇垨鈥滅嚎璺��");
@@ -103,12 +99,15 @@
return fail("鏄惁瑁佸壀鍙兘鏄�淵ES鈥濇垨鈥淣O鈥�");
}
- DirEntity dir = dirService.selectDir(dirId);
+ if (StringHelper.isEmpty(dirCode)) {
+ return fail("鐩綍缂栫爜涓嶈兘涓虹┖");
+ }
+ DirEntity dir = dirService.selectByCode(dirCode);
if (null == dir) {
- return fail("鐩綍(id = " + dirId + ")涓嶅瓨鍦�");
+ return fail("鐩綍缂栫爜涓�" + dirCode + "鐨勭洰褰曚笉瀛樺湪");
}
- String id = fmeService.crdsPackaging(dir.getFullName(), major, isCut, req);
+ String id = fmeService.crdsPackaging(dirCode, major, isCut, req);
return success(id);
} catch (Exception ex) {
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 c73ef99..51a4d8e 100644
--- a/src/main/java/com/lf/server/mapper/data/DirMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/DirMapper.java
@@ -72,6 +72,14 @@
public DirEntity selectDir(int id);
/**
+ * 鏍规嵁Code鏌ヨ鐩綍
+ *
+ * @param code
+ * @return
+ */
+ public DirEntity selectByCode(String code);
+
+ /**
* 鏌ヨ澶氭潯鏁版嵁
*
* @return
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 bb5ab27..2c255db 100644
--- a/src/main/java/com/lf/server/service/data/DirService.java
+++ b/src/main/java/com/lf/server/service/data/DirService.java
@@ -54,6 +54,11 @@
}
@Override
+ public DirEntity selectByCode(String code) {
+ return dirMapper.selectByCode(code);
+ }
+
+ @Override
public List<DirEntity> selectDirAll() {
return dirMapper.selectDirAll();
}
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 7dc71c5..dad628a 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -240,11 +240,12 @@
/**
* 14.CRDS骞冲彴浜や粯
*/
- public String crdsPackaging(String dir, String major, String isCut, HttpServletRequest req) {
- String url = getUrl("datax/task/run/CRDS骞冲彴浜や粯_娴嬭瘯", req);
+ public String crdsPackaging(String dirCode, String major, String isCut, HttpServletRequest req) {
+ // datax/task/run/CRDS骞冲彴浜や粯_娴嬭瘯
+ String url = getUrl("datax/task/run/CRDS骞冲彴浜や粯_code娴嬭瘯", req);
- List<NameValueEntity> list = getKeyValues("CRDS骞冲彴浜や粯_娴嬭瘯");
- list.add(new NameValueEntity("S_FFXMMC", dir));
+ List<NameValueEntity> list = getKeyValues("CRDS骞冲彴浜や粯");
+ list.add(new NameValueEntity("S_FFXMMC", dirCode));
list.add(new NameValueEntity("MBZY", major));
list.add(new NameValueEntity("P_WBFW", isCut));
diff --git a/src/main/resources/mapper/data/DirMapper.xml b/src/main/resources/mapper/data/DirMapper.xml
index e28e032..31fb886 100644
--- a/src/main/resources/mapper/data/DirMapper.xml
+++ b/src/main/resources/mapper/data/DirMapper.xml
@@ -4,6 +4,9 @@
<select id="selectDir" resultType="com.lf.server.entity.data.DirEntity">
select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a where id = #{id}
</select>
+ <select id="selectByCode" resultType="com.lf.server.entity.data.DirEntity">
+ select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a where code = #{code}
+ </select>
<select id="selectDirAll" resultType="com.lf.server.entity.data.DirEntity">
select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a order by order_num;
--
Gitblit v1.9.3