forked from gzzfw/backEnd/gz-dyh

xusd
2024-09-22 47a4eaba095726f1610b606527c871333e4cf46b
调整静态文件读取位置
1 files renamed
2 files modified
17 ■■■■ changed files
dyh-service/dyh-mediate/src/main/assembly/assembly.xml 6 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java 11 ●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/resources/area/Area.json patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/assembly/assembly.xml
@@ -53,6 +53,12 @@
            <fileMode>0755</fileMode>
        </fileSet>
        <fileSet>
            <directory>${project.basedir}/src/main/resources/area</directory>
            <outputDirectory>area</outputDirectory>
            <fileMode>0755</fileMode>
        </fileSet>
        <!-- 指定输出templates中的文件到templates目录中 -->
        <fileSet>
            <directory>${project.basedir}/src/main/resources/templates</directory>
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -1061,6 +1061,7 @@
    public List<CaseStatisticsAreaDTO> sortArea(List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS){
        caseStatisticsAreaDTOS.sort((o1, o2)->{
            log.info("xsd:{},{}",o1,o2);
            Integer totalScore1 = Integer.valueOf(o1.getAreaCode());
            Integer totalScore2 = Integer.valueOf(o2.getAreaCode());
            if(totalScore1 > totalScore2) {
@@ -1083,12 +1084,12 @@
    /**
     * 根据json文件获取区域信息
     * */
     */
    public CaseAreaDTO getArea() throws IOException {
        Class<?> clazz = CaseAreaDTO.class;
        String path = clazz.getProtectionDomain().getCodeSource().getLocation().getPath();
        ObjectMapper mapper = new ObjectMapper();
        File file = new File(path+ "cn"+File.separator+"huge"+File.separator+"module"+File.separator+"cases"+File.separator+"domain"+File.separator+"json"+File.separator+"Area.json");
        File file = new File("area/Area.json");
        CaseAreaDTO obj = mapper.readValue(file, CaseAreaDTO.class);
        return obj;
    }
@@ -1096,12 +1097,12 @@
    /**
     * 根据不同的等级获取不同区域子集合
     *
     * @param areaType 1-市级 2-区
     * */
     */
    public List<CaseAreaDTO> listAreaByType(Object areaType,Object areaCode) throws IOException {
        log.info("listAreaByType {},{}",areaType,areaCode);
        CaseAreaDTO area = getArea();
        log.info("listAreaByType area {}",JSON.toJSONString(area));
        if(ObjectUtils.isEmpty(areaType) || areaType.equals("") || areaType.equals("1")){
            return area.getChildren();
        }
dyh-service/dyh-mediate/src/main/resources/area/Area.json