Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
link-gw
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
冯之健
link-gw
Commits
a38e9ea1
Commit
a38e9ea1
authored
Apr 22, 2020
by
冯之健
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口修改
parent
74fa8830
Pipeline
#1572
failed with stages
in 0 seconds
Changes
16
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
130 additions
and
13 deletions
+130
-13
link-admin/src/test/java/com/link/BaseTest.java
+23
-2
link-api/src/main/java/com/link/controller/ApiController.java
+0
-0
link-api/src/main/java/com/link/controller/ApiLoginController.java
+2
-2
link-api/src/main/java/com/link/dao/OoziejobresultDao.java
+4
-0
link-api/src/main/java/com/link/dto/BdajobConfigDTO.java
+7
-0
link-api/src/main/java/com/link/dto/OoziejobresultDTO.java
+4
-0
link-api/src/main/java/com/link/entity/BdajobConfigEntity.java
+9
-0
link-api/src/main/java/com/link/entity/OoziejobresultEntity.java
+6
-0
link-api/src/main/java/com/link/interceptor/AuthorizationInterceptor.java
+5
-1
link-api/src/main/java/com/link/service/OoziejobresultService.java
+9
-0
link-api/src/main/java/com/link/service/impl/AgentnodeServiceImpl.java
+6
-5
link-api/src/main/java/com/link/service/impl/BdajobConfigServiceImpl.java
+7
-0
link-api/src/main/java/com/link/service/impl/OoziejobresultServiceImpl.java
+10
-0
link-api/src/main/resources/application.yml
+1
-1
link-api/src/main/resources/mapper/OoziejobresultDao.xml
+36
-1
pom.xml
+1
-1
No files found.
link-admin/src/test/java/com/link/BaseTest.java
View file @
a38e9ea1
...
@@ -8,12 +8,32 @@
...
@@ -8,12 +8,32 @@
package
com
.
link
;
package
com
.
link
;
import
cn.hutool.core.date.DateField
;
import
cn.hutool.core.date.DatePattern
;
import
cn.hutool.core.date.DateTime
;
import
cn.hutool.core.date.DateUnit
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.Quarter
;
import
cn.hutool.core.date.format.DateParser
;
import
com.alibaba.fastjson.JSON
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
java.text.DateFormat
;
import
java.time.format.DateTimeFormatter
;
import
java.util.Calendar
;
import
java.util.Date
;
@RunWith
(
SpringRunner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
(
webEnvironment
=
SpringBootTest
.
WebEnvironment
.
DEFINED
_PORT
)
@SpringBootTest
(
webEnvironment
=
SpringBootTest
.
WebEnvironment
.
RANDOM
_PORT
)
public
abstract
class
BaseTest
{
public
abstract
class
BaseTest
{
public
static
void
main
(
String
[]
args
)
{
Quarter
quarter
=
DateUtil
.
quarterEnum
(
new
Date
());
DateTime
dateTime
=
DateUtil
.
beginOfQuarter
(
new
Date
());
String
s
=
DateUtil
.
yearAndQuarter
(
new
Date
());
DateUtil
.
weekOfYear
(
DateUtil
.
parse
(
"2019"
,
"yyyy"
));
System
.
out
.
println
(
s
);
}
}
}
\ No newline at end of file
link-api/src/main/java/com/link/controller/ApiController.java
View file @
a38e9ea1
This diff is collapsed.
Click to expand it.
link-api/src/main/java/com/link/controller/ApiLoginController.java
View file @
a38e9ea1
...
@@ -38,8 +38,8 @@ public class ApiLoginController {
...
@@ -38,8 +38,8 @@ public class ApiLoginController {
private
TokenService
tokenService
;
private
TokenService
tokenService
;
@PostMapping
(
"
login
"
)
@PostMapping
(
"
authorize
"
)
@ApiOperation
(
"
登录
"
)
@ApiOperation
(
"
用于数据接口访问前的授权操作
"
)
public
Result
<
Map
<
String
,
Object
>>
login
(
@RequestBody
LoginDTO
dto
){
public
Result
<
Map
<
String
,
Object
>>
login
(
@RequestBody
LoginDTO
dto
){
//表单校验
//表单校验
ValidatorUtils
.
validateEntity
(
dto
);
ValidatorUtils
.
validateEntity
(
dto
);
...
...
link-api/src/main/java/com/link/dao/OoziejobresultDao.java
View file @
a38e9ea1
...
@@ -6,6 +6,7 @@ import com.link.entity.OoziejobresultEntity;
...
@@ -6,6 +6,7 @@ import com.link.entity.OoziejobresultEntity;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
...
@@ -18,4 +19,6 @@ import java.util.Map;
...
@@ -18,4 +19,6 @@ import java.util.Map;
public
interface
OoziejobresultDao
extends
BaseDao
<
OoziejobresultEntity
>
{
public
interface
OoziejobresultDao
extends
BaseDao
<
OoziejobresultEntity
>
{
IPage
<
OoziejobresultEntity
>
getPage
(
IPage
<
OoziejobresultEntity
>
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
IPage
<
OoziejobresultEntity
>
getPage
(
IPage
<
OoziejobresultEntity
>
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
List
<
OoziejobresultEntity
>
getJoinList
(
Map
<
String
,
Object
>
params
);
}
}
\ No newline at end of file
link-api/src/main/java/com/link/dto/BdajobConfigDTO.java
View file @
a38e9ea1
...
@@ -26,9 +26,15 @@ public class BdajobConfigDTO implements Serializable {
...
@@ -26,9 +26,15 @@ public class BdajobConfigDTO implements Serializable {
@ApiModelProperty
(
"字段名"
)
@ApiModelProperty
(
"字段名"
)
private
String
fieldName
;
private
String
fieldName
;
@ApiModelProperty
(
"字段编码"
)
private
String
fieldCode
;
@ApiModelProperty
(
"字段描述"
)
@ApiModelProperty
(
"字段描述"
)
private
String
fieldDesc
;
private
String
fieldDesc
;
@ApiModelProperty
(
"字段类型:0-草稿,1-正式"
)
private
Integer
fieldType
;
@ApiModelProperty
(
"创建时间"
)
@ApiModelProperty
(
"创建时间"
)
private
Date
createTime
;
private
Date
createTime
;
}
}
\ No newline at end of file
link-api/src/main/java/com/link/dto/OoziejobresultDTO.java
View file @
a38e9ea1
...
@@ -31,5 +31,8 @@ public class OoziejobresultDTO implements Serializable {
...
@@ -31,5 +31,8 @@ public class OoziejobresultDTO implements Serializable {
@ApiModelProperty
(
value
=
"创建时间"
)
@ApiModelProperty
(
value
=
"创建时间"
)
private
String
createdtime
;
private
String
createdtime
;
@ApiModelProperty
(
value
=
"应用id"
)
private
String
jobId
;
}
}
\ No newline at end of file
link-api/src/main/java/com/link/entity/BdajobConfigEntity.java
View file @
a38e9ea1
package
com
.
link
.
entity
;
package
com
.
link
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
...
@@ -29,10 +30,18 @@ public class BdajobConfigEntity {
...
@@ -29,10 +30,18 @@ public class BdajobConfigEntity {
*/
*/
private
String
fieldName
;
private
String
fieldName
;
/**
/**
* 字段编码
*/
private
String
fieldCode
;
/**
* 字段描述
* 字段描述
*/
*/
private
String
fieldDesc
;
private
String
fieldDesc
;
/**
/**
* 字段类型
*/
private
Integer
fieldType
;
/**
* 创建时间
* 创建时间
*/
*/
private
Date
createTime
;
private
Date
createTime
;
...
...
link-api/src/main/java/com/link/entity/OoziejobresultEntity.java
View file @
a38e9ea1
...
@@ -35,4 +35,9 @@ public class OoziejobresultEntity {
...
@@ -35,4 +35,9 @@ public class OoziejobresultEntity {
* 创建时间
* 创建时间
*/
*/
private
String
createdtime
;
private
String
createdtime
;
/**
* 应用id
*/
private
String
jobId
;
}
}
\ No newline at end of file
link-api/src/main/java/com/link/interceptor/AuthorizationInterceptor.java
View file @
a38e9ea1
...
@@ -61,7 +61,11 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
...
@@ -61,7 +61,11 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
//查询token信息
//查询token信息
TokenEntity
tokenEntity
=
tokenService
.
getByToken
(
token
);
TokenEntity
tokenEntity
=
tokenService
.
getByToken
(
token
);
if
(
tokenEntity
==
null
||
tokenEntity
.
getExpireDate
().
getTime
()
<
System
.
currentTimeMillis
()){
// if(tokenEntity == null || tokenEntity.getExpireDate().getTime() < System.currentTimeMillis()){
// throw new RenException(ErrorCode.TOKEN_INVALID);
// }
//设置token不过期
if
(
tokenEntity
==
null
){
throw
new
RenException
(
ErrorCode
.
TOKEN_INVALID
);
throw
new
RenException
(
ErrorCode
.
TOKEN_INVALID
);
}
}
...
...
link-api/src/main/java/com/link/service/OoziejobresultService.java
View file @
a38e9ea1
...
@@ -7,6 +7,7 @@ import com.link.entity.OoziejobresultEntity;
...
@@ -7,6 +7,7 @@ import com.link.entity.OoziejobresultEntity;
import
com.link.dto.OoziejobresultDTO
;
import
com.link.dto.OoziejobresultDTO
;
import
com.link.entity.OoziejobresultEntity
;
import
com.link.entity.OoziejobresultEntity
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
...
@@ -24,4 +25,11 @@ public interface OoziejobresultService extends CrudService<OoziejobresultEntity,
...
@@ -24,4 +25,11 @@ public interface OoziejobresultService extends CrudService<OoziejobresultEntity,
*/
*/
PageData
<
OoziejobresultDTO
>
getPage
(
Map
<
String
,
Object
>
params
);
PageData
<
OoziejobresultDTO
>
getPage
(
Map
<
String
,
Object
>
params
);
/**
* @author Mr.Feng
* @date 2020/4/17 11:30
* @description 连接查询
*/
List
<
OoziejobresultDTO
>
getJoinList
(
Map
<
String
,
Object
>
params
);
}
}
\ No newline at end of file
link-api/src/main/java/com/link/service/impl/AgentnodeServiceImpl.java
View file @
a38e9ea1
...
@@ -15,11 +15,10 @@ import com.link.service.AgentnodeService;
...
@@ -15,11 +15,10 @@ import com.link.service.AgentnodeService;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
javax.swing.text.ComponentView
;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
*
*
* @author Mr.Feng zhijian.feng@hrtuoyu.com
* @author Mr.Feng zhijian.feng@hrtuoyu.com
* @since 1.0.0 2020-04-13
* @since 1.0.0 2020-04-13
*/
*/
...
@@ -27,13 +26,15 @@ import java.util.Map;
...
@@ -27,13 +26,15 @@ import java.util.Map;
public
class
AgentnodeServiceImpl
extends
CrudServiceImpl
<
AgentnodeDao
,
AgentnodeEntity
,
AgentnodeDTO
>
implements
AgentnodeService
{
public
class
AgentnodeServiceImpl
extends
CrudServiceImpl
<
AgentnodeDao
,
AgentnodeEntity
,
AgentnodeDTO
>
implements
AgentnodeService
{
@Override
@Override
public
QueryWrapper
<
AgentnodeEntity
>
getWrapper
(
Map
<
String
,
Object
>
params
){
public
QueryWrapper
<
AgentnodeEntity
>
getWrapper
(
Map
<
String
,
Object
>
params
)
{
String
id
=
(
String
)
params
.
get
(
"id"
);
String
id
=
(
String
)
params
.
get
(
"id"
);
String
name
=
Convert
.
toStr
(
params
.
get
(
"name"
));
String
name
=
Convert
.
toStr
(
params
.
get
(
"name"
));
String
nodeIds
=
Convert
.
toStr
(
params
.
get
(
"nodeIds"
));
QueryWrapper
<
AgentnodeEntity
>
wrapper
=
new
QueryWrapper
<>();
QueryWrapper
<
AgentnodeEntity
>
wrapper
=
new
QueryWrapper
<>();
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
id
),
"id"
,
id
);
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
id
),
"id"
,
id
);
wrapper
.
eq
(
StrUtil
.
isNotBlank
(
name
),
"name"
,
name
);
wrapper
.
eq
(
StrUtil
.
isNotBlank
(
name
),
"name"
,
name
);
wrapper
.
inSql
(
StrUtil
.
isNotBlank
(
nodeIds
),
"id"
,
nodeIds
);
return
wrapper
;
return
wrapper
;
}
}
...
...
link-api/src/main/java/com/link/service/impl/BdajobConfigServiceImpl.java
View file @
a38e9ea1
package
com
.
link
.
service
.
impl
;
package
com
.
link
.
service
.
impl
;
import
cn.hutool.core.convert.Convert
;
import
cn.hutool.core.convert.Convert
;
import
cn.hutool.core.util.ArrayUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.core.util.StrUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.link.common.service.impl.CrudServiceImpl
;
import
com.link.common.service.impl.CrudServiceImpl
;
...
@@ -28,10 +29,16 @@ public class BdajobConfigServiceImpl extends CrudServiceImpl<BdajobConfigDao, Bd
...
@@ -28,10 +29,16 @@ public class BdajobConfigServiceImpl extends CrudServiceImpl<BdajobConfigDao, Bd
public
QueryWrapper
<
BdajobConfigEntity
>
getWrapper
(
Map
<
String
,
Object
>
params
)
{
public
QueryWrapper
<
BdajobConfigEntity
>
getWrapper
(
Map
<
String
,
Object
>
params
)
{
String
id
=
(
String
)
params
.
get
(
"id"
);
String
id
=
(
String
)
params
.
get
(
"id"
);
String
jobId
=
Convert
.
toStr
(
params
.
get
(
"jobId"
));
String
jobId
=
Convert
.
toStr
(
params
.
get
(
"jobId"
));
String
[]
fieldCodeArr
=
(
String
[])
params
.
get
(
"fieldCodeArr"
);
Integer
fieldType
=
Convert
.
toInt
(
params
.
get
(
"fieldType"
));
QueryWrapper
<
BdajobConfigEntity
>
wrapper
=
new
QueryWrapper
<>();
QueryWrapper
<
BdajobConfigEntity
>
wrapper
=
new
QueryWrapper
<>();
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
id
),
"id"
,
id
);
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
id
),
"id"
,
id
);
wrapper
.
eq
(
StrUtil
.
isNotBlank
(
jobId
),
"job_id"
,
jobId
);
wrapper
.
eq
(
StrUtil
.
isNotBlank
(
jobId
),
"job_id"
,
jobId
);
if
(
ArrayUtil
.
isNotEmpty
(
fieldCodeArr
))
{
wrapper
.
in
(
"field_code"
,
fieldCodeArr
);
}
wrapper
.
eq
(
fieldType
!=
null
,
"field_type"
,
fieldType
);
return
wrapper
;
return
wrapper
;
}
}
...
...
link-api/src/main/java/com/link/service/impl/OoziejobresultServiceImpl.java
View file @
a38e9ea1
package
com
.
link
.
service
.
impl
;
package
com
.
link
.
service
.
impl
;
import
cn.hutool.core.convert.Convert
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.link.common.constant.Constant
;
import
com.link.common.constant.Constant
;
import
com.link.common.page.PageData
;
import
com.link.common.page.PageData
;
import
com.link.common.service.impl.CrudServiceImpl
;
import
com.link.common.service.impl.CrudServiceImpl
;
import
com.link.common.utils.ConvertUtils
;
import
com.link.dao.OoziejobresultDao
;
import
com.link.dao.OoziejobresultDao
;
import
com.link.dto.OoziejobresultDTO
;
import
com.link.dto.OoziejobresultDTO
;
import
com.link.entity.OoziejobresultEntity
;
import
com.link.entity.OoziejobresultEntity
;
...
@@ -16,6 +18,7 @@ import com.link.service.OoziejobresultService;
...
@@ -16,6 +18,7 @@ import com.link.service.OoziejobresultService;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
...
@@ -41,4 +44,10 @@ public class OoziejobresultServiceImpl extends CrudServiceImpl<OoziejobresultDao
...
@@ -41,4 +44,10 @@ public class OoziejobresultServiceImpl extends CrudServiceImpl<OoziejobresultDao
IPage
<
OoziejobresultEntity
>
page
=
baseDao
.
getPage
(
getPage
(
params
,
"createdtime"
,
false
),
params
);
IPage
<
OoziejobresultEntity
>
page
=
baseDao
.
getPage
(
getPage
(
params
,
"createdtime"
,
false
),
params
);
return
getPageData
(
page
,
OoziejobresultDTO
.
class
);
return
getPageData
(
page
,
OoziejobresultDTO
.
class
);
}
}
@Override
public
List
<
OoziejobresultDTO
>
getJoinList
(
Map
<
String
,
Object
>
params
)
{
List
<
OoziejobresultEntity
>
entityList
=
baseDao
.
getJoinList
(
params
);
return
ConvertUtils
.
sourceToTarget
(
entityList
,
OoziejobresultDTO
.
class
);
}
}
}
\ No newline at end of file
link-api/src/main/resources/application.yml
View file @
a38e9ea1
...
@@ -4,7 +4,7 @@ server:
...
@@ -4,7 +4,7 @@ server:
uri-encoding
:
UTF-8
uri-encoding
:
UTF-8
max-threads
:
1000
max-threads
:
1000
min-spare-threads
:
30
min-spare-threads
:
30
port
:
80
81
port
:
80
90
servlet
:
servlet
:
context-path
:
/link-api
context-path
:
/link-api
...
...
link-api/src/main/resources/mapper/OoziejobresultDao.xml
View file @
a38e9ea1
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<select
id=
"getPage"
resultType=
"com.link.entity.OoziejobresultEntity"
>
<select
id=
"getPage"
resultType=
"com.link.entity.OoziejobresultEntity"
>
select t.*
select t.*
from ooziejobresult t
from ooziejobresult t
left join ooziejob ooziejob on t.apppath = ooziejob.path and t.nodeid = ooziejob.id
left join ooziejob ooziejob on t.apppath = ooziejob.path and t.nodeid = ooziejob.
node
id
<where>
<where>
<if
test=
"params != null and params.nodeId != null and params.nodeId != ''"
>
<if
test=
"params != null and params.nodeId != null and params.nodeId != ''"
>
and t.nodeid = #{params.nodeId}
and t.nodeid = #{params.nodeId}
...
@@ -23,5 +23,39 @@
...
@@ -23,5 +23,39 @@
</where>
</where>
</select>
</select>
<select
id=
"getJoinList"
resultType=
"com.link.entity.OoziejobresultEntity"
>
select t.*,
ooziejob.jobid jobId
from ooziejobresult t
left join ooziejob ooziejob on t.apppath = ooziejob.path and t.nodeid = ooziejob.nodeid
<where>
<if
test=
"nodeId != null and nodeId != ''"
>
and t.nodeid = #{nodeId}
</if>
<if
test=
"jobId != null and jobId != ''"
>
and ooziejob.jobid = #{jobId}
</if>
<if
test=
"beginTime != null and beginTime != ''"
>
and t.createdtime
>
= #{beginTime}
</if>
<if
test=
"endTime != null and endTime != ''"
>
and t.createdtime
<
= #{endTime}
</if>
<if
test=
"nodeIds != null and nodeIds != ''"
>
and t.nodeid in (${nodeIds})
</if>
<if
test=
"jobIdList != null and jobIdList.size > 0"
>
and ooziejob.jobid in
<foreach
collection=
"jobIdList"
item=
"jobId"
open=
"("
close=
")"
separator=
","
>
#{jobId}
</foreach>
</if>
</where>
<if
test=
"orderBy != null and orderBy != ''"
>
order by ${orderBy}
</if>
</select>
</mapper>
</mapper>
\ No newline at end of file
pom.xml
View file @
a38e9ea1
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
<hutool.version>
5.1.2
</hutool.version>
<hutool.version>
5.1.2
</hutool.version>
<gson.version>
2.8.6
</gson.version>
<gson.version>
2.8.6
</gson.version>
<jsoup.version>
1.11.3
</jsoup.version>
<jsoup.version>
1.11.3
</jsoup.version>
<knife4j.version>
2.0.
1
</knife4j.version>
<knife4j.version>
2.0.
2
</knife4j.version>
<lombok.version>
1.18.4
</lombok.version>
<lombok.version>
1.18.4
</lombok.version>
<docker.plugin.version>
1.1.1
</docker.plugin.version>
<docker.plugin.version>
1.1.1
</docker.plugin.version>
</properties>
</properties>
...
...
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