1

13693261870

2023-04-11 d43fe8e4c939edf7810681aad17fa1deeef1b0b6

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

@@ -10,7 +10,7 @@
import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.mapper.data.DownloadMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.data.DownloadService;
import com.lf.server.service.data.MetaService;
import net.lingala.zip4j.ZipFile;
import net.lingala.zip4j.model.ZipParameters;
import org.apache.commons.logging.Log;
@@ -31,10 +31,10 @@
    PathHelper pathHelper;

    @Autowired
    DownloadMapper downloadMapper;
    MetaService metaService;

    @Autowired
    DownloadService downloadService;
    DownloadMapper downloadMapper;

    @Autowired
    BaseQueryService baseQueryService;
@@ -128,7 +128,6 @@
        }

        for (String id : ids) {
            // || "00".equals(id)
            if (StringHelper.isEmpty(id)) {
                continue;
            }
@@ -164,7 +163,7 @@
        ZipParameters params = Zip4jHelper.getZipParams(true);
        zip.addFolder(new File(gdbPath), params);
        // zip.addFolder(new File(annexPath), params)
        downloadService.addAnnex(zip, params, annexMap);
        metaService.addAnnex(zip, params, annexMap);

        String dbPwd = Md5Helper.reverse(Md5Helper.generate(dr.getPwd()));
        DownloadEntity de = getDownloadEntity(ue, zipFile, dbPwd);
@@ -185,7 +184,7 @@
                }

                QueryWrapper wrapper = createQueryWrapper(baseMapper, dr);
                downloadService.addData(entity, baseMapper, wrapper, dataMap, annexMap);
                metaService.addData(entity, baseMapper, wrapper, dataMap, annexMap);
            } catch (Exception ex) {
                log.error(ex.getMessage(), ex);
            }