Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

zhongrj

2023-07-06 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java

@@ -2,6 +2,7 @@

import cn.gistack.sm.resDataCheck.entity.Rules;
import cn.gistack.sm.resDataCheck.entity.RulesCondition;
import cn.gistack.sm.resDataCheck.service.IQualityManageService;
import cn.gistack.sm.resDataCheck.service.IRulesConditionService;
import cn.gistack.sm.resDataCheck.service.IRulesService;
import lombok.AllArgsConstructor;
@@ -28,6 +29,8 @@
   private IRulesService rulesService;

   private IRulesConditionService rulesConditionService;

   private IQualityManageService qualityManageService;

   /**
    * 指标匹配空值
@@ -58,40 +61,40 @@
      String retStr = "-1";
      switch (key) {
         case "GREATER": //大于
            retStr = " > " + target;
            retStr = " > " + target;
            break;
         case "GREATER_EQUAL": //大于等于
            retStr = " >= " + target;
            retStr = " >= " + target;
            break;
         case "EQUAL": //等于
            retStr = " = " + target;
            break;
         case "LESS_EQUAL": //小于等于
            retStr = " <= " + target;
            retStr = " <= " + target;
            break;
         case "LESS":  //小于
            retStr = " &lt; " + target;
            retStr = " < " + target;
            break;
         case "UNEQUAL": //不等于
            retStr = " &lt;&gt; " + target;
            retStr = " <> " + target;
            break;
         case "DIFFER_GRATER": //差值大于
            retStr = " - " + target + " &gt; " + val;
            retStr = " - " + target + " > " + val;
            break;
         case "DIFFER_GRATER_EQUAL": //差值大于等于
            retStr = " - " + target + " &gt;= " + val;
            retStr = " - " + target + " >= " + val;
            break;
         case "DIFFER_EQUAL": //差值等于
            retStr = " - " + target + " = " + val;
            break;
         case "DIFFER_LESS_EQUAL": //差值小于等于
            retStr = " - " + target + " &lt; " + val;
            retStr = " - " + target + " < " + val;
            break;
         case "DIFFER_LESS": //差值小于
            retStr = " - " + target + " &lt;= " + val;
            retStr = " - " + target + " <= " + val;
            break;
         case "DIFFER_UNEQUAL": //差值不等于
            retStr = " - " + target + " &lt;&gt; " + val;
            retStr = " - " + target + " <> " + val;
            break;
      }
      return retStr;
@@ -107,22 +110,22 @@
      String retStr = "-1";
      switch (key) {
         case "GREATER": //大于
            retStr = " &gt; " + val;
            retStr = " > " + val;
            break;
         case "GREATER_EQUAL": //大于等于
            retStr = " &gt;= " + val;
            retStr = " >= " + val;
            break;
         case "EQUAL": //等于
            retStr = " = " + val;
            break;
         case "LESS_EQUAL": //小于等于
            retStr = " &lt;= " + val;
            retStr = " <= " + val;
            break;
         case "LESS":  //小于
            retStr = " &lt; " + val;
            retStr = " < " + val;
            break;
         case "UNEQUAL": //不等于
            retStr = " &lt;&gt; " + val;
            retStr = " <> " + val;
            break;
      }
      return retStr;
@@ -218,7 +221,7 @@
         } else if (rc.getRelation().equals("OR")) {
            relation = " OR ";
         } else {
            relation = "";
            relation = " WHERE ";
         }

         sqlStr += relation + getPropSqlStr(rc.getBasic());
@@ -238,9 +241,7 @@
         return R.fail(-1,sqlStr + "\\n 查询条件错误，请检查规则设置");
      }



      // 执行sql
      return null;
      return R.data(qualityManageService.addQualityManage(id,sqlStr));
   }
}