fix：“修复闹钟无法删除的问题“

src/main/java/com/szwl/controller/TAlarmClockController.java

@@ -5,6 +5,9 @@ import cn.com.crbank.ommo.bean.ResultMessage;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.constant.ResponseCodesEnum;
+import com.szwl.model.bo.R;
+import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.TAlarmClock;
 import com.szwl.model.entity.TAlarmClockItem;
 import com.szwl.model.entity.TEquipment;
@@ -456,30 +459,20 @@ public class TAlarmClockController {
     }
     @ApiOperation(value = "删除闹钟")
     @PostMapping("/delete")
-    public ResponseEntity<?> delete(@RequestBody TAlarmClock alarmClock){
+    public ResponseModel<?> delete(@RequestBody TAlarmClock alarmClock){
         if(alarmClock.getId()==null){
-            return ResponseEntity.status(HttpStatus.OK)
-                    .body(new ResultMessage().setCode(false).setData(null).setMessage("数据为空"));
+            return R.fail(ResponseCodesEnum.A0001);
         }
-//        TAlarmClockItemExample example = new TAlarmClockItemExample();
-//        TAlarmClockItemExample.Criteria criteria = example.createCriteria();
-//        criteria.andClockIdEqualTo(alarmClock.getId());
-//        criteria.andAdminIdEqualTo(alarmClock.getAdminId());
-//        Integer integer1 = tAlarmClockItemService.deleteByOption(example);
-//        Integer integer = tAlarmClockService.deleteById(alarmClock.getId());
-
         LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
         query.eq(TAlarmClockItem::getClockId,alarmClock.getId());
         List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
-        if(list.size()>0){
+        if(!list.isEmpty()){
             for(TAlarmClockItem tAlarmClockItem:list){
                 tAlarmClockItemService.removeById(tAlarmClockItem.getId());
             }
-            tAlarmClockService.removeById(alarmClock.getId());
         }
-        sentMessageToEquiment(alarmClock.getType(),alarmClock.getEquipmentIds(),alarmClock.getAdminId());
-        return ResponseEntity.status(HttpStatus.OK)
-                .body(new ResultMessage().setCode(true).setData(null).setMessage("SUCCESS"));
+        tAlarmClockService.removeById(alarmClock.getId());
+        return R.ok();
     }
     // 添加对应单个机器的列表
     private void addItemList(TAlarmClock alarmClock) {
@@ -495,7 +488,6 @@ public class TAlarmClockController {
             alarmClockItem.setWeek(alarmClock.getWeek());
             alarmClockItem.setStatus(alarmClock.getStatus());
             alarmClockItem.setType(alarmClock.getType());
-//                alarmClockItem.setIsCirculate(alarmClock.getIsCirculate());
             alarmClockItem.setModifyDate(new Date());
             alarmClockItem.setCreateDate(new Date());
             tAlarmClockItemService.save(alarmClockItem);
@@ -508,13 +500,6 @@ public class TAlarmClockController {
         if(eids.length>0){
             for (int i = 0;i < eids.length;i++){
                 TEquipment equipment = tEquipmentService.getById(Long.valueOf(eids[i]));
-//                TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
-//                TAlarmClockItemExample.Criteria exampleCriteria = itemExample.createCriteria();
-//                exampleCriteria.andEquipmentIdEqualTo(Long.valueOf(eids[i]));
-//                exampleCriteria.andTypeEqualTo(type);
-//                exampleCriteria.andAdminIdEqualTo(adminId);
-//                exampleCriteria.andStatusEqualTo("1");
-//                List<TAlarmClockItem> tAlarmClockItems = tAlarmClockItemService.selectByOption(itemExample);
                 LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
                 query.eq(TAlarmClockItem::getEquipmentId,Long.valueOf(eids[i]));
                 query.eq(TAlarmClockItem::getType,type);
@@ -533,7 +518,6 @@ public class TAlarmClockController {
                 }
                 kindData.put("data" , list);
                 tEquipmentService.sentMessage(equipment.getClientId(),PushUtils.buildJson("alarmClock", kindData.toString()).toString());
-//					PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("alarmClock", kindData.toString()).toString());
 
             }
         }