From 33e1f47419d28736b17d6947bb15ccc290b2905a Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 二月 2025 17:42:45 +0800 Subject: [PATCH] 1、代码完善; 2、江海协议解析不正确处修改,如金额是4位小数; 3、根据江海协议,新建RTU模拟器模块,可以上报心跳、开阀、关阀数据。 --- pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/PipIrrBaseApplication.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/PipIrrBaseApplication.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/PipIrrBaseApplication.java index ad605ba..0575f41 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/PipIrrBaseApplication.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/PipIrrBaseApplication.java @@ -6,12 +6,26 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.context.annotation.FilterType; @SpringBootApplication @EnableAspectJAutoProxy @EnableMultiDataSource -@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.pipIrrBase"}) -@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoBa"}) +@ComponentScan(basePackages = {"com.dy.common", "com.dy.pipIrrGlobal", "com.dy.pipIrrBase"}, + excludeFilters = { + @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = { + com.dy.common.singleDataSource.DruidDataSourceConfig.class //鎺掗櫎鍗曟暟鎹簮 + }) + } +) +@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoBa", + "com.dy.pipIrrGlobal.daoSe", + "com.dy.pipIrrGlobal.daoRm", + "com.dy.pipIrrGlobal.daoPr", + "com.dy.pipIrrGlobal.daoFi", + "com.dy.pipIrrGlobal.daoOp", + "com.dy.pipIrrGlobal.daoAllRound" + }) public class PipIrrBaseApplication { public static void main(String[] args) { -- Gitblit v1.8.0