From 96d3ae20a572460e3dc226204398c44b4d0c8484 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 18 Jun 2021 16:54:05 +0800
Subject: [PATCH] screen-api 增加编辑组织型号因子的显示单位以及报警等级接口
---
screen-manage/src/main/java/com/moral/api/pojo/dto/organizationUnitAlarm/OrganizationUnitAlarmDTO.java | 2 +
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java | 21 ++++++++++
screen-manage/src/main/java/com/moral/api/controller/OrganizationUnitAlarmController.java | 22 ++++++++--
screen-manage/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java | 11 +++++
screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java | 5 +-
screen-manage/src/main/java/com/moral/api/pojo/form/organizationUnitAlarm/OrganizationUnitAlarmUpdateForm.java | 41 ++++++++++++++++++++
screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmVO.java | 2
7 files changed, 96 insertions(+), 8 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);
+ }
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/organizationUnitAlarm/OrganizationUnitAlarmDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/organizationUnitAlarm/OrganizationUnitAlarmDTO.java
index 13160cd..0afa54a 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/dto/organizationUnitAlarm/OrganizationUnitAlarmDTO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/organizationUnitAlarm/OrganizationUnitAlarmDTO.java
@@ -3,6 +3,7 @@
import com.moral.api.entity.OrganizationUnitAlarm;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* @ClassName OrganizationUnitAlarmDTO
@@ -12,6 +13,7 @@
* @Version TODO
**/
@Data
+@NoArgsConstructor
public class OrganizationUnitAlarmDTO {
private Integer code;
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/organizationUnitAlarm/OrganizationUnitAlarmUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/organizationUnitAlarm/OrganizationUnitAlarmUpdateForm.java
new file mode 100644
index 0000000..cf168a9
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/organizationUnitAlarm/OrganizationUnitAlarmUpdateForm.java
@@ -0,0 +1,41 @@
+package com.moral.api.pojo.form.organizationUnitAlarm;
+
+import com.alibaba.fastjson.JSON;
+import com.moral.api.entity.OrganizationUnitAlarm;
+import lombok.Data;
+import org.springframework.util.ObjectUtils;
+
+import java.lang.reflect.Array;
+
+/**
+ * @ClassName OrganizationUnitAlarmUpdateForm
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/6/18 16:15
+ * @Version TODO
+ **/
+@Data
+public class OrganizationUnitAlarmUpdateForm {
+
+ private Integer id;
+
+ private String showUnitKey;
+
+ private String alarmLevel;
+
+ public boolean valid(){
+ if(ObjectUtils.isEmpty(showUnitKey)&&ObjectUtils.isEmpty(alarmLevel))
+ return false;
+ if(ObjectUtils.isEmpty(id))
+ return false;
+ return true;
+ }
+
+ public OrganizationUnitAlarm formConvertEntity(){
+ OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
+ organizationUnitAlarm.setId(id);
+ organizationUnitAlarm.setShowUnitKey(showUnitKey);
+ organizationUnitAlarm.setAlarmLevel(alarmLevel);
+ return organizationUnitAlarm;
+ }
+}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java
index 2e4e945..d0e7274 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmQueryVO.java
@@ -62,7 +62,8 @@
vo.setUnitKey(organizationUnitAlarm.getUnitKey());
vo.setShowUnitKey(organizationUnitAlarm.getShowUnitKey());
//alarmLevel Json������������������
- if (!ObjectUtils.isEmpty(organizationUnitAlarm.getAlarmLevel())) {
+ vo.setAlarmLevel(organizationUnitAlarm.getAlarmLevel());
+ /*if (!ObjectUtils.isEmpty(organizationUnitAlarm.getAlarmLevel())) {
StringBuilder alarmLevelStr = new StringBuilder(organizationUnitAlarm.getAlarmLevel());
List<Integer> alarmLevel = new ArrayList<>();
alarmLevelStr.deleteCharAt(0);
@@ -72,7 +73,7 @@
alarmLevel.add(Integer.parseInt(level));
}
vo.setAlarmLevel(alarmLevel);
- }
+ }*/
return vo;
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmVO.java
index 672f3c3..6fbe308 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmVO.java
@@ -24,5 +24,5 @@
private String showUnitKey;
- private List<Integer> alarmLevel;
+ private String alarmLevel;
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java b/screen-manage/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java
index 2cfb78c..83dfc74 100644
--- a/screen-manage/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/OrganizationUnitAlarmService.java
@@ -2,8 +2,10 @@
import com.moral.api.entity.OrganizationUnitAlarm;
import com.baomidou.mybatisplus.extension.service.IService;
+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;
/**
* <p>
@@ -23,4 +25,13 @@
* @Date: 2021/6/18
*/
OrganizationUnitAlarmQueryDTO query(OrganizationUnitAlarmQueryForm form);
+
+ /**
+ * @Description: ������id���������������������������������������������
+ * @Param: [form]
+ * @return: com.moral.api.pojo.dto.organizationUnitAlarm.OrganizationUnitAlarmDTO
+ * @Author: ���������
+ * @Date: 2021/6/18
+ */
+ OrganizationUnitAlarmDTO update(OrganizationUnitAlarmUpdateForm form);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
index 9200e29..cdeb6a1 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
@@ -7,12 +7,14 @@
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.service.OrganizationUnitAlarmService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@@ -56,4 +58,23 @@
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
}
+
+ @Override
+ @Transactional
+ public OrganizationUnitAlarmDTO update(OrganizationUnitAlarmUpdateForm form) {
+ //������������������
+ OrganizationUnitAlarmDTO dto = new OrganizationUnitAlarmDTO();
+ //������
+ OrganizationUnitAlarm organizationUnitAlarm = form.formConvertEntity();
+ //������������������������������������������
+ OrganizationUnitAlarm oldRecord = organizationUnitAlarmMapper.selectById(organizationUnitAlarm.getId());
+ //������
+ organizationUnitAlarmMapper.updateById(organizationUnitAlarm);
+ //������������������������������������������
+ OrganizationUnitAlarm newRecord = organizationUnitAlarmMapper.selectById(organizationUnitAlarm.getId());
+ //������������������
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ return dto;
+ }
}
--
Gitblit v1.8.0