分页参数、aws key加密统一

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceGroupController.java

@@ -1,6 +1,7 @@
 package com.dongjian.dashboard.back.controller;
 
 import com.dongjian.dashboard.back.configurator.aspect.OperationLog;
+import com.dongjian.dashboard.back.dto.BaseSearchNoCompanysParams;
 import com.dongjian.dashboard.back.dto.devicegroup.*;
 import com.dongjian.dashboard.back.vo.device.DeviceVO;
 import io.swagger.v3.oas.annotations.Hidden;
@@ -154,6 +155,7 @@ public class DeviceGroupController {
 	@RequestMapping(value = "/getBindedDeviceByGroup/{deviceGroupId}", method = RequestMethod.GET)
 	public PageResponse<PageInfo<DeviceVO>> getBindedDeviceByGroup(
 			@PathVariable Long deviceGroupId,
+			BaseSearchNoCompanysParams BaseSearchNoCompanysParams,
 			@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,
@@ -161,6 +163,8 @@ public class DeviceGroupController {
 			@Parameter(name = "LanguageType", description = "Language type: 0 - Chinese, 1 - English, 2 - Japanese", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required = true) Integer LanguageType) {
 
 		DeviceGroupSearchParams pageSearchParam = new DeviceGroupSearchParams();
+		pageSearchParam.setPageNum(BaseSearchNoCompanysParams.getPageNum());
+		pageSearchParam.setPageSize(BaseSearchNoCompanysParams.getPageSize());
 		pageSearchParam.setUserId(UserId);
 		pageSearchParam.setDeviceGroupIdList(Collections.singletonList(deviceGroupId));
 

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/CommonServiceImpl.java

@@ -12,6 +12,7 @@ import com.dongjian.dashboard.back.common.response.ResponseCode;
 import com.dongjian.dashboard.back.dto.common.BatchGetFileTemporaryParams;
 import com.dongjian.dashboard.back.model.S3FileMapping;
 import com.dongjian.dashboard.back.model.S3FileMappingExample;
+import com.dongjian.dashboard.back.util.DESUtil;
 import com.dongjian.dashboard.back.vo.common.TemporaryInfo;
 import com.dongjian.dashboard.back.vo.company.AuroraInfo;
 import org.apache.commons.collections.CollectionUtils;
@@ -129,10 +130,10 @@ public class CommonServiceImpl implements CommonService {
 		DataSourceContextHolder.setCurrentDataSourceKey(Constants.DATASOURCE_PREFIX+ apikeyInfo.getId());
 
 		String bucketName = awsBucketAdress;
-		String accessKey = awsAccessKeyId;
-		String secretKey = awsAccessSecret;
 
-		AwsBasicCredentials awsCredentials = AwsBasicCredentials.create(accessKey, secretKey);
+		AwsBasicCredentials awsCredentials = AwsBasicCredentials.create(
+				DESUtil.decrypt(awsAccessKeyId, Constants.DES_SALT),
+				DESUtil.decrypt(awsAccessSecret, Constants.DES_SALT));
 		Region region = Region.AP_NORTHEAST_1;
 
 		S3Presigner presigner = null;