Commit 0e18e892 authored by suhuiguang's avatar suhuiguang

1.压力管道按照装置报检,对接报检信息暂不发送

parent db3f61e7
...@@ -10,7 +10,7 @@ import org.springframework.context.ApplicationEvent; ...@@ -10,7 +10,7 @@ import org.springframework.context.ApplicationEvent;
@Getter @Getter
public class InspectionApplicationPushEvent extends ApplicationEvent { public class InspectionApplicationPushEvent extends ApplicationEvent {
private JyjcInspectionApplicationModel jyjcInspectionApplicationModel; private final JyjcInspectionApplicationModel jyjcInspectionApplicationModel;
/** /**
* Create a new {@code ApplicationEvent}. * Create a new {@code ApplicationEvent}.
......
...@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicat ...@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicat
import com.yeejoin.amos.boot.module.jyjc.biz.util.JsonUtils; import com.yeejoin.amos.boot.module.jyjc.biz.util.JsonUtils;
import com.yeejoin.amos.boot.module.jyjc.biz.util.JyjcConstant; import com.yeejoin.amos.boot.module.jyjc.biz.util.JyjcConstant;
import com.yeejoin.amos.boot.module.ymt.api.entity.*; import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.*; import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -142,8 +143,8 @@ public class InspectionApplicationPushEventListener implements ApplicationListen ...@@ -142,8 +143,8 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
@PostConstruct @PostConstruct
public void init() { public void init() {
companyCodeRegNameMap = JsonUtils.getResourceJson(regNameJson);
ExecutorService executorService = Executors.newFixedThreadPool(threadNum); ExecutorService executorService = Executors.newFixedThreadPool(threadNum);
companyCodeRegNameMap = JsonUtils.getResourceJson(regNameJson);
// 可处理的检验检测类型,目前只处理检验的,不处理检测业务 // 可处理的检验检测类型,目前只处理检验的,不处理检测业务
List<String> canDealInspectionTypes = getCanDealInspectionType(); List<String> canDealInspectionTypes = getCanDealInspectionType();
for (int i = 0; i < threadNum; i++) { for (int i = 0; i < threadNum; i++) {
...@@ -154,6 +155,10 @@ public class InspectionApplicationPushEventListener implements ApplicationListen ...@@ -154,6 +155,10 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
if (!canDealInspectionTypes.contains(applicationModel.getInspectionType())) { if (!canDealInspectionTypes.contains(applicationModel.getInspectionType())) {
return; return;
} }
if(applicationModel.getEquipClassify().equals(EquipmentClassifityEnum.YLGD.getCode())){
log.info("压力管道暂不处理");
return;
}
//构建数据 //构建数据
JyjcInspectionApplicationPushLog pushLog = this.createPushData(applicationModel); JyjcInspectionApplicationPushLog pushLog = this.createPushData(applicationModel);
// 发送数据 // 发送数据
......
...@@ -820,7 +820,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -820,7 +820,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
} }
inspectionResultService.saveOrUpdateBatch(resultModels); inspectionResultService.saveOrUpdateBatch(resultModels);
// 报检信息推送 TODO // 报检信息推送 TODO
// this.pushInspectionApplication(model); this.pushInspectionApplication(model);
this.saveBatchResume(jgResumeInfoDtoList); this.saveBatchResume(jgResumeInfoDtoList);
this.createHisAfterReceive(model); this.createHisAfterReceive(model);
// 更新流程中的流程数据 // 更新流程中的流程数据
......
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