init

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/AddAlarmConfigDTO.java

@@ -1,5 +1,6 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.model.dto;
+package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig;
 
+import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
@@ -19,6 +20,10 @@ public class AddAlarmConfigDTO {
      */
     private String objId;
     /**
+     * 项目id
+     */
+    private String projectId;
+    /**
      * 设备类编码
      */
     private String classCode;

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/OrderDTO.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.model.dto;
+package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common;
 
 /**
  * 排序通用类

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/QueryAlarmConfigDTO.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.model.dto;
+package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common;
 
 import java.util.List;
 

AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/model/dto/QueryDTO.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.energyalarmstarter.alarmdata.model.dto;
+package com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common;
 
 import lombok.Data;
 

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

@@ -1,12 +1,11 @@
 package com.persagy.apm.energyalarmstarter.alarmdata.service;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.client.AlarmClient;
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AddAlarmConfigDTO;
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.QueryAlarmConfigDTO;
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.QueryDTO;
+import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.AddAlarmConfigDTO;
+import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryAlarmConfigDTO;
+import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.QueryDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmConfigItem;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.DmpUpsertVO;
 import com.persagy.apm.energyalarmstarter.alarmdata.utils.DmpResultUtil;