质检特例

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

@@ -94,7 +94,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @ApiOperation("分页")
     public R<PageBean<DeviceInfoDto.Vo>> pageSingle(DeviceInfoDto.PageSingle dto) {
         PageBean pageBean = dto.getPage();
-        LambdaQueryWrapper<DeviceInfo> lqw = new MybatisPlusQuery().eqWrapper(dto,DeviceInfo.class)
+        LambdaQueryWrapper<DeviceInfo> lqw = new MybatisPlusQuery().eqWrapper(dto, DeviceInfo.class)
                 .build();
         IPage<DeviceInfo> iPage = page(toIPage(pageBean), lqw);
         return R.ok(toPageBean(DeviceInfoDto.Vo.class, iPage));
@@ -201,14 +201,18 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             return R.fail("设备不存在");
         }
         DeviceStatusDto.Vo deviceStatus = deviceInfo.getDeviceStatus();
-        check(deviceInfo.getFreezeStatus(), 2, "设备已冻结");
         SysDictRedis sysDictRedis = SysDictUtils.get(DictsEnum.DEVICE_FAULT_LEVEL_PAY_THRESHOLD.getKey(), DictsSonEnum.DEVICE_FAULT_LEVEL_PAY_THRESHOLD_NOT_PAY.getKey());
         if (deviceInfo.getFaultLevel() >= Integer.valueOf(sysDictRedis.getValue())) {
             return R.fail("设备故障");
         }
         check(deviceStatus.getNetState(), 2, "设备已离线");
         check(obj.getDoor() != null && obj.getDoor() == 1 ? deviceStatus.getDoorStateR() : deviceStatus.getDoorStateL(), 1, "设备正在使用中，请稍后");
-        check(obj.getDoor() != null && obj.getDoor() == 1 ? deviceStatus.getLockStateR() : deviceStatus.getLockStateL(), 2, "设备已锁机");
+        //质检用户不检查
+        SysDictRedis qualitySets = SysDictUtils.get(DictsEnum.QUALITY_MERC_SETS.getKey(), DictsSonEnum.QUALITY_MERC_SETS_MERC_CODE.getKey());
+        if (!qualitySets.getValue().equals(deviceInfo.getMercCode())) {
+            check(deviceInfo.getFreezeStatus(), 2, "设备已冻结");
+            check(obj.getDoor() != null && obj.getDoor() == 1 ? deviceStatus.getLockStateR() : deviceStatus.getLockStateL(), 2, "设备已锁机");
+        }
         return R.ok(deviceInfo);
     }
 
@@ -272,8 +276,6 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     }
 
 
-
-
     @Override
     @ApiOperation("更新商户点位")
     public R updatePlace(@RequestBody @Validated DeviceInfoDto.UpdatePlace updatePlace) {

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

@@ -76,7 +76,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
     @Lock(value = "save.deviceId", prefix = "device_register_")
     public R save(@RequestBody @Validated DeviceRegisterDto.Save save) {
         //重复校验
-        DeviceRegister deviceRegister = copy(DeviceRegister.class, save);
+        DeviceRegister deviceRegister = copy(DeviceRegister.class, save.setDeviceSn(save.getDeviceSn().toUpperCase()));
         DeviceCreateIds deviceCreateIds = deviceCreateIdsMapper.selectById(deviceRegister.getDeviceId());
         if (deviceCreateIds == null) {
             return R.fail("设备ID不存在");
@@ -84,7 +84,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
         if (deviceCreateIds.getBindState()) {
             return R.fail("设备ID已被绑定");
         }
-        long count = count(new LambdaQueryWrapper<DeviceRegister>().eq(DeviceRegister::getDeviceSn, save.getDeviceSn()));
+        long count = count(new LambdaQueryWrapper<DeviceRegister>().eq(DeviceRegister::getDeviceSn, deviceRegister.getDeviceSn()));
         if (count > 0) {
             return R.fail("设备SN已被绑定");
         }

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

@@ -35,6 +35,8 @@ public enum DictsEnum {
 
     DEVICE_TYPE("device_type", "设备-机器类型"),
 
+    QUALITY_MERC_SETS("quality_merc_sets", "质检商户配置"),
+
     ;
 
     private String key;

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

@@ -62,6 +62,8 @@ public enum DictsSonEnum {
 
     DEVICE_TYPE_5("5", "设备-机器类型-支付宝视动态觉柜"),
 
+    QUALITY_MERC_SETS_MERC_CODE("merc_code", "质检商户配置-质检商户账号code"),
+
     ;
 
     private String key;