Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-shiro
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
常超
xzxt-shiro
Commits
a3905cd1
Commit
a3905cd1
authored
Aug 09, 2018
by
zhaoshaonan
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
4aacd5e5
dbc1dbd2
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
212 additions
and
22 deletions
+212
-22
src/main/java/com/xzxtshiro/pojo/XzxtRestResult.java
+147
-0
src/main/java/com/xzxtshiro/util/RedisUtil.java
+51
-0
src/main/java/com/xzxtshiro/util/ZtreeDataUtil.java
+13
-21
src/main/resources/resource/db.properties
+1
-1
No files found.
src/main/java/com/xzxtshiro/pojo/XzxtRestResult.java
0 → 100644
View file @
a3905cd1
package
com
.
xzxtshiro
.
pojo
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
java.util.List
;
/**
* Xzxt-Rest自定义响应结构
*/
public
class
XzxtRestResult
{
// 定义jackson对象
private
static
final
ObjectMapper
MAPPER
=
new
ObjectMapper
();
// 响应业务状态
private
Integer
status
;
// 响应消息
private
String
msg
;
// 响应中的数据
private
Object
data
;
public
static
XzxtRestResult
build
(
Integer
status
,
String
msg
,
Object
data
)
{
return
new
XzxtRestResult
(
status
,
msg
,
data
);
}
public
static
XzxtRestResult
ok
(
Object
data
)
{
return
new
XzxtRestResult
(
data
);
}
public
static
XzxtRestResult
ok
(
int
i
,
String
count
,
List
<
Object
>
list
)
{
return
new
XzxtRestResult
(
null
);
}
public
XzxtRestResult
()
{
}
public
static
XzxtRestResult
build
(
Integer
status
,
String
msg
)
{
return
new
XzxtRestResult
(
status
,
msg
,
null
);
}
public
XzxtRestResult
(
Integer
status
,
String
msg
,
Object
data
)
{
this
.
status
=
status
;
this
.
msg
=
msg
;
this
.
data
=
data
;
}
public
XzxtRestResult
(
Object
data
)
{
this
.
status
=
200
;
this
.
msg
=
"OK"
;
this
.
data
=
data
;
}
public
Integer
getStatus
()
{
return
status
;
}
public
void
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
}
public
String
getMsg
()
{
return
msg
;
}
public
void
setMsg
(
String
msg
)
{
this
.
msg
=
msg
;
}
public
Object
getData
()
{
return
data
;
}
public
void
setData
(
Object
data
)
{
this
.
data
=
data
;
}
/**
* 将json结果集转化为Xzxt-Rest对象
*
* @param jsonData json数据
* @param clazz Xzxt-Rest中的object类型
* @return
*/
public
static
XzxtRestResult
formatToPojo
(
String
jsonData
,
Class
<?>
clazz
)
{
try
{
if
(
clazz
==
null
)
{
return
MAPPER
.
readValue
(
jsonData
,
XzxtRestResult
.
class
);
}
JsonNode
jsonNode
=
MAPPER
.
readTree
(
jsonData
);
JsonNode
data
=
jsonNode
.
get
(
"data"
);
Object
obj
=
null
;
if
(
clazz
!=
null
)
{
if
(
data
.
isObject
())
{
obj
=
MAPPER
.
readValue
(
data
.
traverse
(),
clazz
);
}
else
if
(
data
.
isTextual
())
{
obj
=
MAPPER
.
readValue
(
data
.
asText
(),
clazz
);
}
}
return
build
(
jsonNode
.
get
(
"status"
).
intValue
(),
jsonNode
.
get
(
"msg"
).
asText
(),
obj
);
}
catch
(
Exception
e
)
{
return
null
;
}
}
/**
* object对象的转化
*
* @param json
* @return
*/
public
static
XzxtRestResult
format
(
String
json
)
{
try
{
return
MAPPER
.
readValue
(
json
,
XzxtRestResult
.
class
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
return
null
;
}
/**
* Object是集合转化
*
* @param jsonData json数据
* @param clazz 集合中的类型
* @return
*/
public
static
XzxtRestResult
formatToList
(
String
jsonData
,
Class
<?>
clazz
)
{
try
{
JsonNode
jsonNode
=
MAPPER
.
readTree
(
jsonData
);
JsonNode
data
=
jsonNode
.
get
(
"data"
);
Object
obj
=
null
;
if
(
data
.
isArray
()
&&
data
.
size
()
>
0
)
{
obj
=
MAPPER
.
readValue
(
data
.
traverse
(),
MAPPER
.
getTypeFactory
().
constructCollectionType
(
List
.
class
,
clazz
));
}
return
build
(
jsonNode
.
get
(
"status"
).
intValue
(),
jsonNode
.
get
(
"msg"
).
asText
(),
obj
);
}
catch
(
Exception
e
)
{
return
null
;
}
}
}
src/main/java/com/xzxtshiro/util/RedisUtil.java
0 → 100644
View file @
a3905cd1
package
com
.
xzxtshiro
.
util
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
java.util.HashMap
;
import
java.util.Map
;
public
class
RedisUtil
{
//读取redis服务
/**
*
* hkey:省份 山西:14
* key: :14_CODE_UNIT_141181991700
* @return
*/
public
static
XzxtRestResult
ReadRedisRest
(
String
hkey
,
String
key
)
{
//查询参数
Map
<
String
,
String
>
param
=
new
HashMap
<>();
XzxtRestResult
xzxtRestResult
=
new
XzxtRestResult
();
param
.
put
(
"hkey"
,
hkey
);
param
.
put
(
"key"
,
key
);
//调用redisrest的服务
String
json
=
HttpClientUtil
.
doPost
(
"http://127.0.0.1:9043/xzxt-rest/ReadRedisRest"
,
param
);
if
(!
StringUtils
.
isBlank
(
json
))
{
xzxtRestResult
=
XzxtRestResult
.
format
(
json
);
}
return
xzxtRestResult
;
}
//更新edis服务
/**
*
* hkey:省份 山西:14
* tpye:CODE_UNIT
* @return
*/
public
static
XzxtRestResult
UpdateRedisRest
(
String
hkey
,
String
tpye
)
{
//查询参数
Map
<
String
,
String
>
param
=
new
HashMap
<>();
XzxtRestResult
xzxtRestResult
=
new
XzxtRestResult
();
param
.
put
(
"hkey"
,
hkey
);
param
.
put
(
"type"
,
tpye
);
//调用redisrest的服务
String
json
=
HttpClientUtil
.
doPost
(
"http://127.0.0.1:9043/xzxt-rest/UpdateRedisRest"
,
param
);
if
(!
StringUtils
.
isBlank
(
json
))
{
xzxtRestResult
=
XzxtRestResult
.
format
(
json
);
}
return
xzxtRestResult
;
}
}
src/main/java/com/xzxtshiro/util/ZtreeDataUtil.java
View file @
a3905cd1
...
@@ -10,8 +10,8 @@ import com.xzxtshiro.service.SysPermissionNewService;
...
@@ -10,8 +10,8 @@ import com.xzxtshiro.service.SysPermissionNewService;
import
com.xzxtshiro.service.SysRoleService
;
import
com.xzxtshiro.service.SysRoleService
;
import
com.xzxtshiro.service.SysUserService
;
import
com.xzxtshiro.service.SysUserService
;
import
net.sf.json.JSONArray
;
import
net.sf.json.JSONArray
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.ui.Model
;
import
org.springframework.ui.Model
;
import
org.springframework.util.StringUtils
;
import
java.util.List
;
import
java.util.List
;
...
@@ -49,34 +49,26 @@ public class ZtreeDataUtil {
...
@@ -49,34 +49,26 @@ public class ZtreeDataUtil {
String
unitStr
=
user
.
getUnitcode
();
String
unitStr
=
user
.
getUnitcode
();
String
usergrade
=
user
.
getGrade
();
String
usergrade
=
user
.
getGrade
();
SysDictitem
dictitem
=
new
SysDictitem
();
SysDictitem
dictitem
=
new
SysDictitem
();
dictitem
.
setGroupid
(
"CODE_UNIT"
);
dictitem
.
setGroupid
(
"CODE_UNIT
_ALL
"
);
dictitem
.
setCodeStr
(
unitStr
.
substring
(
0
,
2
)+
"%"
);
dictitem
.
setCodeStr
(
unitStr
.
substring
(
0
,
2
)+
"%"
);
// if(usergrade==null||usergrade.equals("")){
XzxtRestResult
xzxtRestResult
=
new
XzxtRestResult
();
//
// }else{
// if (usergrade.equals("S") || usergrade.equals("T")) {
// dictitem.setCodeStr(unitStr.substring(0,2)+"%");
// } else if (usergrade.equals("D")) {
// dictitem.setCodeStr(unitStr.substring(0,4)+"%");
// } else if (usergrade.equals("X")) {
// dictitem.setCodeStr(unitStr.substring(0,6)+"%");
// }
// else if (usergrade.equals("P")) {
// dictitem.setCodeStr(unitStr+"%");
// }
// }
//从缓存中取内容
//从缓存中取内容
try
{
try
{
String
result
=
jedisClient
.
hget
(
"CODE_UNIT"
,
dictitem
.
getCodeStr
());
xzxtRestResult
=
RedisUtil
.
ReadRedisRest
(
unitStr
.
substring
(
0
,
2
),
dictitem
.
getGroupid
());
if
(!
StringUtils
.
isBlank
(
result
))
{
String
result
=
""
;
if
(
xzxtRestResult
.
getStatus
()==
202
)
{
result
=
(
String
)
xzxtRestResult
.
getData
();
model
.
addAttribute
(
"unit"
,
result
);
model
.
addAttribute
(
"unit"
,
result
);
}
}
//向缓存中添加内容
//向缓存中添加内容
else
{
else
{
JSONArray
unit
=
dictitemService
.
selectDictitemByCondition
(
dictitem
);
try
{
try
{
jedisClient
.
hset
(
"CODE_UNIT"
,
dictitem
.
getCodeStr
(),
unit
.
toString
());
//先存储
model
.
addAttribute
(
"unit"
,
unit
);
RedisUtil
.
UpdateRedisRest
(
unitStr
.
substring
(
0
,
2
),
dictitem
.
getGroupid
());
//读取
xzxtRestResult
=
RedisUtil
.
ReadRedisRest
(
unitStr
.
substring
(
0
,
2
),
dictitem
.
getGroupid
());
result
=
(
String
)
xzxtRestResult
.
getData
();
model
.
addAttribute
(
"unit"
,
result
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
...
...
src/main/resources/resource/db.properties
View file @
a3905cd1
jdbc.driverClassName
=
oracle.jdbc.driver.OracleDriver
jdbc.driverClassName
=
oracle.jdbc.driver.OracleDriver
jdbc.driver
=
oracle.jdbc.driver.OracleDriver
jdbc.driver
=
oracle.jdbc.driver.OracleDriver
jdbc.url
=
jdbc:oracle:thin:@192.168.
126.129:1521:XZXT3
jdbc.url
=
jdbc:oracle:thin:@192.168.
2.160:1521:XZXT
jdbc.username
=
XZXT
jdbc.username
=
XZXT
jdbc.password
=
XZXT
jdbc.password
=
XZXT
...
...
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