|
@@ -167,8 +167,8 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
page.setTotal(page.getTotal());
|
|
|
page.setCurrent(page.getCurrent());
|
|
|
page.setPages(page.getPages());
|
|
|
-// List<String> roleKey = baseUserService.getRoleName(getUserId());
|
|
|
-// BaseUser baseUser = baseUserService.getUser(getUserId());
|
|
|
+ List<String> roleKey = baseUserService.getRoleName(getUserId());
|
|
|
+ BaseUser baseUser = baseUserService.getUser(getUserId());
|
|
|
if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
|
|
|
List<BaseCameraManagement> dto1 = page.getRecords().stream().map(o -> {
|
|
|
LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
|
|
@@ -188,17 +188,17 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
o.setLineDirStr(o.getLineDir() == 1 ? "上行" : "下行");
|
|
|
o.setMilesRange(begin + "-" + end);
|
|
|
o.setLongitudeAndLatitude(o.getInstallLongitude() + "," + o.getInstallLongitude());
|
|
|
-// if (roleKey.size() > 0 || "admin".equals(baseUser.getUserName())) {
|
|
|
-// o.setIsStartRecording(1);
|
|
|
-// for (String s : roleKey) {
|
|
|
-// if ("admin".equals(s) || "admin".equals(baseUser.getUserName())) {
|
|
|
-// o.setIsStartRecording(1);
|
|
|
-// break;
|
|
|
-// } else {
|
|
|
-// o.setIsStartRecording(2);
|
|
|
-// }
|
|
|
-// }
|
|
|
-// }
|
|
|
+ if (roleKey.size() > 0 || "admin".equals(baseUser.getUserName())) {
|
|
|
+ o.setIsStartRecording(1);
|
|
|
+ for (String s : roleKey) {
|
|
|
+ if ("admin".equals(s) || "admin".equals(baseUser.getUserName())) {
|
|
|
+ o.setIsStartRecording(1);
|
|
|
+ break;
|
|
|
+ } else {
|
|
|
+ o.setIsStartRecording(2);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return o;
|
|
|
}).collect(Collectors.toList());
|
|
|
page.setRecords(dto1);
|