|
@@ -310,10 +310,6 @@ public class TAlarmClockController {
|
|
|
oldAlarmClock.setWeek(alarmClock.getWeek()+",");
|
|
|
tAlarmClockService.updateById(oldAlarmClock);
|
|
|
//删除其对应的单个机器的数据
|
|
|
-// TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
|
|
|
-// TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
|
|
|
-// criteria.andClockIdEqualTo(oldAlarmClock.getId());
|
|
|
-// tAlarmClockItemService.deleteByOption(itemExample);
|
|
|
LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
|
|
|
query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
|
|
|
List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
|
|
@@ -344,10 +340,6 @@ public class TAlarmClockController {
|
|
|
oldAlarmClock.setWeek(alarmClock.getWeek()+",");
|
|
|
tAlarmClockService.updateById(oldAlarmClock);
|
|
|
//删除其对应的单个机器的数据
|
|
|
-// TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
|
|
|
-// TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
|
|
|
-// criteria.andClockIdEqualTo(oldAlarmClock.getId());
|
|
|
-// tAlarmClockItemService.deleteByOption(itemExample);
|
|
|
LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
|
|
|
query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
|
|
|
List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
|
|
@@ -375,10 +367,6 @@ public class TAlarmClockController {
|
|
|
oldAlarmClock.setWeek(alarmClock.getWeek()+",");
|
|
|
tAlarmClockService.updateById(oldAlarmClock);
|
|
|
//删除其对应的单个机器的数据
|
|
|
-// TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
|
|
|
-// TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
|
|
|
-// criteria.andClockIdEqualTo(oldAlarmClock.getId());
|
|
|
-// tAlarmClockItemService.deleteByOption(itemExample);
|
|
|
LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
|
|
|
query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
|
|
|
List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
|
|
@@ -402,10 +390,6 @@ public class TAlarmClockController {
|
|
|
oldAlarmClock.setHour(alarmClock.getHour()+":00");
|
|
|
tAlarmClockService.updateById(oldAlarmClock);
|
|
|
//删除其对应的单个机器的数据
|
|
|
-// TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
|
|
|
-// TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
|
|
|
-// criteria.andClockIdEqualTo(oldAlarmClock.getId());
|
|
|
-// tAlarmClockItemService.deleteByOption(itemExample);
|
|
|
LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
|
|
|
query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
|
|
|
List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
|
|
@@ -473,6 +457,21 @@ public class TAlarmClockController {
|
|
|
tAlarmClockService.removeById(alarmClock.getId());
|
|
|
return R.ok();
|
|
|
}
|
|
|
+
|
|
|
+ @ApiOperation("修改闹钟状态")
|
|
|
+ @PostMapping("/updataStatus")
|
|
|
+ public ResponseModel<?> updataStatus(@RequestBody TAlarmClock alarmClock){
|
|
|
+ if(alarmClock.getId()==null){
|
|
|
+ return R.fail(ResponseCodesEnum.A0001);
|
|
|
+ }
|
|
|
+ TAlarmClock tAlarmClock = tAlarmClockService.getById(alarmClock.getId());
|
|
|
+ if(tAlarmClock!=null){
|
|
|
+ tAlarmClock.setStatus(alarmClock.getStatus());
|
|
|
+ tAlarmClockService.updateById(tAlarmClock);
|
|
|
+ }
|
|
|
+ return R.ok();
|
|
|
+ }
|
|
|
+
|
|
|
// 添加对应单个机器的列表
|
|
|
private void addItemList(TAlarmClock alarmClock) {
|
|
|
Long alarmClockItemId = alarmClock.getId();
|