增加租户的存储空间

blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java

@@ -83,6 +83,21 @@ public class Tenant extends BaseEntity {
 	 */
 	@ApiModelProperty(value = "账号额度")
 	private Integer accountNumber;
+
+
+	/**
+	 * 文件存储空间
+	 */
+	@ApiModelProperty(value = "文件存储空间 单位MB")
+	private Long fileSpace;
+
+
+	/**
+	 * 数据存储空间
+	 */
+	@ApiModelProperty(value = "数据存储空间 单位MB")
+	private Long dataSpace;
+
 	/**
 	 * 过期时间
 	 */

blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java

@@ -166,8 +166,15 @@ public class TenantController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "授权配置", notes = "传入ids,accountNumber,expireTime")
 	@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
-	public R setting(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "账号额度") Integer accountNumber, @ApiParam(value = "过期时间") Date expireTime) {
-		return R.status(tenantService.setting(accountNumber, expireTime, ids));
+	public R setting(@ApiParam(value = "主键集合", required = true) @RequestParam String ids,
+					 @ApiParam(value = "账号额度") Integer accountNumber,
+					 @ApiParam(value = "过期时间") Date expireTime,
+					 @ApiParam(value = "数据存储空间") Long dataSpace,
+					 @ApiParam(value = "文件存储空间") Long fileSpace
+					 ) {
+
+
+		return R.status(tenantService.setting(accountNumber,dataSpace,fileSpace, expireTime, ids));
 	}
 
 	/**

blade-service/blade-system/src/main/java/org/springblade/system/service/ITenantService.java

@@ -67,11 +67,13 @@ public interface ITenantService extends BaseService<Tenant> {
 	 * 配置租户授权
 	 *
 	 * @param accountNumber
+	 * @param dataSpace
+	 * @param fileSpace
 	 * @param expireTime
 	 * @param ids
 	 * @return
 	 */
-	boolean setting(Integer accountNumber, Date expireTime, String ids);
+	boolean setting(Integer accountNumber, Long dataSpace, Long fileSpace, Date expireTime, String ids);
 	/**
 	 * 自定义分页
 	 *

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RegionServiceImpl.java

@@ -252,12 +252,12 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 						areaObject.put("label", areaName);
 						areaArray.add(areaObject);
 					}
-					if (areaArray.size() > 0) {
+					if (!areaArray.isEmpty()) {
 						cityObject.put("children", areaArray);
 					}
 					cityArray.add(cityObject);
 				}
-				if (cityArray.size() > 0) {
+				if (!cityArray.isEmpty()) {
 					provinceObject.put("children", cityArray);
 				}
 				jsonArray.add(provinceObject);

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java

@@ -131,7 +131,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 	}
 
 	@Override
-	public boolean setting(Integer accountNumber, Date expireTime, String ids) {
+	public boolean setting(Integer accountNumber, Long dataSpace, Long fileSpace, Date expireTime, String ids) {
 		List<String> tenantIds = this.list(Wrappers.<Tenant>query().lambda().in(Tenant::getId, ids))
 			.stream().map(tenant -> Func.toStr(tenant.getTenantId())).distinct().collect(Collectors.toList());
 		CacheUtil.clear(SYS_CACHE, tenantIds);
@@ -141,6 +141,8 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 			update(
 				Wrappers.<Tenant>update().lambda()
 					.set(Tenant::getAccountNumber, accountNumber)
+					.set(Tenant::getDataSpace, dataSpace)
+					.set(Tenant::getFileSpace, fileSpace)
 					.set(Tenant::getExpireTime, expireTime)
 					.set(Tenant::getLicenseKey, licenseKey)
 					.eq(Tenant::getId, id)