From ed5b338a4ef3e95db7354ad3f3d65f8752b5915c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 05 Jul 2022 16:15:32 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/configurations/properties/CmsProperties.java | 18 ++++++++++++++++++
src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsTemplateService.java | 3 +++
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java | 11 +++++++++++
src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsTemplateController.java | 6 ++++++
src/main/resources/application-test.yml | 6 ++++++
src/main/java/com/xcong/farmer/cms/configurations/CmsConfig.java | 8 +++++++-
src/main/resources/application.yml | 6 ++++++
7 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/configurations/CmsConfig.java b/src/main/java/com/xcong/farmer/cms/configurations/CmsConfig.java
index 10f3e34..1e7697f 100644
--- a/src/main/java/com/xcong/farmer/cms/configurations/CmsConfig.java
+++ b/src/main/java/com/xcong/farmer/cms/configurations/CmsConfig.java
@@ -1,8 +1,11 @@
package com.xcong.farmer.cms.configurations;
+import com.xcong.farmer.cms.configurations.properties.CmsProperties;
import com.xcong.farmer.cms.core.template.TemplateConfiguration;
import com.xcong.farmer.cms.core.template.TemplateLoader;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -14,10 +17,13 @@
@Configuration
public class CmsConfig {
+ @Autowired
+ private CmsProperties cmsProperties;
+
@Bean
public TemplateConfiguration templateConfiguration() {
log.info("CMS管理系统");
- TemplateConfiguration cfg = new TemplateConfiguration("/Users/helius/Desktop/template", "", "/Users/helius/Desktop/web/output");
+ TemplateConfiguration cfg = new TemplateConfiguration(cmsProperties.getTemplatePath(), cmsProperties.getStaticPath(), cmsProperties.getOutputPath());
TemplateLoader loader = new TemplateLoader(cfg);
cfg.templateLoader(loader);
return cfg;
diff --git a/src/main/java/com/xcong/farmer/cms/configurations/properties/CmsProperties.java b/src/main/java/com/xcong/farmer/cms/configurations/properties/CmsProperties.java
new file mode 100644
index 0000000..3a75d7d
--- /dev/null
+++ b/src/main/java/com/xcong/farmer/cms/configurations/properties/CmsProperties.java
@@ -0,0 +1,18 @@
+package com.xcong.farmer.cms.configurations.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "cms.file")
+public class CmsProperties {
+
+ private String templatePath;
+
+ private String staticPath;
+
+ private String outputPath;
+
+}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsTemplateController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsTemplateController.java
index c372d83..f31f248 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsTemplateController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsTemplateController.java
@@ -44,4 +44,10 @@
cmsTemplateService.delete(id);
return Result.ok("删除成功");
}
+
+ @ApiOperation(value = "模板下拉列表", notes = "模板下拉列表接口")
+ @GetMapping(value = "/dropdownList")
+ public Result dropdownList() {
+ return Result.ok(cmsTemplateService.dropdownList());
+ }
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsTemplateService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsTemplateService.java
index 9633445..ebe9aaa 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsTemplateService.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsTemplateService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.modules.system.dto.TemplateListDto;
import com.xcong.farmer.cms.modules.system.entity.CmsTemplateEntity;
import org.springframework.web.multipart.MultipartFile;
@@ -14,4 +15,6 @@
IPage<CmsTemplateEntity> findInPage(TemplateListDto templateListDto);
void delete(Long id);
+
+ Result dropdownList();
}
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 807d28e..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
@@ -8,11 +8,13 @@
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;
@@ -139,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);
+ }
}
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 31d19f5..efdc99a 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -92,3 +92,9 @@
url: http://120.27.238.55:8000/uploadeFile/image/
path: /home/javaweb/webresource/uploadeFile/image/
+cms:
+ file:
+ template-path: /Users/helius/Desktop/template
+ static-path:
+ output-path: /Users/helius/Desktop/web/output
+
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cc017af..45e7f31 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -96,3 +96,9 @@
url: http://192.168.0.11:8878/image/
path: /image/
+cms:
+ file:
+ template-path: /Users/helius/Desktop/template
+ static-path:
+ output-path: /Users/helius/Desktop/web/output
+
--
Gitblit v1.9.1