Commit 575ab885 authored by 曹盼盼's avatar 曹盼盼

增加气瓶追溯详情图片接口

parent 3b0203cc
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;
}
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));
}
}
......@@ -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;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment