去掉多余注入

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

@@ -6,7 +6,6 @@ import com.xy.dto.MercMiniDeviceDto;
 import com.xy.dto.be.MercDto;
 import com.xy.entity.DeviceInfo;
 import com.xy.enums.MercStatus;
-import com.xy.service.DeviceInfoService;
 import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.service.be.MercFeignService;
 import com.xy.utils.MercAuthUtils;
@@ -36,11 +35,9 @@ import java.time.LocalDateTime;
 @Api(tags = "小程序-设备")
 public class MercMiniDeviceController {
 
-    private final DeviceInfoService deviceInfoService;
-
     private final MercFeignService mercFeignService;
 
-    private final DeviceInfoServiceImpl deviceInfoServiceImpl;
+    private final DeviceInfoServiceImpl deviceInfoService;
 
     @ApiOperation("商户设备首页统计")
     @PostMapping("mercHomeStatistical")
@@ -73,7 +70,7 @@ public class MercMiniDeviceController {
     @PostMapping("active")
     @ApiOperation("激活设备")
     public R active(@RequestBody MercMiniDeviceDto.Active active) {
-        DeviceInfo deviceInfo = deviceInfoServiceImpl.getById(active.getDeviceId());
+        DeviceInfo deviceInfo = deviceInfoService.getById(active.getDeviceId());
         if (deviceInfo.getActiveState().equals(Integer.valueOf(DictSonEnum.DEVICE_ACTIVE_STATUS_1.getKey()))) {
             return R.fail("机器已激活");
         }
@@ -98,7 +95,7 @@ public class MercMiniDeviceController {
                 .setBusyState(Integer.valueOf(DictSonEnum.DEVICE_BUSY_STATUS_1.getKey()))
                 .setActiveTime(LocalDateTime.now())
                 .setShowStatus(true);
-        deviceInfoServiceImpl.updateById(updateDeviceInfo);
+        deviceInfoService.updateById(updateDeviceInfo);
         return R.ok();
     }
 
@@ -111,8 +108,9 @@ public class MercMiniDeviceController {
                 .setDeviceId(deviceId)
                 .setMercId(mercId)
                 .setBusyState(busySate.getBusyState());
-        deviceInfoServiceImpl.updateById(updateDeviceInfo);
+        deviceInfoService.updateById(updateDeviceInfo);
         return R.ok();
     }
 
+
 }