From f02e07c9b700eecee71a73d3f9adb0acbbd52213 Mon Sep 17 00:00:00 2001 From: xiachao Date: Tue, 10 Sep 2024 08:41:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E6=80=81=E5=A4=A7=E5=B1=8F=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=EF=BC=8Cbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/utils/HttpContextUtils.java | 20 +++++++++++-------- .../listener/ProductionResultListener.java | 1 - .../visual/board/dto/IotVisualManageDTO.java | 2 +- .../board/entity/IotVisualManageEntity.java | 2 ++ .../impl/IotVisualManageServiceImpl.java | 13 +++++++++--- .../impl/IotVisualDesignServiceImpl.java | 7 +++++-- .../impl/IotVisualGroupServiceImpl.java | 4 ++-- .../material/dto/IotVisualMaterialDTO.java | 4 ++-- .../impl/IotVisualMaterialServiceImpl.java | 17 +++++++--------- 9 files changed, 41 insertions(+), 29 deletions(-) diff --git a/common/core/src/main/java/com/thing/common/core/utils/HttpContextUtils.java b/common/core/src/main/java/com/thing/common/core/utils/HttpContextUtils.java index 5f48dc3..18fe93d 100644 --- a/common/core/src/main/java/com/thing/common/core/utils/HttpContextUtils.java +++ b/common/core/src/main/java/com/thing/common/core/utils/HttpContextUtils.java @@ -83,14 +83,18 @@ public class HttpContextUtils { public static String getLanguage() { //默认语言 String defaultLanguage = "zh-CN"; -// //request -// HttpServletRequest request = getHttpServletRequest(); -// if(request == null){ -// return defaultLanguage; -// } -// -// //请求语言 -// defaultLanguage = request.getHeader(HttpHeaders.ACCEPT_LANGUAGE); + //request + HttpServletRequest request = getHttpServletRequest(); + if(request == null){ + return defaultLanguage; + } + + //请求语言 + try { + defaultLanguage = request.getHeader(HttpHeaders.ACCEPT_LANGUAGE); + } catch (Exception e) { + throw new RuntimeException(e); + } return defaultLanguage; } diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/event/standardcal/listener/ProductionResultListener.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/event/standardcal/listener/ProductionResultListener.java index 4b3232c..a2062e9 100644 --- a/modules/carbon-track/src/main/java/com/thing/carbontrack/event/standardcal/listener/ProductionResultListener.java +++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/event/standardcal/listener/ProductionResultListener.java @@ -68,7 +68,6 @@ public class ProductionResultListener { * 计算产品批次碳足迹 * @param production */ - @Transactional public synchronized void calculate(ProductionPage production){ try { QuantityDto quantityDto = iotCarbonProductionRecordService.getQuantityByMidAndPrCode(production.getMId(),production.getPrCode()); diff --git a/modules/visual-design/src/main/java/com/thing/visual/board/dto/IotVisualManageDTO.java b/modules/visual-design/src/main/java/com/thing/visual/board/dto/IotVisualManageDTO.java index 4fb1e1d..5fb2589 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/board/dto/IotVisualManageDTO.java +++ b/modules/visual-design/src/main/java/com/thing/visual/board/dto/IotVisualManageDTO.java @@ -51,6 +51,6 @@ public class IotVisualManageDTO implements Serializable { @Schema(description = "所属企业(租户code)") private Long tenantCode; - + private Integer isDefault; } \ No newline at end of file diff --git a/modules/visual-design/src/main/java/com/thing/visual/board/entity/IotVisualManageEntity.java b/modules/visual-design/src/main/java/com/thing/visual/board/entity/IotVisualManageEntity.java index 21420c0..b3ae60b 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/board/entity/IotVisualManageEntity.java +++ b/modules/visual-design/src/main/java/com/thing/visual/board/entity/IotVisualManageEntity.java @@ -49,4 +49,6 @@ public class IotVisualManageEntity extends BaseInfoEntity { */ private String previewUrl; + private Integer isDefault; + } \ No newline at end of file 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 2c28c6e..6ee02d5 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 @@ -29,6 +29,7 @@ import com.thing.sys.biz.service.SysMenuService; import com.thing.sys.biz.service.SysRoleMenuService; import com.thing.sys.biz.service.SysRoleService; import com.thing.sys.security.context.TenantContext; +import com.thing.sys.security.context.UserContext; import com.thing.sys.security.domain.SecurityUser; import com.thing.sys.security.domain.UserDetail; import com.thing.util.TenantSubsetUtil; @@ -56,6 +57,8 @@ import java.util.*; import java.util.stream.Collectors; import static com.mybatisflex.core.query.QueryMethods.column; +import static com.thing.visual.board.entity.table.IotVisualManageEntityTableDef.IOT_VISUAL_MANAGE_ENTITY; +import static com.thing.visual.component.entity.table.IotVisualComponentEntityTableDef.IOT_VISUAL_COMPONENT_ENTITY; /** * 组态大屏管理 @@ -88,7 +91,8 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl params){ QueryColumn nameColumn = column("name"); - QueryColumn idColumn = column("id::varchar"); + QueryColumn idColumn = column("id"); + Long tenantCode = UserContext.getTenantCode(); QueryWrapper wrapper = new QueryWrapper(); String type = (String) params.get("type"); @@ -105,10 +109,13 @@ public class IotVisualManageServiceImpl extends BaseServiceImpl idList = Arrays.asList(ids.split(",")); + List idList = Arrays.stream(ids.split(",")) + .map(String::trim) // 去掉可能的空格 + .map(Long::parseLong) // 将每个字符串转换为 Long + .collect(Collectors.toList()); wrapper.in( "id", idList,CollectionUtils.isNotEmpty(idList)); } - wrapper.in("tenant_code",tenantSubsetUtil.paramsAddTenantCodeList(true)); + wrapper.and(IOT_VISUAL_MANAGE_ENTITY.TENANT_CODE.eq(tenantCode).or(IOT_VISUAL_MANAGE_ENTITY.IS_DEFAULT.eq(0))); return wrapper; } diff --git a/modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java b/modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java index b3e6e16..e033d07 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java +++ b/modules/visual-design/src/main/java/com/thing/visual/configuration/service/impl/IotVisualDesignServiceImpl.java @@ -114,13 +114,16 @@ public class IotVisualDesignServiceImpl extends BaseServiceImpl apiIds = Arrays.asList(data.getApiSetIds().split(",")); + List apiIds = Arrays.stream(data.getApiSetIds().split(",")) + .map(String::trim) // 去掉可能的空格 + .map(Long::parseLong) // 将每个字符串转换为 Long + .collect(Collectors.toList()); if(!apiIds.isEmpty()){ data.setIotThingApiDTOList( ConvertUtils.sourceToTarget(iotThingApiDao.selectListByIds(apiIds), IotThingApiDTO.class)); } diff --git a/modules/visual-design/src/main/java/com/thing/visual/group/service/impl/IotVisualGroupServiceImpl.java b/modules/visual-design/src/main/java/com/thing/visual/group/service/impl/IotVisualGroupServiceImpl.java index 529c0b8..8b43f02 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/group/service/impl/IotVisualGroupServiceImpl.java +++ b/modules/visual-design/src/main/java/com/thing/visual/group/service/impl/IotVisualGroupServiceImpl.java @@ -95,12 +95,12 @@ public class IotVisualGroupServiceImpl extends BaseServiceImpl params){ - QueryColumn is_default = column("is_default"); - QueryColumn tenant_code = column("tenant_code"); - QueryWrapper wrapper = new QueryWrapper(); wrapper.leftJoin("iot_visual_group").on("iot_visual_material.group_id = iot_visual_group.id"); @@ -88,14 +85,14 @@ public class IotVisualMaterialServiceImpl extends BaseServiceImpl