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
03f69f85
Commit
03f69f85
authored
Jul 08, 2024
by
tianbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature(cylinder):气站卸液量对接接口
parent
bec6121e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
2 deletions
+37
-2
CylinderController.java
...ejoin/amos/api/openapi/controller/CylinderController.java
+12
-2
CylinderFillingDataValidationService.java
...pi/face/service/CylinderFillingDataValidationService.java
+25
-0
No files found.
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/CylinderController.java
View file @
03f69f85
...
...
@@ -5,7 +5,6 @@ import com.yeejoin.amos.api.common.restful.utils.ResponseModel;
import
com.yeejoin.amos.api.openapi.face.dto.CylinderFillingMessage
;
import
com.yeejoin.amos.api.openapi.face.model.*
;
import
com.yeejoin.amos.api.openapi.face.service.*
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.feign.privilege.Privilege
;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
io.swagger.annotations.Api
;
...
...
@@ -29,7 +28,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.stream.Collectors
;
@RestController
@RequestMapping
(
value
=
"/cylinder"
)
...
...
@@ -59,6 +57,9 @@ public class CylinderController {
@Autowired
private
EmqKeeper
emqKeeper
;
@Autowired
private
TmCylinderOffloadingService
cylinderOffloadingService
;
private
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
...
...
@@ -189,4 +190,13 @@ public class CylinderController {
return
ResponseHelper
.
buildResponse
(
cylinderFillingExamineService
.
createCylinderFillingExamine
(
fillingAuditData
));
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@ApiOperation
(
value
=
"气站卸液量记录数据"
)
@PostMapping
(
value
=
"/offloading"
)
@RestEventTrigger
(
value
=
"openapiLogEventHandler"
)
public
ResponseModel
<
String
>
createCylinderOffloading
(
@RequestBody
List
<
TmCylinderOffloadingModel
>
offloadingData
)
{
cylinderFillingDataValidationService
.
validateCylinderOffloadingData
(
offloadingData
);
return
ResponseHelper
.
buildResponse
(
cylinderOffloadingService
.
createCylinderOffloading
(
offloadingData
));
}
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/CylinderFillingDataValidationService.java
View file @
03f69f85
...
...
@@ -451,4 +451,29 @@ public class CylinderFillingDataValidationService {
}
return
null
;
}
/**
* 气站卸液量记录数据校验
*
* @param offloadingData 卸液量数据
*/
public
void
validateCylinderOffloadingData
(
List
<
TmCylinderOffloadingModel
>
offloadingData
)
{
JSONArray
jsonArray
=
JSONArray
.
fromObject
(
offloadingData
);
// 1.必填校验
List
<
String
>
errorRows
=
validateRequired
(
CylinderOffloadingFieldEnum
.
getAllRequireKeys
(),
jsonArray
);
if
(!
ObjectUtils
.
isEmpty
(
errorRows
))
{
throw
new
BadRequest
(
JSONArray
.
fromObject
(
errorRows
.
stream
().
map
(
e
->
"必填字段不能为空:"
+
e
).
collect
(
Collectors
.
toList
())).
toString
());
}
// 2.本次上传数据唯一性校验
errorRows
=
validateUnique
(
CylinderOffloadingFieldEnum
.
getAllUniqueKeys
(),
jsonArray
);
if
(!
ObjectUtils
.
isEmpty
(
errorRows
))
{
throw
new
BadRequest
(
JSONArray
.
fromObject
(
errorRows
.
stream
().
map
(
e
->
"上传数据重复:"
+
e
).
collect
(
Collectors
.
toList
())).
toString
());
}
// // 3.检查企业统一社会信用代码是否存在
// Set<String> creditCodes = getAllData(FillingBeforeFieldEnum.creditCode.name(), jsonArray);
// errorRows = getNotExistEnterpriseInfoByCreditCode(creditCodes);
// if (!ObjectUtils.isEmpty(errorRows)) {
// throw new BadRequest(JSONArray.fromObject(errorRows.stream().map(e -> "企业统一社会信用代码不存在:" + e).collect(Collectors.toList())).toString());
// }
}
}
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