From 3c630c05c676ebd47775eb8922d3ed2225876fd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?= <2847127106@qq.com> Date: Tue, 13 Aug 2024 09:40:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-resource-common/pom.xml | 4 +++ .../muyu/resource/domain/ResourceInfo.java | 1 + .../domain/resp/ResourceInfoResp.java | 7 ++++ .../controller/ResourceController.java | 4 +-- .../resource/service/ResourceService.java | 2 +- .../service/impl/ResourceServiceImpl.java | 35 ++++++++----------- .../com/muyu/resource/utils/ExcelUtils.java | 0 7 files changed, 30 insertions(+), 23 deletions(-) rename {cloud-resource-common => cloud-resource-server}/src/main/java/com/muyu/resource/utils/ExcelUtils.java (100%) diff --git a/cloud-resource-common/pom.xml b/cloud-resource-common/pom.xml index 2882038..144f557 100644 --- a/cloud-resource-common/pom.xml +++ b/cloud-resource-common/pom.xml @@ -23,6 +23,10 @@ cloud-common-core + + com.muyu + cloud-common-redis + diff --git a/cloud-resource-common/src/main/java/com/muyu/resource/domain/ResourceInfo.java b/cloud-resource-common/src/main/java/com/muyu/resource/domain/ResourceInfo.java index 3d7f236..fdb6d86 100644 --- a/cloud-resource-common/src/main/java/com/muyu/resource/domain/ResourceInfo.java +++ b/cloud-resource-common/src/main/java/com/muyu/resource/domain/ResourceInfo.java @@ -68,6 +68,7 @@ public class ResourceInfo { /** * 为精确查询情况赋值 */ + public void setFlag(ResourceReq req) { this.flag = this.getTitle().equals(req.getTitle()) && this.getPissn().equals(req.getPissn()) diff --git a/cloud-resource-common/src/main/java/com/muyu/resource/domain/resp/ResourceInfoResp.java b/cloud-resource-common/src/main/java/com/muyu/resource/domain/resp/ResourceInfoResp.java index eea3b87..d8d4efc 100644 --- a/cloud-resource-common/src/main/java/com/muyu/resource/domain/resp/ResourceInfoResp.java +++ b/cloud-resource-common/src/main/java/com/muyu/resource/domain/resp/ResourceInfoResp.java @@ -2,8 +2,11 @@ package com.muyu.resource.domain.resp; import com.alibaba.excel.annotation.ExcelProperty; import com.muyu.common.core.annotation.Excel; +import com.muyu.resource.domain.ResourceInfo; import lombok.*; +import java.util.List; + /** * @Author: 胡杨 * @Name: ResourceInfo @@ -18,6 +21,8 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor public class ResourceInfoResp { + // 序号 + private Integer id; /* * 题名 */ @@ -84,7 +89,9 @@ public class ResourceInfoResp { @Excel(name = "语种") private String language; + private List resourceInfoList; + private Integer code = 0; } diff --git a/cloud-resource-server/src/main/java/com/muyu/resource/controller/ResourceController.java b/cloud-resource-server/src/main/java/com/muyu/resource/controller/ResourceController.java index b1ed202..ced3bf6 100644 --- a/cloud-resource-server/src/main/java/com/muyu/resource/controller/ResourceController.java +++ b/cloud-resource-server/src/main/java/com/muyu/resource/controller/ResourceController.java @@ -39,8 +39,8 @@ public class ResourceController { * @return */ @PostMapping("/upload") - public Result> upload(@RequestParam("file") MultipartFile file) { - return Result.success(service.upload(file)); + public Result upload(@RequestParam("file") MultipartFile file) { + return Result.success(service.upload(file), "上传成功"); } /** diff --git a/cloud-resource-server/src/main/java/com/muyu/resource/service/ResourceService.java b/cloud-resource-server/src/main/java/com/muyu/resource/service/ResourceService.java index f930464..1f4be71 100644 --- a/cloud-resource-server/src/main/java/com/muyu/resource/service/ResourceService.java +++ b/cloud-resource-server/src/main/java/com/muyu/resource/service/ResourceService.java @@ -17,7 +17,7 @@ import java.util.List; */ public interface ResourceService{ - PageResult upload(MultipartFile file); + Boolean upload(MultipartFile file); List findResourceByPissn(ResourceReq req); diff --git a/cloud-resource-server/src/main/java/com/muyu/resource/service/impl/ResourceServiceImpl.java b/cloud-resource-server/src/main/java/com/muyu/resource/service/impl/ResourceServiceImpl.java index 421e8b2..ba002ef 100644 --- a/cloud-resource-server/src/main/java/com/muyu/resource/service/impl/ResourceServiceImpl.java +++ b/cloud-resource-server/src/main/java/com/muyu/resource/service/impl/ResourceServiceImpl.java @@ -7,8 +7,6 @@ import javax.annotation.Resource; import com.alibaba.fastjson.JSONObject; import com.muyu.common.core.utils.StringUtils; import com.muyu.resource.domain.result.PageResult; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.muyu.resource.domain.ResourceInfo; import com.muyu.resource.domain.req.ResourceReq; import com.muyu.resource.domain.resp.ResourceInfoResp; @@ -38,18 +36,17 @@ public class ResourceServiceImpl implements ResourceService { @Resource private ResourceMapper mapper; @Resource - private RedisTemplate redisTemplate; + private RedisTemplate redisTemplate; + private static Integer on = 1; @Override - public PageResult upload(MultipartFile file) { + public Boolean upload(MultipartFile file) { ExcelUtils excelUtils = new ExcelUtils<>(ResourceInfoResp.class); try { - PageHelper.startPage(1, 10); // 调用导入方法 List respList = excelUtils.importExcel(null, file); - redisTemplate.opsForValue().set("list",JSONObject.toJSONString(respList),1,TimeUnit.HOURS); - PageInfo pageInfo = new PageInfo<>(respList); - return PageResult.toPageResult(pageInfo.getTotal(), pageInfo.getList()); + redisTemplate.opsForValue().set("list",respList,1,TimeUnit.HOURS); + return true; } catch (Exception e) { throw new RuntimeException(e); } @@ -57,28 +54,26 @@ public class ResourceServiceImpl implements ResourceService { @Override public List findResourceByPissn(ResourceReq req) { - String resString = redisTemplate.opsForValue().get(req.toString()); - if (StringUtils.isNotEmpty(resString)){ - return JSONObject.parseObject(resString, List.class); - } List resourceInfos = mapper.findResourceByPissn(req); resourceInfos.forEach(resourceInfo -> resourceInfo.setFlag(req)); - redisTemplate.opsForValue().set(req.toString(), JSONObject.toJSONString(resourceInfos),1, TimeUnit.HOURS); + redisTemplate.opsForValue().set("ResourceReq:"+req.toString(), resourceInfos,1, TimeUnit.HOURS); return resourceInfos; } @Override public PageResult list(Integer pageNum) { - String resString = redisTemplate.opsForValue().get("list"); - if (StringUtils.isNotEmpty(resString)){ - List respList = JSONObject.parseObject(resString, List.class); + Object o = redisTemplate.opsForValue().get("list"); + if (o!=null){ + List respListAll = (List) o; int index = (pageNum-1)*10; - int toIndex = (pageNum-1)*10+10; - if (toIndex>respList.size()){ + int toIndex = index+10; + if (toIndex>respListAll.size()){ return null; } - return PageResult.toPageResult(respList.size(), - respList.subList(index,toIndex)); + List respList = respListAll.subList(index, toIndex); + respList.forEach(resourceInfoResp -> resourceInfoResp.setId(on++)); + on = 1; + return PageResult.toPageResult(respListAll.size(), respList); } return null; } diff --git a/cloud-resource-common/src/main/java/com/muyu/resource/utils/ExcelUtils.java b/cloud-resource-server/src/main/java/com/muyu/resource/utils/ExcelUtils.java similarity index 100% rename from cloud-resource-common/src/main/java/com/muyu/resource/utils/ExcelUtils.java rename to cloud-resource-server/src/main/java/com/muyu/resource/utils/ExcelUtils.java