优化

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

@@ -115,6 +115,7 @@ public class YongyouServiceImpl implements YongyouService {
     }
     private String geToken(Integer type) {
         String token = null;
+//        boolean isDev = BeanUtils.isDev();
         boolean isDev = BeanUtils.isDev();
         if(!isDev){
             if (type==1) { // 新厂
@@ -173,6 +174,7 @@ public class YongyouServiceImpl implements YongyouService {
         req.setPUserId("sb");
         req.setPPassword("321.jkl");
         boolean isDev = BeanUtils.isDev();
+//        boolean isDev = BeanUtils.isDev();
         if(!isDev){
             if (type == 1) { // 新厂
                 req.setPAccId("005");
@@ -238,6 +240,7 @@ public class YongyouServiceImpl implements YongyouService {
     }
     private String getConn2(Integer type) {
         boolean isDev = BeanUtils.isDev();
+//        boolean isDev = BeanUtils.isDev();
         if(!isDev){
             if (type == 1) { // 新厂
                 return RedisUtils.getString(Conn_key1);
@@ -498,7 +501,6 @@ public class YongyouServiceImpl implements YongyouService {
 
     @Override
     public List<SpareStoreVO> selectPageList3(SpareStoreDTO record) {
-
         List<SpareVO> spareVOS = record.getSpareVOS();
         Map<Integer, List<SpareVO>> map = new HashMap<>();
         if (spareVOS != null && spareVOS.size() > 0) {
@@ -524,9 +526,9 @@ public class YongyouServiceImpl implements YongyouService {
                 map.put(2, oldF);
             }
 
+//            boolean isDev = BeanUtils.isDev();
             boolean isDev = BeanUtils.isDev();
 
-
             String sqlStr = "";
             List<SpareStoreVO> returnList = new ArrayList<>();
             for (Map.Entry<Integer, List<SpareVO>> entry : map.entrySet()) {
@@ -603,26 +605,27 @@ public class YongyouServiceImpl implements YongyouService {
                             sbModelSpareBomMapper.updateBatch2(spareNos2,2,record.getSbId());
                             returnList.addAll(oldSpareStoreVOS2);
                         }
-                        return returnList;
                     }
                     else {
-                        req.setCAcc_ID("993");
-                        req.setToken(geToken(1));
-                        req.setConn(getConn2(1));
-                        for (SpareVO spareVO : newF) {
-                            whereStr.append(spareVO.getBeiJianCode() + ",");
-                        }
-                        sqlStr = whereStr.toString().substring(0, whereStr.toString().length() - 1) + ")";
-                        if (!sqlStr.equals("")) {
-                            req.setStrWhere(sqlStr);
-                        } else {
-                            req.setStrWhere(whereStr.toString());
+                        if (entry.getKey() == 1) {
+                            req.setCAcc_ID("993");
+                            req.setToken(geToken(1));
+                            req.setConn(getConn2(1));
+                            for (SpareVO spareVO : newF) {
+                                whereStr.append(spareVO.getBeiJianCode() + ",");
+                            }
+                            sqlStr = whereStr.toString().substring(0, whereStr.toString().length() - 1) + ")";
+                            if (!sqlStr.equals("")) {
+                                req.setStrWhere(sqlStr);
+                            } else {
+                                req.setStrWhere(whereStr.toString());
+                            }
+                            returnList.addAll(getList(handler, req));
                         }
-                        returnList.addAll(getList(handler, req));
-                        return returnList;
                     }
                 }
             }
+            return returnList;
         }
         return new ArrayList<SpareStoreVO>();
     }