|
@@ -31,6 +31,7 @@ import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.Delete
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.QueryAlarmConfigDTO;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmConfigItem;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmConfigServiceImpl;
|
|
|
+import com.persagy.apm.mybatis.handler.DynamicDataSourceHandler;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.apache.poi.ss.usermodel.DataFormatter;
|
|
@@ -43,6 +44,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
import java.io.File;
|
|
|
import java.io.IOException;
|
|
|
import java.io.InputStream;
|
|
@@ -74,6 +76,10 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
|
|
|
private GroupManagementServiceImpl groupManagementService;
|
|
|
@Autowired
|
|
|
private IProjectAlarmRuleObjRelService projectAlarmRuleObjRelService;
|
|
|
+ @Autowired
|
|
|
+ private DynamicDataSourceHandler dynamicDataSourceHandler;
|
|
|
+ @Autowired
|
|
|
+ private HttpServletRequest request;
|
|
|
|
|
|
ExecutorService executor = ExecutorBuilder.create()
|
|
|
.setCorePoolSize(5)
|
|
@@ -108,6 +114,7 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
|
|
|
executor.execute(() -> {
|
|
|
// 切换线程需要重新设置线程中的通用变量
|
|
|
PoemsContext.setContext(userId, loginDevice, pd, groupCode, projectId);
|
|
|
+ dynamicDataSourceHandler.resetDataSource(request);
|
|
|
projectAlarmRuleService.addProjectAlarmRules(addGroupAlarmRuleDTO);
|
|
|
});
|
|
|
|
|
@@ -394,6 +401,7 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
|
|
|
PoemsContextContent context = PoemsContext.getContext();
|
|
|
executor.execute(() -> {
|
|
|
PoemsContext.setContext(context);
|
|
|
+ dynamicDataSourceHandler.resetDataSource(request);
|
|
|
try {
|
|
|
projectAlarmRuleService.deleteBatchByGroupRule(groupAlarmRule);
|
|
|
String condition = deleteGroupAlarmRuleDTO.getCondition();
|
|
@@ -513,6 +521,7 @@ public class GroupAlarmRuleServiceImpl extends ServiceImpl<GroupAlarmRuleMapper,
|
|
|
executor.execute(() -> {
|
|
|
// 切换线程需要重新设置线程中的通用变量
|
|
|
PoemsContext.setContext(userId, loginDevice, pd, groupCode, projectId);
|
|
|
+ dynamicDataSourceHandler.resetDataSource(request);
|
|
|
projectAlarmRuleService.addProjectAlarmRulesPM(addGroupAlarmRuleDTO);
|
|
|
});
|
|
|
|