Browse Source

优化电度
1:新增电度记录时,判断当前小时内是否以及采集过
2:发送电度召唤时,判断需要采集的电度总数是否和当前小时内已采集数量相等,不等才发送召唤

hfxc226 2 years ago
parent
commit
238f0604df

+ 1 - 1
platform-iec/pom.xml

@@ -28,7 +28,7 @@
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.platform</groupId>
             <groupId>com.platform</groupId>
-            <artifactId>platform-dao</artifactId>
+            <artifactId>platform-common</artifactId>
             <version>1.0-SNAPSHOT</version>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>

+ 1 - 4
platform-iec/src/main/java/com/platform/iec/IecApplication.java

@@ -1,6 +1,5 @@
 package com.platform.iec;
 package com.platform.iec;
 
 
-import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
 import com.platform.iec.master.MasterSysDataHandler;
 import com.platform.iec.master.MasterSysDataHandler;
 import com.ydl.iec.iec104.config.Iec104Config;
 import com.ydl.iec.iec104.config.Iec104Config;
 import com.ydl.iec.iec104.server.Iec104MasterFactory;
 import com.ydl.iec.iec104.server.Iec104MasterFactory;
@@ -9,7 +8,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.annotation.Order;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 
@@ -21,8 +19,7 @@ import java.util.TimeZone;
  * @Date 2019/7/22
  * @Date 2019/7/22
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
  */
  */
-@SpringBootApplication(scanBasePackages = {"com.platform.common","com.platform.dao", "com.platform.iec"}, exclude = {
-        DataSourceAutoConfiguration.class, PageHelperAutoConfiguration.class})
+@SpringBootApplication
 @EnableScheduling
 @EnableScheduling
 @Order(1)
 @Order(1)
 @Slf4j
 @Slf4j