diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index d103b63..c242ffb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -68,6 +68,9 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String areaId = httpServletRequest.getParameter("areaId"); + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); Page> page = new PageFactory>().defaultPage("alarmTime",false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); @@ -76,7 +79,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope); new AlarmRecordWarpper(retList).warp(); @@ -107,7 +110,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,"", dataScope); new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index d103b63..c242ffb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -68,6 +68,9 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String areaId = httpServletRequest.getParameter("areaId"); + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); Page> page = new PageFactory>().defaultPage("alarmTime",false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); @@ -76,7 +79,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope); new AlarmRecordWarpper(retList).warp(); @@ -107,7 +110,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,"", dataScope); new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 8fff1af..0ce8c49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -57,6 +57,15 @@ String deviceType = httpServletRequest.getParameter("deviceType"); if (ToolUtil.isEmpty(deviceType)) deviceType = ""; + + String areaId = httpServletRequest.getParameter("areaId"); + if (ToolUtil.isEmpty(areaId)) { + areaId = ""; + } else { + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); + } + Page> page = new PageFactory>().defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; @@ -68,7 +77,7 @@ } List> retList = new ArrayList<>(); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope - retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); + retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, areaId, dataScope); // 查找预警阈值 for (int i = 0; i < retList.size(); i++) { Map retItem = retList.get(i); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index d103b63..c242ffb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -68,6 +68,9 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String areaId = httpServletRequest.getParameter("areaId"); + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); Page> page = new PageFactory>().defaultPage("alarmTime",false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); @@ -76,7 +79,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope); new AlarmRecordWarpper(retList).warp(); @@ -107,7 +110,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,"", dataScope); new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 8fff1af..0ce8c49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -57,6 +57,15 @@ String deviceType = httpServletRequest.getParameter("deviceType"); if (ToolUtil.isEmpty(deviceType)) deviceType = ""; + + String areaId = httpServletRequest.getParameter("areaId"); + if (ToolUtil.isEmpty(areaId)) { + areaId = ""; + } else { + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); + } + Page> page = new PageFactory>().defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; @@ -68,7 +77,7 @@ } List> retList = new ArrayList<>(); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope - retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); + retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, areaId, dataScope); // 查找预警阈值 for (int i = 0; i < retList.size(); i++) { Map retItem = retList.get(i); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index a0bd20d..9d25208 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -18,7 +18,7 @@ */ public interface IAlarmRecordsService extends IService { - List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope); + List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope); List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index d103b63..c242ffb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -68,6 +68,9 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String areaId = httpServletRequest.getParameter("areaId"); + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); Page> page = new PageFactory>().defaultPage("alarmTime",false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); @@ -76,7 +79,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope); new AlarmRecordWarpper(retList).warp(); @@ -107,7 +110,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,"", dataScope); new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 8fff1af..0ce8c49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -57,6 +57,15 @@ String deviceType = httpServletRequest.getParameter("deviceType"); if (ToolUtil.isEmpty(deviceType)) deviceType = ""; + + String areaId = httpServletRequest.getParameter("areaId"); + if (ToolUtil.isEmpty(areaId)) { + areaId = ""; + } else { + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); + } + Page> page = new PageFactory>().defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; @@ -68,7 +77,7 @@ } List> retList = new ArrayList<>(); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope - retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); + retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, areaId, dataScope); // 查找预警阈值 for (int i = 0; i < retList.size(); i++) { Map retItem = retList.get(i); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index a0bd20d..9d25208 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -18,7 +18,7 @@ */ public interface IAlarmRecordsService extends IService { - List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope); + List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope); List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java index 394f24f..24d74cc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java @@ -19,7 +19,7 @@ */ public interface IAlarmRuleService extends IService { - List> ruleListViaParam(Page> page, String keywords, String deviceType, DataScope dataScope); + List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope); boolean updateRule( int id, float highValue, float lowValue); List getNoAlarmDevice(DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index d103b63..c242ffb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -68,6 +68,9 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String areaId = httpServletRequest.getParameter("areaId"); + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); Page> page = new PageFactory>().defaultPage("alarmTime",false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); @@ -76,7 +79,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope); new AlarmRecordWarpper(retList).warp(); @@ -107,7 +110,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,"", dataScope); new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 8fff1af..0ce8c49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -57,6 +57,15 @@ String deviceType = httpServletRequest.getParameter("deviceType"); if (ToolUtil.isEmpty(deviceType)) deviceType = ""; + + String areaId = httpServletRequest.getParameter("areaId"); + if (ToolUtil.isEmpty(areaId)) { + areaId = ""; + } else { + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); + } + Page> page = new PageFactory>().defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; @@ -68,7 +77,7 @@ } List> retList = new ArrayList<>(); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope - retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); + retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, areaId, dataScope); // 查找预警阈值 for (int i = 0; i < retList.size(); i++) { Map retItem = retList.get(i); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index a0bd20d..9d25208 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -18,7 +18,7 @@ */ public interface IAlarmRecordsService extends IService { - List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope); + List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope); List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java index 394f24f..24d74cc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java @@ -19,7 +19,7 @@ */ public interface IAlarmRuleService extends IService { - List> ruleListViaParam(Page> page, String keywords, String deviceType, DataScope dataScope); + List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope); boolean updateRule( int id, float highValue, float lowValue); List getNoAlarmDevice(DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 12e2736..0b66956 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -27,12 +27,12 @@ @Override - public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { + public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope) { String sContent = null; if (ToolUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } - return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); + return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent, areaId, dataScope); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index d103b63..c242ffb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -68,6 +68,9 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String areaId = httpServletRequest.getParameter("areaId"); + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); Page> page = new PageFactory>().defaultPage("alarmTime",false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); @@ -76,7 +79,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope); new AlarmRecordWarpper(retList).warp(); @@ -107,7 +110,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,"", dataScope); new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 8fff1af..0ce8c49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -57,6 +57,15 @@ String deviceType = httpServletRequest.getParameter("deviceType"); if (ToolUtil.isEmpty(deviceType)) deviceType = ""; + + String areaId = httpServletRequest.getParameter("areaId"); + if (ToolUtil.isEmpty(areaId)) { + areaId = ""; + } else { + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); + } + Page> page = new PageFactory>().defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; @@ -68,7 +77,7 @@ } List> retList = new ArrayList<>(); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope - retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); + retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, areaId, dataScope); // 查找预警阈值 for (int i = 0; i < retList.size(); i++) { Map retItem = retList.get(i); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index a0bd20d..9d25208 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -18,7 +18,7 @@ */ public interface IAlarmRecordsService extends IService { - List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope); + List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope); List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java index 394f24f..24d74cc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java @@ -19,7 +19,7 @@ */ public interface IAlarmRuleService extends IService { - List> ruleListViaParam(Page> page, String keywords, String deviceType, DataScope dataScope); + List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope); boolean updateRule( int id, float highValue, float lowValue); List getNoAlarmDevice(DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 12e2736..0b66956 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -27,12 +27,12 @@ @Override - public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { + public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope) { String sContent = null; if (ToolUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } - return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); + return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent, areaId, dataScope); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java index 515a3d0..a420969 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java @@ -27,8 +27,8 @@ AlarmRuleMapper alarmRuleMapper; @Override - public List> ruleListViaParam(Page> page, String keywords, String deviceType,DataScope dataScope) { - return this.baseMapper.ruleListViaParam(page,keywords,deviceType,dataScope); + public List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope) { + return this.baseMapper.ruleListViaParam(page,keywords,deviceType, areaId, dataScope); } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index d103b63..c242ffb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -68,6 +68,9 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String areaId = httpServletRequest.getParameter("areaId"); + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); Page> page = new PageFactory>().defaultPage("alarmTime",false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); @@ -76,7 +79,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope); new AlarmRecordWarpper(retList).warp(); @@ -107,7 +110,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,"", dataScope); new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 8fff1af..0ce8c49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -57,6 +57,15 @@ String deviceType = httpServletRequest.getParameter("deviceType"); if (ToolUtil.isEmpty(deviceType)) deviceType = ""; + + String areaId = httpServletRequest.getParameter("areaId"); + if (ToolUtil.isEmpty(areaId)) { + areaId = ""; + } else { + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); + } + Page> page = new PageFactory>().defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; @@ -68,7 +77,7 @@ } List> retList = new ArrayList<>(); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope - retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); + retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, areaId, dataScope); // 查找预警阈值 for (int i = 0; i < retList.size(); i++) { Map retItem = retList.get(i); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index a0bd20d..9d25208 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -18,7 +18,7 @@ */ public interface IAlarmRecordsService extends IService { - List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope); + List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope); List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java index 394f24f..24d74cc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java @@ -19,7 +19,7 @@ */ public interface IAlarmRuleService extends IService { - List> ruleListViaParam(Page> page, String keywords, String deviceType, DataScope dataScope); + List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope); boolean updateRule( int id, float highValue, float lowValue); List getNoAlarmDevice(DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 12e2736..0b66956 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -27,12 +27,12 @@ @Override - public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { + public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope) { String sContent = null; if (ToolUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } - return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); + return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent, areaId, dataScope); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java index 515a3d0..a420969 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java @@ -27,8 +27,8 @@ AlarmRuleMapper alarmRuleMapper; @Override - public List> ruleListViaParam(Page> page, String keywords, String deviceType,DataScope dataScope) { - return this.baseMapper.ruleListViaParam(page,keywords,deviceType,dataScope); + public List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope) { + return this.baseMapper.ruleListViaParam(page,keywords,deviceType, areaId, dataScope); } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java index a6f05c4..9ce18e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -19,7 +19,7 @@ */ public interface AlarmRecordsMapper extends BaseMapper { - List> alarmList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("status") String status, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); + List> alarmList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("status") String status, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("areaId") String areaId, @Param("dataScope") DataScope dataScope); List alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index d103b63..c242ffb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -68,6 +68,9 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String areaId = httpServletRequest.getParameter("areaId"); + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); Page> page = new PageFactory>().defaultPage("alarmTime",false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); @@ -76,7 +79,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope); new AlarmRecordWarpper(retList).warp(); @@ -107,7 +110,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,"", dataScope); new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 8fff1af..0ce8c49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -57,6 +57,15 @@ String deviceType = httpServletRequest.getParameter("deviceType"); if (ToolUtil.isEmpty(deviceType)) deviceType = ""; + + String areaId = httpServletRequest.getParameter("areaId"); + if (ToolUtil.isEmpty(areaId)) { + areaId = ""; + } else { + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); + } + Page> page = new PageFactory>().defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; @@ -68,7 +77,7 @@ } List> retList = new ArrayList<>(); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope - retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); + retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, areaId, dataScope); // 查找预警阈值 for (int i = 0; i < retList.size(); i++) { Map retItem = retList.get(i); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index a0bd20d..9d25208 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -18,7 +18,7 @@ */ public interface IAlarmRecordsService extends IService { - List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope); + List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope); List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java index 394f24f..24d74cc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java @@ -19,7 +19,7 @@ */ public interface IAlarmRuleService extends IService { - List> ruleListViaParam(Page> page, String keywords, String deviceType, DataScope dataScope); + List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope); boolean updateRule( int id, float highValue, float lowValue); List getNoAlarmDevice(DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 12e2736..0b66956 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -27,12 +27,12 @@ @Override - public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { + public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope) { String sContent = null; if (ToolUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } - return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); + return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent, areaId, dataScope); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java index 515a3d0..a420969 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java @@ -27,8 +27,8 @@ AlarmRuleMapper alarmRuleMapper; @Override - public List> ruleListViaParam(Page> page, String keywords, String deviceType,DataScope dataScope) { - return this.baseMapper.ruleListViaParam(page,keywords,deviceType,dataScope); + public List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope) { + return this.baseMapper.ruleListViaParam(page,keywords,deviceType, areaId, dataScope); } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java index a6f05c4..9ce18e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -19,7 +19,7 @@ */ public interface AlarmRecordsMapper extends BaseMapper { - List> alarmList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("status") String status, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); + List> alarmList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("status") String status, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("areaId") String areaId, @Param("dataScope") DataScope dataScope); List alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java index 00f33ee..82f8537 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java @@ -20,7 +20,7 @@ */ public interface AlarmRuleMapper extends BaseMapper { - List> ruleListViaParam(@Param("page") Page> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope); + List> ruleListViaParam(@Param("page") Page> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType, @Param("areaId") String areaId, @Param("dataScope") DataScope dataScope); boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue); List getNoAlarmDevice(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index d103b63..c242ffb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -68,6 +68,9 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String areaId = httpServletRequest.getParameter("areaId"); + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); Page> page = new PageFactory>().defaultPage("alarmTime",false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); @@ -76,7 +79,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope); new AlarmRecordWarpper(retList).warp(); @@ -107,7 +110,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,"", dataScope); new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 8fff1af..0ce8c49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -57,6 +57,15 @@ String deviceType = httpServletRequest.getParameter("deviceType"); if (ToolUtil.isEmpty(deviceType)) deviceType = ""; + + String areaId = httpServletRequest.getParameter("areaId"); + if (ToolUtil.isEmpty(areaId)) { + areaId = ""; + } else { + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); + } + Page> page = new PageFactory>().defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; @@ -68,7 +77,7 @@ } List> retList = new ArrayList<>(); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope - retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); + retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, areaId, dataScope); // 查找预警阈值 for (int i = 0; i < retList.size(); i++) { Map retItem = retList.get(i); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index a0bd20d..9d25208 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -18,7 +18,7 @@ */ public interface IAlarmRecordsService extends IService { - List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope); + List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope); List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java index 394f24f..24d74cc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java @@ -19,7 +19,7 @@ */ public interface IAlarmRuleService extends IService { - List> ruleListViaParam(Page> page, String keywords, String deviceType, DataScope dataScope); + List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope); boolean updateRule( int id, float highValue, float lowValue); List getNoAlarmDevice(DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 12e2736..0b66956 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -27,12 +27,12 @@ @Override - public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { + public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope) { String sContent = null; if (ToolUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } - return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); + return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent, areaId, dataScope); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java index 515a3d0..a420969 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java @@ -27,8 +27,8 @@ AlarmRuleMapper alarmRuleMapper; @Override - public List> ruleListViaParam(Page> page, String keywords, String deviceType,DataScope dataScope) { - return this.baseMapper.ruleListViaParam(page,keywords,deviceType,dataScope); + public List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope) { + return this.baseMapper.ruleListViaParam(page,keywords,deviceType, areaId, dataScope); } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java index a6f05c4..9ce18e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -19,7 +19,7 @@ */ public interface AlarmRecordsMapper extends BaseMapper { - List> alarmList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("status") String status, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); + List> alarmList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("status") String status, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("areaId") String areaId, @Param("dataScope") DataScope dataScope); List alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java index 00f33ee..82f8537 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java @@ -20,7 +20,7 @@ */ public interface AlarmRuleMapper extends BaseMapper { - List> ruleListViaParam(@Param("page") Page> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope); + List> ruleListViaParam(@Param("page") Page> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType, @Param("areaId") String areaId, @Param("dataScope") DataScope dataScope); boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue); List getNoAlarmDevice(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 73047da..4d1c0a2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -65,6 +65,9 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND bwi.area like concat(#{areaId}, '%') + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index d103b63..c242ffb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -68,6 +68,9 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String areaId = httpServletRequest.getParameter("areaId"); + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); Page> page = new PageFactory>().defaultPage("alarmTime",false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); @@ -76,7 +79,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope); new AlarmRecordWarpper(retList).warp(); @@ -107,7 +110,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,"", dataScope); new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 8fff1af..0ce8c49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -57,6 +57,15 @@ String deviceType = httpServletRequest.getParameter("deviceType"); if (ToolUtil.isEmpty(deviceType)) deviceType = ""; + + String areaId = httpServletRequest.getParameter("areaId"); + if (ToolUtil.isEmpty(areaId)) { + areaId = ""; + } else { + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); + } + Page> page = new PageFactory>().defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; @@ -68,7 +77,7 @@ } List> retList = new ArrayList<>(); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope - retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); + retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, areaId, dataScope); // 查找预警阈值 for (int i = 0; i < retList.size(); i++) { Map retItem = retList.get(i); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index a0bd20d..9d25208 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -18,7 +18,7 @@ */ public interface IAlarmRecordsService extends IService { - List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope); + List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope); List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java index 394f24f..24d74cc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java @@ -19,7 +19,7 @@ */ public interface IAlarmRuleService extends IService { - List> ruleListViaParam(Page> page, String keywords, String deviceType, DataScope dataScope); + List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope); boolean updateRule( int id, float highValue, float lowValue); List getNoAlarmDevice(DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 12e2736..0b66956 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -27,12 +27,12 @@ @Override - public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { + public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope) { String sContent = null; if (ToolUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } - return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); + return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent, areaId, dataScope); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java index 515a3d0..a420969 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java @@ -27,8 +27,8 @@ AlarmRuleMapper alarmRuleMapper; @Override - public List> ruleListViaParam(Page> page, String keywords, String deviceType,DataScope dataScope) { - return this.baseMapper.ruleListViaParam(page,keywords,deviceType,dataScope); + public List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope) { + return this.baseMapper.ruleListViaParam(page,keywords,deviceType, areaId, dataScope); } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java index a6f05c4..9ce18e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -19,7 +19,7 @@ */ public interface AlarmRecordsMapper extends BaseMapper { - List> alarmList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("status") String status, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); + List> alarmList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("status") String status, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("areaId") String areaId, @Param("dataScope") DataScope dataScope); List alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java index 00f33ee..82f8537 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java @@ -20,7 +20,7 @@ */ public interface AlarmRuleMapper extends BaseMapper { - List> ruleListViaParam(@Param("page") Page> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope); + List> ruleListViaParam(@Param("page") Page> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType, @Param("areaId") String areaId, @Param("dataScope") DataScope dataScope); boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue); List getNoAlarmDevice(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 73047da..4d1c0a2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -65,6 +65,9 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND bwi.area like concat(#{areaId}, '%') + diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index b6acdee..1e17979 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -85,7 +85,10 @@ responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId()); dataScope.setDeptIds(responsibleDeptIds); } -// areaId += "%"; + if (ToolUtil.isNotEmpty(areaId)) { + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); + } List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java index d103b63..c242ffb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java @@ -68,6 +68,9 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String areaId = httpServletRequest.getParameter("areaId"); + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); Page> page = new PageFactory>().defaultPage("alarmTime",false); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope(); @@ -76,7 +79,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> retList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr, areaId, dataScope); new AlarmRecordWarpper(retList).warp(); @@ -107,7 +110,7 @@ if (!currentUser.getRoleTips().contains(sAdmin) && !currentUser.getRoleTips().contains(sOperator)) { alarmTypeStr = "1"; } - List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,dataScope); + List> alarmExpList = alarmRecordsService.alarmList(page,keywords,beginTime,endTime,statusStr,alarmTypeStr,alarmContentStr,"", dataScope); new AlarmRecordWarpper(alarmExpList).warp(); FileInputStream fileInputStream = null; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 8fff1af..0ce8c49 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -57,6 +57,15 @@ String deviceType = httpServletRequest.getParameter("deviceType"); if (ToolUtil.isEmpty(deviceType)) deviceType = ""; + + String areaId = httpServletRequest.getParameter("areaId"); + if (ToolUtil.isEmpty(areaId)) { + areaId = ""; + } else { + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); + } + Page> page = new PageFactory>().defaultPage(); Map retMap = new HashMap<>(); boolean bSessionValid = false; @@ -68,7 +77,7 @@ } List> retList = new ArrayList<>(); DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope - retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope); + retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, areaId, dataScope); // 查找预警阈值 for (int i = 0; i < retList.size(); i++) { Map retItem = retList.get(i); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java index a0bd20d..9d25208 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java @@ -18,7 +18,7 @@ */ public interface IAlarmRecordsService extends IService { - List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope); + List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope); List alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java index 394f24f..24d74cc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRuleService.java @@ -19,7 +19,7 @@ */ public interface IAlarmRuleService extends IService { - List> ruleListViaParam(Page> page, String keywords, String deviceType, DataScope dataScope); + List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope); boolean updateRule( int id, float highValue, float lowValue); List getNoAlarmDevice(DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index 12e2736..0b66956 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -27,12 +27,12 @@ @Override - public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, DataScope dataScope) { + public List> alarmList(Page> page, String keywords, String beginTime, String endTime, String status, String alarmType, String alarmContent, String areaId, DataScope dataScope) { String sContent = null; if (ToolUtil.isNotEmpty(alarmContent)){ sContent = EhcacheConstant.retBean().getAlarmContentName(Integer.valueOf(alarmContent)); } - return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent,dataScope); + return this.baseMapper.alarmList(page,keywords,beginTime,endTime,status,alarmType,sContent, areaId, dataScope); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java index 515a3d0..a420969 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java @@ -27,8 +27,8 @@ AlarmRuleMapper alarmRuleMapper; @Override - public List> ruleListViaParam(Page> page, String keywords, String deviceType,DataScope dataScope) { - return this.baseMapper.ruleListViaParam(page,keywords,deviceType,dataScope); + public List> ruleListViaParam(Page> page, String keywords, String deviceType, String areaId, DataScope dataScope) { + return this.baseMapper.ruleListViaParam(page,keywords,deviceType, areaId, dataScope); } @Override diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java index a6f05c4..9ce18e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRecordsMapper.java @@ -19,7 +19,7 @@ */ public interface AlarmRecordsMapper extends BaseMapper { - List> alarmList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("status") String status, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); + List> alarmList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("status") String status, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("areaId") String areaId, @Param("dataScope") DataScope dataScope); List alarmListNoPage(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("beginTime") String beginTime, @Param("endTime") String endTime); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java index 00f33ee..82f8537 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmRuleMapper.java @@ -20,7 +20,7 @@ */ public interface AlarmRuleMapper extends BaseMapper { - List> ruleListViaParam(@Param("page") Page> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType,@Param("dataScope") DataScope dataScope); + List> ruleListViaParam(@Param("page") Page> page, @Param("keywords") String keywords, @Param("deviceType") String deviceType, @Param("areaId") String areaId, @Param("dataScope") DataScope dataScope); boolean updateRule(@Param("id") int id,@Param("highValue") float highValue,@Param("lowValue") float lowValue); List getNoAlarmDevice(@Param("dataScope") DataScope dataScope); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml index 73047da..4d1c0a2 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml @@ -65,6 +65,9 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND bwi.area like concat(#{areaId}, '%') + diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index b6acdee..1e17979 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -85,7 +85,10 @@ responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId()); dataScope.setDeptIds(responsibleDeptIds); } -// areaId += "%"; + if (ToolUtil.isNotEmpty(areaId)) { + if (areaId.indexOf("00") > 0) + areaId = areaId.substring(0, areaId.indexOf("00")); + } List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index 70f5325..89c6fb5 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -76,7 +76,7 @@ ) - and w.AREA like + and w.AREA like CONCAT(#{areaId},'%')