From 62a304eb5c68fc7f54a9bc247e76223cc2c7f243 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Dec 2022 11:05:30 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
index 3c373b2..df4c3b5 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
@@ -31,6 +31,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -89,6 +90,7 @@
return;
}
+ FileUtil.touch(new File(staticPath + "/empty.txt"));
for (File templateFile : files) {
if (!templateFile.isFile()) {
FileUtil.move(templateFile, new File(staticPath), true);
@@ -180,7 +182,7 @@
public Result dropdownList() {
Long companyId = LoginUserUtil.getCompanyId();
QueryWrapper<CmsTemplateEntity> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("company_id",companyId);
+ objectQueryWrapper.eq("company_id", companyId);
List<CmsTemplateEntity> cmsTemplateEntities = this.baseMapper.selectList(objectQueryWrapper);
return Result.ok(cmsTemplateEntities);
}
@@ -217,15 +219,14 @@
Long id = adminSaveTemplateInfoDto.getId();
CompanyEntity company = this.companyMapper.selectById(companyId);
- CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectByIdAndCompanyId(id,companyId);
+ CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectByIdAndCompanyId(id, companyId);
String name = cmsTemplateEntity.getName();
Integer type = cmsTemplateEntity.getType();
- String templatePath = cmsProperties.getTemplatePath();
+ String templatePath = FileUtils.path(cmsProperties.getTemplatePath(), company.getCode());
String path = cmsTemplateEntity.getPath();
- this.baseMapper.delete(id,companyId);
+ this.baseMapper.delete(id, companyId);
String pathNew = FileUtils.path(templatePath, path);
- pathNew = pathNew + "/" + company.getCode();
log.info("模板写入地址:{}", pathNew);
File file = new File(pathNew);
FileUtil.touch(file);
@@ -244,4 +245,18 @@
return Result.ok("保存成功");
}
+ @Override
+ public Result downloadTemplate() {
+ Long companyId = LoginUserUtil.getCompanyId();
+ CompanyEntity company = this.companyMapper.selectById(companyId);
+
+ String templatePath = FileUtils.path(cmsProperties.getTemplatePath(), company.getCode());
+ String staticPath = FileUtils.path(cmsProperties.getStaticPath(), company.getCode());
+ String downloadPath = FileUtils.path(cmsProperties.getDownloadPath(), company.getCode());
+
+ String fileName = "template.zip";
+ ZipUtil.zip(FileUtil.file(downloadPath + "/template.zip"), true, FileUtil.file(templatePath), FileUtil.file(staticPath));
+ String url = cmsProperties.getStaticUrl() + "download/" + company.getCode();
+ return Result.ok("success", url +"/" + fileName);
+ }
}
--
Gitblit v1.9.1