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
7fe2a693
Commit
7fe2a693
authored
Jun 07, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(cyl):接口修改,企业气瓶信息统计,单日刷入数据,若重复刷入则覆盖原先记录
parent
f2dec891
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
0 deletions
+16
-0
CylinderInfoServiceImpl.java
...ylinder/flc/biz/service/impl/CylinderInfoServiceImpl.java
+16
-0
No files found.
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderInfoServiceImpl.java
View file @
7fe2a693
...
@@ -10,6 +10,7 @@ import com.google.common.collect.Lists;
...
@@ -10,6 +10,7 @@ import com.google.common.collect.Lists;
import
com.yeejoin.amos.boot.biz.common.utils.DateUtils
;
import
com.yeejoin.amos.boot.biz.common.utils.DateUtils
;
import
com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingRecordStatisticsUnitDayDto
;
import
com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingRecordStatisticsUnitDayDto
;
import
com.yeejoin.amos.boot.module.cylinder.api.dto.WarningMsgDto
;
import
com.yeejoin.amos.boot.module.cylinder.api.dto.WarningMsgDto
;
import
com.yeejoin.amos.boot.module.cylinder.api.entity.CylinderFillingRecordStatisticsUnitDay
;
import
com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderInfoDto
;
import
com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderInfoDto
;
import
com.yeejoin.amos.boot.module.cylinder.api.entity.MsgLog
;
import
com.yeejoin.amos.boot.module.cylinder.api.entity.MsgLog
;
import
com.yeejoin.amos.boot.module.cylinder.api.enums.EarlyWarningLevelEnum
;
import
com.yeejoin.amos.boot.module.cylinder.api.enums.EarlyWarningLevelEnum
;
...
@@ -817,6 +818,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
...
@@ -817,6 +818,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
CompletableFuture
.
runAsync
(()
->
countByUnit
(
cylinderUnit
->
{
CompletableFuture
.
runAsync
(()
->
countByUnit
(
cylinderUnit
->
{
CylinderFillingRecordStatisticsUnitDayDto
unitDay
=
new
CylinderFillingRecordStatisticsUnitDayDto
();
CylinderFillingRecordStatisticsUnitDayDto
unitDay
=
new
CylinderFillingRecordStatisticsUnitDayDto
();
calcCylinderFillingCheckDataUnitDataWithDay
(
cylinderUnit
,
calendar
,
unitDay
);
calcCylinderFillingCheckDataUnitDataWithDay
(
cylinderUnit
,
calendar
,
unitDay
);
checkFillingRecordStatisticsUnitDay
(
unitDay
);
cylinderFillingRecordStatisticsUnitDayServiceImpl
.
createWithModel
(
unitDay
);
cylinderFillingRecordStatisticsUnitDayServiceImpl
.
createWithModel
(
unitDay
);
}));
}));
}
else
{
// 刷入指定企业数据
}
else
{
// 刷入指定企业数据
...
@@ -826,6 +828,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
...
@@ -826,6 +828,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
.
orElseThrow
(()
->
new
NoSuchElementException
(
"没有对应appid的企业"
));
.
orElseThrow
(()
->
new
NoSuchElementException
(
"没有对应appid的企业"
));
CylinderFillingRecordStatisticsUnitDayDto
unitDay
=
new
CylinderFillingRecordStatisticsUnitDayDto
();
CylinderFillingRecordStatisticsUnitDayDto
unitDay
=
new
CylinderFillingRecordStatisticsUnitDayDto
();
calcCylinderFillingCheckDataUnitDataWithDay
(
targetUnit
,
calendar
,
unitDay
);
calcCylinderFillingCheckDataUnitDataWithDay
(
targetUnit
,
calendar
,
unitDay
);
checkFillingRecordStatisticsUnitDay
(
unitDay
);
cylinderFillingRecordStatisticsUnitDayServiceImpl
.
createWithModel
(
unitDay
);
cylinderFillingRecordStatisticsUnitDayServiceImpl
.
createWithModel
(
unitDay
);
}
}
}
catch
(
ParseException
e
)
{
}
catch
(
ParseException
e
)
{
...
@@ -837,6 +840,19 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
...
@@ -837,6 +840,19 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
}
}
}
}
/**
* 检查CylinderFillingRecordStatisticsUnitDayDto是否已经存在数据,若存在,则删除该条记录
* 检查维度:appId + fillingDate
*/
public
void
checkFillingRecordStatisticsUnitDay
(
CylinderFillingRecordStatisticsUnitDayDto
unitDay
)
{
LambdaQueryWrapper
<
CylinderFillingRecordStatisticsUnitDay
>
queryWrapper
=
new
QueryWrapper
<
CylinderFillingRecordStatisticsUnitDay
>().
lambda
()
.
eq
(
CylinderFillingRecordStatisticsUnitDay:
:
getAppId
,
unitDay
.
getAppId
())
.
eq
(
CylinderFillingRecordStatisticsUnitDay:
:
getFillingDate
,
unitDay
.
getFillingDate
());
CylinderFillingRecordStatisticsUnitDay
one
=
cylinderFillingRecordStatisticsUnitDayServiceImpl
.
getOne
(
queryWrapper
);
if
(!
ValidationUtil
.
isEmpty
(
one
)){
cylinderFillingRecordStatisticsUnitDayServiceImpl
.
deleteBySeq
(
one
.
getSequenceNbr
());
}
}
@Override
@Override
public
void
fillingRecordDataSynHandler
()
{
public
void
fillingRecordDataSynHandler
()
{
...
...
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