Merge pull request 'fix:修复自定义查询封装缺失功能、修改拉取无量云数据接口地址变化问题' (#54) from fix/searchQueryEdit into test

Reviewed-on: #54

jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQuery.java

@@ -154,6 +154,17 @@ public class SearchQuery implements java.io.Serializable{
     public void addLessEqual(String field,Date value){
         addQuery(field,value, SearchQueryConstant.SEARCH_LESS_EQUAL);
     }
+
+    public void addRulesOp(String field,String rulesOp){
+        SearchQueryForm searchQueryForm = new SearchQueryForm();
+        if(query.get(field)!=null){
+            searchQueryForm = (SearchQueryForm) query.get(field);
+            searchQueryForm.setRulesOp(rulesOp);
+            return;
+        }
+        searchQueryForm.setRulesOp(rulesOp);
+        query.put(field,searchQueryForm);
+    }
     /**
      *
      * @param field 字段名称
@@ -177,11 +188,15 @@ public class SearchQuery implements java.io.Serializable{
             log.error("【添加搜索条件】对象-value-错误，value不能为空");
             return;
         }
-        if(null != query.get(field)){
-            log.error("【添加搜索条件】-query-错误，query已经存在数据,field={}",field);
-            return;
-        }
+//        if(null != query.get(field)){
+//            log.error("【添加搜索条件】-query-错误，query已经存在数据,field={}",field);
+//            return;
+//        }
         SearchQueryForm lf = new SearchQueryForm();
+        if(query.get(field)!=null){
+            lf = (SearchQueryForm) query.get(field);
+        }
+
         lf.setField(field);
         lf.setDataOp(SearchQueryUtil.filterMap.get(filter));
         lf.setOp(filter);

jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQueryForm.java

@@ -8,10 +8,10 @@ import java.io.Serializable;
  */
 public class SearchQueryForm implements Serializable {
     private static final long serialVersionUID = 1L;
-    private String field;// 字段名称
-    private String op;// 比对条件
-    private Object value;// 比对内容
-    private String type;// 类型
+    private String field;// 字段名称 username and  t1.username = %111%(vachar)
+    private String op;// 比对条件  =
+    private Object value;// 比对内容 111
+    private String type;// 类型 ()
     private String rulesOp;// 搜索条件的关联方式，或/与（and/or）
     private String tablenameother = "";// 数据表别名
     private String dataOp;// 数据库中的比较条件,根据op属性获取

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java

@@ -85,7 +85,8 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
 
         //组装请求参数
         String url = apiConfig.getInterfaceDomain()+pictureSourceUrl;
-        String requestBodyJson = JSONObject.toJSONString(requestData);
+//        String requestBodyJson = JSONObject.toJSONString(requestData);
+        String requestBodyJson = "{\"accessKey\":\"7390F0221A1A73D8E13F8C8BB96F33B0\",\"data\":\"gzUtN5Mt24_fbDDMK3wLop8Tgu68xLCVy3Wzp9BcXnkxnCiPg_D2TNEXnQ68-Y-GhGYYcD7Iwg8juZTx1m5v4NkDvKvEwdvjQvZnMDTRYbqtHrwgVLAvUGotIMTckDY67yo2Ku52vWedjYpzzDseHwiIGVcIl-u1CljEbyjLzJzIf6oXfD7qKjOYnxKjfjp11k0IlvsPdS-mgNXTHcBei5jOFrYmZrE2y4v9bI5n1QE\",\"signature\":\"0bmIbhhybDcGeyX4ao5gSPZQeaY8G2JRh3nRt7NC7qw\",\"tenantCode\":\"1673196576094806016\",\"timestamp\":1711971774448}";
         //入参
         System.out.println("入参数据:"+requestBodyJson);
         HttpParamers httpParamers = new HttpParamers(HttpMethod.POST);

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java

@@ -192,8 +192,8 @@ public class PictureDisposeTask implements Runnable{
                 picture.setField11(pictureSourceResult.getVisitDate());
 
                 //提报日期时间戳
-//                picture.setSubmitDateTimestamp(pictureSourceResult.getSubmitTime());
-                picture.setSubmitDateTimestamp(System.currentTimeMillis());
+                picture.setSubmitDateTimestamp(pictureSourceResult.getSubmitTime());
+//                picture.setSubmitDateTimestamp(System.currentTimeMillis());
                 picture.setPhotoDateTimestamp(System.currentTimeMillis());
 
                 System.out.println("SubmitDateTimestamp1=================>>>>>>>"+pictureSourceResult.getSubmitTime());

runstart/src/main/resources/application-dev.yml

@@ -276,7 +276,7 @@ debugger_tools: true
 ocr:
   api:
     wly:
-      interface-domain: https://b-dr.prevailcloud.com #接口域名
+      interface-domain: https://b-test.prevailcloud.com #接口域名
       accessKey: 7390F0221A1A73D8E13F8C8BB96F33B0 #秘钥
       accessCode: ED6F7B39768AF95E87AEA8ACCCC71A6F #秘钥编码
       connectTimeout: 5000 #请求超时时间 毫秒

runstart/src/main/resources/application-pro.yml

@@ -280,7 +280,7 @@ debugger_tools: true
 ocr:
   api:
     wly:
-      interface-domain: https://b-dr.prevailcloud.com #接口域名
+      interface-domain: https://b-test.prevailcloud.com  #接口域名
       accessKey: 7390F0221A1A73D8E13F8C8BB96F33B0 #秘钥
       accessCode: ED6F7B39768AF95E87AEA8ACCCC71A6F #秘钥编码
       connectTimeout: 5000 #请求超时时间 毫秒
@@ -289,4 +289,4 @@ ocr:
 image:
   similarityPath: http://127.0.0.1:8000/api/similarity/
   classifyPath: http://127.0.0.1:8000/api/classify/
-  serverUrl: http://47.93.59.251/api/image/
+  serverUrl: http://47.93.59.251/api/image/