dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
374 changed files with 55245 additions and 1122 deletions
Showing only changes of commit a4ac11e7d9 - Show all commits

View File

@ -58,7 +58,7 @@ public class StrategyTempSyncAspect {
// 用ThreadLocal暂存删除前的对象 // 用ThreadLocal暂存删除前的对象
private ThreadLocal<EmsStrategyTemp> beforeDeleteThreadLocal = new ThreadLocal<>(); private ThreadLocal<EmsStrategyTemp> beforeDeleteThreadLocal = new ThreadLocal<>();
@Before("execution(* com.xzzn.ems.mapper.EmsStrategyTempMapper.deleteEmsStrategyTempById(..)) && args(templateId)") @Before("execution(* com.xzzn.ems.mapper.EmsStrategyTempMapper.deleteTempByTempId(..)) && args(templateId)")
public void beforeDelete(JoinPoint joinPoint, String templateId) { public void beforeDelete(JoinPoint joinPoint, String templateId) {
// 查询删除前的数据-仅存一获取siteId // 查询删除前的数据-仅存一获取siteId
List<EmsStrategyTemp> tempList = emsStrategyTempMapper.selectStrategyTempByTempId(templateId); List<EmsStrategyTemp> tempList = emsStrategyTempMapper.selectStrategyTempByTempId(templateId);
@ -67,7 +67,7 @@ public class StrategyTempSyncAspect {
} }
} }
@Pointcut("(execution(* com.xzzn.ems.mapper.EmsStrategyTempMapper.deleteEmsStrategyTempById(..)) && args(templateId)) ") @Pointcut("(execution(* com.xzzn.ems.mapper.EmsStrategyTempMapper.deleteTempByTempId(..)) && args(templateId)) ")
public void deletePointCut(String templateId) { public void deletePointCut(String templateId) {
logger.info("【删除策略模版切面】StrategyTempSyncAspect 被实例化"); logger.info("【删除策略模版切面】StrategyTempSyncAspect 被实例化");
} }
@ -105,7 +105,7 @@ public class StrategyTempSyncAspect {
} }
// 数据转换 // 数据转换
SyncStrategyTempVo tempVo = convertEntity(insertEntity); SyncStrategyTempVo tempVo = convertEntity(insertEntity);
String content = objectMapper.writeValueAsString(tempVo); String content = JSON.toJSONString(tempVo);
message.setContent(content); message.setContent(content);
// 发布到MQTT主题 // 发布到MQTT主题