diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 6c24763..762477e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -58,6 +59,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody AlarmRule alarmRule) { return ReturnUtil.success(iAlarmRuleService.saveAlarmRule(alarmRule)); @@ -66,6 +68,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody AlarmRule alarmRule) { Assert.isFalse(Objects.isNull(alarmRule.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 6c24763..762477e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -58,6 +59,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody AlarmRule alarmRule) { return ReturnUtil.success(iAlarmRuleService.saveAlarmRule(alarmRule)); @@ -66,6 +68,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody AlarmRule alarmRule) { Assert.isFalse(Objects.isNull(alarmRule.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java index 1d50155..438c8fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -51,6 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody List alarmRuleDeviceList) { String createUser = permissionContext.getAuthService().getLoginUser().getName(); @@ -63,6 +65,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody List alarmRuleDeviceList) { return ReturnUtil.success(iAlarmRuleDeviceService.updateBatchById(alarmRuleDeviceList)); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 6c24763..762477e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -58,6 +59,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody AlarmRule alarmRule) { return ReturnUtil.success(iAlarmRuleService.saveAlarmRule(alarmRule)); @@ -66,6 +68,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody AlarmRule alarmRule) { Assert.isFalse(Objects.isNull(alarmRule.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java index 1d50155..438c8fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -51,6 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody List alarmRuleDeviceList) { String createUser = permissionContext.getAuthService().getLoginUser().getName(); @@ -63,6 +65,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody List alarmRuleDeviceList) { return ReturnUtil.success(iAlarmRuleDeviceService.updateBatchById(alarmRuleDeviceList)); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java index ba85978..73c2004 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java @@ -24,20 +24,15 @@ @Select("WITH alarm_temp AS ( SELECT ALARM_TYPE_ID,devcode,LEDGER_CODE,LEDGER_NUMBER,ALARM_LEVEL " + "FROM alarm_records ar WHERE ar.id = #{alarmId} ) SELECT " + - "bdt.TYPE_NAME AS devType, " + - "ay.ALARM_TYPE AS alarmType, " + + "bd.device_type AS devType, " + "bv.lngGaode AS lng, " + - "bv.latGaode AS lat, " + - "ac.alarm_level as alarmLevel " + + "bv.latGaode AS lat " + "FROM " + " alarm_temp ap " + - " LEFT JOIN alarm_type ay ON ay.id = ap.ALARM_TYPE_ID " + " LEFT JOIN bus_device bd ON bd.devcode = ap.devcode " + " AND bd.valid > 0 " + - " LEFT JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE " + " LEFT JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE " + " AND bv.tagNumber = ap.LEDGER_NUMBER " + - " left join alarm_level_control ac on ac.id=ap.ALARM_LEVEL " + " LIMIT 1") AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 6c24763..762477e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -58,6 +59,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody AlarmRule alarmRule) { return ReturnUtil.success(iAlarmRuleService.saveAlarmRule(alarmRule)); @@ -66,6 +68,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody AlarmRule alarmRule) { Assert.isFalse(Objects.isNull(alarmRule.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java index 1d50155..438c8fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -51,6 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody List alarmRuleDeviceList) { String createUser = permissionContext.getAuthService().getLoginUser().getName(); @@ -63,6 +65,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody List alarmRuleDeviceList) { return ReturnUtil.success(iAlarmRuleDeviceService.updateBatchById(alarmRuleDeviceList)); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java index ba85978..73c2004 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java @@ -24,20 +24,15 @@ @Select("WITH alarm_temp AS ( SELECT ALARM_TYPE_ID,devcode,LEDGER_CODE,LEDGER_NUMBER,ALARM_LEVEL " + "FROM alarm_records ar WHERE ar.id = #{alarmId} ) SELECT " + - "bdt.TYPE_NAME AS devType, " + - "ay.ALARM_TYPE AS alarmType, " + + "bd.device_type AS devType, " + "bv.lngGaode AS lng, " + - "bv.latGaode AS lat, " + - "ac.alarm_level as alarmLevel " + + "bv.latGaode AS lat " + "FROM " + " alarm_temp ap " + - " LEFT JOIN alarm_type ay ON ay.id = ap.ALARM_TYPE_ID " + " LEFT JOIN bus_device bd ON bd.devcode = ap.devcode " + " AND bd.valid > 0 " + - " LEFT JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE " + " LEFT JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE " + " AND bv.tagNumber = ap.LEDGER_NUMBER " + - " left join alarm_level_control ac on ac.id=ap.ALARM_LEVEL " + " LIMIT 1") AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java index f7c97d1..359a6c9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java @@ -3,8 +3,12 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data -public class AlarmRuleResponseDTO implements Cloneable{ +public class AlarmRuleResponseDTO implements Cloneable, Serializable { + + private static final long serialVersionUID = 1L; @ApiModelProperty("设备编号") private String devCode; @@ -25,5 +29,4 @@ private String alarmTypeName; - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 6c24763..762477e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -58,6 +59,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody AlarmRule alarmRule) { return ReturnUtil.success(iAlarmRuleService.saveAlarmRule(alarmRule)); @@ -66,6 +68,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody AlarmRule alarmRule) { Assert.isFalse(Objects.isNull(alarmRule.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java index 1d50155..438c8fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -51,6 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody List alarmRuleDeviceList) { String createUser = permissionContext.getAuthService().getLoginUser().getName(); @@ -63,6 +65,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody List alarmRuleDeviceList) { return ReturnUtil.success(iAlarmRuleDeviceService.updateBatchById(alarmRuleDeviceList)); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java index ba85978..73c2004 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java @@ -24,20 +24,15 @@ @Select("WITH alarm_temp AS ( SELECT ALARM_TYPE_ID,devcode,LEDGER_CODE,LEDGER_NUMBER,ALARM_LEVEL " + "FROM alarm_records ar WHERE ar.id = #{alarmId} ) SELECT " + - "bdt.TYPE_NAME AS devType, " + - "ay.ALARM_TYPE AS alarmType, " + + "bd.device_type AS devType, " + "bv.lngGaode AS lng, " + - "bv.latGaode AS lat, " + - "ac.alarm_level as alarmLevel " + + "bv.latGaode AS lat " + "FROM " + " alarm_temp ap " + - " LEFT JOIN alarm_type ay ON ay.id = ap.ALARM_TYPE_ID " + " LEFT JOIN bus_device bd ON bd.devcode = ap.devcode " + " AND bd.valid > 0 " + - " LEFT JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE " + " LEFT JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE " + " AND bv.tagNumber = ap.LEDGER_NUMBER " + - " left join alarm_level_control ac on ac.id=ap.ALARM_LEVEL " + " LIMIT 1") AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java index f7c97d1..359a6c9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java @@ -3,8 +3,12 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data -public class AlarmRuleResponseDTO implements Cloneable{ +public class AlarmRuleResponseDTO implements Cloneable, Serializable { + + private static final long serialVersionUID = 1L; @ApiModelProperty("设备编号") private String devCode; @@ -25,5 +29,4 @@ private String alarmTypeName; - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java index 5f5c27b..42ef2eb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java @@ -7,10 +7,10 @@ private String devType; - private String alarmType; +// private String alarmType; private String lng; private String lat; - private String alarmLevel; +// private String alarmLevel; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 6c24763..762477e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -58,6 +59,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody AlarmRule alarmRule) { return ReturnUtil.success(iAlarmRuleService.saveAlarmRule(alarmRule)); @@ -66,6 +68,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody AlarmRule alarmRule) { Assert.isFalse(Objects.isNull(alarmRule.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java index 1d50155..438c8fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -51,6 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody List alarmRuleDeviceList) { String createUser = permissionContext.getAuthService().getLoginUser().getName(); @@ -63,6 +65,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody List alarmRuleDeviceList) { return ReturnUtil.success(iAlarmRuleDeviceService.updateBatchById(alarmRuleDeviceList)); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java index ba85978..73c2004 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java @@ -24,20 +24,15 @@ @Select("WITH alarm_temp AS ( SELECT ALARM_TYPE_ID,devcode,LEDGER_CODE,LEDGER_NUMBER,ALARM_LEVEL " + "FROM alarm_records ar WHERE ar.id = #{alarmId} ) SELECT " + - "bdt.TYPE_NAME AS devType, " + - "ay.ALARM_TYPE AS alarmType, " + + "bd.device_type AS devType, " + "bv.lngGaode AS lng, " + - "bv.latGaode AS lat, " + - "ac.alarm_level as alarmLevel " + + "bv.latGaode AS lat " + "FROM " + " alarm_temp ap " + - " LEFT JOIN alarm_type ay ON ay.id = ap.ALARM_TYPE_ID " + " LEFT JOIN bus_device bd ON bd.devcode = ap.devcode " + " AND bd.valid > 0 " + - " LEFT JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE " + " LEFT JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE " + " AND bv.tagNumber = ap.LEDGER_NUMBER " + - " left join alarm_level_control ac on ac.id=ap.ALARM_LEVEL " + " LIMIT 1") AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java index f7c97d1..359a6c9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java @@ -3,8 +3,12 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data -public class AlarmRuleResponseDTO implements Cloneable{ +public class AlarmRuleResponseDTO implements Cloneable, Serializable { + + private static final long serialVersionUID = 1L; @ApiModelProperty("设备编号") private String devCode; @@ -25,5 +29,4 @@ private String alarmTypeName; - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java index 5f5c27b..42ef2eb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java @@ -7,10 +7,10 @@ private String devType; - private String alarmType; +// private String alarmType; private String lng; private String lat; - private String alarmLevel; +// private String alarmLevel; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index aec86db..57b155f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -346,8 +346,8 @@ public void sendMsg(AlarmRecords alarmRecords, AppRequestDTO appRequestDTO, int count, Long processorId) { Map parasMap = new HashMap<>(); parasMap.put("alarmId", alarmRecords.getId()); - parasMap.put("alarmType", appRequestDTO.getAlarmType()); - parasMap.put("alarmLevel", appRequestDTO.getAlarmLevel()); + parasMap.put("alarmType", alarmRecords.getAlarmTypeId()); + parasMap.put("alarmLevel", alarmRecords.getAlarmLevel()); parasMap.put("alarmTime", alarmRecords.getAlarmTime()); parasMap.put("devType", appRequestDTO.getDevType()); parasMap.put("devcode", alarmRecords.getDevcode()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 6c24763..762477e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -58,6 +59,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody AlarmRule alarmRule) { return ReturnUtil.success(iAlarmRuleService.saveAlarmRule(alarmRule)); @@ -66,6 +68,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody AlarmRule alarmRule) { Assert.isFalse(Objects.isNull(alarmRule.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java index 1d50155..438c8fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -51,6 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody List alarmRuleDeviceList) { String createUser = permissionContext.getAuthService().getLoginUser().getName(); @@ -63,6 +65,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody List alarmRuleDeviceList) { return ReturnUtil.success(iAlarmRuleDeviceService.updateBatchById(alarmRuleDeviceList)); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java index ba85978..73c2004 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java @@ -24,20 +24,15 @@ @Select("WITH alarm_temp AS ( SELECT ALARM_TYPE_ID,devcode,LEDGER_CODE,LEDGER_NUMBER,ALARM_LEVEL " + "FROM alarm_records ar WHERE ar.id = #{alarmId} ) SELECT " + - "bdt.TYPE_NAME AS devType, " + - "ay.ALARM_TYPE AS alarmType, " + + "bd.device_type AS devType, " + "bv.lngGaode AS lng, " + - "bv.latGaode AS lat, " + - "ac.alarm_level as alarmLevel " + + "bv.latGaode AS lat " + "FROM " + " alarm_temp ap " + - " LEFT JOIN alarm_type ay ON ay.id = ap.ALARM_TYPE_ID " + " LEFT JOIN bus_device bd ON bd.devcode = ap.devcode " + " AND bd.valid > 0 " + - " LEFT JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE " + " LEFT JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE " + " AND bv.tagNumber = ap.LEDGER_NUMBER " + - " left join alarm_level_control ac on ac.id=ap.ALARM_LEVEL " + " LIMIT 1") AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java index f7c97d1..359a6c9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java @@ -3,8 +3,12 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data -public class AlarmRuleResponseDTO implements Cloneable{ +public class AlarmRuleResponseDTO implements Cloneable, Serializable { + + private static final long serialVersionUID = 1L; @ApiModelProperty("设备编号") private String devCode; @@ -25,5 +29,4 @@ private String alarmTypeName; - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java index 5f5c27b..42ef2eb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java @@ -7,10 +7,10 @@ private String devType; - private String alarmType; +// private String alarmType; private String lng; private String lat; - private String alarmLevel; +// private String alarmLevel; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index aec86db..57b155f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -346,8 +346,8 @@ public void sendMsg(AlarmRecords alarmRecords, AppRequestDTO appRequestDTO, int count, Long processorId) { Map parasMap = new HashMap<>(); parasMap.put("alarmId", alarmRecords.getId()); - parasMap.put("alarmType", appRequestDTO.getAlarmType()); - parasMap.put("alarmLevel", appRequestDTO.getAlarmLevel()); + parasMap.put("alarmType", alarmRecords.getAlarmTypeId()); + parasMap.put("alarmLevel", alarmRecords.getAlarmLevel()); parasMap.put("alarmTime", alarmRecords.getAlarmTime()); parasMap.put("devType", appRequestDTO.getDevType()); parasMap.put("devcode", alarmRecords.getDevcode()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java index fdade51..765ae5c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmRuleDeviceService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -75,6 +76,7 @@ } + @Cacheable(value = "alarmRuleCache", key = "#devCode") @Override public List getByDevCode(String devCode) { //toDo:缓存取 diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 6c24763..762477e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -58,6 +59,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody AlarmRule alarmRule) { return ReturnUtil.success(iAlarmRuleService.saveAlarmRule(alarmRule)); @@ -66,6 +68,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody AlarmRule alarmRule) { Assert.isFalse(Objects.isNull(alarmRule.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java index 1d50155..438c8fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -51,6 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody List alarmRuleDeviceList) { String createUser = permissionContext.getAuthService().getLoginUser().getName(); @@ -63,6 +65,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody List alarmRuleDeviceList) { return ReturnUtil.success(iAlarmRuleDeviceService.updateBatchById(alarmRuleDeviceList)); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java index ba85978..73c2004 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java @@ -24,20 +24,15 @@ @Select("WITH alarm_temp AS ( SELECT ALARM_TYPE_ID,devcode,LEDGER_CODE,LEDGER_NUMBER,ALARM_LEVEL " + "FROM alarm_records ar WHERE ar.id = #{alarmId} ) SELECT " + - "bdt.TYPE_NAME AS devType, " + - "ay.ALARM_TYPE AS alarmType, " + + "bd.device_type AS devType, " + "bv.lngGaode AS lng, " + - "bv.latGaode AS lat, " + - "ac.alarm_level as alarmLevel " + + "bv.latGaode AS lat " + "FROM " + " alarm_temp ap " + - " LEFT JOIN alarm_type ay ON ay.id = ap.ALARM_TYPE_ID " + " LEFT JOIN bus_device bd ON bd.devcode = ap.devcode " + " AND bd.valid > 0 " + - " LEFT JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE " + " LEFT JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE " + " AND bv.tagNumber = ap.LEDGER_NUMBER " + - " left join alarm_level_control ac on ac.id=ap.ALARM_LEVEL " + " LIMIT 1") AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java index f7c97d1..359a6c9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java @@ -3,8 +3,12 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data -public class AlarmRuleResponseDTO implements Cloneable{ +public class AlarmRuleResponseDTO implements Cloneable, Serializable { + + private static final long serialVersionUID = 1L; @ApiModelProperty("设备编号") private String devCode; @@ -25,5 +29,4 @@ private String alarmTypeName; - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java index 5f5c27b..42ef2eb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java @@ -7,10 +7,10 @@ private String devType; - private String alarmType; +// private String alarmType; private String lng; private String lat; - private String alarmLevel; +// private String alarmLevel; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index aec86db..57b155f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -346,8 +346,8 @@ public void sendMsg(AlarmRecords alarmRecords, AppRequestDTO appRequestDTO, int count, Long processorId) { Map parasMap = new HashMap<>(); parasMap.put("alarmId", alarmRecords.getId()); - parasMap.put("alarmType", appRequestDTO.getAlarmType()); - parasMap.put("alarmLevel", appRequestDTO.getAlarmLevel()); + parasMap.put("alarmType", alarmRecords.getAlarmTypeId()); + parasMap.put("alarmLevel", alarmRecords.getAlarmLevel()); parasMap.put("alarmTime", alarmRecords.getAlarmTime()); parasMap.put("devType", appRequestDTO.getDevType()); parasMap.put("devcode", alarmRecords.getDevcode()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java index fdade51..765ae5c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmRuleDeviceService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -75,6 +76,7 @@ } + @Cacheable(value = "alarmRuleCache", key = "#devCode") @Override public List getByDevCode(String devCode) { //toDo:缓存取 diff --git a/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java b/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java index 30f67f3..df79ba0 100644 --- a/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java +++ b/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java @@ -17,13 +17,13 @@ @Slf4j @RequiredArgsConstructor @RestController -@RequestMapping("/api") +@RequestMapping("/monitorDataReceive") public class ApiController { private final IAlarmRecordsService iAlarmRecordsService; //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 @ApiOperation("接收app处置结果") - @PostMapping("/receiveProcessResult") + @PostMapping("/alarmPush") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 6c24763..762477e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -58,6 +59,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody AlarmRule alarmRule) { return ReturnUtil.success(iAlarmRuleService.saveAlarmRule(alarmRule)); @@ -66,6 +68,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody AlarmRule alarmRule) { Assert.isFalse(Objects.isNull(alarmRule.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java index 1d50155..438c8fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -51,6 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody List alarmRuleDeviceList) { String createUser = permissionContext.getAuthService().getLoginUser().getName(); @@ -63,6 +65,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody List alarmRuleDeviceList) { return ReturnUtil.success(iAlarmRuleDeviceService.updateBatchById(alarmRuleDeviceList)); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java index ba85978..73c2004 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java @@ -24,20 +24,15 @@ @Select("WITH alarm_temp AS ( SELECT ALARM_TYPE_ID,devcode,LEDGER_CODE,LEDGER_NUMBER,ALARM_LEVEL " + "FROM alarm_records ar WHERE ar.id = #{alarmId} ) SELECT " + - "bdt.TYPE_NAME AS devType, " + - "ay.ALARM_TYPE AS alarmType, " + + "bd.device_type AS devType, " + "bv.lngGaode AS lng, " + - "bv.latGaode AS lat, " + - "ac.alarm_level as alarmLevel " + + "bv.latGaode AS lat " + "FROM " + " alarm_temp ap " + - " LEFT JOIN alarm_type ay ON ay.id = ap.ALARM_TYPE_ID " + " LEFT JOIN bus_device bd ON bd.devcode = ap.devcode " + " AND bd.valid > 0 " + - " LEFT JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE " + " LEFT JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE " + " AND bv.tagNumber = ap.LEDGER_NUMBER " + - " left join alarm_level_control ac on ac.id=ap.ALARM_LEVEL " + " LIMIT 1") AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java index f7c97d1..359a6c9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java @@ -3,8 +3,12 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data -public class AlarmRuleResponseDTO implements Cloneable{ +public class AlarmRuleResponseDTO implements Cloneable, Serializable { + + private static final long serialVersionUID = 1L; @ApiModelProperty("设备编号") private String devCode; @@ -25,5 +29,4 @@ private String alarmTypeName; - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java index 5f5c27b..42ef2eb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java @@ -7,10 +7,10 @@ private String devType; - private String alarmType; +// private String alarmType; private String lng; private String lat; - private String alarmLevel; +// private String alarmLevel; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index aec86db..57b155f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -346,8 +346,8 @@ public void sendMsg(AlarmRecords alarmRecords, AppRequestDTO appRequestDTO, int count, Long processorId) { Map parasMap = new HashMap<>(); parasMap.put("alarmId", alarmRecords.getId()); - parasMap.put("alarmType", appRequestDTO.getAlarmType()); - parasMap.put("alarmLevel", appRequestDTO.getAlarmLevel()); + parasMap.put("alarmType", alarmRecords.getAlarmTypeId()); + parasMap.put("alarmLevel", alarmRecords.getAlarmLevel()); parasMap.put("alarmTime", alarmRecords.getAlarmTime()); parasMap.put("devType", appRequestDTO.getDevType()); parasMap.put("devcode", alarmRecords.getDevcode()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java index fdade51..765ae5c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmRuleDeviceService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -75,6 +76,7 @@ } + @Cacheable(value = "alarmRuleCache", key = "#devCode") @Override public List getByDevCode(String devCode) { //toDo:缓存取 diff --git a/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java b/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java index 30f67f3..df79ba0 100644 --- a/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java +++ b/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java @@ -17,13 +17,13 @@ @Slf4j @RequiredArgsConstructor @RestController -@RequestMapping("/api") +@RequestMapping("/monitorDataReceive") public class ApiController { private final IAlarmRecordsService iAlarmRecordsService; //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 @ApiOperation("接收app处置结果") - @PostMapping("/receiveProcessResult") + @PostMapping("/alarmPush") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 9029096..e539848 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -24,7 +24,7 @@ db: init: enable: false - brAppUrl: http://127.0.0.1:8083/api/receiveProcessResult + brAppUrl: http://127.0.0.1:8083/monitorDataReceive/alarmPush smartcity: config: diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java index 6c24763..762477e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java @@ -22,6 +22,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -58,6 +59,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody AlarmRule alarmRule) { return ReturnUtil.success(iAlarmRuleService.saveAlarmRule(alarmRule)); @@ -66,6 +68,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody AlarmRule alarmRule) { Assert.isFalse(Objects.isNull(alarmRule.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java index 1d50155..438c8fc 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleDeviceController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -51,6 +52,7 @@ @ApiOperation("新增") @PostMapping("/add") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO add(@RequestBody List alarmRuleDeviceList) { String createUser = permissionContext.getAuthService().getLoginUser().getName(); @@ -63,6 +65,7 @@ @ApiOperation("编辑") @PostMapping("/edit") @ResponseBody + @CacheEvict(value = "alarmRuleCache", allEntries = true) public ReturnDTO edit(@RequestBody List alarmRuleDeviceList) { return ReturnUtil.success(iAlarmRuleDeviceService.updateBatchById(alarmRuleDeviceList)); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java index ba85978..73c2004 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/RemindLogMapper.java @@ -24,20 +24,15 @@ @Select("WITH alarm_temp AS ( SELECT ALARM_TYPE_ID,devcode,LEDGER_CODE,LEDGER_NUMBER,ALARM_LEVEL " + "FROM alarm_records ar WHERE ar.id = #{alarmId} ) SELECT " + - "bdt.TYPE_NAME AS devType, " + - "ay.ALARM_TYPE AS alarmType, " + + "bd.device_type AS devType, " + "bv.lngGaode AS lng, " + - "bv.latGaode AS lat, " + - "ac.alarm_level as alarmLevel " + + "bv.latGaode AS lat " + "FROM " + " alarm_temp ap " + - " LEFT JOIN alarm_type ay ON ay.id = ap.ALARM_TYPE_ID " + " LEFT JOIN bus_device bd ON bd.devcode = ap.devcode " + " AND bd.valid > 0 " + - " LEFT JOIN base_device_type bdt ON bdt.id = bd.DEVICE_TYPE " + " LEFT JOIN bus_ledger_all_view bv ON bv.ledgerCode = ap.LEDGER_CODE " + " AND bv.tagNumber = ap.LEDGER_NUMBER " + - " left join alarm_level_control ac on ac.id=ap.ALARM_LEVEL " + " LIMIT 1") AppRequestDTO getAppRequestDTO(@Param("alarmId") Long alarmId); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java index f7c97d1..359a6c9 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AlarmRuleResponseDTO.java @@ -3,8 +3,12 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; + @Data -public class AlarmRuleResponseDTO implements Cloneable{ +public class AlarmRuleResponseDTO implements Cloneable, Serializable { + + private static final long serialVersionUID = 1L; @ApiModelProperty("设备编号") private String devCode; @@ -25,5 +29,4 @@ private String alarmTypeName; - } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java index 5f5c27b..42ef2eb 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dto/AppRequestDTO.java @@ -7,10 +7,10 @@ private String devType; - private String alarmType; +// private String alarmType; private String lng; private String lat; - private String alarmLevel; +// private String alarmLevel; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index aec86db..57b155f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -346,8 +346,8 @@ public void sendMsg(AlarmRecords alarmRecords, AppRequestDTO appRequestDTO, int count, Long processorId) { Map parasMap = new HashMap<>(); parasMap.put("alarmId", alarmRecords.getId()); - parasMap.put("alarmType", appRequestDTO.getAlarmType()); - parasMap.put("alarmLevel", appRequestDTO.getAlarmLevel()); + parasMap.put("alarmType", alarmRecords.getAlarmTypeId()); + parasMap.put("alarmLevel", alarmRecords.getAlarmLevel()); parasMap.put("alarmTime", alarmRecords.getAlarmTime()); parasMap.put("devType", appRequestDTO.getDevType()); parasMap.put("devcode", alarmRecords.getDevcode()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java index fdade51..765ae5c 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRuleServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.modular.alarm.service.IAlarmRuleDeviceService; import com.casic.missiles.modular.alarm.service.IAlarmRuleService; import lombok.RequiredArgsConstructor; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -75,6 +76,7 @@ } + @Cacheable(value = "alarmRuleCache", key = "#devCode") @Override public List getByDevCode(String devCode) { //toDo:缓存取 diff --git a/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java b/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java index 30f67f3..df79ba0 100644 --- a/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java +++ b/casic-rest-api/src/main/java/com/casic/missiles/modular/appOther/controller/ApiController.java @@ -17,13 +17,13 @@ @Slf4j @RequiredArgsConstructor @RestController -@RequestMapping("/api") +@RequestMapping("/monitorDataReceive") public class ApiController { private final IAlarmRecordsService iAlarmRecordsService; //alarmId 报警id、realAlarm(1:是，0：否)、processStatus(5：已确认，6：待处置，7：已处置)、处理人、处理时间、备注 @ApiOperation("接收app处置结果") - @PostMapping("/receiveProcessResult") + @PostMapping("/alarmPush") @ResponseBody public Object getProcessResult(@RequestBody Map resultParams) { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 9029096..e539848 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -24,7 +24,7 @@ db: init: enable: false - brAppUrl: http://127.0.0.1:8083/api/receiveProcessResult + brAppUrl: http://127.0.0.1:8083/monitorDataReceive/alarmPush smartcity: config: diff --git a/casic-web/src/main/resources/ehcache.xml b/casic-web/src/main/resources/ehcache.xml index 88b148f..2a92b72 100644 --- a/casic-web/src/main/resources/ehcache.xml +++ b/casic-web/src/main/resources/ehcache.xml @@ -105,6 +105,19 @@ transactionalMode="off"> + + +