|
@@ -6,12 +6,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.fdkankan.common.response.PageInfo;
|
|
import com.fdkankan.common.response.PageInfo;
|
|
import com.fdkankan.manage.common.CacheUtil;
|
|
import com.fdkankan.manage.common.CacheUtil;
|
|
|
|
+import com.fdkankan.manage.entity.Camera;
|
|
import com.fdkankan.manage.entity.DownloadOrder;
|
|
import com.fdkankan.manage.entity.DownloadOrder;
|
|
|
|
+import com.fdkankan.manage.entity.ScenePlus;
|
|
|
|
+import com.fdkankan.manage.entity.ScenePro;
|
|
import com.fdkankan.manage.mapper.IDownloadOrderMapper;
|
|
import com.fdkankan.manage.mapper.IDownloadOrderMapper;
|
|
-import com.fdkankan.manage.service.IDownloadOrderService;
|
|
|
|
-import com.fdkankan.manage.service.IExcelService;
|
|
|
|
|
|
+import com.fdkankan.manage.service.*;
|
|
import com.fdkankan.manage.vo.request.OrderParam;
|
|
import com.fdkankan.manage.vo.request.OrderParam;
|
|
import com.fdkankan.manage.vo.response.DownOrderVo;
|
|
import com.fdkankan.manage.vo.response.DownOrderVo;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -32,12 +35,36 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
|
|
@Autowired
|
|
@Autowired
|
|
IExcelService excelService;
|
|
IExcelService excelService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ ISceneProService sceneProService;
|
|
|
|
+ @Autowired
|
|
|
|
+ IScenePlusService scenePlusService;
|
|
|
|
+ @Autowired
|
|
|
|
+ ICameraService cameraService;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public PageInfo pageList(OrderParam param) {
|
|
public PageInfo pageList(OrderParam param) {
|
|
CacheUtil.orderParam = param;
|
|
CacheUtil.orderParam = param;
|
|
Page<DownOrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
|
|
Page<DownOrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
|
|
for (DownOrderVo record : page.getRecords()) {
|
|
for (DownOrderVo record : page.getRecords()) {
|
|
record.setCreateTime(record.getTradeTime());
|
|
record.setCreateTime(record.getTradeTime());
|
|
|
|
+ if(StringUtils.isNotBlank(record.getSceneNum())){
|
|
|
|
+ Long cameraId = null;
|
|
|
|
+ ScenePro pro = sceneProService.getByNum(record.getSceneNum());
|
|
|
|
+ if(pro == null){
|
|
|
|
+ ScenePlus plus = scenePlusService.getByNum(record.getSceneNum());
|
|
|
|
+ cameraId = plus.getCameraId();
|
|
|
|
+ }else {
|
|
|
|
+ cameraId = pro.getCameraId();
|
|
|
|
+ }
|
|
|
|
+ if(cameraId != null){
|
|
|
|
+ Camera camera = cameraService.getById(cameraId);
|
|
|
|
+ if(camera != null){
|
|
|
|
+ record.setSnCode(camera.getSnCode());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
return PageInfo.PageInfo(page);
|
|
return PageInfo.PageInfo(page);
|
|
}
|
|
}
|