From e31f5210c808586897af580f53d4c2930d22a478 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 14:52:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/controller/all/CrdsController.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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..d2b7bfc 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 = "鏌ヨ椤圭洰")
@@ -82,24 +82,34 @@
@SysLog()
@ApiOperation(value = "璇锋眰鎵撳寘")
@ApiImplicitParams({
- @ApiImplicitParam(name = "dirId", value = "鐩綍ID", dataType = "Integer", paramType = "57"),
- @ApiImplicitParam(name = "major", value = "涓撲笟", dataType = "String", paramType = "绌胯法瓒�")
+ @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, 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 (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);
+ if (StringHelper.isEmpty(dirCode)) {
+ return fail("鐩綍缂栫爜涓嶈兘涓虹┖");
+ }
+ DirEntity dir = dirService.selectByCode(dirCode);
+ if (null == dir) {
+ return fail("鐩綍缂栫爜涓�" + dirCode + "鐨勭洰褰曚笉瀛樺湪");
+ }
+
+ String id = fmeService.crdsPackaging(dirCode, major, isCut, req);
+
+ return success(id);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
--
Gitblit v1.9.3