From 16e144456b5bf1f23dfbdc6b2d0f07307b0c2af2 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 16 一月 2024 19:01:01 +0800
Subject: [PATCH] 2024-01-16 朱宝民 项目编号及协议列表转到Constant
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java | 9 +++++----
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 8 ++++----
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java | 9 ++++++++-
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java
index c523017..f862b9d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java
@@ -11,6 +11,14 @@
public static final Integer no = 0 ;
public static final String YES = "1" ;
public static final String NO = "0" ;
+
+ // 椤圭洰缂栧彿
+ public static final Integer projectCode_ym = 100;
+ public static final Integer projectCode_pj = 101;
+
+ // 鍗忚鍒楄〃
+ public static final String[] protocol = {"DYJS_2023", "DYJS_2024"};
+
public static List<String[]> yesNo(){
List<String[]> list = new ArrayList<>() ;
list.add(new String[]{YES , "鏄�"}) ;
@@ -41,5 +49,4 @@
}
return null ;
}
-
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index edd8936..28bf7d0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -114,9 +114,9 @@
idSuffix: 7
#椤圭洰缂栧彿
-projectCode:
- ym: 100
- pj: 101
+#projectCode:
+# ym: 100
+# pj: 101
#閫氳鍗忚
-protocol: DYJS_2023,DYJS_2024
\ No newline at end of file
+#protocol: DYJS_2023,DYJS_2024
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
index 99e7eae..745991c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
@@ -7,6 +7,7 @@
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoSe.SeActiveCard;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
+import com.dy.pipIrrGlobal.util.Constant;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrSell.clientCard.CardStateENUM;
import com.dy.pipIrrSell.clientCard.ClientCardSv;
@@ -23,7 +24,6 @@
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -48,8 +48,8 @@
private final ClientCardSv clientCardSv;
private final RechargeCtrl rechargeCtrl;
- @Value("${projectCode.ym}")
- private Integer projectCode;
+ //@Value("${projectCode.ym}")
+ //private Integer projectCode;
/**
* 鑾峰彇寮�鍗¤褰�
@@ -222,7 +222,8 @@
}
Map map = new HashMap();
- map.put("projectCode", projectCode);
+ //map.put("projectCode", projectCode);
+ map.put("projectCode", Constant.projectCode_ym);
map.put("cardNum", cardNum);
return BaseResponseUtils.buildSuccess(map) ;
}
--
Gitblit v1.8.0