Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
map-parent
Commits
826a1b53
Commit
826a1b53
authored
Nov 02, 2022
by
宋珺琪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改真实ip、任务列表添加筛选条件(西藏)
parent
9036cc5e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
2 deletions
+34
-2
common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/SkRegionalsTaskParam.java
+8
-0
common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java
+2
-2
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsTaskMapper.xml
+24
-0
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/SkRegionalsTaskParam.java
View file @
826a1b53
...
@@ -39,4 +39,12 @@ public class SkRegionalsTaskParam {
...
@@ -39,4 +39,12 @@ public class SkRegionalsTaskParam {
* 列数
* 列数
*/
*/
private
Integer
pageSize
;
private
Integer
pageSize
;
/**
* 任务状态
*/
private
String
state
;
/**
*任务编号(RW开头)
*/
private
String
taskId
;
}
}
common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java
View file @
826a1b53
...
@@ -79,7 +79,7 @@ public class SysUserController extends ApiController {
...
@@ -79,7 +79,7 @@ public class SysUserController extends ApiController {
JwtUser
util
=
new
JwtUser
();
JwtUser
util
=
new
JwtUser
();
String
ip
=
request
.
getRemoteAddr
();
String
ip
=
request
.
getRemoteAddr
();
//密码加密与刑专一致
//密码加密与刑专一致
Token
tokenEntity
=
new
Token
(
one
.
getUsername
(),
ip
,
DigestUtil
.
encrypt
(
password
));
Token
tokenEntity
=
new
Token
(
one
.
getUsername
(),
one
.
getIp
()
,
DigestUtil
.
encrypt
(
password
));
JSONObject
jsonObject
=
(
JSONObject
)
JSONObject
.
toJSON
(
tokenEntity
);
JSONObject
jsonObject
=
(
JSONObject
)
JSONObject
.
toJSON
(
tokenEntity
);
//用户JWT生成token
//用户JWT生成token
String
token
=
util
.
createJWT
(
jsonObject
.
toString
());
String
token
=
util
.
createJWT
(
jsonObject
.
toString
());
...
@@ -121,7 +121,7 @@ public class SysUserController extends ApiController {
...
@@ -121,7 +121,7 @@ public class SysUserController extends ApiController {
one
.
setIp
(
NetworkUtil
.
getIpAddr
(
request
));
one
.
setIp
(
NetworkUtil
.
getIpAddr
(
request
));
JwtUser
util
=
new
JwtUser
();
JwtUser
util
=
new
JwtUser
();
String
ip
=
request
.
getRemoteAddr
();
String
ip
=
request
.
getRemoteAddr
();
Token
tokenEntity
=
new
Token
(
one
.
getUsername
(),
ip
,
one
.
getPassword
());
Token
tokenEntity
=
new
Token
(
one
.
getUsername
(),
one
.
getIp
()
,
one
.
getPassword
());
JSONObject
jsonObject
=
(
JSONObject
)
JSONObject
.
toJSON
(
tokenEntity
);
JSONObject
jsonObject
=
(
JSONObject
)
JSONObject
.
toJSON
(
tokenEntity
);
// 用户JWT生成token
// 用户JWT生成token
String
token
=
util
.
createJWT
(
jsonObject
.
toString
());
String
token
=
util
.
createJWT
(
jsonObject
.
toString
());
...
...
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsTaskMapper.xml
View file @
826a1b53
...
@@ -112,6 +112,18 @@
...
@@ -112,6 +112,18 @@
<if
test=
"jssj!= null and jssj!=''"
>
<if
test=
"jssj!= null and jssj!=''"
>
AND a.fssj
<![CDATA[<=]]>
DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
AND a.fssj
<![CDATA[<=]]>
DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
</if>
</if>
<if
test=
"state == 1"
>
AND (a.state = '1' or a.state = '2')
</if>
<if
test=
"state == 2"
>
AND a.state = '3'
</if>
<if
test=
"state == 3"
>
AND (a.state = '1' or a.state = '2' or a.state = '3')
</if>
<if
test=
"taskId != null and taskId != ''"
>
AND a.taskId = #{taskId , jdbcType=VARCHAR }
</if>
ORDER BY
ORDER BY
fssj DESC
fssj DESC
LIMIT #{page},#{pageSize}
LIMIT #{page},#{pageSize}
...
@@ -138,6 +150,18 @@
...
@@ -138,6 +150,18 @@
<if
test=
"jssj!= null and jssj!=''"
>
<if
test=
"jssj!= null and jssj!=''"
>
AND a.fssj
<![CDATA[<=]]>
DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
AND a.fssj
<![CDATA[<=]]>
DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
</if>
</if>
<if
test=
"state == 1"
>
AND (a.state = '1' or a.state = '2')
</if>
<if
test=
"state == 2"
>
AND a.state = '3'
</if>
<if
test=
"state == 3"
>
AND (a.state = '1' or a.state = '2' or a.state = '3')
</if>
<if
test=
"taskId != null and taskId != ''"
>
AND a.taskId = #{taskId , jdbcType=VARCHAR }
</if>
</select>
</select>
<!--根据任务id查询区域信息-->
<!--根据任务id查询区域信息-->
<select
id=
"queryRegionalsList"
parameterType=
"String"
resultType=
"com.founder.commonutils.model.vo.param.RegionalsParam"
>
<select
id=
"queryRegionalsList"
parameterType=
"String"
resultType=
"com.founder.commonutils.model.vo.param.RegionalsParam"
>
...
...
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