Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
guns-vip
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
chenjunxiong
guns-vip
Commits
ec4d2565
Commit
ec4d2565
authored
Apr 04, 2019
by
fengshuonan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
适配oracle的wrapper
parent
82dd6279
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
48 additions
and
7 deletions
+48
-7
src/main/java/cn/stylefeng/guns/core/util/DecimalUtil.java
+36
-0
src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptWrapper.java
+3
-2
src/main/java/cn/stylefeng/guns/modular/system/warpper/LogWrapper.java
+2
-1
src/main/java/cn/stylefeng/guns/modular/system/warpper/NoticeWrapper.java
+2
-1
src/main/java/cn/stylefeng/guns/modular/system/warpper/RoleWrapper.java
+3
-2
src/main/java/cn/stylefeng/guns/modular/system/warpper/UserWrapper.java
+2
-1
No files found.
src/main/java/cn/stylefeng/guns/core/util/DecimalUtil.java
0 → 100644
View file @
ec4d2565
package
cn
.
stylefeng
.
guns
.
core
.
util
;
import
java.math.BigDecimal
;
import
java.math.BigInteger
;
/**
* decimal变量获取
*
* @author fengshuonan
* @date 2019-04-04-17:06
*/
public
class
DecimalUtil
{
/**
* 获取object的值
*
* @author fengshuonan
* @Date 2019-04-04 17:07
*/
public
static
Long
getLong
(
Object
object
)
{
if
(
object
==
null
)
{
return
null
;
}
if
(
object
instanceof
BigDecimal
)
{
return
((
BigDecimal
)
object
).
longValue
();
}
if
(
object
instanceof
BigInteger
)
{
return
((
BigInteger
)
object
).
longValue
();
}
if
(
object
instanceof
Long
)
{
return
((
Long
)
object
);
}
return
null
;
}
}
src/main/java/cn/stylefeng/guns/modular/system/warpper/DeptWrapper.java
View file @
ec4d2565
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
package
cn
.
stylefeng
.
guns
.
modular
.
system
.
warpper
;
package
cn
.
stylefeng
.
guns
.
modular
.
system
.
warpper
;
import
cn.stylefeng.guns.core.common.constant.factory.ConstantFactory
;
import
cn.stylefeng.guns.core.common.constant.factory.ConstantFactory
;
import
cn.stylefeng.guns.core.util.DecimalUtil
;
import
cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper
;
import
cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper
;
import
cn.stylefeng.roses.core.util.ToolUtil
;
import
cn.stylefeng.roses.core.util.ToolUtil
;
import
cn.stylefeng.roses.kernel.model.page.PageResult
;
import
cn.stylefeng.roses.kernel.model.page.PageResult
;
...
@@ -50,9 +51,9 @@ public class DeptWrapper extends BaseControllerWrapper {
...
@@ -50,9 +51,9 @@ public class DeptWrapper extends BaseControllerWrapper {
@Override
@Override
protected
void
wrapTheMap
(
Map
<
String
,
Object
>
map
)
{
protected
void
wrapTheMap
(
Map
<
String
,
Object
>
map
)
{
Long
pid
=
(
Long
)
map
.
get
(
"pid"
);
Long
pid
=
DecimalUtil
.
getLong
(
map
.
get
(
"pid"
)
);
if
(
ToolUtil
.
isEmpty
(
pid
)
||
pid
.
equals
(
0
))
{
if
(
ToolUtil
.
isEmpty
(
pid
)
||
pid
.
equals
(
0
L
))
{
map
.
put
(
"pName"
,
"--"
);
map
.
put
(
"pName"
,
"--"
);
}
else
{
}
else
{
map
.
put
(
"pName"
,
ConstantFactory
.
me
().
getDeptName
(
pid
));
map
.
put
(
"pName"
,
ConstantFactory
.
me
().
getDeptName
(
pid
));
...
...
src/main/java/cn/stylefeng/guns/modular/system/warpper/LogWrapper.java
View file @
ec4d2565
...
@@ -17,6 +17,7 @@ package cn.stylefeng.guns.modular.system.warpper;
...
@@ -17,6 +17,7 @@ package cn.stylefeng.guns.modular.system.warpper;
import
cn.stylefeng.guns.core.common.constant.factory.ConstantFactory
;
import
cn.stylefeng.guns.core.common.constant.factory.ConstantFactory
;
import
cn.stylefeng.guns.core.util.Contrast
;
import
cn.stylefeng.guns.core.util.Contrast
;
import
cn.stylefeng.guns.core.util.DecimalUtil
;
import
cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper
;
import
cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper
;
import
cn.stylefeng.roses.core.util.ToolUtil
;
import
cn.stylefeng.roses.core.util.ToolUtil
;
...
@@ -43,7 +44,7 @@ public class LogWrapper extends BaseControllerWrapper {
...
@@ -43,7 +44,7 @@ public class LogWrapper extends BaseControllerWrapper {
protected
void
wrapTheMap
(
Map
<
String
,
Object
>
map
)
{
protected
void
wrapTheMap
(
Map
<
String
,
Object
>
map
)
{
String
message
=
(
String
)
map
.
get
(
"message"
);
String
message
=
(
String
)
map
.
get
(
"message"
);
Long
userid
=
(
Long
)
map
.
get
(
"userId"
);
Long
userid
=
DecimalUtil
.
getLong
(
map
.
get
(
"userId"
)
);
map
.
put
(
"userName"
,
ConstantFactory
.
me
().
getUserNameById
(
userid
));
map
.
put
(
"userName"
,
ConstantFactory
.
me
().
getUserNameById
(
userid
));
//如果信息过长,则只截取前100位字符串
//如果信息过长,则只截取前100位字符串
...
...
src/main/java/cn/stylefeng/guns/modular/system/warpper/NoticeWrapper.java
View file @
ec4d2565
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
package
cn
.
stylefeng
.
guns
.
modular
.
system
.
warpper
;
package
cn
.
stylefeng
.
guns
.
modular
.
system
.
warpper
;
import
cn.stylefeng.guns.core.common.constant.factory.ConstantFactory
;
import
cn.stylefeng.guns.core.common.constant.factory.ConstantFactory
;
import
cn.stylefeng.guns.core.util.DecimalUtil
;
import
cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper
;
import
cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper
;
import
cn.stylefeng.roses.kernel.model.page.PageResult
;
import
cn.stylefeng.roses.kernel.model.page.PageResult
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
...
@@ -49,7 +50,7 @@ public class NoticeWrapper extends BaseControllerWrapper {
...
@@ -49,7 +50,7 @@ public class NoticeWrapper extends BaseControllerWrapper {
@Override
@Override
protected
void
wrapTheMap
(
Map
<
String
,
Object
>
map
)
{
protected
void
wrapTheMap
(
Map
<
String
,
Object
>
map
)
{
Long
creater
=
(
Long
)
map
.
get
(
"createUser"
);
Long
creater
=
DecimalUtil
.
getLong
(
map
.
get
(
"createUser"
)
);
map
.
put
(
"createrName"
,
ConstantFactory
.
me
().
getUserNameById
(
creater
));
map
.
put
(
"createrName"
,
ConstantFactory
.
me
().
getUserNameById
(
creater
));
}
}
}
}
src/main/java/cn/stylefeng/guns/modular/system/warpper/RoleWrapper.java
View file @
ec4d2565
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
package
cn
.
stylefeng
.
guns
.
modular
.
system
.
warpper
;
package
cn
.
stylefeng
.
guns
.
modular
.
system
.
warpper
;
import
cn.stylefeng.guns.core.common.constant.factory.ConstantFactory
;
import
cn.stylefeng.guns.core.common.constant.factory.ConstantFactory
;
import
cn.stylefeng.guns.core.util.DecimalUtil
;
import
cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper
;
import
cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper
;
import
cn.stylefeng.roses.kernel.model.page.PageResult
;
import
cn.stylefeng.roses.kernel.model.page.PageResult
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
...
@@ -49,8 +50,8 @@ public class RoleWrapper extends BaseControllerWrapper {
...
@@ -49,8 +50,8 @@ public class RoleWrapper extends BaseControllerWrapper {
@Override
@Override
protected
void
wrapTheMap
(
Map
<
String
,
Object
>
map
)
{
protected
void
wrapTheMap
(
Map
<
String
,
Object
>
map
)
{
map
.
put
(
"pName"
,
ConstantFactory
.
me
().
getSingleRoleName
(
(
Long
)
map
.
get
(
"pid"
)));
map
.
put
(
"pName"
,
ConstantFactory
.
me
().
getSingleRoleName
(
DecimalUtil
.
getLong
(
map
.
get
(
"pid"
)
)));
map
.
put
(
"deptName"
,
ConstantFactory
.
me
().
getDeptName
(
(
Long
)
map
.
get
(
"deptId"
)));
map
.
put
(
"deptName"
,
ConstantFactory
.
me
().
getDeptName
(
DecimalUtil
.
getLong
(
map
.
get
(
"deptId"
)
)));
}
}
}
}
src/main/java/cn/stylefeng/guns/modular/system/warpper/UserWrapper.java
View file @
ec4d2565
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
package
cn
.
stylefeng
.
guns
.
modular
.
system
.
warpper
;
package
cn
.
stylefeng
.
guns
.
modular
.
system
.
warpper
;
import
cn.stylefeng.guns.core.common.constant.factory.ConstantFactory
;
import
cn.stylefeng.guns.core.common.constant.factory.ConstantFactory
;
import
cn.stylefeng.guns.core.util.DecimalUtil
;
import
cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper
;
import
cn.stylefeng.roses.core.base.warpper.BaseControllerWrapper
;
import
cn.stylefeng.roses.kernel.model.page.PageResult
;
import
cn.stylefeng.roses.kernel.model.page.PageResult
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
...
@@ -51,7 +52,7 @@ public class UserWrapper extends BaseControllerWrapper {
...
@@ -51,7 +52,7 @@ public class UserWrapper extends BaseControllerWrapper {
protected
void
wrapTheMap
(
Map
<
String
,
Object
>
map
)
{
protected
void
wrapTheMap
(
Map
<
String
,
Object
>
map
)
{
map
.
put
(
"sexName"
,
ConstantFactory
.
me
().
getSexName
((
String
)
map
.
get
(
"sex"
)));
map
.
put
(
"sexName"
,
ConstantFactory
.
me
().
getSexName
((
String
)
map
.
get
(
"sex"
)));
map
.
put
(
"roleName"
,
ConstantFactory
.
me
().
getRoleName
((
String
)
map
.
get
(
"roleId"
)));
map
.
put
(
"roleName"
,
ConstantFactory
.
me
().
getRoleName
((
String
)
map
.
get
(
"roleId"
)));
map
.
put
(
"deptName"
,
ConstantFactory
.
me
().
getDeptName
(
(
Long
)
map
.
get
(
"deptId"
)));
map
.
put
(
"deptName"
,
ConstantFactory
.
me
().
getDeptName
(
DecimalUtil
.
getLong
(
map
.
get
(
"deptId"
)
)));
map
.
put
(
"statusName"
,
ConstantFactory
.
me
().
getStatusName
((
String
)
map
.
get
(
"status"
)));
map
.
put
(
"statusName"
,
ConstantFactory
.
me
().
getStatusName
((
String
)
map
.
get
(
"status"
)));
}
}
...
...
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