From b173d31976fc4731b7c247d4038de92134eba317 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 11:42:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentDataCmd.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentDataCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentDataCmd.java
index c988974..dbb1b14 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentDataCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportCustomComponent/ListReportCustomComponentDataCmd.java
@@ -19,19 +19,18 @@
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.core.log.LoggerFactory;
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.dto.reportCustom.ReportCustomComponentDto;
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.utils.util.StringUtil;
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;
@@ -50,12 +49,12 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴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
@@ -66,8 +65,12 @@
super.validatePageInfo(reqJson);
Assert.hasKeyAndValue(reqJson, "componentId", "鏈寘鍚粍浠禝D");
}
+
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+ String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
+ reqJson.put("storeId", storeId);
//鏌ヨ缁勪欢鏄惁瀛樺湪
ReportCustomComponentDto reportCustomComponentDto = new ReportCustomComponentDto();
@@ -122,9 +125,15 @@
reqJson.put("page", (page - 1) * reqJson.getIntValue("row"));
}
JSONObject data = queryServiceSMOImpl.execQuerySql(reqJson, sql);
+ if (!sql.trim().contains("test=\"count")) {
+ total = JSONArray.parseArray(data.getString("td")).size();
+ }
+ if (!StringUtil.isEmpty(sql) && !sql.contains("limit #page#,#row#")) {
+ sql = sql + " limit #page#,#row#";
+ data = queryServiceSMOImpl.execQuerySql(reqJson, sql);
+ }
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);
}
-
}
--
Gitblit v1.8.0