From 262da4207e549ba8effb0fc2b5a26a5322addaf8 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 11 十月 2022 17:01:23 +0800
Subject: [PATCH] 车俩管理 字典表 文本上传

---
 ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java      |    6 +-
 ycl-platform/src/main/java/com/ycl/entity/carManage/CarEnforcecar.java               |   10 ++
 ycl-common/src/main/java/com/ycl/enums/common/DictTypeEnum.java                      |   31 ++++++++++
 ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java |   77 +++++++++++++++++++------
 4 files changed, 101 insertions(+), 23 deletions(-)

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
new file mode 100644
index 0000000..a0ca17d
--- /dev/null
+++ b/ycl-common/src/main/java/com/ycl/enums/common/DictTypeEnum.java
@@ -0,0 +1,31 @@
+package com.ycl.enums.common;
+
+public enum DictTypeEnum {
+    ILLEGAL_BULID_TYPE("01", "杩濆缓绫诲瀷"),
+    VIOLATION_TYPE("06", "杩濊绫诲瀷"),
+    EVENT_GRADE_TYPE("02", "浜嬩欢绛夌骇"),
+    IDENTITY_TYPE("03", "璇佷欢绫诲瀷"),
+    CULTURE_TYPE("04", "鏂囧寲"),
+    NATIONALITY_TYPE("05", "鍚嶆棌"),
+    USER_TYPE("07", "鐢ㄦ埛绫诲瀷"),
+    ROLE_TYPE("09", "瑙掕壊绫诲瀷"),
+    DEPART_TYPE("08", "閮ㄩ棬绫诲瀷"),
+    STREET_TYPE("10", "涔¢晣琛楅亾"),
+    COMMUNITY_TYPE("11", "鎵�杈栨潙(绀惧尯)");
+
+    private String code;
+    private String type;
+
+    DictTypeEnum(String code, String type) {
+        this.code = code;
+        this.type = type;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getType() {
+        return type;
+    }
+}
\ 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 3dce945..d21b178 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
@@ -2,16 +2,17 @@
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.ycl.api.CommonResult;
 import com.ycl.controller.BaseController;
 import com.ycl.entity.dict.DataDictionary;
+import com.ycl.enums.common.DictTypeEnum;
 import com.ycl.service.dict.IDataDictionaryService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -39,7 +40,7 @@
 
     @GetMapping("/queryByCode")
     @ApiOperation(("鏍规嵁code鑾峰彇瀛楁淇℃伅"))
-    private CommonResult<List<DataDictionary>> queryByCode(@RequestParam(value = "code") String code){
+    private CommonResult<List<DataDictionary>> queryByCode(@RequestParam(value = "code") String code) {
         List<DataDictionary> dataDictionary = iDatabaseDictionaryService.queryByCode(code);
         return CommonResult.success(dataDictionary);
     }
@@ -48,11 +49,10 @@
     @ApiOperation("鏌ヨ鐢ㄦ埛绫诲瀷")
     private CommonResult queryUserType() {
         String level = "1";
-        String typeCode = "07";
         return CommonResult.success(iDatabaseDictionaryService
                 .list(new LambdaQueryWrapper<DataDictionary>()
                         .eq(DataDictionary::getLevel, level)
-                        .eq(DataDictionary::getTypeCode, typeCode)
+                        .eq(DataDictionary::getTypeCode, DictTypeEnum.USER_TYPE.getCode())
                 ));
     }
 
@@ -60,11 +60,10 @@
     @ApiOperation("鏌ヨ瑙掕壊绫诲瀷")
     private CommonResult queryRoleType() {
         String level = "1";
-        String typeCode = "09";
         return CommonResult.success(iDatabaseDictionaryService
                 .list(new LambdaQueryWrapper<DataDictionary>()
                         .eq(DataDictionary::getLevel, level)
-                        .eq(DataDictionary::getTypeCode, typeCode)
+                        .eq(DataDictionary::getTypeCode, DictTypeEnum.ROLE_TYPE.getCode())
                 ));
     }
 
@@ -72,11 +71,10 @@
     @ApiOperation("鏌ヨ閮ㄩ棬绫诲瀷")
     private CommonResult queryDepartType() {
         String level = "1";
-        String typeCode = "08";
         return CommonResult.success(iDatabaseDictionaryService
                 .list(new LambdaQueryWrapper<DataDictionary>()
                         .eq(DataDictionary::getLevel, level)
-                        .eq(DataDictionary::getTypeCode, typeCode)
+                        .eq(DataDictionary::getTypeCode, DictTypeEnum.DEPART_TYPE.getCode())
                 ));
     }
 
@@ -84,7 +82,42 @@
     @ApiOperation("鏌ヨ涔℃潙琛楅亾绫诲瀷")
     private CommonResult queryStreetType() {
         String level = "1";
-        String typeCode = "10";
+        return CommonResult.success(iDatabaseDictionaryService
+                .list(new LambdaQueryWrapper<DataDictionary>()
+                        .eq(DataDictionary::getLevel, level)
+                        .eq(DataDictionary::getTypeCode, DictTypeEnum.STREET_TYPE.getCode())
+                ));
+    }
+
+    @GetMapping("/query_social_type")
+    @ApiOperation("鏌ヨ鎵�杈栨潙锛堢ぞ鍖�")
+    private CommonResult querySocialTypeById(@RequestParam Integer id) {
+        return CommonResult.success(iDatabaseDictionaryService
+                .list(new LambdaQueryWrapper<DataDictionary>()
+                        .eq(DataDictionary::getParentId, id)
+                ));
+    }
+
+
+    @GetMapping("/query_social")
+    @ApiOperation("鏌ヨ鎵�杈栨潙锛堢ぞ鍖�")
+    private CommonResult querySocialType() {
+        String level = "1";
+        return CommonResult.success(iDatabaseDictionaryService
+                .list(new LambdaQueryWrapper<DataDictionary>()
+                        .eq(DataDictionary::getLevel, level)
+                        .eq(DataDictionary::getTypeCode, DictTypeEnum.COMMUNITY_TYPE.getCode())
+                ));
+    }
+
+    @GetMapping("/query_type")
+    @ApiOperation("閫氳繃绫诲瀷缂栫爜鏌ヨ绫诲瀷")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "typeCode", value = "01杩濊 02 浜嬩欢绛夌骇 03璇佷欢绫诲瀷 04鏂囧寲 05鍚嶆棌 06杩濆缓 07鐢ㄦ埛绫诲瀷 08 閮ㄩ棬绫诲瀷 09 瑙掕壊绫诲瀷 10 涔℃潙琛楅亾 11 绀惧尯"),
+            @ApiImplicitParam(name = "level", value = "1 椤剁骇 2 涓�绾у瓙绾� 3 浜岀骇瀛愮骇 4涓夌骇瀛愮骇")
+    }
+    )
+    private CommonResult queryType(@RequestParam String typeCode, @RequestParam Integer level) {
         return CommonResult.success(iDatabaseDictionaryService
                 .list(new LambdaQueryWrapper<DataDictionary>()
                         .eq(DataDictionary::getLevel, level)
@@ -92,12 +125,20 @@
                 ));
     }
 
-    @GetMapping("/query_social_type")
-    @ApiOperation("鏌ヨ鎵�杈栨潙锛堢ぞ鍖�")
-    private CommonResult querySocialType(@RequestParam Integer id) {
-        return CommonResult.success(iDatabaseDictionaryService
+    @GetMapping("/addition")
+    @ApiOperation("閫氱敤娣诲姞")
+    @ApiImplicitParams(
+            @ApiImplicitParam(name = "typeCode", value = "01杩濊 02 浜嬩欢绛夌骇 03璇佷欢绫诲瀷 04鏂囧寲 05鍚嶆棌 06杩濆缓 07鐢ㄦ埛绫诲瀷 08 閮ㄩ棬绫诲瀷 09 瑙掕壊绫诲瀷 10 涔℃潙琛楅亾 11 绀惧尯")
+    )
+    private CommonResult queryType(@RequestBody DataDictionary dataDictionary) {
+        return CommonResult.success(iDatabaseDictionaryService.save(dataDictionary));
+    }
+
+    @GetMapping("/query")
+    @ApiOperation("閫氱敤id鏌ヨ璇︽儏")
+    private CommonResult queryDictById(@RequestParam Integer id) {
+    return CommonResult.success(iDatabaseDictionaryService
                 .list(new LambdaQueryWrapper<DataDictionary>()
-                        .eq(DataDictionary::getParentId, id)
-                ));
+                        .eq(DataDictionary::getParentId, id)));
     }
 }
diff --git a/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
index 5e057f5..3226c81 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java
@@ -189,7 +189,7 @@
      * 璇佷欢绫诲瀷
      */
     @ApiModelProperty(value = "璇佷欢绫诲瀷")
-    private String certificateType;
+    private Integer certificateType;
 
     /**
      * 璇佷欢鍙�
@@ -201,7 +201,7 @@
      * 鏂囧寲绋嬪害
      */
     @ApiModelProperty(value = "鏂囧寲绋嬪害")
-    private String educationDegree;
+    private Integer educationDegree;
 
     /**
      * 鑱屼笟
@@ -219,7 +219,7 @@
      * 姘戞棌
      */
     @ApiModelProperty(value = "姘戞棌")
-    private String nation;
+    private Integer nation;
 
     /**
      * 绫嶈疮
diff --git a/ycl-platform/src/main/java/com/ycl/entity/carManage/CarEnforcecar.java b/ycl-platform/src/main/java/com/ycl/entity/carManage/CarEnforcecar.java
index 20c47e3..7f918bb 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/carManage/CarEnforcecar.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/carManage/CarEnforcecar.java
@@ -63,6 +63,12 @@
     /**
      * 鎵�灞炲ぇ闃�
      */
-    @TableField("group")
-    private String group;
+    @TableField("belong")
+    private String belong;
+
+    /**
+     * 鎵�灞為儴闂�
+     */
+    @TableField("depart")
+    private String depart;
 }

--
Gitblit v1.8.0