| | |
|---|
| | | if (startTime == null && endTime == null) { |
|---|
| | | dataList1.reverse() |
|---|
| | | } |
|---|
| | | pageInfo = PageHelper.startPage<ElectricMinuteValue>(p, perP) |
|---|
| | | if (dataList1.isEmpty()) return BaseResponse(true, data = result) |
|---|
| | | |
|---|
| | | // pageInfo = PageHelper.startPage<ElectricMinuteValue>(p, perP) |
|---|
| | | val dataList2 = electricMinuteValueMapper.selectByExample(Example(ElectricMinuteValue::class.java).apply { |
|---|
| | | createCriteria().andEqualTo("mvStatCode", d2?.cdDeviceCode) |
|---|
| | | .apply { |
|---|
| | | sTime?.let { andGreaterThanOrEqualTo("mvDataTime", it) } |
|---|
| | | andGreaterThanOrEqualTo("mvDataTime", sTime ?: dataList1[0].mvDataTime) |
|---|
| | | eTime?.let { andLessThanOrEqualTo("mvDataTime", it) } |
|---|
| | | } |
|---|
| | | orderBy("mvDataTime").apply { |
|---|
| | |
|---|
| | | return BaseResponse(true, head = DataHead(pageInfo.pageNum, pageInfo.pages), data = result) |
|---|
| | | } |
|---|
| | | |
|---|
| | | override fun dailyStatistics(cId: String, startTime: String?, endTime: String?): BaseResponse<List<ElectricDailyInfo>> { |
|---|
| | | override fun dailyAnalysis(cId: String, startTime: String?, endTime: String?): BaseResponse<List<ElectricDailyInfo>> { |
|---|
| | | // 根据企业id获取对应设备 |
|---|
| | | val devices = companyDeviceMapper.selectByExample(Example(CompanyDevice::class.java).apply { |
|---|
| | | createCriteria().andEqualTo("cdCompanyId", cId) |
|---|
