Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

mg

2022-10-14 b9e7a0261443ca41b80108b9fef555093f20bb8b

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

 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>

 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;
    }
}

 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() {

 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();
    }

}