diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 0199778..6b5a8fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -33,6 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; @@ -236,9 +237,9 @@ } private ResponseData catchMybatisPlusException(Exception e, String errorMsg) { - if (e instanceof MybatisPlusException) { - MybatisPlusException mybatisPlusException = (MybatisPlusException) e; - String message = mybatisPlusException.getCause().getCause().getCause().getMessage(); + if (e instanceof DataAccessException) { + DataAccessException mybatisPlusException = (DataAccessException) e; + String message = mybatisPlusException.getRootCause().getMessage(); if (message.contains("Duplicate entry '")) { return new ErrorResponseData("设备编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'DEVCODE'", "")); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 0199778..6b5a8fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -33,6 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; @@ -236,9 +237,9 @@ } private ResponseData catchMybatisPlusException(Exception e, String errorMsg) { - if (e instanceof MybatisPlusException) { - MybatisPlusException mybatisPlusException = (MybatisPlusException) e; - String message = mybatisPlusException.getCause().getCause().getCause().getMessage(); + if (e instanceof DataAccessException) { + DataAccessException mybatisPlusException = (DataAccessException) e; + String message = mybatisPlusException.getRootCause().getMessage(); if (message.contains("Duplicate entry '")) { return new ErrorResponseData("设备编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'DEVCODE'", "")); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java index 3d7d1eb..edc076a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java @@ -133,7 +133,7 @@ private ResponseData catchMybatisPlusException(Exception e, String errorMsg) { if (e instanceof DataAccessException) { DataAccessException mybatisPlusException = (DataAccessException) e; - String message = mybatisPlusException.getCause().getCause().getCause().getMessage(); + String message =mybatisPlusException.getRootCause().getMessage(); if (message.contains("Duplicate entry '")) { return new ErrorResponseData("集中器编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'CONCENCODE'", "")); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 0199778..6b5a8fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -33,6 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; @@ -236,9 +237,9 @@ } private ResponseData catchMybatisPlusException(Exception e, String errorMsg) { - if (e instanceof MybatisPlusException) { - MybatisPlusException mybatisPlusException = (MybatisPlusException) e; - String message = mybatisPlusException.getCause().getCause().getCause().getMessage(); + if (e instanceof DataAccessException) { + DataAccessException mybatisPlusException = (DataAccessException) e; + String message = mybatisPlusException.getRootCause().getMessage(); if (message.contains("Duplicate entry '")) { return new ErrorResponseData("设备编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'DEVCODE'", "")); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java index 3d7d1eb..edc076a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java @@ -133,7 +133,7 @@ private ResponseData catchMybatisPlusException(Exception e, String errorMsg) { if (e instanceof DataAccessException) { DataAccessException mybatisPlusException = (DataAccessException) e; - String message = mybatisPlusException.getCause().getCause().getCause().getMessage(); + String message =mybatisPlusException.getRootCause().getMessage(); if (message.contains("Duplicate entry '")) { return new ErrorResponseData("集中器编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'CONCENCODE'", "")); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/web/controller/BusNbDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/web/controller/BusNbDeviceController.java index 0d467a9..d95ef9b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/web/controller/BusNbDeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/web/controller/BusNbDeviceController.java @@ -11,6 +11,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -263,9 +264,9 @@ } private ResponseData catchMybatisPlusException(Exception e, String errorMsg) { - if (e instanceof MybatisPlusException) { - MybatisPlusException mybatisPlusException = (MybatisPlusException) e; - String message = mybatisPlusException.getCause().getCause().getCause().getMessage(); + if (e instanceof DataAccessException) { + DataAccessException mybatisPlusException = (DataAccessException) e; + String message = mybatisPlusException.getRootCause().getMessage(); if (message.contains("Duplicate entry '")) { return new ErrorResponseData("设备编号或唯一标识重复"); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 0199778..6b5a8fd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -33,6 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; @@ -236,9 +237,9 @@ } private ResponseData catchMybatisPlusException(Exception e, String errorMsg) { - if (e instanceof MybatisPlusException) { - MybatisPlusException mybatisPlusException = (MybatisPlusException) e; - String message = mybatisPlusException.getCause().getCause().getCause().getMessage(); + if (e instanceof DataAccessException) { + DataAccessException mybatisPlusException = (DataAccessException) e; + String message = mybatisPlusException.getRootCause().getMessage(); if (message.contains("Duplicate entry '")) { return new ErrorResponseData("设备编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'DEVCODE'", "")); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java index 3d7d1eb..edc076a 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConcentratorServiceImpl.java @@ -133,7 +133,7 @@ private ResponseData catchMybatisPlusException(Exception e, String errorMsg) { if (e instanceof DataAccessException) { DataAccessException mybatisPlusException = (DataAccessException) e; - String message = mybatisPlusException.getCause().getCause().getCause().getMessage(); + String message =mybatisPlusException.getRootCause().getMessage(); if (message.contains("Duplicate entry '")) { return new ErrorResponseData("集中器编号重复:" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'CONCENCODE'", "")); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/web/controller/BusNbDeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/web/controller/BusNbDeviceController.java index 0d467a9..d95ef9b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/web/controller/BusNbDeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/web/controller/BusNbDeviceController.java @@ -11,6 +11,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -263,9 +264,9 @@ } private ResponseData catchMybatisPlusException(Exception e, String errorMsg) { - if (e instanceof MybatisPlusException) { - MybatisPlusException mybatisPlusException = (MybatisPlusException) e; - String message = mybatisPlusException.getCause().getCause().getCause().getMessage(); + if (e instanceof DataAccessException) { + DataAccessException mybatisPlusException = (DataAccessException) e; + String message = mybatisPlusException.getRootCause().getMessage(); if (message.contains("Duplicate entry '")) { return new ErrorResponseData("设备编号或唯一标识重复"); } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 5a4dab7..67c0b9b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; import lombok.NoArgsConstructor; @@ -35,12 +36,16 @@ @ExcelProperty("状态描述") private String descn; @ExcelProperty("甲烷/CH4(%VOL)") + @JSONField(name="CH4") private String CH4; @ExcelProperty("氧气(ppm)") + @JSONField(name="O2") private String O2; @ExcelProperty("一氧化氮(ppm)") + @JSONField(name="CO") private String CO; @ExcelProperty("硫化氢(ppm)") + @JSONField(name="H2S") private String H2S; @ExcelProperty("液位开关") private String switchStart;