对接环境健康

src/main/java/com/persagy/apm/dmpalarm/controller/AlarmEventTypeController.java

@@ -0,0 +1,53 @@
+/**
+ * 
+ */
+package com.persagy.apm.dmpalarm.controller;
+
+import javax.annotation.Resource;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.persagy.apm.dmpalarm.criteria.JsonCriteria;
+import com.persagy.apm.dmpalarm.model.AlarmEventType;
+import com.persagy.apm.dmpalarm.service.IAlarmEventTypeService;
+import com.persagy.apm.dmpalarm.web.MapResponse;
+import com.persagy.apm.dmpalarm.web.PagedResponse;
+
+import io.swagger.annotations.Api;
+
+/**
+ * @author gaoyu
+ *
+ */
+@Api(tags = "报警原因事件类型")
+@Validated
+@RestController("dmpAlarmEvent")
+@RequestMapping("/alarm/event")
+public class AlarmEventTypeController {
+	
+    @Resource(name="dmpAlarmEventTypeService")
+    private IAlarmEventTypeService alarmEventTypeService;
+
+    @PostMapping("/query")
+    public PagedResponse<AlarmEventType> query(@RequestBody JsonCriteria criteria) {
+        return alarmEventTypeService.query(criteria);
+    }
+
+    @PostMapping("/create")
+    public MapResponse create(@RequestBody AlarmEventType param){
+        return alarmEventTypeService.create(param);
+    }
+
+    @PostMapping("/update")
+    public MapResponse update(@RequestBody AlarmEventType param){
+        return alarmEventTypeService.update(param);
+    }
+    @PostMapping("/delete")
+    public MapResponse delete(@RequestBody AlarmEventType param){
+        return alarmEventTypeService.delete(param);
+    }
+}

src/main/java/com/persagy/apm/dmpalarm/criteria/CriteriaUtils.java

@@ -16,7 +16,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.gson.JsonArray;
 import com.persagy.apm.dmpalarm.criteria.JsonCriteria.Order;
 import com.persagy.apm.dmpalarm.utils.UtilsTools;
 import com.persagy.apm.dmpalarm.web.PagedResponse;

src/main/java/com/persagy/apm/dmpalarm/model/AlarmComment.java

@@ -44,10 +44,10 @@ public class AlarmComment implements Serializable {
     
     @ApiModelProperty("更新人")
     private String updateUser;
-
     private int valid;
+    @ApiModelProperty("alarm_event 外键")
+    private String eventTypeId;
     
-
     public static String PROP_RECORD_ID = "record_id";
     public static String PROP_CONTENT = "content";
     public static String PROP_CREATE_USER = "create_user";
@@ -56,5 +56,5 @@ public class AlarmComment implements Serializable {
     public static String PROP_CREATE_TIME = "create_time";
     public static String PROP_UPDATE_TIME = "update_time";
     public static String PROP_UPDATE_USER = "update_user";
-
+    public static String PROP_EVENT_TYPE_ID = "event_type_id";
 }

src/main/java/com/persagy/apm/dmpalarm/model/AlarmEventType.java

@@ -0,0 +1,32 @@
+package com.persagy.apm.dmpalarm.model;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+ /**
+  * 
+  * @author gaoyu
+  *
+  */
+@Data
+@ApiModel(description = "报警原因事件类型")
+@TableName(autoResultMap = true)
+public class AlarmEventType implements Serializable {
+    private static final long serialVersionUID = -25604656657950729L;
+    private String id;
+    private Integer eventId;
+    private String eventName;
+    private String category; 
+    private Date ts;
+    private String creator;
+    private Date creationTime;
+    private String  modifier;
+    private Date modifiedTime; 
+    private Integer valid;
+}

src/main/java/com/persagy/apm/dmpalarm/service/IAlarmEventTypeService.java

@@ -0,0 +1,50 @@
+/**
+ * 
+ */
+package com.persagy.apm.dmpalarm.service;
+
+import com.persagy.apm.dmpalarm.criteria.JsonCriteria;
+import com.persagy.apm.dmpalarm.model.AlarmEventType;
+import com.persagy.apm.dmpalarm.web.MapResponse;
+import com.persagy.apm.dmpalarm.web.PagedResponse;
+
+/**
+ * @author gaoyu
+ *
+ */
+public interface IAlarmEventTypeService {
+
+	/**
+	 *<p>分页查询</p>
+	 * @param criteria
+	 * @return    参数
+	 * @return PagedResponse<AlarmItem>    返回类型
+	 */
+	PagedResponse<AlarmEventType> query(JsonCriteria criteria);
+
+	/**
+	 *<p>更新</p>
+	 * @param param
+	 * @return    参数
+	 * @return MapResponse    返回类型
+	 */
+	MapResponse update(AlarmEventType param);
+
+	/**
+	 *<p>新增</p>
+	 * @param param
+	 * @return    参数
+	 * @return MapResponse    返回类型
+	 */
+	MapResponse create(AlarmEventType param);
+
+	/**
+	 *<p>删除</p>
+	 * @param param
+	 * @return    参数
+	 * @return MapResponse    返回类型
+	 */
+	MapResponse delete(AlarmEventType param);
+
+	 
+}

src/main/java/com/persagy/apm/dmpalarm/service/impl/AlarmEventTypeServiceImpl.java

@@ -0,0 +1,100 @@
+/**
+ * 
+ */
+package com.persagy.apm.dmpalarm.service.impl;
+
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.persagy.apm.dmpalarm.criteria.CriteriaUtils;
+import com.persagy.apm.dmpalarm.criteria.JsonCriteria;
+import com.persagy.apm.dmpalarm.model.AlarmEventType;
+import com.persagy.apm.dmpalarm.service.IAlarmEventTypeService;
+import com.persagy.apm.dmpalarm.utils.CheckRequiredParam;
+import com.persagy.apm.dmpalarm.web.MapResponse;
+import com.persagy.apm.dmpalarm.web.PagedResponse;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author gaoyu
+ *
+ */
+@Slf4j
+@Service("dmpAlarmEventTypeService")
+public class AlarmEventTypeServiceImpl extends BaseServiceImpl<BaseMapper<AlarmEventType>, AlarmEventType>
+		implements IAlarmEventTypeService {
+	@Resource
+	private CriteriaUtils criteriaUtils;
+
+	@Override
+	public PagedResponse<AlarmEventType> query(JsonCriteria criteria) {
+		QueryWrapper<AlarmEventType> queryWrapper = criteriaUtils.handleAlarmConditions(criteria, AlarmEventType.class);
+		try {
+			return criteriaUtils.getPagedResponse(criteria, AlarmEventType.class, queryWrapper, getBaseMapper());
+		} catch (Exception e) {
+			log.error("alarmEventType query page error JsonCriteria is  {}", criteria.toString(), e);
+		}
+		return new PagedResponse<>();
+	}
+
+	@Override
+	public MapResponse update(AlarmEventType entity) {
+		MapResponse response = new MapResponse();
+		AlarmParam alarmParam = prepareParam(response);
+		String checkResult = CheckRequiredParam.check(entity, "id", "eventId", "eventName", "category");
+		if (!StringUtils.isEmpty(checkResult)) {
+			response.setFail(checkResult);
+			return response;
+		}
+		if (alarmParam == null) {
+			return response;
+		}
+		entity.setModifier(alarmParam.userId);
+		entity.setModifiedTime(new Date());
+		saveOrUpdate(entity);
+		return response;
+	}
+
+	@Override
+	public MapResponse create(AlarmEventType entity) {
+		MapResponse response = new MapResponse();
+		AlarmParam alarmParam = prepareParam(response);
+		if (alarmParam == null) {
+			return response;
+		}
+		// 必填项校验
+		String checkResult = CheckRequiredParam.check(entity, "id", "eventId", "eventName", "category");
+		if (!StringUtils.isEmpty(checkResult)) {
+			response.setFail(checkResult);
+			return response;
+		}
+		entity.setId(UUID.randomUUID().toString());
+		entity.setCreator(alarmParam.userId);
+		entity.setCreationTime(new Date());
+		entity.setValid(0);
+		save(entity);
+		return response;
+	}
+
+	@Override
+	public MapResponse delete(AlarmEventType entity) {
+		MapResponse response = new MapResponse();
+		String checkResult = CheckRequiredParam.check(entity, "id");
+		if (!StringUtils.isEmpty(checkResult)) {
+			response.setFail(checkResult);
+			return response;
+		}
+		entity.setValid(1);
+		updateById(entity);
+		return response;
+	}
+
+}

src/main/resources/bootstrap.yml

@@ -21,11 +21,7 @@ spring:
           data: classpath*:db/init/data.sql
           continue-on-error: true
           # MYSQL_SCHEMA建议使用默认值。如果有特殊需求，建议在环境变量中配置该值
-<<<<<<< HEAD
           url: jdbc:mysql://${persagy.mysql.ip}:${persagy.mysql.port}/${MYSQL_SCHEMA_ALARM_SERVICE:dmp_alarm}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-=======
-          url: jdbc:mysql://${persagy.mysql.ip}:${persagy.mysql.port}/${MYSQL_SCHEMA_ALARM_SERVICE:energy_alarm_service}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
->>>>>>> v2.2.0
           username: ${MYSQL_USERNAME:${spring.datasource.username}}
           password: ${MYSQL_PASSWORD:${spring.datasource.password}}
           driver-class-name: com.mysql.cj.jdbc.Driver