1

13693261870

2023-03-28 d3d32bede6f5dfe8fa1939c7fb85f0af57ea3358

1

 src/main/java/com/lf/server/controller/all/BaseQueryController.java

@@ -395,7 +395,7 @@
            }
            dirs = DataLibService.copeCodes(dirs, "dirid");
            if (dirs != null) {
                filters += String.format(" and (%s)", dirs);
                filters += String.format(" and %s", dirs);
            }

            String field = null == hasGeom || !hasGeom ? "gid" : "geom";
@@ -634,7 +634,7 @@
            }

            UserEntity ue = tokenService.getCurrentUser(req);
            String guid = dataLibService.downloadDbReq4Wkt(ue, dr);
            String guid = dataLibService.downloadDbReq(ue, dr);

            return success(guid);
        } catch (Exception ex) {

 src/main/java/com/lf/server/service/data/MetaService.java

@@ -197,12 +197,12 @@
        int i = 0, c = list.size();
        while (i < c) {
            String str = list.get(i);
            if (str.contains("bs.m_pipelinepoint")) {
                list.add(str.replace("bs.m_pipelinepoint", "bs.m_pipesegment"));
                list.add(str.replace("bs.m_pipelinepoint", "bs.m_pipeline"));
            if (str.contains("bs.m_pipelinepoint ")) {
                list.add(str.replace("bs.m_pipelinepoint ", "bs.m_pipesegment "));
                list.add(str.replace("bs.m_pipelinepoint ", "bs.m_pipeline "));
            }
            if (str.contains("bs.s_explorationpoint")) {
                list.add(str.replace("bs.s_explorationpoint", "bs.s_surveyworksite"));
            if (str.contains("bs.s_explorationpoint ")) {
                list.add(str.replace("bs.s_explorationpoint ", "bs.s_surveyworksite "));
            }

            i++;

 src/main/java/com/lf/server/service/show/DataLibService.java

@@ -156,16 +156,13 @@
            return null;
        }

        //


        return null;
    }

    /**
     * 查询数据
     */
    private void queryData(DownloadReqEntity dr, Map<String, List<?>> dataMap , Map<String, String> annexMap) {
    private void queryData(DownloadReqEntity dr, Map<String, List<?>> dataMap, Map<String, String> annexMap) {
        for (String enity : dr.getEntities()) {
            try {
                BasicMapper baseMapper = ClassHelper.getBasicMapper(enity);
@@ -174,17 +171,19 @@
                }

                QueryWrapper wrapper = createQueryWrapper(baseMapper, dr);
                List<?> list = baseMapper.selectList(wrapper);
                List list = baseMapper.selectList(wrapper);
                if (null == list || list.size() == 0) {
                    continue;
                }

                // SQL片段
                String sqlSegment = wrapper.getSqlSegment();

                if (!dataMap.containsKey(enity)) {
                    dataMap.put(enity, list);
                } else {
                    dataMap.get(enity).addAll(list);
                }

                // SQL片段
                String sqlSegment = wrapper.getSqlSegment();
            } catch (Exception ex) {
                log.error(ex.getMessage(), ex);
            }
@@ -202,7 +201,8 @@
            wrapper.apply(dirs);
        }
        if (!StringHelper.isEmpty(dr.getDepcode())) {
            wrapper.likeRight("depid", dr.getDepcode());
            //wrapper.likeRight("depid", dr.getDepcode());
            wrapper.apply(String.format("depid like '%s'", StringHelper.getRightLike(dr.getDepcode())));
        }
        if (baseMapper instanceof GeomBaseMapper && !StringHelper.isEmpty(dr.getWkt())) {
            wrapper.select("ST_AsText(geom) as geom, *");
@@ -421,7 +421,7 @@
        removeDuplicate(list);
        setRightLike(list, field);

        return StringHelper.join(list, " or ");
        return "(" + StringHelper.join(list, " or ") + ")";
    }

    /**

 src/main/resources/mapper/data/MetaMapper.xml

@@ -50,7 +50,7 @@
                and depcode like #{depcode}
            </if>
            <if test="dirs != null">
                and (${dirs})
                and ${dirs}
            </if>
            <if test="name != null">
                and upper(name) like #{name}
@@ -70,7 +70,7 @@
                and depcode like #{depcode}
            </if>
            <if test="dirs != null">
                and (${dirs})
                and ${dirs}
            </if>
            <if test="name != null">
                and upper(name) like #{name}