优化代码

java110-bean/src/main/java/com/java110/dto/reportCustomComponentFooter/ReportCustomComponentFooterDto.java

@@ -0,0 +1,90 @@
+package com.java110.dto.reportCustomComponentFooter;
+
+import com.java110.dto.PageDto;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 底部统计数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class ReportCustomComponentFooterDto extends PageDto implements Serializable {
+
+    private String footerId;
+private String componentId;
+private String javaScript;
+private String name;
+private String remark;
+private String queryModel;
+private String componentSql;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getFooterId() {
+        return footerId;
+    }
+public void setFooterId(String footerId) {
+        this.footerId = footerId;
+    }
+public String getComponentId() {
+        return componentId;
+    }
+public void setComponentId(String componentId) {
+        this.componentId = componentId;
+    }
+public String getJavaScript() {
+        return javaScript;
+    }
+public void setJavaScript(String javaScript) {
+        this.javaScript = javaScript;
+    }
+public String getName() {
+        return name;
+    }
+public void setName(String name) {
+        this.name = name;
+    }
+public String getRemark() {
+        return remark;
+    }
+public void setRemark(String remark) {
+        this.remark = remark;
+    }
+public String getQueryModel() {
+        return queryModel;
+    }
+public void setQueryModel(String queryModel) {
+        this.queryModel = queryModel;
+    }
+public String getComponentSql() {
+        return componentSql;
+    }
+public void setComponentSql(String componentSql) {
+        this.componentSql = componentSql;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

java110-bean/src/main/java/com/java110/po/reportCustomComponentFooter/ReportCustomComponentFooterPo.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.po.reportCustomComponentFooter;
+
+import java.io.Serializable;
+import java.util.Date;
+/**
+ * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
+ * add by 吴学文 at 2021-11-14 01:32:10 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+public class ReportCustomComponentFooterPo implements Serializable {
+
+    private String footerId;
+private String componentId;
+private String javaScript;
+private String name;
+private String remark;
+private String statusCd = "0";
+private String queryModel;
+private String componentSql;
+public String getFooterId() {
+        return footerId;
+    }
+public void setFooterId(String footerId) {
+        this.footerId = footerId;
+    }
+public String getComponentId() {
+        return componentId;
+    }
+public void setComponentId(String componentId) {
+        this.componentId = componentId;
+    }
+public String getJavaScript() {
+        return javaScript;
+    }
+public void setJavaScript(String javaScript) {
+        this.javaScript = javaScript;
+    }
+public String getName() {
+        return name;
+    }
+public void setName(String name) {
+        this.name = name;
+    }
+public String getRemark() {
+        return remark;
+    }
+public void setRemark(String remark) {
+        this.remark = remark;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getQueryModel() {
+        return queryModel;
+    }
+public void setQueryModel(String queryModel) {
+        this.queryModel = queryModel;
+    }
+public String getComponentSql() {
+        return componentSql;
+    }
+public void setComponentSql(String componentSql) {
+        this.componentSql = componentSql;
+    }
+
+
+
+}

java110-generator/src/main/java/com/java110/code/TableToJsonWeb.java

@@ -7,20 +7,22 @@ import com.java110.utils.util.StringUtil;
 public class TableToJsonWeb {
 
     //show create table c_orders  用这个语句获取
-    public static final String createTableSql = "CREATE TABLE `report_custom_component_rel` (\n" +
-            "  `rel_id` varchar(30) NOT NULL COMMENT '关系编号',\n" +
+    public static final String createTableSql = "CREATE TABLE `report_custom_component_footer` (\n" +
+            "  `footer_id` varchar(30) NOT NULL COMMENT '报表底部同步ID',\n" +
             "  `component_id` varchar(30) NOT NULL COMMENT '组件ID',\n" +
-            "  `custom_id` varchar(30) NOT NULL COMMENT '报表编号',\n" +
-            "  `seq` int(11) NOT NULL COMMENT '组件序号',\n" +
-            "  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n" +
+            "  `name` varchar(64) NOT NULL COMMENT '名称',\n" +
+            "  `query_model` varchar(1) NOT NULL COMMENT '查询方式 1、sql,2、java',\n" +
+            "  `java_script` longtext(1024) COMMENT '执行java脚本代码',\n" +
+            "  `component_sql` longtext(1024) COMMENT '执行sql',\n" +
+            "  `remark` varchar(512) DEFAULT NULL COMMENT '描述'\n" +
             ")";
     public static void main(String[] args) {
-        String templateName = "报表组件"; //业务名称
-        String templateCode = "reportCustomComponentRel"; //表名大写
-        String templateKey = "relId"; //表主键
-        String templateKeyName = "关系编号";//主键说明
-        String searchCode = "relId"; //分片字段
-        String searchName = "关系编号"; //分片字段说明
+        String templateName = "组件统计"; //业务名称
+        String templateCode = "reportCustomComponentFooter"; //表名大写
+        String templateKey = "footerId"; //表主键
+        String templateKeyName = "统计ID";//主键说明
+        String searchCode = "footerId"; //分片字段
+        String searchName = "统计ID"; //分片字段说明
         String directories = "dev"; //前端生成到那个目录下
         // templateName 业务名称 业务编码名称生成后文件名 templateCode 主键 templateKey
         // 业务主键名称 templateKeyName=templateName+ID 主机驼峰 searchCode 主键名称 searchName

java110-generator/src/main/java/com/java110/code/newBack/BackCoderGeneratorStart.java

@@ -70,7 +70,7 @@ public class BackCoderGeneratorStart extends BaseGenerator {
         generatorInnerServiceSMOImpl.generator(data);
 
         GeneratorDtoBean generatorDtoBean = new GeneratorDtoBean();
-        //generatorDtoBean.generator(data);
+        generatorDtoBean.generator(data);
 
         GeneratorIInnerServiceSMO generatorIInnerServiceSMO = new GeneratorIInnerServiceSMO();
         generatorIInnerServiceSMO.generator(data);

java110-generator/src/main/java/com/java110/code/newBack/GeneratorApiListener.java

@@ -14,7 +14,7 @@ public class GeneratorApiListener extends BaseGenerator {
      * @param data
      */
     public void generator(Data data) throws Exception {
-        //genneratorPo(data);             //API DataVo对象
+        genneratorPo(data);             //API DataVo对象
         genneratorSaveCmd(data);            //Api BmoImpl
         genneratorUpdateBmoImpl(data);            //Api BmoImpl
         genneratorDeleteBmoImpl(data);            //Api BmoImpl

java110-generator/src/main/resources/web/template_1.json

@@ -1,6 +1,6 @@
 {
-  "templateKeyName": "关系编号",
-  "templateName": "报表组件",
+  "templateKeyName": "统计ID",
+  "templateName": "组件统计",
   "columns": [
     {
       "hasDefaultValue": false,
@@ -16,46 +16,88 @@
     },
     {
       "hasDefaultValue": false,
-      "limitParam": "30",
-      "code": "customId",
-      "limitErrInfo": "报表编号不能超过30",
-      "cnCode": "报表编号",
+      "limitParam": "64",
+      "code": "name",
+      "limitErrInfo": "名称不能超过64",
+      "cnCode": "名称",
       "limit": "maxLength",
       "show": true,
       "inputType": "input",
       "required": true,
-      "desc": "必填，报表编号"
+      "desc": "必填，名称"
     },
     {
       "hasDefaultValue": false,
-      "limitParam": "11",
-      "code": "seq",
-      "limitErrInfo": "组件序号不能超过11",
-      "cnCode": "组件序号",
+      "limitParam": "1",
+      "code": "queryModel",
+      "limitErrInfo": "查询方式不能超过1",
+      "cnCode": "查询方式",
       "limit": "maxLength",
       "show": true,
       "inputType": "input",
       "required": true,
-      "desc": "必填，组件序号"
+      "desc": "必填，查询方式"
+    },
+    {
+      "hasDefaultValue": false,
+      "limitParam": "1024",
+      "code": "javaScript",
+      "limitErrInfo": "执行java脚本代码不能超过1024",
+      "cnCode": "执行java脚本代码",
+      "limit": "maxLength",
+      "show": false,
+      "inputType": "input",
+      "required": false,
+      "desc": "执行java脚本代码"
+    },
+    {
+      "hasDefaultValue": false,
+      "limitParam": "1024",
+      "code": "componentSql",
+      "limitErrInfo": "执行sql不能超过1024",
+      "cnCode": "执行sql",
+      "limit": "maxLength",
+      "show": false,
+      "inputType": "input",
+      "required": false,
+      "desc": "执行sql"
+    },
+    {
+      "hasDefaultValue": false,
+      "limitParam": "512",
+      "code": "remark",
+      "limitErrInfo": "描述'不能超过512",
+      "cnCode": "描述'",
+      "limit": "maxLength",
+      "show": true,
+      "inputType": "input",
+      "required": false,
+      "desc": "描述'"
     }
   ],
-  "searchName": "关系编号",
+  "searchName": "统计ID",
   "directories": "dev",
-  "searchCode": "relId",
-  "templateCode": "reportCustomComponentRel",
+  "searchCode": "footerId",
+  "templateCode": "reportCustomComponentFooter",
   "conditions": [
     {
       "whereCondition": "equal",
-      "code": "relId",
-      "name": "关系编号",
+      "code": "componentId",
+      "name": "组件ID",
+      "inputType": "input"
+    },
+    {
+      "whereCondition": "equal",
+      "code": "name",
+      "name": "名称",
       "inputType": "input"
     },
     {
       "whereCondition": "equal",
-      "code": "componentId",
-      "name": "组件ID",
+      "code": "queryModel",
+      "name": "查询方式",
       "inputType": "input"
     }
   ],
-  "templateKey": "relId"
+  "templateKey": "footerId"
 }

java110-interface/src/main/java/com/java110/intf/report/IReportCustomComponentFooterV1InnerServiceSMO.java

@@ -27,7 +27,7 @@ import java.util.List;
 
 /**
  * 类表述： 服务之前调用的接口类，不对外提供接口能力 只用于接口建调用
- * 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
  * 官网：http://www.homecommunity.cn
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下

service-report/src/main/java/com/java110/report/cmd/reportCustomComponentFooter/DeleteReportCustomComponentFooterCmd.java

@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  * 类表述：删除
  * 服务编码：reportCustomComponentFooter.deleteReportCustomComponentFooter
  * 请求路劲：/app/reportCustomComponentFooter.DeleteReportCustomComponentFooter
- * 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
  * 官网：http://www.homecommunity.cn
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下

service-report/src/main/java/com/java110/report/cmd/reportCustomComponentFooter/ListReportCustomComponentFooterCmd.java

@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
  * 类表述：查询
  * 服务编码：reportCustomComponentFooter.listReportCustomComponentFooter
  * 请求路劲：/app/reportCustomComponentFooter.ListReportCustomComponentFooter
- * 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
  * 官网：http://www.homecommunity.cn
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下

service-report/src/main/java/com/java110/report/cmd/reportCustomComponentFooter/SaveReportCustomComponentFooterCmd.java

@@ -26,17 +26,19 @@ 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;
 
 /**
  * 类表述：保存
  * 服务编码：reportCustomComponentFooter.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
  * 官网：http://www.homecommunity.cn
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
@@ -54,9 +56,8 @@ public class SaveReportCustomComponentFooterCmd extends AbstractServiceCmdListen
 
     @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 @@ Assert.hasKeyAndValue(reqJson, "name", "请求报文中未包含name");
     @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) {

service-report/src/main/java/com/java110/report/cmd/reportCustomComponentFooter/UpdateReportCustomComponentFooterCmd.java

@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
  * 类表述：更新
  * 服务编码：reportCustomComponentFooter.updateReportCustomComponentFooter
  * 请求路劲：/app/reportCustomComponentFooter.UpdateReportCustomComponentFooter
- * 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
  * 官网：http://www.homecommunity.cn
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下

service-report/src/main/java/com/java110/report/dao/IReportCustomComponentFooterV1ServiceDao.java

@@ -28,7 +28,7 @@ import java.util.Map;
 
 /**
  * 类表述：
- * 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
  * 官网：http://www.homecommunity.cn
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下

service-report/src/main/java/com/java110/report/dao/impl/ReportCustomComponentFooterV1ServiceDaoImpl.java

@@ -31,7 +31,7 @@ import java.util.Map;
 
 /**
  * 类表述：
- * 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
  * 官网：http://www.homecommunity.cn
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下

service-report/src/main/java/com/java110/report/smo/impl/ReportCustomComponentFooterV1InnerServiceSMOImpl.java

@@ -16,24 +16,24 @@
 package com.java110.report.smo.impl;
 
 
-import com.java110.report.dao.IReportCustomComponentFooterV1ServiceDao;
-import com.java110.intf.report.IReportCustomComponentFooterV1InnerServiceSMO;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
 import com.java110.dto.reportCustomComponentFooter.ReportCustomComponentFooterDto;
+import com.java110.intf.report.IReportCustomComponentFooterV1InnerServiceSMO;
 import com.java110.po.reportCustomComponentFooter.ReportCustomComponentFooterPo;
+import com.java110.report.dao.IReportCustomComponentFooterV1ServiceDao;
+import com.java110.utils.util.Base64Convert;
 import com.java110.utils.util.BeanConvertUtil;
-import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
-import com.java110.dto.PageDto;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 类表述： 服务之前调用的接口实现类，不对外提供接口能力 只用于接口建调用
- * 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
  * 官网：http://www.homecommunity.cn
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
@@ -47,26 +47,26 @@ public class ReportCustomComponentFooterV1InnerServiceSMOImpl extends BaseServic
 
 
     @Override
-    public int saveReportCustomComponentFooter(@RequestBody  ReportCustomComponentFooterPo reportCustomComponentFooterPo) {
+    public int saveReportCustomComponentFooter(@RequestBody ReportCustomComponentFooterPo reportCustomComponentFooterPo) {
         int saveFlag = reportCustomComponentFooterV1ServiceDaoImpl.saveReportCustomComponentFooterInfo(BeanConvertUtil.beanCovertMap(reportCustomComponentFooterPo));
         return saveFlag;
     }
 
-     @Override
-    public int updateReportCustomComponentFooter(@RequestBody  ReportCustomComponentFooterPo reportCustomComponentFooterPo) {
+    @Override
+    public int updateReportCustomComponentFooter(@RequestBody ReportCustomComponentFooterPo reportCustomComponentFooterPo) {
         int saveFlag = reportCustomComponentFooterV1ServiceDaoImpl.updateReportCustomComponentFooterInfo(BeanConvertUtil.beanCovertMap(reportCustomComponentFooterPo));
         return saveFlag;
     }
 
-     @Override
-    public int deleteReportCustomComponentFooter(@RequestBody  ReportCustomComponentFooterPo reportCustomComponentFooterPo) {
-       reportCustomComponentFooterPo.setStatusCd("1");
-       int saveFlag = reportCustomComponentFooterV1ServiceDaoImpl.updateReportCustomComponentFooterInfo(BeanConvertUtil.beanCovertMap(reportCustomComponentFooterPo));
-       return saveFlag;
+    @Override
+    public int deleteReportCustomComponentFooter(@RequestBody ReportCustomComponentFooterPo reportCustomComponentFooterPo) {
+        reportCustomComponentFooterPo.setStatusCd("1");
+        int saveFlag = reportCustomComponentFooterV1ServiceDaoImpl.updateReportCustomComponentFooterInfo(BeanConvertUtil.beanCovertMap(reportCustomComponentFooterPo));
+        return saveFlag;
     }
 
     @Override
-    public List<ReportCustomComponentFooterDto> queryReportCustomComponentFooters(@RequestBody  ReportCustomComponentFooterDto reportCustomComponentFooterDto) {
+    public List<ReportCustomComponentFooterDto> queryReportCustomComponentFooters(@RequestBody ReportCustomComponentFooterDto reportCustomComponentFooterDto) {
 
         //校验是否传了 分页信息
 
@@ -78,12 +78,32 @@ public class ReportCustomComponentFooterV1InnerServiceSMOImpl extends BaseServic
 
         List<ReportCustomComponentFooterDto> reportCustomComponentFooters = BeanConvertUtil.covertBeanList(reportCustomComponentFooterV1ServiceDaoImpl.getReportCustomComponentFooterInfo(BeanConvertUtil.beanCovertMap(reportCustomComponentFooterDto)), ReportCustomComponentFooterDto.class);
 
+        desCode(reportCustomComponentFooters);
         return reportCustomComponentFooters;
     }
 
 
+    private void desCode(List<ReportCustomComponentFooterDto> ReportCustomComponentFooterDtos) {
+        if (ReportCustomComponentFooterDtos == null || ReportCustomComponentFooterDtos.size() < 1) {
+            return;
+        }
+        for (ReportCustomComponentFooterDto reportCustomComponentDto : ReportCustomComponentFooterDtos) {
+            try {
+                if (!StringUtil.isEmpty(reportCustomComponentDto.getComponentSql())) {
+                    reportCustomComponentDto.setComponentSql(new String(Base64Convert.base64ToByte(reportCustomComponentDto.getComponentSql()), "UTF-8"));
+                }
+                if (!StringUtil.isEmpty(reportCustomComponentDto.getJavaScript())) {
+                    reportCustomComponentDto.setJavaScript(new String(Base64Convert.base64ToByte(reportCustomComponentDto.getJavaScript()), "UTF-8"));
+                }
+            } catch (Exception e) {
+            }
+        }
+    }
+
+
     @Override
     public int queryReportCustomComponentFootersCount(@RequestBody ReportCustomComponentFooterDto reportCustomComponentFooterDto) {
-        return reportCustomComponentFooterV1ServiceDaoImpl.queryReportCustomComponentFootersCount(BeanConvertUtil.beanCovertMap(reportCustomComponentFooterDto));    }
+        return reportCustomComponentFooterV1ServiceDaoImpl.queryReportCustomComponentFootersCount(BeanConvertUtil.beanCovertMap(reportCustomComponentFooterDto));
+    }
 
 }