1

13693261870

2023-02-09 8efceed6603127342626ac8579ff6077c799813b

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

@@ -22,7 +22,6 @@
import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.data.DownloadService;
import com.lf.server.service.data.UploadService;
import com.lf.server.service.show.DataLibService;
import com.lf.server.service.sys.AttachService;
import com.lf.server.service.sys.DepService;
@@ -423,31 +422,62 @@
    @SysLog()
    @ApiOperation(value = "请求DB数据下载")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "reqEntity", value = "请求下载实体", dataType = "DownloadReqEntity", paramType = "body")
            @ApiImplicitParam(name = "dre", value = "请求下载实体", dataType = "DownloadReqEntity", paramType = "body")
    })
    @ResponseBody
    @PostMapping(value = "/downloadDbReq")
    public ResponseMsg<Object> downloadDbReq(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
    public ResponseMsg<Object> downloadDbReq(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
        try {
            if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
            if (null == dre || StringHelper.isEmpty(dre.getPwd())) {
                return fail("密码不能为空");
            }
            if (null == reqEntity.getEntities() || reqEntity.getEntities().isEmpty()) {
            if (null == dre.getEntities() || dre.getEntities().isEmpty()) {
                return fail("请选择要下载的实体名");
            }
            reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
            if (StringHelper.isEmpty(reqEntity.getWkt())) {
            dre.setWkt(AesHelper.decrypt(dre.getWkt()));
            if (StringHelper.isEmpty(dre.getWkt())) {
                return fail("请选择要下载的WKT范围");
            }
            if (!DownloadService.decryptPwd(reqEntity)) {
            if (!DownloadService.decryptPwd(dre)) {
                return fail("密码解密失败", null);
            }
            if (StringHelper.isPwdInvalid(reqEntity.getPwd())) {
            if (StringHelper.isPwdInvalid(dre.getPwd())) {
                return fail("密码不符合要求");
            }

            UserEntity ue = tokenService.getCurrentUser(req);
            String guid = dataLibService.createZipFile(ue, reqEntity.getEntities(), reqEntity.getWkt(), reqEntity.getPwd());
            String guid = dataLibService.createZipFile(ue, dre.getEntities(), dre.getWkt(), dre.getPwd());

            return success(guid);
        } catch (Exception ex) {
            return fail(ex.getMessage(), null);
        }
    }

    @SysLog()
    @ApiOperation(value = "请求实体数据下载")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "dre", value = "请求下载实体", dataType = "DownloadReqEntity", paramType = "body")
    })
    @ResponseBody
    @PostMapping(value = "/downloadEntityReq")
    public ResponseMsg<Object> downloadEntityReq(@RequestBody DownloadReqEntity dre, HttpServletRequest req, HttpServletResponse res) {
        try {
            if (null == dre || StringHelper.isEmpty(dre.getPwd())) {
                return fail("密码不能为空");
            }
            if (null == dre.getEntities() || dre.getEntities().isEmpty()) {
                return fail("请选择要下载的实体名");
            }
            if (!DownloadService.decryptPwd(dre)) {
                return fail("密码解密失败", null);
            }
            if (StringHelper.isPwdInvalid(dre.getPwd())) {
                return fail("密码不符合要求");
            }

            UserEntity ue = tokenService.getCurrentUser(req);
            String guid = dataLibService.zipDbData(ue, dre.getEntities().get(0), dre.getFilter(), dre.getPwd());

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