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
575ab885
Commit
575ab885
authored
Mar 22, 2023
by
曹盼盼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加气瓶追溯详情图片接口
parent
3b0203cc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
97 additions
and
0 deletions
+97
-0
CylinderFileUrlDto.java
...join/amos/boot/module/tzs/api/dto/CylinderFileUrlDto.java
+39
-0
TzCylinderController.java
...t/module/tzs/flc/biz/controller/TzCylinderController.java
+12
-0
TzCylinderServiceImpl.java
...odule/tzs/flc/biz/service/impl/TzCylinderServiceImpl.java
+46
-0
No files found.
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/CylinderFileUrlDto.java
0 → 100644
View file @
575ab885
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
api
.
dto
;
import
lombok.Data
;
import
java.util.List
;
import
java.util.Map
;
/**
* @Author cpp
* @Description
* @Date 2023/3/21
*/
@Data
public
class
CylinderFileUrlDto
{
/**
*产品合格证
*/
private
List
<
Map
>
productQualified
;
/**
*质量证明书
*/
private
List
<
Map
>
proofQuality
;
/**
*监督检验证书
*/
private
List
<
Map
>
supervisionInspec
;
/**
*型式实验证书
*/
private
List
<
Map
>
typeExperiments
;
/**
* 气瓶钢印标识
* */
private
List
<
Map
>
gasCylinderStamp
;
}
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/TzCylinderController.java
View file @
575ab885
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
flc
.
biz
.
controller
;
import
com.yeejoin.amos.boot.module.tzs.api.dto.CylinderFileUrlDto
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.PageParam
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderInfoDto
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.dto.TzCylinderTraceDto
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.service.ITzCylinderService
;
import
com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.TzCylinderServiceImpl
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.Api
;
...
...
@@ -26,6 +28,8 @@ public class TzCylinderController {
@Autowired
ITzCylinderService
iTzCylinderService
;
@Autowired
TzCylinderServiceImpl
cylinderServiceImpl
;
/**
* 气瓶基本信息列表分页查询
...
...
@@ -51,4 +55,12 @@ public class TzCylinderController {
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@RequestMapping
(
value
=
"/getCylinderTraceDto/{sequenceNbr}"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询追溯详情"
,
notes
=
"根据sequenceNbr查询追溯详情"
)
public
ResponseModel
<
CylinderFileUrlDto
>
getCylinderTraceDto
(
@PathVariable
String
sequenceNbr
){
return
ResponseHelper
.
buildResponse
(
cylinderServiceImpl
.
getFileUrlAndName
(
sequenceNbr
));
}
}
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/TzCylinderServiceImpl.java
View file @
575ab885
...
...
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.entity.DataDictionary
;
import
com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl
;
import
com.yeejoin.amos.boot.module.tzs.api.dto.CylinderFileUrlDto
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.PageParam
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.dto.*
;
import
com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo
;
...
...
@@ -163,4 +164,49 @@ public class TzCylinderServiceImpl extends BaseService<TzCylinderInfoDto, Cylind
return
new
TzCylinderTraceDto
(
tzCylinderProduceDto
,
tzCylinderInfoDto
,
tzCylinderTagsDto
,
tzCylinderInspectionDtoList
,
tzCylinderFillingDtoList
);
}
public
CylinderFileUrlDto
getFileUrlAndName
(
String
sequenceNbr
){
String
orgCode
=
tzCylinderMapper
.
getSequencCode
(
sequenceNbr
);
TzCylinderProduceDto
tzCylinderProduceDto
=
tzCylinderMapper
.
getTzCylinderProduceDto
(
orgCode
);
TzCylinderTagsDto
tzCylinderTagsDto
=
tzCylinderMapper
.
getTzCylinderTagsDto
(
orgCode
);
CylinderFileUrlDto
dto
=
new
CylinderFileUrlDto
();
if
(!
ValidationUtil
.
isEmpty
(
tzCylinderProduceDto
.
getProductQualified
()))
{
String
productQualified
=
tzCylinderProduceDto
.
getProductQualified
();
List
<
Map
>
productQualifiedList
=
getMaps
(
productQualified
);
dto
.
setProductQualified
(
productQualifiedList
);
}
if
(!
ValidationUtil
.
isEmpty
(
tzCylinderProduceDto
.
getProofQuality
()))
{
String
proofQuality
=
tzCylinderProduceDto
.
getProofQuality
();
List
<
Map
>
proofQualityList
=
getMaps
(
proofQuality
);
dto
.
setProofQuality
(
proofQualityList
);
}
if
(!
ValidationUtil
.
isEmpty
(
tzCylinderProduceDto
.
getSupervisionInspec
()))
{
String
supervisionInspec
=
tzCylinderProduceDto
.
getSupervisionInspec
();
List
<
Map
>
supervisionInspecList
=
getMaps
(
supervisionInspec
);
dto
.
setSupervisionInspec
(
supervisionInspecList
);
}
if
(!
ValidationUtil
.
isEmpty
(
tzCylinderProduceDto
.
getTypeExperiments
()))
{
String
typeExperiments
=
tzCylinderProduceDto
.
getTypeExperiments
();
List
<
Map
>
typeExperimentsList
=
getMaps
(
typeExperiments
);
dto
.
setTypeExperiments
(
typeExperimentsList
);
}
if
(!
ValidationUtil
.
isEmpty
(
tzCylinderTagsDto
.
getGasCylinderStamp
()))
{
String
gasCylinderStamp
=
tzCylinderTagsDto
.
getGasCylinderStamp
();
List
<
Map
>
gasCylinderStampList
=
getMaps
(
gasCylinderStamp
);
dto
.
setGasCylinderStamp
(
gasCylinderStampList
);
}
return
dto
;
}
public
List
<
Map
>
getMaps
(
String
o
){
List
list
=
new
ArrayList
();
JSONObject
objects
=
JSONObject
.
parseObject
(
o
);
HashMap
<
String
,
String
>
map
=
new
HashMap
<>();
map
.
put
(
"url"
,
objects
.
getString
(
"fileUrl"
));
map
.
put
(
"name"
,
objects
.
getString
(
"fileName"
));
list
.
add
(
map
);
return
list
;
}
}
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