Ver código fonte

周一演示最后修改。

tom 3 meses atrás
pai
commit
c45b8d129e

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

@@ -403,7 +403,8 @@ public class CommSendService {
      */
     public SimMsg debugClearOneFault(final String simNum, final String bindHardwareMsg) {
         SimMsg sm = commBuildService.buildSendMsgClearFault(simNum, bindHardwareMsg);
-        return send(sm, null, RETRY_COUNT_CLEAR_ONE_FAULT, SLEEP_LONG);
+        Sim s = simService.uniqueBySimNum(simNum);
+        return send(sm, s, RETRY_COUNT_CLEAR_ONE_FAULT, SLEEP_LONG);
     }
 
     public AjaxResult debugClearAllOnlineSimAllFault() {
@@ -523,6 +524,7 @@ public class CommSendService {
                                                       final String[] faultIds,
                                                       final Boolean checkReplace) {
         //
+        l.info("faultIds.length = {}", faultIds.length);
         {
             int deleteCount = debugFaultService.deleteAll();
             l.info("deleteCount = {}", deleteCount);
@@ -837,6 +839,7 @@ public class CommSendService {
         } catch (InterruptedException | IOException e) {   // SocketTimeoutException
             e.printStackTrace();
             // 失败计数
+            l.info("fail sim data = {}", s);
             boolean limit = commFailCountAdd1(Objects.requireNonNull(s).getSimId());
             if (limit) {
                 simService.updateSimStateBySimId(s.getSimId(), Sim.State.OFFLINE);

+ 2 - 3
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/DebugFaultService.java

@@ -109,10 +109,9 @@ public class DebugFaultService {
         List<DebugFault> list = selectDebugFaultList(q);
         Long[] refIds = new Long[list.size()];
         for (int i = 0; i < list.size(); i++) {
-            refIds[i] = list.get(i).getRefId();
+            deleteDebugFaultByRefId(list.get(i).getRefId());
         }
-        deleteDebugFaultByRefIds(refIds);
-        return refIds.length;
+        return list.size();
     }
 
     public interface Flag {