简化查询。

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/CommSendService.java

@@ -1,18 +1,17 @@
 package com.ruoyi.sim.service.impl;
 
-import cn.hutool.core.map.MapUtil;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.sim.config.SimConfig;
 import com.ruoyi.sim.constant.ArBuilder;
 import com.ruoyi.sim.constant.CommConst;
+import com.ruoyi.sim.constant.FaultContentAnswerConst;
 import com.ruoyi.sim.constant.FaultIdConst;
 import com.ruoyi.sim.domain.*;
 import com.ruoyi.sim.domain.vo.FaultCheckVo;
 import com.ruoyi.sim.domain.vo.ScanSeatVo;
 import com.ruoyi.sim.domain.vo.SimSocketParamVo;
 import com.ruoyi.sim.util.SimDateUtil;
-import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
@@ -21,7 +20,6 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.print.DocFlavor;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -807,13 +805,10 @@ public class CommSendService {
     }
 
     public AjaxResult readOneSimAllFaultSubmitCheck(final Seat seat, final Sim sim) {
-        String simType = sim.getSimType();
+        final 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);
+            List<Fault> listF = faultService.listType3(simType);
             for (Fault oneF : listF) {
                 FaultCheckVo voOne = new FaultCheckVo();
                 voOne.setSeat(seat);
@@ -826,12 +821,18 @@ public class CommSendService {
                     l.info("put key = {}", vo.getFault().getFaultId());
                 }
                 l.info("debug@FaultCheckVo = {}", vo);
-                if (StringUtils.equals(Objects.requireNonNull(vo).getFault().getFaultId(), FaultIdConst.T0001.F09)) {
-                    if (!StringUtils.equals(vo.getSimMsgReceive().getReceiveSubContentData(), "00000002")) {
+                if (StringUtils.equals(
+                        Objects.requireNonNull(vo).getFault().getFaultId(),
+                        FaultIdConst.T0001.F09)) {
+                    if (!StringUtils.equals(
+                            vo.getSimMsgReceive().getReceiveSubContentData(),
+                            FaultContentAnswerConst.T0001.F09_CLOSED
+                    )) {
                         return ArBuilder.error(T24002, M24002);
                     }
                 }
             }
+            // 1型，接触不良。
             if (mapE.containsKey(FaultIdConst.T0001.F01) &&
                     mapE.containsKey(FaultIdConst.T0001.F02) &&
                     mapE.containsKey(FaultIdConst.T0001.F03) &&
@@ -839,7 +840,8 @@ public class CommSendService {
                     mapE.containsKey(FaultIdConst.T0001.F06) &&
                     mapE.containsKey(FaultIdConst.T0001.F07) &&
                     mapE.containsKey(FaultIdConst.T0001.F08) &&
-                    mapE.containsKey(FaultIdConst.T0001.F0A)) {
+                    mapE.containsKey(FaultIdConst.T0001.F0A)
+            ) {
                 return ArBuilder.error(T24003, M24003);
             }
         }
@@ -897,7 +899,9 @@ public class CommSendService {
         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());
         if (smR.isResultNotOk()) {
-            if (Objects.equals(smR.getResult(), SimMsg.Result.RECEIVE_CHECK_FAIL) || (Objects.equals(smR.getResult(), SimMsg.Result.RECEIVE_NOT_MATCH))) {
+            if (Objects.equals(smR.getResult(), SimMsg.Result.RECEIVE_CHECK_FAIL) ||
+                    (Objects.equals(smR.getResult(), SimMsg.Result.RECEIVE_NOT_MATCH))
+            ) {
                 l.info("reset connection！");
                 String ip = vo.getSeat().getSeatRs485Ip();
                 Integer port = vo.getSeat().getSeatRs485Port();