From 3534b13391b2a6152d0f91b72fda343b13a947cb Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 22 一月 2025 15:55:27 +0800
Subject: [PATCH] 分类码段码值管理查询去除null的情况，分类码段生成编码时去除码值为null的情况
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleCharacterController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleCharacterController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleCharacterController.java
index a7f08a7..8cac5e8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleCharacterController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleCharacterController.java
@@ -6,6 +6,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.rmi.ServerException;
import java.util.List;
import java.util.Map;
@@ -17,8 +18,10 @@
@RestController
@RequestMapping("/codeRuleCharacterController")
public class CodeRuleCharacterController {
+
@Resource
private ICodeRuleCharacterService iCodeRuleCharacterService;
+
/**
* 浣跨敤缂栫爜瑙勫垯oid鑾峰彇鏁版嵁
* @param codeRuleId 瑙勫垯oid
@@ -28,6 +31,27 @@
public R<List<Map<String,String>>> getDataByOid(@RequestParam("codeRuleId")String codeRuleId,@RequestParam("chartType")String chartType){
return R.data(iCodeRuleCharacterService.getDataByRuleId(codeRuleId,chartType));
}
+
+ /**
+ * 浣跨敤缂栫爜瑙勫垯oid鑾峰彇鏁版嵁涓嬫媺鏁版嵁婧�
+ * @param codeRuleId 瑙勫垯oid
+ * @return 鏁版嵁鍐呭
+ */
+ @GetMapping("/selectList")
+ public R<List<Map<String, String>>> getSelectListByRuleId(@RequestParam("codeRuleId")String codeRuleId,@RequestParam("chartType")String chartType) throws ServerException {
+ return R.data(iCodeRuleCharacterService.getSelectListByRuleId(codeRuleId,chartType));
+ }
+
+ /**
+ * 浣跨敤缂栫爜瑙勫垯oid鑾峰彇鏁版嵁涓嬫媺鏁版嵁婧�
+ * @param codeRuleId 瑙勫垯oid
+ * @return 鏁版嵁鍐呭
+ */
+ @GetMapping("/getRegexStr")
+ public R<String> getRegexStrByCodeRuleId(@RequestParam("codeRuleId")String codeRuleId,@RequestParam("chartType")String chartType) throws ServerException {
+ return R.data(iCodeRuleCharacterService.getRegexStrByCodeRuleId(codeRuleId,chartType));
+ }
+
/**
* 淇濆瓨瑙勫垯瀵硅薄
* @param codeRuleCharacterVO 瑙勫垯瀛楃瀵硅薄
@@ -35,8 +59,9 @@
*/
@PostMapping("/addSave")
public R addSave(@RequestBody CodeRuleCharacterVO codeRuleCharacterVO){
- return iCodeRuleCharacterService.saveOrUpdate(codeRuleCharacterVO);
+ return iCodeRuleCharacterService.saveOrUpdate(codeRuleCharacterVO,1);
}
+
/**
* 淇敼瑙勫垯瀵硅薄
* @param codeRuleCharacterVO 瑙勫垯瀛楃瀵硅薄
@@ -44,7 +69,7 @@
*/
@PostMapping("/editSave")
public R editSave(@RequestBody CodeRuleCharacterVO codeRuleCharacterVO){
- return iCodeRuleCharacterService.saveOrUpdate(codeRuleCharacterVO);
+ return iCodeRuleCharacterService.saveOrUpdate(codeRuleCharacterVO,2);
}
/**
@@ -54,6 +79,7 @@
*/
@PostMapping("/delete")
public R delete(@RequestBody CodeRuleCharacterVO codeRuleCharacterVO){
- return iCodeRuleCharacterService.saveOrUpdate(codeRuleCharacterVO);
+ return iCodeRuleCharacterService.saveOrUpdate(codeRuleCharacterVO,3);
}
+
}
--
Gitblit v1.9.3