|
@@ -407,6 +407,9 @@ public class MsgAlarmController extends BaseController {
|
|
@RequestParam(value = "releasedType", required = false) Integer releasedType,
|
|
@RequestParam(value = "releasedType", required = false) Integer releasedType,
|
|
@RequestParam(value = "releasedReason", required = false) String releasedReason) {
|
|
@RequestParam(value = "releasedReason", required = false) String releasedReason) {
|
|
MsgAlarm msgAlarm = msgAlarmService.getById(id);
|
|
MsgAlarm msgAlarm = msgAlarmService.getById(id);
|
|
|
|
+ if (msgAlarm.getIsLock()==1){
|
|
|
|
+ return AjaxResult.error("报警已解除");
|
|
|
|
+ }
|
|
msgAlarm.setIsLock(1);
|
|
msgAlarm.setIsLock(1);
|
|
msgAlarm.setUpdateBy(getUserId());
|
|
msgAlarm.setUpdateBy(getUserId());
|
|
msgAlarm.setReleasedBy(getUserId());
|
|
msgAlarm.setReleasedBy(getUserId());
|