Merge remote-tracking branch 'origin/master' into prod

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -27,6 +27,7 @@ import com.xy.mapper.entity.DeviceInfoQueryPage;
 import com.xy.util.ExcelUtils;
 import com.xy.util.FileUtils;
 import com.xy.utils.*;
+import com.xy.utils.enums.DeviceActiveStateEnum;
 import com.xy.utils.enums.DeviceNetSateType;
 import com.xy.utils.enums.DictEnum;
 import com.xy.utils.enums.DictSonEnum;
@@ -547,6 +548,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         List<DeviceInfoDto.MercHomeListVO> dataList = new ArrayList<>(list.size());
 
         LambdaQueryWrapper<DeviceInfo> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(DeviceInfo::getActiveState, DeviceActiveStateEnum.TRUE.getCode());
         lqw.eq(mercId != null, DeviceInfo::getMercId, mercId);
         lqw.eq(deviceId != null, DeviceInfo::getDeviceId, deviceId);
         lqw.like(StrUtil.isNotEmpty(deviceName), DeviceInfo::getDeviceName, deviceName);

device-api/src/main/java/com/xy/utils/enums/DeviceActiveStateEnum.java

@@ -0,0 +1,24 @@
+package com.xy.utils.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.ToString;
+
+/**
+ * <p>
+ * 设备激活状态
+ * </p>
+ *
+ * @author hechunping
+ * @since 2023/3/23
+ */
+@Getter
+@ToString
+@AllArgsConstructor
+public enum DeviceActiveStateEnum {
+    TRUE("1","已激活"),
+    FALSE("2", "未激活")
+    ;
+    private String code;
+    private String msg;
+}