From 7bc2b875448f9e5311bcc987691b5475a06dfbcb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 四月 2024 12:43:51 +0800
Subject: [PATCH] 1、集团码返码接口下标越界bug。 2、集团返码,需要修改我们系统中的属性,修改时需要判断每一个字段,确定哪些有修改,然后用oldBusinessData字段记录下修改前旧的业务数据。 3、同步型号代号,记录下对方的创建时间和修改时间。

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleCharacterController.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 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 138f53a..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,6 +18,7 @@
 @RestController
 @RequestMapping("/codeRuleCharacterController")
 public class CodeRuleCharacterController {
+
 	@Resource
 	 private ICodeRuleCharacterService iCodeRuleCharacterService;
 
@@ -28,6 +30,26 @@
 	@GetMapping("/list")
 	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));
 	}
 
 	/**
@@ -59,4 +81,5 @@
 	public R delete(@RequestBody CodeRuleCharacterVO codeRuleCharacterVO){
 		return iCodeRuleCharacterService.saveOrUpdate(codeRuleCharacterVO,3);
 	}
+
 }

--
Gitblit v1.9.3