过滤设备MAC

smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceQuery.java

@@ -70,4 +70,7 @@ public class DeviceQuery extends Device {
 
     @ApiModelProperty("是否过期")
     private Boolean isArrears;
+
+    @ApiModelProperty("MAC列表")
+    private List<String> macList;
 }

smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.java

@@ -167,7 +167,7 @@ public interface DeviceMapper
     /**
      * 获取所有MAC
      */
-    List<String> selectAllMac();
+    List<String> selectMacList(DeviceQuery query);
 
     /**
      * 查询一个

smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml

@@ -73,6 +73,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+        <if test="macList != null and macList.size() > 0">
+            and sd.mac in
+            <foreach collection="macList" open="(" close=")" separator="," item="item">
+                #{item}
+            </foreach>
+        </if>
         <if test="deleted == null">and sd.deleted = false</if>
         <if test="deleted != null">and sd.deleted = #{deleted}</if>
     </sql>
@@ -225,10 +231,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where sd.device_no = #{deviceNo} and sd.deleted = false
     </select>
 
-    <select id="selectAllMac" resultType="java.lang.String">
+    <select id="selectMacList" resultType="java.lang.String">
-        select distinct mac
+        select distinct sd.mac
         from sm_device sd
-        where sd.deleted = false
+        <where>
+            <include refid="searchCondition"/>
+        </where>
     </select>
 
     <select id="selectOne" resultMap="SmDeviceResult">

smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceService.java

@@ -234,7 +234,7 @@ public interface DeviceService
     /**
      * 获取所有MAC
      */
-    List<String> selectAllMac();
+    List<String> selectMacList(DeviceQuery query);
 
     /**
      * 查询一个
@@ -306,4 +306,5 @@ public interface DeviceService
      * 电量归零，并关闭订单
      */
     int resetEleWithBill(Long deviceId);
+
 }

smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java

@@ -333,8 +333,8 @@ public class DeviceServiceImpl implements DeviceService
     }
 
     @Override
-    public List<String> selectAllMac() {
+    public List<String> selectMacList(DeviceQuery query) {
-        return deviceMapper.selectAllMac();
+        return deviceMapper.selectMacList(query);
     }
 
     @Override

smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppDeviceController.java

@@ -197,7 +197,16 @@ public class AppDeviceController extends BaseController {
     @GetMapping("/listAllMac")
     @DeviceAdminRequired
     public AjaxResult getAllMac() {
-        return success(smDeviceService.selectAllMac());
+        return success(smDeviceService.selectMacList(new DeviceQuery()));
+    }
+
+    @ApiOperation("管理员过滤已录入的设备MAC列表")
+    @DeviceAdminRequired
+    @GetMapping("/getExistMac/{mac}")
+    public AjaxResult getExistMac(@PathVariable @ApiParam("设备mac") List<String> mac) {
+        DeviceQuery query = new DeviceQuery();
+        query.setMacList(mac);
+        return success(smDeviceService.selectMacList(query));
     }
 
     @ApiOperation("获取正在使用中的设备列表")