From 0d969cd294217259a32beb786d452b521fc80fef Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 12 Nov 2021 11:25:54 +0800
Subject: [PATCH] 枪支定位url拼接判空处理
---
src/main/java/org/springblade/common/utils/InvestigateUtil.java | 21 ++++++++++++++++++++-
src/main/resources/application-dev.yml | 7 +++++--
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/common/utils/InvestigateUtil.java b/src/main/java/org/springblade/common/utils/InvestigateUtil.java
index 7951167..ef57970 100644
--- a/src/main/java/org/springblade/common/utils/InvestigateUtil.java
+++ b/src/main/java/org/springblade/common/utils/InvestigateUtil.java
@@ -64,8 +64,27 @@
*/
public static String httpGetGunPosition(String idCardNo,String deptName,String startTime,String endTime,Integer pageNum,Integer pageSize) {
OkHttpClient client = new OkHttpClient();
+ String hwysfzh = "";
+ String szdw = "";
+ String kssj = "";
+ String jssj = "";
+ String page_size = "&page_size="+ pageSize;
+ String page_num = "&page_num="+ pageNum;
+ if(!idCardNo.equals("") && idCardNo != null){
+ hwysfzh = "&hwysfzh=" + idCardNo;
+ }
+ if(!deptName.equals("") && deptName != null){
+ szdw = "&szdw=" + deptName;
+ }
+ if(!startTime.equals("") && startTime != null){
+ kssj = "&kssj=" + startTime;
+ }
+ if(!endTime.equals("") && endTime != null){
+ jssj = "&jssj=" + endTime;
+ }
+
Request request = new Request.Builder()
- .url("http://47.49.27.44:8000/dbapi/dmc_qzdw?page_num="+pageNum+"&page_size="+pageSize+"&hwysfzh="+idCardNo+"&szdw="+deptName+"&kssj="+startTime+"&jssj="+endTime)
+ .url("http://47.49.27.44:8000/dbapi/dmc_qzdw?"+ hwysfzh + szdw + kssj + jssj)
.get()
.addHeader("Authorization","Bearer eyJ0eXAiOiJqd3QiLCJhbGciOiJIUzI1NiIsInVjIjoiMzYwNjAyMTk4OTA3MDgxMDE4IiwidG9rZW5fdHlwZSI6MX0.eyJpc3MiOiI3aWN5MXplc3N2eVBPVlJKUVk2aHpPRTJhc0JMdkw1MyIsImlhdCI6MTYyOTI1MTMzOX0.DLasFawQHexpRBFORQU64tbSR_n76bpway42GfIwPf4")
.build();
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 2103911..c19ea22 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -8,6 +8,9 @@
port: 6378
password: redispsw
+# port: 6379
+# password:
+
database: 0
ssl: false
##redis 集群环境配置
@@ -17,13 +20,13 @@
datasource:
# MySql
# 内网版本
- url: jdbc:mysql://localhost:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://223.82.109.183:2083/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
password: zhba0728
#ftp 设置
ftp:
- sqlConnect: jdbc:mysql://localhost:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ sqlConnect: jdbc:mysql://47.49.36.191:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
ftpHost: 47.49.21.194
ftpPort: 21
ftpUserName: ylcs
--
Gitblit v1.9.3