# WARNING: head commit changed in the meantime

Merge branch 'v3.0.0' of
http://39.106.8.246:3003/apm/energy-alarm-service.git into v3.0.0

src/main/java/com/persagy/apm/dmpalarm/controller/AlarmCommentController.java

@@ -44,6 +44,11 @@ public class AlarmCommentController {
         return alarmCommentService.create(param);
     }
 
+    @PostMapping("/delete")
+    public MapResponse delete(@RequestBody AlarmComment param) {
+        return alarmCommentService.delete(param);
+    }
+
     @PostMapping("/sendMessage")
     public MapResponse update(@RequestBody AlarmComment param) {
         for (int i = 0; i < 2000; i++) {

src/main/java/com/persagy/apm/dmpalarm/criteria/CriteriaUtils.java

@@ -137,6 +137,7 @@ public class CriteriaUtils {
 		} else {
 			Page<T> page = baseMapper.selectPage(new Page<>(criteria.getPage(), criteria.getSize()), queryWrapper);
 			pagedResponse.setCount(page.getTotal());
+			System.out.println(queryWrapper.getCustomSqlSegment());
 			pagedResponse.setData(page.getRecords());
 		}
 		return pagedResponse;

src/main/java/com/persagy/apm/dmpalarm/service/IAlarmCommentService.java

@@ -16,4 +16,6 @@ public interface IAlarmCommentService  {
     public PagedResponse<AlarmComment> query(JsonCriteria criteria);
 
     public MapResponse create(AlarmComment param);
+
+    public  MapResponse delete(AlarmComment param);
 }

src/main/java/com/persagy/apm/dmpalarm/service/impl/AlarmCommentServiceImpl.java

@@ -64,4 +64,13 @@ public class AlarmCommentServiceImpl extends BaseServiceImpl<BaseMapper<AlarmCom
         response.add("id", entity.getId());
         return response;
     }
+
+    @Override
+    public MapResponse delete(AlarmComment param) {
+        MapResponse response = new MapResponse();
+        boolean b=removeById(param.getId());
+        response.add("result", b);
+        return response;
+    }
+
 }