测试 容量字段

720yun_fd_manage/gis_application/src/main/resources/application-locSit.properties

@@ -40,13 +40,11 @@ spring.datasource.druid.web-stat-filter.enabled=true
 spring.datasource.druid.stat-view-servlet.enabled=true
 
 
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.database=0
-#spring.redis.host=127.0.0.1
-spring.redis.host=120.24.144.164
+spring.redis.host=r-wz9owsphxqwi4ztqlfpd.redis.rds.aliyuncs.com
+spring.redis.password=3oo19bgh0cae2406&
 
+spring.redis.database=0
 spring.redis.port=6379
-spring.redis.password=bgh0cae240
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
 spring.redis.timeout=3000ms
 # \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002
@@ -59,7 +57,6 @@ spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-wait=-1ms
 
 
-
 #rabbit MQ
 #spring.rabbitmq.host=localhost
 #spring.rabbitmq.port=5672

720yun_fd_manage/gis_common/src/main/java/com/gis/common/config/WebMvcConfig.java

@@ -37,18 +37,18 @@ public class WebMvcConfig implements WebMvcConfigurer {
      * 配置全局跨域
      * 开发、测试环境开启跨域， 正式环境不开启
      */
-//    @Override
-//    public void addCorsMappings(CorsRegistry registry) {
-//        String active = configConstant.active;
-//        if ("dev".equals(active) || "sit".equals(active)){
-//            registry.addMapping("/**")
-//                    .allowedOrigins("*")
-//                    .allowCredentials(true)
-//                    .allowedMethods("GET", "POST", "DELETE", "PUT", "OPTIONS")
-//                    .maxAge(3600);
-//        }
-//
-//    }
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        String active = configConstant.active;
+        if ("dev".equals(active) || "sit".equals(active)|| "locSit".equals(active)){
+            registry.addMapping("/**")
+                    .allowedOrigins("*")
+                    .allowCredentials(true)
+                    .allowedMethods("GET", "POST", "DELETE", "PUT", "OPTIONS")
+                    .maxAge(3600);
+        }
+
+    }
 
 
     /**

720yun_fd_manage/gis_common/src/main/java/com/gis/common/test/ImageUtil.java

@@ -90,8 +90,8 @@ public class ImageUtil {
     }
 
     public static void main(String[] args) {
-        String path = "C:\\Users\\Administrator\\Desktop\\33\\aa.jpg";
-        new ImageUtil().thumbnailImage(path, 100, 150);
+        int MAX_SIZE = 1024 * 1024 * 6;
+        System.out.println("MAX_SIZE;"+MAX_SIZE);
     }
 
 }

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/SysUserEntity.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  */
 @Data
 @Entity
-@Table(name = "sys_user")
+@Table(name = "tb_user")
 public class SysUserEntity extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = -853504493430501564L;
@@ -30,8 +30,6 @@ public class SysUserEntity extends BaseEntity implements Serializable {
 //    @ApiModelProperty(value = "用户编号")
 //    private Integer userNum;
 
-    @ApiModelProperty(value = "性别 0:男  1：女")
-    private Integer sex;
 
     @ApiModelProperty(value = "手机号")
     private String phone;
@@ -39,11 +37,8 @@ public class SysUserEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "状态 0:启用  1：停用 2：注销")
     private Integer status;
 
-    @ApiModelProperty(value = "邮箱")
-    private String email;
 
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
+
 
     @ApiModelProperty(value = "管理者，0：是， 1：否")
     private Integer manager;

720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/SysUserMapper.java

@@ -16,10 +16,10 @@ public interface SysUserMapper extends IBaseMapper<SysUserEntity, Long> {
 //    @SelectProvider(type = UserProvider.class, method = "findAllBySearchKey")
 //    List<UserResponse> findAllBySearchKey(String searchKey);
 
-    @Select(value = "select * from sys_user where rec_status = 'A' AND user_name= #{userName}")
+    @Select(value = "select * from tb_user where is_delete = 0 AND user_name= #{userName}")
     SysUserEntity findByUserName(String userName);
 
-    @Select(value = "select * from sys_user where rec_status = 'A' AND phone = #{phone}")
+    @Select(value = "select * from tb_user where is_delete =0 AND phone = #{phone}")
     SysUserEntity findByPhone(String phone);
 //
 //    @SelectProvider(type = UserProvider.class, method = "findBySearchKey")

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/FodderServiceImpl.java

@@ -15,10 +15,7 @@ import com.gis.common.constant.RedisConstant;
 import com.gis.common.exception.BaseRuntimeException;
 import com.gis.common.util.*;
 import com.gis.domain.dto.*;
-import com.gis.domain.entity.DirEntity;
-import com.gis.domain.entity.FodderEntity;
-import com.gis.domain.entity.WorkEntity;
-import com.gis.domain.entity.WorkHotsFodderEntity;
+import com.gis.domain.entity.*;
 import com.gis.domain.vo.FodderVo;
 import com.gis.mapper.FodderMapper;
 import com.gis.mapper.IBaseMapper;
@@ -389,17 +386,21 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
     @Override
     public Result checkUserSize() {
         String phone = getUserNameForToken();
-
+        SysUserEntity sysUserEntity = sysUserService.findByPhoneIfNotBeSave(phone);
         // 检查用户空间, 2022-11-16 免检用户
+        Map<String ,Integer> space=new HashMap<>();
         Integer size = null;
         if (FREE_SIZE_USER.contains(phone)){
             size = 0;
-            return Result.success(size);
+            space.put("useSpace",size);
+            space.put("totalSpace",9999999);
+            return Result.success(space);
         }
-
         size = entityMapper.countSize(phone);
         size = size == null? 0 : size;
-        return Result.success(size);
+        space.put("useSpace",size);
+        space.put("totalSpace",sysUserEntity.getSize());
+        return Result.success(space);
     }
 
 

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/SysUserServiceImpl.java

@@ -1,6 +1,8 @@
 package com.gis.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.amazonaws.services.dynamodbv2.xspec.S;
+import com.gis.common.util.RedisUtil;
 import com.gis.domain.entity.SysUserEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.SysUserMapper;
@@ -9,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 
 /**
@@ -16,9 +19,11 @@ import java.util.List;
  */
 @Service
 public class SysUserServiceImpl extends IBaseServiceImpl<SysUserEntity, Long> implements SysUserService {
-
+    @Autowired
+    RedisUtil redisUtil;
     @Autowired
     private SysUserMapper entityMapper;
+    static final String USER_PHONE_KEY = "720:user:phone:";
 
     @Override
     public IBaseMapper<SysUserEntity, Long> getBaseMapper() {
@@ -33,7 +38,18 @@ public class SysUserServiceImpl extends IBaseServiceImpl<SysUserEntity, Long> im
 
     @Override
     public SysUserEntity findByPhone(String phone) {
-        return entityMapper.findByPhone(phone);
+        String key=USER_PHONE_KEY+phone;
+        if (redisUtil.hasKey(key)){
+            Object o = redisUtil.get(key);
+            return (SysUserEntity)o;
+        }else {
+            SysUserEntity sysUser = entityMapper.findByPhone(phone);
+            if (ObjectUtil.isNotNull(sysUser)){
+                redisUtil.set(key, sysUser, 12, TimeUnit.HOURS);
+                return sysUser;
+            }
+        }
+        return null;
     }
 
     @Override