wl
2022-10-11 262da4207e549ba8effb0fc2b5a26a5322addaf8
车俩管理 字典表 文本上传
3个文件已修改
1个文件已添加
124 ■■■■ 已修改文件
ycl-common/src/main/java/com/ycl/enums/common/DictTypeEnum.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java 77 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/carManage/CarEnforcecar.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/enums/common/DictTypeEnum.java
New file
@@ -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;
    }
}
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)));
    }
}
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;
    /**
     * 籍贯
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;
}