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 0dab79a..e767ba9 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 @@ -11,6 +11,7 @@ import com.techsor.datacenter.business.model.GatewayClients; import com.techsor.datacenter.business.service.GatewayClientsService; import com.techsor.datacenter.business.vo.device.BuildInFunctionVO; import com.techsor.datacenter.business.vo.device.DeviceVO; +import com.techsor.datacenter.business.vo.floor.FloorPageVO; import com.techsor.datacenter.business.vo.gateway.GatewayClientsStatisticsCount; import com.techsor.datacenter.business.vo.gateway.GatewayClientsStatisticsVO; @@ -59,6 +60,20 @@ public class GatewayClientsController { return pageResponse; } + @Operation(summary = "Get Gateway clients ", description = "") + @PostMapping(path = "/getAll") + public SimpleDataResponse> getBuildInFunctionList( + @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required = true) String LoginName, + @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required = true) String AccessToken, + @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required = true) Long UserId, + @Parameter(name = "CompanyId", description = "User's company ID", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required = false) Long CompanyId, + @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)); + return dataResponse; + } + @Operation(summary = "add", description = "") @PostMapping(path = "/add") public SimpleDataResponse add( diff --git a/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/GatewayClientsMapperExt.java b/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/GatewayClientsMapperExt.java index bcb0dbd..eb62a34 100644 --- a/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/GatewayClientsMapperExt.java +++ b/data-center-business-dao/src/main/java/com/techsor/datacenter/business/dao/ex/GatewayClientsMapperExt.java @@ -22,6 +22,7 @@ import java.util.Map; @Mapper public interface GatewayClientsMapperExt extends GatewayClientsMapper { + List getAll(@Param("companyId") Long companyId); List getListPage(@Param("param") GatewayClientsQueryParam param, @Param("companyId") Long companyId); } 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 816896f..288c30b 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 @@ -54,7 +54,8 @@ device_info.gateway_info_id, data_provider_gateway_info.name gatewayInfoName, device_info.alarm_level, device_info.unit,device_info.data_mapping, dashboard_device_group.id deviceGroupId, dashboard_device_group.name deviceGroupName, - gateway_clients.client_name gatewayClientName + gateway_clients.client_name gatewayClientName, + device_category.category_name_jp categoryName from device_info left join basic_project on device_info.project_id = basic_project.id 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 d7a7d3f..05d6dfc 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 @@ -44,6 +44,7 @@ public class DeviceVO { private Long typeId; private Long categoryId; + private Long categoryName; private String typeName; @@ -65,6 +66,7 @@ public class DeviceVO { private String assetSymbol; + private String gatewayId; private String gatewayClientName; private Integer flag; diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/GatewayClientsService.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/GatewayClientsService.java index b0abbe4..dad7173 100644 --- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/GatewayClientsService.java +++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/GatewayClientsService.java @@ -18,6 +18,7 @@ import java.util.List; */ public interface GatewayClientsService { + List getAll(Long userId, Long companyId, Integer languageType); PageInfo query(GatewayClientsQueryParam param, Long userId, Long companyId, Integer languageType); SimpleDataResponse add(GatewayClientsAddParam param, Long userId, Long companyId, Integer languageType); 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 e5c7e93..4384528 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 @@ -89,6 +89,12 @@ public class GatewayClientsServiceImpl implements GatewayClientsService { return new PageInfo<>(resultList); } + @Override + public List getAll(Long userId, Long companyId, Integer languageType) { + List resultList = gatewayClientsMapperExt.getListPage(null,companyId); + return resultList; + } + @Override public SimpleDataResponse count(Long userId, Long companyId, Integer languageType) {