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
31d78b50
Commit
31d78b50
authored
Jun 05, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改结构
parent
c35a9471
Changes
85
Show whitespace changes
Inline
Side-by-side
Showing
85 changed files
with
143 additions
and
180 deletions
+143
-180
OrderTemplateBiz.java
...in/java/com/xxfc/platform/order/biz/OrderTemplateBiz.java
+2
-2
OrderRentVehicleService.java
.../xxfc/platform/order/service/OrderRentVehicleService.java
+1
-1
VehicleFeign.java
...in/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
+1
-1
AddOrUpdateAccompanyingItem.java
...fc/platform/vehicle/pojo/AddOrUpdateAccompanyingItem.java
+1
-1
AddOrUpdateVehicleVo.java
.../com/xxfc/platform/vehicle/pojo/AddOrUpdateVehicleVo.java
+1
-1
AddVehicleWarningMsgVo.java
...om/xxfc/platform/vehicle/pojo/AddVehicleWarningMsgVo.java
+1
-1
BookVehicleVo.java
...in/java/com/xxfc/platform/vehicle/pojo/BookVehicleVo.java
+1
-1
BranchCompanyStockApplyInfoVo.java
.../platform/vehicle/pojo/BranchCompanyStockApplyInfoVo.java
+1
-1
BranchCompanyStockApplyVo.java
...xxfc/platform/vehicle/pojo/BranchCompanyStockApplyVo.java
+1
-1
BranchCompanyStockInfoVo.java
.../xxfc/platform/vehicle/pojo/BranchCompanyStockInfoVo.java
+1
-1
BranchCompanyStockSearchVo.java
...xfc/platform/vehicle/pojo/BranchCompanyStockSearchVo.java
+1
-1
BranchCompanyVo.java
.../java/com/xxfc/platform/vehicle/pojo/BranchCompanyVo.java
+1
-1
CampsiteVo.java
.../main/java/com/xxfc/platform/vehicle/pojo/CampsiteVo.java
+1
-1
CataDto.java
...src/main/java/com/xxfc/platform/vehicle/pojo/CataDto.java
+1
-1
CataVo.java
.../src/main/java/com/xxfc/platform/vehicle/pojo/CataVo.java
+1
-1
CompanyDetail.java
...in/java/com/xxfc/platform/vehicle/pojo/CompanyDetail.java
+1
-1
CompanySearchDTO.java
...java/com/xxfc/platform/vehicle/pojo/CompanySearchDTO.java
+1
-1
CompanySearchVO.java
.../java/com/xxfc/platform/vehicle/pojo/CompanySearchVO.java
+1
-1
ConstantVo.java
.../main/java/com/xxfc/platform/vehicle/pojo/ConstantVo.java
+1
-1
LiftVehicleVo.java
...in/java/com/xxfc/platform/vehicle/pojo/LiftVehicleVo.java
+1
-1
QueryAccompanyItemVo.java
.../com/xxfc/platform/vehicle/pojo/QueryAccompanyItemVo.java
+1
-1
QueryVehicleBookRecordVo.java
.../xxfc/platform/vehicle/pojo/QueryVehicleBookRecordVo.java
+1
-1
QueryVehicleVo.java
...n/java/com/xxfc/platform/vehicle/pojo/QueryVehicleVo.java
+1
-1
QueryVehicleWarningMsgVo.java
.../xxfc/platform/vehicle/pojo/QueryVehicleWarningMsgVo.java
+1
-1
RentVehicleBookDTO.java
...va/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java
+1
-3
RetVehicleVo.java
...ain/java/com/xxfc/platform/vehicle/pojo/RetVehicleVo.java
+1
-1
UsableVehicleModelVO.java
.../com/xxfc/platform/vehicle/pojo/UsableVehicleModelVO.java
+1
-3
UsableVeicleDTO.java
.../java/com/xxfc/platform/vehicle/pojo/UsableVeicleDTO.java
+1
-5
VModelDetailVO.java
...n/java/com/xxfc/platform/vehicle/pojo/VModelDetailVO.java
+1
-1
VehicleArrivalVo.java
...java/com/xxfc/platform/vehicle/pojo/VehicleArrivalVo.java
+1
-1
VehicleBookRecordAndTbNameVo.java
...c/platform/vehicle/pojo/VehicleBookRecordAndTbNameVo.java
+1
-1
VehicleBookRecordQueryVo.java
.../xxfc/platform/vehicle/pojo/VehicleBookRecordQueryVo.java
+1
-1
VehicleDepartureLogVo.java
...com/xxfc/platform/vehicle/pojo/VehicleDepartureLogVo.java
+1
-1
VehicleDepartureStatisticDataVo.java
...latform/vehicle/pojo/VehicleDepartureStatisticDataVo.java
+1
-1
VehicleDepartureVo.java
...va/com/xxfc/platform/vehicle/pojo/VehicleDepartureVo.java
+1
-1
VehiclePageQueryVo.java
...va/com/xxfc/platform/vehicle/pojo/VehiclePageQueryVo.java
+1
-1
VehicleRepairVo.java
.../java/com/xxfc/platform/vehicle/pojo/VehicleRepairVo.java
+1
-1
VehicleUpkeepEndVo.java
...va/com/xxfc/platform/vehicle/pojo/VehicleUpkeepEndVo.java
+1
-1
VehicleUpkeepLogItemVo.java
...om/xxfc/platform/vehicle/pojo/VehicleUpkeepLogItemVo.java
+1
-1
VehicleUpkeepLogVo.java
...va/com/xxfc/platform/vehicle/pojo/VehicleUpkeepLogVo.java
+1
-1
VehicleUpkeepVo.java
.../java/com/xxfc/platform/vehicle/pojo/VehicleUpkeepVo.java
+1
-1
VehicleUserLicenseVo.java
.../com/xxfc/platform/vehicle/pojo/VehicleUserLicenseVo.java
+1
-1
VehicleWarningMsgQueryVo.java
.../xxfc/platform/vehicle/pojo/VehicleWarningMsgQueryVo.java
+1
-1
AccompanyingItemBiz.java
...va/com/xxfc/platform/vehicle/biz/AccompanyingItemBiz.java
+2
-2
BranchCompanyBiz.java
.../java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java
+3
-4
BranchCompanyStockService.java
.../xxfc/platform/vehicle/biz/BranchCompanyStockService.java
+4
-4
CampsiteBiz.java
.../main/java/com/xxfc/platform/vehicle/biz/CampsiteBiz.java
+1
-1
ConstantBiz.java
.../main/java/com/xxfc/platform/vehicle/biz/ConstantBiz.java
+1
-1
SysRegionBiz.java
...main/java/com/xxfc/platform/vehicle/biz/SysRegionBiz.java
+0
-2
VehicleActiveService.java
...a/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
+4
-4
VehicleBiz.java
...c/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
+20
-13
VehicleBookRecordBiz.java
...a/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java
+1
-1
VehicleDepartureService.java
...om/xxfc/platform/vehicle/biz/VehicleDepartureService.java
+2
-2
VehicleLicenseBiz.java
...java/com/xxfc/platform/vehicle/biz/VehicleLicenseBiz.java
+1
-1
VehiclePlatCataBiz.java
...ava/com/xxfc/platform/vehicle/biz/VehiclePlatCataBiz.java
+1
-1
VehicleUpkeepService.java
...a/com/xxfc/platform/vehicle/biz/VehicleUpkeepService.java
+2
-2
VehicleWarningMsgBiz.java
...a/com/xxfc/platform/vehicle/biz/VehicleWarningMsgBiz.java
+2
-2
BranchCompanyMapper.java
...com/xxfc/platform/vehicle/mapper/BranchCompanyMapper.java
+0
-1
BranchCompanyStockApplyInfoMapper.java
...orm/vehicle/mapper/BranchCompanyStockApplyInfoMapper.java
+1
-1
BranchCompanyStockInfoMapper.java
...platform/vehicle/mapper/BranchCompanyStockInfoMapper.java
+2
-2
VehicleBookRecordMapper.java
...xxfc/platform/vehicle/mapper/VehicleBookRecordMapper.java
+2
-2
VehicleDepartureLogMapper.java
...fc/platform/vehicle/mapper/VehicleDepartureLogMapper.java
+1
-1
VehicleMapper.java
.../java/com/xxfc/platform/vehicle/mapper/VehicleMapper.java
+3
-3
VehicleUpkeepLogMapper.java
.../xxfc/platform/vehicle/mapper/VehicleUpkeepLogMapper.java
+2
-2
VehicleWarningMsgMapper.java
...xxfc/platform/vehicle/mapper/VehicleWarningMsgMapper.java
+1
-1
AccompanyingItemController.java
...xfc/platform/vehicle/rest/AccompanyingItemController.java
+2
-2
BranchCompanyController.java
...m/xxfc/platform/vehicle/rest/BranchCompanyController.java
+3
-5
BranchCompanyStockController.java
...c/platform/vehicle/rest/BranchCompanyStockController.java
+3
-3
CampsiteController.java
...va/com/xxfc/platform/vehicle/rest/CampsiteController.java
+1
-1
ConstantController.java
...va/com/xxfc/platform/vehicle/rest/ConstantController.java
+1
-1
VehicleActiveController.java
...m/xxfc/platform/vehicle/rest/VehicleActiveController.java
+1
-1
VehicleCataController.java
...com/xxfc/platform/vehicle/rest/VehicleCataController.java
+1
-18
VehicleController.java
...ava/com/xxfc/platform/vehicle/rest/VehicleController.java
+7
-10
VehicleLicenseController.java
.../xxfc/platform/vehicle/rest/VehicleLicenseController.java
+1
-1
VehicleModelController.java
...om/xxfc/platform/vehicle/rest/VehicleModelController.java
+1
-12
VehicleWarningMsgController.java
...fc/platform/vehicle/rest/VehicleWarningMsgController.java
+2
-3
BranchCompanyMapper.xml
...-server/src/main/resources/mapper/BranchCompanyMapper.xml
+4
-2
BranchCompanyStockApplyInfoMapper.xml
...in/resources/mapper/BranchCompanyStockApplyInfoMapper.xml
+1
-1
BranchCompanyStockInfoMapper.xml
...rc/main/resources/mapper/BranchCompanyStockInfoMapper.xml
+2
-2
VehicleBookRecordMapper.xml
...ver/src/main/resources/mapper/VehicleBookRecordMapper.xml
+1
-1
VehicleDepartureLogMapper.xml
...r/src/main/resources/mapper/VehicleDepartureLogMapper.xml
+2
-2
VehicleMapper.xml
...ehicle-server/src/main/resources/mapper/VehicleMapper.xml
+4
-4
VehicleUpkeepLogMapper.xml
...rver/src/main/resources/mapper/VehicleUpkeepLogMapper.xml
+3
-3
VehicleWarningMsgMapper.xml
...ver/src/main/resources/mapper/VehicleWarningMsgMapper.xml
+2
-2
VehicleWarningRuleMapper.xml
...er/src/main/resources/mapper/VehicleWarningRuleMapper.xml
+1
-1
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTemplateBiz.java
View file @
31d78b50
...
@@ -28,8 +28,8 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate>
...
@@ -28,8 +28,8 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate>
// TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig());
// TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig());
// OrderCostDetail orderCostDetail = orderCostDetailBiz.selectById(OrderCostEnum.RentVehicle.getCode());
// OrderCostDetail orderCostDetail = orderCostDetailBiz.selectById(OrderCostEnum.RentVehicle.getCode());
// Template template = engine.getTemplate(orderCostDetail.getTemplate());
// Template template = engine.getTemplate(orderCostDetail.getTemplate());
// String result = template.render(Dict.parse(
v
o));
// String result = template.render(Dict.parse(
poj
o));
//
v
o.setCostDetail(result);
//
poj
o.setCostDetail(result);
List
<
OrderTemplate
>
all
=
this
.
selectListAll
();
List
<
OrderTemplate
>
all
=
this
.
selectListAll
();
Map
<
String
,
Object
>
allCodeMap
=
all
.
parallelStream
().
collect
(
Collectors
.
toMap
(
item
->
"tem_"
+
item
.
getCode
(),
OrderTemplate:
:
getTemplate
));
Map
<
String
,
Object
>
allCodeMap
=
all
.
parallelStream
().
collect
(
Collectors
.
toMap
(
item
->
"tem_"
+
item
.
getCode
(),
OrderTemplate:
:
getTemplate
));
List
<
String
>
codes
=
all
.
parallelStream
().
map
(
OrderTemplate:
:
getCode
).
collect
(
Collectors
.
toList
());
List
<
String
>
codes
=
all
.
parallelStream
().
map
(
OrderTemplate:
:
getCode
).
collect
(
Collectors
.
toList
());
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java
View file @
31d78b50
...
@@ -121,7 +121,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
...
@@ -121,7 +121,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
* @return
* @return
*/
*/
private
String
costDetail
(
RentVehiclePriceVO
vo
)
{
private
String
costDetail
(
RentVehiclePriceVO
vo
)
{
//orderTemplateBiz.result(orderTemplateBiz.selectById(OrderCostEnum.RentVehicle.getCode()), Dict.parse(
v
o));
//orderTemplateBiz.result(orderTemplateBiz.selectById(OrderCostEnum.RentVehicle.getCode()), Dict.parse(
poj
o));
TemplateEngine
engine
=
TemplateUtil
.
createEngine
(
new
TemplateConfig
());
TemplateEngine
engine
=
TemplateUtil
.
createEngine
(
new
TemplateConfig
());
OrderCostDetail
orderCostDetail
=
orderCostDetailBiz
.
selectById
(
OrderCostEnum
.
RentVehicle
.
getCode
());
OrderCostDetail
orderCostDetail
=
orderCostDetailBiz
.
selectById
(
OrderCostEnum
.
RentVehicle
.
getCode
());
Template
template
=
engine
.
getTemplate
(
orderCostDetail
.
getTemplate
());
Template
template
=
engine
.
getTemplate
(
orderCostDetail
.
getTemplate
());
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
View file @
31d78b50
...
@@ -3,7 +3,7 @@ package com.xxfc.platform.vehicle.feign;
...
@@ -3,7 +3,7 @@ package com.xxfc.platform.vehicle.feign;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.entity.VehicleModel
;
import
com.xxfc.platform.vehicle.entity.VehicleModel
;
import
com.xxfc.platform.vehicle.
v
o.BookVehicleVo
;
import
com.xxfc.platform.vehicle.
poj
o.BookVehicleVo
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/AddOrUpdateAccompanyingItem.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/AddOrUpdateAccompanyingItem.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/AddOrUpdateVehicleVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/AddOrUpdateVehicleVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/AddVehicleWarningMsgVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/AddVehicleWarningMsgVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/BookVehicleVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/BookVehicleVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/BranchCompanyStockApplyInfoVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/BranchCompanyStockApplyInfoVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/BranchCompanyStockApplyVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/BranchCompanyStockApplyVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/BranchCompanyStockInfoVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/BranchCompanyStockInfoVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/BranchCompanyStockSearchVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/BranchCompanyStockSearchVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/BranchCompanyVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/BranchCompanyVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/CampsiteVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/CampsiteVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/CataDto.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/CataDto.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
java.util.List
;
import
java.util.List
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/CataVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/CataVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/CompanyDetail.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/CompanyDetail.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
com.xxfc.platform.vehicle.entity.BranchCompany
;
import
com.xxfc.platform.vehicle.entity.BranchCompany
;
import
com.xxfc.platform.vehicle.entity.SysRegion
;
import
com.xxfc.platform.vehicle.entity.SysRegion
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/CompanySearchDTO.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/CompanySearchDTO.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/CompanySearchVO.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/CompanySearchVO.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
com.xxfc.platform.vehicle.entity.BranchCompany
;
import
com.xxfc.platform.vehicle.entity.BranchCompany
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/ConstantVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/ConstantVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/LiftVehicleVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/LiftVehicleVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/QueryAccompanyItemVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/QueryAccompanyItemVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/QueryVehicleBookRecordVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/QueryVehicleBookRecordVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/QueryVehicleVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/QueryVehicleVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/QueryVehicleWarningMsgVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/QueryVehicleWarningMsgVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/RentVehicleBookDTO.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/RentVehicleBookDTO.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
com.github.wxiaoqi.security.common.vo.PageParam
;
import
com.github.wxiaoqi.security.common.vo.PageParam
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
java.util.Map
;
@Data
@Data
public
class
RentVehicleBookDTO
extends
PageParam
{
public
class
RentVehicleBookDTO
extends
PageParam
{
//根据车型、时间、距离,门店,预定车辆
//根据车型、时间、距离,门店,预定车辆
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/RetVehicleVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/RetVehicleVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/UsableVehicleModelVO.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/UsableVehicleModelVO.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
com.xxfc.platform.vehicle.entity.BranchCompany
;
import
com.xxfc.platform.vehicle.entity.BranchCompany
;
import
com.xxfc.platform.vehicle.entity.Vehicle
;
import
com.xxfc.platform.vehicle.entity.VehicleModel
;
import
com.xxfc.platform.vehicle.entity.VehicleModel
;
import
lombok.Data
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.List
;
@Data
@Data
public
class
UsableVehicleModelVO
{
public
class
UsableVehicleModelVO
{
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/UsableVeicleDTO.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/UsableVeicleDTO.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
com.github.wxiaoqi.security.common.vo.PageParam
;
import
com.github.wxiaoqi.security.common.vo.PageParam
;
import
com.xxfc.platform.vehicle.entity.VehiclePlatCata
;
import
com.xxfc.platform.vehicle.entity.VehiclePlatCata
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.time.Instant
;
import
java.time.Instant
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.time.ZoneOffset
;
import
java.time.ZoneOffset
;
import
java.time.format.DateTimeFormatter
;
import
java.time.format.DateTimeFormatter
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
static
java
.
time
.
LocalDateTime
.
ofEpochSecond
;
@Data
@Data
public
class
UsableVeicleDTO
extends
PageParam
{
public
class
UsableVeicleDTO
extends
PageParam
{
public
static
final
DateTimeFormatter
DEFAULT_DATE_TIME_FORMATTER
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd"
);
public
static
final
DateTimeFormatter
DEFAULT_DATE_TIME_FORMATTER
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd"
);
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VModelDetailVO.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VModelDetailVO.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
com.xxfc.platform.vehicle.entity.VehicleModel
;
import
com.xxfc.platform.vehicle.entity.VehicleModel
;
import
com.xxfc.platform.vehicle.entity.VehiclePlatCata
;
import
com.xxfc.platform.vehicle.entity.VehiclePlatCata
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehicleArrivalVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehicleArrivalVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehicleBookRecordAndTbNameVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehicleBookRecordAndTbNameVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehicleBookRecordQueryVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehicleBookRecordQueryVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehicleDepartureLogVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehicleDepartureLogVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehicleDepartureStatisticDataVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehicleDepartureStatisticDataVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehicleDepartureVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehicleDepartureVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehiclePageQueryVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehiclePageQueryVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehicleRepairVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehicleRepairVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehicleUpkeepEndVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehicleUpkeepEndVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehicleUpkeepLogItemVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehicleUpkeepLogItemVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehicleUpkeepLogVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehicleUpkeepLogVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehicleUpkeepVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehicleUpkeepVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehicleUserLicenseVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehicleUserLicenseVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
v
o/VehicleWarningMsgQueryVo.java
→
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/
poj
o/VehicleWarningMsgQueryVo.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
v
o
;
package
com
.
xxfc
.
platform
.
vehicle
.
poj
o
;
import
lombok.Data
;
import
lombok.Data
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/AccompanyingItemBiz.java
View file @
31d78b50
...
@@ -9,9 +9,9 @@ import com.xxfc.platform.vehicle.common.RestResponse;
...
@@ -9,9 +9,9 @@ import com.xxfc.platform.vehicle.common.RestResponse;
import
com.xxfc.platform.vehicle.constant.RedisKey
;
import
com.xxfc.platform.vehicle.constant.RedisKey
;
import
com.xxfc.platform.vehicle.entity.AccompanyingItem
;
import
com.xxfc.platform.vehicle.entity.AccompanyingItem
;
import
com.xxfc.platform.vehicle.mapper.AccompanyingItemMapper
;
import
com.xxfc.platform.vehicle.mapper.AccompanyingItemMapper
;
import
com.xxfc.platform.vehicle.
v
o.AddOrUpdateAccompanyingItem
;
import
com.xxfc.platform.vehicle.
poj
o.AddOrUpdateAccompanyingItem
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.xxfc.platform.vehicle.
v
o.QueryAccompanyItemVo
;
import
com.xxfc.platform.vehicle.
poj
o.QueryAccompanyItemVo
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java
View file @
31d78b50
...
@@ -14,11 +14,10 @@ import com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo;
...
@@ -14,11 +14,10 @@ import com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo;
import
com.xxfc.platform.vehicle.entity.SysRegion
;
import
com.xxfc.platform.vehicle.entity.SysRegion
;
import
com.xxfc.platform.vehicle.feign.dto.UserDTO
;
import
com.xxfc.platform.vehicle.feign.dto.UserDTO
;
import
com.xxfc.platform.vehicle.mapper.BranchCompanyMapper
;
import
com.xxfc.platform.vehicle.mapper.BranchCompanyMapper
;
import
com.xxfc.platform.vehicle.rest.BranchCompanyController
;
import
com.xxfc.platform.vehicle.util.excel.ExcelImport
;
import
com.xxfc.platform.vehicle.util.excel.ExcelImport
;
import
com.xxfc.platform.vehicle.
v
o.BranchCompanyVo
;
import
com.xxfc.platform.vehicle.
poj
o.BranchCompanyVo
;
import
com.xxfc.platform.vehicle.
v
o.CompanyDetail
;
import
com.xxfc.platform.vehicle.
poj
o.CompanyDetail
;
import
com.xxfc.platform.vehicle.
v
o.CompanySearchDTO
;
import
com.xxfc.platform.vehicle.
poj
o.CompanySearchDTO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections.CollectionUtils
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyStockService.java
View file @
31d78b50
...
@@ -14,10 +14,10 @@ import com.xxfc.platform.vehicle.mapper.BranchCompanyStockApplyInfoMapper;
...
@@ -14,10 +14,10 @@ import com.xxfc.platform.vehicle.mapper.BranchCompanyStockApplyInfoMapper;
import
com.xxfc.platform.vehicle.mapper.BranchCompanyStockInfoMapper
;
import
com.xxfc.platform.vehicle.mapper.BranchCompanyStockInfoMapper
;
import
com.xxfc.platform.vehicle.mapper.SysRegionMapper
;
import
com.xxfc.platform.vehicle.mapper.SysRegionMapper
;
import
com.xxfc.platform.vehicle.util.excel.ExcelImport
;
import
com.xxfc.platform.vehicle.util.excel.ExcelImport
;
import
com.xxfc.platform.vehicle.
v
o.BranchCompanyStockApplyInfoVo
;
import
com.xxfc.platform.vehicle.
poj
o.BranchCompanyStockApplyInfoVo
;
import
com.xxfc.platform.vehicle.
v
o.BranchCompanyStockApplyVo
;
import
com.xxfc.platform.vehicle.
poj
o.BranchCompanyStockApplyVo
;
import
com.xxfc.platform.vehicle.
v
o.BranchCompanyStockInfoVo
;
import
com.xxfc.platform.vehicle.
poj
o.BranchCompanyStockInfoVo
;
import
com.xxfc.platform.vehicle.
v
o.BranchCompanyStockSearchVo
;
import
com.xxfc.platform.vehicle.
poj
o.BranchCompanyStockSearchVo
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.joda.time.DateTime
;
import
org.joda.time.DateTime
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CampsiteBiz.java
View file @
31d78b50
...
@@ -14,7 +14,7 @@ import com.xxfc.platform.vehicle.mapper.CampsiteMapper;
...
@@ -14,7 +14,7 @@ import com.xxfc.platform.vehicle.mapper.CampsiteMapper;
import
com.xxfc.platform.vehicle.mapper.ConstantMapper
;
import
com.xxfc.platform.vehicle.mapper.ConstantMapper
;
import
com.xxfc.platform.vehicle.mapper.SysRegionMapper
;
import
com.xxfc.platform.vehicle.mapper.SysRegionMapper
;
import
com.xxfc.platform.vehicle.util.excel.ExcelImport
;
import
com.xxfc.platform.vehicle.util.excel.ExcelImport
;
import
com.xxfc.platform.vehicle.
v
o.CampsiteVo
;
import
com.xxfc.platform.vehicle.
poj
o.CampsiteVo
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections.CollectionUtils
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/ConstantBiz.java
View file @
31d78b50
...
@@ -9,7 +9,7 @@ import com.xxfc.platform.vehicle.constant.ConstantType;
...
@@ -9,7 +9,7 @@ import com.xxfc.platform.vehicle.constant.ConstantType;
import
com.xxfc.platform.vehicle.constant.RedisKey
;
import
com.xxfc.platform.vehicle.constant.RedisKey
;
import
com.xxfc.platform.vehicle.entity.Constant
;
import
com.xxfc.platform.vehicle.entity.Constant
;
import
com.xxfc.platform.vehicle.mapper.ConstantMapper
;
import
com.xxfc.platform.vehicle.mapper.ConstantMapper
;
import
com.xxfc.platform.vehicle.
v
o.ConstantVo
;
import
com.xxfc.platform.vehicle.
poj
o.ConstantVo
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections.MapUtils
;
import
org.apache.commons.collections.MapUtils
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/SysRegionBiz.java
View file @
31d78b50
...
@@ -7,10 +7,8 @@ import com.google.common.collect.Lists;
...
@@ -7,10 +7,8 @@ import com.google.common.collect.Lists;
import
com.xxfc.platform.vehicle.common.CustomIllegalParamException
;
import
com.xxfc.platform.vehicle.common.CustomIllegalParamException
;
import
com.xxfc.platform.vehicle.constant.RedisKey
;
import
com.xxfc.platform.vehicle.constant.RedisKey
;
import
com.xxfc.platform.vehicle.constant.RegionType
;
import
com.xxfc.platform.vehicle.constant.RegionType
;
import
com.xxfc.platform.vehicle.entity.BranchCompany
;
import
com.xxfc.platform.vehicle.entity.SysRegion
;
import
com.xxfc.platform.vehicle.entity.SysRegion
;
import
com.xxfc.platform.vehicle.mapper.SysRegionMapper
;
import
com.xxfc.platform.vehicle.mapper.SysRegionMapper
;
import
com.xxfc.platform.vehicle.vo.CompanySearchVO
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
View file @
31d78b50
...
@@ -10,10 +10,10 @@ import com.xxfc.platform.vehicle.entity.VehicleActiveLog;
...
@@ -10,10 +10,10 @@ import com.xxfc.platform.vehicle.entity.VehicleActiveLog;
import
com.xxfc.platform.vehicle.entity.VehicleDepartureLog
;
import
com.xxfc.platform.vehicle.entity.VehicleDepartureLog
;
import
com.xxfc.platform.vehicle.entity.VehicleUpkeepLog
;
import
com.xxfc.platform.vehicle.entity.VehicleUpkeepLog
;
import
com.xxfc.platform.vehicle.mapper.*
;
import
com.xxfc.platform.vehicle.mapper.*
;
import
com.xxfc.platform.vehicle.
v
o.VehicleArrivalVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleArrivalVo
;
import
com.xxfc.platform.vehicle.
v
o.VehicleDepartureVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleDepartureVo
;
import
com.xxfc.platform.vehicle.
v
o.VehicleUpkeepEndVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleUpkeepEndVo
;
import
com.xxfc.platform.vehicle.
v
o.VehicleUpkeepVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleUpkeepVo
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
View file @
31d78b50
...
@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
...
@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.exception.BaseException
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Maps
;
import
com.google.common.collect.Maps
;
...
@@ -19,7 +21,7 @@ import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
...
@@ -19,7 +21,7 @@ import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
import
com.xxfc.platform.vehicle.mapper.VehicleBookInfoMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleBookInfoMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleMapper
;
import
com.xxfc.platform.vehicle.
v
o.*
;
import
com.xxfc.platform.vehicle.
poj
o.*
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.beanutils.PropertyUtils
;
import
org.apache.commons.beanutils.PropertyUtils
;
...
@@ -270,7 +272,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
...
@@ -270,7 +272,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
* @return
* @return
*/
*/
@Transactional
@Transactional
public
RestResponse
applyVehicle4Employee
(
Integer
userId
,
BookVehicleVo
bookVehicleVo
,
String
userName
)
throws
Exception
{
public
void
applyVehicle4Employee
(
Integer
userId
,
BookVehicleVo
bookVehicleVo
,
String
userName
)
throws
Exception
{
//检查车辆信息是否合法
//检查车辆信息是否合法
checkIfVehicleExists
(
bookVehicleVo
.
getVehicle
());
checkIfVehicleExists
(
bookVehicleVo
.
getVehicle
());
//提取日期和相应的预定目标日期
//提取日期和相应的预定目标日期
...
@@ -285,7 +287,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
...
@@ -285,7 +287,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
for
(
Map
.
Entry
<
String
,
List
<
String
>>
entry:
yearMonthAndDate
.
entrySet
()){
for
(
Map
.
Entry
<
String
,
List
<
String
>>
entry:
yearMonthAndDate
.
entrySet
()){
Boolean
rsEach
=
applyVehicle4EmployeePerMonth
(
bookVehicleVo
.
getVehicle
(),
entry
.
getValue
(),
entry
.
getKey
());
Boolean
rsEach
=
applyVehicle4EmployeePerMonth
(
bookVehicleVo
.
getVehicle
(),
entry
.
getValue
(),
entry
.
getKey
());
if
(
Boolean
.
FALSE
.
equals
(
rsEach
)){
if
(
Boolean
.
FALSE
.
equals
(
rsEach
)){
return
RestResponse
.
code
(
ResCode
.
VEHICLE_BOOKED_INFO_ALREADY_CHANGED
.
getCode
()
);
throw
new
BaseException
(
ResultCode
.
FAILED_CODE
);
}
}
}
}
//加入预定申请记录
//加入预定申请记录
...
@@ -304,6 +306,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
...
@@ -304,6 +306,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
vehicleBookRecord
.
setDestination
(
bookVehicleVo
.
getDestination
());
vehicleBookRecord
.
setDestination
(
bookVehicleVo
.
getDestination
());
vehicleBookRecord
.
setLiftCompany
(
bookVehicleVo
.
getLiftCompany
());
vehicleBookRecord
.
setLiftCompany
(
bookVehicleVo
.
getLiftCompany
());
vehicleBookRecordMapper
.
insertSelective
(
vehicleBookRecord
);
vehicleBookRecordMapper
.
insertSelective
(
vehicleBookRecord
);
//修改相关车辆预定记录
Boolean
hasSuc
=
bookedVehicle
(
bookVehicleVo
);
if
(!
hasSuc
){
throw
new
BaseException
(
ResultCode
.
FAILED_CODE
);
}
//添加随车物品
List
<
Map
<
String
,
Object
>>
params
=
Lists
.
newArrayList
();
List
<
Map
<
String
,
Object
>>
params
=
Lists
.
newArrayList
();
if
(
MapUtils
.
isNotEmpty
(
bookVehicleVo
.
getSelectedAccItem
())){
if
(
MapUtils
.
isNotEmpty
(
bookVehicleVo
.
getSelectedAccItem
())){
for
(
Map
.
Entry
<
Integer
,
Integer
>
idAndAmount
:
bookVehicleVo
.
getSelectedAccItem
().
entrySet
()){
for
(
Map
.
Entry
<
Integer
,
Integer
>
idAndAmount
:
bookVehicleVo
.
getSelectedAccItem
().
entrySet
()){
...
@@ -315,7 +325,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
...
@@ -315,7 +325,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
}
}
bookRecordAccItemMapper
.
batchAdd
(
params
);
bookRecordAccItemMapper
.
batchAdd
(
params
);
}
}
return
RestResponse
.
suc
();
}
}
@Transactional
@Transactional
...
@@ -362,13 +371,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
...
@@ -362,13 +371,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
BeanUtils
.
copyProperties
(
bookVehicleVo
,
vehicleBookRecord
);
BeanUtils
.
copyProperties
(
bookVehicleVo
,
vehicleBookRecord
);
bookVehicleVo
.
setBookStartDate
(
new
DateTime
(
vehicleBookRecord
.
getBookStartDate
()).
toString
(
DEFAULT_DATE_TIME_FORMATTER
));
bookVehicleVo
.
setBookStartDate
(
new
DateTime
(
vehicleBookRecord
.
getBookStartDate
()).
toString
(
DEFAULT_DATE_TIME_FORMATTER
));
bookVehicleVo
.
setBookEndDate
(
new
DateTime
(
vehicleBookRecord
.
getBookEndDate
()).
toString
(
DEFAULT_DATE_TIME_FORMATTER
));
bookVehicleVo
.
setBookEndDate
(
new
DateTime
(
vehicleBookRecord
.
getBookEndDate
()).
toString
(
DEFAULT_DATE_TIME_FORMATTER
));
//审核通过的话,需要修改相关车辆预定记录
//
//审核通过的话,需要修改相关车辆预定记录
if
(
VehicleBookRecordStatus
.
APPROVE
.
getCode
().
equals
(
rsStatus
))
{
//
if(VehicleBookRecordStatus.APPROVE.getCode().equals(rsStatus)) {
Boolean
hasSuc
=
bookedVehicle
(
bookVehicleVo
);
//
Boolean hasSuc = bookedVehicle(bookVehicleVo);
if
(!
hasSuc
){
//
if(!hasSuc){
return
RestResponse
.
code
(
ResCode
.
VEHICLE_BOOKED_INFO_ALREADY_CHANGED
.
getCode
());
//
return RestResponse.code(ResCode.VEHICLE_BOOKED_INFO_ALREADY_CHANGED.getCode());
}
//
}
}
//
}
//成功后修改预定记录状态
//成功后修改预定记录状态
Map
<
String
,
Object
>
updateParam
=
Maps
.
newHashMap
();
Map
<
String
,
Object
>
updateParam
=
Maps
.
newHashMap
();
updateParam
.
put
(
"id"
,
bookRecordId
);
updateParam
.
put
(
"id"
,
bookRecordId
);
...
@@ -426,8 +435,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
...
@@ -426,8 +435,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
return
RestResponse
.
suc
();
return
RestResponse
.
suc
();
}
}
/**
/**
* 获取预定车辆相关与操作参数
* 获取预定车辆相关与操作参数
* @return
* @return
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java
View file @
31d78b50
...
@@ -16,7 +16,7 @@ import com.xxfc.platform.vehicle.entity.BookRecordAccItem;
...
@@ -16,7 +16,7 @@ import com.xxfc.platform.vehicle.entity.BookRecordAccItem;
import
com.xxfc.platform.vehicle.entity.VehicleBookRecord
;
import
com.xxfc.platform.vehicle.entity.VehicleBookRecord
;
import
com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper
;
import
com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper
;
import
com.xxfc.platform.vehicle.
v
o.*
;
import
com.xxfc.platform.vehicle.
poj
o.*
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.beanutils.PropertyUtils
;
import
org.apache.commons.beanutils.PropertyUtils
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleDepartureService.java
View file @
31d78b50
...
@@ -8,8 +8,8 @@ import com.xxfc.platform.vehicle.entity.Vehicle;
...
@@ -8,8 +8,8 @@ import com.xxfc.platform.vehicle.entity.Vehicle;
import
com.xxfc.platform.vehicle.entity.VehicleDepartureLog
;
import
com.xxfc.platform.vehicle.entity.VehicleDepartureLog
;
import
com.xxfc.platform.vehicle.mapper.VehicleDepartureLogMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleDepartureLogMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleMapper
;
import
com.xxfc.platform.vehicle.
v
o.VehicleDepartureLogVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleDepartureLogVo
;
import
com.xxfc.platform.vehicle.
v
o.VehicleDepartureStatisticDataVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleDepartureStatisticDataVo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleLicenseBiz.java
View file @
31d78b50
...
@@ -8,7 +8,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
...
@@ -8,7 +8,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
import
com.xxfc.platform.vehicle.entity.VehicleUserLicense
;
import
com.xxfc.platform.vehicle.entity.VehicleUserLicense
;
import
com.xxfc.platform.vehicle.mapper.VehicleLicenseMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleLicenseMapper
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.xxfc.platform.vehicle.
v
o.VehicleUserLicenseVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleUserLicenseVo
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePlatCataBiz.java
View file @
31d78b50
...
@@ -10,7 +10,7 @@ import com.xxfc.platform.vehicle.constant.RedisKey;
...
@@ -10,7 +10,7 @@ import com.xxfc.platform.vehicle.constant.RedisKey;
import
com.xxfc.platform.vehicle.entity.VehicleCata
;
import
com.xxfc.platform.vehicle.entity.VehicleCata
;
import
com.xxfc.platform.vehicle.entity.VehiclePlatCata
;
import
com.xxfc.platform.vehicle.entity.VehiclePlatCata
;
import
com.xxfc.platform.vehicle.mapper.VehiclePlatCataMapper
;
import
com.xxfc.platform.vehicle.mapper.VehiclePlatCataMapper
;
import
com.xxfc.platform.vehicle.
v
o.CataVo
;
import
com.xxfc.platform.vehicle.
poj
o.CataVo
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleUpkeepService.java
View file @
31d78b50
...
@@ -5,8 +5,8 @@ import com.github.pagehelper.PageInfo;
...
@@ -5,8 +5,8 @@ import com.github.pagehelper.PageInfo;
import
com.xxfc.platform.vehicle.entity.VehicleUpkeepItem
;
import
com.xxfc.platform.vehicle.entity.VehicleUpkeepItem
;
import
com.xxfc.platform.vehicle.mapper.VehicleUpkeepItemMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleUpkeepItemMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleUpkeepLogMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleUpkeepLogMapper
;
import
com.xxfc.platform.vehicle.
v
o.VehicleUpkeepLogItemVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleUpkeepLogItemVo
;
import
com.xxfc.platform.vehicle.
v
o.VehicleUpkeepLogVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleUpkeepLogVo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleWarningMsgBiz.java
View file @
31d78b50
...
@@ -15,9 +15,9 @@ import com.xxfc.platform.vehicle.mapper.VehicleMapper;
...
@@ -15,9 +15,9 @@ import com.xxfc.platform.vehicle.mapper.VehicleMapper;
import
com.xxfc.platform.vehicle.mapper.VehicleWarningMsgMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleWarningMsgMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleWarningRuleMapper
;
import
com.xxfc.platform.vehicle.mapper.VehicleWarningRuleMapper
;
import
com.xxfc.platform.vehicle.util.JSUtil
;
import
com.xxfc.platform.vehicle.util.JSUtil
;
import
com.xxfc.platform.vehicle.
v
o.AddVehicleWarningMsgVo
;
import
com.xxfc.platform.vehicle.
poj
o.AddVehicleWarningMsgVo
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.xxfc.platform.vehicle.
v
o.QueryVehicleWarningMsgVo
;
import
com.xxfc.platform.vehicle.
poj
o.QueryVehicleWarningMsgVo
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/BranchCompanyMapper.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
import
com.xxfc.platform.vehicle.entity.BranchCompany
;
import
com.xxfc.platform.vehicle.entity.BranchCompany
;
import
com.xxfc.platform.vehicle.vo.BranchCompanyStockApplyInfoVo
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
tk.mybatis.mapper.common.Mapper
;
import
tk.mybatis.mapper.common.Mapper
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/BranchCompanyStockApplyInfoMapper.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
import
com.xxfc.platform.vehicle.entity.BranchCompanyStockApplyInfo
;
import
com.xxfc.platform.vehicle.entity.BranchCompanyStockApplyInfo
;
import
com.xxfc.platform.vehicle.
v
o.BranchCompanyStockApplyInfoVo
;
import
com.xxfc.platform.vehicle.
poj
o.BranchCompanyStockApplyInfoVo
;
import
tk.mybatis.mapper.common.Mapper
;
import
tk.mybatis.mapper.common.Mapper
;
import
java.util.List
;
import
java.util.List
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/BranchCompanyStockInfoMapper.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
import
com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo
;
import
com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo
;
import
com.xxfc.platform.vehicle.
v
o.BranchCompanyStockInfoVo
;
import
com.xxfc.platform.vehicle.
poj
o.BranchCompanyStockInfoVo
;
import
com.xxfc.platform.vehicle.
v
o.BranchCompanyStockSearchVo
;
import
com.xxfc.platform.vehicle.
poj
o.BranchCompanyStockSearchVo
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
tk.mybatis.mapper.common.Mapper
;
import
tk.mybatis.mapper.common.Mapper
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookRecordMapper.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
import
com.xxfc.platform.vehicle.entity.VehicleBookRecord
;
import
com.xxfc.platform.vehicle.entity.VehicleBookRecord
;
import
com.xxfc.platform.vehicle.
v
o.QueryVehicleBookRecordVo
;
import
com.xxfc.platform.vehicle.
poj
o.QueryVehicleBookRecordVo
;
import
com.xxfc.platform.vehicle.
v
o.VehicleBookRecordAndTbNameVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleBookRecordAndTbNameVo
;
import
tk.mybatis.mapper.common.Mapper
;
import
tk.mybatis.mapper.common.Mapper
;
import
java.util.List
;
import
java.util.List
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleDepartureLogMapper.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
import
com.xxfc.platform.vehicle.entity.VehicleDepartureLog
;
import
com.xxfc.platform.vehicle.entity.VehicleDepartureLog
;
import
com.xxfc.platform.vehicle.
v
o.VehicleDepartureLogVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleDepartureLogVo
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
tk.mybatis.mapper.common.BaseMapper
;
import
tk.mybatis.mapper.common.BaseMapper
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleMapper.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
import
com.xxfc.platform.vehicle.entity.Vehicle
;
import
com.xxfc.platform.vehicle.entity.Vehicle
;
import
com.xxfc.platform.vehicle.
v
o.AddOrUpdateVehicleVo
;
import
com.xxfc.platform.vehicle.
poj
o.AddOrUpdateVehicleVo
;
import
com.xxfc.platform.vehicle.
v
o.QueryVehicleVo
;
import
com.xxfc.platform.vehicle.
poj
o.QueryVehicleVo
;
import
com.xxfc.platform.vehicle.
v
o.UsableVehicleModelVO
;
import
com.xxfc.platform.vehicle.
poj
o.UsableVehicleModelVO
;
import
org.springframework.data.repository.query.Param
;
import
org.springframework.data.repository.query.Param
;
import
tk.mybatis.mapper.common.Mapper
;
import
tk.mybatis.mapper.common.Mapper
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleUpkeepLogMapper.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
import
com.xxfc.platform.vehicle.entity.VehicleUpkeepLog
;
import
com.xxfc.platform.vehicle.entity.VehicleUpkeepLog
;
import
com.xxfc.platform.vehicle.
v
o.VehicleUpkeepLogItemVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleUpkeepLogItemVo
;
import
com.xxfc.platform.vehicle.
v
o.VehicleUpkeepLogVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleUpkeepLogVo
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
tk.mybatis.mapper.common.Mapper
;
import
tk.mybatis.mapper.common.Mapper
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleWarningMsgMapper.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
import
com.xxfc.platform.vehicle.entity.VehicleWarningMsg
;
import
com.xxfc.platform.vehicle.entity.VehicleWarningMsg
;
import
com.xxfc.platform.vehicle.
v
o.QueryVehicleWarningMsgVo
;
import
com.xxfc.platform.vehicle.
poj
o.QueryVehicleWarningMsgVo
;
import
tk.mybatis.mapper.common.Mapper
;
import
tk.mybatis.mapper.common.Mapper
;
import
java.util.List
;
import
java.util.List
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AccompanyingItemController.java
View file @
31d78b50
...
@@ -9,9 +9,9 @@ import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
...
@@ -9,9 +9,9 @@ import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.entity.AccompanyingItem
;
import
com.xxfc.platform.vehicle.entity.AccompanyingItem
;
import
com.xxfc.platform.vehicle.
v
o.AddOrUpdateAccompanyingItem
;
import
com.xxfc.platform.vehicle.
poj
o.AddOrUpdateAccompanyingItem
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.xxfc.platform.vehicle.
v
o.QueryAccompanyItemVo
;
import
com.xxfc.platform.vehicle.
poj
o.QueryAccompanyItemVo
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java
View file @
31d78b50
...
@@ -9,16 +9,14 @@ import com.xxfc.platform.vehicle.common.BaseController;
...
@@ -9,16 +9,14 @@ import com.xxfc.platform.vehicle.common.BaseController;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.entity.BranchCompany
;
import
com.xxfc.platform.vehicle.entity.BranchCompany
;
import
com.xxfc.platform.vehicle.entity.SysRegion
;
import
com.xxfc.platform.vehicle.feign.UserFeign
;
import
com.xxfc.platform.vehicle.feign.UserFeign
;
import
com.xxfc.platform.vehicle.feign.dto.UserDTO
;
import
com.xxfc.platform.vehicle.feign.dto.UserDTO
;
import
com.xxfc.platform.vehicle.
v
o.BranchCompanyVo
;
import
com.xxfc.platform.vehicle.
poj
o.BranchCompanyVo
;
import
com.xxfc.platform.vehicle.
v
o.CompanyDetail
;
import
com.xxfc.platform.vehicle.
poj
o.CompanyDetail
;
import
com.xxfc.platform.vehicle.
v
o.CompanySearchDTO
;
import
com.xxfc.platform.vehicle.
poj
o.CompanySearchDTO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.Data
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyStockController.java
View file @
31d78b50
...
@@ -6,9 +6,9 @@ import com.xxfc.platform.vehicle.biz.BranchCompanyStockService;
...
@@ -6,9 +6,9 @@ import com.xxfc.platform.vehicle.biz.BranchCompanyStockService;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.entity.BranchCompanyStockApplyInfo
;
import
com.xxfc.platform.vehicle.entity.BranchCompanyStockApplyInfo
;
import
com.xxfc.platform.vehicle.
v
o.BranchCompanyStockApplyVo
;
import
com.xxfc.platform.vehicle.
poj
o.BranchCompanyStockApplyVo
;
import
com.xxfc.platform.vehicle.
v
o.BranchCompanyStockInfoVo
;
import
com.xxfc.platform.vehicle.
poj
o.BranchCompanyStockInfoVo
;
import
com.xxfc.platform.vehicle.
v
o.BranchCompanyStockSearchVo
;
import
com.xxfc.platform.vehicle.
poj
o.BranchCompanyStockSearchVo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/CampsiteController.java
View file @
31d78b50
...
@@ -10,7 +10,7 @@ import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
...
@@ -10,7 +10,7 @@ import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
import
com.xxfc.platform.vehicle.entity.Campsite
;
import
com.xxfc.platform.vehicle.entity.Campsite
;
import
com.xxfc.platform.vehicle.feign.UserFeign
;
import
com.xxfc.platform.vehicle.feign.UserFeign
;
import
com.xxfc.platform.vehicle.feign.dto.UserDTO
;
import
com.xxfc.platform.vehicle.feign.dto.UserDTO
;
import
com.xxfc.platform.vehicle.
v
o.CampsiteVo
;
import
com.xxfc.platform.vehicle.
poj
o.CampsiteVo
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/ConstantController.java
View file @
31d78b50
...
@@ -7,7 +7,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
...
@@ -7,7 +7,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
import
com.xxfc.platform.vehicle.constant.ConstantType
;
import
com.xxfc.platform.vehicle.constant.ConstantType
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.entity.Constant
;
import
com.xxfc.platform.vehicle.entity.Constant
;
import
com.xxfc.platform.vehicle.
v
o.ConstantVo
;
import
com.xxfc.platform.vehicle.
poj
o.ConstantVo
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleActiveController.java
View file @
31d78b50
...
@@ -3,7 +3,7 @@ package com.xxfc.platform.vehicle.rest;
...
@@ -3,7 +3,7 @@ package com.xxfc.platform.vehicle.rest;
import
com.xxfc.platform.vehicle.biz.VehicleActiveService
;
import
com.xxfc.platform.vehicle.biz.VehicleActiveService
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.
v
o.*
;
import
com.xxfc.platform.vehicle.
poj
o.*
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestBody
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleCataController.java
View file @
31d78b50
package
com
.
xxfc
.
platform
.
vehicle
.
rest
;
package
com
.
xxfc
.
platform
.
vehicle
.
rest
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONException
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken
;
import
com.github.wxiaoqi.security.auth.client.config.UserAuthConfig
;
import
com.github.wxiaoqi.security.common.context.BaseContextHandler
;
import
com.xxfc.platform.vehicle.biz.VehicleBiz
;
import
com.xxfc.platform.vehicle.biz.VehicleBookRecordBiz
;
import
com.xxfc.platform.vehicle.biz.VehicleCataBiz
;
import
com.xxfc.platform.vehicle.biz.VehicleCataBiz
;
import
com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz
;
import
com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz
;
import
com.xxfc.platform.vehicle.common.CustomIllegalParamException
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.common.VehicleBaseController
;
import
com.xxfc.platform.vehicle.common.VehicleBaseController
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.entity.VehicleCata
;
import
com.xxfc.platform.vehicle.feign.UserFeign
;
import
com.xxfc.platform.vehicle.feign.dto.AppUserDTO
;
import
com.xxfc.platform.vehicle.feign.dto.AppUserDTO
;
import
com.xxfc.platform.vehicle.feign.dto.UserDTO
;
import
com.xxfc.platform.vehicle.pojo.*
;
import
com.xxfc.platform.vehicle.vo.*
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.joda.time.format.DateTimeFormat
;
import
org.joda.time.format.DateTimeFormatter
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
java.util.List
;
@RestController
@RestController
@RequestMapping
(
"/cata"
)
@RequestMapping
(
"/cata"
)
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java
View file @
31d78b50
...
@@ -7,8 +7,6 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
...
@@ -7,8 +7,6 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken
;
import
com.github.wxiaoqi.security.auth.client.config.UserAuthConfig
;
import
com.github.wxiaoqi.security.auth.client.config.UserAuthConfig
;
import
com.github.wxiaoqi.security.common.context.BaseContextHandler
;
import
com.github.wxiaoqi.security.common.context.BaseContextHandler
;
import
com.github.wxiaoqi.security.common.exception.BaseException
;
import
com.github.wxiaoqi.security.common.msg.BaseResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.xxfc.platform.vehicle.biz.VehicleBiz
;
import
com.xxfc.platform.vehicle.biz.VehicleBiz
;
...
@@ -21,11 +19,10 @@ import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
...
@@ -21,11 +19,10 @@ import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
import
com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus
;
import
com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus
;
import
com.xxfc.platform.vehicle.entity.Vehicle
;
import
com.xxfc.platform.vehicle.entity.Vehicle
;
import
com.xxfc.platform.vehicle.entity.VehicleBookInfo
;
import
com.xxfc.platform.vehicle.entity.VehicleBookInfo
;
import
com.xxfc.platform.vehicle.entity.VehicleCata
;
import
com.xxfc.platform.vehicle.entity.VehiclePlatCata
;
import
com.xxfc.platform.vehicle.entity.VehiclePlatCata
;
import
com.xxfc.platform.vehicle.feign.UserFeign
;
import
com.xxfc.platform.vehicle.feign.UserFeign
;
import
com.xxfc.platform.vehicle.feign.dto.UserDTO
;
import
com.xxfc.platform.vehicle.feign.dto.UserDTO
;
import
com.xxfc.platform.vehicle.
v
o.*
;
import
com.xxfc.platform.vehicle.
poj
o.*
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
@@ -38,8 +35,6 @@ import org.springframework.http.ResponseEntity;
...
@@ -38,8 +35,6 @@ import org.springframework.http.ResponseEntity;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.MultipartFile
;
import
tk.mybatis.mapper.entity.Example
;
import
tk.mybatis.mapper.entity.Example
;
import
tk.mybatis.mapper.weekend.Weekend
;
import
tk.mybatis.mapper.weekend.WeekendCriteria
;
import
tk.mybatis.mapper.weekend.WeekendSqls
;
import
tk.mybatis.mapper.weekend.WeekendSqls
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
@@ -160,7 +155,8 @@ public class VehicleController extends BaseController<VehicleBiz> {
...
@@ -160,7 +155,8 @@ public class VehicleController extends BaseController<VehicleBiz> {
public
RestResponse
<
Integer
>
applyVehicle
(
@RequestBody
BookVehicleVo
bookVehicleVo
)
throws
Exception
{
public
RestResponse
<
Integer
>
applyVehicle
(
@RequestBody
BookVehicleVo
bookVehicleVo
)
throws
Exception
{
Integer
operatorId
=
Integer
.
parseInt
(
BaseContextHandler
.
getUserID
());
Integer
operatorId
=
Integer
.
parseInt
(
BaseContextHandler
.
getUserID
());
String
userName
=
BaseContextHandler
.
getName
();
String
userName
=
BaseContextHandler
.
getName
();
return
baseBiz
.
applyVehicle4Employee
(
operatorId
,
bookVehicleVo
,
userName
);
baseBiz
.
applyVehicle4Employee
(
operatorId
,
bookVehicleVo
,
userName
);
return
RestResponse
.
suc
();
}
}
/**
/**
...
@@ -218,7 +214,6 @@ public class VehicleController extends BaseController<VehicleBiz> {
...
@@ -218,7 +214,6 @@ public class VehicleController extends BaseController<VehicleBiz> {
@RequestMapping
(
value
=
"/bookedRecord/{bookEndDate}/{id}"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/bookedRecord/{bookEndDate}/{id}"
,
method
=
RequestMethod
.
GET
)
public
RestResponse
<
QueryVehicleBookRecordVo
>
getBookedRecord
(
@PathVariable
String
bookEndDate
,
@PathVariable
Long
id
)
throws
Exception
{
public
RestResponse
<
QueryVehicleBookRecordVo
>
getBookedRecord
(
@PathVariable
String
bookEndDate
,
@PathVariable
Long
id
)
throws
Exception
{
try
{
try
{
return
RestResponse
.
codeAndData
(
RestResponse
.
SUC_CODE
,
vehicleBookRecordBiz
.
getById
(
id
,
DateTime
.
parse
(
bookEndDate
,
DEFAULT_FORMATTER
)));
return
RestResponse
.
codeAndData
(
RestResponse
.
SUC_CODE
,
vehicleBookRecordBiz
.
getById
(
id
,
DateTime
.
parse
(
bookEndDate
,
DEFAULT_FORMATTER
)));
}
catch
(
JSONException
ex
)
{
}
catch
(
JSONException
ex
)
{
...
@@ -310,7 +305,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
...
@@ -310,7 +305,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
*/
*/
@ApiOperation
(
"租车触发的申请预定车辆"
)
@ApiOperation
(
"租车触发的申请预定车辆"
)
@RequestMapping
(
value
=
"/rent/book/vehicle"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/rent/book/vehicle"
,
method
=
RequestMethod
.
POST
)
public
RestResponse
<
String
>
rentApplyVehicle
(
@RequestBody
RentVehicleBookDTO
dto
)
throws
Exception
{
public
ObjectRestResponse
<
Integer
>
rentApplyVehicle
(
@RequestBody
RentVehicleBookDTO
dto
)
throws
Exception
{
//默认USER_APP 预约
//默认USER_APP 预约
Integer
operatorId
=
USER_APP
;
Integer
operatorId
=
USER_APP
;
String
userName
=
BaseContextHandler
.
getName
();
String
userName
=
BaseContextHandler
.
getName
();
...
@@ -322,6 +317,8 @@ public class VehicleController extends BaseController<VehicleBiz> {
...
@@ -322,6 +317,8 @@ public class VehicleController extends BaseController<VehicleBiz> {
PageDataVO
<
Vehicle
>
pageDataVO
=
vehicleBiz
.
searchUsableVehicle
(
dto
);
PageDataVO
<
Vehicle
>
pageDataVO
=
vehicleBiz
.
searchUsableVehicle
(
dto
);
bookVehicleVo
.
setVehicle
(
pageDataVO
.
getData
().
get
(
0
).
getId
());
bookVehicleVo
.
setVehicle
(
pageDataVO
.
getData
().
get
(
0
).
getId
());
return
baseBiz
.
applyVehicle4Employee
(
operatorId
,
bookVehicleVo
,
userName
);
baseBiz
.
applyVehicle4Employee
(
operatorId
,
bookVehicleVo
,
userName
);
return
ObjectRestResponse
.
success
();
}
}
}
}
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleLicenseController.java
View file @
31d78b50
...
@@ -8,7 +8,7 @@ import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
...
@@ -8,7 +8,7 @@ import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
import
com.xxfc.platform.vehicle.entity.VehicleUserLicense
;
import
com.xxfc.platform.vehicle.entity.VehicleUserLicense
;
import
com.xxfc.platform.vehicle.feign.dto.AppUserDTO
;
import
com.xxfc.platform.vehicle.feign.dto.AppUserDTO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.xxfc.platform.vehicle.
v
o.VehicleUserLicenseVo
;
import
com.xxfc.platform.vehicle.
poj
o.VehicleUserLicenseVo
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java
View file @
31d78b50
...
@@ -5,29 +5,18 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
...
@@ -5,29 +5,18 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.xxfc.platform.vehicle.biz.VehicleModelBiz
;
import
com.xxfc.platform.vehicle.biz.VehicleModelBiz
;
import
com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz
;
import
com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.entity.VehicleCata
;
import
com.xxfc.platform.vehicle.entity.VehicleModel
;
import
com.xxfc.platform.vehicle.entity.VehicleModel
;
import
com.xxfc.platform.vehicle.entity.VehiclePlatCata
;
import
com.xxfc.platform.vehicle.pojo.VModelDetailVO
;
import
com.xxfc.platform.vehicle.entity.VehicleUserLicense
;
import
com.xxfc.platform.vehicle.feign.dto.AppUserDTO
;
import
com.xxfc.platform.vehicle.vo.VModelDetailVO
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
import
io.swagger.annotations.ApiParam
;
import
io.swagger.models.auth.In
;
import
lombok.Data
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
@Controller
@Controller
@RequestMapping
(
"vehicleModel"
)
@RequestMapping
(
"vehicleModel"
)
@Api
(
value
=
"车型controller"
,
tags
={
"车型操作接口"
})
@Api
(
value
=
"车型controller"
,
tags
={
"车型操作接口"
})
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleWarningMsgController.java
View file @
31d78b50
...
@@ -3,16 +3,15 @@ package com.xxfc.platform.vehicle.rest;
...
@@ -3,16 +3,15 @@ package com.xxfc.platform.vehicle.rest;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONException
;
import
com.alibaba.fastjson.JSONException
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken
;
import
com.github.wxiaoqi.security.common.msg.BaseResponse
;
import
com.xxfc.platform.vehicle.biz.VehicleWarningMsgBiz
;
import
com.xxfc.platform.vehicle.biz.VehicleWarningMsgBiz
;
import
com.xxfc.platform.vehicle.common.BaseController
;
import
com.xxfc.platform.vehicle.common.BaseController
;
import
com.xxfc.platform.vehicle.common.CustomIllegalParamException
;
import
com.xxfc.platform.vehicle.common.CustomIllegalParamException
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.constant.ResCode.ResCode
;
import
com.xxfc.platform.vehicle.entity.VehicleWarningMsg
;
import
com.xxfc.platform.vehicle.entity.VehicleWarningMsg
;
import
com.xxfc.platform.vehicle.
v
o.AddVehicleWarningMsgVo
;
import
com.xxfc.platform.vehicle.
poj
o.AddVehicleWarningMsgVo
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.xxfc.platform.vehicle.
v
o.QueryVehicleWarningMsgVo
;
import
com.xxfc.platform.vehicle.
poj
o.QueryVehicleWarningMsgVo
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
...
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml
View file @
31d78b50
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
<result
column=
"update_time"
property=
"updateTime"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"update_time"
property=
"updateTime"
jdbcType=
"TIMESTAMP"
/>
</resultMap>
</resultMap>
<select
id=
"search"
resultType=
"com.xxfc.platform.vehicle.
v
o.CompanySearchVO"
>
<select
id=
"search"
resultType=
"com.xxfc.platform.vehicle.
poj
o.CompanySearchVO"
>
select *
select *
<if
test=
"lon != null and lat != null"
>
<if
test=
"lon != null and lat != null"
>
, st_distance_sphere(point(#{lon}, #{lat}), point(longitude, latitude)) as distance
, st_distance_sphere(point(#{lon}, #{lat}), point(longitude, latitude)) as distance
...
@@ -28,11 +28,13 @@
...
@@ -28,11 +28,13 @@
<if
test=
"addrCity != null"
>
<if
test=
"addrCity != null"
>
addr_city = #{addrCity}
addr_city = #{addrCity}
</if>
</if>
<if
test=
"lon != null and lat != null"
>
longitude is not null and latitude is not null
</if>
</trim>
</trim>
<if
test=
"lon != null and lat != null"
>
<if
test=
"lon != null and lat != null"
>
order by distance asc
order by distance asc
</if>
</if>
</select>
</select>
</mapper>
</mapper>
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyStockApplyInfoMapper.xml
View file @
31d78b50
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
<result
column=
"create_time"
property=
"createTime"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"create_time"
property=
"createTime"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"update_time"
property=
"updateTime"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"update_time"
property=
"updateTime"
jdbcType=
"TIMESTAMP"
/>
</resultMap>
</resultMap>
<select
id=
"selectVoAll"
resultType=
"com.xxfc.platform.vehicle.
v
o.BranchCompanyStockApplyInfoVo"
>
<select
id=
"selectVoAll"
resultType=
"com.xxfc.platform.vehicle.
poj
o.BranchCompanyStockApplyInfoVo"
>
select a.*, b.company_name
select a.*, b.company_name
from branch_company_stock_apply_info a
from branch_company_stock_apply_info a
left join branch_company_stock_info b on a.company_id = b.id
left join branch_company_stock_info b on a.company_id = b.id
...
...
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyStockInfoMapper.xml
View file @
31d78b50
...
@@ -7,11 +7,11 @@
...
@@ -7,11 +7,11 @@
set balance = #{balance}
set balance = #{balance}
where id = #{companyId} and balance = #{lastBalance}
where id = #{companyId} and balance = #{lastBalance}
</update>
</update>
<select
id=
"selectVoAll"
resultType=
"com.xxfc.platform.vehicle.
v
o.BranchCompanyStockInfoVo"
>
<select
id=
"selectVoAll"
resultType=
"com.xxfc.platform.vehicle.
poj
o.BranchCompanyStockInfoVo"
>
select *
select *
from branch_company_stock_info
from branch_company_stock_info
</select>
</select>
<select
id=
"search"
resultType=
"com.xxfc.platform.vehicle.
v
o.BranchCompanyStockInfoVo"
>
<select
id=
"search"
resultType=
"com.xxfc.platform.vehicle.
poj
o.BranchCompanyStockInfoVo"
>
select *
select *
from branch_company_stock_info
from branch_company_stock_info
<trim
prefix=
"where"
suffixOverrides=
"and"
>
<trim
prefix=
"where"
suffixOverrides=
"and"
>
...
...
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml
View file @
31d78b50
...
@@ -193,7 +193,7 @@
...
@@ -193,7 +193,7 @@
limit #{pageStart},#{pageSize}
limit #{pageStart},#{pageSize}
</select>
</select>
<select
id=
"getByPage"
parameterType=
"java.util.Map"
resultType=
"com.xxfc.platform.vehicle.
v
o.QueryVehicleBookRecordVo"
>
<select
id=
"getByPage"
parameterType=
"java.util.Map"
resultType=
"com.xxfc.platform.vehicle.
poj
o.QueryVehicleBookRecordVo"
>
select
select
vbr.`id`,
vbr.`id`,
vbr.`vehicle`,
vbr.`vehicle`,
...
...
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleDepartureLogMapper.xml
View file @
31d78b50
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
where vehicle_id = #{vehicleId}
where vehicle_id = #{vehicleId}
order by create_time desc
order by create_time desc
</select>
</select>
<select
id=
"selectVoAll"
resultType=
"com.xxfc.platform.vehicle.
v
o.VehicleDepartureLogVo"
>
<select
id=
"selectVoAll"
resultType=
"com.xxfc.platform.vehicle.
poj
o.VehicleDepartureLogVo"
>
select vehicle_departure_log.*,vehicle.number_plate
select vehicle_departure_log.*,vehicle.number_plate
from vehicle_departure_log
from vehicle_departure_log
left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
</trim>
</trim>
order by create_time desc
order by create_time desc
</select>
</select>
<select
id=
"selectVoAllNotAllData"
resultType=
"com.xxfc.platform.vehicle.
v
o.VehicleDepartureLogVo"
>
<select
id=
"selectVoAllNotAllData"
resultType=
"com.xxfc.platform.vehicle.
poj
o.VehicleDepartureLogVo"
>
select vehicle_departure_log.*,vehicle.number_plate
select vehicle_departure_log.*,vehicle.number_plate
from vehicle_departure_log
from vehicle_departure_log
left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
...
...
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
View file @
31d78b50
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace=
"com.xxfc.platform.vehicle.mapper.VehicleMapper"
>
<mapper
namespace=
"com.xxfc.platform.vehicle.mapper.VehicleMapper"
>
<resultMap
id=
"searchUsableModelMap"
type=
"com.xxfc.platform.vehicle.
v
o.UsableVehicleModelVO"
>
<resultMap
id=
"searchUsableModelMap"
type=
"com.xxfc.platform.vehicle.
poj
o.UsableVehicleModelVO"
>
<!-- <collection column="company_id" property="id" ofType="com.xxfc.platform.vehicle.entity.BranchCompany" select="com.xxfc.platform.vehicle.mapper.BranchCompanyMapper.selectByPrimaryKey" />-->
<!-- <collection column="company_id" property="id" ofType="com.xxfc.platform.vehicle.entity.BranchCompany" select="com.xxfc.platform.vehicle.mapper.BranchCompanyMapper.selectByPrimaryKey" />-->
<!-- <result column="company_id" property="companyId" jdbcType="VARCHAR" javaType="java.lang.Integer"/>-->
<!-- <result column="company_id" property="companyId" jdbcType="VARCHAR" javaType="java.lang.Integer"/>-->
<!-- <result column="model_id" property="modelId" jdbcType="INTEGER" javaType="java.lang.Integer"/>-->
<!-- <result column="model_id" property="modelId" jdbcType="INTEGER" javaType="java.lang.Integer"/>-->
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<select
id=
"getByPage"
parameterType=
"java.util.Map"
<select
id=
"getByPage"
parameterType=
"java.util.Map"
resultType=
"com.xxfc.platform.vehicle.
v
o.QueryVehicleVo"
>
resultType=
"com.xxfc.platform.vehicle.
poj
o.QueryVehicleVo"
>
select v.`id`,
select v.`id`,
v.`code`,
v.`code`,
v.`status`,
v.`status`,
...
@@ -113,7 +113,7 @@
...
@@ -113,7 +113,7 @@
</select>
</select>
<select
id=
"getByPageNotAllData"
parameterType=
"java.util.Map"
<select
id=
"getByPageNotAllData"
parameterType=
"java.util.Map"
resultType=
"com.xxfc.platform.vehicle.
v
o.QueryVehicleVo"
>
resultType=
"com.xxfc.platform.vehicle.
poj
o.QueryVehicleVo"
>
select v.`id`,
select v.`id`,
v.`code`,
v.`code`,
v.`status`,
v.`status`,
...
@@ -222,7 +222,7 @@
...
@@ -222,7 +222,7 @@
</select>
</select>
<select
id=
"lockByCode"
resultType=
"com.xxfc.platform.vehicle.entity.Vehicle"
<select
id=
"lockByCode"
resultType=
"com.xxfc.platform.vehicle.entity.Vehicle"
parameterType=
"com.xxfc.platform.vehicle.
v
o.AddOrUpdateVehicleVo"
>
parameterType=
"com.xxfc.platform.vehicle.
poj
o.AddOrUpdateVehicleVo"
>
select
select
v.`id`,
v.`id`,
v.`code`,
v.`code`,
...
...
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleUpkeepLogMapper.xml
View file @
31d78b50
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
delete from vehicle_upkeep_log_item
delete from vehicle_upkeep_log_item
where log_id = #{id}
where log_id = #{id}
</delete>
</delete>
<select
id=
"selectVoAll"
resultType=
"com.xxfc.platform.vehicle.
v
o.VehicleUpkeepLogVo"
>
<select
id=
"selectVoAll"
resultType=
"com.xxfc.platform.vehicle.
poj
o.VehicleUpkeepLogVo"
>
select a.*, b.number_plate, c.name as branch_company_name
select a.*, b.number_plate, c.name as branch_company_name
from vehicle_upkeep_log a
from vehicle_upkeep_log a
left join vehicle b on a.vehicle_id = b.id
left join vehicle b on a.vehicle_id = b.id
...
@@ -40,14 +40,14 @@
...
@@ -40,14 +40,14 @@
</trim>
</trim>
order by a.create_time desc
order by a.create_time desc
</select>
</select>
<select
id=
"selectVoById"
resultType=
"com.xxfc.platform.vehicle.
v
o.VehicleUpkeepLogVo"
>
<select
id=
"selectVoById"
resultType=
"com.xxfc.platform.vehicle.
poj
o.VehicleUpkeepLogVo"
>
select a.*, b.number_plate, c.name as branch_company_name
select a.*, b.number_plate, c.name as branch_company_name
from vehicle_upkeep_log a
from vehicle_upkeep_log a
left join vehicle b on a.vehicle_id = b.id
left join vehicle b on a.vehicle_id = b.id
left join branch_company c on a.branch_company_id = c.id
left join branch_company c on a.branch_company_id = c.id
where a.id = #{id}
where a.id = #{id}
</select>
</select>
<select
id=
"getItemsByLogId"
resultType=
"com.xxfc.platform.vehicle.
v
o.VehicleUpkeepLogItemVo"
>
<select
id=
"getItemsByLogId"
resultType=
"com.xxfc.platform.vehicle.
poj
o.VehicleUpkeepLogItemVo"
>
select a.*, b.name as item_name
select a.*, b.name as item_name
from vehicle_upkeep_log_item a
from vehicle_upkeep_log_item a
left join vehicle_upkeep_item b on a.item_id = b.id
left join vehicle_upkeep_item b on a.item_id = b.id
...
...
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleWarningMsgMapper.xml
View file @
31d78b50
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.xxfc.platform.vehicle.mapper.VehicleWarningMsgMapper"
>
<mapper
namespace=
"com.xxfc.platform.vehicle.mapper.VehicleWarningMsgMapper"
>
<select
id=
"getByPage"
resultType=
"com.xxfc.platform.vehicle.
v
o.VehicleWarningMsgQueryVo"
<select
id=
"getByPage"
resultType=
"com.xxfc.platform.vehicle.
poj
o.VehicleWarningMsgQueryVo"
parameterType=
"com.xxfc.platform.vehicle.
v
o.QueryVehicleWarningMsgVo"
>
parameterType=
"com.xxfc.platform.vehicle.
poj
o.QueryVehicleWarningMsgVo"
>
select
select
vwn.id, vwn.type, vwn.`status`, vwn.msg, vwn.rule_id, vwn.msg_key, vwn.vehicle_id, vwn.create_time, vwn.update_time, vwn.remark, v.code as vehicleCode, v.number_plate
vwn.id, vwn.type, vwn.`status`, vwn.msg, vwn.rule_id, vwn.msg_key, vwn.vehicle_id, vwn.create_time, vwn.update_time, vwn.remark, v.code as vehicleCode, v.number_plate
from vehicle_warning_msg vwn left join vehicle v on vwn.vehicle_id = v.id
from vehicle_warning_msg vwn left join vehicle v on vwn.vehicle_id = v.id
...
...
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleWarningRuleMapper.xml
View file @
31d78b50
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.xxfc.platform.vehicle.mapper.VehicleWarningRuleMapper"
>
<mapper
namespace=
"com.xxfc.platform.vehicle.mapper.VehicleWarningRuleMapper"
>
<select
id=
"getByPage"
parameterType=
"com.xxfc.platform.vehicle.
v
o.QueryVehicleWarningMsgVo"
resultType=
"com.xxfc.platform.vehicle.entity.VehicleWarningMsg"
>
<select
id=
"getByPage"
parameterType=
"com.xxfc.platform.vehicle.
poj
o.QueryVehicleWarningMsgVo"
resultType=
"com.xxfc.platform.vehicle.entity.VehicleWarningMsg"
>
</select>
</select>
...
...
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