From 6c7048cb95ad356afaab080798b92d9cfb8ca761 Mon Sep 17 00:00:00 2001 From: glj <管理局23456> Date: Tue, 11 Apr 2023 16:22:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/vo/EntityDataUserVo.java | 7 +++++- .../com/kening/vordm/config/VoRdmConfig.java | 8 +++++++ .../vordm/controller/CaptchaController.java | 2 +- .../vordm/service/EntityDataService.java | 3 ++- .../service/impl/EntityDataServiceImpl.java | 23 +++++++++++++++---- 5 files changed, 36 insertions(+), 7 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java index f7de346..d247879 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/EntityDataUserVo.java @@ -135,10 +135,15 @@ public class EntityDataUserVo { private String professionalTitle; /** - * 职称 + * 验证码key */ private String key; + /** + * 验证码 + */ + private String code; + /** * 文件信息 */ diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/config/VoRdmConfig.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/config/VoRdmConfig.java index 4a91ba6..4a39192 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/config/VoRdmConfig.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/config/VoRdmConfig.java @@ -1,8 +1,11 @@ package com.kening.vordm.config; import org.mybatis.spring.annotation.MapperScan; +import org.springblade.core.redis.serializer.ProtoStuffSerializer; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.serializer.RedisSerializer; /** * @author wanghongqing @@ -12,4 +15,9 @@ import org.springframework.context.annotation.Configuration; @ComponentScan({"org.springblade", "com.kening.vordm"}) @MapperScan({"org.springblade.**.mapper.**", "com.kening.**.mapper.**"}) public class VoRdmConfig { + + @Bean + public RedisSerializer redisSerializer() { + return new ProtoStuffSerializer(); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CaptchaController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CaptchaController.java index 8f63236..0795576 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CaptchaController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CaptchaController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; * @date 2023/3/31 11:10 **/ @RestController -@RequestMapping("/captcha") +@RequestMapping("/ui/captcha") @RequiredArgsConstructor @Api(value = "验证码校验接口", tags = "验证码校验") public class CaptchaController extends BladeController { diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataService.java index ccdc4f4..98b97f8 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.EntityData; import com.kening.vordm.vo.EntityDataUserVo; import com.kening.vordm.vo.UserTenantVo; +import org.springblade.core.tool.api.R; import java.util.List; @@ -28,5 +29,5 @@ public interface EntityDataService extends IService { * Resource upload 上传实体信息 * @return */ - Boolean saveEntityData(EntityDataUserVo entityDataUserVo); + R saveEntityData(EntityDataUserVo entityDataUserVo); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java index 35669ff..59236ed 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java @@ -13,8 +13,12 @@ import com.kening.vordm.vo.EntityDataUserVo; import com.kening.vordm.vo.UserTenantVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.cache.CacheNames; import org.springblade.core.oss.MinioTemplate; import org.springblade.core.oss.model.BladeFile; +import org.springblade.core.redis.cache.BladeRedis; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.StringUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -36,6 +40,11 @@ public class EntityDataServiceImpl extends ServiceImpl link = new ArrayList<>(); + //文件大小 + List size = new ArrayList<>(); //文件数据 List filesArray = entityDataUserVo.getFilesArray(); filesArray.stream().forEach(files->{ BladeFile bladeFile = minioTemplate.putFile(files); + //获取文件大小 + Long fileSize = files.getSize(); link.add(bladeFile.getLink()); + size.add(fileSize); }); //判断上传用户是否存在 @@ -91,15 +105,16 @@ public class EntityDataServiceImpl extends ServiceImpl1; + return R.status(this.baseMapper.insert(entityData)>0); }