|
@@ -410,18 +410,18 @@ public class MsgAlarmController extends BaseController {
|
|
msgAlarm.setReleasedUrl(url);
|
|
msgAlarm.setReleasedUrl(url);
|
|
msgAlarmService.updateById(msgAlarm);
|
|
msgAlarmService.updateById(msgAlarm);
|
|
boolean b = msgAlarmService.updateById(msgAlarm);
|
|
boolean b = msgAlarmService.updateById(msgAlarm);
|
|
- LambdaQueryWrapper<MsgAppPush> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
- wrapper.eq(MsgAppPush::getAlarmId, msgAlarm.getAlarmId());
|
|
|
|
- MsgAppPush app = new MsgAppPush();
|
|
|
|
- app.setStatus(1);
|
|
|
|
- boolean update = msgAppPushService.update(app, wrapper);
|
|
|
|
|
|
+// LambdaQueryWrapper<MsgAppPush> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
+// wrapper.eq(MsgAppPush::getAlarmId, msgAlarm.getAlarmId());
|
|
|
|
+// MsgAppPush app = new MsgAppPush();
|
|
|
|
+// app.setStatus(1);
|
|
|
|
+// boolean update = msgAppPushService.update(app, wrapper);
|
|
LambdaQueryWrapper<MsgWebPush> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<MsgWebPush> queryWrapper = new LambdaQueryWrapper<>();
|
|
queryWrapper.eq(MsgWebPush::getAlarmId, msgAlarm.getAlarmId());
|
|
queryWrapper.eq(MsgWebPush::getAlarmId, msgAlarm.getAlarmId());
|
|
MsgWebPush web = new MsgWebPush();
|
|
MsgWebPush web = new MsgWebPush();
|
|
web.setOnline("1");
|
|
web.setOnline("1");
|
|
boolean update1 = msgWebPushService.update(web, queryWrapper);
|
|
boolean update1 = msgWebPushService.update(web, queryWrapper);
|
|
|
|
|
|
- if (b && update && update1) {
|
|
|
|
|
|
+ if (b && update1) {
|
|
return AjaxResult.success();
|
|
return AjaxResult.success();
|
|
} else {
|
|
} else {
|
|
return AjaxResult.error();
|
|
return AjaxResult.error();
|