Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码调整

Browse Source
This commit is contained in:
hongawen
2023-04-18 10:38:26 +08:00
parent 7a906d8088
commit 700ddb2a87
18 changed files with 911 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
View File

@@ -134,6 +134,8 @@ public class ReportServiceImpl implements ReportService {
private final MonitorClient monitorClient;
private final EventDetailService eventDetailService;
private final FreemarkerUtil freemarkerUtil;
public List<EventDetail> getED(DeviceInfoParam.BusinessParam businessParam) {
List<EventDetail> info = new ArrayList<>();
List<GeneralDeviceDTO> deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(businessParam).getData();
@@ -1643,7 +1645,7 @@ public class ReportServiceImpl implements ReportService {
public String getStr(String barName, Map<String, Object> map) throws TemplateException, IOException {
String s = FreemarkerUtil.generateString(barName, "com/njcn/event/template", map);
String s = freemarkerUtil.generateString(barName, "com/njcn/event/template", map);
return EchartsUtil.generateEchartsBase64(s, "8910");
}

10
pqs-event/event-boot/src/main/java/com/njcn/event/utils/FreemarkerUtil.java
View File

@@ -3,6 +3,9 @@ package com.njcn.event.utils;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
import java.io.File;
import java.io.IOException;
@@ -14,10 +17,13 @@ import java.util.Map;
* @version 1.0.0
* @date 2022年08月23日 19:32
*/
@Component
public class FreemarkerUtil {
@Autowired
FreeMarkerConfigurer freeMarkerConfigurer;
private static String path = FreemarkerUtil.class.getClassLoader().getResource("").getPath();
public static String generateString(String templateFileName, String templateDirectory, Map<String, Object> datas)
public String generateString(String templateFileName, String templateDirectory, Map<String, Object> datas)
throws IOException, TemplateException {
Configuration configuration = new Configuration(Configuration.VERSION_2_3_0);
// 设置默认编码
@@ -30,7 +36,7 @@ public class FreemarkerUtil {
configuration.setDirectoryForTemplateLoading(new File(path + templateDirectory));
// 生成模板对象
Template template = configuration.getTemplate(templateFileName);
Template template = freeMarkerConfigurer.getConfiguration().getTemplate(templateFileName);
// 将datas写入模板并返回
try (StringWriter stringWriter = new StringWriter()) {

4
pqs-event/event-boot/src/main/java/com/njcn/event/utils/TestTemplate.java
View File

@@ -38,8 +38,8 @@ public class TestTemplate {
}
map.put("point",JSONArray.fromObject(floatData).toString());
String s = FreemarkerUtil.generateString("bar.ftl", "com/njcn/event/template", map);
System.out.println(EchartsUtil.generateEchartsBase64(s,"8910"));
// String s = freemarkerUtil.generateString("bar.ftl", "com/njcn/event/template", map);
// System.out.println(EchartsUtil.generateEchartsBase64(s,"8910"));