diff --git a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.util; + +/** + * @Description: 字典名枚举 + * @Author: zt + * @Date: 2023/4/20 10:41 + */ +public interface DictEnum { + //报警状态 + String ALARM_STATUS = "alarmStatus"; + //报警类型 + String ALARM_TYPE = "alarmType"; + + +} diff --git a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.util; + +/** + * @Description: 字典名枚举 + * @Author: zt + * @Date: 2023/4/20 10:41 + */ +public interface DictEnum { + //报警状态 + String ALARM_STATUS = "alarmStatus"; + //报警类型 + String ALARM_TYPE = "alarmType"; + + +} diff --git a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java b/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java index aabad0f..09cb7f0 100644 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java @@ -1,116 +1,116 @@ -package com.casic.missiles.util; - -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.MediaType; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.commons.CommonsMultipartFile; - -import java.io.*; - -/** - * @Description: - * @Author: wangpeng - * @Date: 2023/4/7 15:37 - */ -public class FileUtil { - private static Logger log = LoggerFactory.getLogger(FileUtil.class); - - /** - * MultipartFile转File - */ - public static File multipartFileToFile(MultipartFile multipartFile) { - File file = null; - InputStream inputStream = null; - OutputStream outputStream = null; - try { - inputStream = multipartFile.getInputStream(); - file = new File(multipartFile.getOriginalFilename()); - outputStream = new FileOutputStream(file); - //项目根目录下放置文件 - write(inputStream, outputStream); - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - if (outputStream != null) { - try { - outputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return file; - } - - public static void write(InputStream inputStream, OutputStream outputStream) { - byte[] buffer = new byte[4096]; - try { - int count = inputStream.read(buffer, 0, buffer.length); - while (count != -1) { - outputStream.write(buffer, 0, count); - count = inputStream.read(buffer, 0, buffer.length); - } - } catch (RuntimeException e) { - throw e; - } catch (Exception e) { - throw new RuntimeException(e.getMessage(), e); - } - } - - public static MultipartFile getMultipartFile(InputStream inputStream, String fileName) { - FileItem fileItem = createFileItem(inputStream, fileName); - //CommonsMultipartFile是feign对multipartFile的封装，但是要FileItem类对象 - return new CommonsMultipartFile(fileItem); - } - - /** - * FileItem类对象创建 - */ - public static FileItem createFileItem(InputStream inputStream, String fileName) { - FileItemFactory factory = new DiskFileItemFactory(16, null); - String textFieldName = "file"; - FileItem item = factory.createItem(textFieldName, MediaType.MULTIPART_FORM_DATA_VALUE, true, fileName); - int bytesRead = 0; - byte[] buffer = new byte[8192]; - OutputStream os = null; - //使用输出流输出输入流的字节 - try { - os = item.getOutputStream(); - while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) { - os.write(buffer, 0, bytesRead); - } - inputStream.close(); - } catch (IOException e) { - log.error("Stream copy exception", e); - throw new IllegalArgumentException("文件上传失败"); - } finally { - if (os != null) { - try { - os.close(); - } catch (IOException e) { - log.error("Stream close exception", e); - } - } - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - log.error("Stream close exception", e); - } - } - } - return item; - } - -} +//package com.casic.missiles.util; +// +//import org.apache.commons.fileupload.FileItem; +//import org.apache.commons.fileupload.FileItemFactory; +//import org.apache.commons.fileupload.disk.DiskFileItemFactory; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.http.MediaType; +//import org.springframework.web.multipart.MultipartFile; +//import org.springframework.web.multipart.commons.CommonsMultipartFile; +// +//import java.io.*; +// +///** +// * @Description: +// * @Author: wangpeng +// * @Date: 2023/4/7 15:37 +// */ +//public class FileUtil { +// private static Logger log = LoggerFactory.getLogger(FileUtil.class); +// +// /** +// * MultipartFile转File +// */ +// public static File multipartFileToFile(MultipartFile multipartFile) { +// File file = null; +// InputStream inputStream = null; +// OutputStream outputStream = null; +// try { +// inputStream = multipartFile.getInputStream(); +// file = new File(multipartFile.getOriginalFilename()); +// outputStream = new FileOutputStream(file); +// //项目根目录下放置文件 +// write(inputStream, outputStream); +// } catch (IOException e) { +// e.printStackTrace(); +// } finally { +// if (inputStream != null) { +// try { +// inputStream.close(); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// if (outputStream != null) { +// try { +// outputStream.close(); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// } +// return file; +// } +// +// public static void write(InputStream inputStream, OutputStream outputStream) { +// byte[] buffer = new byte[4096]; +// try { +// int count = inputStream.read(buffer, 0, buffer.length); +// while (count != -1) { +// outputStream.write(buffer, 0, count); +// count = inputStream.read(buffer, 0, buffer.length); +// } +// } catch (RuntimeException e) { +// throw e; +// } catch (Exception e) { +// throw new RuntimeException(e.getMessage(), e); +// } +// } +// +// public static MultipartFile getMultipartFile(InputStream inputStream, String fileName) { +// FileItem fileItem = createFileItem(inputStream, fileName); +// //CommonsMultipartFile是feign对multipartFile的封装，但是要FileItem类对象 +// return new CommonsMultipartFile(fileItem); +// } +// +// /** +// * FileItem类对象创建 +// */ +// public static FileItem createFileItem(InputStream inputStream, String fileName) { +// FileItemFactory factory = new DiskFileItemFactory(16, null); +// String textFieldName = "file"; +// FileItem item = factory.createItem(textFieldName, MediaType.MULTIPART_FORM_DATA_VALUE, true, fileName); +// int bytesRead = 0; +// byte[] buffer = new byte[8192]; +// OutputStream os = null; +// //使用输出流输出输入流的字节 +// try { +// os = item.getOutputStream(); +// while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) { +// os.write(buffer, 0, bytesRead); +// } +// inputStream.close(); +// } catch (IOException e) { +// log.error("Stream copy exception", e); +// throw new IllegalArgumentException("文件上传失败"); +// } finally { +// if (os != null) { +// try { +// os.close(); +// } catch (IOException e) { +// log.error("Stream close exception", e); +// } +// } +// if (inputStream != null) { +// try { +// inputStream.close(); +// } catch (IOException e) { +// log.error("Stream close exception", e); +// } +// } +// } +// return item; +// } +// +//} diff --git a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.util; + +/** + * @Description: 字典名枚举 + * @Author: zt + * @Date: 2023/4/20 10:41 + */ +public interface DictEnum { + //报警状态 + String ALARM_STATUS = "alarmStatus"; + //报警类型 + String ALARM_TYPE = "alarmType"; + + +} diff --git a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java b/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java index aabad0f..09cb7f0 100644 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java @@ -1,116 +1,116 @@ -package com.casic.missiles.util; - -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.MediaType; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.commons.CommonsMultipartFile; - -import java.io.*; - -/** - * @Description: - * @Author: wangpeng - * @Date: 2023/4/7 15:37 - */ -public class FileUtil { - private static Logger log = LoggerFactory.getLogger(FileUtil.class); - - /** - * MultipartFile转File - */ - public static File multipartFileToFile(MultipartFile multipartFile) { - File file = null; - InputStream inputStream = null; - OutputStream outputStream = null; - try { - inputStream = multipartFile.getInputStream(); - file = new File(multipartFile.getOriginalFilename()); - outputStream = new FileOutputStream(file); - //项目根目录下放置文件 - write(inputStream, outputStream); - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - if (outputStream != null) { - try { - outputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return file; - } - - public static void write(InputStream inputStream, OutputStream outputStream) { - byte[] buffer = new byte[4096]; - try { - int count = inputStream.read(buffer, 0, buffer.length); - while (count != -1) { - outputStream.write(buffer, 0, count); - count = inputStream.read(buffer, 0, buffer.length); - } - } catch (RuntimeException e) { - throw e; - } catch (Exception e) { - throw new RuntimeException(e.getMessage(), e); - } - } - - public static MultipartFile getMultipartFile(InputStream inputStream, String fileName) { - FileItem fileItem = createFileItem(inputStream, fileName); - //CommonsMultipartFile是feign对multipartFile的封装，但是要FileItem类对象 - return new CommonsMultipartFile(fileItem); - } - - /** - * FileItem类对象创建 - */ - public static FileItem createFileItem(InputStream inputStream, String fileName) { - FileItemFactory factory = new DiskFileItemFactory(16, null); - String textFieldName = "file"; - FileItem item = factory.createItem(textFieldName, MediaType.MULTIPART_FORM_DATA_VALUE, true, fileName); - int bytesRead = 0; - byte[] buffer = new byte[8192]; - OutputStream os = null; - //使用输出流输出输入流的字节 - try { - os = item.getOutputStream(); - while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) { - os.write(buffer, 0, bytesRead); - } - inputStream.close(); - } catch (IOException e) { - log.error("Stream copy exception", e); - throw new IllegalArgumentException("文件上传失败"); - } finally { - if (os != null) { - try { - os.close(); - } catch (IOException e) { - log.error("Stream close exception", e); - } - } - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - log.error("Stream close exception", e); - } - } - } - return item; - } - -} +//package com.casic.missiles.util; +// +//import org.apache.commons.fileupload.FileItem; +//import org.apache.commons.fileupload.FileItemFactory; +//import org.apache.commons.fileupload.disk.DiskFileItemFactory; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.http.MediaType; +//import org.springframework.web.multipart.MultipartFile; +//import org.springframework.web.multipart.commons.CommonsMultipartFile; +// +//import java.io.*; +// +///** +// * @Description: +// * @Author: wangpeng +// * @Date: 2023/4/7 15:37 +// */ +//public class FileUtil { +// private static Logger log = LoggerFactory.getLogger(FileUtil.class); +// +// /** +// * MultipartFile转File +// */ +// public static File multipartFileToFile(MultipartFile multipartFile) { +// File file = null; +// InputStream inputStream = null; +// OutputStream outputStream = null; +// try { +// inputStream = multipartFile.getInputStream(); +// file = new File(multipartFile.getOriginalFilename()); +// outputStream = new FileOutputStream(file); +// //项目根目录下放置文件 +// write(inputStream, outputStream); +// } catch (IOException e) { +// e.printStackTrace(); +// } finally { +// if (inputStream != null) { +// try { +// inputStream.close(); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// if (outputStream != null) { +// try { +// outputStream.close(); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// } +// return file; +// } +// +// public static void write(InputStream inputStream, OutputStream outputStream) { +// byte[] buffer = new byte[4096]; +// try { +// int count = inputStream.read(buffer, 0, buffer.length); +// while (count != -1) { +// outputStream.write(buffer, 0, count); +// count = inputStream.read(buffer, 0, buffer.length); +// } +// } catch (RuntimeException e) { +// throw e; +// } catch (Exception e) { +// throw new RuntimeException(e.getMessage(), e); +// } +// } +// +// public static MultipartFile getMultipartFile(InputStream inputStream, String fileName) { +// FileItem fileItem = createFileItem(inputStream, fileName); +// //CommonsMultipartFile是feign对multipartFile的封装，但是要FileItem类对象 +// return new CommonsMultipartFile(fileItem); +// } +// +// /** +// * FileItem类对象创建 +// */ +// public static FileItem createFileItem(InputStream inputStream, String fileName) { +// FileItemFactory factory = new DiskFileItemFactory(16, null); +// String textFieldName = "file"; +// FileItem item = factory.createItem(textFieldName, MediaType.MULTIPART_FORM_DATA_VALUE, true, fileName); +// int bytesRead = 0; +// byte[] buffer = new byte[8192]; +// OutputStream os = null; +// //使用输出流输出输入流的字节 +// try { +// os = item.getOutputStream(); +// while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) { +// os.write(buffer, 0, bytesRead); +// } +// inputStream.close(); +// } catch (IOException e) { +// log.error("Stream copy exception", e); +// throw new IllegalArgumentException("文件上传失败"); +// } finally { +// if (os != null) { +// try { +// os.close(); +// } catch (IOException e) { +// log.error("Stream close exception", e); +// } +// } +// if (inputStream != null) { +// try { +// inputStream.close(); +// } catch (IOException e) { +// log.error("Stream close exception", e); +// } +// } +// } +// return item; +// } +// +//} diff --git a/casic-data/pom.xml b/casic-data/pom.xml index 3ad2c9c..7b9d140 100644 --- a/casic-data/pom.xml +++ b/casic-data/pom.xml @@ -46,6 +46,12 @@ casic-data-es 1.0.1.alpha + + com.casic + casic-common + 2.0.0 + compile + diff --git a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.util; + +/** + * @Description: 字典名枚举 + * @Author: zt + * @Date: 2023/4/20 10:41 + */ +public interface DictEnum { + //报警状态 + String ALARM_STATUS = "alarmStatus"; + //报警类型 + String ALARM_TYPE = "alarmType"; + + +} diff --git a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java b/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java index aabad0f..09cb7f0 100644 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ b/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java @@ -1,116 +1,116 @@ -package com.casic.missiles.util; - -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.MediaType; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.commons.CommonsMultipartFile; - -import java.io.*; - -/** - * @Description: - * @Author: wangpeng - * @Date: 2023/4/7 15:37 - */ -public class FileUtil { - private static Logger log = LoggerFactory.getLogger(FileUtil.class); - - /** - * MultipartFile转File - */ - public static File multipartFileToFile(MultipartFile multipartFile) { - File file = null; - InputStream inputStream = null; - OutputStream outputStream = null; - try { - inputStream = multipartFile.getInputStream(); - file = new File(multipartFile.getOriginalFilename()); - outputStream = new FileOutputStream(file); - //项目根目录下放置文件 - write(inputStream, outputStream); - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - if (outputStream != null) { - try { - outputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return file; - } - - public static void write(InputStream inputStream, OutputStream outputStream) { - byte[] buffer = new byte[4096]; - try { - int count = inputStream.read(buffer, 0, buffer.length); - while (count != -1) { - outputStream.write(buffer, 0, count); - count = inputStream.read(buffer, 0, buffer.length); - } - } catch (RuntimeException e) { - throw e; - } catch (Exception e) { - throw new RuntimeException(e.getMessage(), e); - } - } - - public static MultipartFile getMultipartFile(InputStream inputStream, String fileName) { - FileItem fileItem = createFileItem(inputStream, fileName); - //CommonsMultipartFile是feign对multipartFile的封装，但是要FileItem类对象 - return new CommonsMultipartFile(fileItem); - } - - /** - * FileItem类对象创建 - */ - public static FileItem createFileItem(InputStream inputStream, String fileName) { - FileItemFactory factory = new DiskFileItemFactory(16, null); - String textFieldName = "file"; - FileItem item = factory.createItem(textFieldName, MediaType.MULTIPART_FORM_DATA_VALUE, true, fileName); - int bytesRead = 0; - byte[] buffer = new byte[8192]; - OutputStream os = null; - //使用输出流输出输入流的字节 - try { - os = item.getOutputStream(); - while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) { - os.write(buffer, 0, bytesRead); - } - inputStream.close(); - } catch (IOException e) { - log.error("Stream copy exception", e); - throw new IllegalArgumentException("文件上传失败"); - } finally { - if (os != null) { - try { - os.close(); - } catch (IOException e) { - log.error("Stream close exception", e); - } - } - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - log.error("Stream close exception", e); - } - } - } - return item; - } - -} +//package com.casic.missiles.util; +// +//import org.apache.commons.fileupload.FileItem; +//import org.apache.commons.fileupload.FileItemFactory; +//import org.apache.commons.fileupload.disk.DiskFileItemFactory; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.http.MediaType; +//import org.springframework.web.multipart.MultipartFile; +//import org.springframework.web.multipart.commons.CommonsMultipartFile; +// +//import java.io.*; +// +///** +// * @Description: +// * @Author: wangpeng +// * @Date: 2023/4/7 15:37 +// */ +//public class FileUtil { +// private static Logger log = LoggerFactory.getLogger(FileUtil.class); +// +// /** +// * MultipartFile转File +// */ +// public static File multipartFileToFile(MultipartFile multipartFile) { +// File file = null; +// InputStream inputStream = null; +// OutputStream outputStream = null; +// try { +// inputStream = multipartFile.getInputStream(); +// file = new File(multipartFile.getOriginalFilename()); +// outputStream = new FileOutputStream(file); +// //项目根目录下放置文件 +// write(inputStream, outputStream); +// } catch (IOException e) { +// e.printStackTrace(); +// } finally { +// if (inputStream != null) { +// try { +// inputStream.close(); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// if (outputStream != null) { +// try { +// outputStream.close(); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// } +// } +// return file; +// } +// +// public static void write(InputStream inputStream, OutputStream outputStream) { +// byte[] buffer = new byte[4096]; +// try { +// int count = inputStream.read(buffer, 0, buffer.length); +// while (count != -1) { +// outputStream.write(buffer, 0, count); +// count = inputStream.read(buffer, 0, buffer.length); +// } +// } catch (RuntimeException e) { +// throw e; +// } catch (Exception e) { +// throw new RuntimeException(e.getMessage(), e); +// } +// } +// +// public static MultipartFile getMultipartFile(InputStream inputStream, String fileName) { +// FileItem fileItem = createFileItem(inputStream, fileName); +// //CommonsMultipartFile是feign对multipartFile的封装，但是要FileItem类对象 +// return new CommonsMultipartFile(fileItem); +// } +// +// /** +// * FileItem类对象创建 +// */ +// public static FileItem createFileItem(InputStream inputStream, String fileName) { +// FileItemFactory factory = new DiskFileItemFactory(16, null); +// String textFieldName = "file"; +// FileItem item = factory.createItem(textFieldName, MediaType.MULTIPART_FORM_DATA_VALUE, true, fileName); +// int bytesRead = 0; +// byte[] buffer = new byte[8192]; +// OutputStream os = null; +// //使用输出流输出输入流的字节 +// try { +// os = item.getOutputStream(); +// while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) { +// os.write(buffer, 0, bytesRead); +// } +// inputStream.close(); +// } catch (IOException e) { +// log.error("Stream copy exception", e); +// throw new IllegalArgumentException("文件上传失败"); +// } finally { +// if (os != null) { +// try { +// os.close(); +// } catch (IOException e) { +// log.error("Stream close exception", e); +// } +// } +// if (inputStream != null) { +// try { +// inputStream.close(); +// } catch (IOException e) { +// log.error("Stream close exception", e); +// } +// } +// } +// return item; +// } +// +//} diff --git a/casic-data/pom.xml b/casic-data/pom.xml index 3ad2c9c..7b9d140 100644 --- a/casic-data/pom.xml +++ b/casic-data/pom.xml @@ -46,6 +46,12 @@ casic-data-es 1.0.1.alpha + + com.casic + casic-common + 2.0.0 + compile + diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java index b0afea1..ad6cd46 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.modular.system.dao.AlarmRecordMapper; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.util.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,10 +46,10 @@ List alarmRecordList = this.baseMapper.pageList(page, request, dataScope); alarmRecordList.forEach(alarmRecord -> { if (ObjectUtil.isNotEmpty(alarmRecord.getAlarmStatus())) { - alarmRecord.setAlarmStatusName(dictService.getDictNameByCode("alarmStatus", alarmRecord.getAlarmStatus())); + alarmRecord.setAlarmStatusName(dictService.getDictNameByCode(DictEnum.ALARM_STATUS, alarmRecord.getAlarmStatus())); } if (ObjectUtil.isNotEmpty(alarmRecord.getAlarmType())) { - alarmRecord.setAlarmTypeName(dictService.getDictNameByCode("alarmType", alarmRecord.getAlarmType())); + alarmRecord.setAlarmTypeName(dictService.getDictNameByCode(DictEnum.ALARM_TYPE, alarmRecord.getAlarmType())); } }); return alarmRecordList;