From 3854cc3045bbe98390e2ca194f3f9e6fa1494b89 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 19 九月 2024 15:53:30 +0800
Subject: [PATCH] 优化数据统计不统计设备问题

---
 service-report/src/main/java/com/java110/report/cmd/dataReport/QueryInoutDataReportCmd.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryInoutDataReportCmd.java b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryInoutDataReportCmd.java
index 6f65163..13976ad 100644
--- a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryInoutDataReportCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryInoutDataReportCmd.java
@@ -6,7 +6,9 @@
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.IotDataDto;
 import com.java110.dto.report.QueryStatisticsDto;
+import com.java110.intf.job.IIotInnerServiceSMO;
 import com.java110.report.statistics.IInoutStatistics;
 import com.java110.report.statistics.IOrderStatistics;
 import com.java110.utils.exception.CmdException;
@@ -25,6 +27,9 @@
 
     @Autowired
     private IInoutStatistics inoutStatisticsImpl;
+
+    @Autowired
+    private IIotInnerServiceSMO iotInnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -53,22 +58,34 @@
         queryStatisticsDto.setStoreId(storeId);
         JSONArray datas = new JSONArray();
         JSONObject data = null;
+
+        IotDataDto iotDataDto = new IotDataDto();
+        iotDataDto.setData(reqJson);
+        iotDataDto.setIotApiCode("listMachineInoutBmoImpl");
+       ResultVo resultVo = iotInnerServiceSMOImpl.postIotData(iotDataDto);
+        int carInCount = 0;
+        int carOutCount = 0;
+        int personInCount = 0;
+       if(resultVo.getCode() == ResultVo.CODE_OK){
+          JSONObject paramOut = (JSONObject) resultVo.getData();
+           carInCount = paramOut.getIntValue("carInCount");
+           carOutCount = paramOut.getIntValue("carOutCount");
+           personInCount = paramOut.getIntValue("personInCount");
+       }
         // todo 鏌ヨ 杩涘満杞﹁締鏁�
-        double carInCount = inoutStatisticsImpl.getCarInCount(queryStatisticsDto);
+
         data = new JSONObject();
         data.put("name","杩涘満杞﹁締鏁�");
         data.put("value", carInCount);
         datas.add(data);
 
         // todo 鏌ヨ 鍑哄満杞﹁締鏁�
-        double carOutCount = inoutStatisticsImpl.getCarOutCount(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","鍑哄満杞﹁締鏁�");
         data.put("value", carOutCount);
         datas.add(data);
 
         // todo 鏌ヨ 杩涘満浜哄憳鏁�
-        double personInCount = inoutStatisticsImpl.getPersonInCount(queryStatisticsDto);
         data = new JSONObject();
         data.put("name","杩涘満浜哄憳鏁�");
         data.put("value", personInCount);

--
Gitblit v1.8.0