From ab9066e00429cec617724a943da45d91cb812835 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 08 Jul 2022 16:36:06 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 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 0af5786..5c20554 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
@@ -1,7 +1,7 @@
package com.xcong.farmer.cms.modules.system.service.Impl;
import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.io.file.FileWriter;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,12 +11,10 @@
import com.xcong.farmer.cms.common.exception.GlobalException;
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.common.utils.FileUtils;
-import com.xcong.farmer.cms.configurations.GlobalExceptionHandler;
import com.xcong.farmer.cms.configurations.properties.CmsProperties;
-import com.xcong.farmer.cms.core.template.TemplateConfiguration;
+import com.xcong.farmer.cms.modules.system.dto.AdminSaveTemplateInfoDto;
import com.xcong.farmer.cms.modules.system.dto.TemplateListDto;
import com.xcong.farmer.cms.modules.system.entity.CmsTemplateEntity;
-import com.xcong.farmer.cms.modules.system.entity.UserEntity;
import com.xcong.farmer.cms.modules.system.mapper.CmsTemplateMapper;
import com.xcong.farmer.cms.modules.system.service.ICmsTemplateService;
import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
@@ -24,16 +22,14 @@
import org.jsoup.nodes.Document;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -79,7 +75,7 @@
for (File templateFile : files) {
if (!templateFile.isFile()) {
- FileUtil.move(templateFile, new File(FileUtils.path(staticPath, templateFile.getName())), true);
+ FileUtil.move(templateFile, new File(staticPath), true);
continue;
}
@@ -165,6 +161,7 @@
@Override
public Result viewTemplateInfo(Long id) {
+ Result result = new Result();
CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectById(id);
String templatePath = cmsProperties.getTemplatePath();
String pathName = FileUtils.path(templatePath, cmsTemplateEntity.getPath());
@@ -174,11 +171,42 @@
bytes = Files.readAllBytes(Paths.get(pathName));
} catch (IOException e) {
e.printStackTrace();
- return Result.ok("未找到模板");
+ return result.fail("未找到模板");
}
String content = new String(bytes, StandardCharsets.UTF_8);
- return Result.ok(content );
+ result.setData(content);
+ return result;
+ }
+
+ @Override
+ @Transactional
+ public Result saveTemplateInfo(AdminSaveTemplateInfoDto adminSaveTemplateInfoDto) {
+ Long companyId = LoginUserUtil.getCompanyId();
+ Long id = adminSaveTemplateInfoDto.getId();
+ CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectByIdAndCompanyId(id,companyId);
+ String name = cmsTemplateEntity.getName();
+ Integer type = cmsTemplateEntity.getType();
+ String templatePath = cmsProperties.getTemplatePath();
+ String path = cmsTemplateEntity.getPath();
+
+ this.baseMapper.delete(id,companyId);
+ String pathNew = FileUtils.path(templatePath, path);
+ File file = new File(pathNew);
+ FileUtil.touch(file);
+
+ //文件写入，直接覆盖
+ FileWriter writer = new FileWriter(file);
+ writer.write(adminSaveTemplateInfoDto.getTemplateInfo(), false);
+
+ CmsTemplateEntity cmsTemplate = new CmsTemplateEntity();
+ cmsTemplate.setCompanyId(companyId);
+ cmsTemplate.setType(type);
+ cmsTemplate.setName(name);
+ cmsTemplate.setPath(path);
+ this.baseMapper.insert(cmsTemplate);
+
+ return Result.ok("保存成功");
}
}
--
Gitblit v1.9.1