Commit b3669623 authored by suhuiguang's avatar suhuiguang

1.报检信息推送时增加字段traceId 便于排查问题

parent 56a2fa77
...@@ -57,5 +57,7 @@ public class InspectionApplicationPushData implements Serializable { ...@@ -57,5 +57,7 @@ public class InspectionApplicationPushData implements Serializable {
private List<InspectionEquipData> inspectionEquips; private List<InspectionEquipData> inspectionEquips;
private String traceId;
} }
...@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; ...@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity; import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationEquip; import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationEquip;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationPushLog; import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationPushLog;
...@@ -90,6 +91,9 @@ public class InspectionApplicationPushEventListener implements ApplicationListen ...@@ -90,6 +91,9 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
@Autowired @Autowired
KafkaProducer kafkaProducer; KafkaProducer kafkaProducer;
@Autowired
Sequence sequence;
/** /**
* 报检推送主题, 第一位为接收单位标识 * 报检推送主题, 第一位为接收单位标识
*/ */
...@@ -131,24 +135,27 @@ public class InspectionApplicationPushEventListener implements ApplicationListen ...@@ -131,24 +135,27 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
} }
private JyjcInspectionApplicationPushLog createPushData(JyjcInspectionApplicationModel applicationModel) { private JyjcInspectionApplicationPushLog createPushData(JyjcInspectionApplicationModel applicationModel) {
long id = sequence.nextId();
JyjcInspectionApplicationPushLog pushLog = new JyjcInspectionApplicationPushLog(); JyjcInspectionApplicationPushLog pushLog = new JyjcInspectionApplicationPushLog();
pushLog.setInspectionUnitCode(applicationModel.getInspectionUnitCode()); pushLog.setInspectionUnitCode(applicationModel.getInspectionUnitCode());
pushLog.setApplicationSeq(applicationModel.getSequenceNbr()); pushLog.setApplicationSeq(applicationModel.getSequenceNbr());
// 初始状态 // 初始状态
pushLog.setSequenceNbr(id);
pushLog.setPushStatus("1"); pushLog.setPushStatus("1");
pushLog.setPushData(this.buildData(applicationModel)); pushLog.setPushData(this.buildData(id, applicationModel));
pushLog.setRecDate(new Date()); pushLog.setRecDate(new Date());
pushLogService.save(pushLog); pushLogService.save(pushLog);
return pushLog; return pushLog;
} }
private String buildData(JyjcInspectionApplicationModel applicationModel) { private String buildData(long traceId, JyjcInspectionApplicationModel applicationModel) {
InspectionApplicationPushData pushData = new InspectionApplicationPushData(); InspectionApplicationPushData pushData = new InspectionApplicationPushData();
BeanUtil.copyProperties(applicationModel, pushData); BeanUtil.copyProperties(applicationModel, pushData);
// 监管机构 // 监管机构
pushData.setSuperviseOrgName(this.getSuperviseNameByCode(applicationModel.getApplicationUnitCode())); pushData.setSuperviseOrgName(this.getSuperviseNameByCode(applicationModel.getApplicationUnitCode()));
// 报检的设备信息 // 报检的设备信息
pushData.setInspectionEquips(this.buildInspectionEquipInfo(applicationModel.getSequenceNbr())); pushData.setInspectionEquips(this.buildInspectionEquipInfo(applicationModel.getSequenceNbr()));
pushData.setTraceId(traceId + "");
return JSONObject.toJSONString(pushData); return JSONObject.toJSONString(pushData);
} }
......
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