diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml new file mode 100644 index 0000000..23efd22 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml @@ -0,0 +1,34 @@ + + + + + + + '%'||#{alarmContent}||'%' + + + CONCAT('%',#{alarmContent},'%') + + + CONCAT('%',#{alarmContent},'%') + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml new file mode 100644 index 0000000..23efd22 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml @@ -0,0 +1,34 @@ + + + + + + + '%'||#{alarmContent}||'%' + + + CONCAT('%',#{alarmContent},'%') + + + CONCAT('%',#{alarmContent},'%') + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml new file mode 100644 index 0000000..23efd22 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml @@ -0,0 +1,34 @@ + + + + + + + '%'||#{alarmContent}||'%' + + + CONCAT('%',#{alarmContent},'%') + + + CONCAT('%',#{alarmContent},'%') + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 2f1d126..6d45309 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -17,7 +17,9 @@ + SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType", + ALARM_CONTENT AS "alarmContent",ID AS id + FROM base_alarm_content_type + WHERE 1=1 + + AND ALARM_TYPE= #{alarmType} + + + AND DEVICE_TYPE = #{deviceType} + + + AND ALARM_CONTENT like + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 2f1d126..6d45309 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -17,7 +17,9 @@ + SELECT ALARM_TYPE AS "alarmType",DEVICE_TYPE AS "deviceType", + ALARM_CONTENT AS "alarmContent",ID AS id + FROM base_alarm_content_type + WHERE 1=1 + + AND ALARM_TYPE= #{alarmType} + + + AND DEVICE_TYPE = #{deviceType} + + + AND ALARM_CONTENT like + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 2f1d126..6d45309 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -17,7 +17,9 @@ + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml new file mode 100644 index 0000000..23efd22 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml @@ -0,0 +1,34 @@ + + + + + + + '%'||#{alarmContent}||'%' + + + CONCAT('%',#{alarmContent},'%') + + + CONCAT('%',#{alarmContent},'%') + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 2f1d126..6d45309 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -17,7 +17,9 @@ + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 4efffef..ba78a63 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -7,11 +7,19 @@ import java.util.Map; public interface IStatisticsService { - List> wellStaticsByDept(DataScope dataScope); - List> wellStaticsByType(DataScope dataScope); - List> deviceStaticsByType(DataScope dataScope); - List> deviceStaticsByDept(DataScope dataScope,String deviceType); - Map deviceStaticsByStatus(DataScope dataScope); - List> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException; - List> alarmsByDay(String beginTime,String endTime,DataScope dataScope); + List> wellStaticsByDept(DataScope dataScope); + + List> wellStaticsByType(DataScope dataScope); + + List> deviceStaticsByType(DataScope dataScope); + + List> deviceStaticsByDept(DataScope dataScope, String deviceType); + + List> deviceStaticsByStatus(DataScope dataScope); + + List> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException; + + List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); + + Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml new file mode 100644 index 0000000..23efd22 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml @@ -0,0 +1,34 @@ + + + + + + + '%'||#{alarmContent}||'%' + + + CONCAT('%',#{alarmContent},'%') + + + CONCAT('%',#{alarmContent},'%') + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 2f1d126..6d45309 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -17,7 +17,9 @@ + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 4efffef..ba78a63 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -7,11 +7,19 @@ import java.util.Map; public interface IStatisticsService { - List> wellStaticsByDept(DataScope dataScope); - List> wellStaticsByType(DataScope dataScope); - List> deviceStaticsByType(DataScope dataScope); - List> deviceStaticsByDept(DataScope dataScope,String deviceType); - Map deviceStaticsByStatus(DataScope dataScope); - List> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException; - List> alarmsByDay(String beginTime,String endTime,DataScope dataScope); + List> wellStaticsByDept(DataScope dataScope); + + List> wellStaticsByType(DataScope dataScope); + + List> deviceStaticsByType(DataScope dataScope); + + List> deviceStaticsByDept(DataScope dataScope, String deviceType); + + List> deviceStaticsByStatus(DataScope dataScope); + + List> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException; + + List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); + + Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index affce72..4be538f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -4,11 +4,14 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dao.StatisticMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IStatisticsService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -16,6 +19,7 @@ import java.text.SimpleDateFormat; import java.util.*; +@Slf4j @Service public class StatisticServiceImpl implements IStatisticsService { @Resource @@ -66,13 +70,10 @@ } @Override - public Map deviceStaticsByStatus(DataScope dataScope) { + public List> deviceStaticsByStatus(DataScope dataScope) { String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - Map map = statisticMapper.deviceStaticsByStatus(deptIds); - for (String s : map.keySet()) { //value都转为string - map.replace(s, map.get(s).toString()); - } - return map; + List> mapList = statisticMapper.deviceStaticsByStatus(deptIds); + return mapList; } @Override @@ -133,4 +134,22 @@ } return mapList; } + + public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml new file mode 100644 index 0000000..23efd22 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml @@ -0,0 +1,34 @@ + + + + + + + '%'||#{alarmContent}||'%' + + + CONCAT('%',#{alarmContent},'%') + + + CONCAT('%',#{alarmContent},'%') + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 2f1d126..6d45309 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -17,7 +17,9 @@ + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 4efffef..ba78a63 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -7,11 +7,19 @@ import java.util.Map; public interface IStatisticsService { - List> wellStaticsByDept(DataScope dataScope); - List> wellStaticsByType(DataScope dataScope); - List> deviceStaticsByType(DataScope dataScope); - List> deviceStaticsByDept(DataScope dataScope,String deviceType); - Map deviceStaticsByStatus(DataScope dataScope); - List> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException; - List> alarmsByDay(String beginTime,String endTime,DataScope dataScope); + List> wellStaticsByDept(DataScope dataScope); + + List> wellStaticsByType(DataScope dataScope); + + List> deviceStaticsByType(DataScope dataScope); + + List> deviceStaticsByDept(DataScope dataScope, String deviceType); + + List> deviceStaticsByStatus(DataScope dataScope); + + List> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException; + + List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); + + Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index affce72..4be538f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -4,11 +4,14 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dao.StatisticMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IStatisticsService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -16,6 +19,7 @@ import java.text.SimpleDateFormat; import java.util.*; +@Slf4j @Service public class StatisticServiceImpl implements IStatisticsService { @Resource @@ -66,13 +70,10 @@ } @Override - public Map deviceStaticsByStatus(DataScope dataScope) { + public List> deviceStaticsByStatus(DataScope dataScope) { String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - Map map = statisticMapper.deviceStaticsByStatus(deptIds); - for (String s : map.keySet()) { //value都转为string - map.replace(s, map.get(s).toString()); - } - return map; + List> mapList = statisticMapper.deviceStaticsByStatus(deptIds); + return mapList; } @Override @@ -133,4 +134,22 @@ } return mapList; } + + public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 001b2da..e57b310 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -19,9 +19,7 @@ @RequestMapping("/device/simManage") public class DeviceImeiController { - - @Autowired - private IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml new file mode 100644 index 0000000..23efd22 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml @@ -0,0 +1,34 @@ + + + + + + + '%'||#{alarmContent}||'%' + + + CONCAT('%',#{alarmContent},'%') + + + CONCAT('%',#{alarmContent},'%') + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 2f1d126..6d45309 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -17,7 +17,9 @@ + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 4efffef..ba78a63 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -7,11 +7,19 @@ import java.util.Map; public interface IStatisticsService { - List> wellStaticsByDept(DataScope dataScope); - List> wellStaticsByType(DataScope dataScope); - List> deviceStaticsByType(DataScope dataScope); - List> deviceStaticsByDept(DataScope dataScope,String deviceType); - Map deviceStaticsByStatus(DataScope dataScope); - List> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException; - List> alarmsByDay(String beginTime,String endTime,DataScope dataScope); + List> wellStaticsByDept(DataScope dataScope); + + List> wellStaticsByType(DataScope dataScope); + + List> deviceStaticsByType(DataScope dataScope); + + List> deviceStaticsByDept(DataScope dataScope, String deviceType); + + List> deviceStaticsByStatus(DataScope dataScope); + + List> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException; + + List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); + + Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index affce72..4be538f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -4,11 +4,14 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dao.StatisticMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IStatisticsService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -16,6 +19,7 @@ import java.text.SimpleDateFormat; import java.util.*; +@Slf4j @Service public class StatisticServiceImpl implements IStatisticsService { @Resource @@ -66,13 +70,10 @@ } @Override - public Map deviceStaticsByStatus(DataScope dataScope) { + public List> deviceStaticsByStatus(DataScope dataScope) { String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - Map map = statisticMapper.deviceStaticsByStatus(deptIds); - for (String s : map.keySet()) { //value都转为string - map.replace(s, map.get(s).toString()); - } - return map; + List> mapList = statisticMapper.deviceStaticsByStatus(deptIds); + return mapList; } @Override @@ -133,4 +134,22 @@ } return mapList; } + + public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 001b2da..e57b310 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -19,9 +19,7 @@ @RequestMapping("/device/simManage") public class DeviceImeiController { - - @Autowired - private IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index f7f0a58..5b3553f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -4,8 +4,6 @@ import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; -import java.util.Map; - public interface IDeviceImeiService { Object deviceImeiListPage(Page page, String devcode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml new file mode 100644 index 0000000..23efd22 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml @@ -0,0 +1,34 @@ + + + + + + + '%'||#{alarmContent}||'%' + + + CONCAT('%',#{alarmContent},'%') + + + CONCAT('%',#{alarmContent},'%') + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 2f1d126..6d45309 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -17,7 +17,9 @@ + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 4efffef..ba78a63 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -7,11 +7,19 @@ import java.util.Map; public interface IStatisticsService { - List> wellStaticsByDept(DataScope dataScope); - List> wellStaticsByType(DataScope dataScope); - List> deviceStaticsByType(DataScope dataScope); - List> deviceStaticsByDept(DataScope dataScope,String deviceType); - Map deviceStaticsByStatus(DataScope dataScope); - List> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException; - List> alarmsByDay(String beginTime,String endTime,DataScope dataScope); + List> wellStaticsByDept(DataScope dataScope); + + List> wellStaticsByType(DataScope dataScope); + + List> deviceStaticsByType(DataScope dataScope); + + List> deviceStaticsByDept(DataScope dataScope, String deviceType); + + List> deviceStaticsByStatus(DataScope dataScope); + + List> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException; + + List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); + + Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index affce72..4be538f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -4,11 +4,14 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dao.StatisticMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IStatisticsService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -16,6 +19,7 @@ import java.text.SimpleDateFormat; import java.util.*; +@Slf4j @Service public class StatisticServiceImpl implements IStatisticsService { @Resource @@ -66,13 +70,10 @@ } @Override - public Map deviceStaticsByStatus(DataScope dataScope) { + public List> deviceStaticsByStatus(DataScope dataScope) { String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - Map map = statisticMapper.deviceStaticsByStatus(deptIds); - for (String s : map.keySet()) { //value都转为string - map.replace(s, map.get(s).toString()); - } - return map; + List> mapList = statisticMapper.deviceStaticsByStatus(deptIds); + return mapList; } @Override @@ -133,4 +134,22 @@ } return mapList; } + + public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 001b2da..e57b310 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -19,9 +19,7 @@ @RequestMapping("/device/simManage") public class DeviceImeiController { - - @Autowired - private IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index f7f0a58..5b3553f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -4,8 +4,6 @@ import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; -import java.util.Map; - public interface IDeviceImeiService { Object deviceImeiListPage(Page page, String devcode); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java index 140d1b8..9f52e1b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java @@ -26,7 +26,7 @@ /** * 自增主键 */ - @TableId(value = "ID", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 指标名称 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml new file mode 100644 index 0000000..23efd22 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml @@ -0,0 +1,34 @@ + + + + + + + '%'||#{alarmContent}||'%' + + + CONCAT('%',#{alarmContent},'%') + + + CONCAT('%',#{alarmContent},'%') + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 2f1d126..6d45309 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -17,7 +17,9 @@ + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 4efffef..ba78a63 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -7,11 +7,19 @@ import java.util.Map; public interface IStatisticsService { - List> wellStaticsByDept(DataScope dataScope); - List> wellStaticsByType(DataScope dataScope); - List> deviceStaticsByType(DataScope dataScope); - List> deviceStaticsByDept(DataScope dataScope,String deviceType); - Map deviceStaticsByStatus(DataScope dataScope); - List> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException; - List> alarmsByDay(String beginTime,String endTime,DataScope dataScope); + List> wellStaticsByDept(DataScope dataScope); + + List> wellStaticsByType(DataScope dataScope); + + List> deviceStaticsByType(DataScope dataScope); + + List> deviceStaticsByDept(DataScope dataScope, String deviceType); + + List> deviceStaticsByStatus(DataScope dataScope); + + List> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException; + + List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); + + Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index affce72..4be538f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -4,11 +4,14 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dao.StatisticMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IStatisticsService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -16,6 +19,7 @@ import java.text.SimpleDateFormat; import java.util.*; +@Slf4j @Service public class StatisticServiceImpl implements IStatisticsService { @Resource @@ -66,13 +70,10 @@ } @Override - public Map deviceStaticsByStatus(DataScope dataScope) { + public List> deviceStaticsByStatus(DataScope dataScope) { String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - Map map = statisticMapper.deviceStaticsByStatus(deptIds); - for (String s : map.keySet()) { //value都转为string - map.replace(s, map.get(s).toString()); - } - return map; + List> mapList = statisticMapper.deviceStaticsByStatus(deptIds); + return mapList; } @Override @@ -133,4 +134,22 @@ } return mapList; } + + public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 001b2da..e57b310 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -19,9 +19,7 @@ @RequestMapping("/device/simManage") public class DeviceImeiController { - - @Autowired - private IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index f7f0a58..5b3553f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -4,8 +4,6 @@ import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; -import java.util.Map; - public interface IDeviceImeiService { Object deviceImeiListPage(Page page, String devcode); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java index 140d1b8..9f52e1b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java @@ -26,7 +26,7 @@ /** * 自增主键 */ - @TableId(value = "ID", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 指标名称 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java new file mode 100644 index 0000000..a7e8d7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -0,0 +1,57 @@ +package com.casic.missiles.modular.system.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.modular.system.model.DeptPermission; +import com.casic.missiles.modular.system.service.DeptPermissionConfigService; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/deptPermission") +public class DeptPermissionController { + + private final DeptPermissionConfigService deptPermissionService; + + public DeptPermissionController(DeptPermissionConfigService deptPermissionService) { + this.deptPermissionService = deptPermissionService; + } + + /** + * 获取分页列表SMI + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object deviceDeptPermissionList(String deptid) { + Page page = PageFactory.defaultPage(); + return deptPermissionService.deviceDeptPermissionList(page, deptid); + } + + /** + * 新增SMI + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object addDeptPermission(@RequestBody DeptPermission deviceImei) { + return deptPermissionService.addDeptPermission(deviceImei); + } + + /** + * 更新SMI + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object editDeptPermission(@RequestBody DeptPermission deviceImei) { + return deptPermissionService.editDeptPermission(deviceImei); + } + + /** + * 删除imei + */ + @RequestMapping(value = "/delete/{id}") + @ResponseBody + public Object deleteDeptPermission(@PathVariable("id") Long id) { + return deptPermissionService.deleteDeptPermission(id); + } + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml new file mode 100644 index 0000000..23efd22 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml @@ -0,0 +1,34 @@ + + + + + + + '%'||#{alarmContent}||'%' + + + CONCAT('%',#{alarmContent},'%') + + + CONCAT('%',#{alarmContent},'%') + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 2f1d126..6d45309 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -17,7 +17,9 @@ + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 4efffef..ba78a63 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -7,11 +7,19 @@ import java.util.Map; public interface IStatisticsService { - List> wellStaticsByDept(DataScope dataScope); - List> wellStaticsByType(DataScope dataScope); - List> deviceStaticsByType(DataScope dataScope); - List> deviceStaticsByDept(DataScope dataScope,String deviceType); - Map deviceStaticsByStatus(DataScope dataScope); - List> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException; - List> alarmsByDay(String beginTime,String endTime,DataScope dataScope); + List> wellStaticsByDept(DataScope dataScope); + + List> wellStaticsByType(DataScope dataScope); + + List> deviceStaticsByType(DataScope dataScope); + + List> deviceStaticsByDept(DataScope dataScope, String deviceType); + + List> deviceStaticsByStatus(DataScope dataScope); + + List> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException; + + List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); + + Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index affce72..4be538f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -4,11 +4,14 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dao.StatisticMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IStatisticsService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -16,6 +19,7 @@ import java.text.SimpleDateFormat; import java.util.*; +@Slf4j @Service public class StatisticServiceImpl implements IStatisticsService { @Resource @@ -66,13 +70,10 @@ } @Override - public Map deviceStaticsByStatus(DataScope dataScope) { + public List> deviceStaticsByStatus(DataScope dataScope) { String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - Map map = statisticMapper.deviceStaticsByStatus(deptIds); - for (String s : map.keySet()) { //value都转为string - map.replace(s, map.get(s).toString()); - } - return map; + List> mapList = statisticMapper.deviceStaticsByStatus(deptIds); + return mapList; } @Override @@ -133,4 +134,22 @@ } return mapList; } + + public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 001b2da..e57b310 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -19,9 +19,7 @@ @RequestMapping("/device/simManage") public class DeviceImeiController { - - @Autowired - private IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index f7f0a58..5b3553f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -4,8 +4,6 @@ import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; -import java.util.Map; - public interface IDeviceImeiService { Object deviceImeiListPage(Page page, String devcode); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java index 140d1b8..9f52e1b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java @@ -26,7 +26,7 @@ /** * 自增主键 */ - @TableId(value = "ID", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 指标名称 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java new file mode 100644 index 0000000..a7e8d7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -0,0 +1,57 @@ +package com.casic.missiles.modular.system.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.modular.system.model.DeptPermission; +import com.casic.missiles.modular.system.service.DeptPermissionConfigService; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/deptPermission") +public class DeptPermissionController { + + private final DeptPermissionConfigService deptPermissionService; + + public DeptPermissionController(DeptPermissionConfigService deptPermissionService) { + this.deptPermissionService = deptPermissionService; + } + + /** + * 获取分页列表SMI + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object deviceDeptPermissionList(String deptid) { + Page page = PageFactory.defaultPage(); + return deptPermissionService.deviceDeptPermissionList(page, deptid); + } + + /** + * 新增SMI + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object addDeptPermission(@RequestBody DeptPermission deviceImei) { + return deptPermissionService.addDeptPermission(deviceImei); + } + + /** + * 更新SMI + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object editDeptPermission(@RequestBody DeptPermission deviceImei) { + return deptPermissionService.editDeptPermission(deviceImei); + } + + /** + * 删除imei + */ + @RequestMapping(value = "/delete/{id}") + @ResponseBody + public Object deleteDeptPermission(@PathVariable("id") Long id) { + return deptPermissionService.deleteDeptPermission(id); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java new file mode 100644 index 0000000..ea52c6d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.DeptPermission; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface DeptPermissionConfigDao extends BaseMapper { + + List getListPage(@Param("page") Page page, + @Param("deptid") String deptid); + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml new file mode 100644 index 0000000..23efd22 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml @@ -0,0 +1,34 @@ + + + + + + + '%'||#{alarmContent}||'%' + + + CONCAT('%',#{alarmContent},'%') + + + CONCAT('%',#{alarmContent},'%') + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 2f1d126..6d45309 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -17,7 +17,9 @@ + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 4efffef..ba78a63 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -7,11 +7,19 @@ import java.util.Map; public interface IStatisticsService { - List> wellStaticsByDept(DataScope dataScope); - List> wellStaticsByType(DataScope dataScope); - List> deviceStaticsByType(DataScope dataScope); - List> deviceStaticsByDept(DataScope dataScope,String deviceType); - Map deviceStaticsByStatus(DataScope dataScope); - List> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException; - List> alarmsByDay(String beginTime,String endTime,DataScope dataScope); + List> wellStaticsByDept(DataScope dataScope); + + List> wellStaticsByType(DataScope dataScope); + + List> deviceStaticsByType(DataScope dataScope); + + List> deviceStaticsByDept(DataScope dataScope, String deviceType); + + List> deviceStaticsByStatus(DataScope dataScope); + + List> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException; + + List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); + + Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index affce72..4be538f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -4,11 +4,14 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dao.StatisticMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IStatisticsService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -16,6 +19,7 @@ import java.text.SimpleDateFormat; import java.util.*; +@Slf4j @Service public class StatisticServiceImpl implements IStatisticsService { @Resource @@ -66,13 +70,10 @@ } @Override - public Map deviceStaticsByStatus(DataScope dataScope) { + public List> deviceStaticsByStatus(DataScope dataScope) { String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - Map map = statisticMapper.deviceStaticsByStatus(deptIds); - for (String s : map.keySet()) { //value都转为string - map.replace(s, map.get(s).toString()); - } - return map; + List> mapList = statisticMapper.deviceStaticsByStatus(deptIds); + return mapList; } @Override @@ -133,4 +134,22 @@ } return mapList; } + + public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 001b2da..e57b310 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -19,9 +19,7 @@ @RequestMapping("/device/simManage") public class DeviceImeiController { - - @Autowired - private IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index f7f0a58..5b3553f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -4,8 +4,6 @@ import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; -import java.util.Map; - public interface IDeviceImeiService { Object deviceImeiListPage(Page page, String devcode); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java index 140d1b8..9f52e1b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java @@ -26,7 +26,7 @@ /** * 自增主键 */ - @TableId(value = "ID", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 指标名称 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java new file mode 100644 index 0000000..a7e8d7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -0,0 +1,57 @@ +package com.casic.missiles.modular.system.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.modular.system.model.DeptPermission; +import com.casic.missiles.modular.system.service.DeptPermissionConfigService; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/deptPermission") +public class DeptPermissionController { + + private final DeptPermissionConfigService deptPermissionService; + + public DeptPermissionController(DeptPermissionConfigService deptPermissionService) { + this.deptPermissionService = deptPermissionService; + } + + /** + * 获取分页列表SMI + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object deviceDeptPermissionList(String deptid) { + Page page = PageFactory.defaultPage(); + return deptPermissionService.deviceDeptPermissionList(page, deptid); + } + + /** + * 新增SMI + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object addDeptPermission(@RequestBody DeptPermission deviceImei) { + return deptPermissionService.addDeptPermission(deviceImei); + } + + /** + * 更新SMI + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object editDeptPermission(@RequestBody DeptPermission deviceImei) { + return deptPermissionService.editDeptPermission(deviceImei); + } + + /** + * 删除imei + */ + @RequestMapping(value = "/delete/{id}") + @ResponseBody + public Object deleteDeptPermission(@PathVariable("id") Long id) { + return deptPermissionService.deleteDeptPermission(id); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java new file mode 100644 index 0000000..ea52c6d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.DeptPermission; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface DeptPermissionConfigDao extends BaseMapper { + + List getListPage(@Param("page") Page page, + @Param("deptid") String deptid); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml new file mode 100644 index 0000000..70959cc --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml new file mode 100644 index 0000000..23efd22 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml @@ -0,0 +1,34 @@ + + + + + + + '%'||#{alarmContent}||'%' + + + CONCAT('%',#{alarmContent},'%') + + + CONCAT('%',#{alarmContent},'%') + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 2f1d126..6d45309 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -17,7 +17,9 @@ + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 4efffef..ba78a63 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -7,11 +7,19 @@ import java.util.Map; public interface IStatisticsService { - List> wellStaticsByDept(DataScope dataScope); - List> wellStaticsByType(DataScope dataScope); - List> deviceStaticsByType(DataScope dataScope); - List> deviceStaticsByDept(DataScope dataScope,String deviceType); - Map deviceStaticsByStatus(DataScope dataScope); - List> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException; - List> alarmsByDay(String beginTime,String endTime,DataScope dataScope); + List> wellStaticsByDept(DataScope dataScope); + + List> wellStaticsByType(DataScope dataScope); + + List> deviceStaticsByType(DataScope dataScope); + + List> deviceStaticsByDept(DataScope dataScope, String deviceType); + + List> deviceStaticsByStatus(DataScope dataScope); + + List> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException; + + List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); + + Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index affce72..4be538f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -4,11 +4,14 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dao.StatisticMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IStatisticsService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -16,6 +19,7 @@ import java.text.SimpleDateFormat; import java.util.*; +@Slf4j @Service public class StatisticServiceImpl implements IStatisticsService { @Resource @@ -66,13 +70,10 @@ } @Override - public Map deviceStaticsByStatus(DataScope dataScope) { + public List> deviceStaticsByStatus(DataScope dataScope) { String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - Map map = statisticMapper.deviceStaticsByStatus(deptIds); - for (String s : map.keySet()) { //value都转为string - map.replace(s, map.get(s).toString()); - } - return map; + List> mapList = statisticMapper.deviceStaticsByStatus(deptIds); + return mapList; } @Override @@ -133,4 +134,22 @@ } return mapList; } + + public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 001b2da..e57b310 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -19,9 +19,7 @@ @RequestMapping("/device/simManage") public class DeviceImeiController { - - @Autowired - private IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index f7f0a58..5b3553f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -4,8 +4,6 @@ import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; -import java.util.Map; - public interface IDeviceImeiService { Object deviceImeiListPage(Page page, String devcode); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java index 140d1b8..9f52e1b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java @@ -26,7 +26,7 @@ /** * 自增主键 */ - @TableId(value = "ID", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 指标名称 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java new file mode 100644 index 0000000..a7e8d7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -0,0 +1,57 @@ +package com.casic.missiles.modular.system.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.modular.system.model.DeptPermission; +import com.casic.missiles.modular.system.service.DeptPermissionConfigService; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/deptPermission") +public class DeptPermissionController { + + private final DeptPermissionConfigService deptPermissionService; + + public DeptPermissionController(DeptPermissionConfigService deptPermissionService) { + this.deptPermissionService = deptPermissionService; + } + + /** + * 获取分页列表SMI + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object deviceDeptPermissionList(String deptid) { + Page page = PageFactory.defaultPage(); + return deptPermissionService.deviceDeptPermissionList(page, deptid); + } + + /** + * 新增SMI + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object addDeptPermission(@RequestBody DeptPermission deviceImei) { + return deptPermissionService.addDeptPermission(deviceImei); + } + + /** + * 更新SMI + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object editDeptPermission(@RequestBody DeptPermission deviceImei) { + return deptPermissionService.editDeptPermission(deviceImei); + } + + /** + * 删除imei + */ + @RequestMapping(value = "/delete/{id}") + @ResponseBody + public Object deleteDeptPermission(@PathVariable("id") Long id) { + return deptPermissionService.deleteDeptPermission(id); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java new file mode 100644 index 0000000..ea52c6d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.DeptPermission; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface DeptPermissionConfigDao extends BaseMapper { + + List getListPage(@Param("page") Page page, + @Param("deptid") String deptid); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml new file mode 100644 index 0000000..70959cc --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java new file mode 100644 index 0000000..e890655 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.DeptPermission; + +public interface DeptPermissionConfigService { + + Object deviceDeptPermissionList(Page page, String deptid); + + Object addDeptPermission(DeptPermission deviceImei); + + Object editDeptPermission(DeptPermission deviceImei); + + Object deleteDeptPermission(Long id); + +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java index a1d5d40..feae987 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java @@ -3,28 +3,24 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.util.EhcacheConstant; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.model.AlarmLevel; -import com.casic.missiles.modular.system.model.BusNbDevice; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.nio.channels.AcceptPendingException; import java.util.*; @@ -174,22 +170,23 @@ } - @RequestMapping(value = "/add", method = RequestMethod.POST) + @RequestMapping(value = "/level/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmLevel alarmLevel) { - return alarmLevelService.addAlarmLevel(alarmLevel); + @Transactional(rollbackFor = Exception.class) + public Object add(@RequestBody AlarmLevelParam alarmLevelParam) { + return alarmLevelService.addAlarmLevel(alarmLevelParam); } - @RequestMapping(value = "/update", method = RequestMethod.POST) + @RequestMapping(value = "/level/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmLevel alarmLevel) { + public Object update(@RequestBody AlarmLevel alarmLevel) { return alarmLevelService.updateAlarmLevel(alarmLevel); } /** * 获取详情信息 */ - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/level/detail/{id}") @ResponseBody public Object selectAlarmLevel(@PathVariable(name = "Id") Long id) { // 待定 @@ -199,10 +196,10 @@ } - @RequestMapping(value = "/delete/{id}") + @RequestMapping(value = "/level/delete") @ResponseBody - public Object deleteAlarmLevel(@PathVariable(name = "id") Long id) { - return alarmLevelService.deleteById(id); + public Object deleteAlarmLevel(String deviceType, String name, String tenantId) { + return alarmLevelService.deleteByCondition(deviceType, name, tenantId); } 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 ecbac82..4653893 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 @@ -47,6 +47,7 @@ private IAlarmRecordsService alarmRecordsService; @Resource private AbstractPermissionContext iCommonPermissionService; + @Value("${smartcity.office.maxRowsExcel}") private int maxRowsExcel; @Value("${smartcity.config.config-path}") @@ -62,7 +63,6 @@ @RequestMapping(value = "/list") @ResponseBody public Object alarmList(HttpServletRequest httpServletRequest) { - String keywords = httpServletRequest.getParameter("keywords"); String beginTime = httpServletRequest.getParameter("beginTime"); String endTime = httpServletRequest.getParameter("endTime"); @@ -185,7 +185,7 @@ recordExcelDto.setAlarmContentName(alarmExp.get("alarmContentName") == null ? "" : alarmExp.get("alarmContentName").toString()); recordExcelDto.setAlarmLevel(alarmExp.get("alarmLevel") == null ? "" : alarmExp.get("alarmLevel").toString()); recordExcelDto.setAlarmValue(alarmExp.get("alarmValue") == null ? "" : alarmExp.get("alarmValue").toString()); - recordExcelDto.setDeptName(alarmExp.get("deptName")==null?"":alarmExp.get("deptName").toString()); + recordExcelDto.setDeptName(alarmExp.get("deptName") == null ? "" : alarmExp.get("deptName").toString()); recordExcelDto.setLogTime(alarmExp.get("alarmTime").toString()); return recordExcelDto; } @@ -227,9 +227,9 @@ AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser(); List alarmRecords = alarmRecordsService.alarmListNoPage(dataScope, keywords, alarmType, alarmContent, beginTime, endTime); //根据jobId调用closeJob -// for (AlarmRecords alarmRecord : alarmRecords) { -// alarmRecordsService.cancelAlarm((Long) alarmRecord.getJobId(), jobStatus, handleMessage, currentUser.getId()); -// } + for (AlarmRecords alarmRecord : alarmRecords) { + alarmRecordsService.cancelAlarm(Long.valueOf(alarmRecord.getJobId()), jobStatus, handleMessage, currentUser.getId()); + } return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index 8dff963..c083e16 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,5 +1,7 @@ package com.casic.missiles.modular.alarm.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -8,43 +10,40 @@ import org.springframework.web.bind.annotation.*; import sun.misc.Contended; +import java.util.Map; + @Slf4j @Controller -@RequestMapping("/alarmtype") +@RequestMapping("/alarmContent") public class AlarmTypeConfigController { @Autowired private IAlarmContentTypeService alarmContentTypeService; - - - - - @RequestMapping(value = "/detail/{id}") + @RequestMapping(value = "/list") @ResponseBody - public Object selectById(@PathVariable(name = "id") Long id){ - return alarmContentTypeService.selectById(id); - + public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + Page page = PageFactory.defaultPage(); + return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); } @RequestMapping(value = "/delete/{id}") @ResponseBody - public Object delete(@PathVariable(name = "id") Long Id){ + public Object delete(@PathVariable(name = "id") Long Id) { return alarmContentTypeService.deleteById(Id); } @RequestMapping(value = "/add", method = RequestMethod.POST) @ResponseBody - public Object add(@RequestBody AlarmContentType alarmContentType){ + public Object add(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.add(alarmContentType); } @RequestMapping(value = "/update", method = RequestMethod.POST) @ResponseBody - public Object update(@RequestBody AlarmContentType alarmContentType){ + public Object update(@RequestBody AlarmContentType alarmContentType) { return alarmContentTypeService.update(alarmContentType); - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java new file mode 100644 index 0000000..0d7c10d --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.alarm.model; + + +import lombok.Data; + +import java.util.List; + +@Data +public class AlarmLevelParam { + private String tenantId; + private String name; + private String deviceType; + private String openAlarm; + private String openJob; + //等级列表 + private List levelList; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 0e6063f..5515651 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.alarm.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; @@ -7,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - ResponseData selectById(Long id); + Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java index 47f47f5..6ff7bdd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.system.model.AlarmLevel; import java.util.List; @@ -21,7 +22,7 @@ List selectByNameAndTenList(Long tenantId, String name); AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name,Integer level); AlarmLevel selectByID(Long id, DataScope dataScope); - ResponseData deleteById(Long id); - ResponseData addAlarmLevel(AlarmLevel alarmLevel); + ResponseData deleteByCondition(String deviceType, String name, String tenantId); + ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam); ResponseData updateAlarmLevel(AlarmLevel alarmLevel); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 6feabf6..4bf3621 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -1,71 +1,73 @@ package com.casic.missiles.modular.alarm.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.dao.AlarmContentTypeMapper; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.google.gson.internal.$Gson$Preconditions; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; @Service public class AlarmContentTypeServiceImpl extends ServiceImpl implements IAlarmContentTypeService { + + @Override - public ResponseData selectById(Long id){ + public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { - responseData.setData(this.getById(id)); + page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); + responseData.setData(page); responseData.setMessage("success"); responseData.setCode(200); - return responseData; + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型查询异常，异常信息{}", ex); + responseData.setMessage("查询异常"); + responseData.setCode(500); } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型查询异常，异常信息{}",ex); - return ResponseData.error("插入异常"); - } + return responseData; } + @Override - public ResponseData add(AlarmContentType AlarmContentType){ + public ResponseData add(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.save(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型插入异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型插入异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } @Override - public ResponseData update(AlarmContentType AlarmContentType){ + public ResponseData update(AlarmContentType AlarmContentType) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.updateById(AlarmContentType)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型更新异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型更新异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } + @Override - public ResponseData deleteById(Long id){ + public ResponseData deleteById(Long id) { ResponseData responseData = new ResponseData(); try { responseData.setData(this.removeById(id)); responseData.setMessage("success"); responseData.setCode(200); return responseData; - } - catch (AcceptPendingException ex){ - log.error("主题:报警内容类型删除异常，异常信息{}",ex); + } catch (AcceptPendingException ex) { + log.error("主题:报警内容类型删除异常，异常信息{}", ex); return ResponseData.error("插入异常"); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java index 419a76d..ce0058d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java @@ -1,16 +1,21 @@ package com.casic.missiles.modular.alarm.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; +import com.casic.missiles.modular.alarm.model.AlarmLevelParam; import com.casic.missiles.modular.alarm.service.IAlarmLevelService; import com.casic.missiles.modular.system.dao.AlarmLevelMapper; import com.casic.missiles.modular.system.model.AlarmLevel; +import org.apache.ibatis.annotations.Param; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import java.nio.channels.AcceptPendingException; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,29 +51,30 @@ } @Override - public ResponseData deleteById(Long id) { + public ResponseData deleteByCondition(String deviceType, String name, String tenantId) { ResponseData responseData = new ResponseData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("id", id); - boolean flag = this.remove(wrapper); - if (flag == true) { + try { + Long deviceTypes=StrUtil.isEmpty(deviceType)?null:Long.valueOf(deviceType); + Long tenantIds=StrUtil.isEmpty(tenantId)?null:Long.valueOf(tenantId); + this.baseMapper.deleteByCondition(deviceTypes, name, tenantIds); + responseData.setMessage("删除成功！"); responseData.setCode(200); - responseData.setMessage("删除成功"); - } else { + } catch (DataAccessException ex) { + log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); responseData.setCode(500); - responseData.setMessage("数据不存在"); + responseData.error("删除异常"); } return responseData; } @Override - public ResponseData addAlarmLevel(AlarmLevel alarmLevel) { + public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) { ResponseData resultData = new ResponseData(); try { - this.save(alarmLevel); + addAlarmLevelList(alarmLevelParam); resultData.setMessage("新增成功！"); resultData.setCode(200); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置新增出现异常，异常信息{}", ex); resultData.setCode(500); resultData.error("插入异常"); @@ -84,11 +90,24 @@ resultData.setCode(200); resultData.setMessage("更新成功！"); return ResponseData.success(); - } catch (AcceptPendingException ex) { + } catch (DataAccessException ex) { log.error("主题:报警等级配置更新出现异常，异常信息{}", ex); resultData.setCode(500); } return ResponseData.error("更新异常"); } + private void addAlarmLevelList(AlarmLevelParam alarmLevelParam) throws DataAccessException { + AlarmLevel alarmLevel = new AlarmLevel(); + alarmLevel.setName(alarmLevelParam.getName()); + alarmLevel.setOpenJob(alarmLevelParam.getOpenJob()); + alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId())); + alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType())); + alarmLevelParam.getLevelList().forEach( + alarmLevels -> { + alarmLevel.setLevel(Integer.valueOf(StrUtil.isEmpty(alarmLevels.toString()) ? "-1" : alarmLevels.toString())); + this.save(alarmLevel); + } + ); + } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 5ea0e69..7814f7e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -8,6 +8,7 @@ import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -30,16 +31,17 @@ /** * 根据权属单位统计闸井数量 + * * @return */ @RequestMapping(value = "/wellStaticsByDept") @ResponseBody - public Object wellStaticsByDept(){ + public Object wellStaticsByDept() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByDept(dataScope); + try { + List> res = statisticsService.wellStaticsByDept(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -50,12 +52,12 @@ */ @RequestMapping(value = "/wellStaticsByType") @ResponseBody - public Object wellStaticsByType(){ + public Object wellStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.wellStaticsByType(dataScope); + try { + List> res = statisticsService.wellStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -66,12 +68,12 @@ */ @RequestMapping(value = "/deviceStaticsByType") @ResponseBody - public Object deviceStaticsByType(){ + public Object deviceStaticsByType() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByType(dataScope); + try { + List> res = statisticsService.deviceStaticsByType(dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -82,12 +84,12 @@ */ @RequestMapping(value = "/deviceStaticsByDept") @ResponseBody - public Object deviceStaticsByDept(@RequestParam(value = "deviceType",required = false)String deviceType){ + public Object deviceStaticsByDept(@RequestParam(value = "deviceType", required = false) String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.deviceStaticsByDept(dataScope,deviceType); + try { + List> res = statisticsService.deviceStaticsByDept(dataScope, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -98,15 +100,20 @@ */ @RequestMapping(value = "/deviceStaticsByStatus") @ResponseBody - public Object deviceStaticsByStatus(){ + public Object deviceStaticsByStatus() { + ResponseData responseData = new ResponseData(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - Map res = statisticsService.deviceStaticsByStatus(dataScope); - return ResponseData.success(res); - }catch (Exception e){ + try { + List> res = statisticsService.deviceStaticsByStatus(dataScope); + responseData.setData(res); + responseData.setCode(200); + responseData.setMessage("查询成功"); + } catch (DataAccessException e) { e.printStackTrace(); - return ResponseData.error("faliure"); + responseData.setCode(500); + responseData.setMessage("查询异常"); } + return responseData; } /** @@ -114,12 +121,12 @@ */ @RequestMapping(value = "/jobsByDept") @ResponseBody - public Object jobsByDept(String beginTime, String endTime, String deviceType){ + public Object jobsByDept(String beginTime, String endTime, String deviceType) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.jobsByDept(dataScope,beginTime,endTime,deviceType); + try { + List> res = statisticsService.jobsByDept(dataScope, beginTime, endTime, deviceType); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -130,14 +137,14 @@ */ @RequestMapping(value = "/alarmsNow") @ResponseBody - public Object alarmsNow(){ + public Object alarmsNow() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ + try { List alarmNowViews = alarmNowViewService.getNowAlarmRecords(dataScope); Map res = new HashMap<>(); - res.put("total",alarmNowViews.size()); + res.put("total", alarmNowViews.size()); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } @@ -148,17 +155,33 @@ */ @RequestMapping("/alarmsByDay") @ResponseBody - public Object alarmsByDay(String beginTime, String endTime){ + public Object alarmsByDay(String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - try{ - List> res = statisticsService.alarmsByDay(beginTime,endTime,dataScope); + try { + List> res = statisticsService.alarmsByDay(beginTime, endTime, dataScope); return ResponseData.success(res); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); } } + /** + * 报警井排名 + * @param beginTime + * @param endTime + * @param alarmContent + * @return + */ + @RequestMapping("/alarmWellListPage") + @ResponseBody + public Object alarmWellListPage(String beginTime, String endTime,String alarmContent) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return statisticsService.alarmWellListPage(dataScope,beginTime,endTime,alarmContent); + } + + + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java index 1b54b38..d53597f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java @@ -1,13 +1,11 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.core.datascope.DataScope; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.modular.system.model.AlarmContentType; -import com.casic.missiles.modular.system.model.AlarmLevel; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

@@ -18,4 +16,10 @@ * @since 2019-10-15 */ public interface AlarmContentTypeMapper extends BaseMapper { + + List selectListPage(@Param("page") Page page, + @Param("alarmType") String alarmType, + @Param("deviceType") String deviceType, + @Param("alarmContent") String alarmContent); + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java index d7f0da5..9828e15 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java @@ -21,4 +21,7 @@ List selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name); AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level); AlarmLevel selectByID(@Param("id")Long Id,@Param("dataScope") DataScope dataScope); + int deleteByCondition(@Param("deviceType")Long deviceType, + @Param("name")String name, + @Param("tenantId")Long tenantId); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java index 7a226d9..573f5e7 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java @@ -6,12 +6,22 @@ import java.util.List; import java.util.Map; -public interface StatisticMapper{ - List> wellStaticsByDept(@Param("dataScope")DataScope dataScope); - List> wellStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByType(@Param("deptIds")String deptIds); - List> deviceStaticsByDept(@Param("dataScope")DataScope dataScope,@Param("deviceType")String deviceType); - Map deviceStaticsByStatus(@Param("deptIds")String deptIds); - List> jobsByDept(@Param("dataScope")DataScope dataScope,@Param("beginTime")String beginTime,@Param("endTime")String endTime,@Param("deviceType")String deviceType); - Map jobsByDeptId(@Param("deptIds")String deptIds,@Param("beginTime")String beginTime,@Param("endTime")String endTime); +public interface StatisticMapper { + List> wellStaticsByDept(@Param("dataScope") DataScope dataScope); + + List> wellStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByType(@Param("deptIds") String deptIds); + + List> deviceStaticsByDept(@Param("dataScope") DataScope dataScope, @Param("deviceType") String deviceType); + + List> deviceStaticsByStatus(@Param("deptIds") String deptIds); + + List> jobsByDept(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deviceType") String deviceType); + + Map jobsByDeptId(@Param("deptIds") String deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime); + + + List> alarmWellListPage(@Param("dataScope") DataScope dataScope, @Param("beginTime") String beginTime, + @Param("endTime") String endTime, @Param("alarmContent") String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml new file mode 100644 index 0000000..23efd22 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml @@ -0,0 +1,34 @@ + + + + + + + '%'||#{alarmContent}||'%' + + + CONCAT('%',#{alarmContent},'%') + + + CONCAT('%',#{alarmContent},'%') + + + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml index f513a60..c4ea3dd 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -22,7 +22,7 @@ LOW_VALUE AS "lowValue", HIGH_VALUE AS "highValue", OPEN_ALARM AS "openAlarm", OPEN_JOB AS "openJob", TENANT_ID AS "tenantId", TS AS ts - + SELECT - + FROM `alarm_level` WHERE TENANT_ID = #{tenantId} AND NAME = #{name} - + + + DELETE + FROM alarm_level + WHERE + + + 1=1 + + AND DEVICE_TYPE = #{deviceType} + + + AND NAME= #{name} + + + AND TENANT_ID = #{tenantId} + + + + 1=0 + + + + + diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml index 2f1d126..6d45309 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml @@ -17,7 +17,9 @@ + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java index 4efffef..ba78a63 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java @@ -7,11 +7,19 @@ import java.util.Map; public interface IStatisticsService { - List> wellStaticsByDept(DataScope dataScope); - List> wellStaticsByType(DataScope dataScope); - List> deviceStaticsByType(DataScope dataScope); - List> deviceStaticsByDept(DataScope dataScope,String deviceType); - Map deviceStaticsByStatus(DataScope dataScope); - List> jobsByDept(DataScope dataScope,String beginTime, String endTime, String deviceType) throws ParseException; - List> alarmsByDay(String beginTime,String endTime,DataScope dataScope); + List> wellStaticsByDept(DataScope dataScope); + + List> wellStaticsByType(DataScope dataScope); + + List> deviceStaticsByType(DataScope dataScope); + + List> deviceStaticsByDept(DataScope dataScope, String deviceType); + + List> deviceStaticsByStatus(DataScope dataScope); + + List> jobsByDept(DataScope dataScope, String beginTime, String endTime, String deviceType) throws ParseException; + + List> alarmsByDay(String beginTime, String endTime, DataScope dataScope); + + Object alarmWellListPage(DataScope dataScope,String beginTime,String endTime,String alarmContent); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java index affce72..4be538f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java @@ -4,11 +4,14 @@ import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.AlarmNowViewMapper; import com.casic.missiles.modular.system.dao.StatisticMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.service.IStatisticsService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -16,6 +19,7 @@ import java.text.SimpleDateFormat; import java.util.*; +@Slf4j @Service public class StatisticServiceImpl implements IStatisticsService { @Resource @@ -66,13 +70,10 @@ } @Override - public Map deviceStaticsByStatus(DataScope dataScope) { + public List> deviceStaticsByStatus(DataScope dataScope) { String deptIds = StringUtils.strip(dataScope.getDeptIds().toString(), "[]"); - Map map = statisticMapper.deviceStaticsByStatus(deptIds); - for (String s : map.keySet()) { //value都转为string - map.replace(s, map.get(s).toString()); - } - return map; + List> mapList = statisticMapper.deviceStaticsByStatus(deptIds); + return mapList; } @Override @@ -133,4 +134,22 @@ } return mapList; } + + public Object alarmWellListPage(DataScope dataScope, String beginTime, String endTime, String alarmContent) { + ResponseData responseData = new ResponseData(); + try { + List> alarmWellList = statisticMapper.alarmWellListPage(dataScope, beginTime, endTime, alarmContent); + alarmWellList.forEach( + alarmWell -> alarmWell.put("deptName", permissionService.getDeptService().getDeptName(alarmWell.get("deptid").toString())) + ); + responseData.setCode(200); + responseData.setMessage("查询成功"); + responseData.setData(alarmWellList); + } catch (DataAccessException ex) { + log.error("主题：报警井查询出现异常，异常信息{}", ex); + responseData.setCode(500); + responseData.setMessage("查询异常"); + } + return responseData; + } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 001b2da..e57b310 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -19,9 +19,7 @@ @RequestMapping("/device/simManage") public class DeviceImeiController { - - @Autowired - private IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index f7f0a58..5b3553f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -4,8 +4,6 @@ import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; -import java.util.Map; - public interface IDeviceImeiService { Object deviceImeiListPage(Page page, String devcode); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java index 140d1b8..9f52e1b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmLevel.java @@ -26,7 +26,7 @@ /** * 自增主键 */ - @TableId(value = "ID", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 指标名称 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java new file mode 100644 index 0000000..a7e8d7c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -0,0 +1,57 @@ +package com.casic.missiles.modular.system.controller; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.modular.system.model.DeptPermission; +import com.casic.missiles.modular.system.service.DeptPermissionConfigService; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/deptPermission") +public class DeptPermissionController { + + private final DeptPermissionConfigService deptPermissionService; + + public DeptPermissionController(DeptPermissionConfigService deptPermissionService) { + this.deptPermissionService = deptPermissionService; + } + + /** + * 获取分页列表SMI + */ + @RequestMapping(value = "/listPage") + @ResponseBody + public Object deviceDeptPermissionList(String deptid) { + Page page = PageFactory.defaultPage(); + return deptPermissionService.deviceDeptPermissionList(page, deptid); + } + + /** + * 新增SMI + */ + @RequestMapping(value = "/add") + @ResponseBody + public Object addDeptPermission(@RequestBody DeptPermission deviceImei) { + return deptPermissionService.addDeptPermission(deviceImei); + } + + /** + * 更新SMI + */ + @RequestMapping(value = "/update") + @ResponseBody + public Object editDeptPermission(@RequestBody DeptPermission deviceImei) { + return deptPermissionService.editDeptPermission(deviceImei); + } + + /** + * 删除imei + */ + @RequestMapping(value = "/delete/{id}") + @ResponseBody + public Object deleteDeptPermission(@PathVariable("id") Long id) { + return deptPermissionService.deleteDeptPermission(id); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java new file mode 100644 index 0000000..ea52c6d --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java @@ -0,0 +1,17 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.DeptPermission; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface DeptPermissionConfigDao extends BaseMapper { + + List getListPage(@Param("page") Page page, + @Param("deptid") String deptid); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml new file mode 100644 index 0000000..70959cc --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java new file mode 100644 index 0000000..e890655 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.DeptPermission; + +public interface DeptPermissionConfigService { + + Object deviceDeptPermissionList(Page page, String deptid); + + Object addDeptPermission(DeptPermission deviceImei); + + Object editDeptPermission(DeptPermission deviceImei); + + Object deleteDeptPermission(Long id); + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java new file mode 100644 index 0000000..03e2f89 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -0,0 +1,84 @@ +package com.casic.missiles.modular.system.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dao.DeptPermissionConfigDao; +import com.casic.missiles.modular.system.model.DeptPermission; +import com.casic.missiles.modular.system.service.DeptPermissionConfigService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DataAccessException; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +public class DeptPermissionConfigServiceImpl extends ServiceImpl implements DeptPermissionConfigService { + + public Object deviceDeptPermissionList(Page page, String deptid) { + ResponseData responseData = new ResponseData(); + try { + List pageList = this.baseMapper.getListPage(page, deptid); + page.setRecords(pageList); + responseData.setMessage("查询成功"); + responseData.setCode(200); + responseData.setData(page); + } catch (DataAccessException dex) { + log.error("主题：组织权限配置查询出现异常，组织部门编号{},异常信息为{}", deptid, dex); + responseData.setCode(500); + responseData.setMessage("数据库异常"); + } + return responseData; + } + + public Object addDeptPermission(DeptPermission deptPermission) { + ResponseData responseData = new ResponseData(); + try { + this.baseMapper.insert(deptPermission); + responseData.setMessage("新增成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：组织权限配置新增出现异常，主键id:{},井类型:{},设备类型{},异常信息为{}", + deptPermission.getDeptid(), deptPermission.getWellType(), deptPermission.getDeviceType(), dex); + responseData.setCode(500); + responseData.setMessage("数据库异常"); + } + return responseData; + } + + public Object editDeptPermission(DeptPermission deviceImei) { + ResponseData responseData = new ResponseData(); + if (ObjectUtil.isEmpty(deviceImei.getId())) { + responseData.setMessage("主键不能为空"); + responseData.setCode(200); + } else { + try { + this.baseMapper.updateById(deviceImei); + responseData.setMessage("更新成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：组织权限配置更新出现异常，主键id:{},异常信息为{}", deviceImei.getId(), dex); + responseData.setCode(500); + responseData.setMessage("数据库异常"); + } + } + return responseData; + } + + public Object deleteDeptPermission(Long id) { + ResponseData responseData = new ResponseData(); + try { + this.baseMapper.deleteById(id); + responseData.setMessage("删除成功"); + responseData.setCode(200); + } catch (DataAccessException dex) { + log.error("主题：组织权限配置删除出现异常，主键id:{},异常信息为{}", id, dex); + responseData.setCode(500); + responseData.setMessage("数据库异常"); + } + return responseData; + } + +}