2.根据品牌查询消费设备列表的远程调用接口

ruoyi-api/ruoyi-api-backstage/src/main/java/org/dromara/backstage/api/RemotePtXfTermService.java

@@ -5,6 +5,7 @@ import org.dromara.backstage.api.domain.bo.RemoteXfTermParamBo;
 import org.dromara.backstage.api.domain.vo.RemoteXfTermVo;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * 消费设备服务
@@ -41,4 +42,11 @@ public interface RemotePtXfTermService {
      */
     RemoteXfTermVo queryByNo(Long termNo,String tenantId);
 
+    /**
+     * 根据品牌查询设备列表
+     * @param brand 设备品牌
+     * @return 设备信息列表
+     */
+    List<RemoteXfTermVo> queryListByBrand(String brand);
+
 }

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

@@ -306,4 +306,13 @@ public class RemoteXfTermVo implements Serializable {
     private Date blackDownTime;
     //endregion
 
+    /*消费机管理账号*/
+    private String adminName;
+
+    /*消费机管理密码*/
+    private String adminPwd;
+
+    /*消费机品牌*/
+    private String brand;
+
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/dubbo/RemoteXfTermServiceImpl.java

@@ -2,6 +2,7 @@ package org.dromara.backstage.consumption.dubbo;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.excel.util.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.backstage.api.RemotePtXfTermService;
@@ -12,10 +13,12 @@ import org.dromara.backstage.consumption.domain.bo.XfTermBo;
 import org.dromara.backstage.consumption.domain.bo.XfTermParamBo;
 import org.dromara.backstage.consumption.domain.vo.XfTermVo;
 import org.dromara.backstage.consumption.service.IXfTermService;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * @author Hz
@@ -61,4 +64,22 @@ public class RemoteXfTermServiceImpl implements RemotePtXfTermService {
         }
         return null;
     }
+
+    /**
+     * 根据品牌查询设备列表
+     *
+     * @param brand 设备品牌
+     * @return 设备信息列表
+     */
+    @Override
+    public List<RemoteXfTermVo> queryListByBrand(String brand) {
+        if(StringUtils.isBlank(brand)){
+            throw new ServiceException("品牌不能为空");
+        }
+        List<XfTermVo> xfTermVos = xfTermService.queryListByBrand(brand);
+        if (ObjectUtil.isNotEmpty(xfTermVos)) {
+            return MapstructUtils.convert(xfTermVos, RemoteXfTermVo.class);
+        }
+        return null;
+    }
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/IXfTermService.java

@@ -53,7 +53,7 @@ public interface IXfTermService {
      * @param brand
      * @return
      */
-    List<XfTermVo> queryList(String brand);
+    List<XfTermVo> queryListByBrand(String brand);
 
     public Map<Long,XfTermVo> queryMapByIds(List<Long> ids);
 

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfTermServiceImpl.java

@@ -143,7 +143,7 @@ public class XfTermServiceImpl implements IXfTermService {
      * @return
      */
     @Override
-    public List<XfTermVo> queryList(String brand) {
+    public List<XfTermVo> queryListByBrand(String brand) {
         LambdaQueryWrapper<XfTerm> lqw = Wrappers.lambdaQuery();
         lqw.eq(XfTerm::getBrand, brand);
         return baseMapper.selectVoList(lqw);