From eccde23ea401394aed432865bfbbbcb89539ba20 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 18 Aug 2021 15:33:45 +0800
Subject: [PATCH] 特殊设备历史表数据查询、删除，校准接口判断特殊设备表
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
index 5a343e6..cbf5672 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
@@ -7,9 +7,11 @@
import com.moral.api.entity.Device;
import com.moral.api.entity.DeviceAdjustValue;
import com.moral.api.entity.Sensor;
+import com.moral.api.entity.SpecialDevice;
import com.moral.api.mapper.DeviceAdjustValueMapper;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.SensorMapper;
+import com.moral.api.mapper.SpecialDeviceMapper;
import com.moral.api.service.DeviceAdjustValueService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
@@ -47,6 +49,9 @@
private DeviceMapper deviceMapper;
@Autowired(required = false)
+ private SpecialDeviceMapper specialDeviceMapper;
+
+ @Autowired(required = false)
private SensorMapper sensorMapper;
@Autowired
@@ -72,7 +77,10 @@
QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
wrapper_device.eq("is_delete",Constants.NOT_DELETE);
wrapper_device.eq("mac",deviceAdjustValue.getMac());
- if (deviceMapper.selectCount(wrapper_device)==0){
+ QueryWrapper<SpecialDevice> wrapper_specialDevice = new QueryWrapper<>();
+ wrapper_specialDevice.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_specialDevice.eq("mac",deviceAdjustValue.getMac());
+ if (deviceMapper.selectCount(wrapper_device)==0 && specialDeviceMapper.selectCount(wrapper_specialDevice)==0){
resultMap.put("code",ResponseCodeEnum.DEVICE_IS_NULL.getCode());
resultMap.put("msg",ResponseCodeEnum.DEVICE_IS_NULL.getMsg());
return resultMap;
--
Gitblit v1.8.0