sunhao
/
XG_Project_HD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

自动化学成分检测及低倍检测

Browse Source
main
BKGY_MYT 3 weeks ago
parent 0e58742f58
commit b3af6de67a
3 changed files with 395 additions and 131 deletions
Show Stats Download Patch File Download Diff File

218
XG_Project1/src/main/java/com/xisc/pm/api/controller/v1/SubController.java
Unescape Escape View File

@ -200,117 +200,119 @@ public class SubController {
@ApiOperation("数据处理") @ApiOperation("数据处理")
@PostMapping("/SubData1") @PostMapping("/SubData1")
@Permission(level = ResourceLevel.ORGANIZATION) @Permission(level = ResourceLevel.ORGANIZATION)
public JsonData SubData1( PmSubHis dtoListpr, @PathVariable Long organizationId) { public JsonData SubData1(@RequestBody PmSubHis pmSubHis, @PathVariable Long organizationId) {
SecurityTokenHelper.validTokenIgnoreInsert(dtoListpr); SecurityTokenHelper.validTokenIgnoreInsert(pmSubHis);
String strSlab = dtoListpr.getSlabNo(); String strSlab = pmSubHis
.getSlabNo();
SubParams subParams = new SubParams(); SubParams subParams = new SubParams();
subParams.setSlabNo(strSlab); subParams.setSlabNo(strSlab);
subService.autoChkChmAndLowApi(organizationId,subParams);
//获取所有数据 //获取所有数据
GetDataInfo(subParams); // GetDataInfo(subParams);
plistChmChkRsult=new ArrayList<>(); // plistChmChkRsult=new ArrayList<>();
plistLowChkRsult=new ArrayList<>(); // plistLowChkRsult=new ArrayList<>();
plistSlab.forEach(p -> { // plistSlab.forEach(p -> {
//
try { // try {
List<List<QdMatchParamDTO>> listOfDtoLists = new ArrayList<>(); // List<List<QdMatchParamDTO>> listOfDtoLists = new ArrayList<>();
List<QdMatchParamDTO> dtoListChm = new ArrayList<QdMatchParamDTO>(); // List<QdMatchParamDTO> dtoListChm = new ArrayList<QdMatchParamDTO>();
for (PmProCont gpo : plistOrder) { // for (PmProCont gpo : plistOrder) {
//
if (gpo.getOrderNo() == null || gpo.getOrderNo().equals("")) { // if (gpo.getOrderNo() == null || gpo.getOrderNo().equals("")) {
//
} // }
//验证过不需要再验证 // //验证过不需要再验证
if (plistChmChkRsult.stream().anyMatch(dto -> dto.getOrderNo().equals(gpo.getOrderNo()) && dto.getPono().equals(p.getPono()))){ // if (plistChmChkRsult.stream().anyMatch(dto -> dto.getOrderNo().equals(gpo.getOrderNo()) && dto.getPono().equals(p.getPono()))){
continue; // continue;
} // }
QdMatchParamDTO phyFurnaceChemicalMatchDTO = new QdMatchParamDTO(); // QdMatchParamDTO phyFurnaceChemicalMatchDTO = new QdMatchParamDTO();
phyFurnaceChemicalMatchDTO.setOrderNo(gpo.getOrderNo()); // phyFurnaceChemicalMatchDTO.setOrderNo(gpo.getOrderNo());
phyFurnaceChemicalMatchDTO.setPono(p.getPono()); // phyFurnaceChemicalMatchDTO.setPono(p.getPono());
dtoListChm.add(phyFurnaceChemicalMatchDTO); // dtoListChm.add(phyFurnaceChemicalMatchDTO);
if (dtoListChm.size() == 500) { // if (dtoListChm.size() == 500) {
listOfDtoLists.add(new ArrayList<>(dtoListChm)); // listOfDtoLists.add(new ArrayList<>(dtoListChm));
dtoListChm.clear(); // dtoListChm.clear();
} // }
} // }
//
// 如果 dtoListChm 中还有剩余的元素，将其添加到 listOfDtoLists 中 // // 如果 dtoListChm 中还有剩余的元素，将其添加到 listOfDtoLists 中
if (!dtoListChm.isEmpty()) { // if (!dtoListChm.isEmpty()) {
listOfDtoLists.add(new ArrayList<>(dtoListChm)); // listOfDtoLists.add(new ArrayList<>(dtoListChm));
} // }
//
listOfDtoLists.forEach(dtoList -> { // listOfDtoLists.forEach(dtoList -> {
//
List<QdMatchParamDTO> reslutChm = qdOrderClient.phyFurnaceChemicalMatchApi(organizationId, // List<QdMatchParamDTO> reslutChm = qdOrderClient.phyFurnaceChemicalMatchApi(organizationId,
dtoList); // dtoList);
if (reslutChm != null && !reslutChm.isEmpty()) { // if (reslutChm != null && !reslutChm.isEmpty()) {
if (reslutChm != null && !reslutChm.isEmpty()) { // if (reslutChm != null && !reslutChm.isEmpty()) {
for (QdMatchParamDTO qdMatchParamDTO : reslutChm) { // for (QdMatchParamDTO qdMatchParamDTO : reslutChm) {
if (!plistChmChkRsult.stream().anyMatch(m -> m.getPono().equals(p.getPono()) && m.getOrderNo().equals(qdMatchParamDTO.getOrderNo()))) { // if (!plistChmChkRsult.stream().anyMatch(m -> m.getPono().equals(p.getPono()) && m.getOrderNo().equals(qdMatchParamDTO.getOrderNo()))) {
ChkChmResult CR = new ChkChmResult(); // ChkChmResult CR = new ChkChmResult();
CR.setPono(p.getPono()); // CR.setPono(p.getPono());
CR.setOrderNo(qdMatchParamDTO.getOrderNo()); // CR.setOrderNo(qdMatchParamDTO.getOrderNo());
CR.setChmresult(qdMatchParamDTO.getResult()); // CR.setChmresult(qdMatchParamDTO.getResult());
plistChmChkRsult.add(CR); // plistChmChkRsult.add(CR);
} // }
} // }
} // }
} // }
//
}); // });
//
} catch (Exception e) { // } catch (Exception e) {
logger.info("错误信息："+e); // logger.info("错误信息："+e);
} // }
//
try { // try {
List<List<QdSurplusLowMagnificationDTO>> listOfDtoLists = new ArrayList<>(); // List<List<QdSurplusLowMagnificationDTO>> listOfDtoLists = new ArrayList<>();
List<QdSurplusLowMagnificationDTO> dtoListLow = new ArrayList<QdSurplusLowMagnificationDTO>(); // List<QdSurplusLowMagnificationDTO> dtoListLow = new ArrayList<QdSurplusLowMagnificationDTO>();
for (PmProCont gpo : plistOrder) { // for (PmProCont gpo : plistOrder) {
if (gpo.getOrderNo() == null || gpo.getOrderNo().equals("")) { // if (gpo.getOrderNo() == null || gpo.getOrderNo().equals("")) {
continue; // continue;
} // }
//验证过不需要再验证 // //验证过不需要再验证
if (plistLowChkRsult.stream().anyMatch(dto -> dto.getOrderNo().equals(gpo.getOrderNo()) && dto.getPono().equals(p.getPono()))){ // if (plistLowChkRsult.stream().anyMatch(dto -> dto.getOrderNo().equals(gpo.getOrderNo()) && dto.getPono().equals(p.getPono()))){
continue; // continue;
} // }
QdSurplusLowMagnificationDTO phyFurnaceChemicalMatchDTO = new QdSurplusLowMagnificationDTO(); // QdSurplusLowMagnificationDTO phyFurnaceChemicalMatchDTO = new QdSurplusLowMagnificationDTO();
phyFurnaceChemicalMatchDTO.setOrderNo(gpo.getOrderNo()); // phyFurnaceChemicalMatchDTO.setOrderNo(gpo.getOrderNo());
phyFurnaceChemicalMatchDTO.setPono(p.getPono()); // phyFurnaceChemicalMatchDTO.setPono(p.getPono());
dtoListLow.add(phyFurnaceChemicalMatchDTO); // dtoListLow.add(phyFurnaceChemicalMatchDTO);
if (dtoListLow.size() == 500) { // if (dtoListLow.size() == 500) {
listOfDtoLists.add(new ArrayList<>(dtoListLow)); // listOfDtoLists.add(new ArrayList<>(dtoListLow));
dtoListLow.clear(); // dtoListLow.clear();
} // }
} // }
// 如果 dtoListChm 中还有剩余的元素，将其添加到 listOfDtoLists 中 // // 如果 dtoListChm 中还有剩余的元素，将其添加到 listOfDtoLists 中
if (!dtoListLow.isEmpty()) { // if (!dtoListLow.isEmpty()) {
listOfDtoLists.add(new ArrayList<>(dtoListLow)); // listOfDtoLists.add(new ArrayList<>(dtoListLow));
} // }
//
listOfDtoLists.forEach(dtoList -> { // listOfDtoLists.forEach(dtoList -> {
List<QdSurplusLowMagnificationDTO> reslutLow = qdOrderClient.surplusLowMagnificationMatchApi(organizationId, // List<QdSurplusLowMagnificationDTO> reslutLow = qdOrderClient.surplusLowMagnificationMatchApi(organizationId,
dtoList); // dtoList);
//
if (reslutLow != null && !reslutLow.isEmpty()) { // if (reslutLow != null && !reslutLow.isEmpty()) {
if (reslutLow != null && !reslutLow.isEmpty()) { // if (reslutLow != null && !reslutLow.isEmpty()) {
for (QdSurplusLowMagnificationDTO qdSurplusLowMagnificationDTO : reslutLow) { // for (QdSurplusLowMagnificationDTO qdSurplusLowMagnificationDTO : reslutLow) {
if (!plistLowChkRsult.stream().anyMatch(m -> m.getPono().equals(p.getPono()) && m.getOrderNo().equals(qdSurplusLowMagnificationDTO.getOrderNo()))) { // if (!plistLowChkRsult.stream().anyMatch(m -> m.getPono().equals(p.getPono()) && m.getOrderNo().equals(qdSurplusLowMagnificationDTO.getOrderNo()))) {
ChkLowResult CR = new ChkLowResult(); // ChkLowResult CR = new ChkLowResult();
CR.setPono(p.getPono()); // CR.setPono(p.getPono());
CR.setOrderNo(qdSurplusLowMagnificationDTO.getOrderNo()); // CR.setOrderNo(qdSurplusLowMagnificationDTO.getOrderNo());
CR.setLowresult(qdSurplusLowMagnificationDTO.getResult()); // CR.setLowresult(qdSurplusLowMagnificationDTO.getResult());
plistLowChkRsult.add(CR); // plistLowChkRsult.add(CR);
} // }
} // }
} // }
} // }
}); // });
//
} catch (Exception e) { // } catch (Exception e) {
logger.info("错误信息："+e); // logger.info("错误信息："+e);
} // }
//
}); // });
System.out.println("调用成功"); System.out.println("调用成功");
JsonData xx = new JsonData(); JsonData xx = new JsonData();

4
XG_Project1/src/main/java/com/xisc/pm/app/service/SubService.java
Unescape Escape View File

@ -4,8 +4,6 @@ import com.xisc.pm.api.dto.PmPdRecDTO;
import com.xisc.pm.api.dto.model.*; import com.xisc.pm.api.dto.model.*;
import com.xisc.pm.domain.entity.*; import com.xisc.pm.domain.entity.*;
import com.xisc.pm.domain.vo.util.JsonData; import com.xisc.pm.domain.vo.util.JsonData;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PathVariable;
import java.util.List; import java.util.List;
@ -133,7 +131,7 @@ public interface SubService {
void saveSubLog(String slabNo, long subMode, String subRslt, String subLog, Long organizationId); void saveSubLog(String slabNo, long subMode, String subRslt, String subLog, Long organizationId);
void autoChkChmAndLowApi(Long organizationId); void autoChkChmAndLowApi(Long organizationId, SubParams subParams);
// void SaveData(List<PmPdSlab> pmPdSlabDOList, List<PmPdPlateCut> pmPdPlateCutDOList, List<PmPdBlockPos> pmPdBlockPosDOList, List<PmPdContSum> pmPdContSumDOList, List<PmSmallPltPos> pmSmallPltPosDOList, List<PmCmdSlab> pmCmdSlabDOList, List<PmCmdLargePlt> pmCmdLargePltDOList, List<PmCmdCont> pmCmdContDOList, List<PmCmdSmallPlt> pmCmdSmallPltDOList); // void SaveData(List<PmPdSlab> pmPdSlabDOList, List<PmPdPlateCut> pmPdPlateCutDOList, List<PmPdBlockPos> pmPdBlockPosDOList, List<PmPdContSum> pmPdContSumDOList, List<PmSmallPltPos> pmSmallPltPosDOList, List<PmCmdSlab> pmCmdSlabDOList, List<PmCmdLargePlt> pmCmdLargePltDOList, List<PmCmdCont> pmCmdContDOList, List<PmCmdSmallPlt> pmCmdSmallPltDOList);

304
XG_Project1/src/main/java/com/xisc/pm/app/service/impl/SubServiceImpl.java
Unescape Escape View File

@ -7,7 +7,6 @@ import com.xisc.pm.api.dto.*;
import com.xisc.pm.api.dto.ctevent.ProContBoardEndDTO; import com.xisc.pm.api.dto.ctevent.ProContBoardEndDTO;
import com.xisc.pm.api.dto.model.*; import com.xisc.pm.api.dto.model.*;
import com.xisc.pm.app.service.PmPdRecService; import com.xisc.pm.app.service.PmPdRecService;
import com.xisc.pm.app.service.PmSubCheckChmService;
import com.xisc.pm.app.service.strategy.PdMatTypeStrategyFactory; import com.xisc.pm.app.service.strategy.PdMatTypeStrategyFactory;
import com.xisc.pm.app.service.strategy.pdmattype.PdMatTypeStrategy; import com.xisc.pm.app.service.strategy.pdmattype.PdMatTypeStrategy;
import com.xisc.pm.domain.entity.*; import com.xisc.pm.domain.entity.*;
@ -37,7 +36,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PathVariable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
@ -5014,13 +5012,123 @@ public class SubServiceImpl implements SubService {
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
//自动化学成分检测与低倍检测 //自动化学成分检测与低倍检测
public void autoChkChmAndLowApi(Long organizationId) { public void autoChkChmAndLowApi(Long organizationId, SubParams subParams) {
List<SlabInfoDO> slabInfoDOList = subMapper.getSlabInfo(new SubParams()); List<SlabInfoDO> slabInfoDOList = subMapper.getSlabInfo(subParams);
System.out.println("板坯数量：" + slabInfoDOList.size() + "时间：" + new Date());
List<PmProCont> pmProContList = subMapper.getOrderInfo(); List<PmProCont> pmProContList = subMapper.getOrderInfo();
List<PmSubCheckChm> pmSubCheckChmList = new ArrayList<>(); System.out.println("订单数量：" + pmProContList.size() + "时间：" + new Date());
List<PmSubCheckLow> pmSubCheckLowList = new ArrayList<>(); List<PmSubCheckChm> pmSubCheckChmList = pmSubCheckChmRepository.selectList(new PmSubCheckChm());
List<PmSubCheckLow> pmSubCheckLowList = pmSubCheckLowRepository.selectList(new PmSubCheckLow());
System.out.println("数量：" + pmSubCheckChmList.size() + "---" + pmSubCheckLowList.size() + "时间：" + new Date());
List<PmSubCheckChm> pmSubCheckChmResList = new ArrayList<>();
List<PmSubCheckLow> pmSubCheckLowResList = new ArrayList<>();
// List<List<QdMatchParamDTO>> listOfDtoLists = new ArrayList<>();
// List<QdMatchParamDTO> dtoListChm = new ArrayList<QdMatchParamDTO>();
//
// List<List<QdSurplusLowMagnificationDTO>> listOfDtoListLows = new ArrayList<>();
// List<QdSurplusLowMagnificationDTO> dtoListLow = new ArrayList<QdSurplusLowMagnificationDTO>();
//
// slabInfoDOList.parallelStream().forEach(p -> {
// try {
//
// for (PmProCont gpo : pmProContList) {
//
// if (gpo.getOrderNo() == null || gpo.getOrderNo().equals("")) {
// continue;
// }
//// //验证过不需要再验证
//// if (pmSubCheckChmResList.stream().anyMatch(dto -> dto.getOrderNo().equals(gpo.getOrderNo()) && dto.getPono().equals(p.getPono()))) {
//// continue;
//// }
// QdMatchParamDTO phyFurnaceChemicalMatchDTO = new QdMatchParamDTO();
// phyFurnaceChemicalMatchDTO.setOrderNo(gpo.getOrderNo());
// phyFurnaceChemicalMatchDTO.setPono(p.getPono());
// dtoListChm.add(phyFurnaceChemicalMatchDTO);
// if (dtoListChm.size() == 500) {
// listOfDtoLists.add(new ArrayList<>(dtoListChm));
// dtoListChm.clear();
// }
// }
// // 如果 dtoListChm 中还有剩余的元素，将其添加到 listOfDtoLists 中
// if (!dtoListChm.isEmpty()) {
// listOfDtoLists.add(new ArrayList<>(dtoListChm));
// }
// } catch (Exception e) {
// logger.info("错误信息：" + e);
// }
//
// try {
//
// for (PmProCont gpo : pmProContList) {
// if (gpo.getOrderNo() == null || gpo.getOrderNo().equals("")) {
// continue;
// }
//// //验证过不需要再验证
//// if (pmSubCheckLowResList.stream().anyMatch(dto -> dto.getOrderNo().equals(gpo.getOrderNo()) && dto.getPono().equals(p.getPono()))) {
//// continue;
//// }
// QdSurplusLowMagnificationDTO phyFurnaceChemicalMatchDTO = new QdSurplusLowMagnificationDTO();
// phyFurnaceChemicalMatchDTO.setOrderNo(gpo.getOrderNo());
// phyFurnaceChemicalMatchDTO.setPono(p.getPono());
// dtoListLow.add(phyFurnaceChemicalMatchDTO);
// if (dtoListLow.size() == 500) {
// listOfDtoListLows.add(new ArrayList<>(dtoListLow));
// dtoListLow.clear();
// }
// }
// // 如果 dtoListChm 中还有剩余的元素，将其添加到 listOfDtoLists 中
// if (!dtoListLow.isEmpty()) {
// listOfDtoListLows.add(new ArrayList<>(dtoListLow));
// }
// } catch (Exception e) {
// logger.info("错误信息：" + e);
// }
// });
//
// listOfDtoLists.forEach(dtoList -> {
//
// List<QdMatchParamDTO> reslutChm = qdOrderClient.phyFurnaceChemicalMatchApi(organizationId,
// dtoList);
// if (reslutChm != null && !reslutChm.isEmpty()) {
// if (reslutChm != null && !reslutChm.isEmpty()) {
// for (QdMatchParamDTO qdMatchParamDTO : reslutChm) {
// if (!pmSubCheckChmResList.stream().anyMatch(m -> m.getPono().equals(qdMatchParamDTO.getPono()) && m.getOrderNo().equals(qdMatchParamDTO.getOrderNo()))) {
// PmSubCheckChm CR = new PmSubCheckChm();
// CR.setPono(qdMatchParamDTO.getPono());
// CR.setOrderNo(qdMatchParamDTO.getOrderNo());
// CR.setChmResult(qdMatchParamDTO.getResult());
// pmSubCheckChmResList.add(CR);
// }
// }
// }
// }
//
// });
//
// listOfDtoListLows.forEach(dtoList -> {
// List<QdSurplusLowMagnificationDTO> reslutLow = qdOrderClient.surplusLowMagnificationMatchApi(organizationId,
// dtoList);
// if (reslutLow != null && !reslutLow.isEmpty()) {
// if (reslutLow != null && !reslutLow.isEmpty()) {
// for (QdSurplusLowMagnificationDTO qdSurplusLowMagnificationDTO : reslutLow) {
// if (!pmSubCheckLowResList.stream().anyMatch(m -> m.getPono().equals(qdSurplusLowMagnificationDTO.getPono()) && m.getOrderNo().equals(qdSurplusLowMagnificationDTO.getOrderNo()))) {
// PmSubCheckLow CR = new PmSubCheckLow();
// CR.setPono(qdSurplusLowMagnificationDTO.getPono());
// CR.setOrderNo(qdSurplusLowMagnificationDTO.getOrderNo());
// CR.setLowResult(qdSurplusLowMagnificationDTO.getResult());
// pmSubCheckLowResList.add(CR);
// }
// }
// }
// }
// });
slabInfoDOList.forEach(p -> { slabInfoDOList.forEach(p -> {
// SlabInfoDO p = slabInfoDOList.get(0);
// slabChkChmAndLow(p, pmProContList, organizationId);
try { try {
List<List<QdMatchParamDTO>> listOfDtoLists = new ArrayList<>(); List<List<QdMatchParamDTO>> listOfDtoLists = new ArrayList<>();
List<QdMatchParamDTO> dtoListChm = new ArrayList<QdMatchParamDTO>(); List<QdMatchParamDTO> dtoListChm = new ArrayList<QdMatchParamDTO>();
@ -5031,7 +5139,7 @@ public class SubServiceImpl implements SubService {
} }
//验证过不需要再验证 //验证过不需要再验证
if (pmSubCheckChmList.stream().anyMatch(dto -> dto.getOrderNo().equals(gpo.getOrderNo()) && dto.getPono().equals(p.getPono()))) { if (pmSubCheckChmResList.stream().anyMatch(dto -> dto.getOrderNo().equals(gpo.getOrderNo()) && dto.getPono().equals(p.getPono()))) {
continue; continue;
} }
QdMatchParamDTO phyFurnaceChemicalMatchDTO = new QdMatchParamDTO(); QdMatchParamDTO phyFurnaceChemicalMatchDTO = new QdMatchParamDTO();
@ -5056,12 +5164,12 @@ public class SubServiceImpl implements SubService {
if (reslutChm != null && !reslutChm.isEmpty()) { if (reslutChm != null && !reslutChm.isEmpty()) {
if (reslutChm != null && !reslutChm.isEmpty()) { if (reslutChm != null && !reslutChm.isEmpty()) {
for (QdMatchParamDTO qdMatchParamDTO : reslutChm) { for (QdMatchParamDTO qdMatchParamDTO : reslutChm) {
if (!pmSubCheckChmList.stream().anyMatch(m -> m.getPono().equals(p.getPono()) && m.getOrderNo().equals(qdMatchParamDTO.getOrderNo()))) { if (!pmSubCheckChmResList.stream().anyMatch(m -> m.getPono().equals(p.getPono()) && m.getOrderNo().equals(qdMatchParamDTO.getOrderNo()))) {
PmSubCheckChm CR = new PmSubCheckChm(); PmSubCheckChm CR = new PmSubCheckChm();
CR.setPono(p.getPono()); CR.setPono(p.getPono());
CR.setOrderNo(qdMatchParamDTO.getOrderNo()); CR.setOrderNo(qdMatchParamDTO.getOrderNo());
CR.setChmResult(qdMatchParamDTO.getResult()); CR.setChmResult(qdMatchParamDTO.getResult());
pmSubCheckChmList.add(CR); pmSubCheckChmResList.add(CR);
} }
} }
} }
@ -5076,12 +5184,12 @@ public class SubServiceImpl implements SubService {
try { try {
List<List<QdSurplusLowMagnificationDTO>> listOfDtoLists = new ArrayList<>(); List<List<QdSurplusLowMagnificationDTO>> listOfDtoLists = new ArrayList<>();
List<QdSurplusLowMagnificationDTO> dtoListLow = new ArrayList<QdSurplusLowMagnificationDTO>(); List<QdSurplusLowMagnificationDTO> dtoListLow = new ArrayList<QdSurplusLowMagnificationDTO>();
for (PmProCont gpo : plistOrder) { for (PmProCont gpo : pmProContList) {
if (gpo.getOrderNo() == null || gpo.getOrderNo().equals("")) { if (gpo.getOrderNo() == null || gpo.getOrderNo().equals("")) {
continue; continue;
} }
//验证过不需要再验证 //验证过不需要再验证
if (pmSubCheckLowList.stream().anyMatch(dto -> dto.getOrderNo().equals(gpo.getOrderNo()) && dto.getPono().equals(p.getPono()))) { if (pmSubCheckLowResList.stream().anyMatch(dto -> dto.getOrderNo().equals(gpo.getOrderNo()) && dto.getPono().equals(p.getPono()))) {
continue; continue;
} }
QdSurplusLowMagnificationDTO phyFurnaceChemicalMatchDTO = new QdSurplusLowMagnificationDTO(); QdSurplusLowMagnificationDTO phyFurnaceChemicalMatchDTO = new QdSurplusLowMagnificationDTO();
@ -5097,20 +5205,18 @@ public class SubServiceImpl implements SubService {
if (!dtoListLow.isEmpty()) { if (!dtoListLow.isEmpty()) {
listOfDtoLists.add(new ArrayList<>(dtoListLow)); listOfDtoLists.add(new ArrayList<>(dtoListLow));
} }
listOfDtoLists.forEach(dtoList -> { listOfDtoLists.forEach(dtoList -> {
List<QdSurplusLowMagnificationDTO> reslutLow = qdOrderClient.surplusLowMagnificationMatchApi(organizationId, List<QdSurplusLowMagnificationDTO> reslutLow = qdOrderClient.surplusLowMagnificationMatchApi(organizationId,
dtoList); dtoList);
if (reslutLow != null && !reslutLow.isEmpty()) { if (reslutLow != null && !reslutLow.isEmpty()) {
if (reslutLow != null && !reslutLow.isEmpty()) { if (reslutLow != null && !reslutLow.isEmpty()) {
for (QdSurplusLowMagnificationDTO qdSurplusLowMagnificationDTO : reslutLow) { for (QdSurplusLowMagnificationDTO qdSurplusLowMagnificationDTO : reslutLow) {
if (!pmSubCheckLowList.stream().anyMatch(m -> m.getPono().equals(p.getPono()) && m.getOrderNo().equals(qdSurplusLowMagnificationDTO.getOrderNo()))) { if (!pmSubCheckLowResList.stream().anyMatch(m -> m.getPono().equals(p.getPono()) && m.getOrderNo().equals(qdSurplusLowMagnificationDTO.getOrderNo()))) {
PmSubCheckLow CR = new PmSubCheckLow(); PmSubCheckLow CR = new PmSubCheckLow();
CR.setPono(p.getPono()); CR.setPono(p.getPono());
CR.setOrderNo(qdSurplusLowMagnificationDTO.getOrderNo()); CR.setOrderNo(qdSurplusLowMagnificationDTO.getOrderNo());
CR.setLowResult(qdSurplusLowMagnificationDTO.getResult()); CR.setLowResult(qdSurplusLowMagnificationDTO.getResult());
pmSubCheckLowList.add(CR); pmSubCheckLowResList.add(CR);
} }
} }
} }
@ -5120,13 +5226,20 @@ public class SubServiceImpl implements SubService {
} catch (Exception e) { } catch (Exception e) {
logger.info("错误信息：" + e); logger.info("错误信息：" + e);
} }
System.out.println("循环时间：" + new Date());
}); });
List<PmSubCheckChm> insertPmSubCheckChmList = new ArrayList<>(); List<PmSubCheckChm> insertPmSubCheckChmList = new ArrayList<>();
List<PmSubCheckChm> updatePmSubCheckChmList = new ArrayList<>(); List<PmSubCheckChm> updatePmSubCheckChmList = new ArrayList<>();
List<PmSubCheckLow> insertPmSubCheckLowList = new ArrayList<>(); List<PmSubCheckLow> insertPmSubCheckLowList = new ArrayList<>();
List<PmSubCheckLow> updatePmSubCheckLowList = new ArrayList<>(); List<PmSubCheckLow> updatePmSubCheckLowList = new ArrayList<>();
for(PmSubCheckChm pmSubCheckChm : pmSubCheckChmList){ System.out.println("处理chm数据开始：" + new Date());
PmSubCheckChm check = pmSubCheckChmRepository.selectByPonoAndOrderNo(pmSubCheckChm); for(PmSubCheckChm pmSubCheckChm : pmSubCheckChmResList){
// PmSubCheckChm check = pmSubCheckChmRepository.selectByPonoAndOrderNo(pmSubCheckChm);
PmSubCheckChm check = pmSubCheckChmList.stream()
.filter(item -> pmSubCheckChm.getOrderNo().equals(item.getOrderNo()))
.findFirst()
.orElse(null);
pmSubCheckChm.setTenantId(organizationId); pmSubCheckChm.setTenantId(organizationId);
if(check == null){ if(check == null){
insertPmSubCheckChmList.add(pmSubCheckChm); insertPmSubCheckChmList.add(pmSubCheckChm);
@ -5138,9 +5251,13 @@ public class SubServiceImpl implements SubService {
} }
} }
} }
System.out.println("处理chm数据结束：" + new Date());
for(PmSubCheckLow pmSubCheckLow : pmSubCheckLowList){ for(PmSubCheckLow pmSubCheckLow : pmSubCheckLowResList){
PmSubCheckLow check = pmSubCheckLowRepository.selectByPonoAndOrderNo(pmSubCheckLow); // PmSubCheckLow check = pmSubCheckLowRepository.selectByPonoAndOrderNo(pmSubCheckLow);
PmSubCheckLow check = pmSubCheckLowList.stream()
.filter(item -> pmSubCheckLow.getOrderNo().equals(item.getOrderNo()))
.findFirst()
.orElse(null);
pmSubCheckLow.setTenantId(organizationId); pmSubCheckLow.setTenantId(organizationId);
if(check == null){ if(check == null){
insertPmSubCheckLowList.add(pmSubCheckLow); insertPmSubCheckLowList.add(pmSubCheckLow);
@ -5152,13 +5269,160 @@ public class SubServiceImpl implements SubService {
} }
} }
} }
System.out.println("处理low数据结束：" + new Date());
pmSubCheckChmRepository.batchInsertSelective(insertPmSubCheckChmList); pmSubCheckChmRepository.batchInsertSelective(insertPmSubCheckChmList);
pmSubCheckChmRepository.batchUpdateByPrimaryKeySelective(updatePmSubCheckChmList); pmSubCheckChmRepository.batchUpdateByPrimaryKeySelective(updatePmSubCheckChmList);
pmSubCheckLowRepository.batchInsertSelective(insertPmSubCheckLowList); pmSubCheckLowRepository.batchInsertSelective(insertPmSubCheckLowList);
pmSubCheckLowRepository.batchUpdateByPrimaryKeySelective(updatePmSubCheckLowList); pmSubCheckLowRepository.batchUpdateByPrimaryKeySelective(updatePmSubCheckLowList);
System.out.println("保存结束：" + new Date());
} }
// @Transactional(rollbackFor = Exception.class)
// public void slabChkChmAndLow(SlabInfoDO p,List<PmProCont> pmProContList, Long organizationId){
// System.out.println("板坯开始" + p.getSlabNo());
// List<PmSubCheckChm> pmSubCheckChmList = new ArrayList<>();
// List<PmSubCheckLow> pmSubCheckLowList = new ArrayList<>();
// try {
// List<List<QdMatchParamDTO>> listOfDtoLists = new ArrayList<>();
// List<QdMatchParamDTO> dtoListChm = new ArrayList<QdMatchParamDTO>();
// for (PmProCont gpo : pmProContList) {
//
// if (gpo.getOrderNo() == null || gpo.getOrderNo().equals("")) {
//
// }
//
// //验证过不需要再验证
// if (pmSubCheckChmList.stream().anyMatch(dto -> dto.getOrderNo().equals(gpo.getOrderNo()) && dto.getPono().equals(p.getPono()))) {
// continue;
// }
// QdMatchParamDTO phyFurnaceChemicalMatchDTO = new QdMatchParamDTO();
// phyFurnaceChemicalMatchDTO.setOrderNo(gpo.getOrderNo());
// phyFurnaceChemicalMatchDTO.setPono(p.getPono());
// dtoListChm.add(phyFurnaceChemicalMatchDTO);
// if (dtoListChm.size() == 500) {
// listOfDtoLists.add(new ArrayList<>(dtoListChm));
// dtoListChm.clear();
// }
// }
//
// // 如果 dtoListChm 中还有剩余的元素，将其添加到 listOfDtoLists 中
// if (!dtoListChm.isEmpty()) {
// listOfDtoLists.add(new ArrayList<>(dtoListChm));
// }
//
// listOfDtoLists.forEach(dtoList -> {
//
// List<QdMatchParamDTO> reslutChm = qdOrderClient.phyFurnaceChemicalMatchApi(organizationId,
// dtoList);
// if (reslutChm != null && !reslutChm.isEmpty()) {
// if (reslutChm != null && !reslutChm.isEmpty()) {
// for (QdMatchParamDTO qdMatchParamDTO : reslutChm) {
// if (!pmSubCheckChmList.stream().anyMatch(m -> m.getPono().equals(p.getPono()) && m.getOrderNo().equals(qdMatchParamDTO.getOrderNo()))) {
// PmSubCheckChm CR = new PmSubCheckChm();
// CR.setPono(p.getPono());
// CR.setOrderNo(qdMatchParamDTO.getOrderNo());
// CR.setChmResult(qdMatchParamDTO.getResult());
// pmSubCheckChmList.add(CR);
// }
// }
// }
// }
//
// });
//
// } catch (Exception e) {
// logger.info("错误信息：" + e);
// }
//
// try {
// List<List<QdSurplusLowMagnificationDTO>> listOfDtoLists = new ArrayList<>();
// List<QdSurplusLowMagnificationDTO> dtoListLow = new ArrayList<QdSurplusLowMagnificationDTO>();
// for (PmProCont gpo : pmProContList) {
// if (gpo.getOrderNo() == null || gpo.getOrderNo().equals("")) {
// continue;
// }
// //验证过不需要再验证
// if (pmSubCheckLowList.stream().anyMatch(dto -> dto.getOrderNo().equals(gpo.getOrderNo()) && dto.getPono().equals(p.getPono()))) {
// continue;
// }
// QdSurplusLowMagnificationDTO phyFurnaceChemicalMatchDTO = new QdSurplusLowMagnificationDTO();
// phyFurnaceChemicalMatchDTO.setOrderNo(gpo.getOrderNo());
// phyFurnaceChemicalMatchDTO.setPono(p.getPono());
// dtoListLow.add(phyFurnaceChemicalMatchDTO);
// if (dtoListLow.size() == 500) {
// listOfDtoLists.add(new ArrayList<>(dtoListLow));
// dtoListLow.clear();
// }
// }
// // 如果 dtoListChm 中还有剩余的元素，将其添加到 listOfDtoLists 中
// if (!dtoListLow.isEmpty()) {
// listOfDtoLists.add(new ArrayList<>(dtoListLow));
// }
//
// listOfDtoLists.forEach(dtoList -> {
// List<QdSurplusLowMagnificationDTO> reslutLow = qdOrderClient.surplusLowMagnificationMatchApi(organizationId,
// dtoList);
//
// if (reslutLow != null && !reslutLow.isEmpty()) {
// if (reslutLow != null && !reslutLow.isEmpty()) {
// for (QdSurplusLowMagnificationDTO qdSurplusLowMagnificationDTO : reslutLow) {
// if (!pmSubCheckLowList.stream().anyMatch(m -> m.getPono().equals(p.getPono()) && m.getOrderNo().equals(qdSurplusLowMagnificationDTO.getOrderNo()))) {
// PmSubCheckLow CR = new PmSubCheckLow();
// CR.setPono(p.getPono());
// CR.setOrderNo(qdSurplusLowMagnificationDTO.getOrderNo());
// CR.setLowResult(qdSurplusLowMagnificationDTO.getResult());
// pmSubCheckLowList.add(CR);
// }
// }
// }
// }
// });
//
// } catch (Exception e) {
// logger.info("错误信息：" + e);
// }
// List<PmSubCheckChm> insertPmSubCheckChmList = new ArrayList<>();
// List<PmSubCheckChm> updatePmSubCheckChmList = new ArrayList<>();
// List<PmSubCheckLow> insertPmSubCheckLowList = new ArrayList<>();
// List<PmSubCheckLow> updatePmSubCheckLowList = new ArrayList<>();
// for(PmSubCheckChm pmSubCheckChm : pmSubCheckChmList){
// PmSubCheckChm check = pmSubCheckChmRepository.selectByPonoAndOrderNo(pmSubCheckChm);
// pmSubCheckChm.setTenantId(organizationId);
// if(check == null){
// insertPmSubCheckChmList.add(pmSubCheckChm);
// }else{
// if(!pmSubCheckChm.getChmResult().equals(check.getChmResult())){
// pmSubCheckChm.setId(check.getId());
// pmSubCheckChm.setOldResult(check.getChmResult());
// updatePmSubCheckChmList.add(pmSubCheckChm);
// }
// }
// }
//
// for(PmSubCheckLow pmSubCheckLow : pmSubCheckLowList){
// PmSubCheckLow check = pmSubCheckLowRepository.selectByPonoAndOrderNo(pmSubCheckLow);
// pmSubCheckLow.setTenantId(organizationId);
// if(check == null){
// insertPmSubCheckLowList.add(pmSubCheckLow);
// }else{
// if(!pmSubCheckLow.getLowResult().equals(check.getLowResult())){
// pmSubCheckLow.setId(check.getId());
// pmSubCheckLow.setOldResult(check.getLowResult());
// updatePmSubCheckLowList.add(pmSubCheckLow);
// }
// }
// }
// System.out.println(p.getSlabNo() + "开始保存数据：1--"+insertPmSubCheckChmList.size() + "--2--" + updatePmSubCheckChmList.size() + "--3--" + insertPmSubCheckLowList.size() + "--4--" + updatePmSubCheckLowList.size());
// pmSubCheckChmRepository.batchInsertSelective(insertPmSubCheckChmList);
// pmSubCheckChmRepository.batchUpdateByPrimaryKeySelective(updatePmSubCheckChmList);
// pmSubCheckLowRepository.batchInsertSelective(insertPmSubCheckLowList);
// pmSubCheckLowRepository.batchUpdateByPrimaryKeySelective(updatePmSubCheckLowList);
// System.out.println(p.getSlabNo() + "保存数据结束");
//
// }
public void zbCtEventRec(Long organizationId, List<PmPdSlab> pmPdSlabDOList, List<PmCmdLargePlt> pmCmdLargePltDOList, List<PmCmdSlab> pmCmdSlabDOList, List<PmSmallPltPos> pmSmallPltPosDOList) { public void zbCtEventRec(Long organizationId, List<PmPdSlab> pmPdSlabDOList, List<PmCmdLargePlt> pmCmdLargePltDOList, List<PmCmdSlab> pmCmdSlabDOList, List<PmSmallPltPos> pmSmallPltPosDOList) {
for (PmPdSlab pmPdSlab : pmPdSlabDOList) { for (PmPdSlab pmPdSlab : pmPdSlabDOList) {

Write Preview
Loading…
Cancel
Save