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 08aec6b..804d656 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 @@ -19,6 +19,7 @@ import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -143,6 +144,7 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -153,7 +155,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(),deptid); } else { //app角色 long leaderId = 0L; @@ -165,7 +167,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); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -280,8 +282,8 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus())); } } - Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId(); - retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId); + Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId() : jobListParam.getDeptId(); + retList = alarmJobService.jobListSearchApp(page, jobListParam, deptId, currentUser.getId(), leaderId); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -300,7 +302,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -311,7 +313,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -338,7 +340,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -349,7 +351,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -381,9 +383,10 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); 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(),deptid); 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 08aec6b..804d656 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 @@ -19,6 +19,7 @@ import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -143,6 +144,7 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -153,7 +155,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(),deptid); } else { //app角色 long leaderId = 0L; @@ -165,7 +167,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); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -280,8 +282,8 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus())); } } - Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId(); - retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId); + Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId() : jobListParam.getDeptId(); + retList = alarmJobService.jobListSearchApp(page, jobListParam, deptId, currentUser.getId(), leaderId); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -300,7 +302,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -311,7 +313,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -338,7 +340,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -349,7 +351,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -381,9 +383,10 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); 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(),deptid); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index af4f7cb..8ab0809 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; -// @ExcelProperty("部门名称") + @ExcelProperty("部门名称") private String deptName; 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 08aec6b..804d656 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 @@ -19,6 +19,7 @@ import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -143,6 +144,7 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -153,7 +155,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(),deptid); } else { //app角色 long leaderId = 0L; @@ -165,7 +167,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); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -280,8 +282,8 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus())); } } - Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId(); - retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId); + Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId() : jobListParam.getDeptId(); + retList = alarmJobService.jobListSearchApp(page, jobListParam, deptId, currentUser.getId(), leaderId); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -300,7 +302,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -311,7 +313,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -338,7 +340,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -349,7 +351,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -381,9 +383,10 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); 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(),deptid); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index af4f7cb..8ab0809 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; -// @ExcelProperty("部门名称") + @ExcelProperty("部门名称") private String deptName; 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..c4e995b 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,16 +20,16 @@ * @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 deptid); List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); // 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); + List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid); List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); - List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid); List> jobListDelayProApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); 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 08aec6b..804d656 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 @@ -19,6 +19,7 @@ import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -143,6 +144,7 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -153,7 +155,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(),deptid); } else { //app角色 long leaderId = 0L; @@ -165,7 +167,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); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -280,8 +282,8 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus())); } } - Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId(); - retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId); + Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId() : jobListParam.getDeptId(); + retList = alarmJobService.jobListSearchApp(page, jobListParam, deptId, currentUser.getId(), leaderId); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -300,7 +302,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -311,7 +313,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -338,7 +340,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -349,7 +351,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -381,9 +383,10 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); 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(),deptid); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index af4f7cb..8ab0809 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; -// @ExcelProperty("部门名称") + @ExcelProperty("部门名称") private String deptName; 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..c4e995b 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,16 +20,16 @@ * @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 deptid); List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); // 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); + List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid); List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); - List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid); List> jobListDelayProApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); 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..278a206 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 @@ -16,6 +16,7 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -51,9 +52,10 @@ 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 deptid) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1; + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId); return alarmJobList; } @@ -65,23 +67,26 @@ } @Override - public List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptId) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListDelayRe(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId); + Long deptid =StringUtils.isNotEmpty(deptId)?Long.valueOf(deptId):-1; + List> alarmJobList = this.baseMapper.jobListDelayRe(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId,deptid); return alarmJobList; } @Override public List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { alarmContent = converAlarmContent(alarmContent); + List> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, deptId, userId, leaderId); return alarmJobList; } @Override - public List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptId) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListDelayPro(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId); + Long deptid= StringUtils.isNotEmpty(deptId)?Long.valueOf(deptId):-1; + List> alarmJobList = this.baseMapper.jobListDelayPro(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId,deptid); 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 08aec6b..804d656 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 @@ -19,6 +19,7 @@ import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -143,6 +144,7 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -153,7 +155,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(),deptid); } else { //app角色 long leaderId = 0L; @@ -165,7 +167,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); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -280,8 +282,8 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus())); } } - Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId(); - retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId); + Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId() : jobListParam.getDeptId(); + retList = alarmJobService.jobListSearchApp(page, jobListParam, deptId, currentUser.getId(), leaderId); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -300,7 +302,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -311,7 +313,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -338,7 +340,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -349,7 +351,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -381,9 +383,10 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); 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(),deptid); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index af4f7cb..8ab0809 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; -// @ExcelProperty("部门名称") + @ExcelProperty("部门名称") private String deptName; 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..c4e995b 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,16 +20,16 @@ * @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 deptid); List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); // 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); + List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid); List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); - List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid); List> jobListDelayProApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); 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..278a206 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 @@ -16,6 +16,7 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -51,9 +52,10 @@ 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 deptid) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1; + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId); return alarmJobList; } @@ -65,23 +67,26 @@ } @Override - public List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptId) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListDelayRe(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId); + Long deptid =StringUtils.isNotEmpty(deptId)?Long.valueOf(deptId):-1; + List> alarmJobList = this.baseMapper.jobListDelayRe(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId,deptid); return alarmJobList; } @Override public List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { alarmContent = converAlarmContent(alarmContent); + List> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, deptId, userId, leaderId); return alarmJobList; } @Override - public List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptId) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListDelayPro(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId); + Long deptid= StringUtils.isNotEmpty(deptId)?Long.valueOf(deptId):-1; + List> alarmJobList = this.baseMapper.jobListDelayPro(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId,deptid); return alarmJobList; } 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..94d28f0 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,16 +23,16 @@ * @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("deptid") Long deptid); 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 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); + 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,@Param("deptid") Long deptid); List> jobListDelayReApp(@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("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); - List> jobListDelayPro(@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); + List> jobListDelayPro(@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,@Param("deptid") Long deptid); List> jobListDelayProApp(@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("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); 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 08aec6b..804d656 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 @@ -19,6 +19,7 @@ import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -143,6 +144,7 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -153,7 +155,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(),deptid); } else { //app角色 long leaderId = 0L; @@ -165,7 +167,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); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -280,8 +282,8 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus())); } } - Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId(); - retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId); + Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId() : jobListParam.getDeptId(); + retList = alarmJobService.jobListSearchApp(page, jobListParam, deptId, currentUser.getId(), leaderId); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -300,7 +302,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -311,7 +313,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -338,7 +340,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -349,7 +351,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -381,9 +383,10 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); 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(),deptid); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index af4f7cb..8ab0809 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; -// @ExcelProperty("部门名称") + @ExcelProperty("部门名称") private String deptName; 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..c4e995b 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,16 +20,16 @@ * @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 deptid); List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); // 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); + List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid); List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); - List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid); List> jobListDelayProApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); 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..278a206 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 @@ -16,6 +16,7 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -51,9 +52,10 @@ 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 deptid) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1; + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId); return alarmJobList; } @@ -65,23 +67,26 @@ } @Override - public List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptId) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListDelayRe(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId); + Long deptid =StringUtils.isNotEmpty(deptId)?Long.valueOf(deptId):-1; + List> alarmJobList = this.baseMapper.jobListDelayRe(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId,deptid); return alarmJobList; } @Override public List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { alarmContent = converAlarmContent(alarmContent); + List> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, deptId, userId, leaderId); return alarmJobList; } @Override - public List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptId) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListDelayPro(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId); + Long deptid= StringUtils.isNotEmpty(deptId)?Long.valueOf(deptId):-1; + List> alarmJobList = this.baseMapper.jobListDelayPro(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId,deptid); return alarmJobList; } 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..94d28f0 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,16 +23,16 @@ * @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("deptid") Long deptid); 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 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); + 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,@Param("deptid") Long deptid); List> jobListDelayReApp(@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("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); - List> jobListDelayPro(@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); + List> jobListDelayPro(@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,@Param("deptid") Long deptid); List> jobListDelayProApp(@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("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); 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 e17b700..c235877 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 @@ -528,6 +528,10 @@ AND aj.JOB_STATUS = #{jobStatus} + + AND bwi.deptid = #{deptid} + + and aj.WELL_CODE like @@ -636,6 +640,9 @@ and aj.WELL_CODE like + + AND bwi.deptid = #{deptid} + AND ar.ALARM_TYPE = #{alarmType} @@ -728,6 +735,9 @@ and aj.WELL_CODE like + + AND bwi.deptid = #{deptid} + AND ar.ALARM_TYPE = #{alarmType} 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 08aec6b..804d656 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 @@ -19,6 +19,7 @@ import com.casic.missiles.modular.alarm.service.ISysDictService; import com.casic.missiles.modular.system.enums.DeviceExportEnum; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -143,6 +144,7 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -153,7 +155,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(),deptid); } else { //app角色 long leaderId = 0L; @@ -165,7 +167,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); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -280,8 +282,8 @@ page.setSearchCount(!alarmJobService.checkJobStatus(jobListParam.getJobStatus())); } } - Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId():jobListParam.getDeptId(); - retList = alarmJobService.jobListSearchApp(page, jobListParam,deptId, currentUser.getId(), leaderId); + Long deptId = ObjectUtils.isEmpty(jobListParam.getDeptId()) ? currentUser.getDeptId() : jobListParam.getDeptId(); + retList = alarmJobService.jobListSearchApp(page, jobListParam, deptId, currentUser.getId(), leaderId); } retList.forEach(this::alarmJobWrapper); page.setRecords(retList); @@ -300,7 +302,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -311,7 +313,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayRe(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -338,7 +340,7 @@ String endTime = httpServletRequest.getParameter("endTime"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); - + String deptid = httpServletRequest.getParameter("deptid"); Page> page = PageFactory.defaultPage(); DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope(); AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); @@ -349,7 +351,7 @@ if (!currentUser.getRoleTips().contains(sOperation) && !currentUser.getRoleTips().contains(sAdmin)) { alarmTypeStr = "1"; } - retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId()); + retList = alarmJobService.jobListDelayPro(page, keywords, beginTime, endTime, alarmTypeStr, alarmContentStr, dataScope, currentUser.getId(),deptid); } else { // app角色 Long leaderId = 0L; @@ -381,9 +383,10 @@ String jobStatusStr = httpServletRequest.getParameter("jobStatus"); String alarmTypeStr = httpServletRequest.getParameter("alarmType"); String alarmContentStr = httpServletRequest.getParameter("alarmContentType"); + String deptid = httpServletRequest.getParameter("deptid"); 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(),deptid); jobExpList.forEach(this::alarmJobWrapper); List jobExcelDtoList = new ArrayList<>(); jobExpList.stream().forEach( diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java index af4f7cb..8ab0809 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/JobExcelDto.java @@ -45,7 +45,7 @@ // @ExcelProperty("设备编号") private String devcode; -// @ExcelProperty("部门名称") + @ExcelProperty("部门名称") private String deptName; 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..c4e995b 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,16 +20,16 @@ * @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 deptid); List> jobListApp(Page> page, String keywords, String beginTime, String endTime, String jobStatus, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); // 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); + List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid); List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); - List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId); + List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptid); List> jobListDelayProApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId); 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..278a206 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 @@ -16,6 +16,7 @@ import com.casic.missiles.modular.system.util.WebSocket; import com.casic.missiles.quartz.service.IQuartzManager; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -51,9 +52,10 @@ 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 deptid) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId); + Long deptId= StringUtils.isNotEmpty(deptid)?Long.valueOf(deptid):-1; + List> alarmJobList = this.baseMapper.jobList(page, keywords, beginTime, endTime, jobStatus, alarmType, alarmContent, dataScope, userId,deptId); return alarmJobList; } @@ -65,23 +67,26 @@ } @Override - public List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobListDelayRe(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptId) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListDelayRe(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId); + Long deptid =StringUtils.isNotEmpty(deptId)?Long.valueOf(deptId):-1; + List> alarmJobList = this.baseMapper.jobListDelayRe(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId,deptid); return alarmJobList; } @Override public List> jobListDelayReApp(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, Long deptId, Long userId, Long leaderId) { alarmContent = converAlarmContent(alarmContent); + List> alarmJobList = this.baseMapper.jobListDelayReApp(page, keywords, beginTime, endTime, alarmType, alarmContent, deptId, userId, leaderId); return alarmJobList; } @Override - public List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId) { + public List> jobListDelayPro(Page> page, String keywords, String beginTime, String endTime, String alarmType, String alarmContent, DataScope dataScope, Long userId,String deptId) { alarmContent = converAlarmContent(alarmContent); - List> alarmJobList = this.baseMapper.jobListDelayPro(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId); + Long deptid= StringUtils.isNotEmpty(deptId)?Long.valueOf(deptId):-1; + List> alarmJobList = this.baseMapper.jobListDelayPro(page, keywords, beginTime, endTime, alarmType, alarmContent, dataScope, userId,deptid); return alarmJobList; } 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..94d28f0 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,16 +23,16 @@ * @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("deptid") Long deptid); 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 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); + 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,@Param("deptid") Long deptid); List> jobListDelayReApp(@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("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); - List> jobListDelayPro(@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); + List> jobListDelayPro(@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,@Param("deptid") Long deptid); List> jobListDelayProApp(@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("deptId") Long deptId, @Param("userId") Long userId, @Param("leaderId") Long leaderId); 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 e17b700..c235877 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 @@ -528,6 +528,10 @@ AND aj.JOB_STATUS = #{jobStatus} + + AND bwi.deptid = #{deptid} + + and aj.WELL_CODE like @@ -636,6 +640,9 @@ and aj.WELL_CODE like + + AND bwi.deptid = #{deptid} + AND ar.ALARM_TYPE = #{alarmType} @@ -728,6 +735,9 @@ and aj.WELL_CODE like + + AND bwi.deptid = #{deptid} + AND ar.ALARM_TYPE = #{alarmType} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index bdd94ad..b6f4372 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -260,7 +260,7 @@ SELECT ar.WELL_CODE AS "wellCode",COUNT(*) AS "alarmCount",bwi.WELL_NAME AS "wellName",DEPTID AS deptid, - COUNT(ar.DEVCODE) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY", + COUNT(distinct (ar.DEVCODE)) AS count,POSITION AS "position",COORDINATE_X AS "coordinateX",COORDINATE_Y AS "coordinateY", LAT_BAIDU AS "latBaidu",LNG_BAIDU AS "lngBaidu",LNG_GAODE AS "latGaode",LNG_GAODE AS "lngGaode", bd.DEVICE_TYPE AS "deviceType" FROM alarm_records ar diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java index 15e9dd7..179d91c 100644 --- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java +++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java @@ -46,7 +46,7 @@ super.getSession().setAttribute(PermissionConstants.IS_APP, false); SuccessResponseData resultData = new SuccessResponseData(); if (StrUtil.hasEmpty(username, password)) { - username = "gwq"; + username = "cz"; password = "111111"; } Subject currentUser = ShiroKit.getSubject();