Merge remote-tracking branch 'origin/master'

ruoyi-api/ruoyi-api-backstage/src/main/java/org/dromara/backstage/api/domain/vo/RemoteXfTermVo.java

@@ -80,6 +80,11 @@ public class RemoteXfTermVo implements Serializable {
      */
     private String serverIp;
 
+    /**
+     * 子网掩码
+     */
+    private String mask;
+
     /**
      * 服务器端口
      */
@@ -87,6 +92,16 @@ public class RemoteXfTermVo implements Serializable {
 
     private String autoDown;
 
+    /**
+     * 设备MAC地址
+     */
+    private String termMac;
+
+    /**
+     * 网关IP
+     */
+    private String gatewayIp;
+
     /**
      * 备注
      */

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/vo/XfTermVo.java

@@ -85,6 +85,21 @@ public class XfTermVo implements Serializable {
     @ExcelProperty(value = "设备IP")
     private String termIp;
 
+    /**
+     * 子网掩码
+     */
+    private String mask;
+
+    /**
+     * 设备MAC地址
+     */
+    private String termMac;
+
+    /**
+     * 网关IP
+     */
+    private String gatewayIp;
+
     /**
      * 设备通讯端口
      */

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/TermBusiness.java

@@ -5,8 +5,12 @@ import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.backstage.api.RemotePtXfTermService;
+import org.dromara.backstage.api.domain.vo.RemoteXfTermVo;
+import org.dromara.common.core.config.DefaultConfig;
 import org.dromara.common.core.constant.DefaultConstants;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.enums.SystemUseTypeEnum;
 import org.dromara.server.consume.cache.TokenManager;
 import org.dromara.server.consume.domain.vo.XfTermVo;
 import org.dromara.server.consume.domain.vo.yc.RoomInfo;
@@ -40,19 +44,22 @@ import java.util.concurrent.ConcurrentHashMap;
 @RequiredArgsConstructor
 public class TermBusiness {
     private static final Object locker = new Object();
-    @DubboReference
-    private final RemoteUserService remoteUserService;
-    private final IXfTermService termService;
-    private final TokenManager tokenManager;
-
     private static final ConcurrentHashMap<Integer, Long> lastCheckModify = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<Integer, Long> lastModify = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<Integer, Long> lastCheckBlack = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<Integer, Long> lastBlack = new ConcurrentHashMap<>();
+    @DubboReference
+    private final RemoteUserService remoteUserService;
+    @DubboReference
+    private final RemotePtXfTermService remoteTermService;
+    private final IXfTermService termService;
+    private final TokenManager tokenManager;
+    private final DefaultConfig defaultConfig;
 
     public R<TermToken> getTermToken(Long termNo, String admin, String pwd) {
-        XfTermVo termVo = termService.queryVoOneByNo(termNo);
-        if (ObjectUtil.isEmpty(termVo)) {
+        // XfTermVo termVo = termService.queryVoOneByNo(termNo);
+        RemoteXfTermVo remoteVo = remoteTermService.queryByNo(termNo, defaultConfig.getTenantId());
+        if (ObjectUtil.isEmpty(remoteVo)) {
             return R.fail(MessageFormat.format("机号为[{0}]的设备不存在", termNo), null);
         }
         RemoteUserVo userVo = remoteUserService.selectUserVoByUserName(admin);
@@ -96,12 +103,16 @@ public class TermBusiness {
     }
 
     public R<TermInfo> getTermInfoByTermNo(Long termNo) {
-        XfTermVo termVo = termService.queryVoOneByNo(termNo);
-        if (ObjectUtil.isEmpty(termVo)) {
+        return this.getTermInfoByTermNo(termNo, defaultConfig.getTenantId());
+    }
+
+    public R<TermInfo> getTermInfoByTermNo(Long termNo, String tenantId) {
+        RemoteXfTermVo remoteVo = remoteTermService.queryByNo(termNo, tenantId);
+        if (ObjectUtil.isEmpty(remoteVo)) {
             return R.fail(MessageFormat.format("机号为[{0}]的设备不存在", termNo), null);
         }
 
-        TermInfo termInfo = this.convertToYc(termVo);
+        TermInfo termInfo = this.convertToYc(remoteVo);
 
         return R.ok(termInfo);
     }
@@ -127,7 +138,7 @@ public class TermBusiness {
         return R.ok(resultMap);
     }
 
-    private TermInfo convertToYc(XfTermVo termVo) {
+    private TermInfo convertToYc(RemoteXfTermVo termVo) {
         TermInfo termInfo = new TermInfo();
         termInfo.setTermId(termVo.getTermId().toString());
         termInfo.setTermNo(termVo.getTermNo().intValue());
@@ -136,8 +147,8 @@ public class TermBusiness {
         termInfo.setConsumeType("4");
         termInfo.setRoomId(termVo.getRoomId().toString());
         termInfo.setAccountId(termVo.getAccountId().toString());
-        termInfo.setWorkStationId(termVo.getStationId() == null ? null : termVo.getStationId().toString());
-        termInfo.setUseType(termVo.getUseType());
+        // termInfo.setWorkStationId(termVo.getStationId() == null ? null : termVo.getStationId().toString());
+        termInfo.setUseType(SystemUseTypeEnum.CONSUME.code().toString());
         termInfo.setCardTypeId(termVo.getCardType());
         termInfo.setOperateMode(!termVo.getOpenMode().equals("0"));
         termInfo.setWorkModeId(termVo.getWorkMode());
@@ -184,7 +195,7 @@ public class TermBusiness {
         termInfo.setServerIp(termVo.getServerIp());
         termInfo.setServerPort(termVo.getServerPort().toString());
         termInfo.setMask(termVo.getMask());
-        termInfo.setQrCode(termVo.getQrCode());
+        // termInfo.setQrCode(termVo.getQrCode());
         termInfo.setIsAutoDownParameter(termVo.getAutoDown().equals("Y"));
         termInfo.setLastCheckTime(termVo.getLastCheck());
         termInfo.setOutLineMin(termVo.getOfflineTime().intValue());
@@ -214,4 +225,5 @@ public class TermBusiness {
 
         return termInfo;
     }
+
 }