diff --git a/src/main/java/com/docus/demo/controller/SyncBasicDataController.java b/src/main/java/com/docus/demo/controller/SyncBasicDataController.java index 12dda3c..7b4024c 100644 --- a/src/main/java/com/docus/demo/controller/SyncBasicDataController.java +++ b/src/main/java/com/docus/demo/controller/SyncBasicDataController.java @@ -51,9 +51,10 @@ public class SyncBasicDataController { return CommonResult.failed("无效的请求参数!"); } String blockKey="syncBasicData:"+ JSON.toJSONString(syncBasicDataDto); - if (SYNC_BASIC_DATA_BLOCK_MAP.putIfAbsent(blockKey, 0) != null) { + if (SYNC_BASIC_DATA_BLOCK_MAP.containsKey(blockKey)) { return CommonResult.failed("有正在同步的任务!"); } + SYNC_BASIC_DATA_BLOCK_MAP.put(blockKey,0); try { return syncBasicDataService.syncBasicData(syncBasicDataDto); }catch (Exception ex){ @@ -68,9 +69,10 @@ public class SyncBasicDataController { public CommonResult syncSingleBasicData(@RequestParam(name = "disDate") String disDate,@RequestParam(name = "inpatientNo") String inpatientNo){ log.info("省厅-同步单个患者基础数据,disDate={},inpatientNo={}", disDate, inpatientNo); String blockKey="syncSingleBasicData:"+ inpatientNo+":"+disDate; - if (SYNC_BASIC_DATA_BLOCK_MAP.putIfAbsent(blockKey, 0) != null) { + if (SYNC_BASIC_DATA_BLOCK_MAP.containsKey(blockKey)) { return CommonResult.failed("有正在同步的任务!"); } + SYNC_BASIC_DATA_BLOCK_MAP.put(blockKey,0); try { LocalDate localDate = LocalDate.parse(disDate); SyncBasicDataDto dto = new SyncBasicDataDto(); @@ -91,9 +93,10 @@ public class SyncBasicDataController { @GetMapping("/syncLastMonthBasicData") public CommonResult syncLastMonthBasicData(){ String blockKey="syncLastMonthBasicData"; - if (SYNC_BASIC_DATA_BLOCK_MAP.putIfAbsent(blockKey, 0) != null) { + if (SYNC_BASIC_DATA_BLOCK_MAP.containsKey(blockKey)) { return CommonResult.failed("有正在同步的任务!"); } + SYNC_BASIC_DATA_BLOCK_MAP.put(blockKey,0); try { LocalDate today = LocalDate.now(); LocalDate firstDayOfLastMonth = today.minusMonths(1).with(TemporalAdjusters.firstDayOfMonth());