Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
O
OA-Integration
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
李炎
OA-Integration
Commits
fb09e7f2
提交
fb09e7f2
authored
10月 08, 2021
作者:
李炎
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
更新
上级
edc88dfc
隐藏空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
117 行增加
和
98 行删除
+117
-98
CategoryDaoSql.java
...n/java/org/jeecg/modules/iost/API/Dao/CategoryDaoSql.java
+19
-1
LoanInterfaceApi.java
.../modules/iost/API/ExternalInterface/LoanInterfaceApi.java
+4
-3
QueryLoanTimed.java
.../org/jeecg/modules/iost/API/TimedTask/QueryLoanTimed.java
+7
-1
ApiTestContrller.java
...g/jeecg/modules/iost/API/controller/ApiTestContrller.java
+49
-63
QueryLoanDetailsServiceImpl.java
...es/iost/API/service/impl/QueryLoanDetailsServiceImpl.java
+3
-0
KingdeeSaveJournalServiceImpl.java
...ce/kingdeejournal/impl/KingdeeSaveJournalServiceImpl.java
+1
-1
BusinessTripInterfaceWebapi.java
.../modules/iost/API/webapi/BusinessTripInterfaceWebapi.java
+5
-1
LoanInterfaceWebapi.java
...rg/jeecg/modules/iost/API/webapi/LoanInterfaceWebapi.java
+5
-1
OtherReimbursementInterfaceWebapi.java
...es/iost/API/webapi/OtherReimbursementInterfaceWebapi.java
+5
-0
application-docker.yml
...t-module-system/src/main/resources/application-docker.yml
+2
-1
application-test.yml
...oot-module-system/src/main/resources/application-test.yml
+2
-1
banner.txt
jeecg-boot-module-system/src/main/resources/banner.txt
+8
-11
ToolsTest.java
...boot-module-system/src/test/java/org/jeecg/ToolsTest.java
+7
-14
没有找到文件。
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/Dao/CategoryDaoSql.java
浏览文件 @
fb09e7f2
...
...
@@ -181,7 +181,25 @@ public class CategoryDaoSql {
}
return
log
;
}
public
List
<
Map
>
selectIn
(
String
f_sFormId
,
Map
<
String
,
String
>
key
,
Map
<
String
,
String
>
where
)
{
String
content
=
null
;
//请求
List
<
Map
>
list
=
null
;
//响应
try
{
Boolean
result
=
client
.
login
(
dbId
,
uid
,
pwd
,
lang
);
if
(
result
)
{
if
(
where
!=
null
)
{
content
=
"SELECT top 100 "
+
StringkeyMap
(
key
)
+
" FROM "
+
f_sFormId
+
StringCompareIn
(
where
)
+
";"
;
}
else
{
content
=
"SELECT top 100 "
+
StringkeyMap
(
key
)
+
" FROM "
+
f_sFormId
+
";"
;
}
String
[]
strings
=
new
String
[]{
content
};
list
=
client
.
execute
(
servicenameMap
,
strings
,
List
.
class
);
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
return
list
;
}
public
Map
<
String
,
Object
>
updateInMap
(
String
f_sFormId
,
Map
<
String
,
String
>
set
,
Map
<
String
,
String
>
where
)
{
Map
<
String
,
Object
>
log
=
new
HashMap
<>();
//返回k请求v相应
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/ExternalInterface/LoanInterfaceApi.java
浏览文件 @
fb09e7f2
...
...
@@ -5,6 +5,7 @@ import org.jeecg.modules.iost.API.ExternalInterface.Interface.API;
import
org.jeecg.modules.iost.API.Util.HttpUtil
;
import
org.jeecg.modules.iost.API.Util.HttpUtils
;
import
org.jeecg.modules.iost.API.Util.JsonUtil
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Service
;
...
...
@@ -17,9 +18,9 @@ import java.util.*;
@Component
public
class
LoanInterfaceApi
implements
API
{
private
String
url
=
"http://test.qywx.kingsware.cn"
;
//正式接口
// private String url = "https://b02ba329-ac3e-4144-a744-25abca96b290.mock.pstmn.io"
;
//
private String url = "http://test.qywx.kingsware.cn";//正式接口
@Value
(
"${oa.url}"
)
private
String
url
;
private
Map
<
String
,
String
>
hreader
=
new
HashMap
<>();
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/QueryLoanTimed.java
浏览文件 @
fb09e7f2
...
...
@@ -34,6 +34,12 @@ public class QueryLoanTimed implements Job {
@SneakyThrows
@Override
public
void
execute
(
JobExecutionContext
jobExecutionContext
)
throws
JobExecutionException
{
queryLoanDetailsService
.
synchronization
(
null
);
try
{
queryLoanDetailsService
.
synchronization
(
null
);
}
catch
(
Exception
e
){
Thread
.
sleep
(
1000
*
60
*
10
);
queryLoanDetailsService
.
synchronization
(
null
);
}
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/ApiTestContrller.java
浏览文件 @
fb09e7f2
...
...
@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
import
lombok.extern.slf4j.Slf4j
;
import
net.sf.json.JSONObject
;
import
org.jeecg.modules.iost.API.ExternalInterface.LoanInterfaceApi
;
import
org.jeecg.modules.iost.API.Util.JsonUtil
;
import
org.jeecg.modules.iost.API.entity.LQKJ_t_IMSSyncDetails
;
import
org.jeecg.modules.iost.API.service.ILQKJ_t_IMSSyncDetailsService
;
import
org.jeecg.modules.iost.API.vo.LQKJ_t_IMSSync
;
...
...
@@ -31,75 +32,60 @@ public class ApiTestContrller {
LoanInterfaceApi
loanInterfaceApi
;
@Autowired
LoanInterfaceWebapi
loanInterfaceWebapi
;
@GetMapping
(
"/OA"
)
public
Object
tes
()
throws
IOException
,
ParseException
{
System
.
out
.
println
(
123456456
);
String
select
=
loanInterfaceApi
.
select
();
Map
returnResult
=
new
HashMap
();
Map
params
=
new
LinkedHashMap
()
{{
put
(
"method"
,
"queryConcludeData"
);
put
(
"type"
,
"ER_ExpenseRequest"
);
// put("date", beforeDayByNowDay());
}};
String
responsejson
=
""
;
responsejson
=
loanInterfaceApi
.
getSelect
(
params
);
//获取借款
List
list
=
checkBillNo
(
responsejson
);
return
list
;
OaRequest
<
List
>
listOaRequest
=
com
.
alibaba
.
fastjson
.
JSONObject
.
parseObject
(
select
,
OaRequest
.
class
);
}
private
List
checkBillNo
(
String
responsejson
)
{
Object
result
=
JSONObject
.
fromObject
(
responsejson
).
get
(
"result"
);
List
resultList
=
(
List
)
result
;
Map
<
String
,
String
>
fBilNoMap
=
new
IdentityHashMap
<
String
,
String
>();
List
<
Map
>
stringList
=
null
;
List
returnList
=
resultList
;
for
(
int
i
=
0
;
i
<
resultList
.
size
();
i
++)
{
Object
o
=
resultList
.
get
(
i
);
JSONObject
re
=
JSONObject
.
fromObject
(
o
);
Object
fBillNo
=
re
.
get
(
"FBillNo"
);
if
(
null
!=
fBillNo
)
fBilNoMap
.
put
(
new
String
(
"FBillNo "
),
"'"
+
fBillNo
+
"'"
);
//允许同key的map做in语句
}
if
(
null
!=
fBilNoMap
&&
0
<
fBilNoMap
.
size
())
stringList
=
loanInterfaceWebapi
.
selectFBillNo
(
fBilNoMap
);
JSONObject
jsonObject
=
JSONObject
.
fromObject
(
select
);
if
(
null
!=
stringList
&&
0
<
stringList
.
size
())
{
List
returns
=
new
ArrayList
();
for
(
int
i
=
0
;
i
<
resultList
.
size
();
i
++)
{
Object
o
=
resultList
.
get
(
i
);
JSONObject
re
=
JSONObject
.
fromObject
(
o
);
Object
result
=
jsonObject
.
get
(
"result"
);
System
.
out
.
println
(
result
);
List
list
=
(
List
)
result
;
System
.
out
.
println
(
list
);
// String s = list.get(0).toString();
String
s
=
"{\n"
+
"\"FBillNo\": \"JK-20210401-01\",\n"
+
"\"FCostOrgID\": {\n"
+
"\"FNumber\": \"100.1\"\n"
+
"},\n"
+
"\"FSECONDTIME\": \"2021-09-27 15:58:38\",\n"
+
"\"FTOCONTACTUNITTYPE\": \"BD_Empinfo\",\n"
+
"\"FTOCONTACTUNIT\": {\n"
+
"\"FNumber\": \"83108\"\n"
+
"},\n"
+
"\"FStaffID\": {\n"
+
"\"FSTAFFNUMBER\": \"83108\"\n"
+
"},\n"
+
"\"FBankAccount\": \"6230523304602657173\",\n"
+
"\"F_JZW_TWO\": {\n"
+
"\"FSTAFFNUMBER\": \"12188\"\n"
+
"},\n"
+
"\n"
+
"\"F_JZW_ONE\": {\n"
+
"\"FSTAFFNUMBER\": \"12188\"\n"
+
"},\n"
+
"\"FDate\": \"2021-04-01\",\n"
+
"\"FIsBorrow\": true,\n"
+
"\"FBankName\": \"农业银行成都支行\",\n"
+
"\"FReason\": \"主要用于邮储银行总行(北京)需求分析项目借款,主要用于住宿,交通等资金周转。\",\n"
+
"\"FOrgID\": {\n"
+
"\"FNumber\": \"100\"\n"
+
"},\n"
+
"\"FDeptID\": {\n"
+
"\"FNUMBER\": \"19\"\n"
+
"},\n"
+
"\"FCurrencyID\": {\n"
+
"\"FNUMBER\": \"PRE001\"\n"
+
"},\n"
+
"\"FRefundDate\": \"2021-05-14\",\n"
+
"\"FBankAcctName\": \"农业银行成都华阳支行\",\n"
+
"\"FFIRSTTIME\": \"2021-09-27 15:58:25\",\n"
+
"\"FEntity\": [\n"
+
"{\n"
+
"\"FEntryID\": 0,\n"
+
"\"FExpenseItemID\": {\n"
+
"\"FNUMBER\": \"FYXM10_SYS\"\n"
+
"},\n"
+
"\"FOrgAmount\": \"6000\"\n"
+
"}\n"
+
"],\n"
+
"\"FSettleTypeID\": {\n"
+
"\"FNUMBER\": \"JSFS04_SYS\"\n"
+
"}}"
;
System
.
out
.
println
(
s
);
String
add
=
""
;
add
=
loanInterfaceWebapi
.
add
(
s
);
System
.
out
.
println
(
"add "
+
add
);
return
add
;
Object
fBillNo
=
re
.
get
(
"FBillNo"
);
for
(
int
i1
=
0
;
i1
<
stringList
.
size
();
i1
++)
{
String
fBillNo1
=
stringList
.
get
(
i1
).
get
(
"FBillNo"
).
toString
();
if
(
fBillNo
.
equals
(
fBillNo1
))
{
System
.
out
.
println
(
"break"
);
break
;
}
System
.
out
.
println
(
"add"
);
returns
.
add
(
o
);
}
}
System
.
out
.
println
(
"returnList"
);
returnList
=
returns
;
}
return
returnList
;
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/impl/QueryLoanDetailsServiceImpl.java
浏览文件 @
fb09e7f2
...
...
@@ -84,4 +84,7 @@ public class QueryLoanDetailsServiceImpl extends ServiceImpl<QueryLoanDetailsMap
public
Boolean
manual
(
Map
<
String
,
Object
>
map
,
String
ReturnProcessId
)
throws
ParseException
{
return
null
;
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/kingdeejournal/impl/KingdeeSaveJournalServiceImpl.java
浏览文件 @
fb09e7f2
...
...
@@ -33,7 +33,7 @@ public class KingdeeSaveJournalServiceImpl extends ServiceImpl<KingdeeSaveJourna
kingdeeSaveJournal
.
setResponse
(
kingdeeResponse
);
net
.
sf
.
json
.
JSONObject
Result
=
net
.
sf
.
json
.
JSONObject
.
fromObject
(
kingdeeResponse
);
//
net
.
sf
.
json
.
JSONObject
ResponseStatus
=
net
.
sf
.
json
.
JSONObject
.
fromObject
(
net
.
sf
.
json
.
JSONObject
.
fromObject
(
Result
.
get
(
"Result"
)).
get
(
"ResponseStatus"
));
if
(
kingdeeResponse
==
null
||
!(
Boolean
)
ResponseStatus
.
get
(
"IsSuccess"
)
||
null
==
(
Boolean
)
ResponseStatus
.
get
(
"IsSuccess"
)
)
{
//判断请求是否错误
if
(
null
==
kingdeeResponse
||
null
==
(
Boolean
)
ResponseStatus
.
get
(
"IsSuccess"
)
||
!(
Boolean
)
ResponseStatus
.
get
(
"IsSuccess"
)
)
{
//判断请求是否错误
kingdeeSaveJournal
.
setSynchronization
(
0
);
List
successEntitys
=
(
List
)
ResponseStatus
.
get
(
"SuccessEntitys"
);
if
(
null
!=
successEntitys
&&
0
<
successEntitys
.
size
())
{
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/webapi/BusinessTripInterfaceWebapi.java
浏览文件 @
fb09e7f2
...
...
@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Component
;
import
java.text.ParseException
;
import
java.util.HashMap
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -62,5 +63,8 @@ public class BusinessTripInterfaceWebapi implements web_api {
String
add
=
categoryDao
.
batchAdd
(
sFormId
,
object
.
toString
());
return
add
;
}
public
List
<
Map
>
selectFBillNo
(
Map
where
)
{
//in查询是否已有FBillNo
List
<
Map
>
stringList
=
categoryDaoSql
.
selectIn
(
sFormId_t
,
new
HashMap
(){{
put
(
"FBillNo"
,
"FBillNo"
);}},
where
);
return
stringList
;
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/webapi/LoanInterfaceWebapi.java
浏览文件 @
fb09e7f2
...
...
@@ -8,6 +8,7 @@ import org.jeecg.modules.iost.API.webapi.Util.FieldConversion;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.util.HashMap
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -56,7 +57,10 @@ public class LoanInterfaceWebapi implements web_api {
Map
<
String
,
List
<
List
<
Object
>>>
stringListMap
=
categoryDao
.
selectMapWhereString
(
sFormId
,
key
,
where
);
return
stringListMap
;
}
public
List
<
Map
>
selectFBillNo
(
Map
where
)
{
//in查询是否已有FBillNo
List
<
Map
>
stringList
=
categoryDaoSql
.
selectIn
(
sFormId_t
,
new
HashMap
(){{
put
(
"FBillNo"
,
"FBillNo"
);}},
where
);
return
stringList
;
}
public
Map
<
String
,
List
<
Map
>>
synchronization
(
Map
where
)
{
//自动同步用
Map
<
String
,
List
<
Map
>>
stringListMap
=
categoryDaoSql
.
selectMapIn
(
sFormId_t
,
key
,
where
);
return
stringListMap
;
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/webapi/OtherReimbursementInterfaceWebapi.java
浏览文件 @
fb09e7f2
...
...
@@ -6,6 +6,7 @@ import org.jeecg.modules.iost.API.webapi.Interface.web_api;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.util.HashMap
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -61,4 +62,8 @@ public class OtherReimbursementInterfaceWebapi implements web_api {
String
add
=
categoryDao
.
batchAdd
(
sFormId
,
object
.
toString
());
return
add
;
}
public
List
<
Map
>
selectFBillNo
(
Map
where
)
{
//in查询是否已有FBillNo
List
<
Map
>
stringList
=
categoryDaoSql
.
selectIn
(
sFormId_t
,
new
HashMap
(){{
put
(
"FBillNo"
,
"FBillNo"
);}},
where
);
return
stringList
;
}
}
jeecg-boot-module-system/src/main/resources/application-docker.yml
浏览文件 @
fb09e7f2
...
...
@@ -8,7 +8,8 @@ server:
enabled
:
true
min-response-size
:
1024
mime-types
:
application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
oa
:
url
:
http://test.qywx.kingsware.cn
management
:
endpoints
:
web
:
...
...
jeecg-boot-module-system/src/main/resources/application-test.yml
浏览文件 @
fb09e7f2
...
...
@@ -8,7 +8,8 @@ server:
enabled
:
true
min-response-size
:
1024
mime-types
:
application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
oa
:
url
:
https://b02ba329-ac3e-4144-a744-25abca96b290.mock.pstmn.io
management
:
endpoints
:
web
:
...
...
jeecg-boot-module-system/src/main/resources/banner.txt
浏览文件 @
fb09e7f2
${AnsiColor.BRIGHT_BLUE}
(_) | | | |
_ ___ ___ ___ __ _ ______| |__ ___ ___ | |_
| |/ _ \/ _ \/ __/ _` |______| '_ \ / _ \ / _ \| __|
| | __/ __/ (_| (_| | | |_) | (_) | (_) | |_
| |\___|\___|\___\__, | |_.__/ \___/ \___/ \__|
_/ | __/ |
|__/ |___/
${AnsiColor.WHITE}
__ ______ ___ ___ _________
/_/\ /_____/\ /___/\/__/\ /________/\
\:\ \ \:::_ \ \ \::.\ \\ \ \ \__.::.__\/
\:\ \ \:\ \ \ \_ \:: \/_) \ \ /_\::\ \
\:\ \____ \:\ \ /_ \ \:. __ ( ( \:.\::\ \
\:\/___/\ \:\_- \ \ \: \ ) \ \ \: \ \ \
\_____\/ \___|\_\_/ \__\/\__\/ \_____\/
${AnsiColor.BRIGHT_GREEN}
Jeecg Boot Version: 2.3
Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
${AnsiColor.BLACK}
jeecg-boot-module-system/src/test/java/org/jeecg/ToolsTest.java
浏览文件 @
fb09e7f2
...
...
@@ -152,23 +152,16 @@ public class ToolsTest {
@Test
// @Scheduled(fixedDelay = 5000)
public
void
timdsaded
()
throws
InterruptedException
{
List
objects
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
10
;
i
++)
{
try
{
int
i1
=
100
/
i
;
System
.
out
.
println
(
i1
);
System
.
out
.
println
(
i
);
}
catch
(
Exception
e
){
String
s
=
e
.
toString
();
System
.
out
.
println
(
s
);
continue
;
}
finally
{
objects
.
add
(
i
);
}
for
(
int
i
=
0
;
i
<
objects
.
size
();
i
++)
{
if
(
i
==
3
)
{
objects
.
remove
(
i
);
}
System
.
out
.
println
(
""
+
i
);
System
.
out
.
println
(
objects
.
get
(
i
)
);
}
}
@Async
public
void
Async
()
throws
InterruptedException
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论