From 5d19f731a7f3b9f55ebe66f6bcc2d1dae8870013 Mon Sep 17 00:00:00 2001
From: 颓废太子 <1098226878@qq.com>
Date: 星期三, 24 十一月 2021 10:26:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/SaveReportCustomComponentCmd.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/SaveReportCustomComponentCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/SaveReportCustomComponentCmd.java
index 55c562e..445d435 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/SaveReportCustomComponentCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/SaveReportCustomComponentCmd.java
@@ -26,7 +26,9 @@
import com.java110.po.reportCustomComponent.ReportCustomComponentPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.Base64Convert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +57,6 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
- Assert.hasKeyAndValue(reqJson, "componentGroup", "璇锋眰鎶ユ枃涓湭鍖呭惈componentGroup");
Assert.hasKeyAndValue(reqJson, "componentType", "璇锋眰鎶ユ枃涓湭鍖呭惈componentType");
Assert.hasKeyAndValue(reqJson, "queryModel", "璇锋眰鎶ユ枃涓湭鍖呭惈queryModel");
@@ -67,6 +68,18 @@
ReportCustomComponentPo reportCustomComponentPo = BeanConvertUtil.covertBean(reqJson, ReportCustomComponentPo.class);
reportCustomComponentPo.setComponentId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ reportCustomComponentPo.setComponentGroup("C");
+ try {
+ if (!StringUtil.isEmpty(reportCustomComponentPo.getComponentSql())) {
+ reportCustomComponentPo.setComponentSql(Base64Convert.byteToBase64(reportCustomComponentPo.getComponentSql().getBytes("UTF-8")));
+ }
+ if (!StringUtil.isEmpty(reportCustomComponentPo.getJavaScript())) {
+ reportCustomComponentPo.setJavaScript(Base64Convert.byteToBase64(reportCustomComponentPo.getJavaScript().getBytes("UTF-8")));
+ }
+ } catch (Exception e) {
+ logger.error("缂栫爜澶辫触", e);
+ }
+
int flag = reportCustomComponentV1InnerServiceSMOImpl.saveReportCustomComponent(reportCustomComponentPo);
if (flag < 1) {
--
Gitblit v1.8.0