|
@@ -202,10 +202,16 @@ public class TmCameraServiceImpl extends ServiceImpl<ITmCameraMapper, TmCamera>
|
|
}
|
|
}
|
|
}
|
|
}
|
|
List<CameraVo> list = fdkkResponse.getData();
|
|
List<CameraVo> list = fdkkResponse.getData();
|
|
|
|
+ HashMap<String ,TmUser> map = tmUserService.getByCamera(page.getRecords());
|
|
|
|
+
|
|
for (CameraVo cameraVo : list) {
|
|
for (CameraVo cameraVo : list) {
|
|
String deptIdO = deptIdMap.get(cameraVo.getSnCode().toUpperCase());
|
|
String deptIdO = deptIdMap.get(cameraVo.getSnCode().toUpperCase());
|
|
cameraVo.setDeptId(deptIdO);
|
|
cameraVo.setDeptId(deptIdO);
|
|
cameraVo.setDeptName(deptNameMap.get(deptIdO));
|
|
cameraVo.setDeptName(deptNameMap.get(deptIdO));
|
|
|
|
+ TmUser tmUser = map.get(cameraVo.getSnCode().toUpperCase());
|
|
|
|
+ if(tmUser != null){
|
|
|
|
+ cameraVo.setNickName(tmUser.getNickName());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
Page<CameraVo> objectPage = new Page<>(pageNum, pageSize);
|
|
Page<CameraVo> objectPage = new Page<>(pageNum, pageSize);
|
|
objectPage.setRecords(list);
|
|
objectPage.setRecords(list);
|