bug修复

2025年3月6日18:53:31

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");

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;
 

modules/thing/src/main/java/com/thing/control/service/impl/IotDeviceControlLogServiceImpl.java

@@ -118,7 +118,7 @@ public class IotDeviceControlLogServiceImpl extends BaseServiceImpl<IotDeviceCon
             }
         }
 
-        return new PageData<>(list, page.getTotalRow());
+        return new PageData<>(list, CollectionUtil.size(list));
     }
 
     /**

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<IotDashboardElementDTO> iotDashboardElementDTOList;

modules/thing/src/main/java/com/thing/dashboard/service/impl/IotDashboardElementServiceImpl.java

@@ -44,9 +44,9 @@ public class IotDashboardElementServiceImpl extends BaseServiceImpl<IotDashboard
 
     @Override
     public QueryWrapper getWrapper(Map<String, Object> 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;
     }

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());

modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java

@@ -476,7 +476,9 @@ public class IotGroupInfoServiceImpl extends BaseServiceImpl<IotGroupInfoMapper,
         if(CollectionUtils.isNotEmpty(groupRelationEntities)){
             throw new SysException("当前组关联了物实体,无法删除");
         }
-        mapper.deleteBatchByIds(Arrays.asList(ids));
+        for (Long id : ids) {
+            mapper.deleteById(id);
+        }
     }
 
 

modules/thing/src/main/resources/mapper/control/IotDeviceControlMapper.xml

@@ -32,7 +32,7 @@
         FROM
             iot_device_control idc
                 LEFT JOIN iot_thing_entity itt ON idc.thing_id = itt.id
-                INNER JOIN iot_thing_dict_relation itd ON idc.attr_id = itd.id
+                LEFT JOIN iot_thing_dict_relation itd ON idc.attr_id = itd.id
         <where>
             <if test="ids != null">
                 and idc.id in

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<IotVisualManageDTO> get(@PathVariable("id") Long id){
         IotVisualManageDTO data = iotVisualManageService.getIotBoardManageDTO(id);
+        data.setThumbnailUrl(OSSFactory.splice(data.getThumbnailUrl()));
         checkParam(data);
         return new Result<IotVisualManageDTO>().ok(data);
     }

modules/visual-design/src/main/java/com/thing/visual/board/service/impl/IotVisualManageServiceImpl.java

@@ -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());
@@ -259,6 +259,11 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl<IotVisualManageM
 //            //删除菜单表
 //            sysMenuService.removeByIds(menuIdList);
 //            sysLanguageDao.deleteByQuery(QueryWrapper.create().in(SysLanguageEntity::getTableId, menuIdList));
+            List<Long> 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<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);
         }

modules/visual-design/src/main/java/com/thing/visual/group/service/impl/IotVisualGroupServiceImpl.java

@@ -96,12 +96,14 @@ public class IotVisualGroupServiceImpl extends BaseServiceImpl<IotVisualGroupMap
                         .set(IotVisualGroupEntity::getBsSort, temp.getSort())
                         .set(IotVisualGroupEntity::getThumbnailUrl,dto.getThumbnailUrl())
                         .set(IotVisualGroupEntity::getBusinessName,dto.getBusinessName())
+                        .set(IotVisualGroupEntity::getIsDefault,dto.getIsDefault())
                         .set(IotVisualGroupEntity::getRemark,dto.getRemark())
                         .where(IotVisualGroupEntity::getName).eq(dto.getName()).eq(IotVisualGroupEntity::getBusinessName,dto.getOldBusinessName())
                         .update();
             }else {
                 UpdateChain.of(IotVisualGroupEntity.class)
                         .set(IotVisualGroupEntity::getBsSort, temp.getSort())
+                        .set(IotVisualGroupEntity::getIsDefault,dto.getIsDefault())
                         .where(IotVisualGroupEntity::getName).eq(dto.getName()).eq(IotVisualGroupEntity::getBusinessName,temp.getName())
                         .update();
             }