Lianxun_Java.git

			@@ -18,7 +18,7 @@
			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.Cmd;
			import com.java110.core.event.cmd.CmdEvent;
			import com.java110.dto.PageDto;
			import com.java110.dto.reportCustomComponent.ReportCustomComponentDto;
			@@ -28,7 +28,7 @@
			import com.java110.utils.util.Assert;
			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;
			import org.springframework.http.HttpStatus;
			import org.springframework.http.ResponseEntity;
			@@ -47,11 +47,13 @@
			* // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行加入 20行至30行
			*/
			@Java110Cmd(serviceCode = "reportCustomComponent.listReportCustomComponentData")
			public class ListReportCustomComponentDataCmd extends AbstractServiceCmdListener {
			public class ListReportCustomComponentDataCmd extends Cmd {

			private static Logger logger = LoggerFactory.getLogger(ListReportCustomComponentDataCmd.class);
			@Autowired
			private IReportCustomComponentV1InnerServiceSMO reportCustomComponentV1InnerServiceSMOImpl;



			@Autowired
			private IQueryServiceSMO queryServiceSMOImpl;
			@@ -61,7 +63,6 @@
			super.validatePageInfo(reqJson);
			Assert.hasKeyAndValue(reqJson, "componentId", "未包含组件ID");
			}

			@Override
			public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {

			@@ -83,8 +84,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) {
			@@ -101,7 +111,7 @@
			}
			reqJsonCount.put("count", "1");
			JSONObject data = queryServiceSMOImpl.execQuerySql(reqJsonCount, sql);
			total = data.getJSONArray("data").getJSONObject(0).getIntValue("total");
			total = data.getJSONArray("td").getJSONObject(0).getIntValue("total");
			}
			reqJson.put("count", "0");
			int page = reqJson.getInteger("page");
			@@ -113,4 +123,5 @@
			ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
			cmdDataFlowContext.setResponseEntity(responseEntity);
			}

			}