diff --git a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/DeviceController.java b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/DeviceController.java index c5870bb..f8f2350 100644 --- a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/DeviceController.java +++ b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/DeviceController.java @@ -366,7 +366,6 @@ public class DeviceController { @Parameter(name = "UTCOffset", description = "Offset between GMT and local time in minutes, e.g., -480 for GMT+8") @RequestHeader(required = true) Integer UTCOffset, @RequestBody MultipartFile files, HttpServletResponse response) { - return this.deviceExcelService.importDeviceInfosExcelFiles(wsClientId, files, UserId, CompanyId, LanguageType); } diff --git a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java index e767ba9..6145cd7 100644 --- a/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java +++ b/data-center-business-controller/src/main/java/com/techsor/datacenter/business/controller/GatewayClientsController.java @@ -70,7 +70,7 @@ public class GatewayClientsController { @Parameter(name = "LanguageType", description = "Language type 0: Chinese 1: English 2: Japanese", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required = true) Integer LanguageType, @Parameter(name = "UTCOffset", description = "Offset between GMT and local time in minutes, e.g., -480 for GMT+8") @RequestHeader(required = true) Integer UTCOffset ){ - SimpleDataResponse dataResponse =SimpleDataResponse.success(gatewayClientsService.getAll(CompanyId, UserId, LanguageType)); + SimpleDataResponse dataResponse =SimpleDataResponse.success(gatewayClientsService.getAll(UserId, CompanyId, LanguageType)); return dataResponse; } diff --git a/data-center-business-controller/src/main/resources/template/deviceInfo_zh.xlsx b/data-center-business-controller/src/main/resources/template/deviceInfo_zh.xlsx index 0a73421..7cfd421 100644 Binary files a/data-center-business-controller/src/main/resources/template/deviceInfo_zh.xlsx and b/data-center-business-controller/src/main/resources/template/deviceInfo_zh.xlsx differ diff --git a/data-center-business-controller/src/main/resources/template/en/deviceInfo_en.xlsx b/data-center-business-controller/src/main/resources/template/en/deviceInfo_en.xlsx index 025f49f..b9a9b44 100644 Binary files a/data-center-business-controller/src/main/resources/template/en/deviceInfo_en.xlsx and b/data-center-business-controller/src/main/resources/template/en/deviceInfo_en.xlsx differ diff --git a/data-center-business-controller/src/main/resources/template/jp/deviceInfo_jp.xlsx b/data-center-business-controller/src/main/resources/template/jp/deviceInfo_jp.xlsx index 8c93e20..edeedaa 100644 Binary files a/data-center-business-controller/src/main/resources/template/jp/deviceInfo_jp.xlsx and b/data-center-business-controller/src/main/resources/template/jp/deviceInfo_jp.xlsx differ diff --git a/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml b/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml index 288c30b..57d76fe 100644 --- a/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml +++ b/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml @@ -55,6 +55,7 @@ device_info.unit,device_info.data_mapping, dashboard_device_group.id deviceGroupId, dashboard_device_group.name deviceGroupName, gateway_clients.client_name gatewayClientName, + gateway_clients.id gatewayId, device_category.category_name_jp categoryName from device_info @@ -71,7 +72,7 @@ left join device_alert_config dac on device_info.id=dac.device_config_id and dac.flag = 0 left join dashboard_device_group_relation on dashboard_device_group_relation.device_info_id = device_info.id left join dashboard_device_group on dashboard_device_group_relation.device_group_id = dashboard_device_group.id - left join gateway_clients on gateway_clients.client_id = device_info.gateway_client_id + left join gateway_clients on gateway_clients.id = device_info.gateway_client_id left join target_id_check tic on dac.id = tic.alert_config_id diff --git a/data-center-business-dao/src/main/resources/mappers/ex/GatewayClientsMapperExt.xml b/data-center-business-dao/src/main/resources/mappers/ex/GatewayClientsMapperExt.xml index 07c1300..7ededf4 100644 --- a/data-center-business-dao/src/main/resources/mappers/ex/GatewayClientsMapperExt.xml +++ b/data-center-business-dao/src/main/resources/mappers/ex/GatewayClientsMapperExt.xml @@ -40,4 +40,28 @@ + + \ No newline at end of file diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceSearchParams.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceSearchParams.java index 5ca9de9..fb0dcc0 100644 --- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceSearchParams.java +++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/device/DeviceSearchParams.java @@ -45,6 +45,9 @@ public class DeviceSearchParams extends BaseSearchParams { @Schema(description = "Asset symbol", example = "asset-01") private String assetSymbol; + @Schema(description = "gatewayClientName", example = "asset-01") + private String gatewayClientName; + @Schema(description = "Target ID value", example = "33") private Integer targetIdValue; diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelCn.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelCn.java index 83b8cd9..4631878 100644 --- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelCn.java +++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelCn.java @@ -65,6 +65,9 @@ public class DeviceInfoExcelCn { @ExcelProperty(value ="资产符号") private String assetSymbol; + @ExcelProperty(value ="网关ClientID") + private String gatewayClientId; + @ExcelProperty(value ="项目名称") private String projectName; diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelEn.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelEn.java index 827c3da..8395a5f 100644 --- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelEn.java +++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelEn.java @@ -35,6 +35,9 @@ public class DeviceInfoExcelEn { @ExcelProperty(value ="asset symbol") private String assetSymbol; + @ExcelProperty(value ="gateway client id") + private String gatewayClientId; + @ExcelProperty(value ="project name") private String projectName; diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelJp.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelJp.java index 4e541a5..66c3e18 100644 --- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelJp.java +++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/importexcel/deviceinfo/DeviceInfoExcelJp.java @@ -37,6 +37,9 @@ public class DeviceInfoExcelJp { @ExcelProperty(value ="資産記号") private String assetSymbol; + @ExcelProperty(value ="クライアントID") + private String gatewayClientId; + // @ExcelProperty(value ="DBM ClientID") // private String clientId; diff --git a/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java index 05d6dfc..0ce7ba8 100644 --- a/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java +++ b/data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/device/DeviceVO.java @@ -66,7 +66,7 @@ public class DeviceVO { private String assetSymbol; - private String gatewayId; + private Integer gatewayId; private String gatewayClientName; private Integer flag; diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java index f582b27..cf8d3c9 100644 --- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java +++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/DeviceServiceImpl.java @@ -847,9 +847,9 @@ public class DeviceServiceImpl implements IDeviceService { errorList.add(msgLanguageChange.getParameterMapByCode(languageType, "assetSymbolDoesNotExist")); } - // Floor Check + // gatewayClient Check boolean gatewayClientExist = checkGatewayClient(deviceInfoExcel.getGatewayClientId(), companyId, deviceInfo); - if (!floorExists) { + if (!gatewayClientExist) { errorList.add(msgLanguageChange.getParameterMapByCode(languageType, "floorNameDoesNotExist")); } @@ -2097,12 +2097,12 @@ public class DeviceServiceImpl implements IDeviceService { } - private boolean checkGatewayClient(String gatewayClientName, long companyId, DeviceInfo deviceInfo) { - if (StringUtils.isBlank(gatewayClientName)) { + private boolean checkGatewayClient(String gatewayClientId, long companyId, DeviceInfo deviceInfo) { + if (StringUtils.isBlank(gatewayClientId)) { return true; } else { GatewayClientsExample gatewayClientsExample = new GatewayClientsExample(); - gatewayClientsExample.createCriteria().andClientNameEqualTo(gatewayClientName).andCompanyIdEqualTo(companyId).andFlagEqualTo(0); + gatewayClientsExample.createCriteria().andClientIdEqualTo(gatewayClientId).andCompanyIdEqualTo(companyId).andFlagEqualTo(0); List assetList = this.gatewayClientsMapperExt.selectByExample(gatewayClientsExample); if (CollectionUtils.isEmpty(assetList)) { return false; diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java index 4384528..cfbdb45 100644 --- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java +++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/GatewayClientsServiceImpl.java @@ -91,7 +91,7 @@ public class GatewayClientsServiceImpl implements GatewayClientsService { @Override public List getAll(Long userId, Long companyId, Integer languageType) { - List resultList = gatewayClientsMapperExt.getListPage(null,companyId); + List resultList = gatewayClientsMapperExt.getAll(companyId); return resultList; }