java110
2021-11-14 862b72d394a4a0bc467deda2a0afdab43aa25c5e
优化执行java
3个文件已修改
1个文件已添加
191 ■■■■■ 已修改文件
java110-service/src/main/java/com/java110/service/smo/IQueryServiceSMO.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentDataCmd.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentFooterCmd.java 144 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-service/src/main/java/com/java110/service/smo/IQueryServiceSMO.java
@@ -48,4 +48,12 @@
     * }
     */
    JSONObject execQuerySql(JSONObject param, String sql) throws BusinessException;
    /**
     * 执行java脚本
     *
     * @param javaCode
     * @throws BusinessException
     */
    JSONObject execJava(JSONObject params, String javaCode);
}
java110-service/src/main/java/com/java110/service/smo/impl/QueryServiceSMOImpl.java
@@ -341,6 +341,25 @@
        }
    }
    /**
     * 执行java脚本
     *
     * @param javaCode
     * @throws BusinessException
     */
    public JSONObject execJava(JSONObject params, String javaCode) throws BusinessException {
        try {
            //JSONObject params = dataQuery.getRequestParams();
            Interpreter interpreter = new Interpreter();
            interpreter.eval(javaCode);
            interpreter.set("params", params);
            return JSONObject.parseObject(interpreter.eval("execute(dataQuery)").toString());
        } catch (Exception e) {
            logger.error("数据交互异常:", e);
            throw new BusinessException(ResponseConstant.RESULT_CODE_INNER_ERROR, "数据交互异常," + e.getMessage());
        }
    }
    @Override
    public JSONObject execQuerySql(JSONObject params, String currentSql) throws BusinessException {
        List<Map<String, Object>> results = null;
service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentDataCmd.java
@@ -15,6 +15,7 @@
 */
package com.java110.report.cmd.reportCustomComponent;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
@@ -22,6 +23,8 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.PageDto;
import com.java110.dto.reportCustomComponent.ReportCustomComponentDto;
import com.java110.dto.reportCustomComponentFooter.ReportCustomComponentFooterDto;
import com.java110.intf.report.IReportCustomComponentFooterV1InnerServiceSMO;
import com.java110.intf.report.IReportCustomComponentV1InnerServiceSMO;
import com.java110.service.smo.IQueryServiceSMO;
import com.java110.utils.exception.CmdException;
@@ -53,6 +56,8 @@
    @Autowired
    private IReportCustomComponentV1InnerServiceSMO reportCustomComponentV1InnerServiceSMOImpl;
    @Autowired
    private IQueryServiceSMO queryServiceSMOImpl;
@@ -61,7 +66,6 @@
        super.validatePageInfo(reqJson);
        Assert.hasKeyAndValue(reqJson, "componentId", "未包含组件ID");
    }
    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
@@ -83,8 +87,17 @@
    }
    private void doDealJava(JSONObject reqJson, ReportCustomComponentDto reportCustomComponentDto, ICmdDataFlowContext cmdDataFlowContext) {
        //校验是否传了 分页信息
        String javaScript = reportCustomComponentDto.getJavaScript();
        int page = reqJson.getInteger("page");
        if (page != PageDto.DEFAULT_PAGE) {
            reqJson.put("page", (page - 1) * reqJson.getIntValue("row"));
        }
        JSONObject data = queryServiceSMOImpl.execJava(reqJson, javaScript);
        long total = data.getLong("total");
        ResultVo resultVo = new ResultVo((int) Math.ceil((double) total / (double) reqJson.getInteger("row")), total, data);
        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
        cmdDataFlowContext.setResponseEntity(responseEntity);
    }
    private void doDealSql(JSONObject reqJson, ReportCustomComponentDto reportCustomComponentDto, ICmdDataFlowContext cmdDataFlowContext) {
@@ -113,4 +126,5 @@
        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
        cmdDataFlowContext.setResponseEntity(responseEntity);
    }
}
service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentFooterCmd.java
New file
@@ -0,0 +1,144 @@
/*
 * 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.report.cmd.reportCustomComponent;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.PageDto;
import com.java110.dto.reportCustomComponent.ReportCustomComponentDto;
import com.java110.dto.reportCustomComponentFooter.ReportCustomComponentFooterDto;
import com.java110.intf.report.IReportCustomComponentFooterV1InnerServiceSMO;
import com.java110.intf.report.IReportCustomComponentV1InnerServiceSMO;
import com.java110.service.smo.IQueryServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import java.util.List;
/**
 * 类表述:组件底部
 * 服务编码:reportCustomComponent.listReportCustomComponentFooter
 * 请求路劲:/app/reportCustomComponent.listReportCustomComponentFooter
 * add by 吴学文 at 2021-11-09 13:18:41 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行
 */
@Java110Cmd(serviceCode = "reportCustomComponent.listReportCustomComponentFooter")
public class ListReportCustomComponentFooterCmd extends AbstractServiceCmdListener {
    private static Logger logger = LoggerFactory.getLogger(ListReportCustomComponentFooterCmd.class);
    @Autowired
    private IReportCustomComponentV1InnerServiceSMO reportCustomComponentV1InnerServiceSMOImpl;
    @Autowired
    private IReportCustomComponentFooterV1InnerServiceSMO reportCustomComponentFooterV1InnerServiceSMOImpl;
    @Autowired
    private IQueryServiceSMO queryServiceSMOImpl;
    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
        super.validatePageInfo(reqJson);
        Assert.hasKeyAndValue(reqJson, "componentId", "未包含组件ID");
    }
    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
        //查询组件是否存在
        ReportCustomComponentDto reportCustomComponentDto = new ReportCustomComponentDto();
        reportCustomComponentDto.setComponentId(reqJson.getString("componentId"));
        List<ReportCustomComponentDto> reportCustomComponentDtos = reportCustomComponentV1InnerServiceSMOImpl.queryReportCustomComponents(reportCustomComponentDto);
        Assert.listOnlyOne(reportCustomComponentDtos, "组件不存在,请联系开发人员");
        ReportCustomComponentFooterDto reportCustomComponentFooterDto = new ReportCustomComponentFooterDto();
        reportCustomComponentFooterDto.setComponentId(reqJson.getString("componentId"));
        List<ReportCustomComponentFooterDto> reportCustomComponentFooterDtos
                = reportCustomComponentFooterV1InnerServiceSMOImpl.queryReportCustomComponentFooters(reportCustomComponentFooterDto);
        // 没有配置信息
        if (reportCustomComponentFooterDtos == null || reportCustomComponentFooterDtos.size() < 1) {
            cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(new JSONObject()));
            return;
        }
        reportCustomComponentFooterDto = reportCustomComponentFooterDtos.get(0);
        if (ReportCustomComponentDto.QUERY_MODEL_SQL.equals(reportCustomComponentFooterDto.getQueryModel())) {
            doDealSql(reqJson, reportCustomComponentFooterDto, cmdDataFlowContext);
        } else if (ReportCustomComponentDto.QUERY_MODEL_JAVA.equals(reportCustomComponentFooterDto.getQueryModel())) {
            doDealJava(reqJson, reportCustomComponentFooterDto, cmdDataFlowContext);
        } else {
            throw new CmdException("组件实现方式不支持,请联系开发人员");
        }
    }
    private void doDealJava(JSONObject reqJson, ReportCustomComponentFooterDto reportCustomComponentFooterDto, ICmdDataFlowContext cmdDataFlowContext) {
        String sql = reportCustomComponentFooterDto.getComponentSql();
        int page = reqJson.getInteger("page");
        if (page != PageDto.DEFAULT_PAGE) {
            reqJson.put("page", (page - 1) * reqJson.getIntValue("row"));
        }
        JSONObject data = queryServiceSMOImpl.execJava(reqJson, sql);
        JSONArray dataTd = data.getJSONArray("td");
        JSONObject paramOut = null;
        if(dataTd != null && dataTd.size()>0){
            paramOut = dataTd.getJSONObject(0);
        }else{
            paramOut = new JSONObject();
        }
        ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(paramOut);
        cmdDataFlowContext.setResponseEntity(responseEntity);
    }
    private void doDealSql(JSONObject reqJson, ReportCustomComponentFooterDto reportCustomComponentFooterDto, ICmdDataFlowContext cmdDataFlowContext) {
        //校验是否传了 分页信息
        String sql = reportCustomComponentFooterDto.getComponentSql();
        long total = reqJson.getIntValue("row");
        int page = reqJson.getInteger("page");
        if (page != PageDto.DEFAULT_PAGE) {
            reqJson.put("page", (page - 1) * reqJson.getIntValue("row"));
        }
        JSONObject data = queryServiceSMOImpl.execQuerySql(reqJson, sql);
        JSONArray dataTd = data.getJSONArray("td");
        JSONObject paramOut = null;
        if(dataTd != null && dataTd.size()>0){
            paramOut = dataTd.getJSONObject(0);
        }else{
            paramOut = new JSONObject();
        }
        ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(paramOut);
        cmdDataFlowContext.setResponseEntity(responseEntity);
    }
}