Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-05-16 88b41b938164a5b62ed0a31cd6d8876a2a934776

Merge remote-tracking branch 'origin/master'

 ximon-admin/pom.xml

@@ -85,6 +85,10 @@
            <artifactId>UserAgentUtils</artifactId>
            <version>1.21</version>
        </dependency>
        <dependency>
            <groupId>org.assertj</groupId>
            <artifactId>assertj-core</artifactId>
        </dependency>
    </dependencies>

    <!-- Maven控制Spring Profile -->

 ximon-admin/src/main/java/com/sandu/ximon/admin/security/test.java

@@ -1,8 +1,5 @@
package com.sandu.ximon.admin.security;

import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;

/**
 * @Author liuhaonan
 * @Date 2022/2/24 10:15
@@ -11,15 +8,15 @@
public class test {
    public static void main(String[] args) {

        String s="123456";//$2a$10$t0t9gaLuWT/1XFDfbjbUueWcj2G/Dx5vQCrtyRKWNlqkz6C/y.oXK
        PasswordEncoder pw= new BCryptPasswordEncoder();
        //加密
        String encode=pw.encode(s);
        System.out.println(encode);
        //比较密码
        boolean matches=pw.matches(s,encode);
        System.out.println("==============================");
        System.out.println(matches);
//        String s="123456";//$2a$10$t0t9gaLuWT/1XFDfbjbUueWcj2G/Dx5vQCrtyRKWNlqkz6C/y.oXK
//        PasswordEncoder pw= new BCryptPasswordEncoder();
//        //加密
//        String encode=pw.encode(s);
//        System.out.println(encode);
//        //比较密码
//        boolean matches=pw.matches(s,encode);
//        System.out.println("==============================");
//        System.out.println(matches);
//
// //       LocalDateTime now = LocalDateTime.now();
////        Integer week = now.getDayOfWeek().getValue();
@@ -34,5 +31,14 @@
//        LocalDateTime parse = LocalDateTime.parse(format, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
//        System.out.println(parse);

        //获取用户的浏览器信息
//     String userAgent = request.getHeader("User-Agent");
////        System.out.println(userAgent);
////        //获取用户的ip地址
////        String ip = request.getRemoteAddr();
////        System.out.println(ip);
//        //获取用户的操作系统
//        String os = userAgent.substring(userAgent.indexOf("(") + 1, userAgent.indexOf(")"));

    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java

@@ -41,10 +41,9 @@

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -294,9 +293,13 @@
            }
        }

        Integer week = now.getDayOfWeek().getValue();

        Map map = new HashMap();
        //获取当前星期几 1-7

        int week = now.getDayOfWeek().getValue();
        Map map = new LinkedHashMap();
        //获取日期 精确到天
        LocalDateTime localDateTime = now.with(LocalTime.MIN);


        for (int i = 1; i < 8; i++) {
@@ -304,7 +307,8 @@
            if (week < 1) {
                week = 7;
            }
            map.put(i, getlist(week));
            String format = localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
            map.put(localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), getlist(week));
        }


@@ -363,7 +367,9 @@

        Integer week = now.getDayOfWeek().getValue();

        Map map = new HashMap();
        Map map = new LinkedHashMap();
        //获取当前日期  格式为yyyy-MM-dd
        LocalDateTime localDateTime = now.with(LocalTime.MIN);


        for (int i = 1; i < 8; i++) {
@@ -371,7 +377,7 @@
            if (week < 1) {
                week = 7;
            }
            map.put(i, getlistEnergy(week));
            map.put(localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), getlistEnergy(week));
        }