|
@@ -1,5 +1,6 @@
|
|
package com.ruoyi.sim.service.impl;
|
|
package com.ruoyi.sim.service.impl;
|
|
|
|
|
|
|
|
+import cn.hutool.core.map.MapUtil;
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
import com.ruoyi.sim.config.SimConfig;
|
|
import com.ruoyi.sim.config.SimConfig;
|
|
@@ -10,7 +11,6 @@ import com.ruoyi.sim.domain.vo.FaultCheckVo;
|
|
import com.ruoyi.sim.domain.vo.ScanSeatVo;
|
|
import com.ruoyi.sim.domain.vo.ScanSeatVo;
|
|
import com.ruoyi.sim.domain.vo.SimSocketParamVo;
|
|
import com.ruoyi.sim.domain.vo.SimSocketParamVo;
|
|
import com.ruoyi.sim.util.SimDateUtil;
|
|
import com.ruoyi.sim.util.SimDateUtil;
|
|
-import org.apache.commons.collections4.SetUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
@@ -802,6 +802,42 @@ public class CommSendService {
|
|
return AjaxResult.success("所有故障部位检查没有问题。");
|
|
return AjaxResult.success("所有故障部位检查没有问题。");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public AjaxResult readOneSimAllFaultSubmitCheck(final Seat seat, final Sim sim) {
|
|
|
|
+ String simType = sim.getSimType();
|
|
|
|
+ if (StringUtils.equals(simType, Sim.TYPE_0001)) {
|
|
|
|
+ Map<String, SimMsg> mapE = new HashMap<>();
|
|
|
|
+ Fault q = new Fault();
|
|
|
|
+ q.setFaultType(Fault.Type.REAL_GZBW);
|
|
|
|
+ q.setSimType(simType);
|
|
|
|
+ List<Fault> listF = faultService.selectFaultList(q);
|
|
|
|
+ for (Fault oneF : listF) {
|
|
|
|
+ FaultCheckVo voOne = new FaultCheckVo();
|
|
|
|
+ voOne.setSeat(seat);
|
|
|
|
+ voOne.setSim(sim);
|
|
|
|
+ voOne.setFault(oneF);
|
|
|
|
+ AjaxResult ar = readOneSimOneFaultStartSimpleCheck(voOne);
|
|
|
|
+ FaultCheckVo vo = (FaultCheckVo) (Objects.requireNonNull(ar).get(AjaxResult.DATA_TAG));
|
|
|
|
+ if (vo != null && vo.getSimMsgReceive().isReceiveContentDataBlank()) {
|
|
|
|
+ mapE.put(vo.getFault().getFaultId(), vo.getSimMsgReceive());
|
|
|
|
+ l.info("put key = {}", vo.getFault().getFaultId());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (
|
|
|
|
+ mapE.containsKey(FaultIdConst.T0001.F01) &&
|
|
|
|
+ mapE.containsKey(FaultIdConst.T0001.F02) &&
|
|
|
|
+ mapE.containsKey(FaultIdConst.T0001.F03) &&
|
|
|
|
+ mapE.containsKey(FaultIdConst.T0001.F04) &&
|
|
|
|
+ mapE.containsKey(FaultIdConst.T0001.F06) &&
|
|
|
|
+ mapE.containsKey(FaultIdConst.T0001.F07) &&
|
|
|
|
+ mapE.containsKey(FaultIdConst.T0001.F08) &&
|
|
|
|
+ mapE.containsKey(FaultIdConst.T0001.F0A)
|
|
|
|
+ ) {
|
|
|
|
+ return AjaxResult.error("模拟器FZD04B电池舱盖没有关闭,请关闭后重试。");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return AjaxResult.success("所有故障部位检查没有问题。");
|
|
|
|
+ }
|
|
|
|
+
|
|
private String buildKeyType0003(String bindHardwareMsg) {
|
|
private String buildKeyType0003(String bindHardwareMsg) {
|
|
return buildKey(Sim.TYPE_0003, bindHardwareMsg);
|
|
return buildKey(Sim.TYPE_0003, bindHardwareMsg);
|
|
}
|
|
}
|
|
@@ -853,7 +889,7 @@ public class CommSendService {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
public AjaxResult readOneSimOneFaultStartSimpleCheck(FaultCheckVo vo) {
|
|
public AjaxResult readOneSimOneFaultStartSimpleCheck(FaultCheckVo vo) {
|
|
- l.info("readOneSimOneFaultCheck vo = {}", vo);
|
|
|
|
|
|
+ l.info("readOneSimOneFaultStartSimpleCheck vo = {}", vo);
|
|
SimMsg smS = commBuildService.buildSendMsgReadFaultResistance(vo.getSim().getSimNum(), vo.getFault().getBindHardwareMsg());
|
|
SimMsg smS = commBuildService.buildSendMsgReadFaultResistance(vo.getSim().getSimNum(), vo.getFault().getBindHardwareMsg());
|
|
SimMsg smR = send(smS, vo.getSeat(), vo.getSim(), RETRY_COUNT_CHECK_ONE_FAULT, commStrategy.getSleepLong());
|
|
SimMsg smR = send(smS, vo.getSeat(), vo.getSim(), RETRY_COUNT_CHECK_ONE_FAULT, commStrategy.getSleepLong());
|
|
if (smR.isResultNotOk()) {
|
|
if (smR.isResultNotOk()) {
|
|
@@ -870,7 +906,7 @@ public class CommSendService {
|
|
// set send and receive msg.
|
|
// set send and receive msg.
|
|
vo.setSimMsgSend(smS);
|
|
vo.setSimMsgSend(smS);
|
|
vo.setSimMsgReceive(smR);
|
|
vo.setSimMsgReceive(smR);
|
|
- return simReceiveService.getOneFaultCheck(vo);
|
|
|
|
|
|
+ return simReceiveService.getOneFaultStartCheck(vo);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|