diff --git a/fw-dalaran-common/pom.xml b/fw-dalaran-common/pom.xml
index 9b611a4..dc87b07 100644
--- a/fw-dalaran-common/pom.xml
+++ b/fw-dalaran-common/pom.xml
@@ -48,6 +48,10 @@
net.coobird
thumbnailator
+
+ org.springframework.boot
+ spring-boot
+
diff --git a/fw-dalaran-common/src/main/java/cn/fw/dalaran/common/ConfigProperties.java b/fw-dalaran-common/src/main/java/cn/fw/dalaran/common/ConfigProperties.java
new file mode 100644
index 0000000..c709531
--- /dev/null
+++ b/fw-dalaran-common/src/main/java/cn/fw/dalaran/common/ConfigProperties.java
@@ -0,0 +1,27 @@
+package cn.fw.dalaran.common;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * @author wmy3969
+ * @version 1.0
+ * @date 2022/12/29 9:43
+ * @Description 配置文件关联
+ */
+@Data
+@ConfigurationProperties(prefix = "url")
+public class ConfigProperties {
+ /**
+ * 图片文件
+ */
+ private String show;
+ /**
+ * 删除map缓存
+ */
+ private String delMapCache;
+ /**
+ * 重新计算综合得分
+ */
+ private String reCalcScore;
+}
diff --git a/fw-dalaran-common/src/main/java/cn/fw/dalaran/common/constants/Constants.java b/fw-dalaran-common/src/main/java/cn/fw/dalaran/common/constants/Constants.java
index cf56a32..012977d 100644
--- a/fw-dalaran-common/src/main/java/cn/fw/dalaran/common/constants/Constants.java
+++ b/fw-dalaran-common/src/main/java/cn/fw/dalaran/common/constants/Constants.java
@@ -30,7 +30,7 @@ public interface Constants {
/**
* 账号配置角色码
*/
- String ZHSZ_ROLE_CODE = "ZMT-ZHSZ";
+ String ZHSZ_ROLE_CODE = "MKT-HDCZ";
/**
* 直播审计角色码
*/
diff --git a/fw-dalaran-common/src/main/java/cn/fw/dalaran/common/utils/DateUtil.java b/fw-dalaran-common/src/main/java/cn/fw/dalaran/common/utils/DateUtil.java
index 8133c50..27a67f0 100644
--- a/fw-dalaran-common/src/main/java/cn/fw/dalaran/common/utils/DateUtil.java
+++ b/fw-dalaran-common/src/main/java/cn/fw/dalaran/common/utils/DateUtil.java
@@ -1,13 +1,14 @@
package cn.fw.dalaran.common.utils;
+import cn.fw.common.exception.BusinessException;
+
import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.*;
+import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Objects;
+import java.util.*;
/**
* 日期处理工具
@@ -17,6 +18,9 @@ import java.util.Objects;
*/
public final class DateUtil {
+ public static final String START = "start";
+ public static final String END = "end";
+
static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
/**
@@ -26,7 +30,6 @@ public final class DateUtil {
throw new UnsupportedOperationException();
}
-
public static Date parse(String date) {
try {
return sdf.parse(date);
@@ -56,46 +59,6 @@ public final class DateUtil {
return localDateTime2Date(date2LocalDate(date).plusDays(1).atStartOfDay());
}
- /**
- * 处理日期，保留年月日
- */
- public static LocalDate date2LocalDate(final Date date) {
- if (date == null) {
- return null;
- }
- return LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()).toLocalDate();
- }
-
- public static LocalTime date2LocalTime(final Date date) {
- if (date == null) {
- return null;
- }
- return LocalTime.of(date.getHours(), date.getMinutes(), date.getSeconds());
- }
-
- public static LocalDateTime date2LocalDateTime(final Date date) {
- Instant instant = date.toInstant();
- ZoneId zoneId = ZoneId.systemDefault();
- return instant.atZone(zoneId).toLocalDateTime();
- }
-
- /**
- * convert LocalDateTime to Date
- */
- public static Date localDateTime2Date(final LocalDateTime dateTime) {
- return Date.from(dateTime.atZone(ZoneId.systemDefault()).toInstant());
- }
-
- /**
- * convert LocalDate to Date
- */
- public static Date localDate2Date(final LocalDate localDate) {
- if (localDate == null) {
- return null;
- }
- return Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
- }
-
public static Date getBeginInTime(Date inTime) {
if (inTime == null) {
return null;
@@ -561,6 +524,366 @@ public final class DateUtil {
return a > 18 && a <= 23;
}
+
+ /**
+ * 获取date的天的时间范围
+ * date: 2022-8-18 11:19:32
+ * return: 2022-8-18 0:00:00 ——> 2022-8-18 23:59:59
+ */
+ public static Map getDayRange(Date date) {
+ Map dateMap = new HashMap<>();
+ dateMap.put(START, dayBegin(date));
+ dateMap.put(END, dayEnd(date));
+ return dateMap;
+ }
+
+ /**
+ * 获取date的月份的时间范围
+ * date: 2022-8-18 11:19:32
+ * return: 2022-8-01 0:00:00 ——> 2022-8-31 23:59:59
+ */
+ public static Map getMonthRange(Date date) {
+ Map dateMap = new HashMap<>();
+ LocalDate localDate = date2LocalDate(date);
+ dateMap.put(START, dayBegin(localDate2Date(localDate.withDayOfMonth(1))));
+ dateMap.put(END, dayEnd(localDate2Date(localDate.with(TemporalAdjusters.lastDayOfMonth()))));
+ return dateMap;
+ }
+
+ /**
+ * 获取date的近4个月的时间范围
+ * date: 2022-8-18 11:19:32
+ * return: 2022-5-01 0:00:00 ——> 2022-8-31 23:59:59
+ */
+ public static Map get4MonthRange(Date date) {
+ Map dateMap = new HashMap<>();
+ LocalDate localDate = date2LocalDate(date);
+ dateMap.put(START, dayBegin(localDate2Date(localDate.withDayOfMonth(1).minusMonths(3))));
+ dateMap.put(END, dayEnd(localDate2Date(localDate.with(TemporalAdjusters.lastDayOfMonth()))));
+ return dateMap;
+ }
+
+ /**
+ * 获取date的近1年的时间范围
+ * date: 2022-8-18 11:19:32
+ * return: 2021-9-01 0:00:00 ——> 2022-8-31 23:59:59
+ */
+ public static Map getOneYearRange(Date date) {
+ Map dateMap = new HashMap<>();
+ LocalDate localDate = date2LocalDate(date);
+ dateMap.put(START, dayBegin(localDate2Date(localDate.withDayOfMonth(1).minusMonths(11))));
+ dateMap.put(END, dayEnd(localDate2Date(localDate.with(TemporalAdjusters.lastDayOfMonth()))));
+ return dateMap;
+ }
+
+ /**
+ * 获取指定时间那天的最小时间
+ * date: 2022-8-18 11:19:32
+ * return: 2022-8-18 0:00:00
+ */
+ public static Date dayBegin(Date date) {
+ return localDateTime2Date(LocalDateTime
+ .of(date2LocalDate(Objects.requireNonNull(date)), LocalTime.MIN)
+ );
+ }
+
+ /**
+ * 获取指定时间那天的最大时间
+ * date: 2022-8-18 11:19:32
+ * return: 2022-8-18 23:59:59
+ */
+ public static Date dayEnd(Date date) {
+ return localDateTime2Date(LocalDateTime
+ .of(date2LocalDate(Objects.requireNonNull(date)), LocalTime.MAX)
+ );
+ }
+
+ /**
+ * 获取指定时间那月的最小时间
+ * date: 2022-8-18 11:19:32
+ * return: 2022-8-01 0:00:00
+ */
+ public static Date monthBegin(Date date) {
+ return localDateTime2Date(LocalDateTime
+ .of(date2LocalDate(Objects.requireNonNull(date)).withDayOfMonth(1), LocalTime.MIN)
+ );
+ }
+
+ /**
+ * 获取指定时间那月的最大时间
+ * date: 2022-8-18 11:19:32
+ * return: 2022-8-31 23:59:59
+ */
+ public static Date monthEnd(Date date) {
+ return localDateTime2Date(LocalDateTime
+ .of(date2LocalDate(Objects.requireNonNull(date)).with(TemporalAdjusters.lastDayOfMonth()), LocalTime.MAX)
+ );
+ }
+
+ /**
+ * LocalDate转Date
+ */
+ public static Date localDate2Date(LocalDate localDate) {
+ return Date.from(Objects.requireNonNull(localDate)
+ .atStartOfDay()
+ .atZone(ZoneId.systemDefault())
+ .toInstant()
+ );
+ }
+
+ /**
+ * LocalDateTime转Date
+ */
+ public static Date localDateTime2Date(LocalDateTime localDateTime) {
+ return Date.from(Objects.requireNonNull(localDateTime)
+ .atZone(ZoneId.systemDefault())
+ .toInstant()
+ );
+ }
+
+ /**
+ * Date转LocalDateTime
+ */
+ public static LocalDateTime date2LocalDateTime(Date date) {
+ return Objects.requireNonNull(date)
+ .toInstant()
+ .atZone(ZoneId.systemDefault())
+ .toLocalDateTime()
+ ;
+ }
+
+ /**
+ * Date转LocalTime
+ */
+ public static LocalTime date2LocalTime(Date date) {
+ return Objects.requireNonNull(date)
+ .toInstant()
+ .atZone(ZoneId.systemDefault())
+ .toLocalTime()
+ ;
+ }
+
+ /**
+ * Date转LocalDate
+ */
+ public static LocalDate date2LocalDate(Date date) {
+ return Objects.requireNonNull(date)
+ .toInstant()
+ .atZone(ZoneId.systemDefault())
+ .toLocalDate()
+ ;
+ }
+
+ /**
+ * 时间戳转LocalDate
+ */
+ public static LocalDate timestamp2LocalDate(Long timestamp) {
+ return Instant.
+ ofEpochMilli(Objects.requireNonNull(timestamp))
+ .atZone(ZoneId.systemDefault())
+ .toLocalDate()
+ ;
+ }
+
+ /**
+ * 时间戳转LocalDateTime
+ */
+ public static LocalDateTime timestamp2LocalDateTime(Long timestamp) {
+ return Instant.
+ ofEpochMilli(Objects.requireNonNull(timestamp))
+ .atZone(ZoneId.systemDefault())
+ .toLocalDateTime()
+ ;
+ }
+
+ /**
+ * LocalDate转时间戳
+ */
+ public static Long localDate2Timestamp(LocalDate localDate) {
+ return Objects.requireNonNull(localDate)
+ .atStartOfDay(ZoneId.systemDefault())
+ .toInstant()
+ .toEpochMilli()
+ ;
+ }
+
+ /**
+ * LocalDateTime转时间戳
+ */
+ public static Long localDateTime2Timestamp(LocalDateTime localDateTime) {
+ return Objects.requireNonNull(localDateTime)
+ .toInstant(ZoneOffset.ofHours(8))
+ .toEpochMilli()
+ ;
+ }
+
+ /**
+ * 按照pattern指定的格式格式化LocalDateTime对象
+ */
+ public static String formatLocalDateTime(LocalDateTime localDateTime, String pattern) {
+ DateTimeFormatter dtf = DateTimeFormatter.ofPattern(Objects.requireNonNull(pattern));
+ return Objects.requireNonNull(localDateTime).format(dtf);
+ }
+
+ /**
+ * 两个时间是否在同一天
+ */
+ public static boolean sameDay(Date day1, Date day2) {
+ return Objects.equals(date2LocalDate(Objects.requireNonNull(day1)), date2LocalDate(Objects.requireNonNull(day2)));
+ }
+
+ /**
+ * 两个时间是否在同一月
+ */
+ public static boolean sameMonth(Date day1, Date day2) {
+ LocalDate date1 = date2LocalDate(Objects.requireNonNull(day1));
+ LocalDate date2 = date2LocalDate(Objects.requireNonNull(day2));
+ return Objects.equals(date1.getYear(), date2.getYear()) && Objects.equals(date1.getMonthValue(), date2.getMonthValue());
+ }
+
+ /**
+ * 两个时间是否在同一年
+ */
+ public static boolean sameYear(Date day1, Date day2) {
+ LocalDate date1 = date2LocalDate(Objects.requireNonNull(day1));
+ LocalDate date2 = date2LocalDate(Objects.requireNonNull(day2));
+ return Objects.equals(date1.getYear(), date2.getYear());
+ }
+
+ /**
+ * 指定时间 + 指定秒
+ */
+ public static Date plusSeconds(Date date, int seconds) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).plusSeconds(Math.abs(seconds)));
+ }
+
+ /**
+ * 指定时间 - 指定秒
+ */
+ public static Date minusSeconds(Date date, int seconds) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).minusSeconds(Math.abs(seconds)));
+ }
+
+ /**
+ * 指定时间 + 指定分钟
+ */
+ public static Date plusMinutes(Date date, int minutes) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).plusMinutes(Math.abs(minutes)));
+ }
+
+ /**
+ * 指定时间 - 指定秒
+ */
+ public static Date minusMinutes(Date date, int minutes) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).minusMinutes(Math.abs(minutes)));
+ }
+
+ /**
+ * 指定时间 + 指定小时
+ */
+ public static Date plusHours(Date date, int hours) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).plusHours(Math.abs(hours)));
+ }
+
+ /**
+ * 指定时间 - 指定小时
+ */
+ public static Date minusHours(Date date, int hours) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).minusHours(Math.abs(hours)));
+ }
+
+ /**
+ * 指定时间 + 指定天
+ */
+ public static Date plusDays(Date date, int days) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).plusDays(Math.abs(days)));
+ }
+
+ /**
+ * 指定时间 - 指定天
+ */
+ public static Date minusDays(Date date, int days) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).minusDays(Math.abs(days)));
+ }
+
+ /**
+ * 指定时间 + 指定星期
+ */
+ public static Date plusWeeks(Date date, int weeks) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).plusWeeks(Math.abs(weeks)));
+ }
+
+ /**
+ * 指定时间 - 指定星期
+ */
+ public static Date minusWeeks(Date date, int weeks) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).minusWeeks(Math.abs(weeks)));
+ }
+
+ /**
+ * 指定时间 + 指定月
+ */
+ public static Date plusMonths(Date date, int months) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).plusMonths(Math.abs(months)));
+ }
+
+ /**
+ * 指定时间 - 指定月
+ */
+ public static Date minusMonths(Date date, int months) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).minusMonths(Math.abs(months)));
+ }
+
+ /**
+ * 指定时间 + 指定年
+ */
+ public static Date plusYears(Date date, int years) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).plusYears(Math.abs(years)));
+ }
+
+ /**
+ * 指定时间 - 指定年
+ */
+ public static Date minusYears(Date date, int years) {
+ return localDateTime2Date(date2LocalDateTime(Objects.requireNonNull(date)).minusYears(Math.abs(years)));
+ }
+
+ /**
+ * 校验时间有无重叠
+ *
+ * @param startDate1 开始时间1
+ * @param endDate1 结束时间1
+ * @param startDate2 开始时间2
+ * @param endDate2 结束时间2
+ * @return 两个时间区间是否有重叠
+ */
+ public static boolean validDateOverlap(Date startDate1, Date endDate1, Date startDate2, Date endDate2) {
+ if (startDate1.after(endDate1) || startDate2.after(endDate2))
+ throw new BusinessException("开始时间必须在结束时间之前");
+ return !endDate2.before(startDate1) && !startDate2.after(endDate1) && !endDate1.before(startDate2) && !startDate1.after(endDate2);
+ }
+
+ /**
+ * 毫秒->xx天xx小时xx分xx秒xx毫秒
+ */
+ public static String millisToString(Long totalMillis) {
+ totalMillis = Math.abs(totalMillis);
+ int secondMillis = 1000;// 每秒钟毫秒数
+ int minuteMillis = secondMillis * 60;// 每分钟毫秒数
+ int hourMillis = minuteMillis * 60;// 每小时毫秒数
+ int dayMillis = hourMillis * 24;// 每天毫秒数
+ long days = totalMillis / dayMillis;// 共有多少天
+ long hours = (totalMillis - days * dayMillis) / hourMillis;// 还有多少小时
+ long minutes = (totalMillis - days * dayMillis - hours * hourMillis) / minuteMillis;// 还有多少分钟
+ /*long seconds = (totalMillis - days * dayMillis - hours * hourMillis - minutes * minuteMillis) / secondMillis;// 还有多少秒
+ long millis = totalMillis - days * dayMillis - hours * hourMillis - minutes * minuteMillis - seconds * secondMillis;// 还有多少毫秒*/
+ return (days > 0 ? days : 0) + "天" +
+ (hours > 0 ? hours : 0) + "小时" +
+ (minutes > 0 ? minutes : 0) + "分" /*+
+ (seconds > 0 ? seconds : 0) + "秒" +
+ (millis > 0 ? millis : 0) + "毫秒"*/;
+ }
+
public static void main(String[] args) throws ParseException {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = format.parse("2020-09-19 15:45:30");
diff --git a/fw-dalaran-server/pom.xml b/fw-dalaran-server/pom.xml
index 0766507..42b458b 100644
--- a/fw-dalaran-server/pom.xml
+++ b/fw-dalaran-server/pom.xml
@@ -149,7 +149,11 @@
fw-dalaran-domain
1.0.0
-
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ true
+
diff --git a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/Application.java b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/Application.java
index 6168213..a374e33 100644
--- a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/Application.java
+++ b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/Application.java
@@ -1,9 +1,11 @@
package cn.fw.dalaran.server;
+import cn.fw.dalaran.common.ConfigProperties;
import cn.fw.security.auth.client.EnableAuthClient;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -33,6 +35,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@ComponentScan({"cn.fw.dalaran.*"})
@EnableFeignClients({"cn.fw.**.sdk"})
@EnableAspectJAutoProxy(exposeProxy = true)
+@EnableConfigurationProperties({ConfigProperties.class})
public class Application {
public static void main(final String[] args) {
SpringApplication.run(Application.class, args);
diff --git a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/TodoTask.java b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/TodoTask.java
index da9f3b3..1015b76 100644
--- a/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/TodoTask.java
+++ b/fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/TodoTask.java
@@ -1,6 +1,7 @@
package cn.fw.dalaran.server.task;
import cn.fw.dalaran.common.constants.Constants;
+import cn.fw.dalaran.common.utils.DateUtil;
import cn.fw.dalaran.domain.db.Account;
import cn.fw.dalaran.domain.db.ActivityTheme;
import cn.fw.dalaran.domain.db.LivePool;
@@ -52,7 +53,7 @@ public class TodoTask {
List list = todoHistoryService.list(Wrappers.lambdaQuery()
.eq(TodoHistory::getSend, Boolean.FALSE)
.eq(TodoHistory::getDone, Boolean.FALSE)
- .ge(TodoHistory::getCreateTime, new Date(System.currentTimeMillis() - 7 * 24 * 3600 * 1000L))// 创建时间不超过7天的
+ .ge(TodoHistory::getCreateTime, DateUtil.minusDays(new Date(), 7))// 创建时间不超过7天的
);// 找到需要推送待办的数据项
if (CollectionUtils.isEmpty(list)) {
return;
diff --git a/fw-dalaran-server/src/main/resources/application-dev.yml b/fw-dalaran-server/src/main/resources/application-dev.yml
index e8db712..3207f05 100644
--- a/fw-dalaran-server/src/main/resources/application-dev.yml
+++ b/fw-dalaran-server/src/main/resources/application-dev.yml
@@ -23,3 +23,8 @@ logging:
nacos:
plugin:
namespace: df959b8c-de58-4d02-b9fb-d65ca3be05f3
+
+url:
+ show: https://testgate.feewee.cn/file/show?fid= #文件服务器地址
+ del-map-cache: http://testgate.feewee.cn/report2/dalaran/004/other/clearCache #清除报表系统自媒体数据缓存
+ re-calc-score: http://testgate.feewee.cn/report2/debug/extract/data/dalaran?dateType=DAILY&type=Dalaran004D&date= #重新抽取综合得分
diff --git a/fw-dalaran-server/src/main/resources/application-local.yml b/fw-dalaran-server/src/main/resources/application-local.yml
index b52a51b..365bec3 100644
--- a/fw-dalaran-server/src/main/resources/application-local.yml
+++ b/fw-dalaran-server/src/main/resources/application-local.yml
@@ -33,4 +33,7 @@ jedis:
pwd: fw@test@redis
port: 6378
-file-server-addr: 'https://testgate.feewee.cn/file/show?fid='
+url:
+ show: https://testgate.feewee.cn/file/show?fid= #文件服务器地址
+ del-map-cache: http://testgate.feewee.cn/report2/dalaran/004/other/clearCache #清除报表系统自媒体数据缓存
+ re-calc-score: http://testgate.feewee.cn/report2/debug/extract/data/dalaran?dateType=DAILY&type=Dalaran004D&date= #重新抽取综合得分
diff --git a/fw-dalaran-server/src/main/resources/application-prd.yml b/fw-dalaran-server/src/main/resources/application-prd.yml
index 7afbddb..99f20fe 100644
--- a/fw-dalaran-server/src/main/resources/application-prd.yml
+++ b/fw-dalaran-server/src/main/resources/application-prd.yml
@@ -51,4 +51,7 @@ rocketmq:
task:
switch: 'on'
-file-server-addr: 'https://gate.feewee.cn/file/show?fid='
+url:
+ show: https://gate.feewee.cn/file/show?fid= #文件服务器地址
+ del-map-cache: http://gate.feewee.cn/report2/dalaran/004/other/clearCache #清除报表系统自媒体数据缓存
+ re-calc-score: http://gate.feewee.cn/report2/debug/extract/data/dalaran?dateType=DAILY&type=Dalaran004D&date= #重新抽取综合得分
diff --git a/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/OtherBizService.java b/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/OtherBizService.java
index dd55e39..387bba2 100644
--- a/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/OtherBizService.java
+++ b/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/biz/OtherBizService.java
@@ -1,5 +1,6 @@
package cn.fw.dalaran.service.biz;
+import cn.fw.dalaran.common.ConfigProperties;
import cn.fw.dalaran.common.constants.Constants;
import cn.fw.dalaran.common.exception.BusinessException;
import cn.fw.dalaran.common.utils.PublicUtil;
@@ -43,6 +44,7 @@ import java.util.stream.Collectors;
public class OtherBizService {
@Value("${spring.profiles.active}")
private String env;// 获取系统当前环境
+ private final ConfigProperties configProperties;
private final ActivityThemeService activityThemeService;
private final LivePoolService livePoolService;
private final LiveCheckResultService liveCheckResultService;
@@ -196,8 +198,8 @@ public class OtherBizService {
while (!flag && cnt < 5) {
if (cnt > 0)
LockSupport.parkNanos(TimeUnit.SECONDS.toNanos(1));
- this.sendGetRequest("http://" + (env.contains("prd") ? "" : "test") + "gate.feewee.cn/report2/dalaran/004/other/clearCache");// 清空缓存
- flag = this.sendGetRequest("http://" + (env.contains("prd") ? "" : "test") + "gate.feewee.cn/report2/debug/extract/data/dalaran?dateType=DAILY&type=Dalaran004D&date=" +
+ this.sendGetRequest(configProperties.getDelMapCache());// 清空缓存
+ flag = this.sendGetRequest(configProperties.getReCalcScore() +
sdf.format(activityTheme.getEndTime())
);
cnt++;
diff --git a/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/impl/ActivityThemeServiceImpl.java b/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/impl/ActivityThemeServiceImpl.java
index 11231fa..dbc5b1e 100644
--- a/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/impl/ActivityThemeServiceImpl.java
+++ b/fw-dalaran-service/src/main/java/cn/fw/dalaran/service/data/impl/ActivityThemeServiceImpl.java
@@ -2,6 +2,7 @@ package cn.fw.dalaran.service.data.impl;
import cn.fw.common.page.AppPage;
import cn.fw.common.web.auth.LoginAuthBean;
+import cn.fw.dalaran.common.ConfigProperties;
import cn.fw.dalaran.common.constants.Constants;
import cn.fw.dalaran.common.exception.BusinessException;
import cn.fw.dalaran.common.utils.DateUtil;
@@ -35,7 +36,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -59,8 +59,7 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public class ActivityThemeServiceImpl extends ServiceImpl implements ActivityThemeService {
- @Value("${file-server-addr}")
- private String serverAddr;
+ private final ConfigProperties configProperties;
private final ActivityThemeDao activityThemeDao;
private final ConfigGroupService configGroupService;
private final ThemeFileService themeFileService;
@@ -83,7 +82,14 @@ public class ActivityThemeServiceImpl extends ServiceImpl validDateOverlap(item.getStartTime(), item.getEndTime(), vo.getStartTime(), vo.getEndTime()) &&// 验证时间重叠
/*(Objects.equals(item.getAllShop(), 1) || vo.getAllShop() || validShopOverlap(Arrays.stream(item.getShopIds().split(",")).map(Long::valueOf).collect(Collectors.toList()), vo.getShopIds()))// 验证门店重叠*/
- (Objects.equals(item.getAllShop(), 1) || configGroup.getAllShop() > 0 || validShopOverlap(Arrays.stream(item.getShopIds().split(",")).map(Long::valueOf).collect(Collectors.toList()), Arrays.stream(configGroup.getShopIds().split(",")).map(Long::valueOf).collect(Collectors.toList())))// 验证门店重叠
+ (Objects.equals(item.getAllShop(), 1) || configGroup.getAllShop() > 0 ||
+ validShopOverlap(Arrays.stream(item.getShopIds().split(","))
+ .map(Long::valueOf)
+ .collect(Collectors.toList()), Arrays.stream(configGroup.getShopIds().split(","))
+ .map(Long::valueOf)
+ .collect(Collectors.toList())
+ )
+ )// 验证门店重叠
);
}
@@ -363,7 +369,7 @@ public class ActivityThemeServiceImpl extends ServiceImpl {
try {
String fileId = item.getFid();
- File downloadFile = ImageUtils.convertFileByUrl(serverAddr + fileId, fileId);
+ File downloadFile = ImageUtils.convertFileByUrl(configProperties.getShow() + fileId, fileId);
ImageUtils.modifyResolution1(downloadFile.getPath(),
tempDir + "activityTheme" + File.separator + activityTheme.getId() /*+ "#" + activityTheme.getTheme()*/ + File.separator + "settingCover",
"fw_theme_cover_" + fileId,
diff --git a/pom.xml b/pom.xml
index 608bd9d..a053ff6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,11 @@
mybatis-typehandlers-jsr310
${mybatis-typehandlers-jsr310}
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ 2.1.12.RELEASE
+