Skip to content

A
amos-boot-biz
Commit 1692c4c2 authored by 韩桐桐's avatar 韩桐桐
Browse files
Options

fix(openapi):气瓶充装对接接口

parent 40911c25
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 26 deletions
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipRegistrationInfoMapper.java
View file @ 1692c4c2
......@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
......@@ -31,4 +32,47 @@ public interface MidEquipRegistrationInfoMapper extends BaseMapper<MidEquipRegis
"</foreach>" +
"</script>")
List<String> getUsedCountBySeqCodes(@Param("sequenceCodes") Set<String> sequenceCodes);
@DS("tzs")
@Select("<script>" +
"SELECT DISTINCT" +
" sequenceCode," +
" record," +
" unitName," +
" factoryNum," +
" cylinderVariety," +
" cylinderVarietyName," +
" unitInnerCode," +
" informationManageCode," +
" appId," +
" creditCode," +
" regionCode " +
"FROM" +
" (" +
" SELECT" +
" CONCAT ( fi.\"PRODUCE_UNIT_CREDIT_CODE\", '-', fi.\"FACTORY_NUM\" ) AS sequenceCode," +
" fi.\"RECORD\" AS record," +
" ui.\"ESTATE_UNIT_NAME\" AS unitName," +
" fi.\"FACTORY_NUM\" AS factoryNum," +
" ri.\"EQU_DEFINE\" AS cylinderVariety," +
" ( SELECT NAME FROM tz_equipment_category WHERE code = ri.\"EQU_DEFINE\" ) AS cylinderVarietyName," +
" ui.\"USE_INNER_CODE\" AS unitInnerCode," +
" oi.\"INFORMATION_MANAGE_CODE\" AS informationManageCode," +
" ( SELECT app_id FROM tz_base_enterprise_info WHERE use_code = ( SELECT \"USE_UNIT_CREDIT_CODE\" FROM idx_biz_jg_use_info WHERE \"RECORD\" = fi.\"RECORD\" ) ) AS appId," +
" ui.\"USE_UNIT_CREDIT_CODE\" AS creditCode," +
" ( SELECT ui.\"PROVINCE\" || '#' || ui.\"CITY\" || '#' || ui.\"COUNTY\" ) AS regionCode " +
" FROM" +
" idx_biz_jg_factory_info fi" +
" JOIN idx_biz_jg_other_info oi ON oi.\"RECORD\" = fi.\"RECORD\"" +
" JOIN idx_biz_jg_use_info ui ON ui.\"RECORD\" = fi.\"RECORD\"" +
" JOIN idx_biz_jg_register_info ri ON ri.\"RECORD\" = fi.\"RECORD\" " +
" WHERE" +
" oi.\"CLAIM_STATUS\" = '已认领' " +
" AND fi.\"PRODUCE_UNIT_CREDIT_CODE\" IS NOT NULL " +
" AND fi.\"FACTORY_NUM\" IS NOT NULL " +
" ) subquery " +
"WHERE sequenceCode = #{sequenceCode} " +
"LIMIT 1" +
"</script>")
Map<String, Object> getCylUseInfoBySeqCode(@Param("sequenceCode") String sequenceCode);
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/SyncCylinderDataService.java
View file @ 1692c4c2
......@@ -6,7 +6,9 @@ import com.google.common.collect.Lists;
import com.yeejoin.amos.api.openapi.face.model.*;
import com.yeejoin.amos.api.openapi.face.orm.dao.ESCylinderFillingRecordRepository;
import com.yeejoin.amos.api.openapi.face.orm.dao.ESCylinderInfoRepository;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipRegistrationInfoMapper;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderFillingRecordDto;
import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderInfoDto;
import com.yeejoin.amos.boot.module.cylinder.api.enums.CylDictEnum;
......@@ -26,8 +28,8 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@Slf4j
@Component
......@@ -84,6 +86,12 @@ public class SyncCylinderDataService {
@Autowired
CylinderOffloadingMapper cylinderOffloadingMapper;
@Autowired
MidEquipRegistrationInfoMapper registrationInfoMapper;
@Autowired
private SnowflakeIdUtil sequence;
@Value("${cylinder.filling.insert.topic:cylinder/filling/insert/topic}")
private String insertTopic;
......@@ -173,37 +181,71 @@ public class SyncCylinderDataService {
@DS("tzs")
public void createCylinderFillingRecord(List<ESCylinderFillingRecordDto> cylinderFillingRecord) {
if (!ObjectUtils.isEmpty(cylinderFillingRecord)) {
List<String> appIds = cylinderFillingRecord.stream().map(ESCylinderFillingRecordDto::getAppId).collect(Collectors.toList());
List<String> sequenceCodeS = cylinderFillingRecord.stream().map(ESCylinderFillingRecordDto::getSequenceCode).collect(Collectors.toList());
List<ESCylinderFillingRecordDto> cylinderFillingRecordInfo = cylinderFillingRecordMapper.getCylinderFillingRecordInfo(appIds, sequenceCodeS);
cylinderFillingRecord.stream().map(item -> {
List<ESCylinderFillingRecordDto> collect = cylinderFillingRecordInfo.stream().filter(e -> item.getAppIdAndSequenceCode().equals(e.getAppIdAndSequenceCode())).collect(Collectors.toList());
if (!ObjectUtils.isEmpty(collect)) {
item.setSequenceNbr(collect.get(0).getSequenceNbr());
item.setUnitName(collect.get(0).getUnitName());
item.setFactoryNum(collect.get(0).getFactoryNum());
item.setCylinderVariety(collect.get(0).getCylinderVariety());
item.setCylinderVarietyName(collect.get(0).getCylinderVarietyName());
item.setUnitInnerCode(collect.get(0).getUnitInnerCode());
item.setSequenceCode(collect.get(0).getSequenceCode());
item.setQrCode(collect.get(0).getQrCode());
item.setElectronicLabelCode(collect.get(0).getElectronicLabelCode());
item.setAppId(collect.get(0).getAppId());
item.setCreditCode(collect.get(0).getCreditCode());
item.setRegionCode(collect.get(0).getRegionCode());
try {
item.setInspectionDateMs(ObjectUtils.isEmpty(item.getFillingStartTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingStartTime()).getTime());
item.setInspectionDateAfterMS(ObjectUtils.isEmpty(item.getFillingEndTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingEndTime()).getTime());
} catch (ParseException e) {
throw new RuntimeException(e);
}
// List<String> appIds = cylinderFillingRecord.stream().map(ESCylinderFillingRecordDto::getAppId).collect(Collectors.toList());
// List<String> sequenceCodeS = cylinderFillingRecord.stream().map(ESCylinderFillingRecordDto::getSequenceCode).collect(Collectors.toList());
// List<ESCylinderFillingRecordDto> cylinderFillingRecordInfo = cylinderFillingRecordMapper.getCylinderFillingRecordInfo(appIds, sequenceCodeS);
// cylinderFillingRecord.stream().map(item -> {
// List<ESCylinderFillingRecordDto> collect = cylinderFillingRecordInfo.stream().filter(e -> item.getAppIdAndSequenceCode().equals(e.getAppIdAndSequenceCode())).collect(Collectors.toList());
// if (!ObjectUtils.isEmpty(collect)) {
// item.setSequenceNbr(collect.get(0).getSequenceNbr());
// item.setUnitName(collect.get(0).getUnitName());
// item.setFactoryNum(collect.get(0).getFactoryNum());
// item.setCylinderVariety(collect.get(0).getCylinderVariety());
// item.setCylinderVarietyName(collect.get(0).getCylinderVarietyName());
// item.setUnitInnerCode(collect.get(0).getUnitInnerCode());
// item.setSequenceCode(collect.get(0).getSequenceCode());
// item.setQrCode(collect.get(0).getQrCode());
// item.setElectronicLabelCode(collect.get(0).getElectronicLabelCode());
// item.setAppId(collect.get(0).getAppId());
// item.setCreditCode(collect.get(0).getCreditCode());
// item.setRegionCode(collect.get(0).getRegionCode());
// try {
// item.setInspectionDateMs(ObjectUtils.isEmpty(item.getFillingStartTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingStartTime()).getTime());
// item.setInspectionDateAfterMS(ObjectUtils.isEmpty(item.getFillingEndTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingEndTime()).getTime());
// } catch (ParseException e) {
// throw new RuntimeException(e);
// }
// }
// return item;
// });
cylinderFillingRecord.forEach(item -> {
String sequenceCode = item.getSequenceCode();
System.out.println("Processing sequenceCode: " + sequenceCode);
Map<String, Object> cylUseInfo = registrationInfoMapper.getCylUseInfoBySeqCode(sequenceCode);
if (ObjectUtils.isEmpty(cylUseInfo)) {
return;
}
item.setSequenceNbr(sequence.nextId());
item.setUnitName((String) cylUseInfo.get("unitName"));
item.setFactoryNum((String) cylUseInfo.get("factoryNum"));
item.setCylinderVariety(Integer.valueOf((String) cylUseInfo.get("cylinderVariety")));
item.setCylinderVarietyName((String) cylUseInfo.get("cylinderVarietyName"));
item.setUnitInnerCode((String) cylUseInfo.get("unitInnerCode"));
item.setSequenceCode((String) cylUseInfo.get("sequenceCode"));
item.setQrCode((String) cylUseInfo.get("informationManageCode"));
item.setElectronicLabelCode((String) cylUseInfo.get("informationManageCode"));
item.setAppId((String) cylUseInfo.get("appId"));
item.setCreditCode((String) cylUseInfo.get("creditCode"));
item.setRegionCode((String) cylUseInfo.get("regionCode"));
try {
item.setInspectionDateMs(parseDateOrDefault(item.getFillingStartTime()));
item.setInspectionDateAfterMS(parseDateOrDefault(item.getFillingEndTime()));
} catch (ParseException e) {
item.setInspectionDateMs(0L);
item.setInspectionDateAfterMS(0L);
}
return item;
});
saveCylinderFillingRecord2ES(cylinderFillingRecord);
}
}
private long parseDateOrDefault(String date) throws ParseException {
return ObjectUtils.isEmpty(date) ? 0L : DateUtils.dateParseWithPattern(date).getTime();
}
public void saveCylinderFillingRecord2ES(List<ESCylinderFillingRecordDto> records) {
List<String> ids = new ArrayList<>();
for (ESCylinderFillingRecordDto record : records) {
......
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