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/reportCustomComponentFooter/UpdateReportCustomComponentFooterCmd.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportCustomComponentFooter/UpdateReportCustomComponentFooterCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportCustomComponentFooter/UpdateReportCustomComponentFooterCmd.java
index 646156c..ef928d4 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportCustomComponentFooter/UpdateReportCustomComponentFooterCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportCustomComponentFooter/UpdateReportCustomComponentFooterCmd.java
@@ -21,16 +21,17 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
import com.java110.intf.report.IReportCustomComponentFooterV1InnerServiceSMO;
import com.java110.po.reportCustomComponentFooter.ReportCustomComponentFooterPo;
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.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -46,7 +47,7 @@
@Java110Cmd(serviceCode = "reportCustomComponentFooter.updateReportCustomComponentFooter")
public class UpdateReportCustomComponentFooterCmd extends AbstractServiceCmdListener {
- private static Logger logger = LoggerFactory.getLogger(UpdateReportCustomComponentFooterCmd.class);
+ private static Logger logger = LoggerFactory.getLogger(UpdateReportCustomComponentFooterCmd.class);
@Autowired
@@ -55,7 +56,7 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "footerId", "footerId涓嶈兘涓虹┖");
-Assert.hasKeyAndValue(reqJson, "footerId", "footerId涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "footerId", "footerId涓嶈兘涓虹┖");
}
@@ -63,7 +64,17 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- ReportCustomComponentFooterPo reportCustomComponentFooterPo = BeanConvertUtil.covertBean(reqJson, ReportCustomComponentFooterPo.class);
+ ReportCustomComponentFooterPo reportCustomComponentFooterPo = BeanConvertUtil.covertBean(reqJson, ReportCustomComponentFooterPo.class);
+ try {
+ if (!StringUtil.isEmpty(reportCustomComponentFooterPo.getComponentSql())) {
+ reportCustomComponentFooterPo.setComponentSql(Base64Convert.byteToBase64(reportCustomComponentFooterPo.getComponentSql().getBytes("UTF-8")));
+ }
+ if (!StringUtil.isEmpty(reportCustomComponentFooterPo.getJavaScript())) {
+ reportCustomComponentFooterPo.setJavaScript(Base64Convert.byteToBase64(reportCustomComponentFooterPo.getJavaScript().getBytes("UTF-8")));
+ }
+ } catch (Exception e) {
+ logger.error("缂栫爜澶辫触", e);
+ }
int flag = reportCustomComponentFooterV1InnerServiceSMOImpl.updateReportCustomComponentFooter(reportCustomComponentFooterPo);
if (flag < 1) {
--
Gitblit v1.8.0