diff --git a/common/security/src/main/java/com/thing/config/ShiroConfig.java b/common/security/src/main/java/com/thing/config/ShiroConfig.java index 15f3f75..25dd0fc 100644 --- a/common/security/src/main/java/com/thing/config/ShiroConfig.java +++ b/common/security/src/main/java/com/thing/config/ShiroConfig.java @@ -69,6 +69,8 @@ public class ShiroConfig { filterMap.put("/sys/user/bindOpenId", "anon"); filterMap.put("/preview/**", "anon"); filterMap.put("/dashboard/iotdashboard/listShare/**", "anon"); + filterMap.put("/dashboard/iotdashboard/**", "anon"); + filterMap.put("/dashboard/**", "anon"); filterMap.put("/dashboard/iotdashboard/svg/xml/**", "anon"); filterMap.put("/dashboard/getDashboardElementLatestAttr", "anon"); filterMap.put("/office/**", "anon"); diff --git a/modules/alarm/src/main/java/com/thing/alarm/alarm/controller/AlarmConfigController.java b/modules/alarm/src/main/java/com/thing/alarm/alarm/controller/AlarmConfigController.java index 5c29123..58b4d54 100644 --- a/modules/alarm/src/main/java/com/thing/alarm/alarm/controller/AlarmConfigController.java +++ b/modules/alarm/src/main/java/com/thing/alarm/alarm/controller/AlarmConfigController.java @@ -1,28 +1,21 @@ package com.thing.alarm.alarm.controller; import cn.hutool.core.collection.CollectionUtil; - import com.mybatisflex.core.query.QueryWrapper; import com.thing.alarm.alarm.dto.AlarmConfigDTO; -import com.thing.alarm.alarm.dto.AlarmConfigDeleteParam; import com.thing.alarm.alarm.entity.AlarmConfigEntity; import com.thing.alarm.alarm.service.AlarmConfigService; import com.thing.common.core.annotation.LogOperation; import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; - import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; - import jakarta.annotation.Resource; - import org.springframework.web.bind.annotation.*; -import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/modules/thing/src/main/java/com/thing/control/service/impl/IotDeviceControlLogServiceImpl.java b/modules/thing/src/main/java/com/thing/control/service/impl/IotDeviceControlLogServiceImpl.java index 00507fa..f01912c 100644 --- a/modules/thing/src/main/java/com/thing/control/service/impl/IotDeviceControlLogServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/control/service/impl/IotDeviceControlLogServiceImpl.java @@ -118,7 +118,7 @@ public class IotDeviceControlLogServiceImpl extends BaseServiceImpl(list, page.getTotalRow()); + return new PageData<>(list, CollectionUtil.size(list)); } /** diff --git a/modules/thing/src/main/java/com/thing/dashboard/dto/IotDashboardDTO.java b/modules/thing/src/main/java/com/thing/dashboard/dto/IotDashboardDTO.java index 0ae3126..1f802c9 100644 --- a/modules/thing/src/main/java/com/thing/dashboard/dto/IotDashboardDTO.java +++ b/modules/thing/src/main/java/com/thing/dashboard/dto/IotDashboardDTO.java @@ -85,13 +85,13 @@ public class IotDashboardDTO implements Serializable { private Long creator; @Schema(description = "创建时间") - private Date createDate; + private Long createDate; @Schema(description = "更新者") private Long updater; @Schema(description = "更新时间") - private Date updateDate; + private Long updateDate; @Schema(description = "看板元素集合") private List iotDashboardElementDTOList; diff --git a/modules/thing/src/main/java/com/thing/dashboard/service/impl/IotDashboardElementServiceImpl.java b/modules/thing/src/main/java/com/thing/dashboard/service/impl/IotDashboardElementServiceImpl.java index 7a6f6ca..8b2e63a 100644 --- a/modules/thing/src/main/java/com/thing/dashboard/service/impl/IotDashboardElementServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/dashboard/service/impl/IotDashboardElementServiceImpl.java @@ -44,9 +44,9 @@ public class IotDashboardElementServiceImpl extends BaseServiceImpl params){ - String dashboardId = (String) params.get("dashboardId"); + Long dashboardId = (Long) params.get("dashboardId"); QueryWrapper wrapper = new QueryWrapper(); - if (StringUtils.isBlank(dashboardId)) throw new SysException("看板id为必传字段"); + if (ObjectUtil.isNotEmpty(dashboardId)) throw new SysException("看板id为必传字段"); wrapper.eq("dashboard_id", dashboardId); return wrapper; } diff --git a/modules/thing/src/main/java/com/thing/sys/biz/controller/SysUserController.java b/modules/thing/src/main/java/com/thing/sys/biz/controller/SysUserController.java index 186642c..334ca6f 100644 --- a/modules/thing/src/main/java/com/thing/sys/biz/controller/SysUserController.java +++ b/modules/thing/src/main/java/com/thing/sys/biz/controller/SysUserController.java @@ -139,13 +139,6 @@ public class SysUserController { Long tcode = UserContext.getTenantCode(); //SysUserMenuDTO sysUserMenuDTO = sysUserMenuService.getSysUserMenuByUserId(data.getId()); - SysTenantDetailDTO detail = sysTenantDetailService.getDetail(TenantContext.getTenantCode(user)); - if (ObjectUtil.isNotNull(detail)){ - data.setLogo(StringUtils.isNotBlank(detail.getLogoUrl()) ? detail.getLogoUrl() : null); - data.setName(StringUtils.isNotBlank(detail.getTitle()) ? detail.getTitle() : detail.getName()); - data.setShowLogo(true); - data.setTitle(detail.getTitle()); - } SysUserMenuDTO userMenuDTO =sysUserMenuService.queryUrlByTenantcode(tcode); if (ObjectUtil.isNotNull(userMenuDTO)){ data.setUrl(userMenuDTO.getUrl()); diff --git a/modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java index ee44a7f..20f32fb 100644 --- a/modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java @@ -476,7 +476,9 @@ public class IotGroupInfoServiceImpl extends BaseServiceImpl and idc.id in diff --git a/modules/visual-design/src/main/java/com/thing/visual/board/controller/IotVisualManageController.java b/modules/visual-design/src/main/java/com/thing/visual/board/controller/IotVisualManageController.java index 9a6dc49..f10689f 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/board/controller/IotVisualManageController.java +++ b/modules/visual-design/src/main/java/com/thing/visual/board/controller/IotVisualManageController.java @@ -13,6 +13,7 @@ import com.thing.common.core.validator.group.DefaultGroup; import com.thing.common.core.validator.group.UpdateGroup; import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; +import com.thing.sys.oss.cloud.OSSFactory; import com.thing.sys.security.context.UserContext; import com.thing.visual.board.dto.IotVisualManageDTO; import com.thing.visual.board.service.IotVisualManageService; @@ -64,6 +65,7 @@ public class IotVisualManageController { @Operation(summary="信息") public Result get(@PathVariable("id") Long id){ IotVisualManageDTO data = iotVisualManageService.getIotBoardManageDTO(id); + data.setThumbnailUrl(OSSFactory.splice(data.getThumbnailUrl())); checkParam(data); return new Result().ok(data); } diff --git a/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java b/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java index 511b2a7..ca59f8a 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java +++ b/modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java @@ -183,7 +183,7 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl pageIotBoardManageDTO(Map params) { PageData 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 entityList = mapper.selectListByQuery(QueryWrapper.create().in(IotVisualManageEntity::getId, entity.getId())); - List urlList = entityList.stream().map(item -> "scada/preview?id=" + item.getId()).collect(Collectors.toList()); + List urlList = entityList.stream().map(item -> "visual/preview?id=" + item.getId()).collect(Collectors.toList()); if(CollectionUtil.isNotEmpty(urlList)){ List sysMenuDTOList = sysMenuService.getByUrlList(urlList); if (CollectionUtil.isNotEmpty(sysMenuDTOList)) { @@ -251,7 +251,7 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl entityList = mapper.selectListByQuery(QueryWrapper.create().in(IotVisualManageEntity::getId, ids)); //删除角色与菜单的关联表 - List urlList = entityList.stream().map(item -> "scada/preview?id=" + item.getId()).collect(Collectors.toList()); + List urlList = entityList.stream().map(item -> "visual/preview?id=" + item.getId()).collect(Collectors.toList()); List sysMenuDTOList = sysMenuService.getByUrlList(urlList); if (CollectionUtil.isNotEmpty(sysMenuDTOList)) { // List menuIdList = sysMenuDTOList.stream().map(SysMenuDTO::getId).collect(Collectors.toList()); @@ -259,6 +259,11 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl menuIdList = sysMenuDTOList.stream().map(SysMenuDTO::getId).collect(Collectors.toList()); + sysRoleMenuDao.deleteByMenuIds(menuIdList); + //删除菜单表 + menuIdList.forEach(temp-> sysMenuService.delete(temp)); + sysLanguageDao.deleteByQuery(QueryWrapper.create().in(SysLanguageEntity::getTableId, menuIdList)); } //删除大屏管理表 batchDelete(ids); @@ -272,8 +277,7 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl