From e85cd3fe826efe0baaa3fc09ea371467127c370c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 15 七月 2025 18:11:31 +0800
Subject: [PATCH] Merge branch 'dev'
---
business/src/main/java/com/ycl/service/impl/CodingRulerServiceImpl.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/CodingRulerServiceImpl.java b/business/src/main/java/com/ycl/service/impl/CodingRulerServiceImpl.java
index 8f86bfb..e4e63dc 100644
--- a/business/src/main/java/com/ycl/service/impl/CodingRulerServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/CodingRulerServiceImpl.java
@@ -17,6 +17,7 @@
import com.ycl.framework.utils.PageUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.stream.Collectors;
@@ -137,7 +138,7 @@
.eq(CodingRuler::getDeleted,0)
.one();
if (statusStartCodingRuler != null) {
- throw new RuntimeException("鍚屾椂鍙兘鍚姩涓�绉嶈祴鐮佽鍒�");
+ throw new RuntimeException("鐩稿悓椤圭洰鐮佺被鍨嬪悓鏃跺彧鑳藉惎鍔ㄤ竴绉�");
}
codingRuler.setStatus(CodingRulerStatusEnum.on.getValue());
@@ -150,4 +151,30 @@
baseMapper.updateById(codingRuler);
return Result.ok(msg);
}
+ /**
+ * 鑾峰緱鍚姩鐨勮祴鐮佽鍒�
+ * @return 瀛樻斁鐨勫瓧娈� yellowRuler鍚敤鐨勯粍鐮佽鍒欙紝redRuler鍚敤鐨勭孩鐮佽鍒�
+ */
+ @Override
+ public Result getStartRuler() {
+ Result result = new Result();
+ //鑾峰緱鍚敤鐨勮祴鐮佽鍒�
+ List<CodingRulerVO> codingRulerVOS = codingRulerMapper.getStartRuler();
+ if (CollectionUtils.isEmpty(codingRulerVOS)){
+ log.error("鏈惎鐢ㄨ祴鐮佽鍒�");
+ return result;
+ }
+ CodingRulerVO yellowRuler = null;
+ CodingRulerVO redRuler = null;
+ for (CodingRulerVO codingRulerVO : codingRulerVOS){
+ if (CodingRulerCodeTypeEnum.YELLOW.getValue().equals(codingRulerVO.getProjectCodeType())){
+ yellowRuler = codingRulerVO;
+ }else if (CodingRulerCodeTypeEnum.RED.getValue().equals(codingRulerVO.getProjectCodeType())){
+ redRuler = codingRulerVO;
+ }
+ }
+ result.put("yellowRuler",yellowRuler);
+ result.put("redRuler",redRuler);
+ return result;
+ }
}
--
Gitblit v1.8.0