Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
TDLCloud
Project
Project
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
WitCloud
TDLCloud
Commits
c3747a59
Commit
c3747a59
authored
Jun 15, 2018
by
zhuangzhuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
6.15-修改权限,仓库的bug,增加单个接口的权限控制,修该网关的bug修复
parent
b68c0e5c
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
113 additions
and
43 deletions
+113
-43
MyWebMvcConfigurer.java
src/main/java/com/example/tdl/config/MyWebMvcConfigurer.java
+6
-1
PermissionInterceptor.java
...va/com/example/tdl/interceptor/PermissionInterceptor.java
+24
-4
PermissionMapper.java
src/main/java/com/example/tdl/mapper/PermissionMapper.java
+3
-0
WarehouseMapper.java
src/main/java/com/example/tdl/mapper/WarehouseMapper.java
+1
-1
MqttListener.java
src/main/java/com/example/tdl/mqtt/MqttListener.java
+5
-4
PermissionService.java
src/main/java/com/example/tdl/service/PermissionService.java
+4
-0
WarehouseService.java
src/main/java/com/example/tdl/service/WarehouseService.java
+2
-2
CircuitController.java
src/main/java/com/example/tdl/web/CircuitController.java
+1
-0
DownloadController.java
src/main/java/com/example/tdl/web/DownloadController.java
+1
-1
EquipmentBindingController.java
.../java/com/example/tdl/web/EquipmentBindingController.java
+5
-7
GatewayController.java
src/main/java/com/example/tdl/web/GatewayController.java
+9
-1
HomePageController.java
src/main/java/com/example/tdl/web/HomePageController.java
+2
-0
WarehouseController.java
src/main/java/com/example/tdl/web/WarehouseController.java
+27
-11
application.properties
src/main/resources/application.properties
+6
-8
messages_zh_CN.properties
src/main/resources/i18n/messages_zh_CN.properties
+1
-0
CompanyMapper.xml
src/main/resources/mapper/CompanyMapper.xml
+1
-0
ConfigMapper.xml
src/main/resources/mapper/ConfigMapper.xml
+1
-1
GatewayMapper.xml
src/main/resources/mapper/GatewayMapper.xml
+1
-1
PermissionMapper.xml
src/main/resources/mapper/PermissionMapper.xml
+10
-0
WarehouseMapper.xml
src/main/resources/mapper/WarehouseMapper.xml
+3
-1
No files found.
src/main/java/com/example/tdl/config/MyWebMvcConfigurer.java
View file @
c3747a59
...
@@ -24,7 +24,12 @@ public class MyWebMvcConfigurer extends WebMvcConfigurerAdapter {
...
@@ -24,7 +24,12 @@ public class MyWebMvcConfigurer extends WebMvcConfigurerAdapter {
public
void
addInterceptors
(
InterceptorRegistry
registry
)
{
public
void
addInterceptors
(
InterceptorRegistry
registry
)
{
registry
.
addInterceptor
(
loginInterceptor
()).
excludePathPatterns
(
"/alarmLog/**"
)
registry
.
addInterceptor
(
loginInterceptor
()).
excludePathPatterns
(
"/alarmLog/**"
)
.
excludePathPatterns
(
"/login/**"
);
.
excludePathPatterns
(
"/login/**"
);
registry
.
addInterceptor
(
permissionInterceptor
()).
excludePathPatterns
(
"/login/**"
).
excludePathPatterns
(
"/alarmLog/add"
);
registry
.
addInterceptor
(
permissionInterceptor
())
.
excludePathPatterns
(
"/login/**"
)
.
excludePathPatterns
(
"/alarmLog/add"
)
.
excludePathPatterns
(
"/side/**"
);
super
.
addInterceptors
(
registry
);
super
.
addInterceptors
(
registry
);
}
}
}
}
src/main/java/com/example/tdl/interceptor/PermissionInterceptor.java
View file @
c3747a59
package
com
.
example
.
tdl
.
interceptor
;
package
com
.
example
.
tdl
.
interceptor
;
import
com.example.tdl.domain.vo.UserVo
;
import
com.example.tdl.domain.vo.UserVo
;
import
com.example.tdl.service.PermissionService
;
import
com.example.tdl.service.RoleService
;
import
com.example.tdl.service.RoleService
;
import
com.example.tdl.service.redis.TokenRedisService
;
import
com.example.tdl.service.redis.TokenRedisService
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
...
@@ -12,6 +13,8 @@ import org.springframework.web.servlet.ModelAndView;
...
@@ -12,6 +13,8 @@ import org.springframework.web.servlet.ModelAndView;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.OutputStream
;
import
java.util.List
;
public
class
PermissionInterceptor
implements
HandlerInterceptor
{
public
class
PermissionInterceptor
implements
HandlerInterceptor
{
...
@@ -23,10 +26,18 @@ public class PermissionInterceptor implements HandlerInterceptor {
...
@@ -23,10 +26,18 @@ public class PermissionInterceptor implements HandlerInterceptor {
@Autowired
@Autowired
private
RoleService
roleService
;
private
RoleService
roleService
;
@Autowired
private
PermissionService
permissionService
;
Gson
gson
=
new
Gson
();
Gson
gson
=
new
Gson
();
@Override
@Override
public
boolean
preHandle
(
HttpServletRequest
request
,
HttpServletResponse
response
,
Object
handler
)
throws
Exception
{
public
boolean
preHandle
(
HttpServletRequest
request
,
HttpServletResponse
response
,
Object
handler
)
throws
Exception
{
String
URL
=
request
.
getRequestURI
();
if
(
URL
.
contains
(
"swagger"
)
||
URL
.
contains
(
"/v2/api-docs"
)){
return
true
;
}
logger
.
info
(
"==============执行顺序: 1、preHandle================"
);
logger
.
info
(
"==============执行顺序: 1、preHandle================"
);
String
requestUri
=
request
.
getRequestURI
();
String
requestUri
=
request
.
getRequestURI
();
String
contextPath
=
request
.
getContextPath
();
String
contextPath
=
request
.
getContextPath
();
...
@@ -34,11 +45,20 @@ public class PermissionInterceptor implements HandlerInterceptor {
...
@@ -34,11 +45,20 @@ public class PermissionInterceptor implements HandlerInterceptor {
logger
.
info
(
"url:"
+
url
);
logger
.
info
(
"url:"
+
url
);
//获取用户信息以及对应的权限信息
//获取用户信息以及对应的权限信息
UserVo
user
=
gson
.
fromJson
(
redisService
.
get
(
"TOKEN_"
+
request
.
getHeader
(
"Account_token"
)),
UserVo
.
class
);
UserVo
user
=
gson
.
fromJson
(
redisService
.
get
(
"TOKEN_"
+
request
.
getHeader
(
"Account_token"
)),
UserVo
.
class
);
//根据用户名获取对应的权限
//根据用户名获取对应的权限
List
<
String
>
permissions
=
permissionService
.
getByRoleName
(
user
.
getRoleName
(),
user
.
getCompanyNo
());
for
(
int
i
=
0
,
length
=
permissions
.
size
();
i
<
length
;
i
++){
return
true
;
if
(
permissions
.
get
(
i
).
contains
(
url
)){
return
true
;
}
}
response
.
setContentType
(
"application/json"
);
response
.
setStatus
(
200
);
response
.
setHeader
(
"Content-type"
,
"text/html;charset=UTF-8"
);
OutputStream
ps
=
response
.
getOutputStream
();
ps
.
write
(
"{\"code\":0,\"message\":\"对不起,您没有权限进行此操作\"}"
.
getBytes
(
"UTF-8"
));
return
false
;
}
}
@Override
@Override
...
...
src/main/java/com/example/tdl/mapper/PermissionMapper.java
View file @
c3747a59
...
@@ -3,6 +3,7 @@ package com.example.tdl.mapper;
...
@@ -3,6 +3,7 @@ package com.example.tdl.mapper;
import
com.example.tdl.domain.vo.PermissionVo
;
import
com.example.tdl.domain.vo.PermissionVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.List
;
...
@@ -13,4 +14,6 @@ public interface PermissionMapper {
...
@@ -13,4 +14,6 @@ public interface PermissionMapper {
List
<
String
>
getPermissionParentName
();
List
<
String
>
getPermissionParentName
();
List
<
String
>
getPermissionByPermissionName
(
String
permissionName
);
List
<
String
>
getPermissionByPermissionName
(
String
permissionName
);
List
<
String
>
getByRoleName
(
@Param
(
"roleName"
)
String
roleName
,
@Param
(
"companyNo"
)
String
companyNo
);
}
}
src/main/java/com/example/tdl/mapper/WarehouseMapper.java
View file @
c3747a59
...
@@ -23,7 +23,7 @@ public interface WarehouseMapper {
...
@@ -23,7 +23,7 @@ public interface WarehouseMapper {
List
<
DeviceVo
>
getDevice
(
String
warehouseNo
);
List
<
DeviceVo
>
getDevice
(
String
warehouseNo
);
Integer
getWarehouseNo
(
String
warehouse
No
);
Integer
getWarehouseNo
(
@Param
(
"warehouseNo"
)
String
warehouseNo
,
@Param
(
"companyNo"
)
String
company
No
);
Integer
getByWarehouseNoAndSN
(
@Param
(
"warehouseNo"
)
String
warehouseNo
,
@Param
(
"SN"
)
String
SN
);
Integer
getByWarehouseNoAndSN
(
@Param
(
"warehouseNo"
)
String
warehouseNo
,
@Param
(
"SN"
)
String
SN
);
...
...
src/main/java/com/example/tdl/mqtt/MqttListener.java
View file @
c3747a59
...
@@ -149,8 +149,7 @@ public class MqttListener implements MqttCallback {
...
@@ -149,8 +149,7 @@ public class MqttListener implements MqttCallback {
@Override
@Override
public
void
messageArrived
(
String
topic
,
MqttMessage
mqttMessage
)
throws
Exception
{
public
void
messageArrived
(
String
topic
,
MqttMessage
mqttMessage
)
throws
Exception
{
String
Message
=
mqttMessage
.
toString
();
String
Message
=
mqttMessage
.
toString
();
Long
timestamp
=
System
.
currentTimeMillis
();
clearOvertimeConfig
(
System
.
currentTimeMillis
());
clearOvertimeConfig
(
timestamp
);
String
[]
tmparray
=
topic
.
split
(
"/"
);
String
[]
tmparray
=
topic
.
split
(
"/"
);
String
Type
=
tmparray
[
1
];
String
Type
=
tmparray
[
1
];
String
SN
=
tmparray
[
2
];
String
SN
=
tmparray
[
2
];
...
@@ -184,12 +183,12 @@ public class MqttListener implements MqttCallback {
...
@@ -184,12 +183,12 @@ public class MqttListener implements MqttCallback {
configCMDVo
.
setT
(
System
.
currentTimeMillis
()/
1000
l
);
configCMDVo
.
setT
(
System
.
currentTimeMillis
()/
1000
l
);
gcconfig
=
new
GWConfigWorker
(
Type
,
SN
,
gson
.
toJson
(
configCMDVo
),
configService
,
true
);
gcconfig
=
new
GWConfigWorker
(
Type
,
SN
,
gson
.
toJson
(
configCMDVo
),
configService
,
true
);
}
}
gwconfigworkerMap
.
put
(
Type
+
"_"
+
SN
+
"_"
+
System
.
currentTimeMillis
(),
gcconfig
);
gcconfig
.
SetMqttConfig
(
mqttconfig
.
getUrl
(),
mqttconfig
.
getPort
(),
gcconfig
.
SetMqttConfig
(
mqttconfig
.
getUrl
(),
mqttconfig
.
getPort
(),
mqttconfig
.
getUsername
(),
mqttconfig
.
getPassword
(),
mqttconfig
.
getQos
(),
mqttconfig
.
getUsername
(),
mqttconfig
.
getPassword
(),
mqttconfig
.
getQos
(),
mqttconfig
.
getCacrt
(),
mqttconfig
.
getClientkey
(),
mqttconfig
.
getClientcrt
(),
mqttconfig
.
getClientpwd
());
mqttconfig
.
getCacrt
(),
mqttconfig
.
getClientkey
(),
mqttconfig
.
getClientcrt
(),
mqttconfig
.
getClientpwd
());
result
=
configthreadPool
.
submit
(
gcconfig
);
result
=
configthreadPool
.
submit
(
gcconfig
);
//futureMap.put(Type+"_"+SN+"_"+timestamp,result);
gwconfigworkerMap
.
put
(
Type
+
"_"
+
SN
+
"_"
+
timestamp
,
gcconfig
);
// while (result.isDone())
// while (result.isDone())
// {
// {
// String respcmd = result.get();
// String respcmd = result.get();
...
@@ -208,6 +207,8 @@ public class MqttListener implements MqttCallback {
...
@@ -208,6 +207,8 @@ public class MqttListener implements MqttCallback {
}
}
}
}
@Override
@Override
public
void
deliveryComplete
(
IMqttDeliveryToken
iMqttDeliveryToken
)
{
public
void
deliveryComplete
(
IMqttDeliveryToken
iMqttDeliveryToken
)
{
...
...
src/main/java/com/example/tdl/service/PermissionService.java
View file @
c3747a59
...
@@ -25,4 +25,8 @@ public class PermissionService {
...
@@ -25,4 +25,8 @@ public class PermissionService {
public
List
<
String
>
getPermissionByPermissionName
(
String
permissionName
){
public
List
<
String
>
getPermissionByPermissionName
(
String
permissionName
){
return
permissionMapper
.
getPermissionByPermissionName
(
permissionName
);
return
permissionMapper
.
getPermissionByPermissionName
(
permissionName
);
}
}
public
List
<
String
>
getByRoleName
(
String
roleName
,
String
companyNo
){
return
permissionMapper
.
getByRoleName
(
roleName
,
companyNo
);
}
}
}
src/main/java/com/example/tdl/service/WarehouseService.java
View file @
c3747a59
...
@@ -36,8 +36,8 @@ public class WarehouseService {
...
@@ -36,8 +36,8 @@ public class WarehouseService {
return
warehouseMapper
.
getDevice
(
warehouseNo
);
return
warehouseMapper
.
getDevice
(
warehouseNo
);
}
}
public
Integer
getWarehouseNo
(
String
warehouseNo
){
public
Integer
getWarehouseNo
(
String
warehouseNo
,
String
companyNo
){
return
warehouseMapper
.
getWarehouseNo
(
warehouseNo
);
return
warehouseMapper
.
getWarehouseNo
(
warehouseNo
,
companyNo
);
}
}
public
Integer
getByWarehouseNoAndSN
(
String
warehouseNo
,
String
SN
){
public
Integer
getByWarehouseNoAndSN
(
String
warehouseNo
,
String
SN
){
...
...
src/main/java/com/example/tdl/web/CircuitController.java
View file @
c3747a59
...
@@ -1430,6 +1430,7 @@ public class CircuitController {
...
@@ -1430,6 +1430,7 @@ public class CircuitController {
Map
<
Object
,
Object
>
msg
=
new
HashMap
<>();
Map
<
Object
,
Object
>
msg
=
new
HashMap
<>();
msg
.
put
(
"msg"
,
map
.
get
(
"msg"
));
msg
.
put
(
"msg"
,
map
.
get
(
"msg"
));
if
(
msg
.
get
(
"msg"
).
equals
(
"解除网关成功"
)){
if
(
msg
.
get
(
"msg"
).
equals
(
"解除网关成功"
)){
fb
.
setCode
(
1
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"circuitDeleteSuccess"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"circuitDeleteSuccess"
));
String
key
=
"TDL/"
+
tdlLogVo
.
getgType
()+
"/"
+
tdlLogVo
.
getgSN
()
+
"/Data"
;
String
key
=
"TDL/"
+
tdlLogVo
.
getgType
()+
"/"
+
tdlLogVo
.
getgSN
()
+
"/Data"
;
alarmRedisService
.
delKey
(
key
);
alarmRedisService
.
delKey
(
key
);
...
...
src/main/java/com/example/tdl/web/DownloadController.java
View file @
c3747a59
...
@@ -94,7 +94,7 @@ public class DownloadController {
...
@@ -94,7 +94,7 @@ public class DownloadController {
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"warehouseNo"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"warehouseNo"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
}
}
if
(
warehouseService
.
getWarehouseNo
(
downloadForWarehouseVo
.
getWarehouseNo
())
==
0
){
if
(
warehouseService
.
getWarehouseNo
(
downloadForWarehouseVo
.
getWarehouseNo
()
,
user
.
getCompanyNo
()
)
==
0
){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
...
...
src/main/java/com/example/tdl/web/EquipmentBindingController.java
View file @
c3747a59
...
@@ -132,11 +132,7 @@ public class EquipmentBindingController {
...
@@ -132,11 +132,7 @@ public class EquipmentBindingController {
gprsPeriod
=
60
;
gprsPeriod
=
60
;
}
else
{
}
else
{
gpsPeriod
=
5
;
gpsPeriod
=
5
;
if
(
"17110194"
.
equals
(
bindingVo
.
getgSN
())){
gprsPeriod
=
15
;
gprsPeriod
=
7
;
}
else
{
gprsPeriod
=
15
;
}
}
}
//开始绑定
//开始绑定
//获取gateway下的所有tdl的编号
//获取gateway下的所有tdl的编号
...
@@ -165,7 +161,7 @@ public class EquipmentBindingController {
...
@@ -165,7 +161,7 @@ public class EquipmentBindingController {
devList
.
add
(
"TDL-"
+
bindingVo
.
getTDLSN
());
devList
.
add
(
"TDL-"
+
bindingVo
.
getTDLSN
());
ConfigCMDVo
configCMDVo
=
new
ConfigCMDVo
(
"config"
,
gpsPeriod
,
gprsPeriod
,
devList
,
tempL
,
tempH
,
humiL
,
humiH
,
pressL
,
pressH
,
sugEnergy
,
accThreshold
,
timeThreshold
,
tiltThreshold
,
bindingVo
.
getMode
(),
System
.
currentTimeMillis
()/
1000
l
);
ConfigCMDVo
configCMDVo
=
new
ConfigCMDVo
(
"config"
,
gpsPeriod
,
gprsPeriod
,
devList
,
tempL
,
tempH
,
humiL
,
humiH
,
pressL
,
pressH
,
sugEnergy
,
accThreshold
,
timeThreshold
,
tiltThreshold
,
bindingVo
.
getMode
(),
System
.
currentTimeMillis
()/
1000
l
);
Map
<
Object
,
Object
>
map
=
new
HashMap
<>();
Map
<
Object
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"companyN
ame"
,
user
.
getCompanyName
());
map
.
put
(
"companyN
o"
,
user
.
getCompanyNo
());
map
.
put
(
"transportationNo"
,
bindingVo
.
getTransportationNo
());
map
.
put
(
"transportationNo"
,
bindingVo
.
getTransportationNo
());
map
.
put
(
"warehouseNo"
,
bindingVo
.
getWarehouseNo
());
map
.
put
(
"warehouseNo"
,
bindingVo
.
getWarehouseNo
());
map
.
put
(
"useScene"
,
bindingVo
.
getMode
());
map
.
put
(
"useScene"
,
bindingVo
.
getMode
());
...
@@ -258,7 +254,7 @@ public class EquipmentBindingController {
...
@@ -258,7 +254,7 @@ public class EquipmentBindingController {
fb
.
setMessage
(
"仓库编号不能为空"
);
fb
.
setMessage
(
"仓库编号不能为空"
);
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
}
}
if
(
warehouseService
.
getWarehouseNo
(
addWarehouseGatewayVo
.
getWarehouseNo
())
==
0
){
if
(
warehouseService
.
getWarehouseNo
(
addWarehouseGatewayVo
.
getWarehouseNo
()
,
user
.
getCompanyNo
()
)
==
0
){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
"仓库编号不存在"
);
fb
.
setMessage
(
"仓库编号不存在"
);
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
...
@@ -297,4 +293,6 @@ public class EquipmentBindingController {
...
@@ -297,4 +293,6 @@ public class EquipmentBindingController {
}
}
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
}
}
}
}
src/main/java/com/example/tdl/web/GatewayController.java
View file @
c3747a59
...
@@ -121,6 +121,11 @@ public class GatewayController {
...
@@ -121,6 +121,11 @@ public class GatewayController {
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"gatewayType"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"gatewayType"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
}
}
if
(
addGatewayVo
.
getType
().
matches
(
"[u4e00-u9fa5]"
)){
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"badGatewayType"
));
return
gson
.
toJson
(
fb
);
}
if
(
StringUtils
.
isEmpty
(
addGatewayVo
.
getModelName
())){
if
(
StringUtils
.
isEmpty
(
addGatewayVo
.
getModelName
())){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"gatewayModelName"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"gatewayModelName"
));
...
@@ -168,6 +173,9 @@ public class GatewayController {
...
@@ -168,6 +173,9 @@ public class GatewayController {
})
})
@RequestMapping
(
value
=
"/updateGateway"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/updateGateway"
,
method
=
RequestMethod
.
POST
)
public
Object
updateGateway
(
@RequestBody
UpdateGatewayVo
updateGatewayVo
,
HttpServletRequest
request
){
public
Object
updateGateway
(
@RequestBody
UpdateGatewayVo
updateGatewayVo
,
HttpServletRequest
request
){
String
token
=
request
.
getHeader
(
"Account_token"
);
String
datum
=
tokenRedisService
.
get
(
"TOKEN_"
+
token
);
UserRedisVo
user
=
gson
.
fromJson
(
datum
,
UserRedisVo
.
class
);
if
(
StringUtils
.
isEmpty
(
updateGatewayVo
.
getSN
())){
if
(
StringUtils
.
isEmpty
(
updateGatewayVo
.
getSN
())){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"gatewaySN"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"gatewaySN"
));
...
@@ -183,7 +191,7 @@ public class GatewayController {
...
@@ -183,7 +191,7 @@ public class GatewayController {
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"gatewayType"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"gatewayType"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
}
}
if
(
gatewayService
.
getBySN
AndType
(
updateGatewayVo
.
getSN
(),
updateGatewayVo
.
getType
())==
null
){
if
(
gatewayService
.
getBySN
(
updateGatewayVo
.
getSN
(),
user
.
getCompanyNo
())==
null
){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"existGateway"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"existGateway"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
...
...
src/main/java/com/example/tdl/web/HomePageController.java
View file @
c3747a59
...
@@ -212,6 +212,8 @@ public class HomePageController {
...
@@ -212,6 +212,8 @@ public class HomePageController {
return
dateResult
;
return
dateResult
;
}
}
//将utc时间转换成时间戳
//将utc时间转换成时间戳
public
static
String
dateToStamp
(
String
s
)
throws
ParseException
{
public
static
String
dateToStamp
(
String
s
)
throws
ParseException
{
Date
date
=
null
;
Date
date
=
null
;
...
...
src/main/java/com/example/tdl/web/WarehouseController.java
View file @
c3747a59
...
@@ -293,7 +293,7 @@ public class WarehouseController {
...
@@ -293,7 +293,7 @@ public class WarehouseController {
}
}
JSONObject
jsonObject
=
JSON
.
parseObject
(
warehouseNo
);
JSONObject
jsonObject
=
JSON
.
parseObject
(
warehouseNo
);
warehouseNo
=(
String
)
jsonObject
.
get
(
"warehouseNo"
);
warehouseNo
=(
String
)
jsonObject
.
get
(
"warehouseNo"
);
if
(
warehouseService
.
getWarehouseNo
(
warehouseNo
)
==
0
){
if
(
warehouseService
.
getWarehouseNo
(
warehouseNo
,
userRedisVo
.
getCompanyNo
()
)
==
0
){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
...
@@ -385,7 +385,7 @@ public class WarehouseController {
...
@@ -385,7 +385,7 @@ public class WarehouseController {
}
}
JSONObject
jsonObject
=
JSON
.
parseObject
(
warehouseNo
);
JSONObject
jsonObject
=
JSON
.
parseObject
(
warehouseNo
);
warehouseNo
=(
String
)
jsonObject
.
get
(
"warehouseNo"
);
warehouseNo
=(
String
)
jsonObject
.
get
(
"warehouseNo"
);
if
(
warehouseService
.
getWarehouseNo
(
warehouseNo
)
==
0
){
if
(
warehouseService
.
getWarehouseNo
(
warehouseNo
,
user
.
getCompanyNo
()
)
==
0
){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
...
@@ -414,7 +414,7 @@ public class WarehouseController {
...
@@ -414,7 +414,7 @@ public class WarehouseController {
}
}
JSONObject
jsonObject
=
JSON
.
parseObject
(
warehouseNo
);
JSONObject
jsonObject
=
JSON
.
parseObject
(
warehouseNo
);
warehouseNo
=(
String
)
jsonObject
.
get
(
"warehouseNo"
);
warehouseNo
=(
String
)
jsonObject
.
get
(
"warehouseNo"
);
if
(
warehouseService
.
getWarehouseNo
(
warehouseNo
)
==
0
){
if
(
warehouseService
.
getWarehouseNo
(
warehouseNo
,
user
.
getCompanyNo
()
)
==
0
){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
...
@@ -452,7 +452,7 @@ public class WarehouseController {
...
@@ -452,7 +452,7 @@ public class WarehouseController {
String
token
=
request
.
getHeader
(
"Account_token"
);
String
token
=
request
.
getHeader
(
"Account_token"
);
String
datum
=
tokenRedisService
.
get
(
"TOKEN_"
+
token
);
String
datum
=
tokenRedisService
.
get
(
"TOKEN_"
+
token
);
UserRedisVo
user
=
gson
.
fromJson
(
datum
,
UserRedisVo
.
class
);
UserRedisVo
user
=
gson
.
fromJson
(
datum
,
UserRedisVo
.
class
);
String
warehouseNo
=
getWarehouseNo
();
String
warehouseNo
=
getWarehouseNo
(
user
.
getCompanyNo
()
);
if
(
StringUtils
.
isEmpty
(
addWarehouseVo
.
getImg
())){
if
(
StringUtils
.
isEmpty
(
addWarehouseVo
.
getImg
())){
addWarehouseVo
.
setImg
(
"https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/wareHouseImage/1527562358242TM.jpg"
);
addWarehouseVo
.
setImg
(
"https://tdlcloud.oss-cn-shanghai.aliyuncs.com/pic/wareHouseImage/1527562358242TM.jpg"
);
}
}
...
@@ -639,6 +639,11 @@ public class WarehouseController {
...
@@ -639,6 +639,11 @@ public class WarehouseController {
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"warehouseNo"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"warehouseNo"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
}
}
if
(
warehouseService
.
getWarehouseNo
(
updateWarehouseVo
.
getWarehouseNo
(),
user
.
getCompanyNo
())
==
0
){
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
return
gson
.
toJson
(
fb
);
}
if
(
StringUtils
.
isEmpty
(
updateWarehouseVo
.
getWarehouseName
())){
if
(
StringUtils
.
isEmpty
(
updateWarehouseVo
.
getWarehouseName
())){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"warehouseName"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"warehouseName"
));
...
@@ -806,7 +811,7 @@ public class WarehouseController {
...
@@ -806,7 +811,7 @@ public class WarehouseController {
}
}
JSONObject
jsonObject
=
JSON
.
parseObject
(
warehouseNo
);
JSONObject
jsonObject
=
JSON
.
parseObject
(
warehouseNo
);
warehouseNo
=(
String
)
jsonObject
.
get
(
"warehouseNo"
);
warehouseNo
=(
String
)
jsonObject
.
get
(
"warehouseNo"
);
if
(
warehouseService
.
getWarehouseNo
(
warehouseNo
)
==
0
){
if
(
warehouseService
.
getWarehouseNo
(
warehouseNo
,
user
.
getCompanyNo
()
)
==
0
){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
...
@@ -847,7 +852,7 @@ public class WarehouseController {
...
@@ -847,7 +852,7 @@ public class WarehouseController {
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"warehouseNo"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"warehouseNo"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
}
}
if
(
warehouseService
.
getWarehouseNo
(
addWarehouseGatewayVo
.
getWarehouseNo
())
==
0
){
if
(
warehouseService
.
getWarehouseNo
(
addWarehouseGatewayVo
.
getWarehouseNo
()
,
user
.
getCompanyNo
()
)
==
0
){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
...
@@ -902,7 +907,7 @@ public class WarehouseController {
...
@@ -902,7 +907,7 @@ public class WarehouseController {
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"warehouseNo"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"warehouseNo"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
}
}
if
(
warehouseService
.
getWarehouseNo
(
warehouseUserVo
.
getWarehouseNo
())
==
0
){
if
(
warehouseService
.
getWarehouseNo
(
warehouseUserVo
.
getWarehouseNo
()
,
user
.
getCompanyNo
()
)
==
0
){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
...
@@ -969,8 +974,16 @@ public class WarehouseController {
...
@@ -969,8 +974,16 @@ public class WarehouseController {
})
})
@PostMapping
(
"/getWarehouseData"
)
@PostMapping
(
"/getWarehouseData"
)
public
Object
getWarehouseData
(
@RequestBody
String
warehouseNo
,
HttpServletRequest
request
){
public
Object
getWarehouseData
(
@RequestBody
String
warehouseNo
,
HttpServletRequest
request
){
String
token
=
request
.
getHeader
(
"Account_token"
);
String
datum
=
tokenRedisService
.
get
(
"TOKEN_"
+
token
);
UserRedisVo
user
=
gson
.
fromJson
(
datum
,
UserRedisVo
.
class
);
JSONObject
jsonObject
=
JSON
.
parseObject
(
warehouseNo
);
JSONObject
jsonObject
=
JSON
.
parseObject
(
warehouseNo
);
warehouseNo
=(
String
)
jsonObject
.
get
(
"warehouseNo"
);
warehouseNo
=(
String
)
jsonObject
.
get
(
"warehouseNo"
);
if
(
warehouseService
.
getWarehouseNo
(
warehouseNo
,
user
.
getCompanyNo
())
==
0
){
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
return
gson
.
toJson
(
fb
);
}
List
<
WarehouseGatewayDateVo
>
warehouseGatewayDateVoList
=
new
ArrayList
<>();
List
<
WarehouseGatewayDateVo
>
warehouseGatewayDateVoList
=
new
ArrayList
<>();
List
<
GatewayOnLineVo
>
gatewayOnLineVos
=
gatewayService
.
getByWarehouseNo
(
warehouseNo
);
List
<
GatewayOnLineVo
>
gatewayOnLineVos
=
gatewayService
.
getByWarehouseNo
(
warehouseNo
);
for
(
int
a
=
0
;
a
<
gatewayOnLineVos
.
size
();
a
++){
for
(
int
a
=
0
;
a
<
gatewayOnLineVos
.
size
();
a
++){
...
@@ -1089,12 +1102,15 @@ public class WarehouseController {
...
@@ -1089,12 +1102,15 @@ public class WarehouseController {
})
})
@PostMapping
(
"/getTdlData"
)
@PostMapping
(
"/getTdlData"
)
public
Object
getTdlData
(
@RequestBody
SearchTdlVo
searchTdlVo
,
HttpServletRequest
request
){
public
Object
getTdlData
(
@RequestBody
SearchTdlVo
searchTdlVo
,
HttpServletRequest
request
){
String
token
=
request
.
getHeader
(
"Account_token"
);
String
datum
=
tokenRedisService
.
get
(
"TOKEN_"
+
token
);
UserRedisVo
user
=
gson
.
fromJson
(
datum
,
UserRedisVo
.
class
);
if
(
StringUtils
.
isEmpty
(
searchTdlVo
.
getWarehouseNo
())){
if
(
StringUtils
.
isEmpty
(
searchTdlVo
.
getWarehouseNo
())){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"warehouseNo"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"warehouseNo"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
}
}
if
(
warehouseService
.
getWarehouseNo
(
searchTdlVo
.
getWarehouseNo
())
==
0
){
if
(
warehouseService
.
getWarehouseNo
(
searchTdlVo
.
getWarehouseNo
()
,
user
.
getCompanyNo
()
)
==
0
){
fb
.
setCode
(
0
);
fb
.
setCode
(
0
);
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
fb
.
setMessage
(
i18n
.
getMessage
(
request
,
"Nonexistent"
));
return
gson
.
toJson
(
fb
);
return
gson
.
toJson
(
fb
);
...
@@ -1158,11 +1174,11 @@ public class WarehouseController {
...
@@ -1158,11 +1174,11 @@ public class WarehouseController {
//生成仓库编号
//生成仓库编号
public
String
getWarehouseNo
(){
public
String
getWarehouseNo
(
String
companyNo
){
String
warehouseNo
=
"WH"
+
System
.
currentTimeMillis
()
;
String
warehouseNo
=
"WH"
+
System
.
currentTimeMillis
()
;
warehouseNo
=
warehouseNo
+((
int
)(
Math
.
random
()*(
9999
-
1000
+
1
))+
1000
);
warehouseNo
=
warehouseNo
+((
int
)(
Math
.
random
()*(
9999
-
1000
+
1
))+
1000
);
if
(
warehouseService
.
getWarehouseNo
(
warehouseNo
)>
0
){
if
(
warehouseService
.
getWarehouseNo
(
warehouseNo
,
companyNo
)>
0
){
while
(
warehouseService
.
getWarehouseNo
(
warehouseNo
)>
0
){
while
(
warehouseService
.
getWarehouseNo
(
warehouseNo
,
companyNo
)>
0
){
warehouseNo
=
warehouseNo
+((
int
)(
Math
.
random
()*(
9999
-
1000
+
1
))+
1000
);
warehouseNo
=
warehouseNo
+((
int
)(
Math
.
random
()*(
9999
-
1000
+
1
))+
1000
);
}
}
}
}
...
...
src/main/resources/application.properties
View file @
c3747a59
#spring.datasource.url=jdbc:mysql://47.97.184.225:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.url
=
jdbc:mysql://192.168.1.16:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
#spring.datasource.url=jdbc:mysql://192.168.1.16:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.url
=
jdbc:mysql://192.168.1.53:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.username
=
root
spring.datasource.username
=
root
spring.datasource.password
=
root
spring.datasource.password
=
37774020
#spring.datasource.password=37774020
spring.datasource.driver-class-name
=
com.mysql.jdbc.Driver
spring.datasource.driver-class-name
=
com.mysql.jdbc.Driver
...
@@ -64,15 +61,16 @@ spring.influxdb.write-timeout=10
...
@@ -64,15 +61,16 @@ spring.influxdb.write-timeout=10
spring.influxdb.gzip
=
true
spring.influxdb.gzip
=
true
#tdl.core.add =http://logisticscore-java:8079/witium/addMount
#tdl.core.delete =http://logisticscore-java:8079/witium/delMount
tdl.core.add
=
http://192.168.1.16:8079/witium/addMount
tdl.core.add
=
http://192.168.1.16:8079/witium/addMount
tdl.core.delete
=
http://192.168.1.16:8079/witium/delMount
tdl.core.delete
=
http://192.168.1.16:8079/witium/delMount
mqtt.userName
=
ugen
mqtt.userName
=
ugen
mqtt.password
=
ugen
mqtt.password
=
ugen
#tdl.core.add =http://logisticscore-java:8079/witium/addMount
#tdl.core.delete =http://logisticscore-java:8079/witium/delMount
#
#mqtt.userName = wtlogistics
#mqtt.userName = wtlogistics
#mqtt.password = wtlogistics
#mqtt.password = wtlogistics
...
...
src/main/resources/i18n/messages_zh_CN.properties
View file @
c3747a59
...
@@ -193,6 +193,7 @@ gatewaySN=\u7F51\u5173\u5E8F\u5217\u53F7\u4E0D\u80FD\u4E3A\u7A7A
...
@@ -193,6 +193,7 @@ gatewaySN=\u7F51\u5173\u5E8F\u5217\u53F7\u4E0D\u80FD\u4E3A\u7A7A
gatewaySNRule
=
gateway
\u
7F16
\u
53F7
\u
5FC5
\u
987B
\u
662F8
\u
4F4D
\u6570\u
5B57
gatewaySNRule
=
gateway
\u
7F16
\u
53F7
\u
5FC5
\u
987B
\u
662F8
\u
4F4D
\u6570\u
5B57
gatewayName
=
\u
7F51
\u5173\u
540D
\u
4E0D
\u
80FD
\u
4E3A
\u
7A7A
gatewayName
=
\u
7F51
\u5173\u
540D
\u
4E0D
\u
80FD
\u
4E3A
\u
7A7A
gatewayType
=
\u
7F51
\u5173\u
7C7B
\u
578B
\u
4E0D
\u
80FD
\u
4E3A
\u
7A7A
gatewayType
=
\u
7F51
\u5173\u
7C7B
\u
578B
\u
4E0D
\u
80FD
\u
4E3A
\u
7A7A
badGatewayType
=
\u
7F51
\u5173\u
7C7B
\u
578B
\u
4E0D
\u
80FD
\u
5B58
\u5728\u
4E2D
\u6587
gatewayModelName
=
\u
7F51
\u5173\u
6A21
\u
677F
\u
540D
\u
4E0D
\u
80FD
\u
4E3A
\u
7A7A
gatewayModelName
=
\u
7F51
\u5173\u
6A21
\u
677F
\u
540D
\u
4E0D
\u
80FD
\u
4E3A
\u
7A7A
existModelName
=
\u
8BE5
\u
6A21
\u
677F
\u
4E0D
\u
5B58
\u5728
existModelName
=
\u
8BE5
\u
6A21
\u
677F
\u
4E0D
\u
5B58
\u5728
repeatedSN
=
\u
6DFB
\u
52A0
\u7684\u
7F51
\u5173\u
5DF2
\u
5B58
\u5728
repeatedSN
=
\u
6DFB
\u
52A0
\u7684\u
7F51
\u5173\u
5DF2
\u
5B58
\u5728
...
...
src/main/resources/mapper/CompanyMapper.xml
View file @
c3747a59
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
WHERE state=1
WHERE state=1
<if
test=
"companyNo!='TM201803298320'"
>
<if
test=
"companyNo!='TM201803298320'"
>
and pid=(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
and pid=(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
OR companyNo=#{companyNo,jdbcType=VARCHAR}
</if>
</if>
</select>
</select>
...
...
src/main/resources/mapper/ConfigMapper.xml
View file @
c3747a59
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<![CDATA[
<![CDATA[
{
{
call pro_addTDLGatewayLog(
call pro_addTDLGatewayLog(
#{companyN
ame
,mode=IN,jdbcType=VARCHAR},
#{companyN
o
,mode=IN,jdbcType=VARCHAR},
#{transportationNo,mode=IN,jdbcType=VARCHAR},
#{transportationNo,mode=IN,jdbcType=VARCHAR},
#{warehouseNo,mode=IN,jdbcType=VARCHAR},
#{warehouseNo,mode=IN,jdbcType=VARCHAR},
#{useScene,mode=IN,jdbcType=INTEGER},
#{useScene,mode=IN,jdbcType=INTEGER},
...
...
src/main/resources/mapper/GatewayMapper.xml
View file @
c3747a59
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
SELECT type from gateway g INNER JOIN company c on g.company_id=c.id
SELECT type from gateway g INNER JOIN company c on g.company_id=c.id
where SN=#{SN,jdbcType=VARCHAR}
where SN=#{SN,jdbcType=VARCHAR}
<if
test=
"companyNo!='TM201803298320'"
>
<if
test=
"companyNo!='TM201803298320'"
>
WHERE
companyNo=#{companyNo,jdbcType=VARCHAR}
and
companyNo=#{companyNo,jdbcType=VARCHAR}
</if>
</if>
</select>
</select>
...
...
src/main/resources/mapper/PermissionMapper.xml
View file @
c3747a59
...
@@ -17,4 +17,14 @@
...
@@ -17,4 +17,14 @@
SELECT p.permissionName FROM permission p,permission a WHERE p.pid=a.id AND a.permissionName=#{permissionName,jdbcType=VARCHAR}
SELECT p.permissionName FROM permission p,permission a WHERE p.pid=a.id AND a.permissionName=#{permissionName,jdbcType=VARCHAR}
</select>
</select>
<select
id=
"getByRoleName"
parameterType=
"String"
resultType=
"String"
>
select DISTINCT url
from permission p,role_has_permission rp,role r,company c
where p.id = rp.permission_id
and r.id = rp.role_id
and c.id = r.company_id
and companyNo = #{companyNo,jdbcType=VARCHAR}
and roleName = #{roleName,jdbcType=VARCHAR}
</select>
</mapper>
</mapper>
\ No newline at end of file
src/main/resources/mapper/WarehouseMapper.xml
View file @
c3747a59
...
@@ -55,7 +55,9 @@
...
@@ -55,7 +55,9 @@
</select>
</select>
<select
id=
"getWarehouseNo"
resultType=
"java.lang.Integer"
parameterType=
"String"
>
<select
id=
"getWarehouseNo"
resultType=
"java.lang.Integer"
parameterType=
"String"
>
select count(warehouseNo) from warehouse where warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
select count(warehouseNo) from warehouse
where warehouseNo=#{warehouseNo,jdbcType=VARCHAR}
and company_id =(select id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
</select>
</select>
<select
id=
"getByWarehouseName"
parameterType=
"String"
resultType=
"com.example.tdl.domain.vo.ResultWarehouseVo"
>
<select
id=
"getByWarehouseName"
parameterType=
"String"
resultType=
"com.example.tdl.domain.vo.ResultWarehouseVo"
>
...
...
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