From 552d471fde57d83857aeda52522167310867dc0b Mon Sep 17 00:00:00 2001 From: zq Date: Tue, 30 Dec 2025 15:25:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=E4=B8=8B=E5=8F=91=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aspectj/StrategyRunningSyncAspect.java | 15 +++++++---- .../aspectj/StrategyTempSyncAspect.java | 25 +++++++++++++------ .../aspectj/StrategyTimeConfigSyncAspect.java | 24 ++++++++++++------ 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/ems-framework/src/main/java/com/xzzn/framework/aspectj/StrategyRunningSyncAspect.java b/ems-framework/src/main/java/com/xzzn/framework/aspectj/StrategyRunningSyncAspect.java index 3892603..4beb204 100644 --- a/ems-framework/src/main/java/com/xzzn/framework/aspectj/StrategyRunningSyncAspect.java +++ b/ems-framework/src/main/java/com/xzzn/framework/aspectj/StrategyRunningSyncAspect.java @@ -10,18 +10,23 @@ import com.xzzn.ems.mapper.EmsMqttTopicConfigMapper; import com.xzzn.ems.mapper.EmsStrategyRunningMapper; import com.xzzn.ems.mapper.MqttSyncLogMapper; import com.xzzn.framework.web.service.MqttPublisher; -import org.apache.juli.logging.Log; -import org.apache.juli.logging.LogFactory; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cglib.beans.BeanMap; import org.springframework.stereotype.Component; -import java.util.*; - /** * 策略运行切面同步 * 云端 - 本地 @@ -30,7 +35,7 @@ import java.util.*; @Component public class StrategyRunningSyncAspect { - private static final Log logger = LogFactory.getLog(StrategyRunningSyncAspect.class); + private static final Logger logger = LoggerFactory.getLogger(StrategyRunningSyncAspect.class); @Autowired private MqttPublisher mqttPublisher; diff --git a/ems-framework/src/main/java/com/xzzn/framework/aspectj/StrategyTempSyncAspect.java b/ems-framework/src/main/java/com/xzzn/framework/aspectj/StrategyTempSyncAspect.java index d12b416..3714352 100644 --- a/ems-framework/src/main/java/com/xzzn/framework/aspectj/StrategyTempSyncAspect.java +++ b/ems-framework/src/main/java/com/xzzn/framework/aspectj/StrategyTempSyncAspect.java @@ -4,23 +4,34 @@ import com.alibaba.fastjson2.JSON; import com.fasterxml.jackson.databind.ObjectMapper; import com.xzzn.common.utils.StringUtils; import com.xzzn.common.utils.bean.BeanUtils; -import com.xzzn.ems.domain.*; +import com.xzzn.ems.domain.EmsStrategy; +import com.xzzn.ems.domain.EmsStrategyRunning; +import com.xzzn.ems.domain.EmsStrategyTemp; +import com.xzzn.ems.domain.MqttSyncLog; import com.xzzn.ems.domain.vo.SyncStrategyTempVo; -import com.xzzn.ems.mapper.*; +import com.xzzn.ems.mapper.EmsMqttTopicConfigMapper; +import com.xzzn.ems.mapper.EmsStrategyMapper; +import com.xzzn.ems.mapper.EmsStrategyTempMapper; +import com.xzzn.ems.mapper.MqttSyncLogMapper; import com.xzzn.framework.web.service.MqttPublisher; -import org.apache.juli.logging.Log; -import org.apache.juli.logging.LogFactory; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Pointcut; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cglib.beans.BeanMap; import org.springframework.stereotype.Component; -import java.util.*; - /** * 策略模板数据同步 * 云端 - 本地 @@ -29,7 +40,7 @@ import java.util.*; @Component public class StrategyTempSyncAspect { - private static final Log logger = LogFactory.getLog(StrategyTempSyncAspect.class); + private static final Logger logger = LoggerFactory.getLogger(StrategyTempSyncAspect.class); @Autowired private MqttPublisher mqttPublisher; diff --git a/ems-framework/src/main/java/com/xzzn/framework/aspectj/StrategyTimeConfigSyncAspect.java b/ems-framework/src/main/java/com/xzzn/framework/aspectj/StrategyTimeConfigSyncAspect.java index 69f7e26..988e8b3 100644 --- a/ems-framework/src/main/java/com/xzzn/framework/aspectj/StrategyTimeConfigSyncAspect.java +++ b/ems-framework/src/main/java/com/xzzn/framework/aspectj/StrategyTimeConfigSyncAspect.java @@ -3,22 +3,32 @@ package com.xzzn.framework.aspectj; import com.fasterxml.jackson.databind.ObjectMapper; import com.xzzn.common.utils.StringUtils; import com.xzzn.common.utils.bean.BeanUtils; -import com.xzzn.ems.domain.*; +import com.xzzn.ems.domain.EmsStrategy; +import com.xzzn.ems.domain.EmsStrategyRunning; +import com.xzzn.ems.domain.EmsStrategyTimeConfig; +import com.xzzn.ems.domain.MqttSyncLog; import com.xzzn.ems.domain.vo.SyncStrategyTimeConfigVo; -import com.xzzn.ems.mapper.*; +import com.xzzn.ems.mapper.EmsMqttTopicConfigMapper; +import com.xzzn.ems.mapper.EmsStrategyMapper; +import com.xzzn.ems.mapper.EmsStrategyTempMapper; +import com.xzzn.ems.mapper.MqttSyncLogMapper; import com.xzzn.framework.web.service.MqttPublisher; -import org.apache.juli.logging.Log; -import org.apache.juli.logging.LogFactory; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cglib.beans.BeanMap; import org.springframework.stereotype.Component; -import java.util.*; - /** * 策略时间配置同步 * 云端 - 本地 @@ -27,7 +37,7 @@ import java.util.*; @Component public class StrategyTimeConfigSyncAspect { - private static final Log logger = LogFactory.getLog(StrategyTimeConfigSyncAspect.class); + private static final Logger logger = LoggerFactory.getLogger(StrategyTimeConfigSyncAspect.class); @Autowired private MqttPublisher mqttPublisher;