From b9e7a0261443ca41b80108b9fef555093f20bb8b Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 14 十月 2022 16:48:13 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/enums/common/DictTypeEnum.java | 28 +++++++++++++++++++++++-----
ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java | 8 ++++++++
pom.xml | 2 +-
ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java | 8 ++++++++
4 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index a0b70f1..d8811a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<docker.maven.plugin.version>0.40.0</docker.maven.plugin.version>
<druid.version>1.2.9</druid.version>
<hutool.version>5.8.0</hutool.version>
- <mysql-connector.version>8.0.29</mysql-connector.version>
+ <mysql-connector.version>8.0.26</mysql-connector.version>
<jjwt.version>0.9.1</jjwt.version>
<mybatis-plus.version>3.5.1</mybatis-plus.version>
<springfox-swagger.version>3.0.0</springfox-swagger.version>
diff --git a/ycl-common/src/main/java/com/ycl/enums/common/DictTypeEnum.java b/ycl-common/src/main/java/com/ycl/enums/common/DictTypeEnum.java
index a0ca17d..94974c3 100644
--- a/ycl-common/src/main/java/com/ycl/enums/common/DictTypeEnum.java
+++ b/ycl-common/src/main/java/com/ycl/enums/common/DictTypeEnum.java
@@ -1,17 +1,23 @@
package com.ycl.enums.common;
+import java.util.HashMap;
+import java.util.Map;
+
public enum DictTypeEnum {
- ILLEGAL_BULID_TYPE("01", "杩濆缓绫诲瀷"),
- VIOLATION_TYPE("06", "杩濊绫诲瀷"),
+ QUESTION_TYPE("01", "闂绫诲瀷"),
EVENT_GRADE_TYPE("02", "浜嬩欢绛夌骇"),
IDENTITY_TYPE("03", "璇佷欢绫诲瀷"),
CULTURE_TYPE("04", "鏂囧寲"),
- NATIONALITY_TYPE("05", "鍚嶆棌"),
+ NATIONALITY_TYPE("05", "姘戞棌"),
+ ILLEGAL_BUILD_TYP("06", "杩濆缓绫诲瀷"),
USER_TYPE("07", "鐢ㄦ埛绫诲瀷"),
ROLE_TYPE("09", "瑙掕壊绫诲瀷"),
DEPART_TYPE("08", "閮ㄩ棬绫诲瀷"),
- STREET_TYPE("10", "涔￠晣琛楅亾"),
- COMMUNITY_TYPE("11", "鎵�杈栨潙(绀惧尯)");
+ STREET_TYPE("10", "涔￠晣琛楅亾--搴熷純"),
+ COMMUNITY_TYPE("11", "鎵�杈栨潙(绀惧尯)--搴熷純"),
+ BAYONET_APPLICABLE_TYPE("12", "鍗″彛閫傜敤绫诲瀷"),
+ BAYONET_FRONTEND_TYPE("13", "鍗″彛鍓嶇绫诲瀷"),
+ BAYONET_PASSAGEWAY_TYPE("14", "鍗″彛鍑哄叆鍩庣被鍨�");
private String code;
private String type;
@@ -28,4 +34,16 @@
public String getType() {
return type;
}
+
+ /**
+ * 鑾峰緱鎵�鏈夋灇涓剧被鍨嬪埌map
+ * @return
+ */
+ public static Map<String,String> getAllToMap() {
+ Map<String,String> map = new HashMap<>();
+ for (DictTypeEnum alarmType : values()) {
+ map.put(alarmType.getCode(), alarmType.getType());
+ }
+ return map;
+ }
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
index 77c0523..ec98475 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
@@ -15,6 +15,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -44,6 +45,13 @@
return CommonResult.success(dataDictionary);
}
+ @GetMapping("/queryTypeCode")
+ @ApiOperation(("鑾峰彇瀛楀吀琛ㄦ墍鏈夌被鍨�"))
+ private CommonResult<Map<String, String>> queryTypeCode() {
+ Map<String, String> s = DictTypeEnum.getAllToMap();
+ return CommonResult.success(s);
+ }
+
@GetMapping("/query_user_type")
@ApiOperation("鏌ヨ鐢ㄦ埛绫诲瀷")
private CommonResult queryUserType() {
diff --git a/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java b/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java
index 9a935ac..22fe8d9 100644
--- a/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java
+++ b/ycl-platform/src/test/java/com/ycl/sccgplatform/SccgPlatformApplicationTests.java
@@ -1,10 +1,13 @@
package com.ycl.sccgplatform;
import com.ycl.common.util.UtilNumber;
+import com.ycl.enums.common.DictTypeEnum;
import com.ycl.service.caseHandler.IBaseCaseService;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.Map;
@SpringBootTest
class SccgPlatformApplicationTests {
@@ -34,4 +37,9 @@
System.out.println(utilNumber.createCaseCode());
}
+ @Test
+ void enumMapTest(){
+ Map<String,String> s =DictTypeEnum.getAllToMap();
+ }
+
}
--
Gitblit v1.8.0