|
@@ -56,6 +56,17 @@ public class TAlarmClockController {
|
|
return ResponseEntity.status(HttpStatus.OK)
|
|
return ResponseEntity.status(HttpStatus.OK)
|
|
.body(new ResultMessage().setCode(true).setData(alarmClockList).setMessage("SUCCESS"));
|
|
.body(new ResultMessage().setCode(true).setData(alarmClockList).setMessage("SUCCESS"));
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @ApiOperation(value = "获取某台机器闹钟")
|
|
|
|
+ @GetMapping("/getList")
|
|
|
|
+ public ResponseModel<?> getList(String equipmentId, String adminId){
|
|
|
|
+ LambdaQueryWrapper<TAlarmClock> query = Wrappers.lambdaQuery();
|
|
|
|
+ query.like(TAlarmClock::getEquipmentIds,equipmentId);
|
|
|
|
+ query.eq(TAlarmClock::getAdminId,Long.valueOf(adminId));
|
|
|
|
+ List<TAlarmClock> alarmClockList = tAlarmClockService.list(query);
|
|
|
|
+ return R.ok(alarmClockList);
|
|
|
|
+ }
|
|
|
|
+
|
|
@ApiOperation(value = "添加闹钟")
|
|
@ApiOperation(value = "添加闹钟")
|
|
@PostMapping("/add")
|
|
@PostMapping("/add")
|
|
public ResponseEntity<?> add(@RequestBody TAlarmClock alarmClock){
|
|
public ResponseEntity<?> add(@RequestBody TAlarmClock alarmClock){
|
|
@@ -224,10 +235,6 @@ public class TAlarmClockController {
|
|
oldAlarmClock.setWeek(alarmClock.getWeek()+",");
|
|
oldAlarmClock.setWeek(alarmClock.getWeek()+",");
|
|
tAlarmClockService.updateById(oldAlarmClock);
|
|
tAlarmClockService.updateById(oldAlarmClock);
|
|
//删除其对应的单个机器的数据
|
|
//删除其对应的单个机器的数据
|
|
-// TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
|
|
|
|
-// TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
|
|
|
|
-// criteria.andClockIdEqualTo(oldAlarmClock.getId());
|
|
|
|
-// tAlarmClockItemService.deleteByOption(itemExample);
|
|
|
|
LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
|
|
query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
|
|
query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
|
|
List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
|
|
List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
|
|
@@ -251,10 +258,6 @@ public class TAlarmClockController {
|
|
oldAlarmClock.setHour(alarmClock.getHour()+":00");
|
|
oldAlarmClock.setHour(alarmClock.getHour()+":00");
|
|
tAlarmClockService.updateById(oldAlarmClock);
|
|
tAlarmClockService.updateById(oldAlarmClock);
|
|
//删除其对应的单个机器的数据
|
|
//删除其对应的单个机器的数据
|
|
-// TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
|
|
|
|
-// TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
|
|
|
|
-// criteria.andClockIdEqualTo(oldAlarmClock.getId());
|
|
|
|
-// tAlarmClockItemService.deleteByOption(itemExample);
|
|
|
|
LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
|
|
query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
|
|
query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
|
|
List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
|
|
List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
|
|
@@ -273,10 +276,6 @@ public class TAlarmClockController {
|
|
oldAlarmClock.setModifyDate(new Date());
|
|
oldAlarmClock.setModifyDate(new Date());
|
|
tAlarmClockService.updateById(oldAlarmClock);
|
|
tAlarmClockService.updateById(oldAlarmClock);
|
|
//删除其对应的单个机器的数据
|
|
//删除其对应的单个机器的数据
|
|
-// TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
|
|
|
|
-// TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
|
|
|
|
-// criteria.andClockIdEqualTo(oldAlarmClock.getId());
|
|
|
|
-// tAlarmClockItemService.deleteByOption(itemExample);
|
|
|
|
LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
|
|
query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
|
|
query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
|
|
List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
|
|
List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
|