wuxw
2024-09-19 3854cc3045bbe98390e2ca194f3f9e6fa1494b89
优化数据统计不统计设备问题
2个文件已修改
26 ■■■■ 已修改文件
service-report/src/main/java/com/java110/report/cmd/dataReport/QueryInoutDataReportCmd.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-report/src/main/java/com/java110/report/dao/impl/ReportInoutStatisticsServiceDaoImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
service-report/src/main/java/com/java110/report/dao/impl/ReportInoutStatisticsServiceDaoImpl.java
@@ -5,6 +5,7 @@
import com.java110.core.log.LoggerFactory;
import com.java110.report.dao.IReportInoutStatisticsServiceDao;
import com.java110.report.dao.IReportOrderStatisticsServiceDao;
import com.java110.utils.util.ListUtil;
import org.slf4j.Logger;
import org.springframework.stereotype.Service;
@@ -31,7 +32,7 @@
        List<Map> infos = sqlSessionTemplate.selectList("reportInoutStatisticsServiceDaoImpl.getCarInCount", info);
        if (infos == null || infos.size() < 1) {
        if (ListUtil.isNull(infos)) {
            return 0;
        }