Prechádzať zdrojové kódy

添加报警消息导出功能

gao.qiang 2 rokov pred
rodič
commit
015f1c6313

+ 1 - 0
business-service/src/main/java/com/ozs/service/entity/MsgAlarm.java

@@ -236,5 +236,6 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      * 报警是否解除 1已解除2未解除
      */
     @Excel(name = "报警是否解除")
+    @TableField(exist = false)
     private String  isLockName;
 }

+ 1 - 1
hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -380,7 +380,7 @@ public class MsgAlarmController extends BaseController {
     @PutMapping(value = "/updateIsLock")
     @ApiOperation("根据报警信息ID解除报警")
     @Log(title = "报警信息管理", businessType = BusinessType.UPDATE)
-    public AjaxResult updateIsLock(@RequestHeader(value = "id") Long id,
+    public AjaxResult updateIsLock(@RequestParam(value = "id") Long id,
                                    @RequestParam(value = "releasedType") Integer releasedType,
                                    @RequestParam(value = "releasedReason") String releasedReason) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);