Browse Source

Merge remote-tracking branch 'origin/master'

yaoll 4 years ago
parent
commit
0252cdb73b

+ 9 - 4
dmp-alarm/src/main/java/com/persagy/dmp/alarm/controller/AlarmConfigController.java

@@ -77,10 +77,15 @@ public class AlarmConfigController {
         return service.batchUpdate(configModels);
     }
 
-    //	@PostMapping("/delete")
-    //	public MapResponse delete(@RequestBody AlarmConfigModel param){
-    //		return service.delete(param);
-    //	}
+    @PostMapping("/delete")
+    public MapResponse delete(@RequestBody AlarmConfigModel param) {
+        return service.delete(param);
+    }
+
+    @PostMapping("/batch_delete")
+    public MapResponse batchDelete(@RequestBody AlarmConfigModels param) {
+        return service.batchDelete(param);
+    }
 
 
     @PostMapping("/init")

+ 6 - 0
dmp-alarm/src/main/java/com/persagy/dmp/alarm/controller/AlarmRecordController.java

@@ -4,6 +4,7 @@ import com.persagy.common.criteria.JacksonCriteria;
 import com.persagy.common.web.MapResponse;
 import com.persagy.common.web.PagedResponse;
 import com.persagy.dmp.alarm.model.AlarmRecordModel;
+import com.persagy.dmp.alarm.model.AlarmRecordModels;
 import com.persagy.dmp.alarm.service.AlarmRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,6 +31,11 @@ public class AlarmRecordController {
 	public MapResponse update(@RequestBody AlarmRecordModel param){
 		return service.update(param);
 	}
+
+	@PostMapping("/batch_update")
+	public MapResponse update(@RequestBody AlarmRecordModels param){
+		return service.batchUpdate(param);
+	}
 	
 //	@PostMapping("/delete")
 //	public MapResponse delete(@RequestBody AlarmRecordModel param){

+ 6 - 2
dmp-alarm/src/main/java/com/persagy/dmp/alarm/model/AlarmConfigModels.java

@@ -1,12 +1,16 @@
 package com.persagy.dmp.alarm.model;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Date;
 import java.util.List;
 
+/**
+ * 报警定义列表参数
+ *
+ * @author lixing
+ * @version V1.0 2021/3/20 10:54 上午
+ */
 @Setter
 @Getter
 public class AlarmConfigModels {

+ 20 - 0
dmp-alarm/src/main/java/com/persagy/dmp/alarm/model/AlarmRecordModels.java

@@ -0,0 +1,20 @@
+package com.persagy.dmp.alarm.model;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 报警记录列表参数
+ *
+ * @author lixing
+ * @version V1.0 2021/3/20 11:05 上午
+ */
+@Setter
+@Getter
+public class AlarmRecordModels {
+	private List<AlarmRecordModel> alarmRecordModels;
+}

+ 41 - 0
dmp-alarm/src/main/java/com/persagy/dmp/alarm/service/AlarmConfigService.java

@@ -14,6 +14,7 @@ import com.persagy.dmp.alarm.entity.QAlarmConfig;
 import com.persagy.dmp.alarm.enumeration.EnumAlarmMessageType;
 import com.persagy.dmp.alarm.jms.MessageProcesser;
 import com.persagy.dmp.alarm.model.AlarmConfigModel;
+import com.persagy.dmp.alarm.model.AlarmConfigModels;
 import com.persagy.dmp.alarm.model.AlarmItemModel;
 import com.persagy.dmp.alarm.model.AlarmTargetModel;
 import com.persagy.dmp.alarm.repository.AlarmConfigRepository;
@@ -771,5 +772,45 @@ public class AlarmConfigService extends AlarmBaseService {
             messageProcesser.convertAndSend(deletedMessage);
         }
     }
+
+    /**
+     * 删除报警定义,真删
+     *
+     * @param param 报警定义对象AlarmConfigModel,只取id
+     * @return 是否删除成功
+     * @author lixing
+     * @version V1.0 2021/3/20 10:49 上午
+     */
+    public MapResponse delete(AlarmConfigModel param) {
+        JacksonCriteria criteria = JacksonCriteria.newInstance();
+        criteria.add("id", param.getId());
+        deleteByCriteria(criteria);
+        return new MapResponse();
+    }
+
+    /**
+     * 批量删除报警定义,真删
+     *
+     * @param param 批量删除对象AlarmConfigModels
+     * @return 是否删除成功
+     * @author lixing
+     * @version V1.0 2021/3/20 10:59 上午
+     */
+    @Transactional
+    public MapResponse batchDelete(AlarmConfigModels param) {
+        MapResponse response = new MapResponse();
+        List<AlarmConfigModel> alarmConfigs = param.getAlarmConfigs();
+        if (CollectionUtils.isEmpty(alarmConfigs)) {
+            response.setFail("批量删除报警定义,没有传入需要删除的对象");
+            return response;
+        }
+
+        List<String> configIds = alarmConfigs.stream().map(AlarmConfigModel::getId).collect(Collectors.toList());
+        JacksonCriteria criteria = JacksonCriteria.newInstance();
+        criteria.add("id", configIds);
+        deleteByCriteria(criteria);
+
+        return response;
+    }
 }
 

+ 30 - 1
dmp-alarm/src/main/java/com/persagy/dmp/alarm/service/AlarmRecordService.java

@@ -1,6 +1,5 @@
 package com.persagy.dmp.alarm.service;
 
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.common.criteria.CriteriaUtils;
 import com.persagy.common.criteria.JacksonCriteria;
@@ -15,6 +14,7 @@ import com.persagy.dmp.alarm.enumeration.EnumAlarmMessageType;
 import com.persagy.dmp.alarm.enumeration.EnumAlarmRecordWithColumns;
 import com.persagy.dmp.alarm.model.AlarmLogModel;
 import com.persagy.dmp.alarm.model.AlarmRecordModel;
+import com.persagy.dmp.alarm.model.AlarmRecordModels;
 import com.persagy.dmp.alarm.repository.AlarmRecordRepository;
 import com.persagy.dmp.alarm.util.CheckRequiredParam;
 import com.persagy.dmp.config.DmpParameterStorage;
@@ -22,6 +22,7 @@ import com.persagy.dmp.rwd.model.DmpMessage;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import javax.transaction.Transactional;
@@ -248,6 +249,34 @@ public class AlarmRecordService extends AlarmBaseService {
         return response;
     }
 
+    /**
+     * 批量更新报警记录
+     *
+     * @param param 批量更新参数AlarmRecordModels
+     * @return 是否更新成功
+     * @author lixing
+     * @version V1.0 2021/3/20 11:09 上午
+     */
+    @Transactional
+    public MapResponse batchUpdate(AlarmRecordModels param) {
+        MapResponse response = new MapResponse();
+
+        List<AlarmRecordModel> alarmRecordModelList = param.getAlarmRecordModels();
+        if (CollectionUtils.isEmpty(alarmRecordModelList)) {
+            response.setFail("批量更新报警记录,没有传入需要更新的对象");
+            return response;
+        }
+
+        // 一次最多更新200条数据
+        if (alarmRecordModelList.size() > 200) {
+            response.setFail("一次最多更新200条数据");
+            return response;
+        }
+
+        alarmRecordModelList.forEach(this::update);
+        return response;
+    }
+
     //	@Transactional
     //	public MapResponse delete(AlarmRecordModel param) {
     //		MapResponse response = new MapResponse();

+ 2 - 2
dmp-alarm/src/main/resources/bootstrap.yml

@@ -5,8 +5,8 @@ spring:
     active: log-dev
   cloud:
     config:
-      profile: dev
-      uri: http://192.168.100.107:9932
+      profile: dev2
+      uri: http://192.168.64.18:9932
 persagy:
   log:
     path: ../logs/dmp-alarm/