diff --git a/AutoSprout-ui/src/views/device/device/index.vue b/AutoSprout-ui/src/views/device/device/index.vue index 15f0c7e..ec7ea25 100644 --- a/AutoSprout-ui/src/views/device/device/index.vue +++ b/AutoSprout-ui/src/views/device/device/index.vue @@ -139,15 +139,29 @@ > - + + + + + + + + + + + + + - - - - {{ parseTime(scope.row.activationTime, "{y}-{m}-{d}") }} + - - - - + + + macs) + @PostMapping("/getExistListByMacs") + public AjaxResult getExistMac(@RequestBody AsDevice asDevice) { - logger.info("【获取已录入设备列表】参数-----macs=【{}】",macs); - List devices = asDeviceService.getExistMac(macs); + logger.info("【获取已录入设备列表】参数-----macs=【{}】",asDevice); + List devices = asDeviceService.getExistMac(asDevice); return AjaxResult.success(devices); } diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDevice.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDevice.java index bcbd546..fbee04c 100644 --- a/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDevice.java +++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDevice.java @@ -48,8 +48,15 @@ public class AsDevice extends BaseEntity private String classifyName; /** 型号id */ + @Excel(name = "型号id") private Long modelId; + @Excel(name = "mac集合") + private List macList; + + @Excel(name = "未查询到数据的mac号集合") + private List missingMacs; + /** 型号 */ @Excel(name = "型号") private String model; @@ -175,4 +182,8 @@ public class AsDevice extends BaseEntity /** 设备前缀 */ @Excel(name = "型号前缀") private String pre; + + @Excel(name = "型号图片") + private String modelPicture; + } diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDeviceQuery.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDeviceQuery.java index 085c026..feba6b7 100644 --- a/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDeviceQuery.java +++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDeviceQuery.java @@ -6,5 +6,5 @@ import java.util.List; @Data public class AsDeviceQuery extends AsDevice{ - private List macList; + } diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsDeviceMapper.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsDeviceMapper.java index 209b695..c24ce2d 100644 --- a/AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsDeviceMapper.java +++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsDeviceMapper.java @@ -37,7 +37,7 @@ public interface AsDeviceMapper extends BaseMapper * @param asDevice 设备列表 * @return 设备列表集合 */ - public List selectAsDeviceList(AsDeviceQuery asDevice); + public List selectAsDeviceList(AsDevice asDevice); /** * 新增设备列表 diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsDeviceService.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsDeviceService.java index 94bb673..2e86a15 100644 --- a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsDeviceService.java +++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsDeviceService.java @@ -127,7 +127,7 @@ public interface IAsDeviceService /** * 获取已录入设备列表 */ - List getExistMac(List mac); + List getExistMac(AsDevice asDevice); /** * sn和mac号绑定 diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java index 00dbb6a..37e2914 100644 --- a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java +++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java @@ -38,10 +38,7 @@ import javax.annotation.Resource; import java.io.UnsupportedEncodingException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -660,10 +657,20 @@ public class AsDeviceServiceImpl extends ServiceImpl i * 获取已录入设备列表 */ @Override - public List getExistMac(List macs) { - AsDeviceQuery asDeviceQuery = new AsDeviceQuery(); - asDeviceQuery.setMacList(macs); - return asDeviceMapper.selectAsDeviceList(asDeviceQuery); + public List getExistMac(AsDevice asDevice) { + // 进行多条件查询 + String mac = asDevice.getMac(); + if(mac != null && !mac.isEmpty()){ + String[] macArray = mac.split(","); + if (macArray.length > 1){ + asDevice.setMacList(Arrays.asList(macArray)); + // 避免mac模糊查询的干扰 + asDevice.setMac(null); + }else { + asDevice.setMac(mac); + } + } + return asDeviceMapper.selectAsDeviceList(asDevice); } /** diff --git a/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml b/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml index 03629d7..9ceb57f 100644 --- a/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml +++ b/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml @@ -79,8 +79,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ad.mode_str, ad.bluetooth_id, ad.bluetooth_name, - ad.pre + ad.model_name, + ad.pre, + am.picture as modelPicture from as_device ad + left join as_model am on ad.model_id = am.model_id