From fcd88fa48dccd67a9fb828fe1e27d8e3711aa69d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 21 二月 2023 14:04:10 +0800
Subject: [PATCH] 规约扫描
---
src/main/java/com/lf/server/mapper/show/OneMapMapper.java | 11 ++---
src/main/java/com/lf/server/controller/all/CrdsController.java | 39 +++++++++++++++++--
src/main/java/com/lf/server/entity/all/StaticData.java | 14 ++++++-
src/main/java/com/lf/server/service/show/OneMapService.java | 19 ++++++---
4 files changed, 64 insertions(+), 19 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 2506d1b..0cc1a00 100644
--- a/src/main/java/com/lf/server/controller/all/CrdsController.java
+++ b/src/main/java/com/lf/server/controller/all/CrdsController.java
@@ -2,6 +2,7 @@
import com.lf.server.annotation.SysLog;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.data.DirEntity;
import com.lf.server.helper.HttpHelper;
import com.lf.server.helper.StringHelper;
@@ -61,10 +62,41 @@
}
@SysLog()
- @ApiOperation(value = "璇锋眰鎵撳寘")
- @GetMapping(value = "/uploadReqPackaging")
- public ResponseMsg<Object> uploadReqPackaging() {
+ @ApiOperation(value = "鏌ヨ浠诲姟鐘舵��")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "浠诲姟ID", dataType = "String", paramType = "query", example = "29db09ee-2aae-4c62-bec0-0b5c5d8084e4")
+ })
+ @GetMapping(value = "/selectTaskStatus")
+ public Object selectTaskStatus(String id, HttpServletRequest req) {
try {
+ if (StringHelper.isEmpty(id)) {
+ return fail("id涓嶈兘涓虹┖");
+ }
+
+ return fmeService.getTaskStatus(id, req);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "璇锋眰鎵撳寘")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "dirId", value = "鐩綍ID", dataType = "Integer", paramType = "57"),
+ @ApiImplicitParam(name = "major", value = "涓撲笟", dataType = "String", paramType = "绌胯法瓒�")
+ })
+ @GetMapping(value = "/uploadReqPackaging")
+ public ResponseMsg<Object> uploadReqPackaging(Integer dirId, String major, 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) {
+ return fail("涓撲笟鍙兘鏄�滅┛璺ㄨ秺鈥濇垨鈥滅嚎璺��");
+ }
+
List<DirEntity> list = dirService.selectDirsForPrj();
return success(list);
@@ -85,7 +117,6 @@
String url = fmeService.getDownloadUrl(id, req);
HttpHelper httpHelper = new HttpHelper();
- // res.sendRedirect(url)
httpHelper.service(req, res, url, null);
}
} catch (Exception ex) {
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 7fd3a8d..f57ba9b 100644
--- a/src/main/java/com/lf/server/entity/all/StaticData.java
+++ b/src/main/java/com/lf/server/entity/all/StaticData.java
@@ -15,6 +15,11 @@
public static String[] EXCLUDE_PATH = new String[]{"/swagger", "/sign/", "/fmeit/", "/perms/", "/floatserver/", "/error", "/wmts/select"};
/**
+ * 鏁板�硷細2
+ */
+ public final static int TWO = 2;
+
+ /**
* 鏁板�硷細4
*/
public final static int FOUR = 4;
@@ -180,9 +185,14 @@
public final static String DRUID_COOKIE_KEY = "JSESSIONID";
/**
- * 涓婁紶鏂囦欢绫诲瀷 *
+ * 绾胯矾
*/
- public final static String FILE_TYPES = "'xls','shp','gdb','mdb'";
+ public final static String ROUTE = "绾胯矾";
+
+ /**
+ * 绌胯法瓒�
+ */
+ public final static String CROSSING = "绌胯法瓒�";
/**
* 16杩涘埗
diff --git a/src/main/java/com/lf/server/mapper/show/OneMapMapper.java b/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
index dbf8201..97b506b 100644
--- a/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
+++ b/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
@@ -1,16 +1,17 @@
package com.lf.server.mapper.show;
-
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
import java.util.List;
+/**
+ * 绠＄綉涓�寮犲浘Mapper
+ * @author 閭㈤敠鍙�
+ */
@Mapper
@Repository
public interface OneMapMapper {
-
-
/**
* 椤圭洰绫诲埆conut
*
@@ -74,14 +75,10 @@
*/
public List<String> countProjectDisplay();
-
-
/**
* 缁熻椤圭洰绫诲瀷
*
* @return {@link List}<{@link String}>
*/
public List<String> countProjectType1();
- //public List<String> countProjectType2();
-
}
diff --git a/src/main/java/com/lf/server/service/show/OneMapService.java b/src/main/java/com/lf/server/service/show/OneMapService.java
index 30f0053..068cb41 100644
--- a/src/main/java/com/lf/server/service/show/OneMapService.java
+++ b/src/main/java/com/lf/server/service/show/OneMapService.java
@@ -6,15 +6,19 @@
import java.util.List;
+/**
+ * 绠＄綉涓�寮犲浘Service
+ * @author 閭㈤敠鍙�
+ */
@Service
public class OneMapService implements OneMapMapper {
-
@Autowired
OneMapMapper aMapOfPipelineMapper;
/**
* 椤圭洰绫诲埆conut
*/
+ @Override
public List<String> projectCategoryCount() {
return aMapOfPipelineMapper.projectCategoryCount();
}
@@ -24,24 +28,25 @@
*
* @return {@link List}<{@link String}>
*/
+ @Override
public List<String> projectLocationCount() {
return aMapOfPipelineMapper.projectLocationCount();
}
-
/**
* 鍥藉缁村害conut
*/
+ @Override
public List<String> countryDimensionCount() {
return aMapOfPipelineMapper.countryDimensionCount();
}
-
/**
* 鐪佺淮conut
*
* @return {@link List}<{@link String}>
*/
+ @Override
public List<String> provinceDimensionCount() {
return aMapOfPipelineMapper.provinceDimensionCount();
}
@@ -51,6 +56,7 @@
*
* @return {@link List}<{@link String}>
*/
+ @Override
public List<String> dataStorageCount() {
return aMapOfPipelineMapper.dataStorageCount();
}
@@ -60,6 +66,7 @@
*
* @return {@link List}<{@link String}>
*/
+ @Override
public List<String> fileFormatCount() {
return aMapOfPipelineMapper.fileFormatCount();
}
@@ -69,6 +76,7 @@
*
* @return {@link List}<{@link String}>
*/
+ @Override
public List<String> dataApplyCount() {
return aMapOfPipelineMapper.dataApplyCount();
}
@@ -78,6 +86,7 @@
*
* @return {@link List}<{@link String}>
*/
+ @Override
public List<String> dataVisitCount() {
return aMapOfPipelineMapper.dataVisitCount();
}
@@ -87,11 +96,10 @@
*
* @return {@link List}<{@link String}>
*/
+ @Override
public List<String> countProjectDisplay() {
return aMapOfPipelineMapper.countProjectDisplay();
}
-
-
/**
* 缁熻椤圭洰绫诲瀷
@@ -102,5 +110,4 @@
public List<String> countProjectType1() {
return aMapOfPipelineMapper.countProjectType1();
}
-
}
--
Gitblit v1.9.3