修改采集数据表

将kafka从tpm移动到ems中

module_ems/src/main/java/org/jeecg/modules/cronJob/GenerateDataJob.java

@@ -42,7 +42,7 @@ public class GenerateDataJob  {
     @Autowired
     private IDataVoltageService voltageService; //设备实时电压service
 
-    //@Scheduled(cron = "0 * * * * ?")
+//    @Scheduled(cron = "0 * * * * ?")
     public void execute() throws JobExecutionException {
         // 电流值范围：20-50、电压值范围：350-450、需量：400-1500、用电量、0-1.5
         // tagtype:4需量、5电流、6电压、7电量

module_ems/src/main/java/org/jeecg/modules/dataCurrent/entity/DataCurrent.java

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("tpm_data_current")
+@TableName("ems_data_current")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="设备实时电流对象", description="设备实时电流")

module_ems/src/main/java/org/jeecg/modules/dataDemand/entity/DataDemand.java

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("tpm_data_demand")
+@TableName("ems_data_demand")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="实时需量对象", description="实时需量")

module_ems/src/main/java/org/jeecg/modules/dataElectricity/entity/DataElectricity.java

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("tpm_data_electricity")
+@TableName("ems_data_electricity")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="分时电量对象", description="分时电量")

module_ems/src/main/java/org/jeecg/modules/dataElectricityDay/entity/DataElectricityDay.java

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("tpm_data_electricity_day")
+@TableName("ems_data_electricity_day")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="设备一天用电量对象", description="设备一天用电量")

module_ems/src/main/java/org/jeecg/modules/dataPower/entity/DataPower.java

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("tpm_data_power")
+@TableName("ems_data_power")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="设备实时功率对象", description="设备实时功率")

module_ems/src/main/java/org/jeecg/modules/dataVoltage/entity/DataVoltage.java

@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("tpm_data_voltage")
+@TableName("ems_data_voltage")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="设备实时电压对象", description="设备实时电压")

module_tpm/src/main/java/org/jeecg/kafka/consumer/TestConsumer.java

@@ -1,4 +1,4 @@
-package org.jeecg.kafka.consumer;
+package org.jeecg.modules.kafka.consumer;
 
 
 //import org.apache.kafka.clients.consumer.ConsumerRecord;

module_tpm/src/main/java/org/jeecg/kafka/controller/TestController.java

@@ -1,4 +1,4 @@
-package org.jeecg.kafka.controller;
+package org.jeecg.modules.kafka.controller;
 
 
 //import org.jeecg.kafka.producer.TestProducer;

module_tpm/src/main/java/org/jeecg/kafka/producer/TestProducer.java

@@ -1,4 +1,4 @@
-package org.jeecg.kafka.producer;
+package org.jeecg.modules.kafka.producer;
 
 //import com.alibaba.fastjson.JSON;
 //import lombok.extern.slf4j.Slf4j;