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

# Conflicts:
#	device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java
#	device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.xy.annotate.RestMappingController;
@@ -35,8 +34,6 @@ import com.xy.vo.DeviceDetailVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -66,7 +63,6 @@ public class MercMiniDeviceController {
      * auth-code有效期30分钟，单位：s ,
      */
     public static final Integer AUTH_CODE_TIMEOUT = 1800;
-    private static final Logger log = LoggerFactory.getLogger(MercMiniDeviceController.class);
     private final MercFeignService mercFeignService;
     private final DeviceInfoServiceImpl deviceInfoService;
     private final DeviceSysinfoServiceImpl deviceSysinfoService;
@@ -168,12 +164,7 @@ public class MercMiniDeviceController {
     @PostMapping("mercHomeStatistical")
     public R<DeviceInfoDto.MercHomeStatisticalVO> mercHomeStatistical(@RequestBody @Valid DeviceInfoDto.MercHomeQueryDTO dto) {
         dto.setMercId(MercAuthUtils.getMercId());
-
-        List<Long> myDevices = getMyDevices();
-        dto.setMyDeviceIds(myDevices);
-        if ("393010594508869".equals(String.valueOf(dto.getMercId())) || "498503052238597".equals(String.valueOf(dto.getMercId()))) {
-            log.info("[商户设备首页统计]#myDevices {}", JSONUtil.toJsonPrettyStr(myDevices));
-        }
+        dto.setMyDeviceIds(getMyDevices());
         return deviceInfoService.mercHomeStatistical(dto);
     }
 
@@ -406,11 +397,10 @@ public class MercMiniDeviceController {
         boolean mercAdmin = MercAuthUtils.isMercAdmin();
         Long mercId = MercAuthUtils.getMercId();
         if (mercAdmin) {
-            boolean isQa = false;
-            if ("393010594508869".equals(String.valueOf(mercId)) || "498503052238597".equals(String.valueOf(mercId))) {
-                isQa = true;
-            }
-            List<DeviceInfo> deviceInfos = deviceInfoService.list(Wrappers.<DeviceInfo>lambdaQuery().eq(DeviceInfo::getMercId, mercId).eq(!isQa, DeviceInfo::getActiveState, DeviceActiveStateEnum.TRUE.getCode()));
+            MercAuthUtils.MercAuth.Merc merc = MercAuthUtils.getMercAuth().getMerc();
+            boolean qaModeMerc = MercAuthUtils.isQaModeMerc(merc.getMercCode());
+            //非QA需要查激活的设备
+            List<DeviceInfo> deviceInfos = deviceInfoService.list(Wrappers.<DeviceInfo>lambdaQuery().eq(DeviceInfo::getMercId, mercId).eq(!qaModeMerc, DeviceInfo::getActiveState, DeviceActiveStateEnum.TRUE.getCode()));
             if (CollUtil.isEmpty(deviceInfos)) {
                 return CollUtil.newArrayList();
             }

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

@@ -1179,12 +1179,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             }
         }
 
-        boolean isQa = false;
-        if ("393010594508869".equals(String.valueOf(mercId)) || "498503052238597".equals(String.valueOf(mercId))) {
-            isQa = true;
-        } else {
-            dto.setActiveState("1");
-        }
+        boolean isQa = dto.getIsQaMode();
+
         List<Long> searchDeviceIds = new ArrayList<>();
         if (StrUtil.isNotEmpty(searchKey) || StrUtil.isNotEmpty(dto.getAdminName())) {
             // 名称或者编号搜索设备
@@ -1268,16 +1264,14 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
 
         LambdaQueryWrapper<DeviceInfo> lqw = new LambdaQueryWrapper<>();
         // 非质检商户才需要激活
-//        lqw.eq(!isQa, DeviceInfo::getActiveState, DeviceActiveStateEnum.TRUE.getCode());
+        lqw.eq(!isQa, DeviceInfo::getActiveState, DeviceActiveStateEnum.TRUE.getCode());
         lqw.eq(mercId != null, DeviceInfo::getMercId, mercId);
         lqw.eq(busyStatus != null, DeviceInfo::getBusyState, busyStatus);
         lqw.eq(deviceType != null, DeviceInfo::getDeviceType, deviceType);
         lqw.in(CollUtil.isNotEmpty(deviceIdList), DeviceInfo::getDeviceId, deviceIdList);
         lqw.like(StrUtil.isNotEmpty(deviceName), DeviceInfo::getDeviceName, deviceName).orderByAsc(true, DeviceInfo::getDeviceName, DeviceInfo::getDeviceId);
         List<DeviceInfoDto.Vo> deviceInfoList = copy(DeviceInfoDto.Vo.class, this.list(lqw));
-        if (isQa) {
-            //log.info("[小程序首页设备列表]：deviceIdList {}，deviceInfoList:{}", JSONUtil.toJsonPrettyStr(deviceIdList), JSONUtil.toJsonPrettyStr(deviceInfoList));
-        }
+
         // 根据点位ID查询管理员名字
         List<Long> placeIdList = deviceInfoList.stream().map(DeviceInfoDto.Vo::getPlaceId).distinct().filter(Objects::nonNull).collect(Collectors.toList());
         List<MercPlaceDto.Vo> mercPlaceList = mercPlaceService.list(new MercPlaceDto.ListDto().setIds(placeIdList)).getData();

device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -1036,6 +1036,9 @@ public class DeviceInfoDto {
         @ApiModelProperty("管理员名字")
         private String adminName;
 
+        @ApiModelProperty("是否QA模式")
+        private Boolean isQaMode;
+
     }