维修查看修复

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -78,10 +78,13 @@ public class YongyouServiceImpl implements YongyouService {
     private String token_key = "yongyou-token";
     private String Conn_key = "yongyou-Conn";
     private String cAcc_ID_key = "yongyou-cAcc_ID";
+    private String cAcc_ID_key_dev = "yongyou-cAcc_ID_dev";
     private String cAcc_ID_key1 = "yongyou-cAcc_ID_1";
     private String cAcc_ID_key2 = "yongyou-cAcc_ID_2";
+    private String token_key_dev = "yongyou_token_dev";
     private String token_key1 = "yongyou-token-1";
     private String token_key2 = "yongyou-token-2";
+    private String Conn_key_dev = "yongyou-Conn-dev";
     private String Conn_key1 = "yongyou-Conn-1";
     private String Conn_key2 = "yongyou-Conn-2";
 
@@ -95,16 +98,25 @@ public class YongyouServiceImpl implements YongyouService {
     }
     private String geToken(Integer type) {
         String token = null;
-        if (type==1) {
-            token = RedisUtils.getString(token_key1);
-        }else if (type==2){
-            token = RedisUtils.getString(token_key2);
-        }
-        if (StringUtils.isBlank(token)) {
-            return geTokenForce(type);
-        } else {
-            return token;
+        // 判断环境
+        boolean isDev = BeanUtils.isDev();
+        if(!isDev){
+            if (type==1) { // 新厂
+                token = RedisUtils.getString(token_key1);
+            }else if (type==2){ // 老厂
+                token = RedisUtils.getString(token_key2);
+            }
+            if (StringUtils.isBlank(token)) {
+                return geTokenForce(type);
+            } else {
+                return token;
+            }
+        }else{
+            // 本地测试
+            token = RedisUtils.getString(token_key_dev);
+            token = StringUtils.isBlank(token) ? geTokenForce(type) : token;
         }
+        return token;
     }
 
     /**
@@ -140,10 +152,15 @@ public class YongyouServiceImpl implements YongyouService {
         req.setCSrv("192.168.16.249");
         req.setPUserId("sb");
         req.setPPassword("321.jkl");
-        if (type==1) { // 新厂
-            req.setPAccId("005");
+        Boolean isDev = BeanUtils.isDev();
+        if(!isDev){
+            if (type == 1) { // 新厂
+                req.setPAccId("005");
+            }else{
+                req.setPAccId("004");
+            }
         }else{
-            req.setPAccId("004");
+            req.setPAccId("993");
         }
         req.setPDate(DateUtils.dateToString(LocalDate.now(), DateUtils.PATTERN_YMD));
         req.setPSubId("DP");
@@ -155,17 +172,21 @@ public class YongyouServiceImpl implements YongyouService {
         }
         Login login = response.getData();
         String token = login.getToken();
-        if (type==1){
-            RedisUtils.setString(token_key1, token, 1800);
-            RedisUtils.setString(Conn_key1, login.getConn(), 1800);
-            RedisUtils.setString(cAcc_ID_key1, login.getCAcc_ID(), 1800);
-        }else if (type==2){
-            RedisUtils.setString(token_key2, token, 1800);
-            RedisUtils.setString(Conn_key2, login.getConn(), 1800);
-            RedisUtils.setString(cAcc_ID_key2, login.getCAcc_ID(), 1800);
-        }
-//        RedisUtils.setString(Conn_key, login.getConn(), 1800);
-//        RedisUtils.setString(cAcc_ID_key, login.getCAcc_ID(), 1800);
+        if(!isDev){
+            if (type == 1){ // 新厂
+                RedisUtils.setString(token_key1, token, 1800);
+                RedisUtils.setString(Conn_key1, login.getConn(), 1800);
+                RedisUtils.setString(cAcc_ID_key1, login.getCAcc_ID(), 1800);
+            }else if (type == 2){
+                RedisUtils.setString(token_key2, token, 1800);
+                RedisUtils.setString(Conn_key2, login.getConn(), 1800);
+                RedisUtils.setString(cAcc_ID_key2, login.getCAcc_ID(), 1800);
+            }
+        }else{
+            RedisUtils.setString(token_key_dev, token, 1800);
+            RedisUtils.setString(Conn_key_dev, login.getConn(), 1800);
+            RedisUtils.setString(cAcc_ID_key_dev, login.getCAcc_ID(), 1800);
+        }
         return token;
     }
 
@@ -173,19 +194,29 @@ public class YongyouServiceImpl implements YongyouService {
         return RedisUtils.getString(Conn_key);
     }
     private String getConn2(Integer type) {
-        if (type==1) {
-            return RedisUtils.getString(Conn_key1);
-        }else if (type==2){
-            return RedisUtils.getString(Conn_key2);
+        Boolean isDev = BeanUtils.isDev();
+        if(!isDev){
+            if (type == 1) { // 新厂
+                return RedisUtils.getString(Conn_key1);
+            }else if (type == 2){
+                return RedisUtils.getString(Conn_key2);
+            }
+        }else{
+            return RedisUtils.getString(Conn_key_dev);
         }
         return null;
     }
 
     private String getCAccId2(Integer type) {
-        if (type==1) {
-            return RedisUtils.getString(cAcc_ID_key1);
-        }else if (type==2){
-            return RedisUtils.getString(cAcc_ID_key2);
+        Boolean isDev = BeanUtils.isDev();
+        if(!isDev) {
+            if (type == 1) {
+                return RedisUtils.getString(cAcc_ID_key1);
+            } else if (type == 2) {
+                return RedisUtils.getString(cAcc_ID_key2);
+            }
+        }else{
+            return RedisUtils.getString(cAcc_ID_key_dev);
         }
         return null;
     }
@@ -471,11 +502,12 @@ public class YongyouServiceImpl implements YongyouService {
         request.setTradeID("");
         request.setToken(geToken(tokenType));
         request.setConn(getConn2(tokenType));
-        if (tokenType==1){
+        request.setCAcc_ID(getCAccId2(tokenType));
+        /*if (tokenType == 1){ // 新厂
             request.setCAcc_ID(RedisUtils.get(cAcc_ID_key1));
-        }else if (tokenType==2){
+        }else if (tokenType==2){ // 老厂
             request.setCAcc_ID(RedisUtils.get(cAcc_ID_key2));
-        }
+        }*/
         AddSpareHandler handler = new AddSpareHandler();
         handler.setRequest(request);
         String responseStr = handler.handler();