diff --git a/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java b/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java index e5c0062e..cf572240 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcSdhsEventController.java @@ -160,6 +160,13 @@ public class DcSdhsEventController { } } + @ApiOperation("查询上次上传的文件信息") + @GetMapping("/getFileInfo") + public AjaxResult getFileInfo() + { + return dcSdhsEventService.getFileInfo(); + } + @ApiOperation("查询事故地市分布") @PostMapping("/selectRegionAnalysis") public AjaxResult selectRegionAnalysis(@RequestBody DcSdhsEventQuery dcSdhsEventQuery) diff --git a/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java b/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java index 32afb38d..a2aca0c6 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcSdhsEventService.java @@ -19,6 +19,8 @@ public interface IDcSdhsEventService // AjaxResult importData(MultipartFile file) throws Exception; AjaxResult importData(String fileName,String fileUrl) throws Exception; + AjaxResult getFileInfo(); + AjaxResult selectRegionAnalysis(DcSdhsEventQuery dcSdhsEventQuery); void exportRegionAnalysis(XWPFDocument doc, DcSdhsEventQuery dcSdhsEventQuery); diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java index e78c70a7..358bd2bf 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcSdhsEventServiceImpl.java @@ -134,11 +134,13 @@ public class DcSdhsEventServiceImpl implements IDcSdhsEventService { Map fileInfo = new HashMap<>(); fileInfo.put("fileName",fileName); fileInfo.put("fileUrl",fileUrl); + + Date now = new Date(); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String updateTime = simpleDateFormat.format(new Date()); + String updateTime = simpleDateFormat.format(now); fileInfo.put("uploadTime",updateTime); - redisCache.setCacheMapValue(RedisKeyConstants.SDHS_EVENT_FILE,updateTime,fileInfo); + redisCache.setCacheMapValue(RedisKeyConstants.SDHS_EVENT_FILE,now.getTime(),fileInfo); return AjaxResult.success("导入成功"); } @@ -242,6 +244,26 @@ public class DcSdhsEventServiceImpl implements IDcSdhsEventService { return numbers; } + @Override + public AjaxResult getFileInfo(){ + Map> allFileInfo = redisCache.getCacheMapValue(RedisKeyConstants.SDHS_EVENT_FILE); + Map lastFile = new HashMap<>(); + if (allFileInfo != null && allFileInfo.size() > 0){ + String maxKeyNumerically = Collections.max(allFileInfo.keySet(), new Comparator() { + @Override + public int compare(String o1, String o2) { + try { + return Long.compare(Long.parseLong(o1), Long.parseLong(o2)); + } catch (NumberFormatException e) { + throw new IllegalArgumentException("Keys cannot be parsed as numbers", e); + } + } + }); + lastFile = allFileInfo.get(maxKeyNumerically); + } + return AjaxResult.success(lastFile); + } + /** * @Description 事故地市分布