|
@@ -14,24 +14,21 @@ import com.persagy.apm.alarmservice.group.alarmrule.model.dto.QueryGroupAlarmRul
|
|
import com.persagy.apm.alarmservice.group.alarmrule.service.IGroupAlarmRuleService;
|
|
import com.persagy.apm.alarmservice.group.alarmrule.service.IGroupAlarmRuleService;
|
|
import com.persagy.apm.alarmservice.group.management.model.equip.dto.QueryEquipDTO;
|
|
import com.persagy.apm.alarmservice.group.management.model.equip.dto.QueryEquipDTO;
|
|
import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipItem;
|
|
import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipItem;
|
|
-import com.persagy.apm.alarmservice.group.management.model.equip.vo.EquipListItem;
|
|
|
|
import com.persagy.apm.alarmservice.group.management.service.impl.GroupManagementServiceImpl;
|
|
import com.persagy.apm.alarmservice.group.management.service.impl.GroupManagementServiceImpl;
|
|
import com.persagy.apm.alarmservice.project.alarmcondition.model.ConvertAlarmConditionTool;
|
|
import com.persagy.apm.alarmservice.project.alarmcondition.model.ConvertAlarmConditionTool;
|
|
import com.persagy.apm.alarmservice.project.alarmcondition.model.dto.AddAlarmConditionDTO;
|
|
import com.persagy.apm.alarmservice.project.alarmcondition.model.dto.AddAlarmConditionDTO;
|
|
-import com.persagy.apm.alarmservice.project.alarmcondition.model.dto.QueryAlarmConditionDTO;
|
|
|
|
import com.persagy.apm.alarmservice.project.alarmcondition.model.dto.UpdateAlarmConditionDTO;
|
|
import com.persagy.apm.alarmservice.project.alarmcondition.model.dto.UpdateAlarmConditionDTO;
|
|
import com.persagy.apm.alarmservice.project.alarmcondition.service.IAlarmConditionService;
|
|
import com.persagy.apm.alarmservice.project.alarmcondition.service.IAlarmConditionService;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.dao.ProjectAlarmRuleMapper;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.dao.ProjectAlarmRuleMapper;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.model.ConvertProjectAlarmRuleTool;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.model.ConvertProjectAlarmRuleTool;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.model.ProjectAlarmRule;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.model.ProjectAlarmRule;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.model.dto.*;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.model.dto.*;
|
|
|
|
+import com.persagy.apm.alarmservice.project.alarmrule.model.vo.ProjectAlarmRuleListItemVO;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.service.IProjectAlarmRuleService;
|
|
import com.persagy.apm.alarmservice.project.alarmrule.service.IProjectAlarmRuleService;
|
|
-import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.ConvertProjectAlarmRuleObjRelTool;
|
|
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.ProjectAlarmRuleObjRel;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.ProjectAlarmRuleObjRel;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.dto.AddProjectAlarmRuleObjRelDTO;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.dto.AddProjectAlarmRuleObjRelDTO;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.dto.QueryRuleObjRelDTO;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.dto.QueryRuleObjRelDTO;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.dto.UpdateAlarmItemDTO;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.dto.UpdateAlarmItemDTO;
|
|
-import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.vo.ProjectAlarmRuleObjRelListItemVO;
|
|
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.vo.ProjectVO;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.model.vo.ProjectVO;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.service.IProjectAlarmRuleObjRelService;
|
|
import com.persagy.apm.alarmservice.project.alarmruleobjrel.service.IProjectAlarmRuleObjRelService;
|
|
import com.persagy.apm.common.constant.enums.ValidEnum;
|
|
import com.persagy.apm.common.constant.enums.ValidEnum;
|
|
@@ -42,17 +39,12 @@ import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmEffectTime;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.*;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmconfig.*;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmConfigItem;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmConfigItem;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmConfigServiceImpl;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmConfigServiceImpl;
|
|
-import org.apache.commons.io.IOUtils;
|
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
|
|
import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.AlarmCondition;
|
|
|
|
|
|
-import java.io.File;
|
|
|
|
-import java.io.IOException;
|
|
|
|
-import java.io.InputStream;
|
|
|
|
-import java.nio.charset.StandardCharsets;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -384,7 +376,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
|
|
|
|
private List<EquipItem> getAllEquip(String classCode, String condition, String projectId) {
|
|
private List<EquipItem> getAllEquip(String classCode, String condition, String projectId) {
|
|
QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
|
|
QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
|
|
- queryEquipDTO.setProjectId(projectId);
|
|
|
|
|
|
+ queryEquipDTO.setProjectId("Pj" + projectId);
|
|
queryEquipDTO.setClassCode(classCode);
|
|
queryEquipDTO.setClassCode(classCode);
|
|
queryEquipDTO.setCondition(condition);
|
|
queryEquipDTO.setCondition(condition);
|
|
List<EquipItem> record = groupManagementService.getEquipList(queryEquipDTO);
|
|
List<EquipItem> record = groupManagementService.getEquipList(queryEquipDTO);
|
|
@@ -499,7 +491,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
List<EquipItem> records = new ArrayList<>();
|
|
List<EquipItem> records = new ArrayList<>();
|
|
for (ProjectVO project : projects) {
|
|
for (ProjectVO project : projects) {
|
|
QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
|
|
QueryEquipDTO queryEquipDTO = new QueryEquipDTO();
|
|
- queryEquipDTO.setProjectId(project.getProjectId());
|
|
|
|
|
|
+ queryEquipDTO.setProjectId("Pj" + project.getProjectId());
|
|
queryEquipDTO.setClassCode(classCode);
|
|
queryEquipDTO.setClassCode(classCode);
|
|
queryEquipDTO.setCondition(condition);
|
|
queryEquipDTO.setCondition(condition);
|
|
List<EquipItem> record = groupManagementService.getEquipList(queryEquipDTO);
|
|
List<EquipItem> record = groupManagementService.getEquipList(queryEquipDTO);
|
|
@@ -558,4 +550,57 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
|
|
public void insertProject(String substring) {
|
|
public void insertProject(String substring) {
|
|
mapper.insertProject(substring);
|
|
mapper.insertProject(substring);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+
|
|
|
|
+ * 利用subList方法进行分页
|
|
|
|
+ * @param list 分页数据
|
|
|
|
+
|
|
|
|
+ * @param pagesize 页面大小
|
|
|
|
+ * @param currentPage 当前页面
|
|
|
|
+ * @return
|
|
|
|
+
|
|
|
|
+ */
|
|
|
|
+
|
|
|
|
+ public List<ProjectAlarmRuleListItemVO> pageBySubList(List<ProjectAlarmRuleListItemVO> list, int pagesize, int currentPage) {
|
|
|
|
+
|
|
|
|
+ int totalcount = list.size();
|
|
|
|
+
|
|
|
|
+ int pagecount = 0;
|
|
|
|
+
|
|
|
|
+ List<ProjectAlarmRuleListItemVO> subList;
|
|
|
|
+
|
|
|
|
+ int m = totalcount % pagesize;
|
|
|
|
+
|
|
|
|
+ if (m > 0) {
|
|
|
|
+
|
|
|
|
+ pagecount = totalcount / pagesize + 1;
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+
|
|
|
|
+ pagecount = totalcount / pagesize;
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (m == 0) {
|
|
|
|
+
|
|
|
|
+ subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+
|
|
|
|
+ if (currentPage == pagecount) {
|
|
|
|
+
|
|
|
|
+ subList = list.subList((currentPage - 1) * pagesize, totalcount);
|
|
|
|
+
|
|
|
|
+ } else {
|
|
|
|
+
|
|
|
|
+ subList = list.subList((currentPage - 1) * pagesize, pagesize * (currentPage));
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return subList;
|
|
|
|
+
|
|
|
|
+ }
|
|
}
|
|
}
|