|
@@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|
import com.fdkankan.common.util.FileUtils;
|
|
import com.fdkankan.common.util.FileUtils;
|
|
import com.fdkankan.fyun.face.FYunFileServiceInterface;
|
|
import com.fdkankan.fyun.face.FYunFileServiceInterface;
|
|
import com.fdkankan.manage_jp.httpClient.param.LaserSceneMoveParam;
|
|
import com.fdkankan.manage_jp.httpClient.param.LaserSceneMoveParam;
|
|
|
|
+import com.fdkankan.manage_jp.service.*;
|
|
import com.fdkankan.rabbitmq.util.RabbitMqProducer;
|
|
import com.fdkankan.rabbitmq.util.RabbitMqProducer;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
@@ -20,10 +21,6 @@ import com.fdkankan.manage_jp.httpClient.param.SSDownSceneParam;
|
|
import com.fdkankan.manage_jp.httpClient.param.SSToBind;
|
|
import com.fdkankan.manage_jp.httpClient.param.SSToBind;
|
|
import com.fdkankan.manage_jp.httpClient.vo.FdkkResponse;
|
|
import com.fdkankan.manage_jp.httpClient.vo.FdkkResponse;
|
|
import com.fdkankan.manage_jp.httpClient.vo.SSDownSceneVo;
|
|
import com.fdkankan.manage_jp.httpClient.vo.SSDownSceneVo;
|
|
-import com.fdkankan.manage_jp.service.ICameraDetailService;
|
|
|
|
-import com.fdkankan.manage_jp.service.ICameraService;
|
|
|
|
-import com.fdkankan.manage_jp.service.ICompanyService;
|
|
|
|
-import com.fdkankan.manage_jp.service.IUserService;
|
|
|
|
import com.fdkankan.manage_jp.vo.request.SceneParam;
|
|
import com.fdkankan.manage_jp.vo.request.SceneParam;
|
|
import com.fdkankan.manage_jp.vo.response.SceneVo;
|
|
import com.fdkankan.manage_jp.vo.response.SceneVo;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -54,6 +51,8 @@ public class LaserService {
|
|
ICameraService cameraService;
|
|
ICameraService cameraService;
|
|
@Autowired
|
|
@Autowired
|
|
ICompanyService companyService;
|
|
ICompanyService companyService;
|
|
|
|
+ @Autowired
|
|
|
|
+ ITmColdStorageService tmColdStorageService;
|
|
|
|
|
|
|
|
|
|
public PageInfo pageList(SceneParam param) {
|
|
public PageInfo pageList(SceneParam param) {
|
|
@@ -96,13 +95,19 @@ public class LaserService {
|
|
}
|
|
}
|
|
sceneVoList.add(vo);
|
|
sceneVoList.add(vo);
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ List<String> sceneNumList = sceneVoList.stream().map(SceneVo::getNum).collect(Collectors.toList());
|
|
|
|
+ HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
|
|
for (SceneVo sceneVo : sceneVoList) {
|
|
for (SceneVo sceneVo : sceneVoList) {
|
|
Company company = companyService.getByChildName(sceneVo.getChildName());
|
|
Company company = companyService.getByChildName(sceneVo.getChildName());
|
|
if(company != null){
|
|
if(company != null){
|
|
sceneVo.setCompanyName(company.getCompanyName());
|
|
sceneVo.setCompanyName(company.getCompanyName());
|
|
}
|
|
}
|
|
|
|
+ if(coldMap.get(sceneVo.getNum())!=null){
|
|
|
|
+ sceneVo.setColdStorage(coldMap.get(sceneVo.getNum()));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
|
|
Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
|
|
voPage.setRecords(sceneVoList);
|
|
voPage.setRecords(sceneVoList);
|
|
voPage.setTotal(total);
|
|
voPage.setTotal(total);
|