From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/controller/OrganizationUnitAlarmController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/OrganizationUnitAlarmController.java b/screen-manage/src/main/java/com/moral/api/controller/OrganizationUnitAlarmController.java
index a9c1793..fe9da2b 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/OrganizationUnitAlarmController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/OrganizationUnitAlarmController.java
@@ -1,7 +1,9 @@
package com.moral.api.controller;
+import com.moral.api.pojo.dto.organizationUnitAlarm.OrganizationUnitAlarmDTO;
import com.moral.api.pojo.dto.organizationUnitAlarm.OrganizationUnitAlarmQueryDTO;
import com.moral.api.pojo.form.organizationUnitAlarm.OrganizationUnitAlarmQueryForm;
+import com.moral.api.pojo.form.organizationUnitAlarm.OrganizationUnitAlarmUpdateForm;
import com.moral.api.pojo.vo.organizationUnitAlarm.OrganizationUnitAlarmQueryVO;
import com.moral.api.service.OrganizationUnitAlarmService;
import com.moral.constant.ResponseCodeEnum;
@@ -9,10 +11,7 @@
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* @ClassName OrganizationUnitAlarmController
@@ -32,7 +31,7 @@
OrganizationUnitAlarmService organizationUnitAlarmService;
@GetMapping("query")
- public ResultMessage query(OrganizationUnitAlarmQueryForm form){
+ public ResultMessage query(OrganizationUnitAlarmQueryForm form) {
//������������������������
if (!form.valid())
@@ -47,4 +46,17 @@
return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
}
+
+ @PostMapping("update")
+ public ResultMessage update(@RequestBody OrganizationUnitAlarmUpdateForm form) {
+
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+ OrganizationUnitAlarmDTO dto = organizationUnitAlarmService.update(form);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
+ }
}
--
Gitblit v1.8.0