From 7ce82b491f9cd097fe70aae37d1ad3dff3779e72 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 21 二月 2023 14:24:43 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/FmeService.java | 14 ++++++++++++++
src/main/java/com/lf/server/controller/all/CrdsController.java | 23 +++++++++++++++++------
src/main/java/com/lf/server/entity/all/StaticData.java | 10 ++++++++++
3 files changed, 41 insertions(+), 6 deletions(-)
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 0cc1a00..704fde6 100644
--- a/src/main/java/com/lf/server/controller/all/CrdsController.java
+++ b/src/main/java/com/lf/server/controller/all/CrdsController.java
@@ -33,7 +33,7 @@
DirService dirService;
@Autowired
- protected FmeService fmeService;
+ FmeService fmeService;
@SysLog()
@ApiOperation(value = "鏌ヨ椤圭洰")
@@ -83,23 +83,34 @@
@ApiOperation(value = "璇锋眰鎵撳寘")
@ApiImplicitParams({
@ApiImplicitParam(name = "dirId", value = "鐩綍ID", dataType = "Integer", paramType = "57"),
- @ApiImplicitParam(name = "major", value = "涓撲笟", dataType = "String", paramType = "绌胯法瓒�")
+ @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, HttpServletRequest req) {
+ public ResponseMsg<Object> uploadReqPackaging(Integer dirId, 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 (StringHelper.isEmpty(major) || !isMajor) {
+ if (!isMajor) {
return fail("涓撲笟鍙兘鏄�滅┛璺ㄨ秺鈥濇垨鈥滅嚎璺��");
}
- List<DirEntity> list = dirService.selectDirsForPrj();
+ boolean bCut = StaticData.YES.equals(isCut) || StaticData.NO.equals(isCut);
+ if (!bCut) {
+ return fail("鏄惁瑁佸壀鍙兘鏄�淵ES鈥濇垨鈥淣O鈥�");
+ }
- return success(list);
+ DirEntity dir = dirService.selectDir(dirId);
+ if (null == dir) {
+ return fail("鐩綍(id = " + dirId + ")涓嶅瓨鍦�");
+ }
+
+ String id = fmeService.crdsPackaging(dir.getFullName(), major, isCut, req);
+
+ return success(id);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
diff --git a/src/main/java/com/lf/server/entity/all/StaticData.java b/src/main/java/com/lf/server/entity/all/StaticData.java
index f57ba9b..bcaac67 100644
--- a/src/main/java/com/lf/server/entity/all/StaticData.java
+++ b/src/main/java/com/lf/server/entity/all/StaticData.java
@@ -185,6 +185,16 @@
public final static String DRUID_COOKIE_KEY = "JSESSIONID";
/**
+ * YES
+ */
+ public final static String YES = "YES";
+
+ /**
+ * NO
+ */
+ public final static String NO = "NO";
+
+ /**
* 绾胯矾
*/
public final static String ROUTE = "绾胯矾";
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 69ad926..7dc71c5 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -238,6 +238,20 @@
}
/**
+ * 14.CRDS骞冲彴浜や粯
+ */
+ public String crdsPackaging(String dir, String major, String isCut, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/CRDS骞冲彴浜や粯_娴嬭瘯", req);
+
+ List<NameValueEntity> list = getKeyValues("CRDS骞冲彴浜や粯_娴嬭瘯");
+ list.add(new NameValueEntity("S_FFXMMC", dir));
+ list.add(new NameValueEntity("MBZY", major));
+ list.add(new NameValueEntity("P_WBFW", isCut));
+
+ return RestHelper.postForRest(url, list);
+ }
+
+ /**
* 鑾峰彇Url
*/
public String getUrl(String subUrl, HttpServletRequest req) {
--
Gitblit v1.9.3