From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/SaveReportCustomComponentCmd.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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..f07bcdc 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
@@ -19,17 +19,19 @@
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.IReportCustomComponentV1InnerServiceSMO;
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;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -43,7 +45,7 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "reportCustomComponent.saveReportCustomComponent")
-public class SaveReportCustomComponentCmd extends AbstractServiceCmdListener {
+public class SaveReportCustomComponentCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(SaveReportCustomComponentCmd.class);
@@ -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