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
65bb2e14
Commit
65bb2e14
authored
Nov 26, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(openapi):西安数据导入问题修改
parent
1f22da08
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
XiAnDataDockServiceImpl.java
...oin/amos/api/openapi/service/XiAnDataDockServiceImpl.java
+5
-4
No files found.
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java
View file @
65bb2e14
...
@@ -77,6 +77,7 @@ public class XiAnDataDockServiceImpl {
...
@@ -77,6 +77,7 @@ public class XiAnDataDockServiceImpl {
* @param equipInfoExcelDtos
* @param equipInfoExcelDtos
*/
*/
public
void
batchSaveEquipmentData
(
List
<
XiAnEquipInfoExcelDto
>
equipInfoExcelDtos
)
{
public
void
batchSaveEquipmentData
(
List
<
XiAnEquipInfoExcelDto
>
equipInfoExcelDtos
)
{
log
.
info
(
"解析成功,准备上传数据,条数:{}"
,
equipInfoExcelDtos
.
size
());
int
batchSize
=
1000
;
int
batchSize
=
1000
;
int
totalSize
=
equipInfoExcelDtos
.
size
();
int
totalSize
=
equipInfoExcelDtos
.
size
();
// 主线程中获取登录信息传递到异步线程中
// 主线程中获取登录信息传递到异步线程中
...
@@ -183,7 +184,7 @@ public class XiAnDataDockServiceImpl {
...
@@ -183,7 +184,7 @@ public class XiAnDataDockServiceImpl {
ReadRowHolder
readRowHolder
=
context
.
readRowHolder
();
ReadRowHolder
readRowHolder
=
context
.
readRowHolder
();
int
rowIndex
=
readRowHolder
.
getRowIndex
()
+
1
;
int
rowIndex
=
readRowHolder
.
getRowIndex
()
+
1
;
StringBuilder
rowError
=
new
StringBuilder
();
StringBuilder
rowError
=
new
StringBuilder
();
log
.
info
(
"开始解析数据,第{}条数据"
,
rowIndex
);
// 是否起重机械
// 是否起重机械
boolean
isQZJX
=
!
ValidationUtil
.
isEmpty
(
data
.
getEquList
())
&&
"4000"
.
equals
(
data
.
getEquList
());
boolean
isQZJX
=
!
ValidationUtil
.
isEmpty
(
data
.
getEquList
())
&&
"4000"
.
equals
(
data
.
getEquList
());
// 是否场内机动车辆
// 是否场内机动车辆
...
@@ -371,7 +372,7 @@ public class XiAnDataDockServiceImpl {
...
@@ -371,7 +372,7 @@ public class XiAnDataDockServiceImpl {
Optional
.
ofNullable
(
data
.
getAppraisalDate
()).
ifPresent
(
v
->
checkDateFormatCorrect
(
v
,
"设计文件鉴定日期格式不正确;"
,
rowError
));
Optional
.
ofNullable
(
data
.
getAppraisalDate
()).
ifPresent
(
v
->
checkDateFormatCorrect
(
v
,
"设计文件鉴定日期格式不正确;"
,
rowError
));
// 制造信息
// 制造信息
//checkNotBlank(data.getProduceUnitCreditCode(), "制造单位统一社会信用代码不能为空;", rowError);
//checkNotBlank(data.getProduceUnitCreditCode(), "制造单位统一社会信用代码不能为空;", rowError);
Optional
.
ofNullable
(
data
.
getProduceUnitCreditCode
()).
ifPresent
(
v
->
checkCreditCode
(
v
,
"制造单位统一社会信用代码格式不正确;"
,
rowError
));
//
Optional.ofNullable(data.getProduceUnitCreditCode()).ifPresent(v -> checkCreditCode(v, "制造单位统一社会信用代码格式不正确;", rowError));
//checkNotBlank(data.getProduceUnitName(), "制造单位名称不能为空;", rowError);
//checkNotBlank(data.getProduceUnitName(), "制造单位名称不能为空;", rowError);
//checkNotBlank(data.getProduceLicenseNum(), "制造许可编号不能为空;", rowError);
//checkNotBlank(data.getProduceLicenseNum(), "制造许可编号不能为空;", rowError);
//checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空;", rowError);
//checkNotBlank(data.getFactoryNum(), "出厂编号/产品编码不能为空;", rowError);
...
@@ -491,10 +492,10 @@ public class XiAnDataDockServiceImpl {
...
@@ -491,10 +492,10 @@ public class XiAnDataDockServiceImpl {
*/
*/
private
void
YLGDTechnicalParamsCheck
(
XiAnEquipInfoExcelDto
data
,
StringBuilder
rowError
)
{
private
void
YLGDTechnicalParamsCheck
(
XiAnEquipInfoExcelDto
data
,
StringBuilder
rowError
)
{
//checkNotBlank(data.getWallThickness_YLGD(), "公称壁厚不能为空;", rowError);
//checkNotBlank(data.getWallThickness_YLGD(), "公称壁厚不能为空;", rowError);
checkNotBlank
(
data
.
getNominalDiameter
(),
"公称直径不能为空;"
,
rowError
);
//
checkNotBlank(data.getNominalDiameter(), "公称直径不能为空;", rowError);
checkNotBlank
(
data
.
getPipeLength
(),
"管道长度不能为空;"
,
rowError
);
checkNotBlank
(
data
.
getPipeLength
(),
"管道长度不能为空;"
,
rowError
);
checkNotBlank
(
data
.
getPressure
(),
"压力不能为空;"
,
rowError
);
checkNotBlank
(
data
.
getPressure
(),
"压力不能为空;"
,
rowError
);
checkNotBlank
(
data
.
getMedium_YLGD
(),
"介质不能为空;"
,
rowError
);
//
checkNotBlank(data.getMedium_YLGD(), "介质不能为空;", rowError);
//checkNotBlank(data.getTemperature_YLGD(), "温度不能为空;", rowError);
//checkNotBlank(data.getTemperature_YLGD(), "温度不能为空;", rowError);
//checkNotBlank(data.getPipelineNumber(), "管道编号不能为空;", rowError);
//checkNotBlank(data.getPipelineNumber(), "管道编号不能为空;", rowError);
//checkNotBlank(data.getDeviceLevel_YLGD(), "管道级别不能为空;", rowError);
//checkNotBlank(data.getDeviceLevel_YLGD(), "管道级别不能为空;", rowError);
...
...
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