diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index b102f65..0c1c7c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -51,16 +51,16 @@ private WebSocket webSocket; @Override - public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode); return alarmJobList; } @Override - public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { + public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId,jobCode,devCode); return alarmJobList; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index b102f65..0c1c7c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -51,16 +51,16 @@ private WebSocket webSocket; @Override - public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode); return alarmJobList; } @Override - public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { + public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId,jobCode,devCode); return alarmJobList; } 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 d2cc7f1..8f151ed 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, DataScope dataScope,String devCode) { String sContent = null; if (ObjectUtil.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, dataScope,devCode); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index b102f65..0c1c7c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -51,16 +51,16 @@ private WebSocket webSocket; @Override - public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode); return alarmJobList; } @Override - public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { + public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId,jobCode,devCode); return alarmJobList; } 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 d2cc7f1..8f151ed 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, DataScope dataScope,String devCode) { String sContent = null; if (ObjectUtil.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, dataScope,devCode); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 596dab3..476a0b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -23,9 +23,11 @@ * @since 2019-05-17 */ public interface AlarmJobMapper extends BaseMapper { - List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); + List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, + @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); - List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); + List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, + @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); // List jobListExport(@Param("page") Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); List> jobListDelayRe(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index b102f65..0c1c7c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -51,16 +51,16 @@ private WebSocket webSocket; @Override - public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode); return alarmJobList; } @Override - public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { + public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId,jobCode,devCode); return alarmJobList; } 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 d2cc7f1..8f151ed 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, DataScope dataScope,String devCode) { String sContent = null; if (ObjectUtil.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, dataScope,devCode); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 596dab3..476a0b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -23,9 +23,11 @@ * @since 2019-05-17 */ public interface AlarmJobMapper extends BaseMapper { - List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); + List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, + @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); - List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); + List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, + @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); // List jobListExport(@Param("page") Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); List> jobListDelayRe(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); 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 4b34b3c..ceb2493 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("dataScope") DataScope dataScope, @Param("devCode") String devCode); 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/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index b102f65..0c1c7c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -51,16 +51,16 @@ private WebSocket webSocket; @Override - public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode); return alarmJobList; } @Override - public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { + public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId,jobCode,devCode); return alarmJobList; } 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 d2cc7f1..8f151ed 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, DataScope dataScope,String devCode) { String sContent = null; if (ObjectUtil.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, dataScope,devCode); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 596dab3..476a0b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -23,9 +23,11 @@ * @since 2019-05-17 */ public interface AlarmJobMapper extends BaseMapper { - List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); + List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, + @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); - List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); + List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, + @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); // List jobListExport(@Param("page") Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); List> jobListDelayRe(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); 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 4b34b3c..ceb2493 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("dataScope") DataScope dataScope, @Param("devCode") String devCode); 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/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index aeca8cd..ce96c5a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -538,6 +538,13 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + + AND aj.CREATE_TIME = ]]> @@ -579,6 +586,12 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + AND aj.CREATE_TIME = ]]> diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index b102f65..0c1c7c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -51,16 +51,16 @@ private WebSocket webSocket; @Override - public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode); return alarmJobList; } @Override - public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { + public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId,jobCode,devCode); return alarmJobList; } 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 d2cc7f1..8f151ed 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, DataScope dataScope,String devCode) { String sContent = null; if (ObjectUtil.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, dataScope,devCode); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 596dab3..476a0b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -23,9 +23,11 @@ * @since 2019-05-17 */ public interface AlarmJobMapper extends BaseMapper { - List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); + List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, + @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); - List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); + List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, + @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); // List jobListExport(@Param("page") Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); List> jobListDelayRe(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); 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 4b34b3c..ceb2493 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("dataScope") DataScope dataScope, @Param("devCode") String devCode); 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/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index aeca8cd..ce96c5a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -538,6 +538,13 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + + AND aj.CREATE_TIME = ]]> @@ -579,6 +586,12 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + AND aj.CREATE_TIME = ]]> 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 e079aa7..f0095f3 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 @@ -77,6 +77,10 @@ ar.ALARM_MSG AS "alarmMessage", ar.DEVCODE as devcode, aj.JOB_STATUS as "jobStatus", + + + + as "handleJobTime", ar.JOB_ID as "jobId", bwi.DEPTID AS deptid FROM alarm_records ar @@ -94,6 +98,9 @@ AND ar.ALARM_TYPE = #{alarmType} + + AND ar.DEVCODE like CONCAT('%',#{devCode},'%') + AND ar.ALARM_CONTENT = #{alarmContent} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index b102f65..0c1c7c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -51,16 +51,16 @@ private WebSocket webSocket; @Override - public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode); return alarmJobList; } @Override - public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { + public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId,jobCode,devCode); return alarmJobList; } 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 d2cc7f1..8f151ed 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, DataScope dataScope,String devCode) { String sContent = null; if (ObjectUtil.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, dataScope,devCode); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 596dab3..476a0b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -23,9 +23,11 @@ * @since 2019-05-17 */ public interface AlarmJobMapper extends BaseMapper { - List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); + List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, + @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); - List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); + List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, + @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); // List jobListExport(@Param("page") Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); List> jobListDelayRe(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); 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 4b34b3c..ceb2493 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("dataScope") DataScope dataScope, @Param("devCode") String devCode); 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/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index aeca8cd..ce96c5a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -538,6 +538,13 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + + AND aj.CREATE_TIME = ]]> @@ -579,6 +586,12 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + AND aj.CREATE_TIME = ]]> 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 e079aa7..f0095f3 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 @@ -77,6 +77,10 @@ ar.ALARM_MSG AS "alarmMessage", ar.DEVCODE as devcode, aj.JOB_STATUS as "jobStatus", + + + + as "handleJobTime", ar.JOB_ID as "jobId", bwi.DEPTID AS deptid FROM alarm_records ar @@ -94,6 +98,9 @@ AND ar.ALARM_TYPE = #{alarmType} + + AND ar.DEVCODE like CONCAT('%',#{devCode},'%') + AND ar.ALARM_CONTENT = #{alarmContent} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ecd8e9a..da2a240 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -288,7 +288,7 @@ JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' + WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' and bdw.VALID='1' AND bd.DEVCODE = #{deviceCode} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index b102f65..0c1c7c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -51,16 +51,16 @@ private WebSocket webSocket; @Override - public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode); return alarmJobList; } @Override - public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { + public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId,jobCode,devCode); return alarmJobList; } 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 d2cc7f1..8f151ed 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, DataScope dataScope,String devCode) { String sContent = null; if (ObjectUtil.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, dataScope,devCode); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 596dab3..476a0b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -23,9 +23,11 @@ * @since 2019-05-17 */ public interface AlarmJobMapper extends BaseMapper { - List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); + List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, + @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); - List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); + List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, + @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); // List jobListExport(@Param("page") Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); List> jobListDelayRe(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); 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 4b34b3c..ceb2493 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("dataScope") DataScope dataScope, @Param("devCode") String devCode); 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/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index aeca8cd..ce96c5a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -538,6 +538,13 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + + AND aj.CREATE_TIME = ]]> @@ -579,6 +586,12 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + AND aj.CREATE_TIME = ]]> 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 e079aa7..f0095f3 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 @@ -77,6 +77,10 @@ ar.ALARM_MSG AS "alarmMessage", ar.DEVCODE as devcode, aj.JOB_STATUS as "jobStatus", + + + + as "handleJobTime", ar.JOB_ID as "jobId", bwi.DEPTID AS deptid FROM alarm_records ar @@ -94,6 +98,9 @@ AND ar.ALARM_TYPE = #{alarmType} + + AND ar.DEVCODE like CONCAT('%',#{devCode},'%') + AND ar.ALARM_CONTENT = #{alarmContent} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ecd8e9a..da2a240 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -288,7 +288,7 @@ JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' + WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' and bdw.VALID='1' AND bd.DEVCODE = #{deviceCode} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 1724edb..c63efba 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -18,6 +19,7 @@ * @author test203 * @date 2019/5/20 */ +@Data @ColumnWidth(30) @HeadRowHeight(15) @ContentRowHeight(20) @@ -25,13 +27,7 @@ @ExcelIgnoreUnannotated @Component public class BusConfigDTO { - // mapper.put("设备编号", "devcode"); -// mapper.put("报警阈值(%)", "percent"); -// mapper.put("安装高度(M)", "installHeight"); -// mapper.put("重传次数", "retryTimes"); -// mapper.put("IP地址", "ip"); -// mapper.put("端口号", "port"); -// mapper.put("最大尝试次数", "attemptsMax"); + private Long id; private Long deviceId; /** @@ -137,9 +133,13 @@ @ExcelProperty("睡眠开始时间(时:分)") private String sleepStartTime; /** - * 休眠开始时间 + * 传感器类型id */ private String sensorId; + /** + * 配置时间 + */ + private String writeTime; public static Map sensorHashMap = new HashMap(); @@ -159,229 +159,6 @@ // private String framecontent;//下发内容 - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public void setDeviceType(Long deviceType) { - this.deviceType = deviceType; - } - - public Long getDeviceId() { - return deviceId; - } - - public void setDeviceId(Long deviceId) { - this.deviceId = deviceId; - } - - public String getDevcode() { - return devcode; - } - - public void setDevcode(String devcode) { - this.devcode = devcode; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getDeviceTypeName() { - return deviceTypeName; - } - - public void setDeviceTypeName(String deviceTypeName) { - this.deviceTypeName = deviceTypeName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public float getThreshold() { - return threshold; - } - - public void setThreshold(float threshold) { - this.threshold = threshold; - } - - public float getPercent() { - return percent; - } - - public void setPercent(float percent) { - this.percent = percent; - } - - public float getInstallHeight() { - return installHeight; - } - - public void setInstallHeight(float installHeight) { - this.installHeight = installHeight; - } - - public String getRetryTimes() { - return retryTimes; - } - - public void setRetryTimes(String retryTimes) { - this.retryTimes = retryTimes; - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip; - } - - public String getPort() { - return port; - } - - public void setPort(String port) { - this.port = port; - } - - public String getAttemptsMax() { - return attemptsMax; - } - - public void setAttemptsMax(String attemptsMax) { - this.attemptsMax = attemptsMax; - } - - public String getAttemptsCurrent() { - return attemptsCurrent; - } - - public void setAttemptsCurrent(String attemptsCurrent) { - this.attemptsCurrent = attemptsCurrent; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public Long getDeviceType() { - return deviceType; - } - - public String getCollectInterval() { - return collectInterval; - } - - public void setCollectInterval(String collectInterval) { - this.collectInterval = collectInterval; - } - - public String getCollectCount() { - return collectCount; - } - - public void setCollectCount(String collectCount) { - this.collectCount = collectCount; - } - - public String getReloadInterval() { - return reloadInterval; - } - - public void setReloadInterval(String reloadInterval) { - this.reloadInterval = reloadInterval; - } - - public String getSleepPeriod() { - return sleepPeriod; - } - - public void setSleepPeriod(String sleepPeriod) { - this.sleepPeriod = sleepPeriod; - } - - public String getUploadPeriod() { - return uploadPeriod; - } - - public void setUploadPeriod(String uploadPeriod) { - this.uploadPeriod = uploadPeriod; - } - - public String getCollectTime() { - return collectTime; - } - - public void setCollectTime(String collectTime) { - this.collectTime = collectTime; - } - - public String getSleepStartTime() { - return sleepStartTime; - } - - public void setSleepStartTime(String sleepStartTime) { - this.sleepStartTime = sleepStartTime; - } - - public String getSensorId() { - return sensorId; - } - - public void setSensorId(String sensorId) { - this.sensorId = sensorId; - } - - public float getPercentExp() { - return percentExp; - } - - public void setPercentExp(float percentExp) { - this.percentExp = percentExp; - } public BusConfigDTO() { } @@ -408,6 +185,7 @@ dto.setStatusName("1".equals(objectMap.get("status").toString()) ? "已下发" : "未下发"); dto.setAttemptsMax(objectMap.get("attemptsmax").toString()); + dto.setWriteTime(objectMap.get("writetime").toString()); return dto; } return new BusConfigDTO(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index b102f65..0c1c7c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -51,16 +51,16 @@ private WebSocket webSocket; @Override - public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode); return alarmJobList; } @Override - public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { + public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId,jobCode,devCode); return alarmJobList; } 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 d2cc7f1..8f151ed 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, DataScope dataScope,String devCode) { String sContent = null; if (ObjectUtil.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, dataScope,devCode); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 596dab3..476a0b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -23,9 +23,11 @@ * @since 2019-05-17 */ public interface AlarmJobMapper extends BaseMapper { - List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); + List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, + @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); - List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); + List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, + @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); // List jobListExport(@Param("page") Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); List> jobListDelayRe(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); 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 4b34b3c..ceb2493 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("dataScope") DataScope dataScope, @Param("devCode") String devCode); 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/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index aeca8cd..ce96c5a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -538,6 +538,13 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + + AND aj.CREATE_TIME = ]]> @@ -579,6 +586,12 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + AND aj.CREATE_TIME = ]]> 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 e079aa7..f0095f3 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 @@ -77,6 +77,10 @@ ar.ALARM_MSG AS "alarmMessage", ar.DEVCODE as devcode, aj.JOB_STATUS as "jobStatus", + + + + as "handleJobTime", ar.JOB_ID as "jobId", bwi.DEPTID AS deptid FROM alarm_records ar @@ -94,6 +98,9 @@ AND ar.ALARM_TYPE = #{alarmType} + + AND ar.DEVCODE like CONCAT('%',#{devCode},'%') + AND ar.ALARM_CONTENT = #{alarmContent} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ecd8e9a..da2a240 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -288,7 +288,7 @@ JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' + WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' and bdw.VALID='1' AND bd.DEVCODE = #{deviceCode} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 1724edb..c63efba 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -18,6 +19,7 @@ * @author test203 * @date 2019/5/20 */ +@Data @ColumnWidth(30) @HeadRowHeight(15) @ContentRowHeight(20) @@ -25,13 +27,7 @@ @ExcelIgnoreUnannotated @Component public class BusConfigDTO { - // mapper.put("设备编号", "devcode"); -// mapper.put("报警阈值(%)", "percent"); -// mapper.put("安装高度(M)", "installHeight"); -// mapper.put("重传次数", "retryTimes"); -// mapper.put("IP地址", "ip"); -// mapper.put("端口号", "port"); -// mapper.put("最大尝试次数", "attemptsMax"); + private Long id; private Long deviceId; /** @@ -137,9 +133,13 @@ @ExcelProperty("睡眠开始时间(时:分)") private String sleepStartTime; /** - * 休眠开始时间 + * 传感器类型id */ private String sensorId; + /** + * 配置时间 + */ + private String writeTime; public static Map sensorHashMap = new HashMap(); @@ -159,229 +159,6 @@ // private String framecontent;//下发内容 - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public void setDeviceType(Long deviceType) { - this.deviceType = deviceType; - } - - public Long getDeviceId() { - return deviceId; - } - - public void setDeviceId(Long deviceId) { - this.deviceId = deviceId; - } - - public String getDevcode() { - return devcode; - } - - public void setDevcode(String devcode) { - this.devcode = devcode; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getDeviceTypeName() { - return deviceTypeName; - } - - public void setDeviceTypeName(String deviceTypeName) { - this.deviceTypeName = deviceTypeName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public float getThreshold() { - return threshold; - } - - public void setThreshold(float threshold) { - this.threshold = threshold; - } - - public float getPercent() { - return percent; - } - - public void setPercent(float percent) { - this.percent = percent; - } - - public float getInstallHeight() { - return installHeight; - } - - public void setInstallHeight(float installHeight) { - this.installHeight = installHeight; - } - - public String getRetryTimes() { - return retryTimes; - } - - public void setRetryTimes(String retryTimes) { - this.retryTimes = retryTimes; - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip; - } - - public String getPort() { - return port; - } - - public void setPort(String port) { - this.port = port; - } - - public String getAttemptsMax() { - return attemptsMax; - } - - public void setAttemptsMax(String attemptsMax) { - this.attemptsMax = attemptsMax; - } - - public String getAttemptsCurrent() { - return attemptsCurrent; - } - - public void setAttemptsCurrent(String attemptsCurrent) { - this.attemptsCurrent = attemptsCurrent; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public Long getDeviceType() { - return deviceType; - } - - public String getCollectInterval() { - return collectInterval; - } - - public void setCollectInterval(String collectInterval) { - this.collectInterval = collectInterval; - } - - public String getCollectCount() { - return collectCount; - } - - public void setCollectCount(String collectCount) { - this.collectCount = collectCount; - } - - public String getReloadInterval() { - return reloadInterval; - } - - public void setReloadInterval(String reloadInterval) { - this.reloadInterval = reloadInterval; - } - - public String getSleepPeriod() { - return sleepPeriod; - } - - public void setSleepPeriod(String sleepPeriod) { - this.sleepPeriod = sleepPeriod; - } - - public String getUploadPeriod() { - return uploadPeriod; - } - - public void setUploadPeriod(String uploadPeriod) { - this.uploadPeriod = uploadPeriod; - } - - public String getCollectTime() { - return collectTime; - } - - public void setCollectTime(String collectTime) { - this.collectTime = collectTime; - } - - public String getSleepStartTime() { - return sleepStartTime; - } - - public void setSleepStartTime(String sleepStartTime) { - this.sleepStartTime = sleepStartTime; - } - - public String getSensorId() { - return sensorId; - } - - public void setSensorId(String sensorId) { - this.sensorId = sensorId; - } - - public float getPercentExp() { - return percentExp; - } - - public void setPercentExp(float percentExp) { - this.percentExp = percentExp; - } public BusConfigDTO() { } @@ -408,6 +185,7 @@ dto.setStatusName("1".equals(objectMap.get("status").toString()) ? "已下发" : "未下发"); dto.setAttemptsMax(objectMap.get("attemptsmax").toString()); + dto.setWriteTime(objectMap.get("writetime").toString()); return dto; } return new BusConfigDTO(); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 5e0f496..e7ba8ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -51,11 +51,15 @@ @RequestMapping("/listPage") - public Object listPage(String keywords, String pipelineType, String deptid) { + public Object listPage(String keywords, String pipelineType, + String deptid,String material, + String pipeDiameter1,String pipeDiameter2, + String begTime,String endTime) { Page page = PageFactory.defaultPage(); //查询数据权限 使用默认deptid 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = busPipelineService.listPage(dataScope, page, keywords, pipelineType, deptid); + List list = busPipelineService.listPage(dataScope, page, keywords, pipelineType, deptid, + material,pipeDiameter1,pipeDiameter2,begTime,endTime); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } @@ -168,9 +172,12 @@ */ @CrossOrigin @RequestMapping(value = "/batchExport", method = RequestMethod.GET) - public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid,String material, + String pipeDiameter1,String pipeDiameter2, + String begTime,String endTime) throws IOException { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = busPipelineService.getBatchExportData(dataScope, wellType, deptid, keywords); + List list = busPipelineService.getBatchExportData(dataScope, wellType, deptid, keywords,material,pipeDiameter1, + pipeDiameter2,begTime,endTime); list.forEach(batchExportDataDto -> { batchExportDataDto.setPipelineTypeName(dictService.getDictNameByCode(BusWellConst.PIPELINE_TYPE, batchExportDataDto.getPipelineType())); batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(Long.valueOf(batchExportDataDto.getDeptid()))); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index b102f65..0c1c7c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -51,16 +51,16 @@ private WebSocket webSocket; @Override - public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode); return alarmJobList; } @Override - public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { + public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId,jobCode,devCode); return alarmJobList; } 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 d2cc7f1..8f151ed 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, DataScope dataScope,String devCode) { String sContent = null; if (ObjectUtil.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, dataScope,devCode); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 596dab3..476a0b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -23,9 +23,11 @@ * @since 2019-05-17 */ public interface AlarmJobMapper extends BaseMapper { - List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); + List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, + @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); - List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); + List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, + @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); // List jobListExport(@Param("page") Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); List> jobListDelayRe(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); 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 4b34b3c..ceb2493 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("dataScope") DataScope dataScope, @Param("devCode") String devCode); 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/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index aeca8cd..ce96c5a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -538,6 +538,13 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + + AND aj.CREATE_TIME = ]]> @@ -579,6 +586,12 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + AND aj.CREATE_TIME = ]]> 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 e079aa7..f0095f3 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 @@ -77,6 +77,10 @@ ar.ALARM_MSG AS "alarmMessage", ar.DEVCODE as devcode, aj.JOB_STATUS as "jobStatus", + + + + as "handleJobTime", ar.JOB_ID as "jobId", bwi.DEPTID AS deptid FROM alarm_records ar @@ -94,6 +98,9 @@ AND ar.ALARM_TYPE = #{alarmType} + + AND ar.DEVCODE like CONCAT('%',#{devCode},'%') + AND ar.ALARM_CONTENT = #{alarmContent} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ecd8e9a..da2a240 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -288,7 +288,7 @@ JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' + WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' and bdw.VALID='1' AND bd.DEVCODE = #{deviceCode} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 1724edb..c63efba 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -18,6 +19,7 @@ * @author test203 * @date 2019/5/20 */ +@Data @ColumnWidth(30) @HeadRowHeight(15) @ContentRowHeight(20) @@ -25,13 +27,7 @@ @ExcelIgnoreUnannotated @Component public class BusConfigDTO { - // mapper.put("设备编号", "devcode"); -// mapper.put("报警阈值(%)", "percent"); -// mapper.put("安装高度(M)", "installHeight"); -// mapper.put("重传次数", "retryTimes"); -// mapper.put("IP地址", "ip"); -// mapper.put("端口号", "port"); -// mapper.put("最大尝试次数", "attemptsMax"); + private Long id; private Long deviceId; /** @@ -137,9 +133,13 @@ @ExcelProperty("睡眠开始时间(时:分)") private String sleepStartTime; /** - * 休眠开始时间 + * 传感器类型id */ private String sensorId; + /** + * 配置时间 + */ + private String writeTime; public static Map sensorHashMap = new HashMap(); @@ -159,229 +159,6 @@ // private String framecontent;//下发内容 - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public void setDeviceType(Long deviceType) { - this.deviceType = deviceType; - } - - public Long getDeviceId() { - return deviceId; - } - - public void setDeviceId(Long deviceId) { - this.deviceId = deviceId; - } - - public String getDevcode() { - return devcode; - } - - public void setDevcode(String devcode) { - this.devcode = devcode; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getDeviceTypeName() { - return deviceTypeName; - } - - public void setDeviceTypeName(String deviceTypeName) { - this.deviceTypeName = deviceTypeName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public float getThreshold() { - return threshold; - } - - public void setThreshold(float threshold) { - this.threshold = threshold; - } - - public float getPercent() { - return percent; - } - - public void setPercent(float percent) { - this.percent = percent; - } - - public float getInstallHeight() { - return installHeight; - } - - public void setInstallHeight(float installHeight) { - this.installHeight = installHeight; - } - - public String getRetryTimes() { - return retryTimes; - } - - public void setRetryTimes(String retryTimes) { - this.retryTimes = retryTimes; - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip; - } - - public String getPort() { - return port; - } - - public void setPort(String port) { - this.port = port; - } - - public String getAttemptsMax() { - return attemptsMax; - } - - public void setAttemptsMax(String attemptsMax) { - this.attemptsMax = attemptsMax; - } - - public String getAttemptsCurrent() { - return attemptsCurrent; - } - - public void setAttemptsCurrent(String attemptsCurrent) { - this.attemptsCurrent = attemptsCurrent; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public Long getDeviceType() { - return deviceType; - } - - public String getCollectInterval() { - return collectInterval; - } - - public void setCollectInterval(String collectInterval) { - this.collectInterval = collectInterval; - } - - public String getCollectCount() { - return collectCount; - } - - public void setCollectCount(String collectCount) { - this.collectCount = collectCount; - } - - public String getReloadInterval() { - return reloadInterval; - } - - public void setReloadInterval(String reloadInterval) { - this.reloadInterval = reloadInterval; - } - - public String getSleepPeriod() { - return sleepPeriod; - } - - public void setSleepPeriod(String sleepPeriod) { - this.sleepPeriod = sleepPeriod; - } - - public String getUploadPeriod() { - return uploadPeriod; - } - - public void setUploadPeriod(String uploadPeriod) { - this.uploadPeriod = uploadPeriod; - } - - public String getCollectTime() { - return collectTime; - } - - public void setCollectTime(String collectTime) { - this.collectTime = collectTime; - } - - public String getSleepStartTime() { - return sleepStartTime; - } - - public void setSleepStartTime(String sleepStartTime) { - this.sleepStartTime = sleepStartTime; - } - - public String getSensorId() { - return sensorId; - } - - public void setSensorId(String sensorId) { - this.sensorId = sensorId; - } - - public float getPercentExp() { - return percentExp; - } - - public void setPercentExp(float percentExp) { - this.percentExp = percentExp; - } public BusConfigDTO() { } @@ -408,6 +185,7 @@ dto.setStatusName("1".equals(objectMap.get("status").toString()) ? "已下发" : "未下发"); dto.setAttemptsMax(objectMap.get("attemptsmax").toString()); + dto.setWriteTime(objectMap.get("writetime").toString()); return dto; } return new BusConfigDTO(); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 5e0f496..e7ba8ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -51,11 +51,15 @@ @RequestMapping("/listPage") - public Object listPage(String keywords, String pipelineType, String deptid) { + public Object listPage(String keywords, String pipelineType, + String deptid,String material, + String pipeDiameter1,String pipeDiameter2, + String begTime,String endTime) { Page page = PageFactory.defaultPage(); //查询数据权限 使用默认deptid 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = busPipelineService.listPage(dataScope, page, keywords, pipelineType, deptid); + List list = busPipelineService.listPage(dataScope, page, keywords, pipelineType, deptid, + material,pipeDiameter1,pipeDiameter2,begTime,endTime); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } @@ -168,9 +172,12 @@ */ @CrossOrigin @RequestMapping(value = "/batchExport", method = RequestMethod.GET) - public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid,String material, + String pipeDiameter1,String pipeDiameter2, + String begTime,String endTime) throws IOException { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = busPipelineService.getBatchExportData(dataScope, wellType, deptid, keywords); + List list = busPipelineService.getBatchExportData(dataScope, wellType, deptid, keywords,material,pipeDiameter1, + pipeDiameter2,begTime,endTime); list.forEach(batchExportDataDto -> { batchExportDataDto.setPipelineTypeName(dictService.getDictNameByCode(BusWellConst.PIPELINE_TYPE, batchExportDataDto.getPipelineType())); batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(Long.valueOf(batchExportDataDto.getDeptid()))); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java index 57cb6e8..5c201f6 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java @@ -18,12 +18,17 @@ public interface BusPipelineMapper extends BaseMapper { List listPage(@Param("scope") DataScope dataScope, @Param("page") Page page, - @Param("keywords") String keywords, @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid); + @Param("keywords") String keywords, @Param("pipelineType") String pipelineType, + @Param("deptid") Long deptid, @Param("material") String material, + @Param("pipeDiameter1") String pipeDiameter1,@Param("pipeDiameter2") String pipeDiameter2, + @Param("begTime") String begTime,@Param("endTime") String endTime); List> getDeptMap(); List getBatchExportData(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, - @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid); + @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid, @Param("material") String material, + @Param("pipeDiameter1") String pipeDiameter1,@Param("pipeDiameter2") String pipeDiameter2, + @Param("begTime") String begTime,@Param("endTime") String endTime); @Select("select t.pipeline_code as pipeCode,t.start_longitude_gaode as startLongitudeGd,t.start_latitude_gaode as startLatitudeGd,t.end_longitude_gaode as endLongitudeGd,t.end_latitude_gaode as endLatitudeGd from bus_pipeline t ") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index b102f65..0c1c7c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -51,16 +51,16 @@ private WebSocket webSocket; @Override - public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode); return alarmJobList; } @Override - public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { + public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId,jobCode,devCode); return alarmJobList; } 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 d2cc7f1..8f151ed 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, DataScope dataScope,String devCode) { String sContent = null; if (ObjectUtil.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, dataScope,devCode); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 596dab3..476a0b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -23,9 +23,11 @@ * @since 2019-05-17 */ public interface AlarmJobMapper extends BaseMapper { - List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); + List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, + @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); - List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); + List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, + @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); // List jobListExport(@Param("page") Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); List> jobListDelayRe(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); 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 4b34b3c..ceb2493 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("dataScope") DataScope dataScope, @Param("devCode") String devCode); 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/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index aeca8cd..ce96c5a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -538,6 +538,13 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + + AND aj.CREATE_TIME = ]]> @@ -579,6 +586,12 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + AND aj.CREATE_TIME = ]]> 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 e079aa7..f0095f3 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 @@ -77,6 +77,10 @@ ar.ALARM_MSG AS "alarmMessage", ar.DEVCODE as devcode, aj.JOB_STATUS as "jobStatus", + + + + as "handleJobTime", ar.JOB_ID as "jobId", bwi.DEPTID AS deptid FROM alarm_records ar @@ -94,6 +98,9 @@ AND ar.ALARM_TYPE = #{alarmType} + + AND ar.DEVCODE like CONCAT('%',#{devCode},'%') + AND ar.ALARM_CONTENT = #{alarmContent} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ecd8e9a..da2a240 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -288,7 +288,7 @@ JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' + WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' and bdw.VALID='1' AND bd.DEVCODE = #{deviceCode} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 1724edb..c63efba 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -18,6 +19,7 @@ * @author test203 * @date 2019/5/20 */ +@Data @ColumnWidth(30) @HeadRowHeight(15) @ContentRowHeight(20) @@ -25,13 +27,7 @@ @ExcelIgnoreUnannotated @Component public class BusConfigDTO { - // mapper.put("设备编号", "devcode"); -// mapper.put("报警阈值(%)", "percent"); -// mapper.put("安装高度(M)", "installHeight"); -// mapper.put("重传次数", "retryTimes"); -// mapper.put("IP地址", "ip"); -// mapper.put("端口号", "port"); -// mapper.put("最大尝试次数", "attemptsMax"); + private Long id; private Long deviceId; /** @@ -137,9 +133,13 @@ @ExcelProperty("睡眠开始时间(时:分)") private String sleepStartTime; /** - * 休眠开始时间 + * 传感器类型id */ private String sensorId; + /** + * 配置时间 + */ + private String writeTime; public static Map sensorHashMap = new HashMap(); @@ -159,229 +159,6 @@ // private String framecontent;//下发内容 - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public void setDeviceType(Long deviceType) { - this.deviceType = deviceType; - } - - public Long getDeviceId() { - return deviceId; - } - - public void setDeviceId(Long deviceId) { - this.deviceId = deviceId; - } - - public String getDevcode() { - return devcode; - } - - public void setDevcode(String devcode) { - this.devcode = devcode; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getDeviceTypeName() { - return deviceTypeName; - } - - public void setDeviceTypeName(String deviceTypeName) { - this.deviceTypeName = deviceTypeName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public float getThreshold() { - return threshold; - } - - public void setThreshold(float threshold) { - this.threshold = threshold; - } - - public float getPercent() { - return percent; - } - - public void setPercent(float percent) { - this.percent = percent; - } - - public float getInstallHeight() { - return installHeight; - } - - public void setInstallHeight(float installHeight) { - this.installHeight = installHeight; - } - - public String getRetryTimes() { - return retryTimes; - } - - public void setRetryTimes(String retryTimes) { - this.retryTimes = retryTimes; - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip; - } - - public String getPort() { - return port; - } - - public void setPort(String port) { - this.port = port; - } - - public String getAttemptsMax() { - return attemptsMax; - } - - public void setAttemptsMax(String attemptsMax) { - this.attemptsMax = attemptsMax; - } - - public String getAttemptsCurrent() { - return attemptsCurrent; - } - - public void setAttemptsCurrent(String attemptsCurrent) { - this.attemptsCurrent = attemptsCurrent; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public Long getDeviceType() { - return deviceType; - } - - public String getCollectInterval() { - return collectInterval; - } - - public void setCollectInterval(String collectInterval) { - this.collectInterval = collectInterval; - } - - public String getCollectCount() { - return collectCount; - } - - public void setCollectCount(String collectCount) { - this.collectCount = collectCount; - } - - public String getReloadInterval() { - return reloadInterval; - } - - public void setReloadInterval(String reloadInterval) { - this.reloadInterval = reloadInterval; - } - - public String getSleepPeriod() { - return sleepPeriod; - } - - public void setSleepPeriod(String sleepPeriod) { - this.sleepPeriod = sleepPeriod; - } - - public String getUploadPeriod() { - return uploadPeriod; - } - - public void setUploadPeriod(String uploadPeriod) { - this.uploadPeriod = uploadPeriod; - } - - public String getCollectTime() { - return collectTime; - } - - public void setCollectTime(String collectTime) { - this.collectTime = collectTime; - } - - public String getSleepStartTime() { - return sleepStartTime; - } - - public void setSleepStartTime(String sleepStartTime) { - this.sleepStartTime = sleepStartTime; - } - - public String getSensorId() { - return sensorId; - } - - public void setSensorId(String sensorId) { - this.sensorId = sensorId; - } - - public float getPercentExp() { - return percentExp; - } - - public void setPercentExp(float percentExp) { - this.percentExp = percentExp; - } public BusConfigDTO() { } @@ -408,6 +185,7 @@ dto.setStatusName("1".equals(objectMap.get("status").toString()) ? "已下发" : "未下发"); dto.setAttemptsMax(objectMap.get("attemptsmax").toString()); + dto.setWriteTime(objectMap.get("writetime").toString()); return dto; } return new BusConfigDTO(); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 5e0f496..e7ba8ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -51,11 +51,15 @@ @RequestMapping("/listPage") - public Object listPage(String keywords, String pipelineType, String deptid) { + public Object listPage(String keywords, String pipelineType, + String deptid,String material, + String pipeDiameter1,String pipeDiameter2, + String begTime,String endTime) { Page page = PageFactory.defaultPage(); //查询数据权限 使用默认deptid 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = busPipelineService.listPage(dataScope, page, keywords, pipelineType, deptid); + List list = busPipelineService.listPage(dataScope, page, keywords, pipelineType, deptid, + material,pipeDiameter1,pipeDiameter2,begTime,endTime); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } @@ -168,9 +172,12 @@ */ @CrossOrigin @RequestMapping(value = "/batchExport", method = RequestMethod.GET) - public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid,String material, + String pipeDiameter1,String pipeDiameter2, + String begTime,String endTime) throws IOException { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = busPipelineService.getBatchExportData(dataScope, wellType, deptid, keywords); + List list = busPipelineService.getBatchExportData(dataScope, wellType, deptid, keywords,material,pipeDiameter1, + pipeDiameter2,begTime,endTime); list.forEach(batchExportDataDto -> { batchExportDataDto.setPipelineTypeName(dictService.getDictNameByCode(BusWellConst.PIPELINE_TYPE, batchExportDataDto.getPipelineType())); batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(Long.valueOf(batchExportDataDto.getDeptid()))); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java index 57cb6e8..5c201f6 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java @@ -18,12 +18,17 @@ public interface BusPipelineMapper extends BaseMapper { List listPage(@Param("scope") DataScope dataScope, @Param("page") Page page, - @Param("keywords") String keywords, @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid); + @Param("keywords") String keywords, @Param("pipelineType") String pipelineType, + @Param("deptid") Long deptid, @Param("material") String material, + @Param("pipeDiameter1") String pipeDiameter1,@Param("pipeDiameter2") String pipeDiameter2, + @Param("begTime") String begTime,@Param("endTime") String endTime); List> getDeptMap(); List getBatchExportData(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, - @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid); + @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid, @Param("material") String material, + @Param("pipeDiameter1") String pipeDiameter1,@Param("pipeDiameter2") String pipeDiameter2, + @Param("begTime") String begTime,@Param("endTime") String endTime); @Select("select t.pipeline_code as pipeCode,t.start_longitude_gaode as startLongitudeGd,t.start_latitude_gaode as startLatitudeGd,t.end_longitude_gaode as endLongitudeGd,t.end_latitude_gaode as endLatitudeGd from bus_pipeline t ") diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml index 4913acc..8027c46 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml @@ -53,6 +53,26 @@ ) + + and pipeline_type = #{pipelineType} + + + and material like CONCAT ('%', #{material}, '%') + + + and pipe_diameter = ]]> #{pipeDiameter1} + + + and pipe_diameter #{pipeDiameter2} + + + + and construct_era = ]]> #{begTime} + + + and construct_era #{endTime} + + ORDER BY ts DESC @@ -81,6 +101,22 @@ and deptid = #{deptid} + + and material like CONCAT ('%', #{material}, '%') + + + and pipe_diameter = ]]> #{pipeDiameter1} + + + and pipe_diameter #{pipeDiameter2} + + + + and construct_era = ]]> #{begTime} + + + and construct_era #{endTime} + and ( pipeline_code like diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index b102f65..0c1c7c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -51,16 +51,16 @@ private WebSocket webSocket; @Override - public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode); return alarmJobList; } @Override - public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { + public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId,jobCode,devCode); return alarmJobList; } 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 d2cc7f1..8f151ed 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, DataScope dataScope,String devCode) { String sContent = null; if (ObjectUtil.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, dataScope,devCode); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 596dab3..476a0b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -23,9 +23,11 @@ * @since 2019-05-17 */ public interface AlarmJobMapper extends BaseMapper { - List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); + List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, + @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); - List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); + List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, + @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); // List jobListExport(@Param("page") Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); List> jobListDelayRe(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); 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 4b34b3c..ceb2493 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("dataScope") DataScope dataScope, @Param("devCode") String devCode); 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/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index aeca8cd..ce96c5a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -538,6 +538,13 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + + AND aj.CREATE_TIME = ]]> @@ -579,6 +586,12 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + AND aj.CREATE_TIME = ]]> 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 e079aa7..f0095f3 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 @@ -77,6 +77,10 @@ ar.ALARM_MSG AS "alarmMessage", ar.DEVCODE as devcode, aj.JOB_STATUS as "jobStatus", + + + + as "handleJobTime", ar.JOB_ID as "jobId", bwi.DEPTID AS deptid FROM alarm_records ar @@ -94,6 +98,9 @@ AND ar.ALARM_TYPE = #{alarmType} + + AND ar.DEVCODE like CONCAT('%',#{devCode},'%') + AND ar.ALARM_CONTENT = #{alarmContent} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ecd8e9a..da2a240 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -288,7 +288,7 @@ JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' + WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' and bdw.VALID='1' AND bd.DEVCODE = #{deviceCode} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 1724edb..c63efba 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -18,6 +19,7 @@ * @author test203 * @date 2019/5/20 */ +@Data @ColumnWidth(30) @HeadRowHeight(15) @ContentRowHeight(20) @@ -25,13 +27,7 @@ @ExcelIgnoreUnannotated @Component public class BusConfigDTO { - // mapper.put("设备编号", "devcode"); -// mapper.put("报警阈值(%)", "percent"); -// mapper.put("安装高度(M)", "installHeight"); -// mapper.put("重传次数", "retryTimes"); -// mapper.put("IP地址", "ip"); -// mapper.put("端口号", "port"); -// mapper.put("最大尝试次数", "attemptsMax"); + private Long id; private Long deviceId; /** @@ -137,9 +133,13 @@ @ExcelProperty("睡眠开始时间(时:分)") private String sleepStartTime; /** - * 休眠开始时间 + * 传感器类型id */ private String sensorId; + /** + * 配置时间 + */ + private String writeTime; public static Map sensorHashMap = new HashMap(); @@ -159,229 +159,6 @@ // private String framecontent;//下发内容 - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public void setDeviceType(Long deviceType) { - this.deviceType = deviceType; - } - - public Long getDeviceId() { - return deviceId; - } - - public void setDeviceId(Long deviceId) { - this.deviceId = deviceId; - } - - public String getDevcode() { - return devcode; - } - - public void setDevcode(String devcode) { - this.devcode = devcode; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getDeviceTypeName() { - return deviceTypeName; - } - - public void setDeviceTypeName(String deviceTypeName) { - this.deviceTypeName = deviceTypeName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public float getThreshold() { - return threshold; - } - - public void setThreshold(float threshold) { - this.threshold = threshold; - } - - public float getPercent() { - return percent; - } - - public void setPercent(float percent) { - this.percent = percent; - } - - public float getInstallHeight() { - return installHeight; - } - - public void setInstallHeight(float installHeight) { - this.installHeight = installHeight; - } - - public String getRetryTimes() { - return retryTimes; - } - - public void setRetryTimes(String retryTimes) { - this.retryTimes = retryTimes; - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip; - } - - public String getPort() { - return port; - } - - public void setPort(String port) { - this.port = port; - } - - public String getAttemptsMax() { - return attemptsMax; - } - - public void setAttemptsMax(String attemptsMax) { - this.attemptsMax = attemptsMax; - } - - public String getAttemptsCurrent() { - return attemptsCurrent; - } - - public void setAttemptsCurrent(String attemptsCurrent) { - this.attemptsCurrent = attemptsCurrent; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public Long getDeviceType() { - return deviceType; - } - - public String getCollectInterval() { - return collectInterval; - } - - public void setCollectInterval(String collectInterval) { - this.collectInterval = collectInterval; - } - - public String getCollectCount() { - return collectCount; - } - - public void setCollectCount(String collectCount) { - this.collectCount = collectCount; - } - - public String getReloadInterval() { - return reloadInterval; - } - - public void setReloadInterval(String reloadInterval) { - this.reloadInterval = reloadInterval; - } - - public String getSleepPeriod() { - return sleepPeriod; - } - - public void setSleepPeriod(String sleepPeriod) { - this.sleepPeriod = sleepPeriod; - } - - public String getUploadPeriod() { - return uploadPeriod; - } - - public void setUploadPeriod(String uploadPeriod) { - this.uploadPeriod = uploadPeriod; - } - - public String getCollectTime() { - return collectTime; - } - - public void setCollectTime(String collectTime) { - this.collectTime = collectTime; - } - - public String getSleepStartTime() { - return sleepStartTime; - } - - public void setSleepStartTime(String sleepStartTime) { - this.sleepStartTime = sleepStartTime; - } - - public String getSensorId() { - return sensorId; - } - - public void setSensorId(String sensorId) { - this.sensorId = sensorId; - } - - public float getPercentExp() { - return percentExp; - } - - public void setPercentExp(float percentExp) { - this.percentExp = percentExp; - } public BusConfigDTO() { } @@ -408,6 +185,7 @@ dto.setStatusName("1".equals(objectMap.get("status").toString()) ? "已下发" : "未下发"); dto.setAttemptsMax(objectMap.get("attemptsmax").toString()); + dto.setWriteTime(objectMap.get("writetime").toString()); return dto; } return new BusConfigDTO(); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 5e0f496..e7ba8ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -51,11 +51,15 @@ @RequestMapping("/listPage") - public Object listPage(String keywords, String pipelineType, String deptid) { + public Object listPage(String keywords, String pipelineType, + String deptid,String material, + String pipeDiameter1,String pipeDiameter2, + String begTime,String endTime) { Page page = PageFactory.defaultPage(); //查询数据权限 使用默认deptid 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = busPipelineService.listPage(dataScope, page, keywords, pipelineType, deptid); + List list = busPipelineService.listPage(dataScope, page, keywords, pipelineType, deptid, + material,pipeDiameter1,pipeDiameter2,begTime,endTime); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } @@ -168,9 +172,12 @@ */ @CrossOrigin @RequestMapping(value = "/batchExport", method = RequestMethod.GET) - public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid,String material, + String pipeDiameter1,String pipeDiameter2, + String begTime,String endTime) throws IOException { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = busPipelineService.getBatchExportData(dataScope, wellType, deptid, keywords); + List list = busPipelineService.getBatchExportData(dataScope, wellType, deptid, keywords,material,pipeDiameter1, + pipeDiameter2,begTime,endTime); list.forEach(batchExportDataDto -> { batchExportDataDto.setPipelineTypeName(dictService.getDictNameByCode(BusWellConst.PIPELINE_TYPE, batchExportDataDto.getPipelineType())); batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(Long.valueOf(batchExportDataDto.getDeptid()))); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java index 57cb6e8..5c201f6 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java @@ -18,12 +18,17 @@ public interface BusPipelineMapper extends BaseMapper { List listPage(@Param("scope") DataScope dataScope, @Param("page") Page page, - @Param("keywords") String keywords, @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid); + @Param("keywords") String keywords, @Param("pipelineType") String pipelineType, + @Param("deptid") Long deptid, @Param("material") String material, + @Param("pipeDiameter1") String pipeDiameter1,@Param("pipeDiameter2") String pipeDiameter2, + @Param("begTime") String begTime,@Param("endTime") String endTime); List> getDeptMap(); List getBatchExportData(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, - @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid); + @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid, @Param("material") String material, + @Param("pipeDiameter1") String pipeDiameter1,@Param("pipeDiameter2") String pipeDiameter2, + @Param("begTime") String begTime,@Param("endTime") String endTime); @Select("select t.pipeline_code as pipeCode,t.start_longitude_gaode as startLongitudeGd,t.start_latitude_gaode as startLatitudeGd,t.end_longitude_gaode as endLongitudeGd,t.end_latitude_gaode as endLatitudeGd from bus_pipeline t ") diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml index 4913acc..8027c46 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml @@ -53,6 +53,26 @@ ) + + and pipeline_type = #{pipelineType} + + + and material like CONCAT ('%', #{material}, '%') + + + and pipe_diameter = ]]> #{pipeDiameter1} + + + and pipe_diameter #{pipeDiameter2} + + + + and construct_era = ]]> #{begTime} + + + and construct_era #{endTime} + + ORDER BY ts DESC @@ -81,6 +101,22 @@ and deptid = #{deptid} + + and material like CONCAT ('%', #{material}, '%') + + + and pipe_diameter = ]]> #{pipeDiameter1} + + + and pipe_diameter #{pipeDiameter2} + + + + and construct_era = ]]> #{begTime} + + + and construct_era #{endTime} + and ( pipeline_code like diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java index a9aec94..87a2e83 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java @@ -16,11 +16,13 @@ Boolean deleteBatchByIds(List ids); - List listPage(DataScope dataScope, Page page, String keywords, String pipelineType, String deptid); + List listPage(DataScope dataScope, Page page, String keywords, String pipelineType, String deptid, + String material,String pipeDiameter1,String pipeDiameter2,String begTime,String endTime); List batchAddPipeline(List results); - List getBatchExportData(DataScope dataScope, String pipelineType, String deptid, String keywords); + List getBatchExportData(DataScope dataScope, String pipelineType, String deptid, String keywords, + String material, String pipeDiameter1,String pipeDiameter2,String begTime,String endTime); List appList(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java index 899bfd2..4f686e5 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java @@ -142,6 +142,8 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -152,7 +154,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); } else { //app角色 long leaderId = 0L; @@ -164,7 +166,7 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobStatusStr)); } } - retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId); + retList = alarmJobService.jobListApp(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, currentUser.getDeptId(), currentUser.getId(), leaderId,jobCode,devCode); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -379,9 +381,11 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String jobCode = httpServletRequest.getParameter("jobCode"); + String devCode = httpServletRequest.getParameter("devCode"); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); - List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + List> jobExpList = alarmJobService.jobList(page, keywords, beginTime, endTime, jobStatusStr, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),jobCode,devCode); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( 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 9c60e79..65ba95c 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 @@ -64,6 +64,7 @@ @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { String keywords = httpServletRequest.getParameter("keywords"); + String devCode = httpServletRequest.getParameter("devCode"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); String statusStr = httpServletRequest.getParameter("status"); @@ -76,7 +77,7 @@ alarmTypeStr = "1"; } dataScope.setScopeName("bwi.DEPTID"); - List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope); + List> retList = alarmRecordsService.alarmList(page, keywords, beginTime, endTime, statusStr, alarmTypeStr, alarmContentStr, dataScope,devCode); retList.forEach(this::alarmRecordWrapper); page.setRecords(retList); @@ -163,7 +164,7 @@ String statusStr = httpServletRequest.getParameter("status"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String devCode = httpServletRequest.getParameter("devCode"); Page> page = PageFactory.defaultPage(); page.setMaxLimit((long) maxRowsExcel); page.setSize(maxRowsExcel); @@ -174,7 +175,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,devCode); alarmExpList.forEach(this::alarmRecordWrapper); List recordExcelDtoList = new ArrayList<>(); alarmExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java index 79117c3..20ee73b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmJobService.java @@ -20,9 +20,9 @@ * @since 2019-05-17 */ public interface IAlarmJobService extends IService { - List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode); - List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); + List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode); // List jobListExport( Page page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType,String alarmContent, DataScope dataScope); List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); 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 8a5b270..2749597 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, DataScope dataScope,String devCode); 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/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java index b102f65..0c1c7c7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java @@ -51,16 +51,16 @@ private WebSocket webSocket; @Override - public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobList(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, DataScope dataScope, Long userId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,jobCode,devCode); return alarmJobList; } @Override - public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { + public List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId,String jobCode,String devCode) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId); + List> alarmJobList = this.baseMapper.jobListApp(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, deptId, userId, leaderId,jobCode,devCode); return alarmJobList; } 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 d2cc7f1..8f151ed 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, DataScope dataScope,String devCode) { String sContent = null; if (ObjectUtil.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, dataScope,devCode); } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java index 596dab3..476a0b1 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmJobMapper.java @@ -23,9 +23,11 @@ * @since 2019-05-17 */ public interface AlarmJobMapper extends BaseMapper { - List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); + List> jobList(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, + @Param("userId") Long userId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); - List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); + List> jobListApp(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("deptId") Long deptId, + @Param("userId") Long userId, @Param("leaderId") Long leaderId, @Param("jobCode") String jobCode, @Param("devCode") String devCode); // List jobListExport(@Param("page") Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("jobStatus") String jobStatus, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent,@Param("dataScope") DataScope dataScope); List> jobListDelayRe(@Param("page") Page> page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("alarmType") String alarmType, @Param("alarmContent") String alarmContent, @Param("dataScope") DataScope dataScope, @Param("userId") Long userId); 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 4b34b3c..ceb2493 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("dataScope") DataScope dataScope, @Param("devCode") String devCode); 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/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml index aeca8cd..ce96c5a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml @@ -538,6 +538,13 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + + AND aj.CREATE_TIME = ]]> @@ -579,6 +586,12 @@ AND ar.ALARM_CONTENT = #{alarmContent} + + AND aj.JOBCODE like CONCAT('%',#{jobCode},'%') + + + AND aj.DEVCODE like CONCAT('%',#{devCode},'%') + AND aj.CREATE_TIME = ]]> 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 e079aa7..f0095f3 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 @@ -77,6 +77,10 @@ ar.ALARM_MSG AS "alarmMessage", ar.DEVCODE as devcode, aj.JOB_STATUS as "jobStatus", + + + + as "handleJobTime", ar.JOB_ID as "jobId", bwi.DEPTID AS deptid FROM alarm_records ar @@ -94,6 +98,9 @@ AND ar.ALARM_TYPE = #{alarmType} + + AND ar.DEVCODE like CONCAT('%',#{devCode},'%') + AND ar.ALARM_CONTENT = #{alarmContent} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index ecd8e9a..da2a240 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -288,7 +288,7 @@ JOIN bus_device_well bdw ON bdw.device_id = bd.id JOIN bus_well_info bwi ON bwi.ID = bdw.well_id JOIN base_device_type bdt on bdt.ID = bd.DEVICE_TYPE - WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' + WHERE bd.online_State = '0' and bd.VALID = '1' AND bwi.VALID='1' and bdw.VALID='1' AND bd.DEVCODE = #{deviceCode} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java index 1724edb..c63efba 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -18,6 +19,7 @@ * @author test203 * @date 2019/5/20 */ +@Data @ColumnWidth(30) @HeadRowHeight(15) @ContentRowHeight(20) @@ -25,13 +27,7 @@ @ExcelIgnoreUnannotated @Component public class BusConfigDTO { - // mapper.put("设备编号", "devcode"); -// mapper.put("报警阈值(%)", "percent"); -// mapper.put("安装高度(M)", "installHeight"); -// mapper.put("重传次数", "retryTimes"); -// mapper.put("IP地址", "ip"); -// mapper.put("端口号", "port"); -// mapper.put("最大尝试次数", "attemptsMax"); + private Long id; private Long deviceId; /** @@ -137,9 +133,13 @@ @ExcelProperty("睡眠开始时间(时:分)") private String sleepStartTime; /** - * 休眠开始时间 + * 传感器类型id */ private String sensorId; + /** + * 配置时间 + */ + private String writeTime; public static Map sensorHashMap = new HashMap(); @@ -159,229 +159,6 @@ // private String framecontent;//下发内容 - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public void setDeviceType(Long deviceType) { - this.deviceType = deviceType; - } - - public Long getDeviceId() { - return deviceId; - } - - public void setDeviceId(Long deviceId) { - this.deviceId = deviceId; - } - - public String getDevcode() { - return devcode; - } - - public void setDevcode(String devcode) { - this.devcode = devcode; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getDeviceTypeName() { - return deviceTypeName; - } - - public void setDeviceTypeName(String deviceTypeName) { - this.deviceTypeName = deviceTypeName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public float getThreshold() { - return threshold; - } - - public void setThreshold(float threshold) { - this.threshold = threshold; - } - - public float getPercent() { - return percent; - } - - public void setPercent(float percent) { - this.percent = percent; - } - - public float getInstallHeight() { - return installHeight; - } - - public void setInstallHeight(float installHeight) { - this.installHeight = installHeight; - } - - public String getRetryTimes() { - return retryTimes; - } - - public void setRetryTimes(String retryTimes) { - this.retryTimes = retryTimes; - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip; - } - - public String getPort() { - return port; - } - - public void setPort(String port) { - this.port = port; - } - - public String getAttemptsMax() { - return attemptsMax; - } - - public void setAttemptsMax(String attemptsMax) { - this.attemptsMax = attemptsMax; - } - - public String getAttemptsCurrent() { - return attemptsCurrent; - } - - public void setAttemptsCurrent(String attemptsCurrent) { - this.attemptsCurrent = attemptsCurrent; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getStatusName() { - return statusName; - } - - public void setStatusName(String statusName) { - this.statusName = statusName; - } - - public Long getDeviceType() { - return deviceType; - } - - public String getCollectInterval() { - return collectInterval; - } - - public void setCollectInterval(String collectInterval) { - this.collectInterval = collectInterval; - } - - public String getCollectCount() { - return collectCount; - } - - public void setCollectCount(String collectCount) { - this.collectCount = collectCount; - } - - public String getReloadInterval() { - return reloadInterval; - } - - public void setReloadInterval(String reloadInterval) { - this.reloadInterval = reloadInterval; - } - - public String getSleepPeriod() { - return sleepPeriod; - } - - public void setSleepPeriod(String sleepPeriod) { - this.sleepPeriod = sleepPeriod; - } - - public String getUploadPeriod() { - return uploadPeriod; - } - - public void setUploadPeriod(String uploadPeriod) { - this.uploadPeriod = uploadPeriod; - } - - public String getCollectTime() { - return collectTime; - } - - public void setCollectTime(String collectTime) { - this.collectTime = collectTime; - } - - public String getSleepStartTime() { - return sleepStartTime; - } - - public void setSleepStartTime(String sleepStartTime) { - this.sleepStartTime = sleepStartTime; - } - - public String getSensorId() { - return sensorId; - } - - public void setSensorId(String sensorId) { - this.sensorId = sensorId; - } - - public float getPercentExp() { - return percentExp; - } - - public void setPercentExp(float percentExp) { - this.percentExp = percentExp; - } public BusConfigDTO() { } @@ -408,6 +185,7 @@ dto.setStatusName("1".equals(objectMap.get("status").toString()) ? "已下发" : "未下发"); dto.setAttemptsMax(objectMap.get("attemptsmax").toString()); + dto.setWriteTime(objectMap.get("writetime").toString()); return dto; } return new BusConfigDTO(); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 5e0f496..e7ba8ed 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -51,11 +51,15 @@ @RequestMapping("/listPage") - public Object listPage(String keywords, String pipelineType, String deptid) { + public Object listPage(String keywords, String pipelineType, + String deptid,String material, + String pipeDiameter1,String pipeDiameter2, + String begTime,String endTime) { Page page = PageFactory.defaultPage(); //查询数据权限 使用默认deptid 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = busPipelineService.listPage(dataScope, page, keywords, pipelineType, deptid); + List list = busPipelineService.listPage(dataScope, page, keywords, pipelineType, deptid, + material,pipeDiameter1,pipeDiameter2,begTime,endTime); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } @@ -168,9 +172,12 @@ */ @CrossOrigin @RequestMapping(value = "/batchExport", method = RequestMethod.GET) - public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid,String material, + String pipeDiameter1,String pipeDiameter2, + String begTime,String endTime) throws IOException { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = busPipelineService.getBatchExportData(dataScope, wellType, deptid, keywords); + List list = busPipelineService.getBatchExportData(dataScope, wellType, deptid, keywords,material,pipeDiameter1, + pipeDiameter2,begTime,endTime); list.forEach(batchExportDataDto -> { batchExportDataDto.setPipelineTypeName(dictService.getDictNameByCode(BusWellConst.PIPELINE_TYPE, batchExportDataDto.getPipelineType())); batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(Long.valueOf(batchExportDataDto.getDeptid()))); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java index 57cb6e8..5c201f6 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java @@ -18,12 +18,17 @@ public interface BusPipelineMapper extends BaseMapper { List listPage(@Param("scope") DataScope dataScope, @Param("page") Page page, - @Param("keywords") String keywords, @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid); + @Param("keywords") String keywords, @Param("pipelineType") String pipelineType, + @Param("deptid") Long deptid, @Param("material") String material, + @Param("pipeDiameter1") String pipeDiameter1,@Param("pipeDiameter2") String pipeDiameter2, + @Param("begTime") String begTime,@Param("endTime") String endTime); List> getDeptMap(); List getBatchExportData(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, - @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid); + @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid, @Param("material") String material, + @Param("pipeDiameter1") String pipeDiameter1,@Param("pipeDiameter2") String pipeDiameter2, + @Param("begTime") String begTime,@Param("endTime") String endTime); @Select("select t.pipeline_code as pipeCode,t.start_longitude_gaode as startLongitudeGd,t.start_latitude_gaode as startLatitudeGd,t.end_longitude_gaode as endLongitudeGd,t.end_latitude_gaode as endLatitudeGd from bus_pipeline t ") diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml index 4913acc..8027c46 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPipelineMapper.xml @@ -53,6 +53,26 @@ ) + + and pipeline_type = #{pipelineType} + + + and material like CONCAT ('%', #{material}, '%') + + + and pipe_diameter = ]]> #{pipeDiameter1} + + + and pipe_diameter #{pipeDiameter2} + + + + and construct_era = ]]> #{begTime} + + + and construct_era #{endTime} + + ORDER BY ts DESC @@ -81,6 +101,22 @@ and deptid = #{deptid} + + and material like CONCAT ('%', #{material}, '%') + + + and pipe_diameter = ]]> #{pipeDiameter1} + + + and pipe_diameter #{pipeDiameter2} + + + + and construct_era = ]]> #{begTime} + + + and construct_era #{endTime} + and ( pipeline_code like diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java index a9aec94..87a2e83 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java @@ -16,11 +16,13 @@ Boolean deleteBatchByIds(List ids); - List listPage(DataScope dataScope, Page page, String keywords, String pipelineType, String deptid); + List listPage(DataScope dataScope, Page page, String keywords, String pipelineType, String deptid, + String material,String pipeDiameter1,String pipeDiameter2,String begTime,String endTime); List batchAddPipeline(List results); - List getBatchExportData(DataScope dataScope, String pipelineType, String deptid, String keywords); + List getBatchExportData(DataScope dataScope, String pipelineType, String deptid, String keywords, + String material, String pipeDiameter1,String pipeDiameter2,String begTime,String endTime); List appList(); } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java index b632a7b..997e39a 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java @@ -56,9 +56,10 @@ } @Override - public List listPage(DataScope dataScope, Page page, String keywords, String pipelineType, String deptid) { + public List listPage(DataScope dataScope, Page page, String keywords, String pipelineType, String deptid, + String material, String pipeDiameter1,String pipeDiameter2, String begTime,String endTime) { List list = this.baseMapper.listPage(dataScope, page, keywords, pipelineType, - Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid)); + Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid),material,pipeDiameter1,pipeDiameter2,begTime,endTime); list.forEach(pipeline -> { pipeline.setPipelineTypeName(dictService.getDictNameByCode(BusWellConst.PIPELINE_TYPE, pipeline.getPipelineType())); pipeline.setDeptName(service.getDeptService().getDeptName(pipeline.getDeptid())); @@ -168,9 +169,11 @@ } @Override - public List getBatchExportData(DataScope dataScope, String pipelineType, String deptid, String keywords) { + public List getBatchExportData(DataScope dataScope, String pipelineType, String deptid, String keywords,String material, + String pipeDiameter1,String pipeDiameter2, + String begTime,String endTime) { List list = this.baseMapper.getBatchExportData(dataScope, keywords, pipelineType, - Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid)); + Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid),material,pipeDiameter1,pipeDiameter2,begTime,endTime); return list; }