Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
72f2c4dc
Commit
72f2c4dc
authored
Nov 11, 2024
by
麻笑宇
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register
parents
ace28f2e
63b5bca3
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
995 additions
and
18 deletions
+995
-18
CylinderService.java
...eejoin/amos/api/openapi/face/service/CylinderService.java
+43
-18
ShCarDto.java
...ava/com/yeejoin/amos/boot/module/jg/api/dto/ShCarDto.java
+146
-0
ShCarEquDto.java
.../com/yeejoin/amos/boot/module/jg/api/dto/ShCarEquDto.java
+102
-0
ShCar.java
...ava/com/yeejoin/amos/boot/module/jg/api/entity/ShCar.java
+210
-0
ShCarEqu.java
.../com/yeejoin/amos/boot/module/jg/api/entity/ShCarEqu.java
+139
-0
ShCarEquMapper.java
...eejoin/amos/boot/module/jg/api/mapper/ShCarEquMapper.java
+14
-0
ShCarMapper.java
...m/yeejoin/amos/boot/module/jg/api/mapper/ShCarMapper.java
+14
-0
IShCarEquService.java
...oin/amos/boot/module/jg/api/service/IShCarEquService.java
+9
-0
IShCarService.java
...eejoin/amos/boot/module/jg/api/service/IShCarService.java
+9
-0
ShCarEquMapper.xml
...odule-jg-api/src/main/resources/mapper/ShCarEquMapper.xml
+5
-0
ShCarMapper.xml
...t-module-jg-api/src/main/resources/mapper/ShCarMapper.xml
+5
-0
ShCarController.java
...n/amos/boot/module/jg/biz/controller/ShCarController.java
+117
-0
ShCarEquController.java
...mos/boot/module/jg/biz/controller/ShCarEquController.java
+116
-0
ShCarEquServiceImpl.java
.../boot/module/jg/biz/service/impl/ShCarEquServiceImpl.java
+33
-0
ShCarServiceImpl.java
...mos/boot/module/jg/biz/service/impl/ShCarServiceImpl.java
+33
-0
No files found.
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/CylinderService.java
View file @
72f2c4dc
...
...
@@ -17,8 +17,6 @@ import org.springframework.beans.BeanUtils;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.stereotype.Component
;
import
org.springframework.transaction.PlatformTransactionManager
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.ObjectUtils
;
import
org.typroject.tyboot.component.cache.Redis
;
import
org.typroject.tyboot.component.emq.EmqKeeper
;
...
...
@@ -26,10 +24,15 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.restful.exception.instance.BadRequest
;
import
javax.annotation.PostConstruct
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.concurrent.BlockingQueue
;
import
java.util.concurrent.ExecutorService
;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.LinkedBlockingQueue
;
/**
* 气瓶service
...
...
@@ -48,11 +51,11 @@ public class CylinderService {
private
final
TmCylinderFillingRecordService
cylinderFillingRecordService
;
private
final
TmCylinderFillingService
cylinderFillingService
;
private
final
PlatformTransactionManager
transactionManager
;
private
final
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
)
;
private
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
private
final
BlockingQueue
<
CylinderFillingMessageModel
>
blockingQueue
=
new
LinkedBlockingQueue
<>(
);
public
CylinderService
(
RedisTemplate
redisTemplate
,
CylinderFillingDataValidationService
cylinderFillingDataValidationService
,
TmCylinderFillingMessageService
cylinderFillingMessageService
,
EmqKeeper
emqKeeper
,
TmCylinderFillingCheckService
cylinderFillingCheckService
,
TmCylinderFillingRecordService
cylinderFillingRecordService
,
TmCylinderFillingService
cylinderFillingService
,
PlatformTransactionManager
transactionManager
)
{
public
CylinderService
(
RedisTemplate
redisTemplate
,
CylinderFillingDataValidationService
cylinderFillingDataValidationService
,
TmCylinderFillingMessageService
cylinderFillingMessageService
,
EmqKeeper
emqKeeper
,
TmCylinderFillingCheckService
cylinderFillingCheckService
,
TmCylinderFillingRecordService
cylinderFillingRecordService
,
TmCylinderFillingService
cylinderFillingService
)
{
this
.
redisTemplate
=
redisTemplate
;
this
.
cylinderFillingDataValidationService
=
cylinderFillingDataValidationService
;
this
.
cylinderFillingMessageService
=
cylinderFillingMessageService
;
...
...
@@ -60,7 +63,6 @@ public class CylinderService {
this
.
cylinderFillingCheckService
=
cylinderFillingCheckService
;
this
.
cylinderFillingRecordService
=
cylinderFillingRecordService
;
this
.
cylinderFillingService
=
cylinderFillingService
;
this
.
transactionManager
=
transactionManager
;
}
@DSTransactional
...
...
@@ -101,8 +103,8 @@ public class CylinderService {
emqKeeper
.
getMqttClient
().
publish
(
"openapi/cylinder/filling"
,
JSONObject
.
fromObject
(
cylinderFillingMessage
).
toString
().
getBytes
(),
2
,
false
);
}
@Transactional
public
JSONArray
validateFillingData
(
JSONObject
jsonobject
,
CylinderFillingMessage
cylinderFillingMessage
)
throws
MqttException
{
//
@Transactional
public
JSONArray
validateFillingData
(
JSONObject
jsonobject
,
CylinderFillingMessage
cylinderFilling
Log
Message
)
throws
MqttException
{
CylinderFillingDataValidationResultModel
validateResult
=
null
;
try
{
...
...
@@ -110,13 +112,13 @@ public class CylinderService {
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
logger
.
error
(
"液化气体气瓶充装信息上报,数据校验失败"
);
cylinderFillingMessage
.
setMessage
(
e
.
getMessage
());
cylinderFilling
Log
Message
.
setMessage
(
e
.
getMessage
());
}
JSONArray
errorData
=
new
JSONArray
();
if
(!
ObjectUtils
.
isEmpty
(
validateResult
))
{
cylinderFillingMessage
.
setCylinderNumber
(
validateResult
.
getCylinderNumber
());
cylinderFilling
Log
Message
.
setCylinderNumber
(
validateResult
.
getCylinderNumber
());
List
<
String
>
message
=
new
ArrayList
<>();
int
errorNumber
=
0
;
JSONObject
error
=
new
JSONObject
();
...
...
@@ -144,23 +146,46 @@ public class CylinderService {
if
(!
ObjectUtils
.
isEmpty
(
validateResult
.
getSeqCodeErrorData
()))
{
errorNumber
+=
validateResult
.
getSeqCodeErrorData
().
size
();
error
.
put
(
"气瓶信息不存在:"
,
validateResult
.
getSeqCodeErrorData
());
message
.
add
(
"气瓶信息不存在数量:"
+
validateResult
.
getSeqCodeErrorData
().
size
());
message
.
add
(
"气瓶信息不存在数量:"
+
validateResult
.
getSeqCodeErrorData
().
size
()
+
"个"
);
errorData
.
add
(
error
);
}
if
(
errorNumber
<=
0
)
{
message
.
add
(
"液化气体气瓶充装信息成功数:"
+
validateResult
.
getSuccessCylinderNumber
()
+
"条"
);
cylinderFillingLogMessage
.
setMessage
(
"液化气体气瓶充装信息成功数:"
+
validateResult
.
getSuccessCylinderNumber
()
+
"条"
);
}
else
{
cylinderFillingMessage
.
setMessage
(
String
.
join
(
"条; "
,
message
)
+
"个"
);
CylinderFillingMessageModel
cylinderFillingMessageModel
=
new
CylinderFillingMessageModel
();
BeanUtils
.
copyProperties
(
cylinderFillingMessage
,
cylinderFillingMessageModel
);
cylinderFillingMessageService
.
createWithModel
(
cylinderFillingMessageModel
);
emqKeeper
.
getMqttClient
().
publish
(
"openapi/cylinder/filling"
,
JSONObject
.
fromObject
(
cylinderFillingMessage
).
toString
().
getBytes
(),
2
,
false
);
throw
new
BadRequest
(
error
.
toString
());
cylinderFillingLogMessage
.
setMessage
(
String
.
join
(
"条; "
,
message
));
// cylinderFillingMessageService.createWithModel(cylinderFillingMessageModel);
emqKeeper
.
getMqttClient
().
publish
(
"openapi/cylinder/filling"
,
JSONObject
.
fromObject
(
cylinderFillingLogMessage
).
toString
().
getBytes
(),
2
,
false
);
}
CylinderFillingMessageModel
cylinderFillingMessageModel
=
new
CylinderFillingMessageModel
();
BeanUtils
.
copyProperties
(
cylinderFillingLogMessage
,
cylinderFillingMessageModel
);
// 充装信息概览放入blockingQueue
blockingQueue
.
add
(
cylinderFillingMessageModel
);
}
else
{
errorData
.
add
(
new
JSONObject
().
put
(
"数据校验失败"
,
"数据校验失败"
));
}
return
errorData
;
}
@PostConstruct
void
init
()
{
ExecutorService
executorService
=
Executors
.
newFixedThreadPool
(
3
);
for
(
int
i
=
0
;
i
<
3
;
i
++)
{
executorService
.
execute
(()
->
{
try
{
while
(
true
)
{
logger
.
info
(
"处理气瓶对接错误信息入库~开始"
);
CylinderFillingMessageModel
cylinderFillingMessageModel
=
blockingQueue
.
take
();
cylinderFillingMessageService
.
createWithModel
(
cylinderFillingMessageModel
);
logger
.
info
(
"处理气瓶对接错误信息入库~完成"
);
}
}
catch
(
InterruptedException
e
)
{
Thread
.
currentThread
().
interrupt
();
logger
.
error
(
"处理气瓶对接错误信息入库异常"
,
e
);
throw
new
RuntimeException
(
e
);
}
});
}
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/ShCarDto.java
0 → 100644
View file @
72f2c4dc
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
dto
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.util.Date
;
/**
* 三环系统-车辆信息表
*
* @author system_generator
* @date 2024-11-08
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@ApiModel
(
value
=
"ShCarDto"
,
description
=
"三环系统-车辆信息表"
)
public
class
ShCarDto
extends
BaseDto
{
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
value
=
"seq"
)
@TableId
(
"SEQUENCE_NBR"
)
private
String
sequenceNbr
;
@ApiModelProperty
(
value
=
"登记机关"
)
@TableField
(
"REGISTRATION_AGENCY"
)
private
String
registrationAgency
;
@ApiModelProperty
(
value
=
"登记机关代码"
)
@TableField
(
"REGISTRATION_AGENCY_CODE"
)
private
String
registrationAgencyCode
;
@ApiModelProperty
(
value
=
"使用登记证代码"
)
@TableField
(
"USE_REGISTRATION_CODE"
)
private
String
useRegistrationCode
;
@ApiModelProperty
(
value
=
"气瓶安装日期"
)
@TableField
(
"INSTALL_START_DATE"
)
private
Date
installStartDate
;
@ApiModelProperty
(
value
=
"车辆属性 A 代表 私家车 B代表公交车 C代表快捷货运 H 代表营运车 P代表公务车 V 代表微型货运车 X代表 其他 T代表出租车 J代表教练车 "
)
@TableField
(
"VEHICLE_ATTRIBUTE"
)
private
String
vehicleAttribute
;
@ApiModelProperty
(
value
=
"车牌号"
)
@TableField
(
"CAR_NUMBER"
)
private
String
carNumber
;
@ApiModelProperty
(
value
=
"车架号"
)
@TableField
(
"FRAME_NUMBER"
)
private
String
frameNumber
;
@ApiModelProperty
(
value
=
"登记日期"
)
@TableField
(
"REG_DATE"
)
private
Date
regDate
;
@ApiModelProperty
(
value
=
"停用日期"
)
@TableField
(
"DEA_DATE"
)
private
Date
deaDate
;
@ApiModelProperty
(
value
=
"发动机号"
)
@TableField
(
"ENGINE_NUMBER"
)
private
String
engineNumber
;
@ApiModelProperty
(
value
=
"气瓶数量"
)
@TableField
(
"BATCH_QUANTITY"
)
private
Integer
batchQuantity
;
@ApiModelProperty
(
value
=
"车辆品牌型号"
)
@TableField
(
"VEHICLE_BRAND_MODEL"
)
private
String
vehicleBrandModel
;
@ApiModelProperty
(
value
=
"证打印标识"
)
@TableField
(
"CERTIFICATE_PRINT_FLAG"
)
private
String
certificatePrintFlag
;
@ApiModelProperty
(
value
=
"联系人"
)
@TableField
(
"CONTACT_PERSON"
)
private
String
contactPerson
;
@ApiModelProperty
(
value
=
"联系电话"
)
@TableField
(
"CONTACT_PHONE"
)
private
String
contactPhone
;
@ApiModelProperty
(
value
=
"所有人"
)
@TableField
(
"OWNER"
)
private
String
owner
;
@ApiModelProperty
(
value
=
"安装单位"
)
@TableField
(
"INSTALLATION_UNIT"
)
private
String
installationUnit
;
@ApiModelProperty
(
value
=
"改装车是否打印备案通知单 原装车 忽略看"
)
@TableField
(
"IF_FLAG"
)
private
String
ifFlag
;
@ApiModelProperty
(
value
=
"第一次打印证日期"
)
@TableField
(
"PRINT_DATE"
)
private
Date
printDate
;
@ApiModelProperty
(
value
=
"充装介质"
)
@TableField
(
"MEDIA"
)
private
String
media
;
@ApiModelProperty
(
value
=
"最新检验报告编号"
)
@TableField
(
"LAST_INSPECT_REPORT_NO"
)
private
String
lastInspectReportNo
;
@ApiModelProperty
(
value
=
"气瓶状态 0正常 1变更 2报废 3注销 4启用 5停用 6注销"
)
@TableField
(
"STATE"
)
private
Integer
state
;
@ApiModelProperty
(
value
=
"登记单位"
)
@TableField
(
"REG_UNIT"
)
private
String
regUnit
;
@ApiModelProperty
(
value
=
"总容积"
)
@TableField
(
"TOTAL_VOLUME"
)
private
String
totalVolume
;
@ApiModelProperty
(
value
=
"监检/检验单位"
)
@TableField
(
"INSPECTION_UNIT"
)
private
String
inspectionUnit
;
@ApiModelProperty
(
value
=
"气瓶加装方式"
)
@TableField
(
"CYLINDER_INSTALLATION_METHOD"
)
private
String
cylinderInstallationMethod
;
@ApiModelProperty
(
value
=
"住址"
)
@TableField
(
"ADDRESS"
)
private
String
address
;
@ApiModelProperty
(
value
=
"上一次检验报告编号"
)
@TableField
(
"PREVIOUS_INSPECTION_REPORT_NUMBER"
)
private
String
previousInspectionReportNumber
;
@ApiModelProperty
(
value
=
"是否认领"
)
@TableField
(
"CLAIMED_FLAG"
)
private
String
claimedFlag
;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/ShCarEquDto.java
0 → 100644
View file @
72f2c4dc
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
dto
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.util.Date
;
/**
*
*
* @author system_generator
* @date 2024-11-08
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@ApiModel
(
value
=
"ShCarEquDto"
,
description
=
""
)
public
class
ShCarEquDto
extends
BaseDto
{
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
value
=
"primary key"
)
@TableId
(
"SEQUENCE_NBR"
)
private
String
sequenceNbr
;
@ApiModelProperty
(
value
=
"tzs_sh_car表主键"
)
@TableField
(
"CAR_ID"
)
private
String
carId
;
@ApiModelProperty
(
value
=
"设备编号"
)
@TableField
(
"SEQUENCE_CODE"
)
private
String
sequenceCode
;
@ApiModelProperty
(
value
=
"设备代码"
)
@TableField
(
"EQU_CODE"
)
private
String
equCode
;
@ApiModelProperty
(
value
=
"制造日期"
)
@TableField
(
"PRODUCE_DATE"
)
private
Date
produceDate
;
@ApiModelProperty
(
value
=
"安装日期"
)
@TableField
(
"EQU_INSTALLDATE"
)
private
Date
equInstalldate
;
@ApiModelProperty
(
value
=
"检查日期"
)
@TableField
(
"EQU_CHECKDATE"
)
private
Date
equCheckdate
;
@ApiModelProperty
(
value
=
"firstDate"
)
@TableField
(
"EQU_FIRSTDATE"
)
private
Date
equFirstdate
;
@ApiModelProperty
(
value
=
"序号"
)
@TableField
(
"SERIAL_NUMBER"
)
private
String
serialNumber
;
@ApiModelProperty
(
value
=
"sub_DM 代码"
)
@TableField
(
"EQU_DM"
)
private
String
equDm
;
@ApiModelProperty
(
value
=
"单位编号"
)
@TableField
(
"EQU_DWBH"
)
private
String
equDwbh
;
@ApiModelProperty
(
value
=
"公称工作压力(MPa)"
)
@TableField
(
"EQU_QPGC"
)
private
String
equQpgc
;
@ApiModelProperty
(
value
=
"气瓶批号"
)
@TableField
(
"BATCH_NUMBER"
)
private
String
batchNumber
;
@ApiModelProperty
(
value
=
"PFZZDW PF制造单位"
)
@TableField
(
"EQU_PFZZDW"
)
private
String
equPfzzdw
;
@ApiModelProperty
(
value
=
"isChange"
)
@TableField
(
"ISCHANGE"
)
private
Integer
ischange
;
@ApiModelProperty
(
value
=
"报告编号"
)
@TableField
(
"REPORTCODE"
)
private
String
reportcode
;
@ApiModelProperty
(
value
=
"BFReportCode"
)
@TableField
(
"BFREPORTCODE"
)
private
String
bfreportcode
;
@ApiModelProperty
(
value
=
"操作方式"
)
@TableField
(
"EQU_CZFS"
)
private
String
equCzfs
;
@ApiModelProperty
(
value
=
"是否认领"
)
@TableField
(
"CLAIMED_FLAG"
)
private
String
claimedFlag
;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/ShCar.java
0 → 100644
View file @
72f2c4dc
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
lombok.*
;
import
org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity
;
import
lombok.experimental.Accessors
;
import
java.util.Date
;
/**
* 三环系统-车辆信息表
*
* @author system_generator
* @date 2024-11-08
*/
@Data
@Accessors
(
chain
=
true
)
@TableName
(
"tzs_sh_car"
)
@AllArgsConstructor
@NoArgsConstructor
@Builder
public
class
ShCar
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* seq
*/
@TableField
(
value
=
"\"SEQUENCE_NBR\""
)
private
String
sequenceNbr
;
/**
* 登记机关
*/
@TableField
(
value
=
"\"REGISTRATION_AGENCY\""
)
private
String
registrationAgency
;
/**
* 登记机关代码
*/
@TableField
(
value
=
"\"REGISTRATION_AGENCY_CODE\""
)
private
String
registrationAgencyCode
;
/**
* 使用登记证代码
*/
@TableField
(
value
=
"\"USE_REGISTRATION_CODE\""
)
private
String
useRegistrationCode
;
/**
* 气瓶安装日期
*/
@TableField
(
value
=
"\"INSTALL_START_DATE\""
)
private
Date
installStartDate
;
/**
* 车辆属性
* A 代表 私家车 B代表公交车 C代表快捷货运 H 代表营运车 P代表公务车 V 代表微型货运车 X代表 其他 T代表出租车 J代表教练车
*/
@TableField
(
value
=
"\"VEHICLE_ATTRIBUTE\""
)
private
String
vehicleAttribute
;
/**
* 车牌号
*/
@TableField
(
value
=
"\"CAR_NUMBER\""
)
private
String
carNumber
;
/**
* 车架号
*/
@TableField
(
value
=
"\"FRAME_NUMBER\""
)
private
String
frameNumber
;
/**
* 登记日期
*/
@TableField
(
value
=
"\"REG_DATE\""
)
private
Date
regDate
;
/**
* 停用日期
*/
@TableField
(
value
=
"\"DEA_DATE\""
)
private
Date
deaDate
;
/**
* 发动机号
*/
@TableField
(
value
=
"\"ENGINE_NUMBER\""
)
private
String
engineNumber
;
/**
* 气瓶数量
*/
@TableField
(
value
=
"\"BATCH_QUANTITY\""
)
private
Integer
batchQuantity
;
/**
* 车辆品牌型号
*/
@TableField
(
value
=
"\"VEHICLE_BRAND_MODEL\""
)
private
String
vehicleBrandModel
;
/**
* 证打印标识
*/
@TableField
(
value
=
"\"CERTIFICATE_PRINT_FLAG\""
)
private
String
certificatePrintFlag
;
/**
* 联系人
*/
@TableField
(
value
=
"\"CONTACT_PERSON\""
)
private
String
contactPerson
;
/**
* 联系电话
*/
@TableField
(
value
=
"\"CONTACT_PHONE\""
)
private
String
contactPhone
;
/**
* 所有人
*/
@TableField
(
value
=
"\"OWNER\""
)
private
String
owner
;
/**
* 安装单位
*/
@TableField
(
value
=
"\"INSTALLATION_UNIT\""
)
private
String
installationUnit
;
/**
* 改装车是否打印备案通知单
* 原装车 忽略看
*/
@TableField
(
value
=
"\"IF_FLAG\""
)
private
String
ifFlag
;
/**
* 第一次打印证日期
*/
@TableField
(
value
=
"\"PRINT_DATE\""
)
private
Date
printDate
;
/**
* 充装介质
*/
@TableField
(
value
=
"\"MEDIA\""
)
private
String
media
;
/**
* 最新检验报告编号
*/
@TableField
(
value
=
"\"LAST_INSPECT_REPORT_NO\""
)
private
String
lastInspectReportNo
;
/**
* 气瓶状态
* 0正常 1变更 2报废 3注销 4启用 5停用 6注销
*/
@TableField
(
value
=
"\"STATE\""
)
private
Integer
state
;
/**
* 登记单位
*/
@TableField
(
value
=
"\"REG_UNIT\""
)
private
String
regUnit
;
/**
* 总容积
*/
@TableField
(
value
=
"\"TOTAL_VOLUME\""
)
private
String
totalVolume
;
/**
* 监检/检验单位
*/
@TableField
(
value
=
"\"INSPECTION_UNIT\""
)
private
String
inspectionUnit
;
/**
* 气瓶加装方式
*/
@TableField
(
value
=
"\"CYLINDER_INSTALLATION_METHOD\""
)
private
String
cylinderInstallationMethod
;
/**
* 住址
*/
@TableField
(
value
=
"\"ADDRESS\""
)
private
String
address
;
/**
* 上一次检验报告编号
*/
@TableField
(
value
=
"\"PREVIOUS_INSPECTION_REPORT_NUMBER\""
)
private
String
previousInspectionReportNumber
;
/**
* 是否认领
*/
@TableField
(
value
=
"\"CLAIMED_FLAG\""
)
private
String
claimedFlag
;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/ShCarEqu.java
0 → 100644
View file @
72f2c4dc
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
lombok.*
;
import
org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity
;
import
lombok.experimental.Accessors
;
import
java.util.Date
;
/**
* @author system_generator
* @date 2024-11-08
*/
@Data
@Accessors
(
chain
=
true
)
@TableName
(
"tzs_sh_car_equ"
)
@AllArgsConstructor
@NoArgsConstructor
@Builder
public
class
ShCarEqu
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* primary key
*/
@TableField
(
value
=
"\"SEQUENCE_NBR\""
)
private
String
sequenceNbr
;
/**
* tzs_sh_car表主键
*/
@TableField
(
value
=
"\"CAR_ID\""
)
private
String
carId
;
/**
* 设备编号
*/
@TableField
(
value
=
"\"SEQUENCE_CODE\""
)
private
String
sequenceCode
;
/**
* 设备代码
*/
@TableField
(
value
=
"\"EQU_CODE\""
)
private
String
equCode
;
/**
* 制造日期
*/
@TableField
(
value
=
"\"PRODUCE_DATE\""
)
private
Date
produceDate
;
/**
* 安装日期
*/
@TableField
(
value
=
"\"EQU_INSTALLDATE\""
)
private
Date
equInstalldate
;
/**
* 检查日期
*/
@TableField
(
value
=
"\"EQU_CHECKDATE\""
)
private
Date
equCheckdate
;
/**
* firstDate
*/
@TableField
(
value
=
"\"EQU_FIRSTDATE\""
)
private
Date
equFirstdate
;
/**
* 序号
*/
@TableField
(
value
=
"\"SERIAL_NUMBER\""
)
private
String
serialNumber
;
/**
* sub_DM 代码
*/
@TableField
(
value
=
"\"EQU_DM\""
)
private
String
equDm
;
/**
* 单位编号
*/
@TableField
(
value
=
"\"EQU_DWBH\""
)
private
String
equDwbh
;
/**
* 公称工作压力(MPa)
*/
@TableField
(
value
=
"\"EQU_QPGC\""
)
private
String
equQpgc
;
/**
* 气瓶批号
*/
@TableField
(
value
=
"\"BATCH_NUMBER\""
)
private
String
batchNumber
;
/**
* PFZZDW PF制造单位
*/
@TableField
(
value
=
"\"EQU_PFZZDW\""
)
private
String
equPfzzdw
;
/**
* isChange
*/
@TableField
(
value
=
"\"ISCHANGE\""
)
private
Integer
ischange
;
/**
* 报告编号
*/
@TableField
(
value
=
"\"REPORTCODE\""
)
private
String
reportcode
;
/**
* BFReportCode
*/
@TableField
(
value
=
"\"BFREPORTCODE\""
)
private
String
bfreportcode
;
/**
* 操作方式
*/
@TableField
(
value
=
"\"EQU_CZFS\""
)
private
String
equCzfs
;
/**
* 是否认领
*/
@TableField
(
value
=
"\"CLAIMED_FLAG\""
)
private
String
claimedFlag
;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/ShCarEquMapper.java
0 → 100644
View file @
72f2c4dc
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
mapper
;
import
com.yeejoin.amos.boot.module.jg.api.entity.ShCarEqu
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
/**
* Mapper 接口
*
* @author system_generator
* @date 2024-11-08
*/
public
interface
ShCarEquMapper
extends
BaseMapper
<
ShCarEqu
>
{
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/ShCarMapper.java
0 → 100644
View file @
72f2c4dc
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
mapper
;
import
com.yeejoin.amos.boot.module.jg.api.entity.ShCar
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
/**
* 三环系统-车辆信息表 Mapper 接口
*
* @author system_generator
* @date 2024-11-08
*/
public
interface
ShCarMapper
extends
BaseMapper
<
ShCar
>
{
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IShCarEquService.java
0 → 100644
View file @
72f2c4dc
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
service
;
/**
* 接口类
*
* @author system_generator
* @date 2024-11-08
*/
public
interface
IShCarEquService
{}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IShCarService.java
0 → 100644
View file @
72f2c4dc
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
service
;
/**
* 三环系统-车辆信息表接口类
*
* @author system_generator
* @date 2024-11-08
*/
public
interface
IShCarService
{}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/ShCarEquMapper.xml
0 → 100644
View file @
72f2c4dc
<?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">
<mapper
namespace=
"com.yeejoin.amos.boot.module.jg.api.mapper.ShCarEquMapper"
>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/ShCarMapper.xml
0 → 100644
View file @
72f2c4dc
<?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">
<mapper
namespace=
"com.yeejoin.amos.boot.module.jg.api.mapper.ShCarMapper"
>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/ShCarController.java
0 → 100644
View file @
72f2c4dc
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
controller
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.module.jg.api.entity.ShCar
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.ShCarServiceImpl
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
javax.servlet.http.HttpServletRequest
;
import
org.springframework.web.bind.annotation.*
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
java.util.List
;
/**
*
* @author system_generator
* @date 2024-11-08
*/
@RestController
@Api
(
tags
=
"Api"
)
@RequestMapping
(
value
=
"/sh-car"
)
public
class
ShCarController
extends
BaseController
{
@Autowired
ShCarServiceImpl
shCarServiceImpl
;
/**
* 新增
*
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
value
=
"/save"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增"
,
notes
=
"新增"
)
public
ResponseModel
<
ShCar
>
save
(
@RequestBody
ShCar
shCar
)
{
shCar
=
shCarServiceImpl
.
createWithModel
(
shCar
);
return
ResponseHelper
.
buildResponse
(
shCar
);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PutMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"根据sequenceNbr更新"
,
notes
=
"根据sequenceNbr更新"
)
public
ResponseModel
<
ShCar
>
updateBySequenceNbrShCar
(
@RequestBody
ShCar
entity
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
entity
.
setSequenceNbr
(
sequenceNbr
);
return
ResponseHelper
.
buildResponse
(
shCarServiceImpl
.
updateWithModel
(
entity
));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@DeleteMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"DELETE"
,
value
=
"根据sequenceNbr删除"
,
notes
=
"根据sequenceNbr删除"
)
public
ResponseModel
<
Boolean
>
deleteBySequenceNbr
(
HttpServletRequest
request
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
){
return
ResponseHelper
.
buildResponse
(
shCarServiceImpl
.
removeById
(
sequenceNbr
));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个"
,
notes
=
"根据sequenceNbr查询单个"
)
public
ResponseModel
<
ShCar
>
selectOne
(
@PathVariable
Long
sequenceNbr
)
{
return
ResponseHelper
.
buildResponse
(
shCarServiceImpl
.
queryBySeq
(
sequenceNbr
));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/page"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"分页查询"
,
notes
=
"分页查询"
)
public
ResponseModel
<
Page
<
ShCar
>>
queryForPage
(
@RequestParam
(
value
=
"current"
)
int
current
,
@RequestParam
(
value
=
"size"
)
int
size
)
{
Page
<
ShCar
>
page
=
new
Page
<
ShCar
>();
page
.
setCurrent
(
current
);
page
.
setSize
(
size
);
return
ResponseHelper
.
buildResponse
(
shCarServiceImpl
.
queryForShCarPage
(
page
));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"列表全部数据查询"
,
notes
=
"列表全部数据查询"
)
@GetMapping
(
value
=
"/list"
)
public
ResponseModel
<
List
<
ShCar
>>
selectForList
()
{
return
ResponseHelper
.
buildResponse
(
shCarServiceImpl
.
queryForShCarList
());
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/ShCarEquController.java
0 → 100644
View file @
72f2c4dc
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
controller
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.module.jg.api.entity.ShCarEqu
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.ShCarEquServiceImpl
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
javax.servlet.http.HttpServletRequest
;
import
org.springframework.web.bind.annotation.*
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
java.util.List
;
/**
*
* @author system_generator
* @date 2024-11-08
*/
@RestController
@Api
(
tags
=
"Api"
)
@RequestMapping
(
value
=
"/sh-car-equ"
)
public
class
ShCarEquController
extends
BaseController
{
@Autowired
ShCarEquServiceImpl
shCarEquServiceImpl
;
/**
* 新增
*
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
value
=
"/save"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增"
,
notes
=
"新增"
)
public
ResponseModel
<
ShCarEqu
>
save
(
@RequestBody
ShCarEqu
shCarEqu
)
{
shCarEqu
=
shCarEquServiceImpl
.
createWithModel
(
shCarEqu
);
return
ResponseHelper
.
buildResponse
(
shCarEqu
);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PutMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"根据sequenceNbr更新"
,
notes
=
"根据sequenceNbr更新"
)
public
ResponseModel
<
ShCarEqu
>
updateBySequenceNbrShCarEqu
(
@RequestBody
ShCarEqu
entity
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
entity
.
setSequenceNbr
(
sequenceNbr
);
return
ResponseHelper
.
buildResponse
(
shCarEquServiceImpl
.
updateWithModel
(
entity
));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@DeleteMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"DELETE"
,
value
=
"根据sequenceNbr删除"
,
notes
=
"根据sequenceNbr删除"
)
public
ResponseModel
<
Boolean
>
deleteBySequenceNbr
(
HttpServletRequest
request
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
){
return
ResponseHelper
.
buildResponse
(
shCarEquServiceImpl
.
removeById
(
sequenceNbr
));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个"
,
notes
=
"根据sequenceNbr查询单个"
)
public
ResponseModel
<
ShCarEqu
>
selectOne
(
@PathVariable
Long
sequenceNbr
)
{
return
ResponseHelper
.
buildResponse
(
shCarEquServiceImpl
.
queryBySeq
(
sequenceNbr
));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/page"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"分页查询"
,
notes
=
"分页查询"
)
public
ResponseModel
<
Page
<
ShCarEqu
>>
queryForPage
(
@RequestParam
(
value
=
"current"
)
int
current
,
@RequestParam
(
value
=
"size"
)
int
size
)
{
Page
<
ShCarEqu
>
page
=
new
Page
<
ShCarEqu
>();
page
.
setCurrent
(
current
);
page
.
setSize
(
size
);
return
ResponseHelper
.
buildResponse
(
shCarEquServiceImpl
.
queryForShCarEquPage
(
page
));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"列表全部数据查询"
,
notes
=
"列表全部数据查询"
)
@GetMapping
(
value
=
"/list"
)
public
ResponseModel
<
List
<
ShCarEqu
>>
selectForList
()
{
return
ResponseHelper
.
buildResponse
(
shCarEquServiceImpl
.
queryForShCarEquList
());
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/ShCarEquServiceImpl.java
0 → 100644
View file @
72f2c4dc
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
service
.
impl
;
import
com.yeejoin.amos.boot.module.jg.api.entity.ShCarEqu
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.ShCarEquMapper
;
import
com.yeejoin.amos.boot.module.jg.api.service.IShCarEquService
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.springframework.stereotype.Service
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
java.util.List
;
/**
* 服务实现类
*
* @author system_generator
* @date 2024-11-08
*/
@Service
public
class
ShCarEquServiceImpl
extends
BaseService
<
ShCarEqu
,
ShCarEqu
,
ShCarEquMapper
>
implements
IShCarEquService
{
/**
* 分页查询
*/
public
Page
<
ShCarEqu
>
queryForShCarEquPage
(
Page
<
ShCarEqu
>
page
)
{
return
this
.
queryForPage
(
page
,
null
,
false
);
}
/**
* 列表查询 示例
*/
public
List
<
ShCarEqu
>
queryForShCarEquList
()
{
return
this
.
queryForList
(
""
,
false
);
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/ShCarServiceImpl.java
0 → 100644
View file @
72f2c4dc
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
service
.
impl
;
import
com.yeejoin.amos.boot.module.jg.api.entity.ShCar
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.ShCarMapper
;
import
com.yeejoin.amos.boot.module.jg.api.service.IShCarService
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.springframework.stereotype.Service
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
java.util.List
;
/**
* 三环系统-车辆信息表服务实现类
*
* @author system_generator
* @date 2024-11-08
*/
@Service
public
class
ShCarServiceImpl
extends
BaseService
<
ShCar
,
ShCar
,
ShCarMapper
>
implements
IShCarService
{
/**
* 分页查询
*/
public
Page
<
ShCar
>
queryForShCarPage
(
Page
<
ShCar
>
page
)
{
return
this
.
queryForPage
(
page
,
null
,
false
);
}
/**
* 列表查询 示例
*/
public
List
<
ShCar
>
queryForShCarList
()
{
return
this
.
queryForList
(
""
,
false
);
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment