浏览代码

下载显示

lyhzzz 2 年之前
父节点
当前提交
699df93373

+ 29 - 2
src/main/java/com/fdkankan/manage/service/impl/DownloadOrderServiceImpl.java

@@ -6,12 +6,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.common.CacheUtil;
+import com.fdkankan.manage.entity.Camera;
 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.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.response.DownOrderVo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -32,12 +35,36 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
     @Autowired
     IExcelService excelService;
 
+    @Autowired
+    ISceneProService sceneProService;
+    @Autowired
+    IScenePlusService scenePlusService;
+    @Autowired
+    ICameraService cameraService;
+
     @Override
     public PageInfo pageList(OrderParam param) {
         CacheUtil.orderParam = param;
         Page<DownOrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         for (DownOrderVo record : page.getRecords()) {
             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);
     }

+ 0 - 2
src/main/resources/mapper/manage/DownloadOrderMapper.xml

@@ -5,8 +5,6 @@
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.DownOrderVo">
         select o.* ,u.user_name ,c.sn_code from  t_download_order o
         left join t_user u on o.user_id = u.id
-        left join t_scene_pro s on o.scene_num = s.num
-        left join t_camera c on s.camera_id = c.id
         WHERE o.rec_status = 'A' and o.pay_status ='1'
         <if test="param.orderSn !=null and param.orderSn !='' ">
             and o.order_sn like concat ('%',#{param.orderSn},'%')