This commit is contained in:
wangjinlei
2023-12-06 15:01:26 +08:00
parent 13c76d69a0
commit 26aab125d5
2 changed files with 15 additions and 4 deletions

View File

@@ -185,11 +185,22 @@ public class PointController {
Date parse = simpleDateFormat.parse(date); Date parse = simpleDateFormat.parse(date);
List<Map<String,Object>> flag = new ArrayList<>(); List<Map<String,Object>> flag = new ArrayList<>();
for (int i=0;i<24;i+=2){ for (int i=0;i<24;i+=2){
Map<String,Object> ff = new HashMap<>();
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
instance.setTime(parse); instance.setTime(parse);
int i1 = instance.get(Calendar.HOUR_OF_DAY);
if(i1==23){
instance.add(Calendar.DAY_OF_MONTH,1);
}
if(i1==23&&i==0){
ff.put("now",true);
} else if (i1<i+1&&i1>=i-1) {
ff.put("now",true);
}else {
ff.put("now",false);
}
instance.set(Calendar.HOUR_OF_DAY,i); instance.set(Calendar.HOUR_OF_DAY,i);
Date time = instance.getTime(); Date time = instance.getTime();
Map<String,Object> ff = new HashMap<>();
ff.put("zwlz",pointService.ZWLZ(time)); ff.put("zwlz",pointService.ZWLZ(time));
ff.put("lgbf",pointService.LGBF(time)); ff.put("lgbf",pointService.LGBF(time));
ff.put("ftbf",pointService.FTBF(time)); ff.put("ftbf",pointService.FTBF(time));

View File

@@ -2,7 +2,7 @@ spring:
redis: redis:
open: false # 是否开启redis缓存 true开启 false关闭 open: false # 是否开启redis缓存 true开启 false关闭
database: 0 database: 0
host: 59.110.212.44 host: 47.93.127.115
port: 6379 port: 6379
password: Jgll2015 # 密码(默认为空) password: Jgll2015 # 密码(默认为空)
timeout: 6000000ms # 连接超时时长(毫秒) timeout: 6000000ms # 连接超时时长(毫秒)
@@ -52,7 +52,7 @@ spring:
initSQL: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci initSQL: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci
rabbitmq: rabbitmq:
host: 39.106.36.183 host: 47.93.127.115
port: 5672 port: 5672
username: admin username: admin
password: 751019 password: 751019
@@ -88,5 +88,5 @@ wxpay:
privateKeyUrl: D:/hs/nuttyreading-java/src/main/resources/cent/apiclient_key.pem privateKeyUrl: D:/hs/nuttyreading-java/src/main/resources/cent/apiclient_key.pem
redisAddress: redis://39.106.36.183:6379 redisAddress: redis://47.93.127.115:6379
redisPassword: Jgll2015 redisPassword: Jgll2015