From 6648e74a007254e167c5508de5d25402cd4bb63b Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期一, 10 三月 2025 16:39:50 +0800
Subject: [PATCH] 完成保养工单明细
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/GenerateCodeController.java | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/GenerateCodeController.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/GenerateCodeController.java
index 9f7aac5..d267a89 100644
--- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/GenerateCodeController.java
+++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/GenerateCodeController.java
@@ -5,6 +5,8 @@
import org.dromara.common.core.constant.CacheConstants;
import org.dromara.common.core.domain.R;
import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.eims.service.IEimsRepairResService;
+import org.dromara.eims.service.IGenerateCodeService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -26,6 +28,8 @@
@RestController
@RequestMapping("/eims/generate")
public class GenerateCodeController {
+
+ private final IGenerateCodeService eimsRepairResService;
/**
* 鏍规嵁鍓嶇紑鐢熸垚鍚勭缂栫爜
*
@@ -35,25 +39,9 @@
@GetMapping("/{prefix}")
public R<String> generateCode(@NotNull(message = "绫诲瀷涓嶈兘涓虹┖")
@PathVariable String prefix) {
- String todayStr = DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDate.now());
- String key = CacheConstants.EIMS_GENERATE_CODE + ":" + prefix;
- String code;
- // 浣跨敤Redis鐨勫師瀛愭�ф搷浣滈伩鍏嶅苟鍙戦棶棰�
- String oldCode = RedisUtils.getCacheObject(key);
- if (oldCode != null && oldCode.contains(todayStr)) {
- int no = Integer.parseInt(oldCode.substring(oldCode.length() - 4));
- code = String.format("%s%s%04d", prefix, todayStr, no + 1);
- } else {
- code = String.format("%s%s%04d", prefix, todayStr, 1);
- }
- // 鏇存柊缂撳瓨
- try {
- RedisUtils.setCacheObject(key, code);
- } catch (Exception e) {
- return R.fail("鐢熸垚缂栫爜澶辫触锛岃绋嶅悗閲嶈瘯锛�");
- }
- return R.ok("鐢熸垚鎴愬姛锛�", code);
+ String code = eimsRepairResService.generateCode(prefix);
+ return code == null ? R.fail("鐢熸垚澶辫触锛�") :R.ok("鐢熸垚鎴愬姛锛�", code);
}
}
--
Gitblit v1.9.3