From ce64e667815b39efdc2f8bd52be0d43d49db8d84 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 17 七月 2022 00:06:29 +0800
Subject: [PATCH] 优化小区位置
---
service-report/src/main/java/com/java110/report/cmd/reportCustomComponentFooter/SaveReportCustomComponentFooterCmd.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportCustomComponentFooter/SaveReportCustomComponentFooterCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportCustomComponentFooter/SaveReportCustomComponentFooterCmd.java
index 91f687b..0087188 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportCustomComponentFooter/SaveReportCustomComponentFooterCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportCustomComponentFooter/SaveReportCustomComponentFooterCmd.java
@@ -19,31 +19,33 @@
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
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 com.java110.core.log.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* 绫昏〃杩帮細淇濆瓨
* 鏈嶅姟缂栫爜锛歳eportCustomComponentFooter.saveReportCustomComponentFooter
* 璇锋眰璺姴锛�/app/reportCustomComponentFooter.SaveReportCustomComponentFooter
- * add by 鍚村鏂� at 2021-11-14 01:21:59 mail: 928255095@qq.com
+ * add by 鍚村鏂� at 2021-11-14 01:32:10 mail: 928255095@qq.com
* open source address: https://gitee.com/wuxw7/MicroCommunity
* 瀹樼綉锛歨ttp://www.homecommunity.cn
* 娓╅Θ鎻愮ず锛氬鏋滄偍瀵规鏂囦欢杩涜淇敼 璇蜂笉瑕佸垹闄ゅ師鏈変綔鑰呭強娉ㄩ噴淇℃伅锛岃琛ュ厖鎮ㄧ殑 淇敼鐨勫師鍥犱互鍙婅仈绯婚偖绠卞涓�
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "reportCustomComponentFooter.saveReportCustomComponentFooter")
-public class SaveReportCustomComponentFooterCmd extends AbstractServiceCmdListener {
+public class SaveReportCustomComponentFooterCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(SaveReportCustomComponentFooterCmd.class);
@@ -54,9 +56,8 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "footerId", "璇锋眰鎶ユ枃涓湭鍖呭惈footerId");
-Assert.hasKeyAndValue(reqJson, "componentId", "璇锋眰鎶ユ枃涓湭鍖呭惈componentId");
-Assert.hasKeyAndValue(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
+ Assert.hasKeyAndValue(reqJson, "componentId", "璇锋眰鎶ユ枃涓湭鍖呭惈componentId");
+ Assert.hasKeyAndValue(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
}
@@ -64,8 +65,18 @@
@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);
reportCustomComponentFooterPo.setFooterId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ 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.saveReportCustomComponentFooter(reportCustomComponentFooterPo);
if (flag < 1) {
--
Gitblit v1.8.0