|
@@ -1,7 +1,6 @@
|
|
|
package com.gis.service.impl;
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
-import cn.hutool.core.img.ImgUtil;
|
|
|
import cn.hutool.core.io.FileTypeUtil;
|
|
|
import cn.hutool.core.io.FileUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
@@ -9,7 +8,6 @@ import com.gis.common.config.RabbitConfig;
|
|
|
import com.gis.common.constant.CmdConstant;
|
|
|
import com.gis.common.constant.ConfigConstant;
|
|
|
import com.gis.common.constant.ErrorEnum;
|
|
|
-import com.gis.common.constant.MsgCode;
|
|
|
import com.gis.common.exception.BaseRuntimeException;
|
|
|
import com.gis.common.util.*;
|
|
|
import com.gis.domain.dto.*;
|
|
@@ -21,21 +19,16 @@ import com.gis.service.FodderService;
|
|
|
import com.gis.service.SceneService;
|
|
|
import com.gis.service.WorkService;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
-import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.junit.Test;
|
|
|
import org.springframework.amqp.rabbit.core.RabbitTemplate;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.web.bind.annotation.PathVariable;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
import tk.mybatis.mapper.entity.Condition;
|
|
|
|
|
|
import javax.transaction.Transactional;
|
|
|
-import java.awt.image.BufferedImage;
|
|
|
-import java.util.ArrayList;
|
|
|
+import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
|
|
@@ -75,6 +68,9 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
|
|
|
// 用户最大空间3G
|
|
|
static int MAX_SIZE = 1024 * 1024 * 3;
|
|
|
|
|
|
+ // 无限空间用户
|
|
|
+ private static List<String> FREE_SIZE_USER = Arrays.asList("66666666666");
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public IBaseMapper<FodderEntity, Long> getBaseMapper() {
|
|
@@ -90,8 +86,10 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
|
|
|
log.info("用户名:{}", phone);
|
|
|
BaseRuntimeException.isBlank(phone, null, "解析token用户失败");
|
|
|
|
|
|
- // 检查用户空间
|
|
|
- checkUserSize(phone);
|
|
|
+ // 检查用户空间, 2022-11-16 免检用户
|
|
|
+ if (!FREE_SIZE_USER.contains(phone)){
|
|
|
+ checkUserSize(phone);
|
|
|
+ }
|
|
|
// 检查非法文件上传
|
|
|
boolean checkFile = FileUtils.checkFile(file);
|
|
|
if (!checkFile) {
|
|
@@ -331,7 +329,15 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
|
|
|
@Override
|
|
|
public Result checkUserSize() {
|
|
|
String phone = getUserNameForToken();
|
|
|
- Integer size = entityMapper.countSize(phone);
|
|
|
+
|
|
|
+ // 检查用户空间, 2022-11-16 免检用户
|
|
|
+ Integer size = null;
|
|
|
+ if (FREE_SIZE_USER.contains(phone)){
|
|
|
+ size = 0;
|
|
|
+ return Result.success(size);
|
|
|
+ }
|
|
|
+
|
|
|
+ size = entityMapper.countSize(phone);
|
|
|
size = size == null? 0 : size;
|
|
|
return Result.success(size);
|
|
|
}
|