1

13693261870

2022-12-19 552da0d21c1203d5ac8ae6e3c82f4989b8845679

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

@@ -15,10 +15,7 @@
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.ClassHelper;
import com.lf.server.helper.Md5Helper;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
import com.lf.server.helper.*;
import com.lf.server.mapper.all.BasicMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.data.DownloadService;
@@ -283,8 +280,12 @@
            if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
                return fail("密码不能为空");
            }
            if (null == reqEntity.getIds() || reqEntity.getIds().isEmpty()) {
                return fail("请选择要下载的文件");
            if (null == reqEntity.getEntities() || reqEntity.getEntities().isEmpty()) {
                return fail("请选择要下载的实体名");
            }
            reqEntity.setWkt(AesHelper.decrypt(reqEntity.getWkt()));
            if (StringHelper.isEmpty(reqEntity.getWkt())) {
                return fail("请选择要下载的WKT范围");
            }
            if (!downloadService.decryptPwd(reqEntity)) {
                return fail("密码解密失败", null);
@@ -293,13 +294,8 @@
                return fail("密码不符合要求");
            }

            List<MetaFileEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
            if (null == list || list.isEmpty()) {
                return fail("没有找到元数据");
            }

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

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