|
@@ -19,6 +19,7 @@ import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmitem.QueryAlarmItemDTO;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmItem;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmItemServiceImpl;
|
|
|
+import com.persagy.framework.tenant.mybatis.datasource.db.holder.SaasContext;
|
|
|
import org.assertj.core.util.Lists;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
@@ -39,8 +40,8 @@ import java.util.stream.Collectors;
|
|
|
@Service
|
|
|
public class EnergyAlarmServiceImpl {
|
|
|
|
|
|
- @Value(value = "${energy.eq.run.system.code}")
|
|
|
- private String systemCode;
|
|
|
+// @Value(value = "${energy.eq.run.system.code}")
|
|
|
+// private String systemCode;
|
|
|
@Autowired
|
|
|
AlarmServiceClient alarmServiceClient;
|
|
|
@Autowired
|
|
@@ -60,7 +61,7 @@ public class EnergyAlarmServiceImpl {
|
|
|
public List<MonitorIndicatorConfigDTO> queryMonitorIndicatorConfigDTOList(String projectId) throws Exception {
|
|
|
MonitorIndicatorConfigDTO monitorIndicatorConfigDTO = MonitorIndicatorConfigDTO.builder().build();
|
|
|
monitorIndicatorConfigDTO.setProjectId(projectId);
|
|
|
- monitorIndicatorConfigDTO.setGroupCode(systemCode);
|
|
|
+ monitorIndicatorConfigDTO.setGroupCode(SaasContext.getContextGroupCode());
|
|
|
monitorIndicatorConfigDTO.setPd("asdasdasda");
|
|
|
monitorIndicatorConfigDTO.setUserId("test");
|
|
|
AlarmResult<JSONObject> result = alarmServiceClient.query(monitorIndicatorConfigDTO);
|
|
@@ -77,7 +78,7 @@ public class EnergyAlarmServiceImpl {
|
|
|
* @return: java.util.Map<java.lang.String, com.persagy.apm.diagnose.service.dto.CalculateMethodDTO>
|
|
|
*/
|
|
|
public Map<String, CalculateMethodDTO> queryCalculateMethods() throws Exception {
|
|
|
- AlarmResult<JSONObject> result = alarmServiceClient.queryCalculateMethods(CalculateMethodDTO.builder().groupCode(systemCode).userId("test").pd("asdasdasdasdadsdasdasdasdasdasd").build());
|
|
|
+ AlarmResult<JSONObject> result = alarmServiceClient.queryCalculateMethods(CalculateMethodDTO.builder().groupCode(SaasContext.getContextGroupCode()).userId("test").pd("asdasdasdasdadsdasdasdasdasdasd").build());
|
|
|
List<CalculateMethodDTO> records = AlarmResultUtil.getRecords(result, CalculateMethodDTO.class);
|
|
|
return records.stream().collect(Collectors.toMap(CalculateMethodDTO::getId, Function.identity(), (key1, key2) -> key2));
|
|
|
}
|
|
@@ -92,7 +93,7 @@ public class EnergyAlarmServiceImpl {
|
|
|
* @updateTime 2021/9/27 11:54
|
|
|
*/
|
|
|
public Map<String, String> queryObjId_indicatorAndMethodId(String projectId,String objId, List<String> indicatorIdList) throws Exception {
|
|
|
- MonitorIndicatorConfigByEquipDTO build = MonitorIndicatorConfigByEquipDTO.builder().projectId(projectId).objId(objId).monitorIndicatorId(indicatorIdList).groupCode(systemCode).userId("test").pd("wwwwwwwwww").build();
|
|
|
+ MonitorIndicatorConfigByEquipDTO build = MonitorIndicatorConfigByEquipDTO.builder().projectId(projectId).objId(objId).monitorIndicatorId(indicatorIdList).groupCode(SaasContext.getContextGroupCode()).userId("test").pd("wwwwwwwwww").build();
|
|
|
AlarmResult<JSONObject> result = alarmServiceClient.query_by_equip(build);
|
|
|
JSONObject content = result.getContent();
|
|
|
if (content == null) {
|
|
@@ -138,7 +139,7 @@ public class EnergyAlarmServiceImpl {
|
|
|
* @updateTime 2021/9/27 11:54
|
|
|
*/
|
|
|
public String queryObjIndicatorMethodId(String projectId,String objId, String indicatorId) throws Exception {
|
|
|
- MonitorIndicatorConfigByEquipDTO build = MonitorIndicatorConfigByEquipDTO.builder().projectId(projectId).objId(objId).monitorIndicatorId(Arrays.asList(indicatorId)).groupCode(systemCode).userId("test").pd("wwwwwwwwww").build();
|
|
|
+ MonitorIndicatorConfigByEquipDTO build = MonitorIndicatorConfigByEquipDTO.builder().projectId(projectId).objId(objId).monitorIndicatorId(Arrays.asList(indicatorId)).groupCode(SaasContext.getContextGroupCode()).userId("test").pd("wwwwwwwwww").build();
|
|
|
AlarmResult<JSONObject> result = alarmServiceClient.query_by_equip(build);
|
|
|
|
|
|
List<MonitorIndicatorConfigVO> records = AlarmResultUtil.getRecords(result, MonitorIndicatorConfigVO.class);
|
|
@@ -167,7 +168,7 @@ public class EnergyAlarmServiceImpl {
|
|
|
public List<AlarmRuleDTO> getProjectAlarmRules(String projectId) throws Exception {
|
|
|
AlarmRuleDTO alarmRuleDTO = AlarmRuleDTO.builder().build();
|
|
|
alarmRuleDTO.setProjectId(projectId);
|
|
|
- alarmRuleDTO.setGroupCode(systemCode);
|
|
|
+ alarmRuleDTO.setGroupCode(SaasContext.getContextGroupCode());
|
|
|
alarmRuleDTO.setPd("asdasdasda");
|
|
|
alarmRuleDTO.setUserId("test");
|
|
|
AlarmResult<JSONObject> result = alarmServiceClient.queryProjectAlarmRules(alarmRuleDTO);
|
|
@@ -189,7 +190,7 @@ public class EnergyAlarmServiceImpl {
|
|
|
for (String code:alarmItemCodeList) {
|
|
|
AlarmRuleDTO alarmRuleDTO = AlarmRuleDTO.builder().build();
|
|
|
alarmRuleDTO.setProjectId(projectId);
|
|
|
- alarmRuleDTO.setGroupCode(systemCode);
|
|
|
+ alarmRuleDTO.setGroupCode(SaasContext.getContextGroupCode());
|
|
|
alarmRuleDTO.setPd("asdasdasda");
|
|
|
alarmRuleDTO.setUserId("test");
|
|
|
alarmRuleDTO.setAlarmItemCode(code);
|
|
@@ -224,7 +225,7 @@ public class EnergyAlarmServiceImpl {
|
|
|
selDTO.setObjId(objId);
|
|
|
selDTO.setItemCode(itemCode);
|
|
|
selDTO.setProjectId(projectId);
|
|
|
- selDTO.setGroupCode(systemCode);
|
|
|
+ selDTO.setGroupCode(SaasContext.getContextGroupCode());
|
|
|
selDTO.setPd("asdasdasda");
|
|
|
selDTO.setUserId("test");
|
|
|
AlarmResult<JSONObject> result = alarmServiceClient.queryByObjAndItemCode(selDTO);
|
|
@@ -233,7 +234,7 @@ public class EnergyAlarmServiceImpl {
|
|
|
|
|
|
public List<AlarmProjectDTO> getAlarmProjectDTOList()throws Exception{
|
|
|
QueryAlarmProjectDTO selDTO = QueryAlarmProjectDTO.builder().build();
|
|
|
- selDTO.setGroupCode(systemCode);
|
|
|
+ selDTO.setGroupCode(SaasContext.getContextGroupCode());
|
|
|
selDTO.setPd("123456");
|
|
|
selDTO.setUserId("systemId");
|
|
|
AlarmResult<JSONArray> result = alarmServiceClient.queryProject(selDTO);
|