Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
93458693
Commit
93458693
authored
May 17, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加入导入功能
parent
2117728c
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
153 additions
and
1 deletion
+153
-1
BranchCompanyBiz.java
...m/xinxincaravan/caravan/vehicle/biz/BranchCompanyBiz.java
+37
-0
BranchCompanyStockService.java
...aravan/caravan/vehicle/biz/BranchCompanyStockService.java
+1
-1
CampsiteBiz.java
...va/com/xinxincaravan/caravan/vehicle/biz/CampsiteBiz.java
+75
-0
ConstantMapper.java
.../xinxincaravan/caravan/vehicle/mapper/ConstantMapper.java
+4
-0
SysRegionMapper.java
...xinxincaravan/caravan/vehicle/mapper/SysRegionMapper.java
+2
-0
BranchCompanyController.java
...caravan/caravan/vehicle/rest/BranchCompanyController.java
+14
-0
CampsiteController.java
...inxincaravan/caravan/vehicle/rest/CampsiteController.java
+13
-0
ConstantMapper.xml
vehicle/src/main/resources/mapper/ConstantMapper.xml
+4
-0
SysRegionMapper.xml
vehicle/src/main/resources/mapper/SysRegionMapper.xml
+3
-0
No files found.
vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/BranchCompanyBiz.java
View file @
93458693
...
...
@@ -9,8 +9,10 @@ import com.google.common.collect.Lists;
import
com.xinxincaravan.caravan.vehicle.common.RestResponse
;
import
com.xinxincaravan.caravan.vehicle.constant.RedisKey
;
import
com.xinxincaravan.caravan.vehicle.entity.BranchCompany
;
import
com.xinxincaravan.caravan.vehicle.entity.BranchCompanyStockInfo
;
import
com.xinxincaravan.caravan.vehicle.feign.dto.UserDTO
;
import
com.xinxincaravan.caravan.vehicle.mapper.BranchCompanyMapper
;
import
com.xinxincaravan.caravan.vehicle.util.excel.ExcelImport
;
import
com.xinxincaravan.caravan.vehicle.vo.BranchCompanyVo
;
import
com.xinxincaravan.caravan.vehicle.vo.PageDataVo
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -28,7 +30,9 @@ import org.springframework.stereotype.Service;
import
org.springframework.web.multipart.MultipartFile
;
import
tk.mybatis.mapper.entity.Example
;
import
javax.servlet.http.HttpServletRequest
;
import
java.io.File
;
import
java.math.BigDecimal
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
...
...
@@ -178,5 +182,38 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
List
<
BranchCompany
>
zoneCompanys
=
selectByExample
(
example
);
return
zoneCompanys
;
}
public
RestResponse
<
String
>
importExcel
(
MultipartFile
multipartfile
,
HttpServletRequest
request
){
try
{
List
<
String
[]>
readExcel
=
ExcelImport
.
getExcelData
(
multipartfile
);
if
(
readExcel
.
size
()<
1
){
return
RestResponse
.
codeAndMessage
(
1001
,
"导入不能没数据!!!"
);
}
List
<
BranchCompanyStockInfo
>
list
=
new
ArrayList
<>();
for
(
int
i
=
1
;
i
<
readExcel
.
size
();
i
++)
{
String
[]
str
=
readExcel
.
get
(
i
);
BranchCompany
branchCompany
=
new
BranchCompany
();
branchCompany
.
setName
(
str
[
0
]);
branchCompany
=
mapper
.
selectOne
(
branchCompany
);
if
(
branchCompany
!=
null
){
BranchCompany
branchCompany1
=
new
BranchCompany
();
if
(
str
.
length
>
1
){
branchCompany1
.
setLeader
(
str
[
1
]);
}
if
(
str
.
length
>
2
){
branchCompany1
.
setLeaderContactInfo
(
str
[
2
]);
}
if
(
branchCompany1
!=
null
&&(
StringUtils
.
isNotBlank
(
branchCompany1
.
getLeader
())||
StringUtils
.
isNotBlank
(
branchCompany1
.
getLeaderContactInfo
()))){
branchCompany1
.
setId
(
branchCompany
.
getId
());
mapper
.
updateByPrimaryKeySelective
(
branchCompany1
);
}
}
}
}
catch
(
Exception
e
){
e
.
printStackTrace
();
return
RestResponse
.
codeAndMessage
(
10001
,
"网络异常!"
);
}
return
RestResponse
.
suc
();
}
}
vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/BranchCompanyStockService.java
View file @
93458693
...
...
@@ -250,7 +250,7 @@ public class BranchCompanyStockService {
String
province
=
str
[
2
];
String
city
=
str
[
3
];
Integer
addr_province
=
sysRegionMapper
.
getNumber
(
province
);
Integer
addr_city
=
sysRegionMapper
.
getNumber
(
city
);
Integer
addr_city
=
sysRegionMapper
.
getNumber
(
city
);
String
company_name
=
str
[
5
];
String
str6
=
str
[
6
];
if
(
StringUtils
.
isNotBlank
(
str6
)){
...
...
vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/CampsiteBiz.java
View file @
93458693
...
...
@@ -11,6 +11,9 @@ import com.xinxincaravan.caravan.vehicle.constant.RedisKey;
import
com.xinxincaravan.caravan.vehicle.entity.Campsite
;
import
com.xinxincaravan.caravan.vehicle.feign.dto.UserDTO
;
import
com.xinxincaravan.caravan.vehicle.mapper.CampsiteMapper
;
import
com.xinxincaravan.caravan.vehicle.mapper.ConstantMapper
;
import
com.xinxincaravan.caravan.vehicle.mapper.SysRegionMapper
;
import
com.xinxincaravan.caravan.vehicle.util.excel.ExcelImport
;
import
com.xinxincaravan.caravan.vehicle.vo.CampsiteVo
;
import
com.xinxincaravan.caravan.vehicle.vo.PageDataVo
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -28,9 +31,12 @@ import org.springframework.stereotype.Service;
import
org.springframework.web.multipart.MultipartFile
;
import
tk.mybatis.mapper.entity.Example
;
import
javax.servlet.http.HttpServletRequest
;
import
java.io.File
;
import
java.math.BigDecimal
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.concurrent.TimeUnit
;
import
java.util.stream.Collectors
;
...
...
@@ -53,6 +59,12 @@ public class CampsiteBiz extends BaseBiz<CampsiteMapper, Campsite> {
@Value
(
"${campsitePic.baseUploadPath}"
)
private
String
baseUploadPath
;
@Autowired
private
SysRegionMapper
sysRegionMapper
;
@Autowired
private
ConstantMapper
constantMapper
;
/**
* 按主键获取公司
* @param id
...
...
@@ -180,4 +192,67 @@ public class CampsiteBiz extends BaseBiz<CampsiteMapper, Campsite> {
return
zoneCompanys
;
}
public
RestResponse
<
String
>
importExcel
(
MultipartFile
multipartfile
,
HttpServletRequest
request
){
try
{
List
<
String
[]>
readExcel
=
ExcelImport
.
getExcelData
(
multipartfile
);
if
(
readExcel
.
size
()<
1
){
return
RestResponse
.
codeAndMessage
(
1001
,
"导入不能没数据!!!"
);
}
Date
date
=
new
Date
();
List
<
Campsite
>
list
=
new
ArrayList
<>();
for
(
int
i
=
1
;
i
<
readExcel
.
size
();
i
++)
{
String
[]
str
=
readExcel
.
get
(
i
);
Campsite
campsite
=
new
Campsite
();
String
name
=
str
[
0
];
String
status
=
str
[
1
];
String
zone
=
str
[
2
];
String
province
=
str
[
3
];
String
city
=
str
[
4
];
String
town
=
str
[
5
];
String
addr_detail
=
str
[
6
];
BigDecimal
latitude
=
new
BigDecimal
(
str
[
7
]);
BigDecimal
longitude
=
new
BigDecimal
(
str
[
8
]);
if
(
str
.
length
>
9
){
String
leader
=
str
[
9
];
campsite
.
setLeader
(
leader
);
}
if
(
str
.
length
>
10
){
String
leader_contact_info
=
str
[
10
];
campsite
.
setLeaderContactInfo
(
leader_contact_info
);
}
Integer
branch_type
=
1
;
Integer
zone_id
=
constantMapper
.
getTypebyname
(
zone
,
4
);
if
(
zone_id
==
null
){
zone_id
=
1
;
}
Integer
addr_province
=
sysRegionMapper
.
getNumberV2
(
province
,
1
);
Integer
addr_city
=
sysRegionMapper
.
getNumberV2
(
city
,
2
);
Integer
addr_town
=
sysRegionMapper
.
getNumberV2
(
town
,
3
);
campsite
.
setAddrProvince
(
addr_province
);
campsite
.
setAddrCity
(
addr_city
);
campsite
.
setAddrTown
(
addr_town
);
campsite
.
setAddrDetail
(
addr_detail
);
campsite
.
setStatus
(
4
);
campsite
.
setName
(
name
);
campsite
.
setLatitude
(
latitude
);
campsite
.
setLongitude
(
longitude
);
campsite
.
setCreateTime
(
date
);
campsite
.
setUpdateTime
(
date
);
campsite
.
setZoneId
(
zone_id
);
campsite
.
setBranchType
(
branch_type
);
//list.add(campsite);
mapper
.
insertSelective
(
campsite
);
}
/* if(list.size()>0){
}*/
}
catch
(
Exception
e
){
e
.
printStackTrace
();
return
RestResponse
.
codeAndMessage
(
10001
,
"网络异常!"
);
}
return
RestResponse
.
suc
();
}
}
vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/mapper/ConstantMapper.java
View file @
93458693
package
com
.
xinxincaravan
.
caravan
.
vehicle
.
mapper
;
import
com.xinxincaravan.caravan.vehicle.entity.Constant
;
import
org.springframework.data.repository.query.Param
;
import
tk.mybatis.mapper.common.Mapper
;
import
java.util.List
;
...
...
@@ -20,4 +21,7 @@ public interface ConstantMapper extends Mapper<Constant> {
* @return
*/
public
int
insertIgnoreOnDuplicate
(
Constant
constant
);
//获取code
public
Integer
getTypebyname
(
@Param
(
"name"
)
String
name
,
@Param
(
"type"
)
Integer
type
);
}
vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/mapper/SysRegionMapper.java
View file @
93458693
...
...
@@ -15,4 +15,6 @@ public interface SysRegionMapper extends Mapper<SysRegion> {
//获取地区的编号
public
Integer
getNumber
(
@Param
(
"name"
)
String
name
);
//获取地区的编号
public
Integer
getNumberV2
(
@Param
(
"name"
)
String
name
,
@Param
(
"type"
)
Integer
type
);
}
vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/rest/BranchCompanyController.java
View file @
93458693
...
...
@@ -22,12 +22,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.List
;
@RestController
@RequestMapping
(
"/branchCompany"
)
@Slf4j
@IgnoreClientToken
@IgnoreUserToken
public
class
BranchCompanyController
extends
BaseController
<
BranchCompanyBiz
>
{
private
static
Integer
MAX_DRIVING_LICENSE_SIZE
=
10
*
1024
*
1024
;
//10M
...
...
@@ -101,4 +103,16 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
return
RestResponse
.
sucResponse
();
}
/**
* 导入
* @param multipartfile
* @param request
* @return
*/
@PostMapping
(
"importExcel"
)
public
RestResponse
importExcel
(
@RequestParam
(
value
=
"file"
)
MultipartFile
multipartfile
,
HttpServletRequest
request
)
{
return
baseBiz
.
importExcel
(
multipartfile
,
request
);
}
}
vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/rest/CampsiteController.java
View file @
93458693
...
...
@@ -17,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.xml.ws.http.HTTPBinding
;
import
java.util.List
;
@RestController
...
...
@@ -82,5 +84,16 @@ public class CampsiteController extends BaseController<CampsiteBiz> {
baseBiz
.
del
(
id
);
return
RestResponse
.
sucResponse
();
}
/**
* 导入
* @param multipartfile
* @param request
* @return
*/
@PostMapping
(
"importExcel"
)
public
RestResponse
importExcel
(
@RequestParam
(
value
=
"file"
)
MultipartFile
multipartfile
,
HttpServletRequest
request
)
{
return
baseBiz
.
importExcel
(
multipartfile
,
request
);
}
}
vehicle/src/main/resources/mapper/ConstantMapper.xml
View file @
93458693
...
...
@@ -18,5 +18,9 @@
insert ignore into constant(type,code,val) values (#{type},#{code},#{val})
</insert>
<select
id=
"getTypebyname"
resultType=
"java.lang.Integer"
>
select distinct `code` from constant where type=#{type} and val like CONCAT('%',#{name},'%') limit 1
</select>
</mapper>
\ No newline at end of file
vehicle/src/main/resources/mapper/SysRegionMapper.xml
View file @
93458693
...
...
@@ -18,5 +18,8 @@
<select
id=
"getNumber"
resultType=
"Integer"
>
select `id` from sys_region where name like CONCAT('%',#{name},'%') limit 1
</select>
<select
id=
"getNumberV2"
resultType=
"Integer"
>
select `id` from sys_region where name like CONCAT('%',#{name},'%') and type=#{type} limit 1
</select>
</mapper>
\ No newline at end of file
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