切换导航条
此项目
正在载入...
登录
vehicle_dispatch
/
vehicle_manage
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
王勇
5 years ago
提交
1b9d70c84f6339f4194f4e3b929b5ac7190c074d
1 个父辈
a0c21c97
结合前端,简单修改
隐藏空白字符变更
内嵌
并排对比
正在显示
14 个修改的文件
包含
106 行增加
和
18 行删除
config/application.yml
src/main/java/com/sunyo/wlpt/vehicle/manage/cache/RedisCache.java
src/main/java/com/sunyo/wlpt/vehicle/manage/common/Common.java
src/main/java/com/sunyo/wlpt/vehicle/manage/config/SwaggerConfig.java
src/main/java/com/sunyo/wlpt/vehicle/manage/controller/CorporationController.java
src/main/java/com/sunyo/wlpt/vehicle/manage/controller/TrailerController.java
src/main/java/com/sunyo/wlpt/vehicle/manage/controller/VehicleController.java
src/main/java/com/sunyo/wlpt/vehicle/manage/domain/LandCorporationInfo.java
src/main/java/com/sunyo/wlpt/vehicle/manage/domain/LandRoadDrRecord.java
src/main/java/com/sunyo/wlpt/vehicle/manage/service/LandRoadVeRecordService.java
src/main/java/com/sunyo/wlpt/vehicle/manage/service/impl/LandCorporationInfoServiceImpl.java
src/main/java/com/sunyo/wlpt/vehicle/manage/service/impl/LandRoadDrRecordServiceImpl.java
src/main/java/com/sunyo/wlpt/vehicle/manage/service/impl/LandRoadTrailerRecordServiceImpl.java
src/main/java/com/sunyo/wlpt/vehicle/manage/service/impl/LandRoadVeRecordServiceImpl.java
config/application.yml
查看文件 @
1b9d70c
...
...
@@ -5,7 +5,7 @@ server:
spring
:
servlet
:
multipart
:
max-file-size
:
100MB
max-file-size
:
100
0
MB
security
:
user
:
name
:
admin
...
...
src/main/java/com/sunyo/wlpt/vehicle/manage/cache/RedisCache.java
查看文件 @
1b9d70c
...
...
@@ -21,8 +21,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
* 下次再次访问的话,就是读取缓存。
* <p>
* 缓存雪崩:是指在某一特殊时刻,缓存中的缓存全部失效,然后这一时刻又有大量的数据库访问,导致数据库不堪重负。
* 解决方案:根据业务的不同设置不同的缓存失效时间。
* 比如:这个项目,做了3个namespace的缓存,其中一个namespace,共有5个Mapper指向它。所以选择使用范围内的随机值,来做缓存失效时间
* 解决方案:根据业务的不同设置不同的缓存失效时间。故,选择使用范围内的随机值,来做缓存失效时间
* <p>
* 时间:2020/8/6 9:37
*/
...
...
src/main/java/com/sunyo/wlpt/vehicle/manage/common/Common.java
查看文件 @
1b9d70c
...
...
@@ -7,4 +7,6 @@ package com.sunyo.wlpt.vehicle.manage.common;
*/
public
class
Common
{
public
static
final
String
RESULT_SUCCESS
=
"200"
;
public
static
final
String
RETURN_MESSAGE_UNEXAMINED
=
"备案未审核"
;
public
static
final
String
RETURN_MESSAGE_EXAMINED
=
"备案成功"
;
}
...
...
src/main/java/com/sunyo/wlpt/vehicle/manage/config/SwaggerConfig.java
查看文件 @
1b9d70c
...
...
@@ -34,7 +34,7 @@ public class SwaggerConfig {
return
new
ApiInfoBuilder
()
.
title
(
"车辆管理服务"
)
.
description
(
"车辆管理服务"
)
.
termsOfServiceUrl
(
"http://localhost:
10001
/"
)
.
termsOfServiceUrl
(
"http://localhost:
8678
/"
)
.
contact
(
"子诚"
)
.
version
(
"1.0.0"
)
.
build
();
...
...
src/main/java/com/sunyo/wlpt/vehicle/manage/controller/CorporationController.java
查看文件 @
1b9d70c
...
...
@@ -23,6 +23,14 @@ public class CorporationController {
@Resource
private
LandCorporationInfoService
landCorporationInfoService
;
/**
* 分页查询
*
* @param coCode 企业代码
* @param pageNum 当前页数
* @param pageSize 每页大小
* @return
*/
@ApiOperation
(
value
=
"企业信息,分页查询"
)
@GetMapping
(
"/page"
)
public
ResultJson
selectListByPage
(
@RequestParam
(
value
=
"coCode"
,
required
=
false
)
String
coCode
,
...
...
@@ -61,7 +69,8 @@ public class CorporationController {
public
ResultJson
batchRemoveCorporation
(
@RequestBody
LandCorporationInfo
landCorporationInfo
)
{
String
id
=
landCorporationInfo
.
getId
();
return
id
.
contains
(
","
)
?
landCorporationInfoService
.
batchRemoveByIds
(
id
)
return
id
.
contains
(
","
)
?
landCorporationInfoService
.
batchRemoveByIds
(
id
)
:
landCorporationInfoService
.
deleteByPrimaryKey
(
id
);
}
...
...
@@ -90,5 +99,4 @@ public class CorporationController {
{
return
landCorporationInfoService
.
insertSelective
(
landCorporationInfo
);
}
}
...
...
src/main/java/com/sunyo/wlpt/vehicle/manage/controller/TrailerController.java
查看文件 @
1b9d70c
...
...
@@ -107,6 +107,7 @@ public class TrailerController {
}
/**
* 该接口,目前就是个Demo,仅提供样式
* 上传图片,以后有了文件管理系统,接口弃用
*
* @param file 文件
...
...
src/main/java/com/sunyo/wlpt/vehicle/manage/controller/VehicleController.java
查看文件 @
1b9d70c
...
...
@@ -106,4 +106,18 @@ public class VehicleController {
{
return
landRoadVeRecordService
.
updateByPrimaryKeySelective
(
landRoadVeRecord
);
}
/**
* 审批车辆
* 新增 or 修改之后的车辆信息,都需被审批之后,才能设置为备案成功
*
* @param landRoadVeRecord 已备案但未审批通过的车辆
* @return
*/
@ApiOperation
(
value
=
"车辆信息,审批"
)
@PutMapping
(
"/approval"
)
public
ResultJson
approvalLandRoadVeRecord
(
@RequestBody
LandRoadVeRecord
landRoadVeRecord
)
{
return
landRoadVeRecordService
.
approvalLandRoadVeRecord
(
landRoadVeRecord
);
}
}
...
...
src/main/java/com/sunyo/wlpt/vehicle/manage/domain/LandCorporationInfo.java
查看文件 @
1b9d70c
package
com
.
sunyo
.
wlpt
.
vehicle
.
manage
.
domain
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
...
...
@@ -65,6 +66,7 @@ public class LandCorporationInfo implements Serializable {
* 批准/许可批文有效期
*/
@ApiModelProperty
(
value
=
"批准/许可批文有效期"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
apprValidTime
;
/**
...
...
src/main/java/com/sunyo/wlpt/vehicle/manage/domain/LandRoadDrRecord.java
查看文件 @
1b9d70c
package
com
.
sunyo
.
wlpt
.
vehicle
.
manage
.
domain
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
...
...
@@ -68,6 +69,7 @@ public class LandRoadDrRecord implements Serializable {
* 出生日期
*/
@ApiModelProperty
(
value
=
"出生日期"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
birthday
;
/**
...
...
@@ -92,6 +94,7 @@ public class LandRoadDrRecord implements Serializable {
* 申请时间
*/
@ApiModelProperty
(
value
=
"申请时间"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
proposeTime
;
/**
...
...
src/main/java/com/sunyo/wlpt/vehicle/manage/service/LandRoadVeRecordService.java
查看文件 @
1b9d70c
...
...
@@ -77,4 +77,13 @@ public interface LandRoadVeRecordService {
* @return
*/
ResultJson
batchRemoveByIds
(
String
ids
);
/**
* 审批车辆
* 新增 or 修改之后的车辆信息,都需被审批之后,才能设置为备案成功
*
* @param landRoadVeRecord 已备案但未审批通过的车辆
* @return 成功 or 失败
*/
ResultJson
approvalLandRoadVeRecord
(
LandRoadVeRecord
landRoadVeRecord
);
}
...
...
src/main/java/com/sunyo/wlpt/vehicle/manage/service/impl/LandCorporationInfoServiceImpl.java
查看文件 @
1b9d70c
...
...
@@ -12,6 +12,7 @@ import com.sunyo.wlpt.vehicle.manage.mapper.LandCorporationInfoMapper;
import
com.sunyo.wlpt.vehicle.manage.domain.LandCorporationInfo
;
import
com.sunyo.wlpt.vehicle.manage.service.LandCorporationInfoService
;
import
java.util.Date
;
import
java.util.List
;
/**
...
...
@@ -75,9 +76,10 @@ public class LandCorporationInfoServiceImpl implements LandCorporationInfoServic
}
@Override
public
ResultJson
updateByPrimaryKeySelective
(
LandCorporationInfo
record
)
public
ResultJson
updateByPrimaryKeySelective
(
LandCorporationInfo
corporationInfo
)
{
return
landCorporationInfoMapper
.
updateByPrimaryKeySelective
(
record
)
>
0
corporationInfo
.
setUpdateDate
(
new
Date
());
return
landCorporationInfoMapper
.
updateByPrimaryKeySelective
(
corporationInfo
)
>
0
?
ResultJson
.
success
(
"200"
,
"编辑企业信息,成功"
)
:
ResultJson
.
error
(
"500"
,
"编辑企业信息,失败"
);
}
...
...
src/main/java/com/sunyo/wlpt/vehicle/manage/service/impl/LandRoadDrRecordServiceImpl.java
查看文件 @
1b9d70c
...
...
@@ -14,6 +14,7 @@ import com.sunyo.wlpt.vehicle.manage.mapper.LandRoadDrRecordMapper;
import
com.sunyo.wlpt.vehicle.manage.domain.LandRoadDrRecord
;
import
com.sunyo.wlpt.vehicle.manage.service.LandRoadDrRecordService
;
import
java.util.Date
;
import
java.util.List
;
/**
...
...
@@ -101,6 +102,7 @@ public class LandRoadDrRecordServiceImpl implements LandRoadDrRecordService {
if
(!
Common
.
RESULT_SUCCESS
.
equals
(
validate
.
getCode
()))
{
return
validate
;
}
landRoadDrRecord
.
setUpdateDate
(
new
Date
());
return
landRoadDrRecordMapper
.
updateByPrimaryKeySelective
(
landRoadDrRecord
)
>
0
?
ResultJson
.
success
(
"200"
,
"编辑驾驶员信息,成功"
)
...
...
src/main/java/com/sunyo/wlpt/vehicle/manage/service/impl/LandRoadTrailerRecordServiceImpl.java
查看文件 @
1b9d70c
...
...
@@ -15,6 +15,7 @@ import com.sunyo.wlpt.vehicle.manage.domain.LandRoadTrailerRecord;
import
com.sunyo.wlpt.vehicle.manage.mapper.LandRoadTrailerRecordMapper
;
import
com.sunyo.wlpt.vehicle.manage.service.LandRoadTrailerRecordService
;
import
java.util.Date
;
import
java.util.List
;
/**
...
...
@@ -77,6 +78,9 @@ public class LandRoadTrailerRecordServiceImpl implements LandRoadTrailerRecordSe
return
validate
;
}
landRoadTrailerRecord
.
setId
(
IdUtils
.
generateId
());
// TODO:需要备案审核,每次更新,都需要备案审核
return
landRoadTrailerRecordMapper
.
insertSelective
(
landRoadTrailerRecord
)
>
0
?
ResultJson
.
success
(
"200"
,
"新增挂车信息,成功"
)
:
ResultJson
.
error
(
"500"
,
"新增挂车信息失败"
);
...
...
@@ -107,6 +111,7 @@ public class LandRoadTrailerRecordServiceImpl implements LandRoadTrailerRecordSe
if
(!
Common
.
RESULT_SUCCESS
.
equals
(
validate
.
getCode
()))
{
return
validate
;
}
landRoadTrailerRecord
.
setUpdateDate
(
new
Date
());
return
landRoadTrailerRecordMapper
.
updateByPrimaryKeySelective
(
landRoadTrailerRecord
)
>
0
?
ResultJson
.
success
(
"200"
,
"编辑挂车信息,成功"
)
...
...
src/main/java/com/sunyo/wlpt/vehicle/manage/service/impl/LandRoadVeRecordServiceImpl.java
查看文件 @
1b9d70c
...
...
@@ -16,6 +16,7 @@ import com.sunyo.wlpt.vehicle.manage.mapper.LandRoadVeRecordMapper;
import
com.sunyo.wlpt.vehicle.manage.domain.LandRoadVeRecord
;
import
com.sunyo.wlpt.vehicle.manage.service.LandRoadVeRecordService
;
import
java.util.Date
;
import
java.util.List
;
/**
...
...
@@ -63,21 +64,23 @@ public class LandRoadVeRecordServiceImpl implements LandRoadVeRecordService {
/**
* 新增
* <p>
* 新增 or 修改,车辆信息,设置为 备案未审核。需被审批之后,才能设置为 备案成功
*
* @param
record the record
* @param
landRoadVeRecord 车辆信息
* @return
*/
@Override
public
ResultJson
insertSelective
(
LandRoadVeRecord
r
ecord
)
public
ResultJson
insertSelective
(
LandRoadVeRecord
landRoadVeR
ecord
)
{
ResultJson
validateInsert
=
validate
(
r
ecord
);
ResultJson
validateInsert
=
validate
(
landRoadVeR
ecord
);
if
(!
Common
.
RESULT_SUCCESS
.
equals
(
validateInsert
.
getCode
()))
{
return
validateInsert
;
}
record
.
setId
(
IdUtils
.
generateId
());
// TODO: 添加车辆信息的具体逻辑
landRoadVeRecord
.
setId
(
IdUtils
.
generateId
());
landRoadVeRecord
.
setReturnmessage
(
Common
.
RETURN_MESSAGE_UNEXAMINED
);
return
landRoadVeRecordMapper
.
insertSelective
(
r
ecord
)
>
0
return
landRoadVeRecordMapper
.
insertSelective
(
landRoadVeR
ecord
)
>
0
?
ResultJson
.
success
(
"200"
,
"添加车辆信息,成功"
)
:
ResultJson
.
error
(
"500"
,
"添加车辆信息,失败"
);
}
...
...
@@ -90,18 +93,25 @@ public class LandRoadVeRecordServiceImpl implements LandRoadVeRecordService {
/**
* 选择性编辑,By 主键
* <p>
* 新增 or 修改,车辆信息,设置为 备案未审核。需被审批之后,才能设置为 备案成功
* <p>
* 数据库中明明设置了更新操作,会自动更新,修改时间。但是竟然没有生效
*
* @param
record the updated record
* @param
landRoadVeRecord 车辆信息
* @return
*/
@Override
public
ResultJson
updateByPrimaryKeySelective
(
LandRoadVeRecord
r
ecord
)
public
ResultJson
updateByPrimaryKeySelective
(
LandRoadVeRecord
landRoadVeR
ecord
)
{
ResultJson
validateEdit
=
validate
(
r
ecord
);
ResultJson
validateEdit
=
validate
(
landRoadVeR
ecord
);
if
(!
Common
.
RESULT_SUCCESS
.
equals
(
validateEdit
.
getCode
()))
{
return
validateEdit
;
}
return
landRoadVeRecordMapper
.
updateByPrimaryKeySelective
(
record
)
>
0
landRoadVeRecord
.
setReturnmessage
(
Common
.
RETURN_MESSAGE_UNEXAMINED
);
landRoadVeRecord
.
setUpdateDate
(
new
Date
());
return
landRoadVeRecordMapper
.
updateByPrimaryKeySelective
(
landRoadVeRecord
)
>
0
?
ResultJson
.
success
(
"200"
,
"编辑车辆信息,成功"
)
:
ResultJson
.
error
(
"500"
,
"编辑车辆信息,失败"
);
}
...
...
@@ -181,6 +191,10 @@ public class LandRoadVeRecordServiceImpl implements LandRoadVeRecordService {
}
}
}
if
(!
StringUtil
.
isNullOrEmpty
(
trailerLicenseNo
)
&&
landRoadTrailerRecordMapper
.
selectByTrailerLicenseNo
(
trailerLicenseNo
).
size
()
==
0
)
{
return
ResultJson
.
error
(
"400"
,
"该挂车信息不存在,请仔细检查"
);
}
if
(!
domesticLisenceNo
.
equals
(
oldVe
.
getDomesticLisenceNo
()))
{
if
(
landRoadVeRecordMapper
.
selectByDomesticLisenceNo
(
domesticLisenceNo
).
size
()
>
0
)
{
return
ResultJson
.
error
(
"400"
,
"该车辆信息(车牌号),已存在"
);
...
...
@@ -208,8 +222,35 @@ public class LandRoadVeRecordServiceImpl implements LandRoadVeRecordService {
return
ResultJson
.
error
(
"400"
,
"该挂车已经被使用,请仔细检查"
);
}
}
if
(!
StringUtil
.
isNullOrEmpty
(
trailerLicenseNo
)
&&
landRoadTrailerRecordMapper
.
selectByTrailerLicenseNo
(
trailerLicenseNo
).
size
()
==
0
)
{
return
ResultJson
.
error
(
"400"
,
"该挂车信息不存在,请仔细检查"
);
}
return
landRoadVeRecordMapper
.
selectByDomesticLisenceNo
(
domesticLisenceNo
).
size
()
>
0
?
ResultJson
.
error
(
"400"
,
"校验失败,该国内车牌号已存在"
)
:
ResultJson
.
success
(
"校验通过"
);
}
/**
* 审批车辆
* <p>
* 已备案成功的车辆信息,无需再次备案
*
* @param landRoadVeRecord 已备案但未审批通过的车辆
* @return
*/
@Override
public
ResultJson
approvalLandRoadVeRecord
(
LandRoadVeRecord
landRoadVeRecord
)
{
if
(
Common
.
RETURN_MESSAGE_EXAMINED
.
equals
(
landRoadVeRecord
.
getReturnmessage
()))
{
return
ResultJson
.
error
(
"400"
,
"该车辆已备案成功,无需再次审批!"
);
}
landRoadVeRecord
.
setReturnmessage
(
Common
.
RETURN_MESSAGE_EXAMINED
);
landRoadVeRecord
.
setUpdateDate
(
new
Date
());
return
landRoadVeRecordMapper
.
updateByPrimaryKeySelective
(
landRoadVeRecord
)
>
0
?
ResultJson
.
success
(
"200"
,
"车辆信息,审批通过,备案成功!"
)
:
ResultJson
.
error
(
"500"
,
"车辆信息,审批失败,请稍后重试!"
);
}
}
...
...
请
注册
或
登录
后发表评论