From ac8e8998235f247365280d1a1632115c43b10037 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 17 十一月 2023 02:24:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomRomanSerialAlgorithmExample.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomRomanSerialAlgorithmExample.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomRomanSerialAlgorithmExample.java
index abe1dfa..96da8d6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomRomanSerialAlgorithmExample.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomRomanSerialAlgorithmExample.java
@@ -1,34 +1,46 @@
package com.vci.ubcs.code.algorithm;
+import com.alibaba.nacos.common.utils.StringUtils;
import com.vci.ubcs.code.annotation.MdmSerialAlgorithm;
import com.vci.ubcs.code.annotation.MdmSerialAlgorithmMethod;
-import com.vci.ubcs.code.dto.CodeOrderSecDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-import com.vci.ubcs.starter.revision.model.BaseModel;
+import com.vci.ubcs.code.dto.CodeCustomSerialDTO;
+import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
+import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
-
-import java.util.List;
/****
* 鑷畾涔夌綏椹祦姘寸畻娉曡嚜瀹氫箟绫�
*/
-@MdmSerialAlgorithm(text = "鑷畾涔夌綏椹祦姘�",description = "鑷畾涔夌綏椹祦姘寸畻娉�")
+@MdmSerialAlgorithm(text = "鑷畾涔夌綏椹祦姘�",serialType="custom_serial_roman",description = "鑷畾涔夌綏椹祦姘寸畻娉�")
public class CustomRomanSerialAlgorithmExample {
/**
* 鐢熸垚缃楅┈娴佹按鍙风殑鏂规硶
* @return 娴佹按鍙风殑淇℃伅
*/
@MdmSerialAlgorithmMethod
- public String serialGenerate(BaseModel data, CodeRuleVO codeRuleVO, List<CodeOrderSecDTO> secDTOList){
+ public String serialGenerate(CodeCustomSerialDTO codeCustomSerialDTO){
+ //
+ codeCustomSerialDTO.getSerialUnitString();
+ CodeBasicSecVO secVO= codeCustomSerialDTO.getSerialCodeCodeBasicSec();
+ String currentFlowValue=codeCustomSerialDTO.getCurrentFlowValue();
-
-
-
+ Double newThisSerialValue = 0d;
+ if(StringUtils.isBlank(currentFlowValue)){
+ //绗竴涓紪鐮�
+ newThisSerialValue = VciBaseUtil.getDouble(secVO.getSerialStart());
+ }else {
+ //娴佹按鍙疯偗瀹氭槸鏁板瓧
+ //灏嗙綏椹祦姘磋浆涓烘暟瀛楁祦姘�
+ int arabicValue=VciBaseUtil.convertRomanToArabic(currentFlowValue);
+ newThisSerialValue = (double)(arabicValue + secVO.getSerialStep()) ;
+ }
+ //瑕佺湅鏄惁瓒呰繃鏈�澶х殑娴佹按鍊�
+ if (newThisSerialValue >= secVO.getCodeFillLimit()) {
+ throw new VciBaseException("娴佹按鍙峰凡缁忚秴杩囧厑璁哥殑鏈�澶ф祦姘村�納0}", new String[]{secVO.getCodeFillLimit().toString()});
+ }
//灏嗘暟瀛楁祦姘磋浆涓虹綏椹祦姘�
- String romanValue=VciBaseUtil.convertArabicToRoman(5);
- //灏嗙綏椹祦姘磋浆涓烘暟瀛楁祦姘�
- int arabicValue=VciBaseUtil.convertRomanToArabic(romanValue);
- return "";
+ String romanValue=VciBaseUtil.convertArabicToRoman(newThisSerialValue.intValue());
+ return romanValue;
}
}
--
Gitblit v1.9.3