From cee43c11fe6772305e19e7ddee1e8276060046d6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 05 Jul 2022 16:15:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 1110bfb..2d41c7d 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,17 +1,20 @@
package com.xcong.farmer.cms.modules.system.service.Impl;
import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.core.template.TemplateConfiguration;
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;
@@ -82,7 +85,6 @@
Document parse = Jsoup.parse(templateFile, null);
String attr = parse.head().attr("name");
- System.out.println(attr);
CmsTemplateEntity cmsTemplate = new CmsTemplateEntity();
cmsTemplate.setCompanyId(10L);
if (name.endsWith(".list.html")) {
@@ -92,14 +94,32 @@
} else {
cmsTemplate.setType(1);
}
- cmsTemplate.setName(templateFile.getName());
+ cmsTemplate.setName(StrUtil.isNotBlank(attr) ? attr : templateFile.getName());
cmsTemplate.setPath(templateFile.getName());
+
+ this.baseMapper.insert(cmsTemplate);
}
}
if (".html".equals(suffix)) {
FileUtil.touch(file);
+
+ Document parse = Jsoup.parse(file, null);
+ String attr = parse.head().attr("name");
+ CmsTemplateEntity cmsTemplate = new CmsTemplateEntity();
+ cmsTemplate.setCompanyId(LoginUserUtil.getCompanyId());
+ if (file.getName().endsWith(".list.html")) {
+ cmsTemplate.setType(2);
+ } else if (file.getName().endsWith(".article.html")) {
+ cmsTemplate.setType(3);
+ } else {
+ cmsTemplate.setType(1);
+ }
+ cmsTemplate.setName(StrUtil.isNotBlank(attr) ? attr : file.getName());
+ cmsTemplate.setPath(file.getName());
+
+ this.baseMapper.insert(cmsTemplate);
}
} catch (IOException e) {
e.printStackTrace();
@@ -121,4 +141,13 @@
Long companyId = LoginUserUtil.getCompanyId();
this.baseMapper.delete(id, companyId);
}
+
+ @Override
+ public Result dropdownList() {
+ Long companyId = LoginUserUtil.getCompanyId();
+ QueryWrapper<CmsTemplateEntity> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("company_id",companyId);
+ List<CmsTemplateEntity> cmsTemplateEntities = this.baseMapper.selectList(objectQueryWrapper);
+ return Result.ok(cmsTemplateEntities);
+ }
}
--
Gitblit v1.9.1