1. 新增用电量数据查询接口 2. 调整污染权重算法

riku

2021-07-12 d978297ae85b2d7453054e616bbbe87bfabe9cbe

 src/main/kotlin/com/flightfeather/uav/common/utils/DateUtil.kt

@@ -5,7 +5,24 @@
import java.text.SimpleDateFormat
import java.util.*

class DateUtil {
class DateUtil private constructor(){

    companion object {
        @Volatile
        private var dateUtil: DateUtil? = null

        @JvmStatic
        val instance: DateUtil
        get() {
            if (dateUtil == null) {
                synchronized(DateUtil::class.java) {
                    dateUtil = DateUtil()
                }
            }
            return dateUtil!!
        }
    }

    private val threadLocal = ThreadLocal<SimpleDateFormat>()

    private val `object` = Any()
@@ -61,7 +78,7 @@
        if (dateStyle != null) {
            var myDate = StringToDate(date, dateStyle)
            myDate = addInteger(myDate, dateType, amount)
            dateString = DateToString(myDate, dateStyle)
            dateString = dateToString(myDate, dateStyle)
        }
        return dateString
    }
@@ -259,7 +276,7 @@
    fun LongToString(millisecondStamp: Long?, dateStyle: DateStyle?): String? {
        var dateString: String? = null
        if (dateStyle != null) {
            dateString = DateToString(Date(millisecondStamp!!), dateStyle.value)
            dateString = dateToString(Date(millisecondStamp!!), dateStyle.value)
        }
        return dateString
    }
@@ -270,7 +287,7 @@
     * @param pattern 日期格式
     * @return 日期字符串
     */
    fun DateToString(date: Date?, pattern: String): String? {
    fun dateToString(date: Date?, pattern: String): String? {
        var dateString: String? = null
        if (date != null) {
            try {
@@ -287,10 +304,10 @@
     * @param dateStyle 日期风格
     * @return 日期字符串
     */
    fun DateToString(date: Date?, dateStyle: DateStyle?): String? {
    fun dateToString(date: Date?, dateStyle: DateStyle?): String? {
        var dateString: String? = null
        if (dateStyle != null) {
            dateString = DateToString(date, dateStyle.value)
            dateString = dateToString(date, dateStyle.value)
        }
        return dateString
    }
@@ -325,7 +342,7 @@
     * @return 新日期字符串
     */
    fun StringToString(date: String, olddPattern: String, newPattern: String): String? {
        return DateToString(StringToDate(date, olddPattern), newPattern)
        return dateToString(StringToDate(date, olddPattern), newPattern)
    }

    /**
@@ -616,7 +633,7 @@
     * @return 日期
     */
    fun getDate(date: Date?): String? {
        return DateToString(date, DateStyle.YYYY_MM_DD)
        return dateToString(date, DateStyle.YYYY_MM_DD)
    }

    /**
@@ -634,7 +651,7 @@
     * @return 时间
     */
    fun getTime(date: Date): String? {
        return DateToString(date, DateStyle.HH_MM_SS)
        return dateToString(date, DateStyle.HH_MM_SS)
    }

    /**