diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 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 b3f3bfe..6262c52 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 @@ -15,7 +15,7 @@ import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConcentratorService; -import com.casic.missiles.util.DeviceUtility; +import com.casic.missiles.modular.system.util.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -140,8 +140,8 @@ void loadPostion(BusConcentrator entity) { if (StrUtil.isNotEmpty(entity.getLat()) && StrUtil.isNotEmpty(entity.getLng())) { - Map baiduCoordinate = DeviceUtility.convertBaiduAPI(entity.getLng(), entity.getLat()); - Map gaodeCoordinate = DeviceUtility.convertGaodeAPI(entity.getLng(), entity.getLat()); + Map baiduCoordinate = Utility.convertBaiduAPI(entity.getLng(), entity.getLat()); + Map gaodeCoordinate = Utility.convertGaodeAPI(entity.getLng(), entity.getLat()); if (ObjectUtil.isEmpty(baiduCoordinate) || ObjectUtil.isEmpty(gaodeCoordinate)) { logger.error("{}坐标转换失败!", entity.getConcencode()); return; diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 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 b3f3bfe..6262c52 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 @@ -15,7 +15,7 @@ import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConcentratorService; -import com.casic.missiles.util.DeviceUtility; +import com.casic.missiles.modular.system.util.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -140,8 +140,8 @@ void loadPostion(BusConcentrator entity) { if (StrUtil.isNotEmpty(entity.getLat()) && StrUtil.isNotEmpty(entity.getLng())) { - Map baiduCoordinate = DeviceUtility.convertBaiduAPI(entity.getLng(), entity.getLat()); - Map gaodeCoordinate = DeviceUtility.convertGaodeAPI(entity.getLng(), entity.getLat()); + Map baiduCoordinate = Utility.convertBaiduAPI(entity.getLng(), entity.getLat()); + Map gaodeCoordinate = Utility.convertGaodeAPI(entity.getLng(), entity.getLat()); if (ObjectUtil.isEmpty(baiduCoordinate) || ObjectUtil.isEmpty(gaodeCoordinate)) { logger.error("{}坐标转换失败!", entity.getConcencode()); return; diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 61a3580..3054996 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server-support - casic 的spring boot版本 + 闸井产品-服务支撑子包 @@ -36,6 +36,16 @@ provided + + com.casic + casic-http + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 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 b3f3bfe..6262c52 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 @@ -15,7 +15,7 @@ import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConcentratorService; -import com.casic.missiles.util.DeviceUtility; +import com.casic.missiles.modular.system.util.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -140,8 +140,8 @@ void loadPostion(BusConcentrator entity) { if (StrUtil.isNotEmpty(entity.getLat()) && StrUtil.isNotEmpty(entity.getLng())) { - Map baiduCoordinate = DeviceUtility.convertBaiduAPI(entity.getLng(), entity.getLat()); - Map gaodeCoordinate = DeviceUtility.convertGaodeAPI(entity.getLng(), entity.getLat()); + Map baiduCoordinate = Utility.convertBaiduAPI(entity.getLng(), entity.getLat()); + Map gaodeCoordinate = Utility.convertGaodeAPI(entity.getLng(), entity.getLat()); if (ObjectUtil.isEmpty(baiduCoordinate) || ObjectUtil.isEmpty(gaodeCoordinate)) { logger.error("{}坐标转换失败!", entity.getConcencode()); return; diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 61a3580..3054996 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server-support - casic 的spring boot版本 + 闸井产品-服务支撑子包 @@ -36,6 +36,16 @@ provided + + com.casic + casic-http + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java new file mode 100644 index 0000000..e1030f2 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") +public class DeviceApiProperties { + private String baiduUrl = null; + private String baiduAk = null; + + private String gaodeUrl = null; + private String gaodeKey = null; +} \ No newline at end of file diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 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 b3f3bfe..6262c52 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 @@ -15,7 +15,7 @@ import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConcentratorService; -import com.casic.missiles.util.DeviceUtility; +import com.casic.missiles.modular.system.util.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -140,8 +140,8 @@ void loadPostion(BusConcentrator entity) { if (StrUtil.isNotEmpty(entity.getLat()) && StrUtil.isNotEmpty(entity.getLng())) { - Map baiduCoordinate = DeviceUtility.convertBaiduAPI(entity.getLng(), entity.getLat()); - Map gaodeCoordinate = DeviceUtility.convertGaodeAPI(entity.getLng(), entity.getLat()); + Map baiduCoordinate = Utility.convertBaiduAPI(entity.getLng(), entity.getLat()); + Map gaodeCoordinate = Utility.convertGaodeAPI(entity.getLng(), entity.getLat()); if (ObjectUtil.isEmpty(baiduCoordinate) || ObjectUtil.isEmpty(gaodeCoordinate)) { logger.error("{}坐标转换失败!", entity.getConcencode()); return; diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 61a3580..3054996 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server-support - casic 的spring boot版本 + 闸井产品-服务支撑子包 @@ -36,6 +36,16 @@ provided + + com.casic + casic-http + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java new file mode 100644 index 0000000..e1030f2 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") +public class DeviceApiProperties { + private String baiduUrl = null; + private String baiduAk = null; + + private String gaodeUrl = null; + private String gaodeKey = null; +} \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index b49b8c0..cc60629 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -1,13 +1,12 @@ package com.casic.missiles.modular.system.dto; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; +import cn.hutool.core.date.DateUtil; import java.util.Date; /** *

- * + * *

* * @author casic123 @@ -177,9 +176,8 @@ } public String getAlarmTime() { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); if (null != this.alarmTimeDate) { - return fmt.print(alarmTimeDate.getTime()); + return DateUtil.format(alarmTimeDate, "yyyy-MM-dd HH:mm:ss"); } else { return ""; } @@ -268,13 +266,13 @@ @Override public String toString() { return "AlarmNowView{" + - "id=" + alarmId + - ", deviceId=" + deviceId + - ", wellId=" + wellId + - ", wellCode=" + wellCode + - ", alarmType=" + alarmType + - ", alarmContent=" + alarmContent + - ", alarmTime=" + getAlarmTime() + - "}"; + "id=" + alarmId + + ", deviceId=" + deviceId + + ", wellId=" + wellId + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmTime=" + getAlarmTime() + + "}"; } } diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 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 b3f3bfe..6262c52 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 @@ -15,7 +15,7 @@ import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConcentratorService; -import com.casic.missiles.util.DeviceUtility; +import com.casic.missiles.modular.system.util.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -140,8 +140,8 @@ void loadPostion(BusConcentrator entity) { if (StrUtil.isNotEmpty(entity.getLat()) && StrUtil.isNotEmpty(entity.getLng())) { - Map baiduCoordinate = DeviceUtility.convertBaiduAPI(entity.getLng(), entity.getLat()); - Map gaodeCoordinate = DeviceUtility.convertGaodeAPI(entity.getLng(), entity.getLat()); + Map baiduCoordinate = Utility.convertBaiduAPI(entity.getLng(), entity.getLat()); + Map gaodeCoordinate = Utility.convertGaodeAPI(entity.getLng(), entity.getLat()); if (ObjectUtil.isEmpty(baiduCoordinate) || ObjectUtil.isEmpty(gaodeCoordinate)) { logger.error("{}坐标转换失败!", entity.getConcencode()); return; diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 61a3580..3054996 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server-support - casic 的spring boot版本 + 闸井产品-服务支撑子包 @@ -36,6 +36,16 @@ provided + + com.casic + casic-http + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java new file mode 100644 index 0000000..e1030f2 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") +public class DeviceApiProperties { + private String baiduUrl = null; + private String baiduAk = null; + + private String gaodeUrl = null; + private String gaodeKey = null; +} \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index b49b8c0..cc60629 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -1,13 +1,12 @@ package com.casic.missiles.modular.system.dto; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; +import cn.hutool.core.date.DateUtil; import java.util.Date; /** *

- * + * *

* * @author casic123 @@ -177,9 +176,8 @@ } public String getAlarmTime() { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); if (null != this.alarmTimeDate) { - return fmt.print(alarmTimeDate.getTime()); + return DateUtil.format(alarmTimeDate, "yyyy-MM-dd HH:mm:ss"); } else { return ""; } @@ -268,13 +266,13 @@ @Override public String toString() { return "AlarmNowView{" + - "id=" + alarmId + - ", deviceId=" + deviceId + - ", wellId=" + wellId + - ", wellCode=" + wellCode + - ", alarmType=" + alarmType + - ", alarmContent=" + alarmContent + - ", alarmTime=" + getAlarmTime() + - "}"; + "id=" + alarmId + + ", deviceId=" + deviceId + + ", wellId=" + wellId + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmTime=" + getAlarmTime() + + "}"; } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 4b8cb20..21df9e4 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -1,8 +1,7 @@ package com.casic.missiles.modular.system.dto; +import cn.hutool.core.date.DateUtil; import com.casic.missiles.modular.system.model.BusWellInfo; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; @@ -283,8 +282,7 @@ //this.setStaff(busWellInfo.getStaff()); //this.setTel(busWellInfo.getTel()); if (null != busWellInfo.getTs()) { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); - this.setTs(fmt.print(busWellInfo.getTs().getTime())); + this.setTs(DateUtil.format(busWellInfo.getTs(), "yyyy-MM-dd HH:mm:ss")); } this.setValid(busWellInfo.getValid()); } diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 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 b3f3bfe..6262c52 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 @@ -15,7 +15,7 @@ import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConcentratorService; -import com.casic.missiles.util.DeviceUtility; +import com.casic.missiles.modular.system.util.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -140,8 +140,8 @@ void loadPostion(BusConcentrator entity) { if (StrUtil.isNotEmpty(entity.getLat()) && StrUtil.isNotEmpty(entity.getLng())) { - Map baiduCoordinate = DeviceUtility.convertBaiduAPI(entity.getLng(), entity.getLat()); - Map gaodeCoordinate = DeviceUtility.convertGaodeAPI(entity.getLng(), entity.getLat()); + Map baiduCoordinate = Utility.convertBaiduAPI(entity.getLng(), entity.getLat()); + Map gaodeCoordinate = Utility.convertGaodeAPI(entity.getLng(), entity.getLat()); if (ObjectUtil.isEmpty(baiduCoordinate) || ObjectUtil.isEmpty(gaodeCoordinate)) { logger.error("{}坐标转换失败!", entity.getConcencode()); return; diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 61a3580..3054996 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server-support - casic 的spring boot版本 + 闸井产品-服务支撑子包 @@ -36,6 +36,16 @@ provided + + com.casic + casic-http + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java new file mode 100644 index 0000000..e1030f2 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") +public class DeviceApiProperties { + private String baiduUrl = null; + private String baiduAk = null; + + private String gaodeUrl = null; + private String gaodeKey = null; +} \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index b49b8c0..cc60629 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -1,13 +1,12 @@ package com.casic.missiles.modular.system.dto; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; +import cn.hutool.core.date.DateUtil; import java.util.Date; /** *

- * + * *

* * @author casic123 @@ -177,9 +176,8 @@ } public String getAlarmTime() { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); if (null != this.alarmTimeDate) { - return fmt.print(alarmTimeDate.getTime()); + return DateUtil.format(alarmTimeDate, "yyyy-MM-dd HH:mm:ss"); } else { return ""; } @@ -268,13 +266,13 @@ @Override public String toString() { return "AlarmNowView{" + - "id=" + alarmId + - ", deviceId=" + deviceId + - ", wellId=" + wellId + - ", wellCode=" + wellCode + - ", alarmType=" + alarmType + - ", alarmContent=" + alarmContent + - ", alarmTime=" + getAlarmTime() + - "}"; + "id=" + alarmId + + ", deviceId=" + deviceId + + ", wellId=" + wellId + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmTime=" + getAlarmTime() + + "}"; } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 4b8cb20..21df9e4 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -1,8 +1,7 @@ package com.casic.missiles.modular.system.dto; +import cn.hutool.core.date.DateUtil; import com.casic.missiles.modular.system.model.BusWellInfo; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; @@ -283,8 +282,7 @@ //this.setStaff(busWellInfo.getStaff()); //this.setTel(busWellInfo.getTel()); if (null != busWellInfo.getTs()) { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); - this.setTs(fmt.print(busWellInfo.getTs().getTime())); + this.setTs(DateUtil.format(busWellInfo.getTs(), "yyyy-MM-dd HH:mm:ss")); } this.setValid(busWellInfo.getValid()); } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index f600534..5df70d3 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server - casic 的spring boot版本 + 闸井产品-其他服务类子包 diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 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 b3f3bfe..6262c52 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 @@ -15,7 +15,7 @@ import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConcentratorService; -import com.casic.missiles.util.DeviceUtility; +import com.casic.missiles.modular.system.util.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -140,8 +140,8 @@ void loadPostion(BusConcentrator entity) { if (StrUtil.isNotEmpty(entity.getLat()) && StrUtil.isNotEmpty(entity.getLng())) { - Map baiduCoordinate = DeviceUtility.convertBaiduAPI(entity.getLng(), entity.getLat()); - Map gaodeCoordinate = DeviceUtility.convertGaodeAPI(entity.getLng(), entity.getLat()); + Map baiduCoordinate = Utility.convertBaiduAPI(entity.getLng(), entity.getLat()); + Map gaodeCoordinate = Utility.convertGaodeAPI(entity.getLng(), entity.getLat()); if (ObjectUtil.isEmpty(baiduCoordinate) || ObjectUtil.isEmpty(gaodeCoordinate)) { logger.error("{}坐标转换失败!", entity.getConcencode()); return; diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 61a3580..3054996 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server-support - casic 的spring boot版本 + 闸井产品-服务支撑子包 @@ -36,6 +36,16 @@ provided + + com.casic + casic-http + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java new file mode 100644 index 0000000..e1030f2 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") +public class DeviceApiProperties { + private String baiduUrl = null; + private String baiduAk = null; + + private String gaodeUrl = null; + private String gaodeKey = null; +} \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index b49b8c0..cc60629 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -1,13 +1,12 @@ package com.casic.missiles.modular.system.dto; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; +import cn.hutool.core.date.DateUtil; import java.util.Date; /** *

- * + * *

* * @author casic123 @@ -177,9 +176,8 @@ } public String getAlarmTime() { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); if (null != this.alarmTimeDate) { - return fmt.print(alarmTimeDate.getTime()); + return DateUtil.format(alarmTimeDate, "yyyy-MM-dd HH:mm:ss"); } else { return ""; } @@ -268,13 +266,13 @@ @Override public String toString() { return "AlarmNowView{" + - "id=" + alarmId + - ", deviceId=" + deviceId + - ", wellId=" + wellId + - ", wellCode=" + wellCode + - ", alarmType=" + alarmType + - ", alarmContent=" + alarmContent + - ", alarmTime=" + getAlarmTime() + - "}"; + "id=" + alarmId + + ", deviceId=" + deviceId + + ", wellId=" + wellId + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmTime=" + getAlarmTime() + + "}"; } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 4b8cb20..21df9e4 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -1,8 +1,7 @@ package com.casic.missiles.modular.system.dto; +import cn.hutool.core.date.DateUtil; import com.casic.missiles.modular.system.model.BusWellInfo; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; @@ -283,8 +282,7 @@ //this.setStaff(busWellInfo.getStaff()); //this.setTel(busWellInfo.getTel()); if (null != busWellInfo.getTs()) { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); - this.setTs(fmt.print(busWellInfo.getTs().getTime())); + this.setTs(DateUtil.format(busWellInfo.getTs(), "yyyy-MM-dd HH:mm:ss")); } this.setValid(busWellInfo.getValid()); } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index f600534..5df70d3 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server - casic 的spring boot版本 + 闸井产品-其他服务类子包 diff --git a/casic-sluicewell/pom.xml b/casic-sluicewell/pom.xml index 6483b6d..3edad2b 100644 --- a/casic-sluicewell/pom.xml +++ b/casic-sluicewell/pom.xml @@ -11,7 +11,7 @@ casic-sluicewell jar casic-sluicewell - 井管理模块 + 闸井产品-井管理子包 diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 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 b3f3bfe..6262c52 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 @@ -15,7 +15,7 @@ import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConcentratorService; -import com.casic.missiles.util.DeviceUtility; +import com.casic.missiles.modular.system.util.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -140,8 +140,8 @@ void loadPostion(BusConcentrator entity) { if (StrUtil.isNotEmpty(entity.getLat()) && StrUtil.isNotEmpty(entity.getLng())) { - Map baiduCoordinate = DeviceUtility.convertBaiduAPI(entity.getLng(), entity.getLat()); - Map gaodeCoordinate = DeviceUtility.convertGaodeAPI(entity.getLng(), entity.getLat()); + Map baiduCoordinate = Utility.convertBaiduAPI(entity.getLng(), entity.getLat()); + Map gaodeCoordinate = Utility.convertGaodeAPI(entity.getLng(), entity.getLat()); if (ObjectUtil.isEmpty(baiduCoordinate) || ObjectUtil.isEmpty(gaodeCoordinate)) { logger.error("{}坐标转换失败!", entity.getConcencode()); return; diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 61a3580..3054996 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server-support - casic 的spring boot版本 + 闸井产品-服务支撑子包 @@ -36,6 +36,16 @@ provided + + com.casic + casic-http + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java new file mode 100644 index 0000000..e1030f2 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") +public class DeviceApiProperties { + private String baiduUrl = null; + private String baiduAk = null; + + private String gaodeUrl = null; + private String gaodeKey = null; +} \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index b49b8c0..cc60629 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -1,13 +1,12 @@ package com.casic.missiles.modular.system.dto; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; +import cn.hutool.core.date.DateUtil; import java.util.Date; /** *

- * + * *

* * @author casic123 @@ -177,9 +176,8 @@ } public String getAlarmTime() { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); if (null != this.alarmTimeDate) { - return fmt.print(alarmTimeDate.getTime()); + return DateUtil.format(alarmTimeDate, "yyyy-MM-dd HH:mm:ss"); } else { return ""; } @@ -268,13 +266,13 @@ @Override public String toString() { return "AlarmNowView{" + - "id=" + alarmId + - ", deviceId=" + deviceId + - ", wellId=" + wellId + - ", wellCode=" + wellCode + - ", alarmType=" + alarmType + - ", alarmContent=" + alarmContent + - ", alarmTime=" + getAlarmTime() + - "}"; + "id=" + alarmId + + ", deviceId=" + deviceId + + ", wellId=" + wellId + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmTime=" + getAlarmTime() + + "}"; } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 4b8cb20..21df9e4 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -1,8 +1,7 @@ package com.casic.missiles.modular.system.dto; +import cn.hutool.core.date.DateUtil; import com.casic.missiles.modular.system.model.BusWellInfo; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; @@ -283,8 +282,7 @@ //this.setStaff(busWellInfo.getStaff()); //this.setTel(busWellInfo.getTel()); if (null != busWellInfo.getTs()) { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); - this.setTs(fmt.print(busWellInfo.getTs().getTime())); + this.setTs(DateUtil.format(busWellInfo.getTs(), "yyyy-MM-dd HH:mm:ss")); } this.setValid(busWellInfo.getValid()); } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index f600534..5df70d3 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server - casic 的spring boot版本 + 闸井产品-其他服务类子包 diff --git a/casic-sluicewell/pom.xml b/casic-sluicewell/pom.xml index 6483b6d..3edad2b 100644 --- a/casic-sluicewell/pom.xml +++ b/casic-sluicewell/pom.xml @@ -11,7 +11,7 @@ casic-sluicewell jar casic-sluicewell - 井管理模块 + 闸井产品-井管理子包 diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 3fe5bba..bd62f3f 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -1,5 +1,10 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.modular.system.constant.BusWellConst; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.model.response.ErrorResponseData; @@ -16,7 +21,6 @@ import com.casic.missiles.modular.system.dto.HasWellDto; import com.casic.missiles.modular.system.enmus.SluicewellExportEnum; import com.casic.missiles.modular.system.util.Utility; -import com.casic.missiles.quartz.job.MyJob; import com.casic.missiles.quartz.service.IQuartzManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +34,6 @@ import java.io.IOException; import java.io.InputStream; -import java.rmi.ServerException; import java.util.*; import com.casic.missiles.core.page.PageFactory; @@ -55,9 +58,10 @@ @Resource private AbstractPermissionContext permissionService; - @Autowired + @Resource private IBusWellInfoService busWellInfoService; - + @Resource + private AbstractDictService dictService; @Autowired public IQuartzManager quartzManager; @@ -164,16 +168,16 @@ @ResponseBody @BussinessLog(value = "修改井信息", key = BusWellConst.SLUICEWELL_ADD_LOG_KEY, dict = BusWellDict.class) public Object update(BusWellInfo busWellInfo) { - if (ToolUtil.isEmpty(busWellInfo.getId())) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null == busWellInfo.getId()) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } - BusWellInfo oldBusWellInfo = this.busWellInfoService.selectById(busWellInfo.getId()); + BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId()); LogObjectHolder.me().set(oldBusWellInfo); Utility.convertCoordinate(busWellInfo); - if(ToolUtil.isEmpty(busWellInfo.getResponsibleDept())){ + if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){ busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); } @@ -193,7 +197,7 @@ @ResponseBody public Object detail(@PathVariable("busWellInfoId") String busWellInfoId) { - return ResponseData.success(busWellInfoService.selectById(busWellInfoId)); + return ResponseData.success(busWellInfoService.getById(busWellInfoId)); } /** @@ -201,13 +205,13 @@ */ @RequestMapping(value = "/info", method = RequestMethod.GET) @ResponseBody - public Object info(Integer id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + public Object info(Long id) { + if (null == id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); - resultData.setData(busWellInfoService.selectById(id)); + resultData.setData(busWellInfoService.getById(id)); return resultData; } @@ -219,8 +223,8 @@ @RequestMapping(value = "/watchDataByWell", method = RequestMethod.GET) @ResponseBody public Object watchDataByWell(Long id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null == id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); resultData.setData(busWellInfoService.getWatchDatas(id)); @@ -235,11 +239,11 @@ @ResponseBody public Object countByBfzt() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips(); + Set roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips(); List deptIds = null; Boolean isApp = false; if (roleTipes.contains("leader") || roleTipes.contains("member")) { - deptIds = permissionService.getSubDepts(permissionService.getAuthService().getLoginUser().getDeptId(), null); + deptIds = permissionService.getDeptService().getIdsByPid(permissionService.getAuthService().getLoginUser().getDeptId(), null); deptIds.add(permissionService.getAuthService().getLoginUser().getDeptId()); isApp = true; }else{ @@ -260,8 +264,8 @@ @RequestMapping(value = "/bfcf", method = RequestMethod.POST) @ResponseBody public Object bfcf(Long wellId, String bfzt) { - if (ToolUtil.isEmpty(wellId) || ToolUtil.isEmpty(bfzt)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null ==wellId || StrUtil.isEmpty(bfzt)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } BusWellInfo busWellInfo = new BusWellInfo(); @@ -291,8 +295,8 @@ @RequestMapping(value = "/bfType", method = RequestMethod.GET) @ResponseBody public Object bfType(Long id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null ==id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); resultData.setData(busWellInfoService.getWatchDatas(id)); @@ -311,7 +315,8 @@ List results = new ArrayList<>(); //设置表头与字段映射,可通过反射获取 Map mapper = new HashMap<>(); - mapper.put("井编号", "wellCode");//判断唯一 + //判断唯一 + mapper.put("井编号", "wellCode"); mapper.put("井名称", "wellName"); mapper.put("井深", "deep"); mapper.put("区", "qu"); @@ -324,22 +329,11 @@ mapper.put("井维护单位代码", "responsibleDept"); try { try (InputStream in = file.getInputStream()) { - ExcelIO.read(in, mapper, BusWellInfo.class, (row) -> { - //读取sheet - if (row.getSheet() == 0) { - if (row.getResult() != null) { - BusWellInfo busWellInfo = row.getResult(); - results.add(busWellInfo); - } - } else { - //其他sheet停止读取 - logger.info("当前sheet" + row.getSheet() + ",停止读取"); - row.shutdown(); - } - }); + results = this.importExcel(BusWellInfo.class,file,null,null); + List list = busWellInfoService.addWellBatch(results); - if (!ToolUtil.isEmpty(list)) { + if (!CollectionUtil.isEmpty(list)) { //获取第校验报错信息 return new ErrorResponseData(list.get(0)); } @@ -360,30 +354,36 @@ } - @ApiOperation("批量导出井接口") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) @ResponseBody public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { - Page page = new PageFactory().defaultPage(); + Page page = PageFactory.defaultPage(); page.setSearchCount(false); page.setCurrent(1); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List list = busWellInfoService.getBatchExportData(dataScope, page, wellType, deptid, keywords); list.forEach(batchExportDataDto -> { - batchExportDataDto.setBfztName(permissionService.getDictNameByCode("bfzt", batchExportDataDto.getBfzt())); + batchExportDataDto.setBfztName(dictService.getDictNameByCode("bfzt", batchExportDataDto.getBfzt())); // batchExportDataDto.setDeviceCount(busWellInfoService.getDeviceCountData(batchExportDataDto.getId())); // batchExportDataDto.setDeptName(busWellInfoService.getDeptNameData(batchExportDataDto.getDeptId())); - batchExportDataDto.setWellTypeName(permissionService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType())); - batchExportDataDto.setDeptName(permissionService.getDeptName(batchExportDataDto.getDeptId())); + batchExportDataDto.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType())); + batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(batchExportDataDto.getDeptId())); }); - - List res = new ArrayList<>(); - res.addAll(list); //获取导出文件header - super.exportExcel(SluicewellExportEnum.DEVICE_EXPORT, res); +// DEVICE_EXPORT(new ArrayList() {{ +// add(new Header("井编号", "wellCode")); +// add(new Header("井名称", "wellName")); +// add(new Header("井深", "deep")); +// add(new Header("详细地址", "position")); +// add(new Header("井类型", "wellTypeName")); +// add(new Header("权属单位", "deptName")); +// add(new Header("设备数量", "deviceCount")); +// add(new Header("布防状态", "bfztName")); +// }}, "sluicewell.xlsx", "井数据导出");SluicewellExportEnum.DEVICE_EXPORT + super.exportExcel(BatchExportDataDto.class, list,""); //super.exportExcel(SluicewellExportEnum.SLUICEWELLDATA_EXPORT, list, response); } @@ -394,8 +394,8 @@ @RequestMapping(value = "/selectOne", method = RequestMethod.GET) @ResponseBody public Object selectOne(String wellCode) { - if (StringUtils.isEmpty(wellCode)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (StrUtil.isEmpty(wellCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } HasWellDto hasWellDto = new HasWellDto(); @@ -440,10 +440,10 @@ @RequestMapping(value = "/getWellByCode", method = RequestMethod.GET) @ResponseBody public Object getWellByCode(String wellCode){ - EntityWrapper wrapper = new EntityWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("WELL_CODE",wellCode); wrapper.eq("valid",1); - return new SuccessResponseData(busWellInfoService.selectOne(wrapper)); + return new SuccessResponseData(busWellInfoService.getOne(wrapper)); } } diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 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 b3f3bfe..6262c52 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 @@ -15,7 +15,7 @@ import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConcentratorService; -import com.casic.missiles.util.DeviceUtility; +import com.casic.missiles.modular.system.util.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -140,8 +140,8 @@ void loadPostion(BusConcentrator entity) { if (StrUtil.isNotEmpty(entity.getLat()) && StrUtil.isNotEmpty(entity.getLng())) { - Map baiduCoordinate = DeviceUtility.convertBaiduAPI(entity.getLng(), entity.getLat()); - Map gaodeCoordinate = DeviceUtility.convertGaodeAPI(entity.getLng(), entity.getLat()); + Map baiduCoordinate = Utility.convertBaiduAPI(entity.getLng(), entity.getLat()); + Map gaodeCoordinate = Utility.convertGaodeAPI(entity.getLng(), entity.getLat()); if (ObjectUtil.isEmpty(baiduCoordinate) || ObjectUtil.isEmpty(gaodeCoordinate)) { logger.error("{}坐标转换失败!", entity.getConcencode()); return; diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 61a3580..3054996 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server-support - casic 的spring boot版本 + 闸井产品-服务支撑子包 @@ -36,6 +36,16 @@ provided + + com.casic + casic-http + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java new file mode 100644 index 0000000..e1030f2 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") +public class DeviceApiProperties { + private String baiduUrl = null; + private String baiduAk = null; + + private String gaodeUrl = null; + private String gaodeKey = null; +} \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index b49b8c0..cc60629 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -1,13 +1,12 @@ package com.casic.missiles.modular.system.dto; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; +import cn.hutool.core.date.DateUtil; import java.util.Date; /** *

- * + * *

* * @author casic123 @@ -177,9 +176,8 @@ } public String getAlarmTime() { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); if (null != this.alarmTimeDate) { - return fmt.print(alarmTimeDate.getTime()); + return DateUtil.format(alarmTimeDate, "yyyy-MM-dd HH:mm:ss"); } else { return ""; } @@ -268,13 +266,13 @@ @Override public String toString() { return "AlarmNowView{" + - "id=" + alarmId + - ", deviceId=" + deviceId + - ", wellId=" + wellId + - ", wellCode=" + wellCode + - ", alarmType=" + alarmType + - ", alarmContent=" + alarmContent + - ", alarmTime=" + getAlarmTime() + - "}"; + "id=" + alarmId + + ", deviceId=" + deviceId + + ", wellId=" + wellId + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmTime=" + getAlarmTime() + + "}"; } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 4b8cb20..21df9e4 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -1,8 +1,7 @@ package com.casic.missiles.modular.system.dto; +import cn.hutool.core.date.DateUtil; import com.casic.missiles.modular.system.model.BusWellInfo; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; @@ -283,8 +282,7 @@ //this.setStaff(busWellInfo.getStaff()); //this.setTel(busWellInfo.getTel()); if (null != busWellInfo.getTs()) { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); - this.setTs(fmt.print(busWellInfo.getTs().getTime())); + this.setTs(DateUtil.format(busWellInfo.getTs(), "yyyy-MM-dd HH:mm:ss")); } this.setValid(busWellInfo.getValid()); } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index f600534..5df70d3 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server - casic 的spring boot版本 + 闸井产品-其他服务类子包 diff --git a/casic-sluicewell/pom.xml b/casic-sluicewell/pom.xml index 6483b6d..3edad2b 100644 --- a/casic-sluicewell/pom.xml +++ b/casic-sluicewell/pom.xml @@ -11,7 +11,7 @@ casic-sluicewell jar casic-sluicewell - 井管理模块 + 闸井产品-井管理子包 diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 3fe5bba..bd62f3f 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -1,5 +1,10 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.modular.system.constant.BusWellConst; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.model.response.ErrorResponseData; @@ -16,7 +21,6 @@ import com.casic.missiles.modular.system.dto.HasWellDto; import com.casic.missiles.modular.system.enmus.SluicewellExportEnum; import com.casic.missiles.modular.system.util.Utility; -import com.casic.missiles.quartz.job.MyJob; import com.casic.missiles.quartz.service.IQuartzManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +34,6 @@ import java.io.IOException; import java.io.InputStream; -import java.rmi.ServerException; import java.util.*; import com.casic.missiles.core.page.PageFactory; @@ -55,9 +58,10 @@ @Resource private AbstractPermissionContext permissionService; - @Autowired + @Resource private IBusWellInfoService busWellInfoService; - + @Resource + private AbstractDictService dictService; @Autowired public IQuartzManager quartzManager; @@ -164,16 +168,16 @@ @ResponseBody @BussinessLog(value = "修改井信息", key = BusWellConst.SLUICEWELL_ADD_LOG_KEY, dict = BusWellDict.class) public Object update(BusWellInfo busWellInfo) { - if (ToolUtil.isEmpty(busWellInfo.getId())) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null == busWellInfo.getId()) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } - BusWellInfo oldBusWellInfo = this.busWellInfoService.selectById(busWellInfo.getId()); + BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId()); LogObjectHolder.me().set(oldBusWellInfo); Utility.convertCoordinate(busWellInfo); - if(ToolUtil.isEmpty(busWellInfo.getResponsibleDept())){ + if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){ busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); } @@ -193,7 +197,7 @@ @ResponseBody public Object detail(@PathVariable("busWellInfoId") String busWellInfoId) { - return ResponseData.success(busWellInfoService.selectById(busWellInfoId)); + return ResponseData.success(busWellInfoService.getById(busWellInfoId)); } /** @@ -201,13 +205,13 @@ */ @RequestMapping(value = "/info", method = RequestMethod.GET) @ResponseBody - public Object info(Integer id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + public Object info(Long id) { + if (null == id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); - resultData.setData(busWellInfoService.selectById(id)); + resultData.setData(busWellInfoService.getById(id)); return resultData; } @@ -219,8 +223,8 @@ @RequestMapping(value = "/watchDataByWell", method = RequestMethod.GET) @ResponseBody public Object watchDataByWell(Long id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null == id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); resultData.setData(busWellInfoService.getWatchDatas(id)); @@ -235,11 +239,11 @@ @ResponseBody public Object countByBfzt() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips(); + Set roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips(); List deptIds = null; Boolean isApp = false; if (roleTipes.contains("leader") || roleTipes.contains("member")) { - deptIds = permissionService.getSubDepts(permissionService.getAuthService().getLoginUser().getDeptId(), null); + deptIds = permissionService.getDeptService().getIdsByPid(permissionService.getAuthService().getLoginUser().getDeptId(), null); deptIds.add(permissionService.getAuthService().getLoginUser().getDeptId()); isApp = true; }else{ @@ -260,8 +264,8 @@ @RequestMapping(value = "/bfcf", method = RequestMethod.POST) @ResponseBody public Object bfcf(Long wellId, String bfzt) { - if (ToolUtil.isEmpty(wellId) || ToolUtil.isEmpty(bfzt)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null ==wellId || StrUtil.isEmpty(bfzt)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } BusWellInfo busWellInfo = new BusWellInfo(); @@ -291,8 +295,8 @@ @RequestMapping(value = "/bfType", method = RequestMethod.GET) @ResponseBody public Object bfType(Long id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null ==id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); resultData.setData(busWellInfoService.getWatchDatas(id)); @@ -311,7 +315,8 @@ List results = new ArrayList<>(); //设置表头与字段映射,可通过反射获取 Map mapper = new HashMap<>(); - mapper.put("井编号", "wellCode");//判断唯一 + //判断唯一 + mapper.put("井编号", "wellCode"); mapper.put("井名称", "wellName"); mapper.put("井深", "deep"); mapper.put("区", "qu"); @@ -324,22 +329,11 @@ mapper.put("井维护单位代码", "responsibleDept"); try { try (InputStream in = file.getInputStream()) { - ExcelIO.read(in, mapper, BusWellInfo.class, (row) -> { - //读取sheet - if (row.getSheet() == 0) { - if (row.getResult() != null) { - BusWellInfo busWellInfo = row.getResult(); - results.add(busWellInfo); - } - } else { - //其他sheet停止读取 - logger.info("当前sheet" + row.getSheet() + ",停止读取"); - row.shutdown(); - } - }); + results = this.importExcel(BusWellInfo.class,file,null,null); + List list = busWellInfoService.addWellBatch(results); - if (!ToolUtil.isEmpty(list)) { + if (!CollectionUtil.isEmpty(list)) { //获取第校验报错信息 return new ErrorResponseData(list.get(0)); } @@ -360,30 +354,36 @@ } - @ApiOperation("批量导出井接口") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) @ResponseBody public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { - Page page = new PageFactory().defaultPage(); + Page page = PageFactory.defaultPage(); page.setSearchCount(false); page.setCurrent(1); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List list = busWellInfoService.getBatchExportData(dataScope, page, wellType, deptid, keywords); list.forEach(batchExportDataDto -> { - batchExportDataDto.setBfztName(permissionService.getDictNameByCode("bfzt", batchExportDataDto.getBfzt())); + batchExportDataDto.setBfztName(dictService.getDictNameByCode("bfzt", batchExportDataDto.getBfzt())); // batchExportDataDto.setDeviceCount(busWellInfoService.getDeviceCountData(batchExportDataDto.getId())); // batchExportDataDto.setDeptName(busWellInfoService.getDeptNameData(batchExportDataDto.getDeptId())); - batchExportDataDto.setWellTypeName(permissionService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType())); - batchExportDataDto.setDeptName(permissionService.getDeptName(batchExportDataDto.getDeptId())); + batchExportDataDto.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType())); + batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(batchExportDataDto.getDeptId())); }); - - List res = new ArrayList<>(); - res.addAll(list); //获取导出文件header - super.exportExcel(SluicewellExportEnum.DEVICE_EXPORT, res); +// DEVICE_EXPORT(new ArrayList() {{ +// add(new Header("井编号", "wellCode")); +// add(new Header("井名称", "wellName")); +// add(new Header("井深", "deep")); +// add(new Header("详细地址", "position")); +// add(new Header("井类型", "wellTypeName")); +// add(new Header("权属单位", "deptName")); +// add(new Header("设备数量", "deviceCount")); +// add(new Header("布防状态", "bfztName")); +// }}, "sluicewell.xlsx", "井数据导出");SluicewellExportEnum.DEVICE_EXPORT + super.exportExcel(BatchExportDataDto.class, list,""); //super.exportExcel(SluicewellExportEnum.SLUICEWELLDATA_EXPORT, list, response); } @@ -394,8 +394,8 @@ @RequestMapping(value = "/selectOne", method = RequestMethod.GET) @ResponseBody public Object selectOne(String wellCode) { - if (StringUtils.isEmpty(wellCode)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (StrUtil.isEmpty(wellCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } HasWellDto hasWellDto = new HasWellDto(); @@ -440,10 +440,10 @@ @RequestMapping(value = "/getWellByCode", method = RequestMethod.GET) @ResponseBody public Object getWellByCode(String wellCode){ - EntityWrapper wrapper = new EntityWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("WELL_CODE",wellCode); wrapper.eq("valid",1); - return new SuccessResponseData(busWellInfoService.selectOne(wrapper)); + return new SuccessResponseData(busWellInfoService.getOne(wrapper)); } } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java index 33dca81..d451598 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java @@ -1,27 +1,23 @@ package com.casic.missiles.modular.system.enmus; -import com.casic.missiles.core.enums.ExportExcelEnum; -import com.casic.missiles.core.enums.ExportExcelHeaderEnum; -import com.casic.missiles.core.util.SpringContextHolder; -import com.casic.missiles.modular.config.SluicewellServerProperties; -import org.hswebframework.expands.office.excel.config.Header; import java.util.ArrayList; import java.util.List; import java.util.Map; -public enum SluicewellExportEnum implements ExportExcelHeaderEnum { +public enum SluicewellExportEnum { - DEVICE_EXPORT(new ArrayList() {{ - add(new Header("井编号", "wellCode")); - add(new Header("井名称", "wellName")); - add(new Header("井深", "deep")); - add(new Header("详细地址", "position")); - add(new Header("井类型", "wellTypeName")); - add(new Header("权属单位", "deptName")); - add(new Header("设备数量", "deviceCount")); - add(new Header("布防状态", "bfztName")); + DEVICE_EXPORT( + new ArrayList() {{ +// add(new Header("井编号", "wellCode")); +// add(new Header("井名称", "wellName")); +// add(new Header("井深", "deep")); +// add(new Header("详细地址", "position")); +// add(new Header("井类型", "wellTypeName")); +// add(new Header("权属单位", "deptName")); +// add(new Header("设备数量", "deviceCount")); +// add(new Header("布防状态", "bfztName")); }}, "sluicewell.xlsx", "井数据导出"); //SLUICEWELLDATA_EXPORT("sluicewell.xlsx", "sluicewell.xlsx", "闸井数据"); @@ -29,7 +25,7 @@ /** * 导出模板相对路径 */ - private List
headers; + private List headers; /** * 下载文件名 */ @@ -39,28 +35,24 @@ */ private String description; - SluicewellExportEnum(List
headers, String fileName, String description) { + SluicewellExportEnum(List headers, String fileName, String description) { this.headers = headers; this.fileName = fileName; this.description = description; } - @Override - public List
getHeaders() { + public List getHeaders() { return headers; } - @Override public String getFileName() { return fileName; } - @Override public String getDescription() { return description; } - @Override public Map getCustomColumnStyle() { return null; } diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 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 b3f3bfe..6262c52 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 @@ -15,7 +15,7 @@ import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConcentratorService; -import com.casic.missiles.util.DeviceUtility; +import com.casic.missiles.modular.system.util.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -140,8 +140,8 @@ void loadPostion(BusConcentrator entity) { if (StrUtil.isNotEmpty(entity.getLat()) && StrUtil.isNotEmpty(entity.getLng())) { - Map baiduCoordinate = DeviceUtility.convertBaiduAPI(entity.getLng(), entity.getLat()); - Map gaodeCoordinate = DeviceUtility.convertGaodeAPI(entity.getLng(), entity.getLat()); + Map baiduCoordinate = Utility.convertBaiduAPI(entity.getLng(), entity.getLat()); + Map gaodeCoordinate = Utility.convertGaodeAPI(entity.getLng(), entity.getLat()); if (ObjectUtil.isEmpty(baiduCoordinate) || ObjectUtil.isEmpty(gaodeCoordinate)) { logger.error("{}坐标转换失败!", entity.getConcencode()); return; diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 61a3580..3054996 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server-support - casic 的spring boot版本 + 闸井产品-服务支撑子包 @@ -36,6 +36,16 @@ provided + + com.casic + casic-http + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java new file mode 100644 index 0000000..e1030f2 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") +public class DeviceApiProperties { + private String baiduUrl = null; + private String baiduAk = null; + + private String gaodeUrl = null; + private String gaodeKey = null; +} \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index b49b8c0..cc60629 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -1,13 +1,12 @@ package com.casic.missiles.modular.system.dto; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; +import cn.hutool.core.date.DateUtil; import java.util.Date; /** *

- * + * *

* * @author casic123 @@ -177,9 +176,8 @@ } public String getAlarmTime() { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); if (null != this.alarmTimeDate) { - return fmt.print(alarmTimeDate.getTime()); + return DateUtil.format(alarmTimeDate, "yyyy-MM-dd HH:mm:ss"); } else { return ""; } @@ -268,13 +266,13 @@ @Override public String toString() { return "AlarmNowView{" + - "id=" + alarmId + - ", deviceId=" + deviceId + - ", wellId=" + wellId + - ", wellCode=" + wellCode + - ", alarmType=" + alarmType + - ", alarmContent=" + alarmContent + - ", alarmTime=" + getAlarmTime() + - "}"; + "id=" + alarmId + + ", deviceId=" + deviceId + + ", wellId=" + wellId + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmTime=" + getAlarmTime() + + "}"; } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 4b8cb20..21df9e4 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -1,8 +1,7 @@ package com.casic.missiles.modular.system.dto; +import cn.hutool.core.date.DateUtil; import com.casic.missiles.modular.system.model.BusWellInfo; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; @@ -283,8 +282,7 @@ //this.setStaff(busWellInfo.getStaff()); //this.setTel(busWellInfo.getTel()); if (null != busWellInfo.getTs()) { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); - this.setTs(fmt.print(busWellInfo.getTs().getTime())); + this.setTs(DateUtil.format(busWellInfo.getTs(), "yyyy-MM-dd HH:mm:ss")); } this.setValid(busWellInfo.getValid()); } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index f600534..5df70d3 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server - casic 的spring boot版本 + 闸井产品-其他服务类子包 diff --git a/casic-sluicewell/pom.xml b/casic-sluicewell/pom.xml index 6483b6d..3edad2b 100644 --- a/casic-sluicewell/pom.xml +++ b/casic-sluicewell/pom.xml @@ -11,7 +11,7 @@ casic-sluicewell jar casic-sluicewell - 井管理模块 + 闸井产品-井管理子包 diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 3fe5bba..bd62f3f 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -1,5 +1,10 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.modular.system.constant.BusWellConst; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.model.response.ErrorResponseData; @@ -16,7 +21,6 @@ import com.casic.missiles.modular.system.dto.HasWellDto; import com.casic.missiles.modular.system.enmus.SluicewellExportEnum; import com.casic.missiles.modular.system.util.Utility; -import com.casic.missiles.quartz.job.MyJob; import com.casic.missiles.quartz.service.IQuartzManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +34,6 @@ import java.io.IOException; import java.io.InputStream; -import java.rmi.ServerException; import java.util.*; import com.casic.missiles.core.page.PageFactory; @@ -55,9 +58,10 @@ @Resource private AbstractPermissionContext permissionService; - @Autowired + @Resource private IBusWellInfoService busWellInfoService; - + @Resource + private AbstractDictService dictService; @Autowired public IQuartzManager quartzManager; @@ -164,16 +168,16 @@ @ResponseBody @BussinessLog(value = "修改井信息", key = BusWellConst.SLUICEWELL_ADD_LOG_KEY, dict = BusWellDict.class) public Object update(BusWellInfo busWellInfo) { - if (ToolUtil.isEmpty(busWellInfo.getId())) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null == busWellInfo.getId()) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } - BusWellInfo oldBusWellInfo = this.busWellInfoService.selectById(busWellInfo.getId()); + BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId()); LogObjectHolder.me().set(oldBusWellInfo); Utility.convertCoordinate(busWellInfo); - if(ToolUtil.isEmpty(busWellInfo.getResponsibleDept())){ + if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){ busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); } @@ -193,7 +197,7 @@ @ResponseBody public Object detail(@PathVariable("busWellInfoId") String busWellInfoId) { - return ResponseData.success(busWellInfoService.selectById(busWellInfoId)); + return ResponseData.success(busWellInfoService.getById(busWellInfoId)); } /** @@ -201,13 +205,13 @@ */ @RequestMapping(value = "/info", method = RequestMethod.GET) @ResponseBody - public Object info(Integer id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + public Object info(Long id) { + if (null == id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); - resultData.setData(busWellInfoService.selectById(id)); + resultData.setData(busWellInfoService.getById(id)); return resultData; } @@ -219,8 +223,8 @@ @RequestMapping(value = "/watchDataByWell", method = RequestMethod.GET) @ResponseBody public Object watchDataByWell(Long id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null == id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); resultData.setData(busWellInfoService.getWatchDatas(id)); @@ -235,11 +239,11 @@ @ResponseBody public Object countByBfzt() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips(); + Set roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips(); List deptIds = null; Boolean isApp = false; if (roleTipes.contains("leader") || roleTipes.contains("member")) { - deptIds = permissionService.getSubDepts(permissionService.getAuthService().getLoginUser().getDeptId(), null); + deptIds = permissionService.getDeptService().getIdsByPid(permissionService.getAuthService().getLoginUser().getDeptId(), null); deptIds.add(permissionService.getAuthService().getLoginUser().getDeptId()); isApp = true; }else{ @@ -260,8 +264,8 @@ @RequestMapping(value = "/bfcf", method = RequestMethod.POST) @ResponseBody public Object bfcf(Long wellId, String bfzt) { - if (ToolUtil.isEmpty(wellId) || ToolUtil.isEmpty(bfzt)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null ==wellId || StrUtil.isEmpty(bfzt)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } BusWellInfo busWellInfo = new BusWellInfo(); @@ -291,8 +295,8 @@ @RequestMapping(value = "/bfType", method = RequestMethod.GET) @ResponseBody public Object bfType(Long id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null ==id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); resultData.setData(busWellInfoService.getWatchDatas(id)); @@ -311,7 +315,8 @@ List results = new ArrayList<>(); //设置表头与字段映射,可通过反射获取 Map mapper = new HashMap<>(); - mapper.put("井编号", "wellCode");//判断唯一 + //判断唯一 + mapper.put("井编号", "wellCode"); mapper.put("井名称", "wellName"); mapper.put("井深", "deep"); mapper.put("区", "qu"); @@ -324,22 +329,11 @@ mapper.put("井维护单位代码", "responsibleDept"); try { try (InputStream in = file.getInputStream()) { - ExcelIO.read(in, mapper, BusWellInfo.class, (row) -> { - //读取sheet - if (row.getSheet() == 0) { - if (row.getResult() != null) { - BusWellInfo busWellInfo = row.getResult(); - results.add(busWellInfo); - } - } else { - //其他sheet停止读取 - logger.info("当前sheet" + row.getSheet() + ",停止读取"); - row.shutdown(); - } - }); + results = this.importExcel(BusWellInfo.class,file,null,null); + List list = busWellInfoService.addWellBatch(results); - if (!ToolUtil.isEmpty(list)) { + if (!CollectionUtil.isEmpty(list)) { //获取第校验报错信息 return new ErrorResponseData(list.get(0)); } @@ -360,30 +354,36 @@ } - @ApiOperation("批量导出井接口") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) @ResponseBody public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { - Page page = new PageFactory().defaultPage(); + Page page = PageFactory.defaultPage(); page.setSearchCount(false); page.setCurrent(1); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List list = busWellInfoService.getBatchExportData(dataScope, page, wellType, deptid, keywords); list.forEach(batchExportDataDto -> { - batchExportDataDto.setBfztName(permissionService.getDictNameByCode("bfzt", batchExportDataDto.getBfzt())); + batchExportDataDto.setBfztName(dictService.getDictNameByCode("bfzt", batchExportDataDto.getBfzt())); // batchExportDataDto.setDeviceCount(busWellInfoService.getDeviceCountData(batchExportDataDto.getId())); // batchExportDataDto.setDeptName(busWellInfoService.getDeptNameData(batchExportDataDto.getDeptId())); - batchExportDataDto.setWellTypeName(permissionService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType())); - batchExportDataDto.setDeptName(permissionService.getDeptName(batchExportDataDto.getDeptId())); + batchExportDataDto.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType())); + batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(batchExportDataDto.getDeptId())); }); - - List res = new ArrayList<>(); - res.addAll(list); //获取导出文件header - super.exportExcel(SluicewellExportEnum.DEVICE_EXPORT, res); +// DEVICE_EXPORT(new ArrayList() {{ +// add(new Header("井编号", "wellCode")); +// add(new Header("井名称", "wellName")); +// add(new Header("井深", "deep")); +// add(new Header("详细地址", "position")); +// add(new Header("井类型", "wellTypeName")); +// add(new Header("权属单位", "deptName")); +// add(new Header("设备数量", "deviceCount")); +// add(new Header("布防状态", "bfztName")); +// }}, "sluicewell.xlsx", "井数据导出");SluicewellExportEnum.DEVICE_EXPORT + super.exportExcel(BatchExportDataDto.class, list,""); //super.exportExcel(SluicewellExportEnum.SLUICEWELLDATA_EXPORT, list, response); } @@ -394,8 +394,8 @@ @RequestMapping(value = "/selectOne", method = RequestMethod.GET) @ResponseBody public Object selectOne(String wellCode) { - if (StringUtils.isEmpty(wellCode)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (StrUtil.isEmpty(wellCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } HasWellDto hasWellDto = new HasWellDto(); @@ -440,10 +440,10 @@ @RequestMapping(value = "/getWellByCode", method = RequestMethod.GET) @ResponseBody public Object getWellByCode(String wellCode){ - EntityWrapper wrapper = new EntityWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("WELL_CODE",wellCode); wrapper.eq("valid",1); - return new SuccessResponseData(busWellInfoService.selectOne(wrapper)); + return new SuccessResponseData(busWellInfoService.getOne(wrapper)); } } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java index 33dca81..d451598 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java @@ -1,27 +1,23 @@ package com.casic.missiles.modular.system.enmus; -import com.casic.missiles.core.enums.ExportExcelEnum; -import com.casic.missiles.core.enums.ExportExcelHeaderEnum; -import com.casic.missiles.core.util.SpringContextHolder; -import com.casic.missiles.modular.config.SluicewellServerProperties; -import org.hswebframework.expands.office.excel.config.Header; import java.util.ArrayList; import java.util.List; import java.util.Map; -public enum SluicewellExportEnum implements ExportExcelHeaderEnum { +public enum SluicewellExportEnum { - DEVICE_EXPORT(new ArrayList() {{ - add(new Header("井编号", "wellCode")); - add(new Header("井名称", "wellName")); - add(new Header("井深", "deep")); - add(new Header("详细地址", "position")); - add(new Header("井类型", "wellTypeName")); - add(new Header("权属单位", "deptName")); - add(new Header("设备数量", "deviceCount")); - add(new Header("布防状态", "bfztName")); + DEVICE_EXPORT( + new ArrayList() {{ +// add(new Header("井编号", "wellCode")); +// add(new Header("井名称", "wellName")); +// add(new Header("井深", "deep")); +// add(new Header("详细地址", "position")); +// add(new Header("井类型", "wellTypeName")); +// add(new Header("权属单位", "deptName")); +// add(new Header("设备数量", "deviceCount")); +// add(new Header("布防状态", "bfztName")); }}, "sluicewell.xlsx", "井数据导出"); //SLUICEWELLDATA_EXPORT("sluicewell.xlsx", "sluicewell.xlsx", "闸井数据"); @@ -29,7 +25,7 @@ /** * 导出模板相对路径 */ - private List
headers; + private List headers; /** * 下载文件名 */ @@ -39,28 +35,24 @@ */ private String description; - SluicewellExportEnum(List
headers, String fileName, String description) { + SluicewellExportEnum(List headers, String fileName, String description) { this.headers = headers; this.fileName = fileName; this.description = description; } - @Override - public List
getHeaders() { + public List getHeaders() { return headers; } - @Override public String getFileName() { return fileName; } - @Override public String getDescription() { return description; } - @Override public Map getCustomColumnStyle() { return null; } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index f82f8df..9776169 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.util.SpringContextHolder; import com.casic.missiles.modular.config.SluicewellProperties; import com.casic.missiles.modular.system.constant.BusWellConst; @@ -10,13 +14,11 @@ import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.BusWellInfoMapper; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.IBusWellInfoService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.modular.system.util.Utility; -import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +28,7 @@ import org.springframework.validation.FieldError; import org.springframework.validation.Validator; +import javax.annotation.Resource; import java.io.Serializable; import java.text.DateFormat; import java.text.DecimalFormat; @@ -46,38 +49,40 @@ @Resource private AbstractPermissionContext service; - + @Resource + private AbstractDictService dictService; @Autowired private Validator validator; @Override - public BusWellInfo selectById(Serializable id) { - BusWellInfo wellInfo = super.selectById(id); - wellInfo.setDeptName(service.getDeptName(wellInfo.getDeptid())); + public BusWellInfo getById(Serializable id) { + BusWellInfo wellInfo = super.getById(id); + wellInfo.setDeptName(service.getDeptService().getDeptName(wellInfo.getDeptid())); //wellInfo.setResponsibleDept(wellInfo.getStaff()); - wellInfo.setResponsibleDeptName(service.getDeptName(wellInfo.getResponsibleDept())); - wellInfo.setBfztName(service.getDictNameByCode("bfZt", wellInfo.getBfzt())); - wellInfo.setWellTypeName(service.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, wellInfo.getWellType())); + wellInfo.setResponsibleDeptName(service.getDeptService().getDeptName(wellInfo.getResponsibleDept())); + wellInfo.setBfztName(dictService.getDictNameByCode("bfZt", wellInfo.getBfzt())); + wellInfo.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, wellInfo.getWellType())); wellInfo.setQu(this.getAreaPid(wellInfo.getArea())); return wellInfo; } + @Override @Transactional public List selectDataScopePage(DataScope dataScope, Page page, String keywords, String wellType, String deptid, String bfzt) { List list = this.baseMapper.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt); list.forEach(well -> { - well.setWellTypeName(service.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType())); - well.setDeptName(service.getDeptName(well.getDeptid())); - well.setBfztName(service.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); + well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType())); + well.setDeptName(service.getDeptService().getDeptName(well.getDeptid())); + well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); // well.setDeviceCount(this.getDeviceCountData(well.getId())); well.setQu(this.getAreaPid(well.getArea())); - well.setResponsibleDeptName(service.getDeptName(well.getResponsibleDept())); + well.setResponsibleDeptName(service.getDeptService().getDeptName(well.getResponsibleDept())); }); return list; } - + @Override public List getWatchDatas(Long id) { List deviceInWellInfos = this.baseMapper.getDeviceInWellInfo(id); @@ -89,7 +94,7 @@ watchDataDto.setDevcode(deviceInWellInfo.getDevcode()); watchDataDto.setInstallDate(deviceInWellInfo.getInstallDate()); watchDataDto.setOnlineState(deviceInWellInfo.getOnlineState()); - watchDataDto.setOnlineStateName(service.getDictNameByCode("onlineStatus", deviceInWellInfo.getOnlineState())); + watchDataDto.setOnlineStateName(dictService.getDictNameByCode("onlineStatus", deviceInWellInfo.getOnlineState())); DeviceData deviceData; DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -99,7 +104,7 @@ deviceData = this.baseMapper.wellcoverData(deviceInWellInfo.getDevcode()); watchDataDto.setWatchType("井盖状态"); watchDataDto.setType("1"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { //井盖离线 if ("0".equals(watchDataDto.getOnlineState())) { watchDataDto.setValue("离线"); @@ -123,7 +128,7 @@ case "液位监测仪": deviceData = this.baseMapper.liquidData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("井内水位"); watchDataDto.setType("2"); @@ -136,7 +141,7 @@ case "有害气体监测仪": deviceData = this.baseMapper.harmfulgasData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] harmfulGasDatas = deviceData.getData().split(","); HarmfulGasBusiness[] harmfulGasBusinesses = HarmfulGasBusiness.values(); @@ -153,7 +158,7 @@ case "燃气智能监测终端": deviceData = this.baseMapper.gasData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("燃气浓度"); watchDataDto.setType("4"); @@ -166,7 +171,7 @@ case "温湿度监测仪": deviceData = this.baseMapper.temphumData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] temphumDatas = deviceData.getData().split(","); TemphumBusiness[] temphumBusinesses = TemphumBusiness.values(); @@ -183,7 +188,7 @@ case "开挖监测仪": deviceData = this.baseMapper.digData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("开挖状态"); watchDataDto.setType("6"); @@ -196,7 +201,7 @@ case "噪声记录仪": deviceData = this.baseMapper.noiseData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("管线噪声"); watchDataDto.setType("8"); @@ -209,7 +214,7 @@ case "井盖定位监测仪": deviceData = this.baseMapper.wellcoverlocaData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("井盖位置"); watchDataDto.setType("7"); @@ -224,7 +229,7 @@ deviceData = this.baseMapper.lgGasData(deviceInWellInfo.getDevcode()); watchDataDto.setWatchType("燃气浓度"); watchDataDto.setType("10"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { Double dValue = Double.parseDouble(deviceData.getData()); if (dValue <= 20.0) { @@ -246,7 +251,7 @@ deviceData = this.baseMapper.lgLiquidData(deviceInWellInfo.getDevcode()); watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); @@ -278,7 +283,7 @@ case "井盖状态监测仪": deviceData = this.baseMapper.wellcoverData(devcode); deviceDataDto.setTypeName("井盖状态"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { //井盖离线 if ("0".equals(status)) { deviceDataDto.setValue("离线"); @@ -298,7 +303,7 @@ case "液位监测仪": deviceData = this.baseMapper.liquidData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("井内水位"); deviceDataDto.setValue(deviceData.getData() + "m"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -308,7 +313,7 @@ case "有害气体监测仪": deviceData = this.baseMapper.harmfulgasData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] harmfulGasDatas = deviceData.getData().split(","); HarmfulGasBusiness[] harmfulGasBusinesses = HarmfulGasBusiness.values(); for (int i = 0; i < harmfulGasDatas.length; i++) { @@ -322,7 +327,7 @@ break; case "燃气智能监测终端": deviceData = this.baseMapper.gasData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("燃气浓度"); deviceDataDto.setValue(deviceData.getData() + "%LEL"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -332,7 +337,7 @@ case "温湿度监测仪": deviceData = this.baseMapper.temphumData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] temphumDatas = deviceData.getData().split(","); TemphumBusiness[] temphumBusinesses = TemphumBusiness.values(); for (int i = 0; i < temphumDatas.length; i++) { @@ -347,7 +352,7 @@ case "开挖监测仪": deviceData = this.baseMapper.digData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("开挖状态"); deviceDataDto.setValue(deviceData.getData() + "mg"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -357,7 +362,7 @@ case "噪声记录仪": deviceData = this.baseMapper.noiseData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("管线噪声"); deviceDataDto.setValue(deviceData.getData() + "mg"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -366,7 +371,7 @@ break; case "井盖定位监测仪": deviceData = this.baseMapper.wellcoverlocaData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("井盖位置"); deviceDataDto.setValue(deviceData.getData()); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -377,7 +382,7 @@ case "燃气智能监测终端(一体化)": deviceData = this.baseMapper.lgGasData(devcode); deviceDataDto.setTypeName("燃气浓度"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { Double dValue = Double.parseDouble(deviceData.getData()); if (dValue <= 20.0) { @@ -395,7 +400,7 @@ deviceData = this.baseMapper.lgLiquidData(devcode); deviceDataDto.setTypeName("井内水位"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setValue(deviceData.getData() + "m"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -413,6 +418,7 @@ } + @Override public BfztCountDataDto getBfztCountData(List deptIds, Boolean isApp) { return this.baseMapper.bfztCountData(deptIds, isApp); } @@ -427,15 +433,18 @@ return this.baseMapper.getBatchExportData(dataScope, page, deviceType, deptid, keywords); } + @Override public Integer getDeviceCountData(Long id) { return this.baseMapper.deviceCountData(id); } + @Override public String getDeptNameData(String deptid) { return this.baseMapper.deptNameData(deptid); } + @Override public List deleteBatchByIds(List ids) { List lists = new ArrayList<>(); @@ -461,8 +470,8 @@ List list = new ArrayList<>(); List gpsCoordinates = new ArrayList<>(); - if (ToolUtil.isNotEmpty(results)) { - List dicts = service.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);//闸井类型 + if (CollectionUtil.isNotEmpty(results)) { + List dicts = dictService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);//闸井类型 Map sluicewellTypeMap = new HashMap<>(); dicts.forEach(dict -> { sluicewellTypeMap.put(dict.getName(), dict.getCode()); @@ -489,7 +498,7 @@ //其他相关性校验 String areaId = this.baseMapper.getAreaId(well.getQu(), well.getArea()); - if (ToolUtil.isNotEmpty(areaId)) { + if (StrUtil.isNotEmpty(areaId)) { well.setArea(areaId); } else { list.add("第" + index[0] + "行，区与街道名不对应！"); @@ -513,7 +522,7 @@ logger.info("第" + index[0] + "行校验完毕！"); } - if (ToolUtil.isNotEmpty(list)) { + if (CollectionUtil.isNotEmpty(list)) { return list; } @@ -527,7 +536,7 @@ convertCoordinates = Utility.convertGaodeAPI(gpsCoordinates); } - if (ToolUtil.isNotEmpty(convertCoordinates) && + if (CollectionUtil.isNotEmpty(convertCoordinates) && results.size() == convertCoordinates.size()) { if ("baidu".equals(coordinate)) { @@ -545,7 +554,7 @@ } } - this.insertBatch(results); + this.saveBatch(results); } else { list.add("导入数据不能为空"); @@ -568,10 +577,12 @@ return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, deptid); } + @Override public String getAreaPid(String id) { return this.baseMapper.getAreaPId(id); } + @Override @Transactional public void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds) { diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 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 b3f3bfe..6262c52 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 @@ -15,7 +15,7 @@ import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConcentratorService; -import com.casic.missiles.util.DeviceUtility; +import com.casic.missiles.modular.system.util.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -140,8 +140,8 @@ void loadPostion(BusConcentrator entity) { if (StrUtil.isNotEmpty(entity.getLat()) && StrUtil.isNotEmpty(entity.getLng())) { - Map baiduCoordinate = DeviceUtility.convertBaiduAPI(entity.getLng(), entity.getLat()); - Map gaodeCoordinate = DeviceUtility.convertGaodeAPI(entity.getLng(), entity.getLat()); + Map baiduCoordinate = Utility.convertBaiduAPI(entity.getLng(), entity.getLat()); + Map gaodeCoordinate = Utility.convertGaodeAPI(entity.getLng(), entity.getLat()); if (ObjectUtil.isEmpty(baiduCoordinate) || ObjectUtil.isEmpty(gaodeCoordinate)) { logger.error("{}坐标转换失败!", entity.getConcencode()); return; diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 61a3580..3054996 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server-support - casic 的spring boot版本 + 闸井产品-服务支撑子包 @@ -36,6 +36,16 @@ provided + + com.casic + casic-http + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java new file mode 100644 index 0000000..e1030f2 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") +public class DeviceApiProperties { + private String baiduUrl = null; + private String baiduAk = null; + + private String gaodeUrl = null; + private String gaodeKey = null; +} \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index b49b8c0..cc60629 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -1,13 +1,12 @@ package com.casic.missiles.modular.system.dto; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; +import cn.hutool.core.date.DateUtil; import java.util.Date; /** *

- * + * *

* * @author casic123 @@ -177,9 +176,8 @@ } public String getAlarmTime() { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); if (null != this.alarmTimeDate) { - return fmt.print(alarmTimeDate.getTime()); + return DateUtil.format(alarmTimeDate, "yyyy-MM-dd HH:mm:ss"); } else { return ""; } @@ -268,13 +266,13 @@ @Override public String toString() { return "AlarmNowView{" + - "id=" + alarmId + - ", deviceId=" + deviceId + - ", wellId=" + wellId + - ", wellCode=" + wellCode + - ", alarmType=" + alarmType + - ", alarmContent=" + alarmContent + - ", alarmTime=" + getAlarmTime() + - "}"; + "id=" + alarmId + + ", deviceId=" + deviceId + + ", wellId=" + wellId + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmTime=" + getAlarmTime() + + "}"; } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 4b8cb20..21df9e4 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -1,8 +1,7 @@ package com.casic.missiles.modular.system.dto; +import cn.hutool.core.date.DateUtil; import com.casic.missiles.modular.system.model.BusWellInfo; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; @@ -283,8 +282,7 @@ //this.setStaff(busWellInfo.getStaff()); //this.setTel(busWellInfo.getTel()); if (null != busWellInfo.getTs()) { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); - this.setTs(fmt.print(busWellInfo.getTs().getTime())); + this.setTs(DateUtil.format(busWellInfo.getTs(), "yyyy-MM-dd HH:mm:ss")); } this.setValid(busWellInfo.getValid()); } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index f600534..5df70d3 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server - casic 的spring boot版本 + 闸井产品-其他服务类子包 diff --git a/casic-sluicewell/pom.xml b/casic-sluicewell/pom.xml index 6483b6d..3edad2b 100644 --- a/casic-sluicewell/pom.xml +++ b/casic-sluicewell/pom.xml @@ -11,7 +11,7 @@ casic-sluicewell jar casic-sluicewell - 井管理模块 + 闸井产品-井管理子包 diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 3fe5bba..bd62f3f 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -1,5 +1,10 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.modular.system.constant.BusWellConst; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.model.response.ErrorResponseData; @@ -16,7 +21,6 @@ import com.casic.missiles.modular.system.dto.HasWellDto; import com.casic.missiles.modular.system.enmus.SluicewellExportEnum; import com.casic.missiles.modular.system.util.Utility; -import com.casic.missiles.quartz.job.MyJob; import com.casic.missiles.quartz.service.IQuartzManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +34,6 @@ import java.io.IOException; import java.io.InputStream; -import java.rmi.ServerException; import java.util.*; import com.casic.missiles.core.page.PageFactory; @@ -55,9 +58,10 @@ @Resource private AbstractPermissionContext permissionService; - @Autowired + @Resource private IBusWellInfoService busWellInfoService; - + @Resource + private AbstractDictService dictService; @Autowired public IQuartzManager quartzManager; @@ -164,16 +168,16 @@ @ResponseBody @BussinessLog(value = "修改井信息", key = BusWellConst.SLUICEWELL_ADD_LOG_KEY, dict = BusWellDict.class) public Object update(BusWellInfo busWellInfo) { - if (ToolUtil.isEmpty(busWellInfo.getId())) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null == busWellInfo.getId()) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } - BusWellInfo oldBusWellInfo = this.busWellInfoService.selectById(busWellInfo.getId()); + BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId()); LogObjectHolder.me().set(oldBusWellInfo); Utility.convertCoordinate(busWellInfo); - if(ToolUtil.isEmpty(busWellInfo.getResponsibleDept())){ + if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){ busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); } @@ -193,7 +197,7 @@ @ResponseBody public Object detail(@PathVariable("busWellInfoId") String busWellInfoId) { - return ResponseData.success(busWellInfoService.selectById(busWellInfoId)); + return ResponseData.success(busWellInfoService.getById(busWellInfoId)); } /** @@ -201,13 +205,13 @@ */ @RequestMapping(value = "/info", method = RequestMethod.GET) @ResponseBody - public Object info(Integer id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + public Object info(Long id) { + if (null == id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); - resultData.setData(busWellInfoService.selectById(id)); + resultData.setData(busWellInfoService.getById(id)); return resultData; } @@ -219,8 +223,8 @@ @RequestMapping(value = "/watchDataByWell", method = RequestMethod.GET) @ResponseBody public Object watchDataByWell(Long id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null == id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); resultData.setData(busWellInfoService.getWatchDatas(id)); @@ -235,11 +239,11 @@ @ResponseBody public Object countByBfzt() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips(); + Set roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips(); List deptIds = null; Boolean isApp = false; if (roleTipes.contains("leader") || roleTipes.contains("member")) { - deptIds = permissionService.getSubDepts(permissionService.getAuthService().getLoginUser().getDeptId(), null); + deptIds = permissionService.getDeptService().getIdsByPid(permissionService.getAuthService().getLoginUser().getDeptId(), null); deptIds.add(permissionService.getAuthService().getLoginUser().getDeptId()); isApp = true; }else{ @@ -260,8 +264,8 @@ @RequestMapping(value = "/bfcf", method = RequestMethod.POST) @ResponseBody public Object bfcf(Long wellId, String bfzt) { - if (ToolUtil.isEmpty(wellId) || ToolUtil.isEmpty(bfzt)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null ==wellId || StrUtil.isEmpty(bfzt)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } BusWellInfo busWellInfo = new BusWellInfo(); @@ -291,8 +295,8 @@ @RequestMapping(value = "/bfType", method = RequestMethod.GET) @ResponseBody public Object bfType(Long id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null ==id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); resultData.setData(busWellInfoService.getWatchDatas(id)); @@ -311,7 +315,8 @@ List results = new ArrayList<>(); //设置表头与字段映射,可通过反射获取 Map mapper = new HashMap<>(); - mapper.put("井编号", "wellCode");//判断唯一 + //判断唯一 + mapper.put("井编号", "wellCode"); mapper.put("井名称", "wellName"); mapper.put("井深", "deep"); mapper.put("区", "qu"); @@ -324,22 +329,11 @@ mapper.put("井维护单位代码", "responsibleDept"); try { try (InputStream in = file.getInputStream()) { - ExcelIO.read(in, mapper, BusWellInfo.class, (row) -> { - //读取sheet - if (row.getSheet() == 0) { - if (row.getResult() != null) { - BusWellInfo busWellInfo = row.getResult(); - results.add(busWellInfo); - } - } else { - //其他sheet停止读取 - logger.info("当前sheet" + row.getSheet() + ",停止读取"); - row.shutdown(); - } - }); + results = this.importExcel(BusWellInfo.class,file,null,null); + List list = busWellInfoService.addWellBatch(results); - if (!ToolUtil.isEmpty(list)) { + if (!CollectionUtil.isEmpty(list)) { //获取第校验报错信息 return new ErrorResponseData(list.get(0)); } @@ -360,30 +354,36 @@ } - @ApiOperation("批量导出井接口") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) @ResponseBody public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { - Page page = new PageFactory().defaultPage(); + Page page = PageFactory.defaultPage(); page.setSearchCount(false); page.setCurrent(1); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List list = busWellInfoService.getBatchExportData(dataScope, page, wellType, deptid, keywords); list.forEach(batchExportDataDto -> { - batchExportDataDto.setBfztName(permissionService.getDictNameByCode("bfzt", batchExportDataDto.getBfzt())); + batchExportDataDto.setBfztName(dictService.getDictNameByCode("bfzt", batchExportDataDto.getBfzt())); // batchExportDataDto.setDeviceCount(busWellInfoService.getDeviceCountData(batchExportDataDto.getId())); // batchExportDataDto.setDeptName(busWellInfoService.getDeptNameData(batchExportDataDto.getDeptId())); - batchExportDataDto.setWellTypeName(permissionService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType())); - batchExportDataDto.setDeptName(permissionService.getDeptName(batchExportDataDto.getDeptId())); + batchExportDataDto.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType())); + batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(batchExportDataDto.getDeptId())); }); - - List res = new ArrayList<>(); - res.addAll(list); //获取导出文件header - super.exportExcel(SluicewellExportEnum.DEVICE_EXPORT, res); +// DEVICE_EXPORT(new ArrayList() {{ +// add(new Header("井编号", "wellCode")); +// add(new Header("井名称", "wellName")); +// add(new Header("井深", "deep")); +// add(new Header("详细地址", "position")); +// add(new Header("井类型", "wellTypeName")); +// add(new Header("权属单位", "deptName")); +// add(new Header("设备数量", "deviceCount")); +// add(new Header("布防状态", "bfztName")); +// }}, "sluicewell.xlsx", "井数据导出");SluicewellExportEnum.DEVICE_EXPORT + super.exportExcel(BatchExportDataDto.class, list,""); //super.exportExcel(SluicewellExportEnum.SLUICEWELLDATA_EXPORT, list, response); } @@ -394,8 +394,8 @@ @RequestMapping(value = "/selectOne", method = RequestMethod.GET) @ResponseBody public Object selectOne(String wellCode) { - if (StringUtils.isEmpty(wellCode)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (StrUtil.isEmpty(wellCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } HasWellDto hasWellDto = new HasWellDto(); @@ -440,10 +440,10 @@ @RequestMapping(value = "/getWellByCode", method = RequestMethod.GET) @ResponseBody public Object getWellByCode(String wellCode){ - EntityWrapper wrapper = new EntityWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("WELL_CODE",wellCode); wrapper.eq("valid",1); - return new SuccessResponseData(busWellInfoService.selectOne(wrapper)); + return new SuccessResponseData(busWellInfoService.getOne(wrapper)); } } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java index 33dca81..d451598 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java @@ -1,27 +1,23 @@ package com.casic.missiles.modular.system.enmus; -import com.casic.missiles.core.enums.ExportExcelEnum; -import com.casic.missiles.core.enums.ExportExcelHeaderEnum; -import com.casic.missiles.core.util.SpringContextHolder; -import com.casic.missiles.modular.config.SluicewellServerProperties; -import org.hswebframework.expands.office.excel.config.Header; import java.util.ArrayList; import java.util.List; import java.util.Map; -public enum SluicewellExportEnum implements ExportExcelHeaderEnum { +public enum SluicewellExportEnum { - DEVICE_EXPORT(new ArrayList() {{ - add(new Header("井编号", "wellCode")); - add(new Header("井名称", "wellName")); - add(new Header("井深", "deep")); - add(new Header("详细地址", "position")); - add(new Header("井类型", "wellTypeName")); - add(new Header("权属单位", "deptName")); - add(new Header("设备数量", "deviceCount")); - add(new Header("布防状态", "bfztName")); + DEVICE_EXPORT( + new ArrayList() {{ +// add(new Header("井编号", "wellCode")); +// add(new Header("井名称", "wellName")); +// add(new Header("井深", "deep")); +// add(new Header("详细地址", "position")); +// add(new Header("井类型", "wellTypeName")); +// add(new Header("权属单位", "deptName")); +// add(new Header("设备数量", "deviceCount")); +// add(new Header("布防状态", "bfztName")); }}, "sluicewell.xlsx", "井数据导出"); //SLUICEWELLDATA_EXPORT("sluicewell.xlsx", "sluicewell.xlsx", "闸井数据"); @@ -29,7 +25,7 @@ /** * 导出模板相对路径 */ - private List
headers; + private List headers; /** * 下载文件名 */ @@ -39,28 +35,24 @@ */ private String description; - SluicewellExportEnum(List
headers, String fileName, String description) { + SluicewellExportEnum(List headers, String fileName, String description) { this.headers = headers; this.fileName = fileName; this.description = description; } - @Override - public List
getHeaders() { + public List getHeaders() { return headers; } - @Override public String getFileName() { return fileName; } - @Override public String getDescription() { return description; } - @Override public Map getCustomColumnStyle() { return null; } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index f82f8df..9776169 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.util.SpringContextHolder; import com.casic.missiles.modular.config.SluicewellProperties; import com.casic.missiles.modular.system.constant.BusWellConst; @@ -10,13 +14,11 @@ import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.BusWellInfoMapper; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.IBusWellInfoService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.modular.system.util.Utility; -import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +28,7 @@ import org.springframework.validation.FieldError; import org.springframework.validation.Validator; +import javax.annotation.Resource; import java.io.Serializable; import java.text.DateFormat; import java.text.DecimalFormat; @@ -46,38 +49,40 @@ @Resource private AbstractPermissionContext service; - + @Resource + private AbstractDictService dictService; @Autowired private Validator validator; @Override - public BusWellInfo selectById(Serializable id) { - BusWellInfo wellInfo = super.selectById(id); - wellInfo.setDeptName(service.getDeptName(wellInfo.getDeptid())); + public BusWellInfo getById(Serializable id) { + BusWellInfo wellInfo = super.getById(id); + wellInfo.setDeptName(service.getDeptService().getDeptName(wellInfo.getDeptid())); //wellInfo.setResponsibleDept(wellInfo.getStaff()); - wellInfo.setResponsibleDeptName(service.getDeptName(wellInfo.getResponsibleDept())); - wellInfo.setBfztName(service.getDictNameByCode("bfZt", wellInfo.getBfzt())); - wellInfo.setWellTypeName(service.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, wellInfo.getWellType())); + wellInfo.setResponsibleDeptName(service.getDeptService().getDeptName(wellInfo.getResponsibleDept())); + wellInfo.setBfztName(dictService.getDictNameByCode("bfZt", wellInfo.getBfzt())); + wellInfo.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, wellInfo.getWellType())); wellInfo.setQu(this.getAreaPid(wellInfo.getArea())); return wellInfo; } + @Override @Transactional public List selectDataScopePage(DataScope dataScope, Page page, String keywords, String wellType, String deptid, String bfzt) { List list = this.baseMapper.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt); list.forEach(well -> { - well.setWellTypeName(service.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType())); - well.setDeptName(service.getDeptName(well.getDeptid())); - well.setBfztName(service.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); + well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType())); + well.setDeptName(service.getDeptService().getDeptName(well.getDeptid())); + well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); // well.setDeviceCount(this.getDeviceCountData(well.getId())); well.setQu(this.getAreaPid(well.getArea())); - well.setResponsibleDeptName(service.getDeptName(well.getResponsibleDept())); + well.setResponsibleDeptName(service.getDeptService().getDeptName(well.getResponsibleDept())); }); return list; } - + @Override public List getWatchDatas(Long id) { List deviceInWellInfos = this.baseMapper.getDeviceInWellInfo(id); @@ -89,7 +94,7 @@ watchDataDto.setDevcode(deviceInWellInfo.getDevcode()); watchDataDto.setInstallDate(deviceInWellInfo.getInstallDate()); watchDataDto.setOnlineState(deviceInWellInfo.getOnlineState()); - watchDataDto.setOnlineStateName(service.getDictNameByCode("onlineStatus", deviceInWellInfo.getOnlineState())); + watchDataDto.setOnlineStateName(dictService.getDictNameByCode("onlineStatus", deviceInWellInfo.getOnlineState())); DeviceData deviceData; DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -99,7 +104,7 @@ deviceData = this.baseMapper.wellcoverData(deviceInWellInfo.getDevcode()); watchDataDto.setWatchType("井盖状态"); watchDataDto.setType("1"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { //井盖离线 if ("0".equals(watchDataDto.getOnlineState())) { watchDataDto.setValue("离线"); @@ -123,7 +128,7 @@ case "液位监测仪": deviceData = this.baseMapper.liquidData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("井内水位"); watchDataDto.setType("2"); @@ -136,7 +141,7 @@ case "有害气体监测仪": deviceData = this.baseMapper.harmfulgasData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] harmfulGasDatas = deviceData.getData().split(","); HarmfulGasBusiness[] harmfulGasBusinesses = HarmfulGasBusiness.values(); @@ -153,7 +158,7 @@ case "燃气智能监测终端": deviceData = this.baseMapper.gasData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("燃气浓度"); watchDataDto.setType("4"); @@ -166,7 +171,7 @@ case "温湿度监测仪": deviceData = this.baseMapper.temphumData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] temphumDatas = deviceData.getData().split(","); TemphumBusiness[] temphumBusinesses = TemphumBusiness.values(); @@ -183,7 +188,7 @@ case "开挖监测仪": deviceData = this.baseMapper.digData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("开挖状态"); watchDataDto.setType("6"); @@ -196,7 +201,7 @@ case "噪声记录仪": deviceData = this.baseMapper.noiseData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("管线噪声"); watchDataDto.setType("8"); @@ -209,7 +214,7 @@ case "井盖定位监测仪": deviceData = this.baseMapper.wellcoverlocaData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("井盖位置"); watchDataDto.setType("7"); @@ -224,7 +229,7 @@ deviceData = this.baseMapper.lgGasData(deviceInWellInfo.getDevcode()); watchDataDto.setWatchType("燃气浓度"); watchDataDto.setType("10"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { Double dValue = Double.parseDouble(deviceData.getData()); if (dValue <= 20.0) { @@ -246,7 +251,7 @@ deviceData = this.baseMapper.lgLiquidData(deviceInWellInfo.getDevcode()); watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); @@ -278,7 +283,7 @@ case "井盖状态监测仪": deviceData = this.baseMapper.wellcoverData(devcode); deviceDataDto.setTypeName("井盖状态"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { //井盖离线 if ("0".equals(status)) { deviceDataDto.setValue("离线"); @@ -298,7 +303,7 @@ case "液位监测仪": deviceData = this.baseMapper.liquidData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("井内水位"); deviceDataDto.setValue(deviceData.getData() + "m"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -308,7 +313,7 @@ case "有害气体监测仪": deviceData = this.baseMapper.harmfulgasData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] harmfulGasDatas = deviceData.getData().split(","); HarmfulGasBusiness[] harmfulGasBusinesses = HarmfulGasBusiness.values(); for (int i = 0; i < harmfulGasDatas.length; i++) { @@ -322,7 +327,7 @@ break; case "燃气智能监测终端": deviceData = this.baseMapper.gasData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("燃气浓度"); deviceDataDto.setValue(deviceData.getData() + "%LEL"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -332,7 +337,7 @@ case "温湿度监测仪": deviceData = this.baseMapper.temphumData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] temphumDatas = deviceData.getData().split(","); TemphumBusiness[] temphumBusinesses = TemphumBusiness.values(); for (int i = 0; i < temphumDatas.length; i++) { @@ -347,7 +352,7 @@ case "开挖监测仪": deviceData = this.baseMapper.digData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("开挖状态"); deviceDataDto.setValue(deviceData.getData() + "mg"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -357,7 +362,7 @@ case "噪声记录仪": deviceData = this.baseMapper.noiseData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("管线噪声"); deviceDataDto.setValue(deviceData.getData() + "mg"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -366,7 +371,7 @@ break; case "井盖定位监测仪": deviceData = this.baseMapper.wellcoverlocaData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("井盖位置"); deviceDataDto.setValue(deviceData.getData()); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -377,7 +382,7 @@ case "燃气智能监测终端(一体化)": deviceData = this.baseMapper.lgGasData(devcode); deviceDataDto.setTypeName("燃气浓度"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { Double dValue = Double.parseDouble(deviceData.getData()); if (dValue <= 20.0) { @@ -395,7 +400,7 @@ deviceData = this.baseMapper.lgLiquidData(devcode); deviceDataDto.setTypeName("井内水位"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setValue(deviceData.getData() + "m"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -413,6 +418,7 @@ } + @Override public BfztCountDataDto getBfztCountData(List deptIds, Boolean isApp) { return this.baseMapper.bfztCountData(deptIds, isApp); } @@ -427,15 +433,18 @@ return this.baseMapper.getBatchExportData(dataScope, page, deviceType, deptid, keywords); } + @Override public Integer getDeviceCountData(Long id) { return this.baseMapper.deviceCountData(id); } + @Override public String getDeptNameData(String deptid) { return this.baseMapper.deptNameData(deptid); } + @Override public List deleteBatchByIds(List ids) { List lists = new ArrayList<>(); @@ -461,8 +470,8 @@ List list = new ArrayList<>(); List gpsCoordinates = new ArrayList<>(); - if (ToolUtil.isNotEmpty(results)) { - List dicts = service.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);//闸井类型 + if (CollectionUtil.isNotEmpty(results)) { + List dicts = dictService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);//闸井类型 Map sluicewellTypeMap = new HashMap<>(); dicts.forEach(dict -> { sluicewellTypeMap.put(dict.getName(), dict.getCode()); @@ -489,7 +498,7 @@ //其他相关性校验 String areaId = this.baseMapper.getAreaId(well.getQu(), well.getArea()); - if (ToolUtil.isNotEmpty(areaId)) { + if (StrUtil.isNotEmpty(areaId)) { well.setArea(areaId); } else { list.add("第" + index[0] + "行，区与街道名不对应！"); @@ -513,7 +522,7 @@ logger.info("第" + index[0] + "行校验完毕！"); } - if (ToolUtil.isNotEmpty(list)) { + if (CollectionUtil.isNotEmpty(list)) { return list; } @@ -527,7 +536,7 @@ convertCoordinates = Utility.convertGaodeAPI(gpsCoordinates); } - if (ToolUtil.isNotEmpty(convertCoordinates) && + if (CollectionUtil.isNotEmpty(convertCoordinates) && results.size() == convertCoordinates.size()) { if ("baidu".equals(coordinate)) { @@ -545,7 +554,7 @@ } } - this.insertBatch(results); + this.saveBatch(results); } else { list.add("导入数据不能为空"); @@ -568,10 +577,12 @@ return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, deptid); } + @Override public String getAreaPid(String id) { return this.baseMapper.getAreaPId(id); } + @Override @Transactional public void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds) { diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/HttpUtil.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/HttpUtil.java deleted file mode 100644 index 244e81b..0000000 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/HttpUtil.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.missiles.modular.system.util; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import org.apache.http.Consts; -import org.apache.http.HttpEntity; -import org.apache.http.NameValuePair; -import org.apache.http.ParseException; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.utils.URIBuilder; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -/** - * @author GWQ - * - */ -public class HttpUtil { - - private static final CloseableHttpClient httpclient = HttpClients.createDefault(); - - /** - * 发送HttpGet请求 - * @param url - * @return - */ - public static String httpGet(String url) { - - HttpGet httpget = new HttpGet(url); - CloseableHttpResponse response = null; - try { - response = httpclient.execute(httpget); - } catch (IOException e1) { - e1.printStackTrace(); - } - String result = null; - try { - HttpEntity entity = response.getEntity(); - if (entity != null) { - result = EntityUtils.toString(entity); - } - } catch (ParseException | IOException e) { - e.printStackTrace(); - } finally { - try { - response.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - return result; - } - - /** - * 发送HttpGet请求，参数为map - * @param url - * @return - */ - public static String httpGet(String url,Map map) throws Exception{ - - URIBuilder uriBuilder = new URIBuilder(url); - if (map != null) { - // 遍历map,拼接请求参数 - for (Map.Entry entry : map.entrySet()) { - uriBuilder.setParameter(entry.getKey(), entry.getValue().toString()); - } - } - // 调用不带参数的get请求 - return httpGet(uriBuilder.build().toString()); - } - - /** - * 发送HttpPost请求，参数为map - * @param url - * @param map - * @return - */ - public static String httpPost(String url, Map map) { - List formparams = new ArrayList(); - for (Map.Entry entry : map.entrySet()) { - formparams.add(new BasicNameValuePair(entry.getKey(), entry.getValue())); - } - UrlEncodedFormEntity entity = new UrlEncodedFormEntity(formparams, Consts.UTF_8); - HttpPost httppost = new HttpPost(url); - httppost.setEntity(entity); - CloseableHttpResponse response = null; - try { - response = httpclient.execute(httppost); - } catch (IOException e) { - e.printStackTrace(); - } - HttpEntity entity1 = response.getEntity(); - String result = null; - try { - result = EntityUtils.toString(entity1); - } catch (ParseException | IOException e) { - e.printStackTrace(); - } - return result; - } - - /** - * 发送不带参数的HttpPost请求 - * @param url - * @return - */ - public static String httpPost(String url) { - HttpPost httppost = new HttpPost(url); - CloseableHttpResponse response = null; - try { - response = httpclient.execute(httppost); - } catch (IOException e) { - e.printStackTrace(); - } - HttpEntity entity = response.getEntity(); - String result = null; - try { - result = EntityUtils.toString(entity); - } catch (ParseException | IOException e) { - e.printStackTrace(); - } - return result; - } - -} diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 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 b3f3bfe..6262c52 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 @@ -15,7 +15,7 @@ import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConcentratorService; -import com.casic.missiles.util.DeviceUtility; +import com.casic.missiles.modular.system.util.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -140,8 +140,8 @@ void loadPostion(BusConcentrator entity) { if (StrUtil.isNotEmpty(entity.getLat()) && StrUtil.isNotEmpty(entity.getLng())) { - Map baiduCoordinate = DeviceUtility.convertBaiduAPI(entity.getLng(), entity.getLat()); - Map gaodeCoordinate = DeviceUtility.convertGaodeAPI(entity.getLng(), entity.getLat()); + Map baiduCoordinate = Utility.convertBaiduAPI(entity.getLng(), entity.getLat()); + Map gaodeCoordinate = Utility.convertGaodeAPI(entity.getLng(), entity.getLat()); if (ObjectUtil.isEmpty(baiduCoordinate) || ObjectUtil.isEmpty(gaodeCoordinate)) { logger.error("{}坐标转换失败!", entity.getConcencode()); return; diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 61a3580..3054996 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server-support - casic 的spring boot版本 + 闸井产品-服务支撑子包 @@ -36,6 +36,16 @@ provided + + com.casic + casic-http + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java new file mode 100644 index 0000000..e1030f2 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") +public class DeviceApiProperties { + private String baiduUrl = null; + private String baiduAk = null; + + private String gaodeUrl = null; + private String gaodeKey = null; +} \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index b49b8c0..cc60629 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -1,13 +1,12 @@ package com.casic.missiles.modular.system.dto; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; +import cn.hutool.core.date.DateUtil; import java.util.Date; /** *

- * + * *

* * @author casic123 @@ -177,9 +176,8 @@ } public String getAlarmTime() { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); if (null != this.alarmTimeDate) { - return fmt.print(alarmTimeDate.getTime()); + return DateUtil.format(alarmTimeDate, "yyyy-MM-dd HH:mm:ss"); } else { return ""; } @@ -268,13 +266,13 @@ @Override public String toString() { return "AlarmNowView{" + - "id=" + alarmId + - ", deviceId=" + deviceId + - ", wellId=" + wellId + - ", wellCode=" + wellCode + - ", alarmType=" + alarmType + - ", alarmContent=" + alarmContent + - ", alarmTime=" + getAlarmTime() + - "}"; + "id=" + alarmId + + ", deviceId=" + deviceId + + ", wellId=" + wellId + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmTime=" + getAlarmTime() + + "}"; } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 4b8cb20..21df9e4 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -1,8 +1,7 @@ package com.casic.missiles.modular.system.dto; +import cn.hutool.core.date.DateUtil; import com.casic.missiles.modular.system.model.BusWellInfo; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; @@ -283,8 +282,7 @@ //this.setStaff(busWellInfo.getStaff()); //this.setTel(busWellInfo.getTel()); if (null != busWellInfo.getTs()) { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); - this.setTs(fmt.print(busWellInfo.getTs().getTime())); + this.setTs(DateUtil.format(busWellInfo.getTs(), "yyyy-MM-dd HH:mm:ss")); } this.setValid(busWellInfo.getValid()); } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index f600534..5df70d3 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server - casic 的spring boot版本 + 闸井产品-其他服务类子包 diff --git a/casic-sluicewell/pom.xml b/casic-sluicewell/pom.xml index 6483b6d..3edad2b 100644 --- a/casic-sluicewell/pom.xml +++ b/casic-sluicewell/pom.xml @@ -11,7 +11,7 @@ casic-sluicewell jar casic-sluicewell - 井管理模块 + 闸井产品-井管理子包 diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 3fe5bba..bd62f3f 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -1,5 +1,10 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.modular.system.constant.BusWellConst; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.model.response.ErrorResponseData; @@ -16,7 +21,6 @@ import com.casic.missiles.modular.system.dto.HasWellDto; import com.casic.missiles.modular.system.enmus.SluicewellExportEnum; import com.casic.missiles.modular.system.util.Utility; -import com.casic.missiles.quartz.job.MyJob; import com.casic.missiles.quartz.service.IQuartzManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +34,6 @@ import java.io.IOException; import java.io.InputStream; -import java.rmi.ServerException; import java.util.*; import com.casic.missiles.core.page.PageFactory; @@ -55,9 +58,10 @@ @Resource private AbstractPermissionContext permissionService; - @Autowired + @Resource private IBusWellInfoService busWellInfoService; - + @Resource + private AbstractDictService dictService; @Autowired public IQuartzManager quartzManager; @@ -164,16 +168,16 @@ @ResponseBody @BussinessLog(value = "修改井信息", key = BusWellConst.SLUICEWELL_ADD_LOG_KEY, dict = BusWellDict.class) public Object update(BusWellInfo busWellInfo) { - if (ToolUtil.isEmpty(busWellInfo.getId())) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null == busWellInfo.getId()) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } - BusWellInfo oldBusWellInfo = this.busWellInfoService.selectById(busWellInfo.getId()); + BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId()); LogObjectHolder.me().set(oldBusWellInfo); Utility.convertCoordinate(busWellInfo); - if(ToolUtil.isEmpty(busWellInfo.getResponsibleDept())){ + if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){ busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); } @@ -193,7 +197,7 @@ @ResponseBody public Object detail(@PathVariable("busWellInfoId") String busWellInfoId) { - return ResponseData.success(busWellInfoService.selectById(busWellInfoId)); + return ResponseData.success(busWellInfoService.getById(busWellInfoId)); } /** @@ -201,13 +205,13 @@ */ @RequestMapping(value = "/info", method = RequestMethod.GET) @ResponseBody - public Object info(Integer id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + public Object info(Long id) { + if (null == id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); - resultData.setData(busWellInfoService.selectById(id)); + resultData.setData(busWellInfoService.getById(id)); return resultData; } @@ -219,8 +223,8 @@ @RequestMapping(value = "/watchDataByWell", method = RequestMethod.GET) @ResponseBody public Object watchDataByWell(Long id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null == id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); resultData.setData(busWellInfoService.getWatchDatas(id)); @@ -235,11 +239,11 @@ @ResponseBody public Object countByBfzt() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips(); + Set roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips(); List deptIds = null; Boolean isApp = false; if (roleTipes.contains("leader") || roleTipes.contains("member")) { - deptIds = permissionService.getSubDepts(permissionService.getAuthService().getLoginUser().getDeptId(), null); + deptIds = permissionService.getDeptService().getIdsByPid(permissionService.getAuthService().getLoginUser().getDeptId(), null); deptIds.add(permissionService.getAuthService().getLoginUser().getDeptId()); isApp = true; }else{ @@ -260,8 +264,8 @@ @RequestMapping(value = "/bfcf", method = RequestMethod.POST) @ResponseBody public Object bfcf(Long wellId, String bfzt) { - if (ToolUtil.isEmpty(wellId) || ToolUtil.isEmpty(bfzt)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null ==wellId || StrUtil.isEmpty(bfzt)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } BusWellInfo busWellInfo = new BusWellInfo(); @@ -291,8 +295,8 @@ @RequestMapping(value = "/bfType", method = RequestMethod.GET) @ResponseBody public Object bfType(Long id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null ==id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); resultData.setData(busWellInfoService.getWatchDatas(id)); @@ -311,7 +315,8 @@ List results = new ArrayList<>(); //设置表头与字段映射,可通过反射获取 Map mapper = new HashMap<>(); - mapper.put("井编号", "wellCode");//判断唯一 + //判断唯一 + mapper.put("井编号", "wellCode"); mapper.put("井名称", "wellName"); mapper.put("井深", "deep"); mapper.put("区", "qu"); @@ -324,22 +329,11 @@ mapper.put("井维护单位代码", "responsibleDept"); try { try (InputStream in = file.getInputStream()) { - ExcelIO.read(in, mapper, BusWellInfo.class, (row) -> { - //读取sheet - if (row.getSheet() == 0) { - if (row.getResult() != null) { - BusWellInfo busWellInfo = row.getResult(); - results.add(busWellInfo); - } - } else { - //其他sheet停止读取 - logger.info("当前sheet" + row.getSheet() + ",停止读取"); - row.shutdown(); - } - }); + results = this.importExcel(BusWellInfo.class,file,null,null); + List list = busWellInfoService.addWellBatch(results); - if (!ToolUtil.isEmpty(list)) { + if (!CollectionUtil.isEmpty(list)) { //获取第校验报错信息 return new ErrorResponseData(list.get(0)); } @@ -360,30 +354,36 @@ } - @ApiOperation("批量导出井接口") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) @ResponseBody public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { - Page page = new PageFactory().defaultPage(); + Page page = PageFactory.defaultPage(); page.setSearchCount(false); page.setCurrent(1); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List list = busWellInfoService.getBatchExportData(dataScope, page, wellType, deptid, keywords); list.forEach(batchExportDataDto -> { - batchExportDataDto.setBfztName(permissionService.getDictNameByCode("bfzt", batchExportDataDto.getBfzt())); + batchExportDataDto.setBfztName(dictService.getDictNameByCode("bfzt", batchExportDataDto.getBfzt())); // batchExportDataDto.setDeviceCount(busWellInfoService.getDeviceCountData(batchExportDataDto.getId())); // batchExportDataDto.setDeptName(busWellInfoService.getDeptNameData(batchExportDataDto.getDeptId())); - batchExportDataDto.setWellTypeName(permissionService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType())); - batchExportDataDto.setDeptName(permissionService.getDeptName(batchExportDataDto.getDeptId())); + batchExportDataDto.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType())); + batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(batchExportDataDto.getDeptId())); }); - - List res = new ArrayList<>(); - res.addAll(list); //获取导出文件header - super.exportExcel(SluicewellExportEnum.DEVICE_EXPORT, res); +// DEVICE_EXPORT(new ArrayList() {{ +// add(new Header("井编号", "wellCode")); +// add(new Header("井名称", "wellName")); +// add(new Header("井深", "deep")); +// add(new Header("详细地址", "position")); +// add(new Header("井类型", "wellTypeName")); +// add(new Header("权属单位", "deptName")); +// add(new Header("设备数量", "deviceCount")); +// add(new Header("布防状态", "bfztName")); +// }}, "sluicewell.xlsx", "井数据导出");SluicewellExportEnum.DEVICE_EXPORT + super.exportExcel(BatchExportDataDto.class, list,""); //super.exportExcel(SluicewellExportEnum.SLUICEWELLDATA_EXPORT, list, response); } @@ -394,8 +394,8 @@ @RequestMapping(value = "/selectOne", method = RequestMethod.GET) @ResponseBody public Object selectOne(String wellCode) { - if (StringUtils.isEmpty(wellCode)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (StrUtil.isEmpty(wellCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } HasWellDto hasWellDto = new HasWellDto(); @@ -440,10 +440,10 @@ @RequestMapping(value = "/getWellByCode", method = RequestMethod.GET) @ResponseBody public Object getWellByCode(String wellCode){ - EntityWrapper wrapper = new EntityWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("WELL_CODE",wellCode); wrapper.eq("valid",1); - return new SuccessResponseData(busWellInfoService.selectOne(wrapper)); + return new SuccessResponseData(busWellInfoService.getOne(wrapper)); } } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java index 33dca81..d451598 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java @@ -1,27 +1,23 @@ package com.casic.missiles.modular.system.enmus; -import com.casic.missiles.core.enums.ExportExcelEnum; -import com.casic.missiles.core.enums.ExportExcelHeaderEnum; -import com.casic.missiles.core.util.SpringContextHolder; -import com.casic.missiles.modular.config.SluicewellServerProperties; -import org.hswebframework.expands.office.excel.config.Header; import java.util.ArrayList; import java.util.List; import java.util.Map; -public enum SluicewellExportEnum implements ExportExcelHeaderEnum { +public enum SluicewellExportEnum { - DEVICE_EXPORT(new ArrayList() {{ - add(new Header("井编号", "wellCode")); - add(new Header("井名称", "wellName")); - add(new Header("井深", "deep")); - add(new Header("详细地址", "position")); - add(new Header("井类型", "wellTypeName")); - add(new Header("权属单位", "deptName")); - add(new Header("设备数量", "deviceCount")); - add(new Header("布防状态", "bfztName")); + DEVICE_EXPORT( + new ArrayList() {{ +// add(new Header("井编号", "wellCode")); +// add(new Header("井名称", "wellName")); +// add(new Header("井深", "deep")); +// add(new Header("详细地址", "position")); +// add(new Header("井类型", "wellTypeName")); +// add(new Header("权属单位", "deptName")); +// add(new Header("设备数量", "deviceCount")); +// add(new Header("布防状态", "bfztName")); }}, "sluicewell.xlsx", "井数据导出"); //SLUICEWELLDATA_EXPORT("sluicewell.xlsx", "sluicewell.xlsx", "闸井数据"); @@ -29,7 +25,7 @@ /** * 导出模板相对路径 */ - private List
headers; + private List headers; /** * 下载文件名 */ @@ -39,28 +35,24 @@ */ private String description; - SluicewellExportEnum(List
headers, String fileName, String description) { + SluicewellExportEnum(List headers, String fileName, String description) { this.headers = headers; this.fileName = fileName; this.description = description; } - @Override - public List
getHeaders() { + public List getHeaders() { return headers; } - @Override public String getFileName() { return fileName; } - @Override public String getDescription() { return description; } - @Override public Map getCustomColumnStyle() { return null; } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index f82f8df..9776169 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.util.SpringContextHolder; import com.casic.missiles.modular.config.SluicewellProperties; import com.casic.missiles.modular.system.constant.BusWellConst; @@ -10,13 +14,11 @@ import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.BusWellInfoMapper; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.IBusWellInfoService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.modular.system.util.Utility; -import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +28,7 @@ import org.springframework.validation.FieldError; import org.springframework.validation.Validator; +import javax.annotation.Resource; import java.io.Serializable; import java.text.DateFormat; import java.text.DecimalFormat; @@ -46,38 +49,40 @@ @Resource private AbstractPermissionContext service; - + @Resource + private AbstractDictService dictService; @Autowired private Validator validator; @Override - public BusWellInfo selectById(Serializable id) { - BusWellInfo wellInfo = super.selectById(id); - wellInfo.setDeptName(service.getDeptName(wellInfo.getDeptid())); + public BusWellInfo getById(Serializable id) { + BusWellInfo wellInfo = super.getById(id); + wellInfo.setDeptName(service.getDeptService().getDeptName(wellInfo.getDeptid())); //wellInfo.setResponsibleDept(wellInfo.getStaff()); - wellInfo.setResponsibleDeptName(service.getDeptName(wellInfo.getResponsibleDept())); - wellInfo.setBfztName(service.getDictNameByCode("bfZt", wellInfo.getBfzt())); - wellInfo.setWellTypeName(service.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, wellInfo.getWellType())); + wellInfo.setResponsibleDeptName(service.getDeptService().getDeptName(wellInfo.getResponsibleDept())); + wellInfo.setBfztName(dictService.getDictNameByCode("bfZt", wellInfo.getBfzt())); + wellInfo.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, wellInfo.getWellType())); wellInfo.setQu(this.getAreaPid(wellInfo.getArea())); return wellInfo; } + @Override @Transactional public List selectDataScopePage(DataScope dataScope, Page page, String keywords, String wellType, String deptid, String bfzt) { List list = this.baseMapper.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt); list.forEach(well -> { - well.setWellTypeName(service.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType())); - well.setDeptName(service.getDeptName(well.getDeptid())); - well.setBfztName(service.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); + well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType())); + well.setDeptName(service.getDeptService().getDeptName(well.getDeptid())); + well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); // well.setDeviceCount(this.getDeviceCountData(well.getId())); well.setQu(this.getAreaPid(well.getArea())); - well.setResponsibleDeptName(service.getDeptName(well.getResponsibleDept())); + well.setResponsibleDeptName(service.getDeptService().getDeptName(well.getResponsibleDept())); }); return list; } - + @Override public List getWatchDatas(Long id) { List deviceInWellInfos = this.baseMapper.getDeviceInWellInfo(id); @@ -89,7 +94,7 @@ watchDataDto.setDevcode(deviceInWellInfo.getDevcode()); watchDataDto.setInstallDate(deviceInWellInfo.getInstallDate()); watchDataDto.setOnlineState(deviceInWellInfo.getOnlineState()); - watchDataDto.setOnlineStateName(service.getDictNameByCode("onlineStatus", deviceInWellInfo.getOnlineState())); + watchDataDto.setOnlineStateName(dictService.getDictNameByCode("onlineStatus", deviceInWellInfo.getOnlineState())); DeviceData deviceData; DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -99,7 +104,7 @@ deviceData = this.baseMapper.wellcoverData(deviceInWellInfo.getDevcode()); watchDataDto.setWatchType("井盖状态"); watchDataDto.setType("1"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { //井盖离线 if ("0".equals(watchDataDto.getOnlineState())) { watchDataDto.setValue("离线"); @@ -123,7 +128,7 @@ case "液位监测仪": deviceData = this.baseMapper.liquidData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("井内水位"); watchDataDto.setType("2"); @@ -136,7 +141,7 @@ case "有害气体监测仪": deviceData = this.baseMapper.harmfulgasData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] harmfulGasDatas = deviceData.getData().split(","); HarmfulGasBusiness[] harmfulGasBusinesses = HarmfulGasBusiness.values(); @@ -153,7 +158,7 @@ case "燃气智能监测终端": deviceData = this.baseMapper.gasData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("燃气浓度"); watchDataDto.setType("4"); @@ -166,7 +171,7 @@ case "温湿度监测仪": deviceData = this.baseMapper.temphumData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] temphumDatas = deviceData.getData().split(","); TemphumBusiness[] temphumBusinesses = TemphumBusiness.values(); @@ -183,7 +188,7 @@ case "开挖监测仪": deviceData = this.baseMapper.digData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("开挖状态"); watchDataDto.setType("6"); @@ -196,7 +201,7 @@ case "噪声记录仪": deviceData = this.baseMapper.noiseData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("管线噪声"); watchDataDto.setType("8"); @@ -209,7 +214,7 @@ case "井盖定位监测仪": deviceData = this.baseMapper.wellcoverlocaData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("井盖位置"); watchDataDto.setType("7"); @@ -224,7 +229,7 @@ deviceData = this.baseMapper.lgGasData(deviceInWellInfo.getDevcode()); watchDataDto.setWatchType("燃气浓度"); watchDataDto.setType("10"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { Double dValue = Double.parseDouble(deviceData.getData()); if (dValue <= 20.0) { @@ -246,7 +251,7 @@ deviceData = this.baseMapper.lgLiquidData(deviceInWellInfo.getDevcode()); watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); @@ -278,7 +283,7 @@ case "井盖状态监测仪": deviceData = this.baseMapper.wellcoverData(devcode); deviceDataDto.setTypeName("井盖状态"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { //井盖离线 if ("0".equals(status)) { deviceDataDto.setValue("离线"); @@ -298,7 +303,7 @@ case "液位监测仪": deviceData = this.baseMapper.liquidData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("井内水位"); deviceDataDto.setValue(deviceData.getData() + "m"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -308,7 +313,7 @@ case "有害气体监测仪": deviceData = this.baseMapper.harmfulgasData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] harmfulGasDatas = deviceData.getData().split(","); HarmfulGasBusiness[] harmfulGasBusinesses = HarmfulGasBusiness.values(); for (int i = 0; i < harmfulGasDatas.length; i++) { @@ -322,7 +327,7 @@ break; case "燃气智能监测终端": deviceData = this.baseMapper.gasData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("燃气浓度"); deviceDataDto.setValue(deviceData.getData() + "%LEL"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -332,7 +337,7 @@ case "温湿度监测仪": deviceData = this.baseMapper.temphumData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] temphumDatas = deviceData.getData().split(","); TemphumBusiness[] temphumBusinesses = TemphumBusiness.values(); for (int i = 0; i < temphumDatas.length; i++) { @@ -347,7 +352,7 @@ case "开挖监测仪": deviceData = this.baseMapper.digData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("开挖状态"); deviceDataDto.setValue(deviceData.getData() + "mg"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -357,7 +362,7 @@ case "噪声记录仪": deviceData = this.baseMapper.noiseData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("管线噪声"); deviceDataDto.setValue(deviceData.getData() + "mg"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -366,7 +371,7 @@ break; case "井盖定位监测仪": deviceData = this.baseMapper.wellcoverlocaData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("井盖位置"); deviceDataDto.setValue(deviceData.getData()); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -377,7 +382,7 @@ case "燃气智能监测终端(一体化)": deviceData = this.baseMapper.lgGasData(devcode); deviceDataDto.setTypeName("燃气浓度"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { Double dValue = Double.parseDouble(deviceData.getData()); if (dValue <= 20.0) { @@ -395,7 +400,7 @@ deviceData = this.baseMapper.lgLiquidData(devcode); deviceDataDto.setTypeName("井内水位"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setValue(deviceData.getData() + "m"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -413,6 +418,7 @@ } + @Override public BfztCountDataDto getBfztCountData(List deptIds, Boolean isApp) { return this.baseMapper.bfztCountData(deptIds, isApp); } @@ -427,15 +433,18 @@ return this.baseMapper.getBatchExportData(dataScope, page, deviceType, deptid, keywords); } + @Override public Integer getDeviceCountData(Long id) { return this.baseMapper.deviceCountData(id); } + @Override public String getDeptNameData(String deptid) { return this.baseMapper.deptNameData(deptid); } + @Override public List deleteBatchByIds(List ids) { List lists = new ArrayList<>(); @@ -461,8 +470,8 @@ List list = new ArrayList<>(); List gpsCoordinates = new ArrayList<>(); - if (ToolUtil.isNotEmpty(results)) { - List dicts = service.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);//闸井类型 + if (CollectionUtil.isNotEmpty(results)) { + List dicts = dictService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);//闸井类型 Map sluicewellTypeMap = new HashMap<>(); dicts.forEach(dict -> { sluicewellTypeMap.put(dict.getName(), dict.getCode()); @@ -489,7 +498,7 @@ //其他相关性校验 String areaId = this.baseMapper.getAreaId(well.getQu(), well.getArea()); - if (ToolUtil.isNotEmpty(areaId)) { + if (StrUtil.isNotEmpty(areaId)) { well.setArea(areaId); } else { list.add("第" + index[0] + "行，区与街道名不对应！"); @@ -513,7 +522,7 @@ logger.info("第" + index[0] + "行校验完毕！"); } - if (ToolUtil.isNotEmpty(list)) { + if (CollectionUtil.isNotEmpty(list)) { return list; } @@ -527,7 +536,7 @@ convertCoordinates = Utility.convertGaodeAPI(gpsCoordinates); } - if (ToolUtil.isNotEmpty(convertCoordinates) && + if (CollectionUtil.isNotEmpty(convertCoordinates) && results.size() == convertCoordinates.size()) { if ("baidu".equals(coordinate)) { @@ -545,7 +554,7 @@ } } - this.insertBatch(results); + this.saveBatch(results); } else { list.add("导入数据不能为空"); @@ -568,10 +577,12 @@ return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, deptid); } + @Override public String getAreaPid(String id) { return this.baseMapper.getAreaPId(id); } + @Override @Transactional public void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds) { diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/HttpUtil.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/HttpUtil.java deleted file mode 100644 index 244e81b..0000000 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/HttpUtil.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.missiles.modular.system.util; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import org.apache.http.Consts; -import org.apache.http.HttpEntity; -import org.apache.http.NameValuePair; -import org.apache.http.ParseException; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.utils.URIBuilder; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -/** - * @author GWQ - * - */ -public class HttpUtil { - - private static final CloseableHttpClient httpclient = HttpClients.createDefault(); - - /** - * 发送HttpGet请求 - * @param url - * @return - */ - public static String httpGet(String url) { - - HttpGet httpget = new HttpGet(url); - CloseableHttpResponse response = null; - try { - response = httpclient.execute(httpget); - } catch (IOException e1) { - e1.printStackTrace(); - } - String result = null; - try { - HttpEntity entity = response.getEntity(); - if (entity != null) { - result = EntityUtils.toString(entity); - } - } catch (ParseException | IOException e) { - e.printStackTrace(); - } finally { - try { - response.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - return result; - } - - /** - * 发送HttpGet请求，参数为map - * @param url - * @return - */ - public static String httpGet(String url,Map map) throws Exception{ - - URIBuilder uriBuilder = new URIBuilder(url); - if (map != null) { - // 遍历map,拼接请求参数 - for (Map.Entry entry : map.entrySet()) { - uriBuilder.setParameter(entry.getKey(), entry.getValue().toString()); - } - } - // 调用不带参数的get请求 - return httpGet(uriBuilder.build().toString()); - } - - /** - * 发送HttpPost请求，参数为map - * @param url - * @param map - * @return - */ - public static String httpPost(String url, Map map) { - List formparams = new ArrayList(); - for (Map.Entry entry : map.entrySet()) { - formparams.add(new BasicNameValuePair(entry.getKey(), entry.getValue())); - } - UrlEncodedFormEntity entity = new UrlEncodedFormEntity(formparams, Consts.UTF_8); - HttpPost httppost = new HttpPost(url); - httppost.setEntity(entity); - CloseableHttpResponse response = null; - try { - response = httpclient.execute(httppost); - } catch (IOException e) { - e.printStackTrace(); - } - HttpEntity entity1 = response.getEntity(); - String result = null; - try { - result = EntityUtils.toString(entity1); - } catch (ParseException | IOException e) { - e.printStackTrace(); - } - return result; - } - - /** - * 发送不带参数的HttpPost请求 - * @param url - * @return - */ - public static String httpPost(String url) { - HttpPost httppost = new HttpPost(url); - CloseableHttpResponse response = null; - try { - response = httpclient.execute(httppost); - } catch (IOException e) { - e.printStackTrace(); - } - HttpEntity entity = response.getEntity(); - String result = null; - try { - result = EntityUtils.toString(entity); - } catch (ParseException | IOException e) { - e.printStackTrace(); - } - return result; - } - -} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/RegUtil.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/RegUtil.java index 36d1648..7710fdd 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/RegUtil.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/RegUtil.java @@ -1,62 +1,66 @@ package com.casic.missiles.modular.system.util; -import org.apache.commons.lang.StringUtils; + +import cn.hutool.core.util.StrUtil; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static java.util.regex.Pattern.compile; + public class RegUtil { public static boolean isDecimal2(String str) {// 判断小数点后2位的数字的正则表达式 - Pattern pattern = Pattern.compile("^\\\\d{0,8}\\\\.{0,1}(\\\\d{1,2})?$"); + Pattern pattern = compile("^\\\\d{0,8}\\\\.{0,1}(\\\\d{1,2})?$"); Matcher match = pattern.matcher(str); return match.matches(); } public static boolean isNumOrLetter(String str) {// 判断字母或数字 - return match(str,"^\\w+$"); + return match(str, "^\\w+$"); } - public final static boolean isMobile(String text){ - if(text.length()!=11) return false; + public final static boolean isMobile(String text) { + if (text.length() != 11) { + return false; + } return match(text, "^(((1+\\d{10})$"); } - public static boolean isIp(String str) {// 判断iP - if(StringUtils.isBlank(str)){ + if (StrUtil.isBlank(str)) { return true; } - Pattern pattern = Pattern.compile("([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}"); + Pattern pattern = compile("([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}"); Matcher match = pattern.matcher(str); return match.matches(); } public static boolean isPort(String str) {// 判断iP - if(StringUtils.isBlank(str)){ + if (StrUtil.isBlank(str)) { return true; } - Pattern pattern = Pattern.compile("^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]{1}|6553[0-5])$"); + Pattern pattern = compile("^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]{1}|6553[0-5])$"); Matcher match = pattern.matcher(str); return match.matches(); } - public static boolean isInteger(String str) {// 判断iP - return match(str,"^[1-9]\\d*$"); + return match(str, "^[1-9]\\d*$"); } private final static boolean match(String text, String reg) { - if (StringUtils.isBlank(text) || StringUtils.isBlank(reg)) + if (StrUtil.isBlank(text) || StrUtil.isBlank(reg)) { return false; - return Pattern.compile(reg).matcher(text).matches(); + } + return compile(reg).matcher(text).matches(); } diff --git a/casic-alarm/pom.xml b/casic-alarm/pom.xml index 6d08f48..1b57b31 100644 --- a/casic-alarm/pom.xml +++ b/casic-alarm/pom.xml @@ -13,7 +13,7 @@ 2.0.0 jar casic-alarm - casic 的spring boot版本 + casic 告警服务子包 diff --git a/casic-device/pom.xml b/casic-device/pom.xml index 76fbec8..577bd26 100644 --- a/casic-device/pom.xml +++ b/casic-device/pom.xml @@ -12,7 +12,7 @@ casic-device 2.0.0.alpha jar - casic 的spring boot版本 + casic 闸井产品设备管理子包 diff --git a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java deleted file mode 100644 index e1030f2..0000000 --- a/casic-device/src/main/java/com/casic/missiles/config/DeviceApiProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.casic.missiles.config; - - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -@Data -@Component -@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") -public class DeviceApiProperties { - private String baiduUrl = null; - private String baiduAk = null; - - private String gaodeUrl = null; - private String gaodeKey = null; -} \ No newline at end of file diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 93766ae..b7e13ca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** - * 控制器 + * 模板管理包 * * @author dev123 * @Date 2018-11-19 13:15:14 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 b3f3bfe..6262c52 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 @@ -15,7 +15,7 @@ import com.casic.missiles.modular.system.model.BusConcentrator; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IBusConcentratorService; -import com.casic.missiles.util.DeviceUtility; +import com.casic.missiles.modular.system.util.Utility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -140,8 +140,8 @@ void loadPostion(BusConcentrator entity) { if (StrUtil.isNotEmpty(entity.getLat()) && StrUtil.isNotEmpty(entity.getLng())) { - Map baiduCoordinate = DeviceUtility.convertBaiduAPI(entity.getLng(), entity.getLat()); - Map gaodeCoordinate = DeviceUtility.convertGaodeAPI(entity.getLng(), entity.getLat()); + Map baiduCoordinate = Utility.convertBaiduAPI(entity.getLng(), entity.getLat()); + Map gaodeCoordinate = Utility.convertGaodeAPI(entity.getLng(), entity.getLat()); if (ObjectUtil.isEmpty(baiduCoordinate) || ObjectUtil.isEmpty(gaodeCoordinate)) { logger.error("{}坐标转换失败!", entity.getConcencode()); return; diff --git a/casic-server-support/pom.xml b/casic-server-support/pom.xml index 61a3580..3054996 100644 --- a/casic-server-support/pom.xml +++ b/casic-server-support/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server-support - casic 的spring boot版本 + 闸井产品-服务支撑子包 @@ -36,6 +36,16 @@ provided + + com.casic + casic-http + ${extension.version} + + + com.casic + casic-export-support + ${extension.version} + diff --git a/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java new file mode 100644 index 0000000..e1030f2 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/config/DeviceApiProperties.java @@ -0,0 +1,17 @@ +package com.casic.missiles.config; + + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "smartcity.sluicewell.coordinate-convert") +public class DeviceApiProperties { + private String baiduUrl = null; + private String baiduAk = null; + + private String gaodeUrl = null; + private String gaodeKey = null; +} \ No newline at end of file diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java index b49b8c0..cc60629 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java @@ -1,13 +1,12 @@ package com.casic.missiles.modular.system.dto; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; +import cn.hutool.core.date.DateUtil; import java.util.Date; /** *

- * + * *

* * @author casic123 @@ -177,9 +176,8 @@ } public String getAlarmTime() { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); if (null != this.alarmTimeDate) { - return fmt.print(alarmTimeDate.getTime()); + return DateUtil.format(alarmTimeDate, "yyyy-MM-dd HH:mm:ss"); } else { return ""; } @@ -268,13 +266,13 @@ @Override public String toString() { return "AlarmNowView{" + - "id=" + alarmId + - ", deviceId=" + deviceId + - ", wellId=" + wellId + - ", wellCode=" + wellCode + - ", alarmType=" + alarmType + - ", alarmContent=" + alarmContent + - ", alarmTime=" + getAlarmTime() + - "}"; + "id=" + alarmId + + ", deviceId=" + deviceId + + ", wellId=" + wellId + + ", wellCode=" + wellCode + + ", alarmType=" + alarmType + + ", alarmContent=" + alarmContent + + ", alarmTime=" + getAlarmTime() + + "}"; } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java index 4b8cb20..21df9e4 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BusWellInfoDto.java @@ -1,8 +1,7 @@ package com.casic.missiles.modular.system.dto; +import cn.hutool.core.date.DateUtil; import com.casic.missiles.modular.system.model.BusWellInfo; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; @@ -283,8 +282,7 @@ //this.setStaff(busWellInfo.getStaff()); //this.setTel(busWellInfo.getTel()); if (null != busWellInfo.getTs()) { - DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); - this.setTs(fmt.print(busWellInfo.getTs().getTime())); + this.setTs(DateUtil.format(busWellInfo.getTs(), "yyyy-MM-dd HH:mm:ss")); } this.setValid(busWellInfo.getValid()); } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index f600534..5df70d3 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -13,7 +13,7 @@ 2.0.0.alpha jar casic-server - casic 的spring boot版本 + 闸井产品-其他服务类子包 diff --git a/casic-sluicewell/pom.xml b/casic-sluicewell/pom.xml index 6483b6d..3edad2b 100644 --- a/casic-sluicewell/pom.xml +++ b/casic-sluicewell/pom.xml @@ -11,7 +11,7 @@ casic-sluicewell jar casic-sluicewell - 井管理模块 + 闸井产品-井管理子包 diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 3fe5bba..bd62f3f 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -1,5 +1,10 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.modular.system.constant.BusWellConst; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.model.response.ErrorResponseData; @@ -16,7 +21,6 @@ import com.casic.missiles.modular.system.dto.HasWellDto; import com.casic.missiles.modular.system.enmus.SluicewellExportEnum; import com.casic.missiles.modular.system.util.Utility; -import com.casic.missiles.quartz.job.MyJob; import com.casic.missiles.quartz.service.IQuartzManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +34,6 @@ import java.io.IOException; import java.io.InputStream; -import java.rmi.ServerException; import java.util.*; import com.casic.missiles.core.page.PageFactory; @@ -55,9 +58,10 @@ @Resource private AbstractPermissionContext permissionService; - @Autowired + @Resource private IBusWellInfoService busWellInfoService; - + @Resource + private AbstractDictService dictService; @Autowired public IQuartzManager quartzManager; @@ -164,16 +168,16 @@ @ResponseBody @BussinessLog(value = "修改井信息", key = BusWellConst.SLUICEWELL_ADD_LOG_KEY, dict = BusWellDict.class) public Object update(BusWellInfo busWellInfo) { - if (ToolUtil.isEmpty(busWellInfo.getId())) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null == busWellInfo.getId()) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } - BusWellInfo oldBusWellInfo = this.busWellInfoService.selectById(busWellInfo.getId()); + BusWellInfo oldBusWellInfo = this.busWellInfoService.getById(busWellInfo.getId()); LogObjectHolder.me().set(oldBusWellInfo); Utility.convertCoordinate(busWellInfo); - if(ToolUtil.isEmpty(busWellInfo.getResponsibleDept())){ + if(ObjectUtil.isEmpty(busWellInfo.getResponsibleDept())){ busWellInfo.setResponsibleDept(busWellInfo.getDeptid()); } @@ -193,7 +197,7 @@ @ResponseBody public Object detail(@PathVariable("busWellInfoId") String busWellInfoId) { - return ResponseData.success(busWellInfoService.selectById(busWellInfoId)); + return ResponseData.success(busWellInfoService.getById(busWellInfoId)); } /** @@ -201,13 +205,13 @@ */ @RequestMapping(value = "/info", method = RequestMethod.GET) @ResponseBody - public Object info(Integer id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + public Object info(Long id) { + if (null == id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); - resultData.setData(busWellInfoService.selectById(id)); + resultData.setData(busWellInfoService.getById(id)); return resultData; } @@ -219,8 +223,8 @@ @RequestMapping(value = "/watchDataByWell", method = RequestMethod.GET) @ResponseBody public Object watchDataByWell(Long id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null == id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); resultData.setData(busWellInfoService.getWatchDatas(id)); @@ -235,11 +239,11 @@ @ResponseBody public Object countByBfzt() { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips(); + Set roleTipes = permissionService.getAuthService().getLoginUser().getRoleTips(); List deptIds = null; Boolean isApp = false; if (roleTipes.contains("leader") || roleTipes.contains("member")) { - deptIds = permissionService.getSubDepts(permissionService.getAuthService().getLoginUser().getDeptId(), null); + deptIds = permissionService.getDeptService().getIdsByPid(permissionService.getAuthService().getLoginUser().getDeptId(), null); deptIds.add(permissionService.getAuthService().getLoginUser().getDeptId()); isApp = true; }else{ @@ -260,8 +264,8 @@ @RequestMapping(value = "/bfcf", method = RequestMethod.POST) @ResponseBody public Object bfcf(Long wellId, String bfzt) { - if (ToolUtil.isEmpty(wellId) || ToolUtil.isEmpty(bfzt)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null ==wellId || StrUtil.isEmpty(bfzt)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } BusWellInfo busWellInfo = new BusWellInfo(); @@ -291,8 +295,8 @@ @RequestMapping(value = "/bfType", method = RequestMethod.GET) @ResponseBody public Object bfType(Long id) { - if (ToolUtil.isEmpty(id)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (null ==id) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } SuccessResponseData resultData = new SuccessResponseData(); resultData.setData(busWellInfoService.getWatchDatas(id)); @@ -311,7 +315,8 @@ List results = new ArrayList<>(); //设置表头与字段映射,可通过反射获取 Map mapper = new HashMap<>(); - mapper.put("井编号", "wellCode");//判断唯一 + //判断唯一 + mapper.put("井编号", "wellCode"); mapper.put("井名称", "wellName"); mapper.put("井深", "deep"); mapper.put("区", "qu"); @@ -324,22 +329,11 @@ mapper.put("井维护单位代码", "responsibleDept"); try { try (InputStream in = file.getInputStream()) { - ExcelIO.read(in, mapper, BusWellInfo.class, (row) -> { - //读取sheet - if (row.getSheet() == 0) { - if (row.getResult() != null) { - BusWellInfo busWellInfo = row.getResult(); - results.add(busWellInfo); - } - } else { - //其他sheet停止读取 - logger.info("当前sheet" + row.getSheet() + ",停止读取"); - row.shutdown(); - } - }); + results = this.importExcel(BusWellInfo.class,file,null,null); + List list = busWellInfoService.addWellBatch(results); - if (!ToolUtil.isEmpty(list)) { + if (!CollectionUtil.isEmpty(list)) { //获取第校验报错信息 return new ErrorResponseData(list.get(0)); } @@ -360,30 +354,36 @@ } - @ApiOperation("批量导出井接口") @RequestMapping(value = "/batchExport", method = RequestMethod.GET) @ResponseBody public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { - Page page = new PageFactory().defaultPage(); + Page page = PageFactory.defaultPage(); page.setSearchCount(false); page.setCurrent(1); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); List list = busWellInfoService.getBatchExportData(dataScope, page, wellType, deptid, keywords); list.forEach(batchExportDataDto -> { - batchExportDataDto.setBfztName(permissionService.getDictNameByCode("bfzt", batchExportDataDto.getBfzt())); + batchExportDataDto.setBfztName(dictService.getDictNameByCode("bfzt", batchExportDataDto.getBfzt())); // batchExportDataDto.setDeviceCount(busWellInfoService.getDeviceCountData(batchExportDataDto.getId())); // batchExportDataDto.setDeptName(busWellInfoService.getDeptNameData(batchExportDataDto.getDeptId())); - batchExportDataDto.setWellTypeName(permissionService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType())); - batchExportDataDto.setDeptName(permissionService.getDeptName(batchExportDataDto.getDeptId())); + batchExportDataDto.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, batchExportDataDto.getWellType())); + batchExportDataDto.setDeptName(permissionService.getDeptService().getDeptName(batchExportDataDto.getDeptId())); }); - - List res = new ArrayList<>(); - res.addAll(list); //获取导出文件header - super.exportExcel(SluicewellExportEnum.DEVICE_EXPORT, res); +// DEVICE_EXPORT(new ArrayList() {{ +// add(new Header("井编号", "wellCode")); +// add(new Header("井名称", "wellName")); +// add(new Header("井深", "deep")); +// add(new Header("详细地址", "position")); +// add(new Header("井类型", "wellTypeName")); +// add(new Header("权属单位", "deptName")); +// add(new Header("设备数量", "deviceCount")); +// add(new Header("布防状态", "bfztName")); +// }}, "sluicewell.xlsx", "井数据导出");SluicewellExportEnum.DEVICE_EXPORT + super.exportExcel(BatchExportDataDto.class, list,""); //super.exportExcel(SluicewellExportEnum.SLUICEWELLDATA_EXPORT, list, response); } @@ -394,8 +394,8 @@ @RequestMapping(value = "/selectOne", method = RequestMethod.GET) @ResponseBody public Object selectOne(String wellCode) { - if (StringUtils.isEmpty(wellCode)) { - throw new GunsException(GunsExceptionEnum.REQUEST_NULL); + if (StrUtil.isEmpty(wellCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); } HasWellDto hasWellDto = new HasWellDto(); @@ -440,10 +440,10 @@ @RequestMapping(value = "/getWellByCode", method = RequestMethod.GET) @ResponseBody public Object getWellByCode(String wellCode){ - EntityWrapper wrapper = new EntityWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("WELL_CODE",wellCode); wrapper.eq("valid",1); - return new SuccessResponseData(busWellInfoService.selectOne(wrapper)); + return new SuccessResponseData(busWellInfoService.getOne(wrapper)); } } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java index 33dca81..d451598 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/enmus/SluicewellExportEnum.java @@ -1,27 +1,23 @@ package com.casic.missiles.modular.system.enmus; -import com.casic.missiles.core.enums.ExportExcelEnum; -import com.casic.missiles.core.enums.ExportExcelHeaderEnum; -import com.casic.missiles.core.util.SpringContextHolder; -import com.casic.missiles.modular.config.SluicewellServerProperties; -import org.hswebframework.expands.office.excel.config.Header; import java.util.ArrayList; import java.util.List; import java.util.Map; -public enum SluicewellExportEnum implements ExportExcelHeaderEnum { +public enum SluicewellExportEnum { - DEVICE_EXPORT(new ArrayList() {{ - add(new Header("井编号", "wellCode")); - add(new Header("井名称", "wellName")); - add(new Header("井深", "deep")); - add(new Header("详细地址", "position")); - add(new Header("井类型", "wellTypeName")); - add(new Header("权属单位", "deptName")); - add(new Header("设备数量", "deviceCount")); - add(new Header("布防状态", "bfztName")); + DEVICE_EXPORT( + new ArrayList() {{ +// add(new Header("井编号", "wellCode")); +// add(new Header("井名称", "wellName")); +// add(new Header("井深", "deep")); +// add(new Header("详细地址", "position")); +// add(new Header("井类型", "wellTypeName")); +// add(new Header("权属单位", "deptName")); +// add(new Header("设备数量", "deviceCount")); +// add(new Header("布防状态", "bfztName")); }}, "sluicewell.xlsx", "井数据导出"); //SLUICEWELLDATA_EXPORT("sluicewell.xlsx", "sluicewell.xlsx", "闸井数据"); @@ -29,7 +25,7 @@ /** * 导出模板相对路径 */ - private List
headers; + private List headers; /** * 下载文件名 */ @@ -39,28 +35,24 @@ */ private String description; - SluicewellExportEnum(List
headers, String fileName, String description) { + SluicewellExportEnum(List headers, String fileName, String description) { this.headers = headers; this.fileName = fileName; this.description = description; } - @Override - public List
getHeaders() { + public List getHeaders() { return headers; } - @Override public String getFileName() { return fileName; } - @Override public String getDescription() { return description; } - @Override public Map getCustomColumnStyle() { return null; } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java index f82f8df..9776169 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.util.SpringContextHolder; import com.casic.missiles.modular.config.SluicewellProperties; import com.casic.missiles.modular.system.constant.BusWellConst; @@ -10,13 +14,11 @@ import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.dao.BusWellInfoMapper; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.IBusWellInfoService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.modular.system.util.Utility; -import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +28,7 @@ import org.springframework.validation.FieldError; import org.springframework.validation.Validator; +import javax.annotation.Resource; import java.io.Serializable; import java.text.DateFormat; import java.text.DecimalFormat; @@ -46,38 +49,40 @@ @Resource private AbstractPermissionContext service; - + @Resource + private AbstractDictService dictService; @Autowired private Validator validator; @Override - public BusWellInfo selectById(Serializable id) { - BusWellInfo wellInfo = super.selectById(id); - wellInfo.setDeptName(service.getDeptName(wellInfo.getDeptid())); + public BusWellInfo getById(Serializable id) { + BusWellInfo wellInfo = super.getById(id); + wellInfo.setDeptName(service.getDeptService().getDeptName(wellInfo.getDeptid())); //wellInfo.setResponsibleDept(wellInfo.getStaff()); - wellInfo.setResponsibleDeptName(service.getDeptName(wellInfo.getResponsibleDept())); - wellInfo.setBfztName(service.getDictNameByCode("bfZt", wellInfo.getBfzt())); - wellInfo.setWellTypeName(service.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, wellInfo.getWellType())); + wellInfo.setResponsibleDeptName(service.getDeptService().getDeptName(wellInfo.getResponsibleDept())); + wellInfo.setBfztName(dictService.getDictNameByCode("bfZt", wellInfo.getBfzt())); + wellInfo.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, wellInfo.getWellType())); wellInfo.setQu(this.getAreaPid(wellInfo.getArea())); return wellInfo; } + @Override @Transactional public List selectDataScopePage(DataScope dataScope, Page page, String keywords, String wellType, String deptid, String bfzt) { List list = this.baseMapper.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt); list.forEach(well -> { - well.setWellTypeName(service.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType())); - well.setDeptName(service.getDeptName(well.getDeptid())); - well.setBfztName(service.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); + well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType())); + well.setDeptName(service.getDeptService().getDeptName(well.getDeptid())); + well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt())); // well.setDeviceCount(this.getDeviceCountData(well.getId())); well.setQu(this.getAreaPid(well.getArea())); - well.setResponsibleDeptName(service.getDeptName(well.getResponsibleDept())); + well.setResponsibleDeptName(service.getDeptService().getDeptName(well.getResponsibleDept())); }); return list; } - + @Override public List getWatchDatas(Long id) { List deviceInWellInfos = this.baseMapper.getDeviceInWellInfo(id); @@ -89,7 +94,7 @@ watchDataDto.setDevcode(deviceInWellInfo.getDevcode()); watchDataDto.setInstallDate(deviceInWellInfo.getInstallDate()); watchDataDto.setOnlineState(deviceInWellInfo.getOnlineState()); - watchDataDto.setOnlineStateName(service.getDictNameByCode("onlineStatus", deviceInWellInfo.getOnlineState())); + watchDataDto.setOnlineStateName(dictService.getDictNameByCode("onlineStatus", deviceInWellInfo.getOnlineState())); DeviceData deviceData; DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -99,7 +104,7 @@ deviceData = this.baseMapper.wellcoverData(deviceInWellInfo.getDevcode()); watchDataDto.setWatchType("井盖状态"); watchDataDto.setType("1"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { //井盖离线 if ("0".equals(watchDataDto.getOnlineState())) { watchDataDto.setValue("离线"); @@ -123,7 +128,7 @@ case "液位监测仪": deviceData = this.baseMapper.liquidData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("井内水位"); watchDataDto.setType("2"); @@ -136,7 +141,7 @@ case "有害气体监测仪": deviceData = this.baseMapper.harmfulgasData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] harmfulGasDatas = deviceData.getData().split(","); HarmfulGasBusiness[] harmfulGasBusinesses = HarmfulGasBusiness.values(); @@ -153,7 +158,7 @@ case "燃气智能监测终端": deviceData = this.baseMapper.gasData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("燃气浓度"); watchDataDto.setType("4"); @@ -166,7 +171,7 @@ case "温湿度监测仪": deviceData = this.baseMapper.temphumData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] temphumDatas = deviceData.getData().split(","); TemphumBusiness[] temphumBusinesses = TemphumBusiness.values(); @@ -183,7 +188,7 @@ case "开挖监测仪": deviceData = this.baseMapper.digData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("开挖状态"); watchDataDto.setType("6"); @@ -196,7 +201,7 @@ case "噪声记录仪": deviceData = this.baseMapper.noiseData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("管线噪声"); watchDataDto.setType("8"); @@ -209,7 +214,7 @@ case "井盖定位监测仪": deviceData = this.baseMapper.wellcoverlocaData(deviceInWellInfo.getDevcode()); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setWatchType("井盖位置"); watchDataDto.setType("7"); @@ -224,7 +229,7 @@ deviceData = this.baseMapper.lgGasData(deviceInWellInfo.getDevcode()); watchDataDto.setWatchType("燃气浓度"); watchDataDto.setType("10"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { Double dValue = Double.parseDouble(deviceData.getData()); if (dValue <= 20.0) { @@ -246,7 +251,7 @@ deviceData = this.baseMapper.lgLiquidData(deviceInWellInfo.getDevcode()); watchDataDto.setWatchType("井内水位"); watchDataDto.setType("10"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { watchDataDto.setValue(deviceData.getData() + "m"); watchDataDto.setData(deviceData.getData() + "m"); @@ -278,7 +283,7 @@ case "井盖状态监测仪": deviceData = this.baseMapper.wellcoverData(devcode); deviceDataDto.setTypeName("井盖状态"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { //井盖离线 if ("0".equals(status)) { deviceDataDto.setValue("离线"); @@ -298,7 +303,7 @@ case "液位监测仪": deviceData = this.baseMapper.liquidData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("井内水位"); deviceDataDto.setValue(deviceData.getData() + "m"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -308,7 +313,7 @@ case "有害气体监测仪": deviceData = this.baseMapper.harmfulgasData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] harmfulGasDatas = deviceData.getData().split(","); HarmfulGasBusiness[] harmfulGasBusinesses = HarmfulGasBusiness.values(); for (int i = 0; i < harmfulGasDatas.length; i++) { @@ -322,7 +327,7 @@ break; case "燃气智能监测终端": deviceData = this.baseMapper.gasData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("燃气浓度"); deviceDataDto.setValue(deviceData.getData() + "%LEL"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -332,7 +337,7 @@ case "温湿度监测仪": deviceData = this.baseMapper.temphumData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { String[] temphumDatas = deviceData.getData().split(","); TemphumBusiness[] temphumBusinesses = TemphumBusiness.values(); for (int i = 0; i < temphumDatas.length; i++) { @@ -347,7 +352,7 @@ case "开挖监测仪": deviceData = this.baseMapper.digData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("开挖状态"); deviceDataDto.setValue(deviceData.getData() + "mg"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -357,7 +362,7 @@ case "噪声记录仪": deviceData = this.baseMapper.noiseData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("管线噪声"); deviceDataDto.setValue(deviceData.getData() + "mg"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -366,7 +371,7 @@ break; case "井盖定位监测仪": deviceData = this.baseMapper.wellcoverlocaData(devcode); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setTypeName("井盖位置"); deviceDataDto.setValue(deviceData.getData()); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -377,7 +382,7 @@ case "燃气智能监测终端(一体化)": deviceData = this.baseMapper.lgGasData(devcode); deviceDataDto.setTypeName("燃气浓度"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { Double dValue = Double.parseDouble(deviceData.getData()); if (dValue <= 20.0) { @@ -395,7 +400,7 @@ deviceData = this.baseMapper.lgLiquidData(devcode); deviceDataDto.setTypeName("井内水位"); - if (ToolUtil.isNotEmpty(deviceData)) { + if (ObjectUtil.isNotEmpty(deviceData)) { deviceDataDto.setValue(deviceData.getData() + "m"); deviceDataDto.setLogtime(sdf.format(deviceData.getLogtime())); @@ -413,6 +418,7 @@ } + @Override public BfztCountDataDto getBfztCountData(List deptIds, Boolean isApp) { return this.baseMapper.bfztCountData(deptIds, isApp); } @@ -427,15 +433,18 @@ return this.baseMapper.getBatchExportData(dataScope, page, deviceType, deptid, keywords); } + @Override public Integer getDeviceCountData(Long id) { return this.baseMapper.deviceCountData(id); } + @Override public String getDeptNameData(String deptid) { return this.baseMapper.deptNameData(deptid); } + @Override public List deleteBatchByIds(List ids) { List lists = new ArrayList<>(); @@ -461,8 +470,8 @@ List list = new ArrayList<>(); List gpsCoordinates = new ArrayList<>(); - if (ToolUtil.isNotEmpty(results)) { - List dicts = service.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);//闸井类型 + if (CollectionUtil.isNotEmpty(results)) { + List dicts = dictService.findInDictByCode(BusWellConst.SLUICEWELL_TYPE);//闸井类型 Map sluicewellTypeMap = new HashMap<>(); dicts.forEach(dict -> { sluicewellTypeMap.put(dict.getName(), dict.getCode()); @@ -489,7 +498,7 @@ //其他相关性校验 String areaId = this.baseMapper.getAreaId(well.getQu(), well.getArea()); - if (ToolUtil.isNotEmpty(areaId)) { + if (StrUtil.isNotEmpty(areaId)) { well.setArea(areaId); } else { list.add("第" + index[0] + "行，区与街道名不对应！"); @@ -513,7 +522,7 @@ logger.info("第" + index[0] + "行校验完毕！"); } - if (ToolUtil.isNotEmpty(list)) { + if (CollectionUtil.isNotEmpty(list)) { return list; } @@ -527,7 +536,7 @@ convertCoordinates = Utility.convertGaodeAPI(gpsCoordinates); } - if (ToolUtil.isNotEmpty(convertCoordinates) && + if (CollectionUtil.isNotEmpty(convertCoordinates) && results.size() == convertCoordinates.size()) { if ("baidu".equals(coordinate)) { @@ -545,7 +554,7 @@ } } - this.insertBatch(results); + this.saveBatch(results); } else { list.add("导入数据不能为空"); @@ -568,10 +577,12 @@ return this.baseMapper.getNotAlarmWellList(dataScope, keywords, wellType, deptid); } + @Override public String getAreaPid(String id) { return this.baseMapper.getAreaPId(id); } + @Override @Transactional public void updateBatchBfcf(String keywords, String wellType, String deptid, String bfzt, List deptIds) { diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/HttpUtil.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/HttpUtil.java deleted file mode 100644 index 244e81b..0000000 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/HttpUtil.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.casic.missiles.modular.system.util; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import org.apache.http.Consts; -import org.apache.http.HttpEntity; -import org.apache.http.NameValuePair; -import org.apache.http.ParseException; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.utils.URIBuilder; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -/** - * @author GWQ - * - */ -public class HttpUtil { - - private static final CloseableHttpClient httpclient = HttpClients.createDefault(); - - /** - * 发送HttpGet请求 - * @param url - * @return - */ - public static String httpGet(String url) { - - HttpGet httpget = new HttpGet(url); - CloseableHttpResponse response = null; - try { - response = httpclient.execute(httpget); - } catch (IOException e1) { - e1.printStackTrace(); - } - String result = null; - try { - HttpEntity entity = response.getEntity(); - if (entity != null) { - result = EntityUtils.toString(entity); - } - } catch (ParseException | IOException e) { - e.printStackTrace(); - } finally { - try { - response.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - return result; - } - - /** - * 发送HttpGet请求，参数为map - * @param url - * @return - */ - public static String httpGet(String url,Map map) throws Exception{ - - URIBuilder uriBuilder = new URIBuilder(url); - if (map != null) { - // 遍历map,拼接请求参数 - for (Map.Entry entry : map.entrySet()) { - uriBuilder.setParameter(entry.getKey(), entry.getValue().toString()); - } - } - // 调用不带参数的get请求 - return httpGet(uriBuilder.build().toString()); - } - - /** - * 发送HttpPost请求，参数为map - * @param url - * @param map - * @return - */ - public static String httpPost(String url, Map map) { - List formparams = new ArrayList(); - for (Map.Entry entry : map.entrySet()) { - formparams.add(new BasicNameValuePair(entry.getKey(), entry.getValue())); - } - UrlEncodedFormEntity entity = new UrlEncodedFormEntity(formparams, Consts.UTF_8); - HttpPost httppost = new HttpPost(url); - httppost.setEntity(entity); - CloseableHttpResponse response = null; - try { - response = httpclient.execute(httppost); - } catch (IOException e) { - e.printStackTrace(); - } - HttpEntity entity1 = response.getEntity(); - String result = null; - try { - result = EntityUtils.toString(entity1); - } catch (ParseException | IOException e) { - e.printStackTrace(); - } - return result; - } - - /** - * 发送不带参数的HttpPost请求 - * @param url - * @return - */ - public static String httpPost(String url) { - HttpPost httppost = new HttpPost(url); - CloseableHttpResponse response = null; - try { - response = httpclient.execute(httppost); - } catch (IOException e) { - e.printStackTrace(); - } - HttpEntity entity = response.getEntity(); - String result = null; - try { - result = EntityUtils.toString(entity); - } catch (ParseException | IOException e) { - e.printStackTrace(); - } - return result; - } - -} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/RegUtil.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/RegUtil.java index 36d1648..7710fdd 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/RegUtil.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/RegUtil.java @@ -1,62 +1,66 @@ package com.casic.missiles.modular.system.util; -import org.apache.commons.lang.StringUtils; + +import cn.hutool.core.util.StrUtil; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static java.util.regex.Pattern.compile; + public class RegUtil { public static boolean isDecimal2(String str) {// 判断小数点后2位的数字的正则表达式 - Pattern pattern = Pattern.compile("^\\\\d{0,8}\\\\.{0,1}(\\\\d{1,2})?$"); + Pattern pattern = compile("^\\\\d{0,8}\\\\.{0,1}(\\\\d{1,2})?$"); Matcher match = pattern.matcher(str); return match.matches(); } public static boolean isNumOrLetter(String str) {// 判断字母或数字 - return match(str,"^\\w+$"); + return match(str, "^\\w+$"); } - public final static boolean isMobile(String text){ - if(text.length()!=11) return false; + public final static boolean isMobile(String text) { + if (text.length() != 11) { + return false; + } return match(text, "^(((1+\\d{10})$"); } - public static boolean isIp(String str) {// 判断iP - if(StringUtils.isBlank(str)){ + if (StrUtil.isBlank(str)) { return true; } - Pattern pattern = Pattern.compile("([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}"); + Pattern pattern = compile("([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}"); Matcher match = pattern.matcher(str); return match.matches(); } public static boolean isPort(String str) {// 判断iP - if(StringUtils.isBlank(str)){ + if (StrUtil.isBlank(str)) { return true; } - Pattern pattern = Pattern.compile("^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]{1}|6553[0-5])$"); + Pattern pattern = compile("^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]{1}|6553[0-5])$"); Matcher match = pattern.matcher(str); return match.matches(); } - public static boolean isInteger(String str) {// 判断iP - return match(str,"^[1-9]\\d*$"); + return match(str, "^[1-9]\\d*$"); } private final static boolean match(String text, String reg) { - if (StringUtils.isBlank(text) || StringUtils.isBlank(reg)) + if (StrUtil.isBlank(text) || StrUtil.isBlank(reg)) { return false; - return Pattern.compile(reg).matcher(text).matches(); + } + return compile(reg).matcher(text).matches(); } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/Utility.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/Utility.java deleted file mode 100644 index e528387..0000000 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/util/Utility.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.casic.missiles.modular.system.util; - -import com.alibaba.fastjson.JSONObject; -import com.casic.missiles.modular.config.SluicewellProperties; -import com.casic.missiles.modular.system.model.BusWellInfo; -import com.casic.missiles.core.util.SpringContextHolder; -import com.casic.missiles.core.util.ToolUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class Utility { - private static final Logger logger = LoggerFactory.getLogger(Utility.class); - - public static Map convertBaiduAPI(String lng, String lat){ - Map result = new HashMap<>(); - SluicewellProperties sluicewellProperties = SpringContextHolder.getBean(SluicewellProperties.class); - String url = sluicewellProperties.getBaiduUrl(); - String ak = sluicewellProperties.getBaiduAk(); - String coords = lng+","+lat; - try { - Map params = new HashMap(); - params.put("coords",coords); - params.put("ak",ak); - params.put("from",1); - params.put("to",5); - - String str = HttpUtil.httpGet(url,params); - JSONObject jsStr = JSONObject.parseObject(str); - if(jsStr.getInteger("status")==0){ - JSONObject coordinate = (JSONObject)jsStr.getJSONArray("result").get(0); - double x = coordinate.getDouble("x"); - double y = coordinate.getDouble("y"); - result.put("x",x); - result.put("y",y); - return result; - }else{ - return null; - } - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - public static Map convertGaodeAPI(String lng, String lat){ - Map result = new HashMap<>(); - SluicewellProperties sluicewellProperties = SpringContextHolder.getBean(SluicewellProperties.class); - String url = sluicewellProperties.getGaodeUrl(); - String ak = sluicewellProperties.getGaodeKey(); - String coords = lng+","+lat; - try { - Map params = new HashMap(); - params.put("locations",coords); - params.put("key",ak); - params.put("coordsys","gps"); - - String str = HttpUtil.httpGet(url,params); - JSONObject jsStr = JSONObject.parseObject(str); - if(jsStr.getInteger("status")==1){ - String coordinate = jsStr.getString("locations"); - String[] xy = coordinate.split(","); - if(xy!=null && xy.length >= 2){ - result.put("x",xy[0]); - result.put("y",xy[1]); - } - - return result; - }else{ - return null; - } - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - public static void convertCoordinate(BusWellInfo busWellInfo){ - if(ToolUtil.isNotEmpty(busWellInfo.getCoordinateX()) && ToolUtil.isNotEmpty(busWellInfo.getCoordinateY())){ - Map baiduCoordinate = Utility.convertBaiduAPI(busWellInfo.getCoordinateX(),busWellInfo.getCoordinateY()); - if(ToolUtil.isNotEmpty(baiduCoordinate)) { - busWellInfo.setLngBaidu(baiduCoordinate.get("x").toString()); - busWellInfo.setLatBaidu(baiduCoordinate.get("y").toString()); - }else{ - logger.error("{}百度坐标转换失败",busWellInfo.getWellCode()); - } - - Map gaodeCoordinate = Utility.convertGaodeAPI(busWellInfo.getCoordinateX(),busWellInfo.getCoordinateY()); - if(ToolUtil.isNotEmpty(gaodeCoordinate)) { - busWellInfo.setLngGaode(gaodeCoordinate.get("x").toString()); - busWellInfo.setLatGaode(gaodeCoordinate.get("y").toString()); - }else{ - logger.error("{}高德坐标转换失败",busWellInfo.getWellCode()); - } - } - } - - public static List convertBaiduAPI(List coordinates ){ - - List result = new ArrayList<>(); - SluicewellProperties sluicewellProperties = SpringContextHolder.getBean(SluicewellProperties.class); - String url = sluicewellProperties.getBaiduUrl(); - String ak = sluicewellProperties.getBaiduAk(); - - Map params = new HashMap<>(); - params.put("coords",null); - params.put("ak",ak); - params.put("from",1); - params.put("to",5); - - int size = 100; - int num = coordinates.size() / 100;//百度批量转换一次最多100对坐标 - for(int i = 0; i <= num; i++){ - - if(i == num){ - size = coordinates.size() % 100; - if(size == 0){ - return result; - } - } - - StringBuilder sb = new StringBuilder(); - for (String coordinate : coordinates.subList(i * 100, i * 100 + size)) { - sb.append(coordinate); - sb.append(";"); - } - params.replace("coords",sb.deleteCharAt(sb.length() - 1).toString()); - - try { - String str = HttpUtil.httpGet(url,params); - JSONObject jsStr = JSONObject.parseObject(str); - if(jsStr.getInteger("status") == 0){ - - for (Object baiduCoordinate : jsStr.getJSONArray("result")) { - BigDecimal x = ((JSONObject) baiduCoordinate).getBigDecimal("x"); - BigDecimal y = ((JSONObject) baiduCoordinate).getBigDecimal("y"); - result.add(x + "," + y); - } - }else{ - return result; - } - } catch (Exception e) { - e.printStackTrace(); - } - } - return result; - } - - public static List convertGaodeAPI(List coordinates) { - List result = new ArrayList<>(); - - SluicewellProperties sluicewellProperties = SpringContextHolder.getBean(SluicewellProperties.class); - String url = sluicewellProperties.getGaodeUrl(); - String ak = sluicewellProperties.getGaodeKey(); - - Map params = new HashMap<>(); - params.put("locations", null); - params.put("key", ak); - params.put("coordsys", "gps"); - - int size = 40; - int num = coordinates.size() / 40;//批量转换一次最多40对坐标 - for (int i = 0; i <= num; i++) { - - if (i == num) { - size = coordinates.size() % 40; - if (size == 0) { - return result; - } - } - - StringBuilder sb = new StringBuilder(); - for (String coordinate : coordinates.subList(i * 40, i * 40 + size)) { - sb.append(coordinate); - sb.append("|"); - } - params.replace("locations", sb.deleteCharAt(sb.length() - 1).toString()); - - try { - String str = HttpUtil.httpGet(url, params); - JSONObject jsStr = JSONObject.parseObject(str); - if (jsStr.getInteger("status") == 1) { - String[] gaodeCoordinates = jsStr.getString("locations").split(";"); - if (gaodeCoordinates != null) { - for (String gaodeCoordinate : gaodeCoordinates) { - result.add(gaodeCoordinate); - } - } - } else { - return result; - } - } catch (Exception e) { - e.printStackTrace(); - } - } - return result; - } - -}