|
@@ -52,8 +52,7 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
|
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
|
|
|
-import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_PROJECT_TASK_NOT_EXISTS;
|
|
|
|
|
-import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.IOT_RD_DAILY_REPORT_NOT_EXISTS;
|
|
|
|
|
|
|
+import static cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant.*;
|
|
|
import static cn.iocoder.yudao.module.pms.framework.config.MultiThreadConfiguration.PMS_THREAD_POOL_TASK_EXECUTOR;
|
|
import static cn.iocoder.yudao.module.pms.framework.config.MultiThreadConfiguration.PMS_THREAD_POOL_TASK_EXECUTOR;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -717,6 +716,33 @@ public class IotRdDailyReportServiceImpl implements IotRdDailyReportService {
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public List<IotRdDailyReportPolylineVO> polylineStatistics(IotRdDailyReportPageReqVO pageReqVO) {
|
|
|
|
|
+ List<IotRdDailyReportPolylineVO> result = new ArrayList<>();
|
|
|
|
|
+ // 默认查询当年工作量
|
|
|
|
|
+ if (ObjUtil.isEmpty(pageReqVO.getCreateTime())) {
|
|
|
|
|
+ throw exception(IOT_DAILY_REPORT_TIME_NOT_EXISTS);
|
|
|
|
|
+ }
|
|
|
|
|
+ // 筛选审核通过的数据
|
|
|
|
|
+ pageReqVO.setAuditStatus(20);
|
|
|
|
|
+ List<IotRdDailyReportDO> dailyReports = iotRdDailyReportMapper.dailyReports(pageReqVO);
|
|
|
|
|
+ if (CollUtil.isNotEmpty(dailyReports)) {
|
|
|
|
|
+ // 设置 小队 任务已经完成的工作量集合 (按照不同的单位统计任务的不同工作量)
|
|
|
|
|
+ // key任务井id value队伍工作量数据
|
|
|
|
|
+ Map<Long, BigDecimal> bridgePlugPair = new HashMap<>();
|
|
|
|
|
+ Map<Long, BigDecimal> runCountPair = new HashMap<>();
|
|
|
|
|
+ Map<Long, BigDecimal> cumulativeWorkingWellPair = new HashMap<>();
|
|
|
|
|
+ Map<Long, BigDecimal> hourCountPair = new HashMap<>();
|
|
|
|
|
+ Map<Long, BigDecimal> waterVolumePair = new HashMap<>();
|
|
|
|
|
+ Map<Long, BigDecimal> pumpTripsPair = new HashMap<>();
|
|
|
|
|
+ Map<Long, BigDecimal> cumulativeWorkingLayersPair = new HashMap<>();
|
|
|
|
|
+ Map<Long, BigDecimal> mixSandPair = new HashMap<>();
|
|
|
|
|
+
|
|
|
|
|
+ dailyReports.forEach(report -> {});
|
|
|
|
|
+ }
|
|
|
|
|
+ return result;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public void saveBatch(List<IotRdDailyReportSaveReqVO> reports) {
|
|
public void saveBatch(List<IotRdDailyReportSaveReqVO> reports) {
|
|
|
if (CollUtil.isEmpty(reports)) {
|
|
if (CollUtil.isEmpty(reports)) {
|