删除重复的更新报警定义方法

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/service/AlarmConfigServiceImpl.java

@@ -43,12 +43,6 @@ public class AlarmConfigServiceImpl {
         return DmpResultUtil.singleConvert(alarmConfig, DmpUpsertVO.class);
     }
 
-    public DmpResult<DmpUpsertVO> update(UpdateAlarmConfigDTO updateAlarmConfigDTO) throws Exception{
-        JSONObject jsonObject = Obj2JSONObject.convert(updateAlarmConfigDTO);
-        DmpResult<JSONObject> alarmConfig = alarmClient.updateAlarmConfig(updateAlarmConfigDTO.fetchParams(), jsonObject);
-        return DmpResultUtil.singleConvert(alarmConfig, DmpUpsertVO.class);
-    }
-
     /**
      * 查询报警条件
      *
@@ -79,23 +73,20 @@ public class AlarmConfigServiceImpl {
         return DmpResultUtil.multiConvert(result, AlarmConfigItem.class);
     }
 
-    public DmpResult<DmpUpsertVO> update(AddAlarmConfigDTO addAlarmConfigDTO) throws Exception{
-        JSONObject jsonObject = Obj2JSONObject.convert(addAlarmConfigDTO);
-        DmpResult<JSONObject> alarmConfig = alarmClient.createAlarmConfig(addAlarmConfigDTO.fetchParams(), jsonObject);
+    /**
+     * 更新报警条件
+     *
+     * @param updateAlarmConfigDTO 入参
+     * @return 报警条件id
+     * @author lixing
+     * @version V1.0 2021/9/15 9:22 下午
+     */
+    public DmpResult<DmpUpsertVO> update(UpdateAlarmConfigDTO updateAlarmConfigDTO) throws Exception{
+        JSONObject jsonObject = Obj2JSONObject.convert(updateAlarmConfigDTO);
+        DmpResult<JSONObject> alarmConfig = alarmClient.updateAlarmConfig(updateAlarmConfigDTO.fetchParams(), jsonObject);
         return DmpResultUtil.singleConvert(alarmConfig, DmpUpsertVO.class);
     }
 
-    public static void main(String[] args) throws Exception{
-        AddAlarmConfigDTO addAlarmConfigDTO = new AddAlarmConfigDTO();
-        addAlarmConfigDTO.setObjId("1");
-        AlarmCondition alarmCondition = new AlarmCondition();
-        alarmCondition.setConfigs("configs");
-        alarmCondition.setTrigger("trigger");
-        addAlarmConfigDTO.setCondition(alarmCondition);
-        JSONObject jsonObject = Obj2JSONObject.convert(addAlarmConfigDTO);
-        System.out.println(jsonObject);
-    }
-
     /**
      * 批量创建
      *
@@ -141,14 +132,25 @@ public class AlarmConfigServiceImpl {
     /**
      * 批量删除
      *
-     * @param batchUpdateAlarmConfigDTO 入参
+     * @param batchDeleteAlarmConfigDTO 入参
      * @return nothing
      * @author lixing
      * @version V1.0 2021/9/16 9:38 下午
      */
-    public DmpResult<DmpBatchUpsertVO> batchDelete(BatchDeleteAlarmConfigDTO batchUpdateAlarmConfigDTO) throws Exception {
-        JSONObject jsonObject = Obj2JSONObject.convert(batchUpdateAlarmConfigDTO);
-        DmpResult<JSONObject> result = alarmClient.batchDeleteAlarmConfig(batchUpdateAlarmConfigDTO.fetchParams(), jsonObject);
+    public DmpResult<DmpBatchUpsertVO> batchDelete(BatchDeleteAlarmConfigDTO batchDeleteAlarmConfigDTO) throws Exception {
+        JSONObject jsonObject = Obj2JSONObject.convert(batchDeleteAlarmConfigDTO);
+        DmpResult<JSONObject> result = alarmClient.batchDeleteAlarmConfig(batchDeleteAlarmConfigDTO.fetchParams(), jsonObject);
         return DmpResultUtil.singleConvert(result, DmpBatchUpsertVO.class);
     }
+
+    public static void main(String[] args) throws Exception{
+        AddAlarmConfigDTO addAlarmConfigDTO = new AddAlarmConfigDTO();
+        addAlarmConfigDTO.setObjId("1");
+        AlarmCondition alarmCondition = new AlarmCondition();
+        alarmCondition.setConfigs("configs");
+        alarmCondition.setTrigger("trigger");
+        addAlarmConfigDTO.setCondition(alarmCondition);
+        JSONObject jsonObject = Obj2JSONObject.convert(addAlarmConfigDTO);
+        System.out.println(jsonObject);
+    }
 }