1

13693261870

2023-03-27 f8d3c39cbcfc7818d2118e7d1e0a2d5beebfbf9c

1

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

@@ -535,18 +535,17 @@
    })
    @ResponseBody
    @PostMapping(value = "/selectDbOverflowDep")
    public ResponseMsg<Object> selectDbOverflowDep(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
    public ResponseMsg<Object> selectDbOverflowDep(@RequestBody DownloadReqEntity dr, HttpServletRequest req, HttpServletResponse res) {
        try {
            if (null == reqEntity || null == reqEntity.getEntities() || reqEntity.getEntities().isEmpty()) {
            if (null == dr || null == dr.getEntities() || dr.getEntities().isEmpty()) {
                return fail("请选择要下载的实体名");
            }
            reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
            if (StringHelper.isEmpty(reqEntity.getWkt())) {
                return fail("请选择要下载的WKT范围");
            if (!StringHelper.isEmpty(dr.getWkt())) {
                dr.setWkt(AesHelper.decrypt(dr.getWkt()));
            }

            UserEntity ue = tokenService.getCurrentUser(req);
            List<String> list = dataLibService.selectDbOverflowDep(ue, reqEntity.getEntities(), reqEntity.getWkt());
            List<String> list = dataLibService.selectDbOverflowDep(ue, dr);

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

 src/main/java/com/lf/server/controller/show/ApplyController.java

@@ -13,6 +13,7 @@
import com.lf.server.service.show.ApplyService;
import com.lf.server.service.show.FlowService;
import com.lf.server.service.sys.TokenService;
import com.lf.server.service.sys.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -40,6 +41,9 @@

    @Autowired
    TokenService tokenService;

    @Autowired
    UserService userService;

    @SysLog()
    @ApiOperation(value = "插入数据申请")
@@ -219,7 +223,8 @@

            applyEntity = applyService.selectById(applyEntity.getId());
            if (StaticData.TEN == applyEntity.getStatus()) {
                applyService.zipDbData(ue, applyEntity);
                UserEntity user = userService.selectUser(applyEntity.getUserid());
                applyService.zipDbData(user, applyEntity);
            }

            return success(rows);

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.lf.server.entity.all.BaseEntity;
import com.lf.server.entity.ctrl.DownloadReqEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.sys.AttachEntity;
import com.lf.server.entity.sys.UserEntity;
@@ -44,11 +45,22 @@
    /**
     * 查询DB中溢出的单位编码
     */
    public List<String> selectDbOverflowDep(UserEntity ue, List<String> entities, String wkt) {
    public List<String> selectDbOverflowDep(UserEntity ue, DownloadReqEntity dr) {
        if (StringHelper.isEmpty(dr.getWkt())) {
            return selectDbOverflowDep4Wkt(ue, dr.getEntities(), dr.getWkt());
        }

        return selectDbOverflowDep4Prop(ue, dr.getEntities().get(0), dr.getIds(), dr.getFilter());
    }

    /**
     * 查询DB中溢出的单位编码-空间查询
     */
    public List<String> selectDbOverflowDep4Wkt(UserEntity ue, List<String> entities, String wkt) {
        List<String> rs = new ArrayList<>();
        for (String enity : entities) {
        for (String entity : entities) {
            try {
                GeomBaseMapper<?> baseMapper = ClassHelper.getGeoBaseMapper(enity);
                GeomBaseMapper<?> baseMapper = ClassHelper.getGeoBaseMapper(entity);
                if (null == baseMapper) {
                    continue;
                }
@@ -65,7 +77,6 @@
                }

                List<String> ids = baseMapper.selectObjs(wrapper);

                addDepCodes(rs, ids);
            } catch (Exception ex) {
                log.error(ex.getMessage(), ex);
@@ -76,6 +87,34 @@
    }

    /**
     * 查询DB中溢出的单位编码-属性查询
     */
    public List<String> selectDbOverflowDep4Prop(UserEntity ue, String entity, List<Integer> gids, String filter) {
        List<String> rs = new ArrayList<>();
        try {
            BasicMapper<?> baseMapper = ClassHelper.getBasicMapper(entity);
            if (null == baseMapper) {
                return rs;
            }

            QueryWrapper wrapper = new QueryWrapper();
            wrapper.select("depid");
            baseQueryService.addFilterWrapper(wrapper, filter);
            if (null != gids && gids.size() > 0) {
                wrapper.apply(String.format("gid in (%s)", StringHelper.join(gids, ",")));
            }
            wrapper.groupBy("depid");

            List<String> ids = baseMapper.selectObjs(wrapper);
            addDepCodes(rs, ids);
        } catch (Exception ex) {
            log.error(ex.getMessage(), ex);
        }

        return rs;
    }

    /**
     * 添加单位编码
     */
    private void addDepCodes(List<String> rs, List<String> ids) {