1.bug qlm

src/main/java/com/zx/dataservice/service/impl/ChoiceHisServiceImpl.java

@@ -60,6 +60,9 @@ public class ChoiceHisServiceImpl implements ChoiceHisService {
         //1.循环需要风控的记录
         for (String key : DataOptions.keySet()) {
             try {
+                if("keyall".equals(key)){
+                    continue;
+                }
                 //2. 查询备份表 最后一条记录 ，在 正常表里查询是否 为最后一条
                 String keyArr[] = key.split("_"); // hy_BTC_LTC
                 String code = keyArr[1];
@@ -68,7 +71,7 @@ public class ChoiceHisServiceImpl implements ChoiceHisService {
                 String toTabeName = "data_hist_" + tocode.replace(".", "_").toLowerCase() + "_" + keyArr[0].replace(".", "_").toLowerCase();
                 String tortTabeName = "data_rt_" + tocode.replace(".", "_").toLowerCase() + "_" + keyArr[0].replace(".", "_").toLowerCase();
                 Record todRec = Db.use("gp").findFirst(" select id,dates from  " + toTabeName + "  order by dates desc  limit 1 ");
-                String riskTableName = "risk_control_formula_history" + keyArr[0];
+                String riskTableName = "risk_control_formula_history_" + keyArr[0];
                 List<Record> recordsnew = new ArrayList<>();
                 if (todRec != null) { // 不为Null 那么查询 正常表内 此时间后的所有 记录
                     List<Record> oldRecordList = Db.use("gp").find(" select * from  " + oldTabeName + " where dates > '" + todRec.get("dates") + "' order by dates asc ");

src/main/java/com/zx/dataservice/service/impl/ChoiceTempIndexServiceImpl.java

@@ -205,6 +205,9 @@ public class ChoiceTempIndexServiceImpl implements ChoiceTempIndexService {
                             if(DataOptions.get("keyall").contains((WSOptions.get(key2).split("_")[0]+"_"+entry.getKey().toUpperCase()))){  // 存在该用户的该股票的风控 记录
                                 for (String key : DataOptions.keySet()) {  // 所有的需要风控的 客户  BTC_BTC_hy  LTC_hy  000001.SZ_hy  LTC_test  test_BTC_BTC
                                     // 风控 逻辑
+                                    if("keyall".equals(key)){
+                                        continue;
+                                    }
                                     if (key.contains((WSOptions.get(key2).split("_")[0]+"_"+entry.getKey().toUpperCase()))) {// 存在该股票的风控  LTC_hy . contains (LTC)
                                         StockRestPojo stockRestPojoRisk = getRiskNow(stockRestPojo, key, DataOptions.get(key)); // 风控后的数据 //tocode & mini & risk & multiples & status
                                         stockRestPojoList.add(stockRestPojoRisk);
@@ -395,6 +398,9 @@ public class ChoiceTempIndexServiceImpl implements ChoiceTempIndexService {
                             if(DataOptions.get("keyall").contains((WSOptions.get(key2).split("_")[0]+entry.getKey().toUpperCase()))){  // 存在该用户的该股票的风控 记录
                                 for (String key : DataOptions.keySet()) {  // 所有的需要风控的 客户  BTC_BTC_hy  LTC_hy  000001.SZ_hy  LTC_test  test_BTC_BTC
                                     // 风控 逻辑
+                                    if("keyall".equals(key)){
+                                        continue;
+                                    }
                                     if (key.contains(entry.getKey())) {// 存在该股票的风控  LTC_hy . contains (LTC)
                                         StockRestPojo stockRestPojoRisk = getRiskNow(stockRestPojo, key, DataOptions.get(key)); // 风控后的数据 //tocode & mini & risk & multiples & status
                                         stockRestPojoList.add(stockRestPojoRisk);