src/main/java/com/whyc/constant/DevAlmEnum.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/constant/LogOpEnum.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/controller/DevalarmDataHisController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/DevalarmDataService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/util/ActionUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/constant/DevAlmEnum.java
New file @@ -0,0 +1,44 @@ package com.whyc.constant; import java.util.HashMap; import java.util.Map; public enum DevAlmEnum { //控制类型 COM_FAULT(101,"通讯故障"), ; private Integer almId; private String almName; DevAlmEnum(Integer almId, String almName) { this.almId = almId; this.almName = almName; } public Integer getAlmId() { return almId; } public String getAlmName() { return almName; } public static String getValue(int code) { for (DevAlmEnum ele : values()) { if(ele.getAlmId().equals(code)) { return ele.getAlmName(); } } return null; } public static Map<Integer,String> getOpInfo() { Map<Integer,String> map=new HashMap<>(); for (DevAlmEnum logOpEnum : DevAlmEnum.values()) { map.put(logOpEnum.getAlmId(),logOpEnum.getAlmName()); } return map; } } src/main/java/com/whyc/constant/LogOpEnum.java
File was deleted src/main/java/com/whyc/controller/DevalarmDataHisController.java
@@ -36,4 +36,10 @@ public Response confiirmAlm(@RequestParam int devId){ return dataService.confiirmAlm(devId); } @ApiOperation(value = "获取所有的告警类型") @GetMapping("getAllAlmName") public Response getAllAlmName(){ return dataService.getAllAlmName(); } } src/main/java/com/whyc/service/DevalarmDataService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.whyc.constant.DevAlmEnum; import com.whyc.dto.DalmDto; import com.whyc.dto.Response; import com.whyc.mapper.DevalarmDataMapper; @@ -19,6 +20,7 @@ import java.text.ParseException; import java.util.Date; import java.util.List; import java.util.Map; @Service public class DevalarmDataService { @@ -69,4 +71,9 @@ int flag=mapper.update((DevalarmData) ActionUtil.objeNull,wrapper); return new Response().set(1,flag>0,"确认实时告警"); } //获取所有的告警类型 public Response getAllAlmName() { Map<Integer,String> map=DevAlmEnum.getOpInfo(); return new Response().setII(1,true,map,"获取所有的告警类型"); } } src/main/java/com/whyc/util/ActionUtil.java
@@ -3,7 +3,6 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonSyntaxException; import com.whyc.constant.LogOpEnum; import com.whyc.pojo.db_user.UserInf; import org.apache.commons.codec.digest.DigestUtils; import org.springframework.web.context.request.RequestContextHolder; @@ -22,8 +21,6 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; public class ActionUtil {