mis 物品查询

src/main/java/com/cc/controller/MisSolrController.java

@@ -356,53 +356,7 @@ public class MisSolrController {
 
 
         fqList.add(misAsjq);
-        String str = "";
         String q = "*:*";
-        String jyaq = misAsjRyRelateVO.getBrief();
-        if(null!=jyaq && !"".equals(jyaq)){
-            jyaq=jyaq.replaceAll("and","AND").replaceAll("or","OR");
-            if(jyaq.indexOf("AND")>0) {
-                String[] andArr = jyaq.split("AND");
-                for (int i = 0; i < andArr.length; i++) {
-                    if (andArr[i].indexOf("OR") > 0) {
-                        String[] orArr = andArr[i].split("OR");
-                        for (int j = 0; j < orArr.length; j++) {
-                            if ((orArr[j].indexOf("(") != -1) || (orArr[j].indexOf("（") != -1)) {
-                                str += " (JYAQ:*" + orArr[j].substring(1, orArr[j].length()) + "* OR ";
-                            } else if (orArr[j].indexOf(")") > 0 || orArr[j].indexOf("）") > 0) {
-                                str += " JYAQ:*" + orArr[j].substring(0, orArr[j].length() - 1) + "*)";
-                            } else {
-                                str += " JYAQ:*" + orArr[j]+"*";
-                            }
-                        }
-                        if (i < andArr.length - 1) {
-                            str += " AND ";
-                        }
-                    } else {
-                        if (i == andArr.length - 1) {
-                            str += " JYAQ:*" + andArr[i]+"*";
-                        } else {
-                            str += " JYAQ:*" + andArr[i] + "* AND ";
-                        }
-                    }
-                }
-            }else if(jyaq.indexOf("OR")>0){
-                str +="(";
-                String[] orArr = jyaq.split("OR");
-                for (int j = 0; j < orArr.length; j++) {
-                    if (j == orArr.length - 1) {
-                        str += " JYAQ:*" + orArr[j]+"*";
-                    } else {
-                        str += " JYAQ:*" + orArr[j] + "* OR ";
-                    }
-                }
-                str +=")";
-            }else{
-                str =" JYAQ:*" + jyaq+"*";
-            }
-            System.out.println(str);
-            q = str;
-        }
         System.out.println("过虑查询条件fqList==================="+fqList);
         System.out.println("查询的关键字q==================="+q);
         map.put("fqList",fqList);
@@ -1165,6 +1119,15 @@ public class MisSolrController {
                 misSj += " AND CASEID:*"+misAsjRyRelateVO.getCaseid()+"*";
             }
         }
+        if(null!=misAsjRyRelateVO.getValuesjmin()&& !"".equals(misAsjRyRelateVO.getValuesjmin())) {
+            if (null != misAsjRyRelateVO.getValuesjmax() && !"".equals(misAsjRyRelateVO.getValuesjmax())) {
+                misSj += " AND VALUE:[" + misAsjRyRelateVO.getValuesjmin() + " TO " + misAsjRyRelateVO.getValuesjmax() + "]";
+            } else {
+                misSj += " AND VALUE:[" + misAsjRyRelateVO.getValuesjmin() + " TO " + "*]";
+            }
+        }else if (null != misAsjRyRelateVO.getValuesjmax() && !"".equals(misAsjRyRelateVO.getValuesjmax())) {
+            misSj += " AND VALUE:[* TO " + misAsjRyRelateVO.getValuesjmax()+"]";
+        }
         if(null!=misAsjRyRelateVO.getBrand() && !"".equals(misAsjRyRelateVO.getBrand())){
             if("null".equals(misAsjRyRelateVO.getBrand())){
                 misSj += " AND -BRAND:*";
@@ -1290,6 +1253,15 @@ public class MisSolrController {
         Map<String, Object> map = new HashedMap();
         List<String> fqList = new ArrayList<>();
         String misCl = "*:*";
+        if(null!=misAsjRyRelateVO.getValueclmin()&& !"".equals(misAsjRyRelateVO.getValueclmin())) {
+            if (null != misAsjRyRelateVO.getValueclmax() && !"".equals(misAsjRyRelateVO.getValueclmax())) {
+                misCl += " AND VALUE:[" + misAsjRyRelateVO.getValueclmin() + " TO " + misAsjRyRelateVO.getValueclmax() + "]";
+            } else {
+                misCl += " AND VALUE:[" + misAsjRyRelateVO.getValueclmin() + " TO " + "*]";
+            }
+        }else if (null != misAsjRyRelateVO.getValueclmax() && !"".equals(misAsjRyRelateVO.getValueclmax())) {
+            misCl += " AND VALUE:[* TO " + misAsjRyRelateVO.getValueclmax()+"]";
+        }
         if(null!=misAsjRyRelateVO.getCaseid() && !"".equals(misAsjRyRelateVO.getCaseid())){
             if("null".equals(misAsjRyRelateVO.getCaseid())){
                 misCl += " AND -CASEID:*";
@@ -1476,6 +1448,15 @@ public class MisSolrController {
                 misSawp += " AND CASEID:*"+misAsjRyRelateVO.getCaseid()+"*";
             }
         }
+        if(null!=misAsjRyRelateVO.getValuesawpmin()&& !"".equals(misAsjRyRelateVO.getValuesawpmin())) {
+            if (null != misAsjRyRelateVO.getValuesawpmax() && !"".equals(misAsjRyRelateVO.getValuesawpmax())) {
+                misSawp += " AND VALUE:[" + misAsjRyRelateVO.getValuesawpmin() + " TO " + misAsjRyRelateVO.getValuesawpmax() + "]";
+            } else {
+                misSawp += " AND VALUE:[" + misAsjRyRelateVO.getValuesawpmin() + " TO " + "*]";
+            }
+        }else if (null != misAsjRyRelateVO.getValuesawpmax() && !"".equals(misAsjRyRelateVO.getValuesawpmax())) {
+            misSawp += " AND VALUE:[* TO " + misAsjRyRelateVO.getValuesawpmax()+"]";
+        }
         if(null!=misAsjRyRelateVO.getSerial() && !"".equals(misAsjRyRelateVO.getSerial())){
             if("null".equals(misAsjRyRelateVO.getSerial())){
                 misSawp += " AND -SERIAL:*";