Merge remote-tracking branch 'origin/master'

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_tpm/src/main/java/org/jeecg/modules/Statistics/entity/Statistics.java

@@ -19,10 +19,10 @@ public class Statistics implements Serializable {
     private java.lang.String equipmentname;
     /**时间*/
     private java.util.Date logtime;
-    /**点位值(电流)*/
+    /**点位值*/
     private java.lang.Double tagvalue;
-    /**分时电量*/
-    private java.lang.Double othervalue;
+    /**值2(一般是分时电量使用)*/
+    private java.lang.Double tagvalue2;
     /**所属年*/
     private java.lang.Integer year;
     /**所属月*/

module_tpm/src/main/java/org/jeecg/modules/Statistics/mapper/xml/StatisticsMapper.xml

@@ -10,7 +10,7 @@
         <result property="equipmentname"    column="equipmentname"    />
         <result property="logtime"    column="logtime"    />
         <result property="tagvalue"    column="tagvalue"    />
-        <result property="othervalue"    column="othervalue"    />
+        <result property="tagvalue2"    column="tagvalue2"    />
         <result property="year"    column="year"    />
         <result property="month"    column="month"    />
         <result property="day"    column="day"    />