dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dyf:b945420446ca901caa52b32f38424fcacefbbf62
Branches Tags
dyf:main dyf:6170 dyf:dyf-device dyf:jingquan dyf:prod dyf:APP权限登录改造
...
compare: dyf:1e4ee840a3b5709593fcfd0dfdb41ec9f36c322a
Branches Tags
dyf:6170 dyf:dyf-device dyf:jingquan dyf:main dyf:prod dyf:APP权限登录改造

2 Commits
b945420446 ... 1e4ee840a3

Author SHA1 Message Date
daiyongfei
1e4ee840a3 Merge branch 'dyf-device' into 6170 2025-09-06 11:48:00 +08:00
daiyongfei
374a03b83d 管理员 2025-09-06 11:46:13 +08:00
2 changed files with 12 additions and 10 deletions
Expand all files Collapse all files

2
fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java
View File

@ -8,8 +8,6 @@ import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
import com.fuyuanshen.common.mybatis.core.page.PageQuery; import com.fuyuanshen.common.mybatis.core.page.PageQuery;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.web.core.BaseController; import com.fuyuanshen.common.web.core.BaseController;
import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
import com.fuyuanshen.web.service.DeviceShareService; import com.fuyuanshen.web.service.DeviceShareService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;

8
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceLogServiceImpl.java
View File

@ -53,6 +53,7 @@ public class DeviceLogServiceImpl implements IDeviceLogService {
return baseMapper.selectVoById(id); return baseMapper.selectVoById(id);
} }
/** /**
* 分页查询设备日志列表 * 分页查询设备日志列表
* *
@ -62,13 +63,12 @@ public class DeviceLogServiceImpl implements IDeviceLogService {
*/ */
@Override @Override
public TableDataInfo<DeviceLogVo> queryPageList(DeviceLogBo bo, PageQuery pageQuery) { public TableDataInfo<DeviceLogVo> queryPageList(DeviceLogBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<DeviceLog> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<DeviceLog> lqw = buildQueryWrapper(bo);
Page<DeviceLogVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<DeviceLogVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
/** /**
* 查询符合条件的设备日志列表 * 查询符合条件的设备日志列表
* *
@ -83,6 +83,9 @@ public class DeviceLogServiceImpl implements IDeviceLogService {
private LambdaQueryWrapper<DeviceLog> buildQueryWrapper(DeviceLogBo bo) { private LambdaQueryWrapper<DeviceLog> buildQueryWrapper(DeviceLogBo bo) {
// 管理员
String username = LoginHelper.getUsername();
if (!username.equals("admin")) {
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
List<DeviceAssignments> assignments = deviceAssignmentsMapper.selectList(new QueryWrapper<DeviceAssignments>().eq("assignee_id", userId)); List<DeviceAssignments> assignments = deviceAssignmentsMapper.selectList(new QueryWrapper<DeviceAssignments>().eq("assignee_id", userId));
List<Long> deviceIds = assignments.stream().map(DeviceAssignments::getDeviceId).collect(Collectors.toList()); List<Long> deviceIds = assignments.stream().map(DeviceAssignments::getDeviceId).collect(Collectors.toList());
@ -90,6 +93,7 @@ public class DeviceLogServiceImpl implements IDeviceLogService {
deviceIds.add(-1L); deviceIds.add(-1L);
} }
bo.setDeviceIds(deviceIds); bo.setDeviceIds(deviceIds);
}
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<DeviceLog> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<DeviceLog> lqw = Wrappers.lambdaQuery();