|
@@ -10,12 +10,10 @@ import com.szwl.model.entity.TAdmin;
|
|
|
import com.szwl.model.entity.TAlarmClean;
|
|
|
import com.szwl.model.entity.TEquipment;
|
|
|
import com.szwl.model.param.AlarmCleanParam;
|
|
|
-import com.szwl.model.utils.YunPianSms;
|
|
|
import com.szwl.service.TAdminService;
|
|
|
import com.szwl.service.TAlarmCleanService;
|
|
|
import com.szwl.service.TEquipmentService;
|
|
|
import com.szwl.util.IDGenerator;
|
|
|
-import io.swagger.annotations.ApiModelProperty;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -99,7 +97,7 @@ public class TAlarmCleanController {
|
|
|
return R.fail("该设备清洗提醒功能已关闭");
|
|
|
}
|
|
|
|
|
|
- Integer candyNum = null;
|
|
|
+ Integer candyNum;
|
|
|
// 首次调用
|
|
|
if (Objects.isNull(alarmClean)) {
|
|
|
TAlarmClean tAlarmClean = new TAlarmClean();
|
|
@@ -108,6 +106,7 @@ public class TAlarmCleanController {
|
|
|
TEquipment equipment = equipmentService.getOne(qw);
|
|
|
Long equipmentId = equipment.getId();
|
|
|
Long adminId = equipment.getAdminId();
|
|
|
+
|
|
|
LambdaQueryWrapper<TAdmin> wrapper = Wrappers.lambdaQuery();
|
|
|
wrapper.eq(TAdmin::getId, adminId);
|
|
|
TAdmin admin = adminService.getOne(wrapper);
|