|
|
|
@ -183,7 +183,7 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl<IotVisualManageM |
|
|
|
public PageData<IotVisualManageDTO> pageIotBoardManageDTO(Map<String, Object> params) { |
|
|
|
PageData<IotVisualManageDTO> pageData = this.getPageData(params, IotVisualManageDTO.class); |
|
|
|
pageData.getList().forEach(temp->{ |
|
|
|
SysMenuDTO sysMenuDTO = sysMenuService.getByUrl("scada/preview?id=" + temp.getId()); |
|
|
|
SysMenuDTO sysMenuDTO = sysMenuService.getByUrl("visual/preview?id=" + temp.getId()); |
|
|
|
if (ObjectUtil.isNotNull(sysMenuDTO)) { |
|
|
|
temp.setSysMenuDTO(sysMenuDTO); |
|
|
|
} |
|
|
|
@ -214,7 +214,7 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl<IotVisualManageM |
|
|
|
menuDTO.setType(0); |
|
|
|
menuDTO.setOpenStyle(0); |
|
|
|
menuDTO.setSaView(1); |
|
|
|
menuDTO.setUrl("scada/preview?id=" + entity.getId()); |
|
|
|
menuDTO.setUrl("visual/preview?id=" + entity.getId()); |
|
|
|
SysMenuEntity sysMenuEntity = ConvertUtils.sourceToTarget(menuDTO, SysMenuEntity.class); |
|
|
|
sysMenuService.save(sysMenuEntity); |
|
|
|
sysLanguageService.saveOrUpdate("sys_menu", sysMenuEntity.getId(), "name", sysMenuEntity.getName(), HttpContextUtils.getLanguage()); |
|
|
|
@ -229,7 +229,7 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl<IotVisualManageM |
|
|
|
} |
|
|
|
} else { |
|
|
|
List<IotVisualManageEntity> entityList = mapper.selectListByQuery(QueryWrapper.create().in(IotVisualManageEntity::getId, entity.getId())); |
|
|
|
List<String> urlList = entityList.stream().map(item -> "scada/preview?id=" + item.getId()).collect(Collectors.toList()); |
|
|
|
List<String> urlList = entityList.stream().map(item -> "visual/preview?id=" + item.getId()).collect(Collectors.toList()); |
|
|
|
if(CollectionUtil.isNotEmpty(urlList)){ |
|
|
|
List<SysMenuDTO> sysMenuDTOList = sysMenuService.getByUrlList(urlList); |
|
|
|
if (CollectionUtil.isNotEmpty(sysMenuDTOList)) { |
|
|
|
@ -251,7 +251,7 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl<IotVisualManageM |
|
|
|
public Result deleteIotBoardManageDTO(Long[] ids) { |
|
|
|
List<IotVisualManageEntity> entityList = mapper.selectListByQuery(QueryWrapper.create().in(IotVisualManageEntity::getId, ids)); |
|
|
|
//删除角色与菜单的关联表 |
|
|
|
List<String> urlList = entityList.stream().map(item -> "scada/preview?id=" + item.getId()).collect(Collectors.toList()); |
|
|
|
List<String> urlList = entityList.stream().map(item -> "visual/preview?id=" + item.getId()).collect(Collectors.toList()); |
|
|
|
List<SysMenuDTO> sysMenuDTOList = sysMenuService.getByUrlList(urlList); |
|
|
|
if (CollectionUtil.isNotEmpty(sysMenuDTOList)) { |
|
|
|
// List<Long> menuIdList = sysMenuDTOList.stream().map(SysMenuDTO::getId).collect(Collectors.toList()); |
|
|
|
@ -272,7 +272,7 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl<IotVisualManageM |
|
|
|
public IotVisualManageDTO getIotBoardManageDTO(Long id) { |
|
|
|
IotVisualManageDTO data =this.getByIdAs(id, IotVisualManageDTO.class); |
|
|
|
//id 页面id为。组态设计详情id |
|
|
|
SysMenuDTO sysMenuDTO = sysMenuService.getByUrl("scada/preview?id=" + data.getId()); |
|
|
|
SysMenuDTO sysMenuDTO = sysMenuService.getByUrl("visual/preview?id=" + data.getId()); |
|
|
|
|
|
|
|
if (ObjectUtil.isNotNull(sysMenuDTO)) { |
|
|
|
data.setSysMenuDTO(sysMenuDTO); |
|
|
|
|