From 7e04e5c23d3b8c7d7c902dd8669ad844b1c8bf08 Mon Sep 17 00:00:00 2001 From: shuliYao <1397940314@qq.com> Date: Tue, 2 Apr 2024 10:15:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=A1=86=E6=9E=B6=E5=AE=9A=E5=88=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B0=81=E8=A3=85bug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8CsearchQuery?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/util/requestFormat/SearchQuery.java | 23 +++++++++++++++---- .../util/requestFormat/SearchQueryForm.java | 8 +++---- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQuery.java b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQuery.java index 6d7fb60b..1eef9ec5 100644 --- a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQuery.java +++ b/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); diff --git a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQueryForm.java b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQueryForm.java index 77849648..f42daa7c 100644 --- a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQueryForm.java +++ b/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属性获取 From 10321f99de7df5ac74145a166781653f5bfd3ae4 Mon Sep 17 00:00:00 2001 From: shuliYao <1397940314@qq.com> Date: Tue, 2 Apr 2024 11:15:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=96=B0=E6=95=B0=E6=8D=AE=E5=9F=9F?= =?UTF-8?q?=E5=90=8D=E5=8F=8A=E8=AF=B7=E6=B1=82=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java | 3 ++- .../cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java | 4 ++-- runstart/src/main/resources/application-dev.yml | 2 +- runstart/src/main/resources/application-pro.yml | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java index b9b5ab43..ffb9ef4e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java +++ b/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); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java index 9a9a0f4d..8ed82d0d 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java +++ b/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()); diff --git a/runstart/src/main/resources/application-dev.yml b/runstart/src/main/resources/application-dev.yml index 9872525c..b2a8e8d7 100644 --- a/runstart/src/main/resources/application-dev.yml +++ b/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 #请求超时时间 毫秒 diff --git a/runstart/src/main/resources/application-pro.yml b/runstart/src/main/resources/application-pro.yml index bd2ceb84..b14dcc68 100644 --- a/runstart/src/main/resources/application-pro.yml +++ b/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/ \ No newline at end of file + serverUrl: http://47.93.59.251/api/image/