diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java new file mode 100644 index 0000000..a5eeb2f --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonitorConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java new file mode 100644 index 0000000..a5eeb2f --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonitorConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java deleted file mode 100644 index 31a5a0e..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -@Data -public class MonitorPoint { - - private Long monitorPointId; - private String monitorPointName; - private String devcode; - private String deviceIp; - private String devicePort; - private String deviceUser; - private String devicePassword; - private String location; - private String setupDate; - private String status; - private String high; - private String type; - - -} diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java new file mode 100644 index 0000000..a5eeb2f --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonitorConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java deleted file mode 100644 index 31a5a0e..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -@Data -public class MonitorPoint { - - private Long monitorPointId; - private String monitorPointName; - private String devcode; - private String deviceIp; - private String devicePort; - private String deviceUser; - private String devicePassword; - private String location; - private String setupDate; - private String status; - private String high; - private String type; - - -} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java new file mode 100644 index 0000000..eae2456 --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import lombok.Data; + +@Data +public class MonitorPointList { + private Long id; + private String monitorName; +} + diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java new file mode 100644 index 0000000..a5eeb2f --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonitorConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java deleted file mode 100644 index 31a5a0e..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -@Data -public class MonitorPoint { - - private Long monitorPointId; - private String monitorPointName; - private String devcode; - private String deviceIp; - private String devicePort; - private String deviceUser; - private String devicePassword; - private String location; - private String setupDate; - private String status; - private String high; - private String type; - - -} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java new file mode 100644 index 0000000..eae2456 --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import lombok.Data; + +@Data +public class MonitorPointList { + private Long id; + private String monitorName; +} + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java index c034969..3779cf1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java @@ -7,11 +7,6 @@ @Data public class StationPointList { - private Long stationId; + private Long id; private String stationName; - private Long deptId; - private String deptName; - private int monitorPointCount; - private List monipoiList; - } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java new file mode 100644 index 0000000..a5eeb2f --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonitorConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java deleted file mode 100644 index 31a5a0e..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -@Data -public class MonitorPoint { - - private Long monitorPointId; - private String monitorPointName; - private String devcode; - private String deviceIp; - private String devicePort; - private String deviceUser; - private String devicePassword; - private String location; - private String setupDate; - private String status; - private String high; - private String type; - - -} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java new file mode 100644 index 0000000..eae2456 --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import lombok.Data; + +@Data +public class MonitorPointList { + private Long id; + private String monitorName; +} + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java index c034969..3779cf1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java @@ -7,11 +7,6 @@ @Data public class StationPointList { - private Long stationId; + private Long id; private String stationName; - private Long deptId; - private String deptName; - private int monitorPointCount; - private List monipoiList; - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 0e5d1ae..4190653 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.annotation.DictCodeField; import lombok.Data; /** @@ -19,7 +20,7 @@ */ @Data @TableName("bus_monipoi_info") -public class BusMonipoiInfo extends Model { +public class BusMonipoiInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -47,7 +48,8 @@ * 0:外协，1：自研，2：宇视通 */ @TableField("TYPE") - private String type; +// @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String deviceType; /** * 设备编号 */ @@ -127,7 +129,14 @@ * 0：离线，1在线，报警 */ @TableField("DEVICE_STATUS") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) private String deviceStatus; + + + @TableField(exist = false) + private String deviceStatusName; + + /** * 最新的巡航线 */ @@ -162,7 +171,7 @@ ", monitorName=" + monitorName + ", stationId=" + stationId + ", location=" + location + - ", type=" + type + + ", deviceType=" + deviceType + ", deviceCode=" + deviceCode + ", deviceIp=" + deviceIp + ", devicePort=" + devicePort + diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java new file mode 100644 index 0000000..a5eeb2f --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonitorConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java deleted file mode 100644 index 31a5a0e..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -@Data -public class MonitorPoint { - - private Long monitorPointId; - private String monitorPointName; - private String devcode; - private String deviceIp; - private String devicePort; - private String deviceUser; - private String devicePassword; - private String location; - private String setupDate; - private String status; - private String high; - private String type; - - -} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java new file mode 100644 index 0000000..eae2456 --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import lombok.Data; + +@Data +public class MonitorPointList { + private Long id; + private String monitorName; +} + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java index c034969..3779cf1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java @@ -7,11 +7,6 @@ @Data public class StationPointList { - private Long stationId; + private Long id; private String stationName; - private Long deptId; - private String deptName; - private int monitorPointCount; - private List monipoiList; - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 0e5d1ae..4190653 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.annotation.DictCodeField; import lombok.Data; /** @@ -19,7 +20,7 @@ */ @Data @TableName("bus_monipoi_info") -public class BusMonipoiInfo extends Model { +public class BusMonipoiInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -47,7 +48,8 @@ * 0:外协，1：自研，2：宇视通 */ @TableField("TYPE") - private String type; +// @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String deviceType; /** * 设备编号 */ @@ -127,7 +129,14 @@ * 0：离线，1在线，报警 */ @TableField("DEVICE_STATUS") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) private String deviceStatus; + + + @TableField(exist = false) + private String deviceStatusName; + + /** * 最新的巡航线 */ @@ -162,7 +171,7 @@ ", monitorName=" + monitorName + ", stationId=" + stationId + ", location=" + location + - ", type=" + type + + ", deviceType=" + deviceType + ", deviceCode=" + deviceCode + ", deviceIp=" + deviceIp + ", devicePort=" + devicePort + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java index 420166b..f4a193a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java @@ -19,7 +19,7 @@ */ @Data @TableName("bus_obserpoi_info") -public class BusObserpoiInfo extends Model { +public class BusObserpoiInfo extends Model implements Serializable{ private static final long serialVersionUID = 1L; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java new file mode 100644 index 0000000..a5eeb2f --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonitorConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java deleted file mode 100644 index 31a5a0e..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -@Data -public class MonitorPoint { - - private Long monitorPointId; - private String monitorPointName; - private String devcode; - private String deviceIp; - private String devicePort; - private String deviceUser; - private String devicePassword; - private String location; - private String setupDate; - private String status; - private String high; - private String type; - - -} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java new file mode 100644 index 0000000..eae2456 --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import lombok.Data; + +@Data +public class MonitorPointList { + private Long id; + private String monitorName; +} + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java index c034969..3779cf1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java @@ -7,11 +7,6 @@ @Data public class StationPointList { - private Long stationId; + private Long id; private String stationName; - private Long deptId; - private String deptName; - private int monitorPointCount; - private List monipoiList; - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 0e5d1ae..4190653 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.annotation.DictCodeField; import lombok.Data; /** @@ -19,7 +20,7 @@ */ @Data @TableName("bus_monipoi_info") -public class BusMonipoiInfo extends Model { +public class BusMonipoiInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -47,7 +48,8 @@ * 0:外协，1：自研，2：宇视通 */ @TableField("TYPE") - private String type; +// @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String deviceType; /** * 设备编号 */ @@ -127,7 +129,14 @@ * 0：离线，1在线，报警 */ @TableField("DEVICE_STATUS") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) private String deviceStatus; + + + @TableField(exist = false) + private String deviceStatusName; + + /** * 最新的巡航线 */ @@ -162,7 +171,7 @@ ", monitorName=" + monitorName + ", stationId=" + stationId + ", location=" + location + - ", type=" + type + + ", deviceType=" + deviceType + ", deviceCode=" + deviceCode + ", deviceIp=" + deviceIp + ", devicePort=" + devicePort + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java index 420166b..f4a193a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java @@ -19,7 +19,7 @@ */ @Data @TableName("bus_obserpoi_info") -public class BusObserpoiInfo extends Model { +public class BusObserpoiInfo extends Model implements Serializable{ private static final long serialVersionUID = 1L; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java index 6ce7371..9d5bafd 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; +import javax.validation.constraints.NotNull; +import java.io.Serializable; import java.util.Date; /** @@ -18,7 +20,7 @@ */ @Data @TableName("bus_station_info") -public class BusStationInfo extends Model { +public class BusStationInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -26,15 +28,17 @@ * 主键id */ @TableId("ID") - private Long id; + private Long stationId; /** * 场站名 */ + @NotNull @TableField("STATION_NAME") private String stationName; /** * 所属机构 */ + @NotNull @TableField("DEPT_ID") private Long deptId; /** @@ -52,7 +56,7 @@ @Override public String toString() { return "BusStationInfo{" + - "id=" + id + + "stationId=" + stationId + ", stationName=" + stationName + ", deptId=" + deptId + ", valid=" + valid + diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java new file mode 100644 index 0000000..a5eeb2f --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonitorConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java deleted file mode 100644 index 31a5a0e..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -@Data -public class MonitorPoint { - - private Long monitorPointId; - private String monitorPointName; - private String devcode; - private String deviceIp; - private String devicePort; - private String deviceUser; - private String devicePassword; - private String location; - private String setupDate; - private String status; - private String high; - private String type; - - -} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java new file mode 100644 index 0000000..eae2456 --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import lombok.Data; + +@Data +public class MonitorPointList { + private Long id; + private String monitorName; +} + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java index c034969..3779cf1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java @@ -7,11 +7,6 @@ @Data public class StationPointList { - private Long stationId; + private Long id; private String stationName; - private Long deptId; - private String deptName; - private int monitorPointCount; - private List monipoiList; - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 0e5d1ae..4190653 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.annotation.DictCodeField; import lombok.Data; /** @@ -19,7 +20,7 @@ */ @Data @TableName("bus_monipoi_info") -public class BusMonipoiInfo extends Model { +public class BusMonipoiInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -47,7 +48,8 @@ * 0:外协，1：自研，2：宇视通 */ @TableField("TYPE") - private String type; +// @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String deviceType; /** * 设备编号 */ @@ -127,7 +129,14 @@ * 0：离线，1在线，报警 */ @TableField("DEVICE_STATUS") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) private String deviceStatus; + + + @TableField(exist = false) + private String deviceStatusName; + + /** * 最新的巡航线 */ @@ -162,7 +171,7 @@ ", monitorName=" + monitorName + ", stationId=" + stationId + ", location=" + location + - ", type=" + type + + ", deviceType=" + deviceType + ", deviceCode=" + deviceCode + ", deviceIp=" + deviceIp + ", devicePort=" + devicePort + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java index 420166b..f4a193a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java @@ -19,7 +19,7 @@ */ @Data @TableName("bus_obserpoi_info") -public class BusObserpoiInfo extends Model { +public class BusObserpoiInfo extends Model implements Serializable{ private static final long serialVersionUID = 1L; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java index 6ce7371..9d5bafd 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; +import javax.validation.constraints.NotNull; +import java.io.Serializable; import java.util.Date; /** @@ -18,7 +20,7 @@ */ @Data @TableName("bus_station_info") -public class BusStationInfo extends Model { +public class BusStationInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -26,15 +28,17 @@ * 主键id */ @TableId("ID") - private Long id; + private Long stationId; /** * 场站名 */ + @NotNull @TableField("STATION_NAME") private String stationName; /** * 所属机构 */ + @NotNull @TableField("DEPT_ID") private Long deptId; /** @@ -52,7 +56,7 @@ @Override public String toString() { return "BusStationInfo{" + - "id=" + id + + "stationId=" + stationId + ", stationName=" + stationName + ", deptId=" + deptId + ", valid=" + valid + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index b880527..5d95d88 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -1,8 +1,14 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 监测点/设备信息 服务类 @@ -13,4 +19,18 @@ */ public interface IBusMonipoiInfoService extends IService { + List monitorList(Long stationId); + + Page monitorListPage(Page page, Long stationId, String keyword); + + ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo); + + ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo); + + ResponseData deleteMonitor(Long id); + + ResponseData monitorDetail(Long id); + + ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO); + } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java new file mode 100644 index 0000000..a5eeb2f --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonitorConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java deleted file mode 100644 index 31a5a0e..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -@Data -public class MonitorPoint { - - private Long monitorPointId; - private String monitorPointName; - private String devcode; - private String deviceIp; - private String devicePort; - private String deviceUser; - private String devicePassword; - private String location; - private String setupDate; - private String status; - private String high; - private String type; - - -} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java new file mode 100644 index 0000000..eae2456 --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import lombok.Data; + +@Data +public class MonitorPointList { + private Long id; + private String monitorName; +} + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java index c034969..3779cf1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java @@ -7,11 +7,6 @@ @Data public class StationPointList { - private Long stationId; + private Long id; private String stationName; - private Long deptId; - private String deptName; - private int monitorPointCount; - private List monipoiList; - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 0e5d1ae..4190653 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.annotation.DictCodeField; import lombok.Data; /** @@ -19,7 +20,7 @@ */ @Data @TableName("bus_monipoi_info") -public class BusMonipoiInfo extends Model { +public class BusMonipoiInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -47,7 +48,8 @@ * 0:外协，1：自研，2：宇视通 */ @TableField("TYPE") - private String type; +// @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String deviceType; /** * 设备编号 */ @@ -127,7 +129,14 @@ * 0：离线，1在线，报警 */ @TableField("DEVICE_STATUS") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) private String deviceStatus; + + + @TableField(exist = false) + private String deviceStatusName; + + /** * 最新的巡航线 */ @@ -162,7 +171,7 @@ ", monitorName=" + monitorName + ", stationId=" + stationId + ", location=" + location + - ", type=" + type + + ", deviceType=" + deviceType + ", deviceCode=" + deviceCode + ", deviceIp=" + deviceIp + ", devicePort=" + devicePort + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java index 420166b..f4a193a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java @@ -19,7 +19,7 @@ */ @Data @TableName("bus_obserpoi_info") -public class BusObserpoiInfo extends Model { +public class BusObserpoiInfo extends Model implements Serializable{ private static final long serialVersionUID = 1L; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java index 6ce7371..9d5bafd 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; +import javax.validation.constraints.NotNull; +import java.io.Serializable; import java.util.Date; /** @@ -18,7 +20,7 @@ */ @Data @TableName("bus_station_info") -public class BusStationInfo extends Model { +public class BusStationInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -26,15 +28,17 @@ * 主键id */ @TableId("ID") - private Long id; + private Long stationId; /** * 场站名 */ + @NotNull @TableField("STATION_NAME") private String stationName; /** * 所属机构 */ + @NotNull @TableField("DEPT_ID") private Long deptId; /** @@ -52,7 +56,7 @@ @Override public String toString() { return "BusStationInfo{" + - "id=" + id + + "stationId=" + stationId + ", stationName=" + stationName + ", deptId=" + deptId + ", valid=" + valid + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index b880527..5d95d88 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -1,8 +1,14 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 监测点/设备信息 服务类 @@ -13,4 +19,18 @@ */ public interface IBusMonipoiInfoService extends IService { + List monitorList(Long stationId); + + Page monitorListPage(Page page, Long stationId, String keyword); + + ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo); + + ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo); + + ResponseData deleteMonitor(Long id); + + ResponseData monitorDetail(Long id); + + ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java index d4b17ec..b14a1b3 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java @@ -1,8 +1,14 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; import com.baomidou.mybatisplus.extension.service.IService; +import javax.xml.ws.Response; +import java.util.List; + /** *

* 场站信息表 服务类 @@ -13,4 +19,14 @@ */ public interface IBusStationInfoService extends IService { + List stationList(); + + Page stationListPage(Page page, String keyword); + + ResponseData addStation(BusStationInfo busStationInfo); + + ResponseData updateStation(BusStationInfo busStationInfo); + + ResponseData deleteStation(Long busStationInfoId); + } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java new file mode 100644 index 0000000..a5eeb2f --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonitorConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java deleted file mode 100644 index 31a5a0e..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -@Data -public class MonitorPoint { - - private Long monitorPointId; - private String monitorPointName; - private String devcode; - private String deviceIp; - private String devicePort; - private String deviceUser; - private String devicePassword; - private String location; - private String setupDate; - private String status; - private String high; - private String type; - - -} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java new file mode 100644 index 0000000..eae2456 --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import lombok.Data; + +@Data +public class MonitorPointList { + private Long id; + private String monitorName; +} + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java index c034969..3779cf1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java @@ -7,11 +7,6 @@ @Data public class StationPointList { - private Long stationId; + private Long id; private String stationName; - private Long deptId; - private String deptName; - private int monitorPointCount; - private List monipoiList; - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 0e5d1ae..4190653 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.annotation.DictCodeField; import lombok.Data; /** @@ -19,7 +20,7 @@ */ @Data @TableName("bus_monipoi_info") -public class BusMonipoiInfo extends Model { +public class BusMonipoiInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -47,7 +48,8 @@ * 0:外协，1：自研，2：宇视通 */ @TableField("TYPE") - private String type; +// @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String deviceType; /** * 设备编号 */ @@ -127,7 +129,14 @@ * 0：离线，1在线，报警 */ @TableField("DEVICE_STATUS") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) private String deviceStatus; + + + @TableField(exist = false) + private String deviceStatusName; + + /** * 最新的巡航线 */ @@ -162,7 +171,7 @@ ", monitorName=" + monitorName + ", stationId=" + stationId + ", location=" + location + - ", type=" + type + + ", deviceType=" + deviceType + ", deviceCode=" + deviceCode + ", deviceIp=" + deviceIp + ", devicePort=" + devicePort + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java index 420166b..f4a193a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java @@ -19,7 +19,7 @@ */ @Data @TableName("bus_obserpoi_info") -public class BusObserpoiInfo extends Model { +public class BusObserpoiInfo extends Model implements Serializable{ private static final long serialVersionUID = 1L; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java index 6ce7371..9d5bafd 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; +import javax.validation.constraints.NotNull; +import java.io.Serializable; import java.util.Date; /** @@ -18,7 +20,7 @@ */ @Data @TableName("bus_station_info") -public class BusStationInfo extends Model { +public class BusStationInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -26,15 +28,17 @@ * 主键id */ @TableId("ID") - private Long id; + private Long stationId; /** * 场站名 */ + @NotNull @TableField("STATION_NAME") private String stationName; /** * 所属机构 */ + @NotNull @TableField("DEPT_ID") private Long deptId; /** @@ -52,7 +56,7 @@ @Override public String toString() { return "BusStationInfo{" + - "id=" + id + + "stationId=" + stationId + ", stationName=" + stationName + ", deptId=" + deptId + ", valid=" + valid + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index b880527..5d95d88 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -1,8 +1,14 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 监测点/设备信息 服务类 @@ -13,4 +19,18 @@ */ public interface IBusMonipoiInfoService extends IService { + List monitorList(Long stationId); + + Page monitorListPage(Page page, Long stationId, String keyword); + + ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo); + + ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo); + + ResponseData deleteMonitor(Long id); + + ResponseData monitorDetail(Long id); + + ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java index d4b17ec..b14a1b3 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java @@ -1,8 +1,14 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; import com.baomidou.mybatisplus.extension.service.IService; +import javax.xml.ws.Response; +import java.util.List; + /** *

* 场站信息表 服务类 @@ -13,4 +19,14 @@ */ public interface IBusStationInfoService extends IService { + List stationList(); + + Page stationListPage(Page page, String keyword); + + ResponseData addStation(BusStationInfo busStationInfo); + + ResponseData updateStation(BusStationInfo busStationInfo); + + ResponseData deleteStation(Long busStationInfoId); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java index 8280370..d9451a9 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java @@ -1,21 +1,93 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.dao.BusMonipoiInfoMapper; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 监测点/设备信息 服务实现类 *

* - * @author stylefeng123 + * @author cz * @since 2023-04-18 */ @Service +@AllArgsConstructor public class BusMonipoiInfoServiceImpl extends ServiceImpl implements IBusMonipoiInfoService { + private final AbstractPermissionContext permissionContext; + + @Override + public List monitorList(Long stationId) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("DEPT_ID"); + List monitorPointLists = this.baseMapper.monitorList(dataScope, stationId); + return monitorPointLists; + } + + @Override + public Page monitorListPage(Page page, Long stationId, String keyword) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("DEPT_ID"); + List monitorPointLists = this.baseMapper.monitorListPage(dataScope, stationId, keyword); + page.setRecords(monitorPointLists); + return page; + } + + @Override + public ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo) { + int addFlag = this.baseMapper.insert(busMonipoiInfo); + if (addFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo) { + int updateFlag = this.baseMapper.updateById(busMonipoiInfo); + if (updateFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData deleteMonitor(Long id) { + int deleteFlag = this.baseMapper.deleteById(id); + if (deleteFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData monitorDetail(Long id) { + BusMonipoiInfo busMonipoiInfo = this.baseMapper.selectById(id); + return ResponseData.success(busMonipoiInfo); + } + + @Override + public ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO) { + return null; + } + } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java new file mode 100644 index 0000000..a5eeb2f --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonitorConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java deleted file mode 100644 index 31a5a0e..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -@Data -public class MonitorPoint { - - private Long monitorPointId; - private String monitorPointName; - private String devcode; - private String deviceIp; - private String devicePort; - private String deviceUser; - private String devicePassword; - private String location; - private String setupDate; - private String status; - private String high; - private String type; - - -} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java new file mode 100644 index 0000000..eae2456 --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import lombok.Data; + +@Data +public class MonitorPointList { + private Long id; + private String monitorName; +} + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java index c034969..3779cf1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java @@ -7,11 +7,6 @@ @Data public class StationPointList { - private Long stationId; + private Long id; private String stationName; - private Long deptId; - private String deptName; - private int monitorPointCount; - private List monipoiList; - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 0e5d1ae..4190653 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.annotation.DictCodeField; import lombok.Data; /** @@ -19,7 +20,7 @@ */ @Data @TableName("bus_monipoi_info") -public class BusMonipoiInfo extends Model { +public class BusMonipoiInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -47,7 +48,8 @@ * 0:外协，1：自研，2：宇视通 */ @TableField("TYPE") - private String type; +// @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String deviceType; /** * 设备编号 */ @@ -127,7 +129,14 @@ * 0：离线，1在线，报警 */ @TableField("DEVICE_STATUS") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) private String deviceStatus; + + + @TableField(exist = false) + private String deviceStatusName; + + /** * 最新的巡航线 */ @@ -162,7 +171,7 @@ ", monitorName=" + monitorName + ", stationId=" + stationId + ", location=" + location + - ", type=" + type + + ", deviceType=" + deviceType + ", deviceCode=" + deviceCode + ", deviceIp=" + deviceIp + ", devicePort=" + devicePort + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java index 420166b..f4a193a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java @@ -19,7 +19,7 @@ */ @Data @TableName("bus_obserpoi_info") -public class BusObserpoiInfo extends Model { +public class BusObserpoiInfo extends Model implements Serializable{ private static final long serialVersionUID = 1L; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java index 6ce7371..9d5bafd 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; +import javax.validation.constraints.NotNull; +import java.io.Serializable; import java.util.Date; /** @@ -18,7 +20,7 @@ */ @Data @TableName("bus_station_info") -public class BusStationInfo extends Model { +public class BusStationInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -26,15 +28,17 @@ * 主键id */ @TableId("ID") - private Long id; + private Long stationId; /** * 场站名 */ + @NotNull @TableField("STATION_NAME") private String stationName; /** * 所属机构 */ + @NotNull @TableField("DEPT_ID") private Long deptId; /** @@ -52,7 +56,7 @@ @Override public String toString() { return "BusStationInfo{" + - "id=" + id + + "stationId=" + stationId + ", stationName=" + stationName + ", deptId=" + deptId + ", valid=" + valid + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index b880527..5d95d88 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -1,8 +1,14 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 监测点/设备信息 服务类 @@ -13,4 +19,18 @@ */ public interface IBusMonipoiInfoService extends IService { + List monitorList(Long stationId); + + Page monitorListPage(Page page, Long stationId, String keyword); + + ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo); + + ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo); + + ResponseData deleteMonitor(Long id); + + ResponseData monitorDetail(Long id); + + ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java index d4b17ec..b14a1b3 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java @@ -1,8 +1,14 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; import com.baomidou.mybatisplus.extension.service.IService; +import javax.xml.ws.Response; +import java.util.List; + /** *

* 场站信息表 服务类 @@ -13,4 +19,14 @@ */ public interface IBusStationInfoService extends IService { + List stationList(); + + Page stationListPage(Page page, String keyword); + + ResponseData addStation(BusStationInfo busStationInfo); + + ResponseData updateStation(BusStationInfo busStationInfo); + + ResponseData deleteStation(Long busStationInfoId); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java index 8280370..d9451a9 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java @@ -1,21 +1,93 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.dao.BusMonipoiInfoMapper; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 监测点/设备信息 服务实现类 *

* - * @author stylefeng123 + * @author cz * @since 2023-04-18 */ @Service +@AllArgsConstructor public class BusMonipoiInfoServiceImpl extends ServiceImpl implements IBusMonipoiInfoService { + private final AbstractPermissionContext permissionContext; + + @Override + public List monitorList(Long stationId) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("DEPT_ID"); + List monitorPointLists = this.baseMapper.monitorList(dataScope, stationId); + return monitorPointLists; + } + + @Override + public Page monitorListPage(Page page, Long stationId, String keyword) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("DEPT_ID"); + List monitorPointLists = this.baseMapper.monitorListPage(dataScope, stationId, keyword); + page.setRecords(monitorPointLists); + return page; + } + + @Override + public ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo) { + int addFlag = this.baseMapper.insert(busMonipoiInfo); + if (addFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo) { + int updateFlag = this.baseMapper.updateById(busMonipoiInfo); + if (updateFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData deleteMonitor(Long id) { + int deleteFlag = this.baseMapper.deleteById(id); + if (deleteFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData monitorDetail(Long id) { + BusMonipoiInfo busMonipoiInfo = this.baseMapper.selectById(id); + return ResponseData.success(busMonipoiInfo); + } + + @Override + public ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO) { + return null; + } + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java index 0035346..877bfd9 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java @@ -17,4 +17,5 @@ @Service public class BusObserpoiInfoServiceImpl extends ServiceImpl implements IBusObserpoiInfoService { + } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java new file mode 100644 index 0000000..a5eeb2f --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonitorConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java deleted file mode 100644 index 31a5a0e..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -@Data -public class MonitorPoint { - - private Long monitorPointId; - private String monitorPointName; - private String devcode; - private String deviceIp; - private String devicePort; - private String deviceUser; - private String devicePassword; - private String location; - private String setupDate; - private String status; - private String high; - private String type; - - -} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java new file mode 100644 index 0000000..eae2456 --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import lombok.Data; + +@Data +public class MonitorPointList { + private Long id; + private String monitorName; +} + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java index c034969..3779cf1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java @@ -7,11 +7,6 @@ @Data public class StationPointList { - private Long stationId; + private Long id; private String stationName; - private Long deptId; - private String deptName; - private int monitorPointCount; - private List monipoiList; - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 0e5d1ae..4190653 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.annotation.DictCodeField; import lombok.Data; /** @@ -19,7 +20,7 @@ */ @Data @TableName("bus_monipoi_info") -public class BusMonipoiInfo extends Model { +public class BusMonipoiInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -47,7 +48,8 @@ * 0:外协，1：自研，2：宇视通 */ @TableField("TYPE") - private String type; +// @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String deviceType; /** * 设备编号 */ @@ -127,7 +129,14 @@ * 0：离线，1在线，报警 */ @TableField("DEVICE_STATUS") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) private String deviceStatus; + + + @TableField(exist = false) + private String deviceStatusName; + + /** * 最新的巡航线 */ @@ -162,7 +171,7 @@ ", monitorName=" + monitorName + ", stationId=" + stationId + ", location=" + location + - ", type=" + type + + ", deviceType=" + deviceType + ", deviceCode=" + deviceCode + ", deviceIp=" + deviceIp + ", devicePort=" + devicePort + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java index 420166b..f4a193a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java @@ -19,7 +19,7 @@ */ @Data @TableName("bus_obserpoi_info") -public class BusObserpoiInfo extends Model { +public class BusObserpoiInfo extends Model implements Serializable{ private static final long serialVersionUID = 1L; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java index 6ce7371..9d5bafd 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; +import javax.validation.constraints.NotNull; +import java.io.Serializable; import java.util.Date; /** @@ -18,7 +20,7 @@ */ @Data @TableName("bus_station_info") -public class BusStationInfo extends Model { +public class BusStationInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -26,15 +28,17 @@ * 主键id */ @TableId("ID") - private Long id; + private Long stationId; /** * 场站名 */ + @NotNull @TableField("STATION_NAME") private String stationName; /** * 所属机构 */ + @NotNull @TableField("DEPT_ID") private Long deptId; /** @@ -52,7 +56,7 @@ @Override public String toString() { return "BusStationInfo{" + - "id=" + id + + "stationId=" + stationId + ", stationName=" + stationName + ", deptId=" + deptId + ", valid=" + valid + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index b880527..5d95d88 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -1,8 +1,14 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 监测点/设备信息 服务类 @@ -13,4 +19,18 @@ */ public interface IBusMonipoiInfoService extends IService { + List monitorList(Long stationId); + + Page monitorListPage(Page page, Long stationId, String keyword); + + ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo); + + ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo); + + ResponseData deleteMonitor(Long id); + + ResponseData monitorDetail(Long id); + + ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java index d4b17ec..b14a1b3 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java @@ -1,8 +1,14 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; import com.baomidou.mybatisplus.extension.service.IService; +import javax.xml.ws.Response; +import java.util.List; + /** *

* 场站信息表 服务类 @@ -13,4 +19,14 @@ */ public interface IBusStationInfoService extends IService { + List stationList(); + + Page stationListPage(Page page, String keyword); + + ResponseData addStation(BusStationInfo busStationInfo); + + ResponseData updateStation(BusStationInfo busStationInfo); + + ResponseData deleteStation(Long busStationInfoId); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java index 8280370..d9451a9 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java @@ -1,21 +1,93 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.dao.BusMonipoiInfoMapper; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 监测点/设备信息 服务实现类 *

* - * @author stylefeng123 + * @author cz * @since 2023-04-18 */ @Service +@AllArgsConstructor public class BusMonipoiInfoServiceImpl extends ServiceImpl implements IBusMonipoiInfoService { + private final AbstractPermissionContext permissionContext; + + @Override + public List monitorList(Long stationId) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("DEPT_ID"); + List monitorPointLists = this.baseMapper.monitorList(dataScope, stationId); + return monitorPointLists; + } + + @Override + public Page monitorListPage(Page page, Long stationId, String keyword) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("DEPT_ID"); + List monitorPointLists = this.baseMapper.monitorListPage(dataScope, stationId, keyword); + page.setRecords(monitorPointLists); + return page; + } + + @Override + public ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo) { + int addFlag = this.baseMapper.insert(busMonipoiInfo); + if (addFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo) { + int updateFlag = this.baseMapper.updateById(busMonipoiInfo); + if (updateFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData deleteMonitor(Long id) { + int deleteFlag = this.baseMapper.deleteById(id); + if (deleteFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData monitorDetail(Long id) { + BusMonipoiInfo busMonipoiInfo = this.baseMapper.selectById(id); + return ResponseData.success(busMonipoiInfo); + } + + @Override + public ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO) { + return null; + } + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java index 0035346..877bfd9 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java @@ -17,4 +17,5 @@ @Service public class BusObserpoiInfoServiceImpl extends ServiceImpl implements IBusObserpoiInfoService { + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java index d8277fd..8cc132e 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java @@ -1,20 +1,79 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; import com.casic.missiles.modular.system.dao.BusStationInfoMapper; import com.casic.missiles.modular.system.service.IBusStationInfoService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.xml.ws.Response; +import java.util.List; + /** *

* 场站信息表 服务实现类 *

* - * @author stylefeng123 + * @author cz * @since 2023-04-18 */ @Service +@AllArgsConstructor public class BusStationInfoServiceImpl extends ServiceImpl implements IBusStationInfoService { + private final AbstractPermissionContext permissionContext; + + @Override + public List stationList() { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("DEPT_ID"); + List stationPointLists = this.baseMapper.stationList(dataScope); + return stationPointLists; + } + + @Override + public Page stationListPage(Page page, String keyword) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("DEPT_ID"); + List busStationInfoList = this.baseMapper.stationListPage(page, dataScope, keyword); + page.setRecords(busStationInfoList); + return page; + } + + @Override + public ResponseData addStation(BusStationInfo busStationInfo) { + int addFlag = this.baseMapper.insert(busStationInfo); + if (addFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData updateStation(BusStationInfo busStationInfo) { + int updateFlag = this.baseMapper.updateById(busStationInfo); + if (updateFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData deleteStation(Long busStationInfoId) { + int deleteFlag = this.baseMapper.deleteById(busStationInfoId); + if (deleteFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java new file mode 100644 index 0000000..9555a9c --- /dev/null +++ b/casic-common/src/main/java/com/casic/missiles/enums/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 deleted file mode 100644 index 9555a9c..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/DictEnum.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 09cb7f0..0000000 --- a/casic-common/src/main/java/com/casic/missiles/util/FileUtil.java +++ /dev/null @@ -1,116 +0,0 @@ -//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/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 6c63111..bdb5d2d 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 @@ -7,7 +7,6 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; -import com.casic.missiles.dto.IdDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmRecordResponse; @@ -16,7 +15,7 @@ import com.casic.missiles.modular.system.model.User; import com.casic.missiles.modular.system.service.IAlarmRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.util.DictEnum; +import com.casic.missiles.enums.DictEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/casic-station/pom.xml b/casic-station/pom.xml index a9d1a33..c15d97d 100644 --- a/casic-station/pom.xml +++ b/casic-station/pom.xml @@ -25,6 +25,11 @@ com.casic + casic-common + ${pro.version} + + + com.casic casic-admin-support ${admin.version} provided diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index e0ea215..826cd9d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -1,105 +1,99 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.casic.missiles.core.page.PageFactory; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import com.stylefeng.guns.core.result.ResultData; -//import com.stylefeng.guns.modular.system.model.BusMonipoiInfo; -//import com.stylefeng.guns.modular.system.service.IBusMonipoiInfoService; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RequestParam; -//import org.springframework.web.bind.annotation.ResponseBody; -// -//import java.util.List; -// -///** -// * 监测点/设备信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:43:43 -// */ -//@Controller -//@RequestMapping("/busMonipoiInfo") -//public class BusMonipoiInfoController extends ExportController { -// -// -// @Autowired -// private IBusMonipoiInfoService busMonipoiInfoService; -// -// -// /** -// * 获取监测点/设备信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busMonipoiInfoService.selectList(null); -// } -// -// /** -// * 获取监测点/设备信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busMonipoiInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增监测点/设备信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.insert(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除监测点/设备信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busMonipoiInfoId) { -// busMonipoiInfoService.deleteById(busMonipoiInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busMonipoiInfoIds") List busMonipoiInfoIds) { -// busMonipoiInfoService.deleteBatchIds(busMonipoiInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改监测点/设备信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusMonipoiInfo busMonipoiInfo) { -// busMonipoiInfoService.updateById(busMonipoiInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 监测点/设备信息详情 -// */ -// @RequestMapping(value = "/detail/{busMonipoiInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busMonipoiInfoId") String busMonipoiInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busMonipoiInfoService.selectById(busMonipoiInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 监测点/设备信息控制器 + * + * @author dev + * @Date 2023-04-18 15:43:43 + */ +@RestController +@RequestMapping("/monitor") +public class BusMonipoiInfoController extends ExportController { + + + @Autowired + private IBusMonipoiInfoService busMonipoiInfoService; + + /** + * 获取监测点/设备信息列表 + */ + @RequestMapping(value = "/list") + public Object list(Long stationId) { + return ResponseData.success(busMonipoiInfoService.monitorList(stationId)); + } + + /** + * 获取监测点/设备信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(Long stationId,String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); + } + + /** + * 新增监测点/设备信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.addMonitor(busMonipoiInfo); + } + + /** + * 修改监测点/设备信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusMonipoiInfo busMonipoiInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.updateMonitor(busMonipoiInfo); + } + + /** + * 删除监测点/设备信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long busMonipoiInfoId) { + return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/info") + public Object detail(Long busMonipoiInfoId) { + return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + } + + /** + * 监测点/设备信息详情 + */ + @RequestMapping(value = "/config") + public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busMonipoiInfoService.configMonitor(monitorConfigDTO); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index 33c8448..bb9efba 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -1,105 +1,80 @@ -//package com.casic.missiles.modular.system.controller; -// -//import com.casic.missiles.core.base.controller.ExportController; -//import com.stylefeng.guns.core.result.ResultData; -//import org.springframework.stereotype.Controller; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.ResponseBody; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.beans.factory.annotation.Autowired; -//import com.casic.missiles.core.page.PageFactory; -//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import java.util.List; -//import com.stylefeng.guns.core.common.constant.factory.PageFactory; -//import org.springframework.web.bind.annotation.RequestParam; -//import com.stylefeng.guns.modular.system.model.BusStationInfo; -//import com.stylefeng.guns.modular.system.service.IBusStationInfoService; -// -///** -// * 场站信息控制器 -// * -// * @author dev -// * @Date 2023-04-18 15:46:00 -// */ -//@Controller -//@RequestMapping("/busStationInfo") -//public class BusStationInfoController extends ExportController { -// -// -// @Autowired -// private IBusStationInfoService busStationInfoService; -// -// -// /** -// * 获取场站信息列表 -// */ -// @RequestMapping(value = "/list") -// @ResponseBody -// public Object list(String condition) { -// return busStationInfoService.selectList(null); -// } -// -// /** -// * 获取场站信息分页列表 -// */ -// @RequestMapping(value = "/listPage") -// @ResponseBody -// public Object listPage(String condition) { -// Page page = new PageFactory().defaultPage(); -// EntityWrapper query = new EntityWrapper<>(); -// page = busStationInfoService.selectPage(page,query); -// return super.packForBT(page); -// } -// /** -// * 新增场站信息 -// */ -// @RequestMapping(value = "/add") -// @ResponseBody -// public Object add(BusStationInfo busStationInfo) { -// busStationInfoService.insert(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 删除场站信息 -// */ -// @RequestMapping(value = "/delete") -// @ResponseBody -// public Object delete(@RequestParam String busStationInfoId) { -// busStationInfoService.deleteById(busStationInfoId); -// return SUCCESS_TIP; -// } -// -// /** -// * 批量删除 -// */ -// @RequestMapping(value = "/batchDelete") -// @ResponseBody -// public Object delete(@RequestParam("busStationInfoIds") List busStationInfoIds) { -// busStationInfoService.deleteBatchIds(busStationInfoIds); -// return SUCCESS_TIP; -// } -// -// /** -// * 修改场站信息 -// */ -// @RequestMapping(value = "/update") -// @ResponseBody -// public Object update(BusStationInfo busStationInfo) { -// busStationInfoService.updateById(busStationInfo); -// return SUCCESS_TIP; -// } -// -// /** -// * 场站信息详情 -// */ -// @RequestMapping(value = "/detail/{busStationInfoId}") -// @ResponseBody -// public Object detail(@PathVariable("busStationInfoId") String busStationInfoId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(busStationInfoService.selectById(busStationInfoId)); -// return resultData; -// } -//} +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusStationInfo; +import com.casic.missiles.modular.system.service.IBusStationInfoService; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.validation.Valid; + +/** + * 场站信息控制器 + * + * @author dev + * @Date 2023-04-18 15:46:00 + */ +@RestController +@RequestMapping("/busStationInfo") +public class BusStationInfoController extends ExportController { + + + @Autowired + private IBusStationInfoService busStationInfoService; + + + /** + * 获取场站信息列表 + */ + @RequestMapping(value = "/list") + public Object list() { + return ResponseData.success(busStationInfoService.stationList()); + } + + /** + * 获取场站信息分页列表 + */ + @RequestMapping(value = "/listPage") + public Object listPage(String keyword) { + Page page = PageFactory.defaultPage(); + return ResponseData.success(super.packForBT(busStationInfoService.stationListPage(page, keyword))); + } + /** + * 新增场站信息 + */ + @RequestMapping(value = "/add") + public Object add(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.addStation(busStationInfo); + } + + /** + * 修改场站信息 + */ + @RequestMapping(value = "/update") + public Object update(@RequestBody @Valid BusStationInfo busStationInfo, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return busStationInfoService.updateStation(busStationInfo); + } + + /** + * 删除场站信息 + */ + @RequestMapping(value = "/delete") + public Object delete(@RequestParam Long stationId) { + return busStationInfoService.deleteStation(stationId); + } + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 3738060..8e5f709 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -1,7 +1,12 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,8 @@ */ public interface BusMonipoiInfoMapper extends BaseMapper { + List monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId); + + List monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java index 80e93f9..34ba2ec 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusStationInfoMapper.java @@ -1,7 +1,13 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +19,10 @@ */ public interface BusStationInfoMapper extends BaseMapper { + List stationList(@Param("scope") DataScope dataScope); + + + List stationListPage(@Param("page") Page page, @Param("dataScope") DataScope dataScope, + @Param("keyword")String keyword); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index e45b9fe..fe4cc1d 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -4,32 +4,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,4 +37,26 @@ ID AS id, MONITOR_NAME AS monitorName, STATION_ID AS stationId, LOCATION AS location, TYPE AS type, DEVICE_CODE AS deviceCode, DEVICE_IP AS deviceIp, DEVICE_PORT AS devicePort, DEVICE_USER AS deviceUser, DEVICE_PASSWORD AS devicePassword, NVR_IP AS nvrIp, NVR_PORT AS nvrPort, NVR_CHANNEL AS nvrChannel, NVR_USER AS nvrUser, NVR_PASSWORD AS nvrPassword, DOOR_IP AS doorIp, DOOR_SN AS doorSn, LONGITUDE AS longitude, LATITUDE AS latitude, DESCRIPTION AS description, DEVICE_STATUS AS deviceStatus, LINE_NUM AS lineNum, PRESET_INTERVAL AS presetInterval, VALID AS valid, SETUP_DATE AS setupDate, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml index 78832db..4210e9a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusStationInfoMapper.xml @@ -4,16 +4,32 @@ - - - - - + + + + + - ID AS id, STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + ID AS "stationId", STATION_NAME AS stationName, DEPT_ID AS deptId, VALID AS valid, TS AS ts + + + + + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java new file mode 100644 index 0000000..a5eeb2f --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class MonitorConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java deleted file mode 100644 index 31a5a0e..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPoint.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -@Data -public class MonitorPoint { - - private Long monitorPointId; - private String monitorPointName; - private String devcode; - private String deviceIp; - private String devicePort; - private String deviceUser; - private String devicePassword; - private String location; - private String setupDate; - private String status; - private String high; - private String type; - - -} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java new file mode 100644 index 0000000..eae2456 --- /dev/null +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorPointList.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import lombok.Data; + +@Data +public class MonitorPointList { + private Long id; + private String monitorName; +} + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java index c034969..3779cf1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/StationPointList.java @@ -7,11 +7,6 @@ @Data public class StationPointList { - private Long stationId; + private Long id; private String stationName; - private Long deptId; - private String deptName; - private int monitorPointCount; - private List monipoiList; - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 0e5d1ae..4190653 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.casic.missiles.annotation.DictCodeField; import lombok.Data; /** @@ -19,7 +20,7 @@ */ @Data @TableName("bus_monipoi_info") -public class BusMonipoiInfo extends Model { +public class BusMonipoiInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -47,7 +48,8 @@ * 0:外协，1：自研，2：宇视通 */ @TableField("TYPE") - private String type; +// @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + private String deviceType; /** * 设备编号 */ @@ -127,7 +129,14 @@ * 0：离线，1在线，报警 */ @TableField("DEVICE_STATUS") + @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) private String deviceStatus; + + + @TableField(exist = false) + private String deviceStatusName; + + /** * 最新的巡航线 */ @@ -162,7 +171,7 @@ ", monitorName=" + monitorName + ", stationId=" + stationId + ", location=" + location + - ", type=" + type + + ", deviceType=" + deviceType + ", deviceCode=" + deviceCode + ", deviceIp=" + deviceIp + ", devicePort=" + devicePort + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java index 420166b..f4a193a 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusObserpoiInfo.java @@ -19,7 +19,7 @@ */ @Data @TableName("bus_obserpoi_info") -public class BusObserpoiInfo extends Model { +public class BusObserpoiInfo extends Model implements Serializable{ private static final long serialVersionUID = 1L; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java index 6ce7371..9d5bafd 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; +import javax.validation.constraints.NotNull; +import java.io.Serializable; import java.util.Date; /** @@ -18,7 +20,7 @@ */ @Data @TableName("bus_station_info") -public class BusStationInfo extends Model { +public class BusStationInfo extends Model implements Serializable { private static final long serialVersionUID = 1L; @@ -26,15 +28,17 @@ * 主键id */ @TableId("ID") - private Long id; + private Long stationId; /** * 场站名 */ + @NotNull @TableField("STATION_NAME") private String stationName; /** * 所属机构 */ + @NotNull @TableField("DEPT_ID") private Long deptId; /** @@ -52,7 +56,7 @@ @Override public String toString() { return "BusStationInfo{" + - "id=" + id + + "stationId=" + stationId + ", stationName=" + stationName + ", deptId=" + deptId + ", valid=" + valid + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index b880527..5d95d88 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -1,8 +1,14 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 监测点/设备信息 服务类 @@ -13,4 +19,18 @@ */ public interface IBusMonipoiInfoService extends IService { + List monitorList(Long stationId); + + Page monitorListPage(Page page, Long stationId, String keyword); + + ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo); + + ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo); + + ResponseData deleteMonitor(Long id); + + ResponseData monitorDetail(Long id); + + ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java index d4b17ec..b14a1b3 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusStationInfoService.java @@ -1,8 +1,14 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; import com.baomidou.mybatisplus.extension.service.IService; +import javax.xml.ws.Response; +import java.util.List; + /** *

* 场站信息表 服务类 @@ -13,4 +19,14 @@ */ public interface IBusStationInfoService extends IService { + List stationList(); + + Page stationListPage(Page page, String keyword); + + ResponseData addStation(BusStationInfo busStationInfo); + + ResponseData updateStation(BusStationInfo busStationInfo); + + ResponseData deleteStation(Long busStationInfoId); + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java index 8280370..d9451a9 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java @@ -1,21 +1,93 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.MonitorConfigDTO; +import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.dao.BusMonipoiInfoMapper; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 监测点/设备信息 服务实现类 *

* - * @author stylefeng123 + * @author cz * @since 2023-04-18 */ @Service +@AllArgsConstructor public class BusMonipoiInfoServiceImpl extends ServiceImpl implements IBusMonipoiInfoService { + private final AbstractPermissionContext permissionContext; + + @Override + public List monitorList(Long stationId) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("DEPT_ID"); + List monitorPointLists = this.baseMapper.monitorList(dataScope, stationId); + return monitorPointLists; + } + + @Override + public Page monitorListPage(Page page, Long stationId, String keyword) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("DEPT_ID"); + List monitorPointLists = this.baseMapper.monitorListPage(dataScope, stationId, keyword); + page.setRecords(monitorPointLists); + return page; + } + + @Override + public ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo) { + int addFlag = this.baseMapper.insert(busMonipoiInfo); + if (addFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo) { + int updateFlag = this.baseMapper.updateById(busMonipoiInfo); + if (updateFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData deleteMonitor(Long id) { + int deleteFlag = this.baseMapper.deleteById(id); + if (deleteFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData monitorDetail(Long id) { + BusMonipoiInfo busMonipoiInfo = this.baseMapper.selectById(id); + return ResponseData.success(busMonipoiInfo); + } + + @Override + public ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO) { + return null; + } + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java index 0035346..877bfd9 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java @@ -17,4 +17,5 @@ @Service public class BusObserpoiInfoServiceImpl extends ServiceImpl implements IBusObserpoiInfoService { + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java index d8277fd..8cc132e 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusStationInfoServiceImpl.java @@ -1,20 +1,79 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.StationPointList; import com.casic.missiles.modular.system.model.BusStationInfo; import com.casic.missiles.modular.system.dao.BusStationInfoMapper; import com.casic.missiles.modular.system.service.IBusStationInfoService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.xml.ws.Response; +import java.util.List; + /** *

* 场站信息表 服务实现类 *

* - * @author stylefeng123 + * @author cz * @since 2023-04-18 */ @Service +@AllArgsConstructor public class BusStationInfoServiceImpl extends ServiceImpl implements IBusStationInfoService { + private final AbstractPermissionContext permissionContext; + + @Override + public List stationList() { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("DEPT_ID"); + List stationPointLists = this.baseMapper.stationList(dataScope); + return stationPointLists; + } + + @Override + public Page stationListPage(Page page, String keyword) { + DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); + dataScope.setScopeName("DEPT_ID"); + List busStationInfoList = this.baseMapper.stationListPage(page, dataScope, keyword); + page.setRecords(busStationInfoList); + return page; + } + + @Override + public ResponseData addStation(BusStationInfo busStationInfo) { + int addFlag = this.baseMapper.insert(busStationInfo); + if (addFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData updateStation(BusStationInfo busStationInfo) { + int updateFlag = this.baseMapper.updateById(busStationInfo); + if (updateFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ResponseData deleteStation(Long busStationInfoId) { + int deleteFlag = this.baseMapper.deleteById(busStationInfoId); + if (deleteFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index 200ca46..705671d 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -8,8 +8,18 @@ multipart: max-file-size: 50MB max-request-size: 80MB -#mybatis-plus: -# sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector +mybatis-plus: + global-config: + enable-sql-runner: true + db-config: + insert-strategy: not_empty + update-strategy: not_empty + where-strategy: not_empty + logic-delete-field: valid #全局逻辑删除实体字段名 + logic-delete-value: 1 #逻辑已删除值 + logic-not-delete-value: 0 #逻辑未删除值 + mybatis-plus: + sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector ################### mybatis-plus配置 ################### ################### guns配置 ################### casic: