设备批量导入支持GatewayClientId

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

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;
     }
 

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
         <if test="deviceVO.targetIdValue != null ">
             left join target_id_check tic on dac.id = tic.alert_config_id
         </if>

data-center-business-dao/src/main/resources/mappers/ex/GatewayClientsMapperExt.xml

@@ -40,4 +40,28 @@
 
   </select>
 
+  <select id="getAll" resultType="com.techsor.datacenter.business.dto.gateway.GatewayClientsQueryResponse">
+    select
+    gateway_clients.id as id,
+    gateway_clients.client_id as clientId,
+    gateway_clients.client_name as clientName,
+    gateway_clients.online_status as onlineStatus,
+    gateway_clients.last_updata_ts as lastUpdataTs,
+    gateway_clients.create_ts as createTs,
+    gateway_clients.address as address,
+    gateway_clients.data_amount_threshold,
+    gateway_clients.data_amount_threshold_alarm,
+    gateway_clients.company_id as companyId,
+    gateway_clients.alert_switch as alertSwitch,
+    gateway_clients.project_id as projectId,
+    gateway_clients.building_id as buildingId,
+    basic_project.project_name as projectName,
+    basic_building.name as buildingName
+    from
+    gateway_clients
+    left join basic_project on gateway_clients.project_id = basic_project.id
+    left join basic_building on gateway_clients.building_id = basic_building.building_id
+    where gateway_clients.flag = 0 and gateway_clients.company_id = #{companyId}
+  </select>
+
 </mapper>

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;
 

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;
 

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;
 

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;
 

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;

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<GatewayClients> assetList = this.gatewayClientsMapperExt.selectByExample(gatewayClientsExample);
             if (CollectionUtils.isEmpty(assetList)) {
                 return false;

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<GatewayClientsQueryResponse> getAll(Long userId, Long companyId, Integer languageType) {
-		List<GatewayClientsQueryResponse> resultList = gatewayClientsMapperExt.getListPage(null,companyId);
+		List<GatewayClientsQueryResponse> resultList = gatewayClientsMapperExt.getAll(companyId);
 		return resultList;
 	}