Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
reyun
manager
Commits
3f1d0666
Commit
3f1d0666
authored
Jan 13, 2021
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
海外和国内adi查询host
parent
162759ed
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
12 deletions
+24
-12
ADIAccountService.java
src/main/java/adi/service/ADIAccountService.java
+3
-0
ADIAccountServiceImpl.java
src/main/java/adi/service/impl/ADIAccountServiceImpl.java
+21
-12
No files found.
src/main/java/adi/service/ADIAccountService.java
View file @
3f1d0666
...
...
@@ -22,11 +22,14 @@ public interface ADIAccountService {
List
<
ReminderLevel
>
findReminderlevel
();
@Deprecated
void
updateAccount
(
Contract
contract
);
//催款提醒关闭
@Deprecated
PressMoney
forbidenPress
(
User
user
,
PressMoney
resource
);
//催款提醒开启
@Deprecated
PressMoney
enablePress
(
User
user
,
PressMoney
resource
);
//回访
...
...
src/main/java/adi/service/impl/ADIAccountServiceImpl.java
View file @
3f1d0666
...
...
@@ -128,6 +128,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
return
null
;
}
@Override
public
void
updateAccount
(
Contract
contract
)
{
...
...
@@ -136,7 +137,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
ADIUser
adiUser
=
findOne
(
contract
.
getEmail
());
if
(
null
!=
adiUser
){
String
url
=
Constant
.
adiUrl
+
"adi/api/user/web/update"
;
String
url
=
Constant
.
adiUrl
.
split
(
","
)[
0
]
+
"adi/api/user/web/update"
;
Map
<
String
,
String
>
conditions
=
new
HashMap
<>();
conditions
.
put
(
"expriedTime"
,
contract
.
getEndDate
()
+
" 00:00:00"
);
conditions
.
put
(
"constractStartTime"
,
contract
.
getStartDate
()
+
" 00:00:00"
);
...
...
@@ -153,9 +154,10 @@ public class ADIAccountServiceImpl implements ADIAccountService {
@Deprecated
private
List
<
ADIUser
>
getAllAccount
()
throws
JSONException
{
List
<
ADIUser
>
list
=
new
ArrayList
<>();
String
url
=
Constant
.
adiUrl
+
"adi/api/user/web/list"
;
String
url
=
Constant
.
adiUrl
.
split
(
","
)[
0
]
+
"adi/api/user/web/list"
;
Map
<
String
,
String
>
conditions
=
new
HashMap
<>();
conditions
.
put
(
"type"
,
""
);
conditions
.
put
(
"status"
,
""
);
...
...
@@ -320,22 +322,29 @@ public class ADIAccountServiceImpl implements ADIAccountService {
}
@Override
public
ADIUser
findOne
(
String
email
)
{
String
url
=
Constant
.
adiUrl
+
"/adi/api/user/web/one?email="
+
email
;
String
url
=
Constant
.
adiUrl
.
split
(
","
)[
0
]
+
"/adi/api/user/web/one?email="
+
email
;
String
request
=
HttpClientUtil
.
doHttpGetRequest
(
url
,
""
);
ADIUser
adiUser
=
null
;
try
{
JSONObject
rs
=
new
JSONObject
(
request
);
String
content
=
rs
.
get
(
"content"
).
toString
();
if
(
StringUtils
.
isEmpty
(
content
)){
url
=
Constant
.
adiUrl
.
split
(
","
)[
1
]
+
"/adi/api/user/web/one?email="
+
email
;
request
=
HttpClientUtil
.
doHttpGetRequest
(
url
,
""
);
rs
=
new
JSONObject
(
request
);
content
=
rs
.
get
(
"content"
).
toString
();
}
if
(!
StringUtils
.
isEmpty
(
content
)){
JSONArray
jsonArray
=
new
JSONArray
(
content
);
JSONObject
jsonObject
=
jsonArray
.
getJSONObject
(
0
);
adiUser
=
new
ADIUser
();
adiUser
.
setCompany
(
jsonObject
.
getString
(
"company"
));
adiUser
.
setAccountStatus
(
jsonObject
.
getString
(
"accountStatus"
));
adiUser
.
setSendStatus
(
jsonObject
.
getString
(
"sendStatus"
));
adiUser
.
setEmail
(
jsonObject
.
getString
(
"email"
));
adiUser
.
setSendTime
(
jsonObject
.
getString
(
"sendTime"
));
//adiUser = new ObjectMapper().readValue(content, ADIUser.class);
adiUser
=
new
ADIUser
();
adiUser
.
setCompany
(
jsonObject
.
getString
(
"company"
));
adiUser
.
setAccountStatus
(
jsonObject
.
getString
(
"accountStatus"
));
adiUser
.
setSendStatus
(
jsonObject
.
getString
(
"sendStatus"
));
adiUser
.
setEmail
(
jsonObject
.
getString
(
"email"
));
adiUser
.
setSendTime
(
jsonObject
.
getString
(
"sendTime"
));
//adiUser = new ObjectMapper().readValue(content, ADIUser.class);
}
}
catch
(
JSONException
e
)
{
e
.
printStackTrace
();
...
...
@@ -370,7 +379,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
contract
.
setStatus
(
"executing"
);
contractRepository
.
save
(
contract
);
}
String
url
=
Constant
.
adiUrl
+
"adi/api/user/web/update"
;
String
url
=
Constant
.
adiUrl
.
split
(
","
)[
0
]
+
"adi/api/user/web/update"
;
Map
<
String
,
String
>
conditions
=
new
HashMap
<>();
conditions
.
put
(
"expriedTime"
,
null
);
conditions
.
put
(
"constractStartTime"
,
null
);
...
...
@@ -408,7 +417,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
contractRepository
.
save
(
contract
);
}
String
url
=
Constant
.
adiUrl
+
"adi/api/user/web/update"
;
String
url
=
Constant
.
adiUrl
.
split
(
","
)[
0
]
+
"adi/api/user/web/update"
;
Map
<
String
,
String
>
conditions
=
new
HashMap
<>();
conditions
.
put
(
"expriedTime"
,
null
);
conditions
.
put
(
"constractStartTime"
,
null
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment