|
@@ -1,6 +1,7 @@
|
|
package com.fdkankan.manage_jp.service.impl;
|
|
package com.fdkankan.manage_jp.service.impl;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.Set;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
@@ -16,11 +17,8 @@ import com.fdkankan.manage_jp.entity.Company;
|
|
import com.fdkankan.manage_jp.entity.User;
|
|
import com.fdkankan.manage_jp.entity.User;
|
|
import com.fdkankan.manage_jp.exception.BusinessException;
|
|
import com.fdkankan.manage_jp.exception.BusinessException;
|
|
import com.fdkankan.manage_jp.mapper.ICameraMapper;
|
|
import com.fdkankan.manage_jp.mapper.ICameraMapper;
|
|
-import com.fdkankan.manage_jp.service.ICameraDetailService;
|
|
|
|
-import com.fdkankan.manage_jp.service.ICameraService;
|
|
|
|
|
|
+import com.fdkankan.manage_jp.service.*;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
-import com.fdkankan.manage_jp.service.ICompanyService;
|
|
|
|
-import com.fdkankan.manage_jp.service.IUserService;
|
|
|
|
import com.fdkankan.manage_jp.vo.request.CameraAddParam;
|
|
import com.fdkankan.manage_jp.vo.request.CameraAddParam;
|
|
import com.fdkankan.manage_jp.vo.request.CameraListParam;
|
|
import com.fdkankan.manage_jp.vo.request.CameraListParam;
|
|
import com.fdkankan.manage_jp.vo.request.RequestCamera;
|
|
import com.fdkankan.manage_jp.vo.request.RequestCamera;
|
|
@@ -48,6 +46,8 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
|
|
ICompanyService companyService;
|
|
ICompanyService companyService;
|
|
@Autowired
|
|
@Autowired
|
|
IUserService userService;
|
|
IUserService userService;
|
|
|
|
+ @Autowired
|
|
|
|
+ IUserRoleService userRoleService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Camera findByChildName(String childName) {
|
|
public Camera findByChildName(String childName) {
|
|
@@ -57,7 +57,11 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Object pageList(CameraListParam param) {
|
|
|
|
|
|
+ public Object pageList(CameraListParam param,User user) {
|
|
|
|
+ Set<Long> roleIds = userRoleService.getByUser(user);
|
|
|
|
+ if(roleIds.contains(6L)){
|
|
|
|
+ param.setCompanyId(user.getCompanyId());
|
|
|
|
+ }
|
|
Page<ResponseCamera> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
|
|
Page<ResponseCamera> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
|
|
for (ResponseCamera record : page.getRecords()) {
|
|
for (ResponseCamera record : page.getRecords()) {
|
|
record.setCameraType(record.getType());
|
|
record.setCameraType(record.getType());
|