新增分析进度

energy-manage-common/src/main/java/com/energy/manage/common/po/analysis/AnalysisResultPo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.persistence.Table;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -68,4 +69,9 @@ public class AnalysisResultPo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime ;
 
+    /**
+     * 分析进度
+     */
+    private BigDecimal analysisProgress;
+
 }

energy-manage-common/src/main/java/com/energy/manage/common/po/datatransfer/DataTransferPo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.persistence.Table;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -97,5 +98,5 @@ public class DataTransferPo {
     /**
      * 转换进度
      */
-    private Integer transferProgress;
+    private BigDecimal transferProgress;
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/analysis/AnalysisResultVo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import javax.persistence.Table;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -78,4 +79,9 @@ public class AnalysisResultVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime ;
 
+    /**
+     * 分析进度
+     */
+    private BigDecimal analysisProgress;
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/datatransfer/DataTransferVo.java

@@ -3,6 +3,7 @@ package com.energy.manage.service.domain.vo.datatransfer;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -88,7 +89,7 @@ public class DataTransferVo {
     /**
      * 时间进度
      */
-    private Integer transferProgress;
+    private BigDecimal transferProgress;
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/datatransfer/impl/DataTransferServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -144,6 +145,7 @@ public class DataTransferServiceImpl implements DataTransferService {
         po.setTransferAddr(editDto.getDataTransferAddr());
         po.setTimeGranularity(editDto.getTimeGranularity());
         po.setUpdateBy(updateBy);
+        po.setTransferProgress(BigDecimal.ZERO);
         return ResultResp.SUCCESS(dataTransferMapper.updateDataTransfer(po));
     }
 

energy-manage-service/src/main/resources/mybatis/analysis/AnalysisResultMapper.xml

@@ -13,6 +13,7 @@
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
         <result column="update_by" property="updateBy" jdbcType="INTEGER"/>
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="analysis_progress" property="analysisProgress" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <select id="selectByCondition" parameterType="com.energy.manage.service.domain.dto.analysis.AnalysisResultDto" resultType="com.energy.manage.service.domain.vo.analysis.AnalysisResultVo">
@@ -24,7 +25,8 @@
             result.analysis_state,
             result.err_state,
             result.err_info,
-            result.create_time
+            result.create_time,
+            result.analysis_progress
         from analysis_result result
         left join wind_field_batch batch
         on result.batch_code = batch.batch_code

energy-manage-service/src/main/resources/mybatis/datatransfer/DataTransferMapper.xml

@@ -18,7 +18,7 @@
         <result property="createBy" column="create_by" jdbcType="INTEGER"/>
         <result property="updateBy" column="update_by" jdbcType="INTEGER"/>
         <result property="callState" column="call_state" jdbcType="INTEGER"/>
-        <result property="transferProgress" column="transfer_progress" jdbcType="INTEGER"/>
+        <result property="transferProgress" column="transfer_progress" jdbcType="DECIMAL"/>
     </resultMap>
     <sql id="BASE_SQL">
         id,
@@ -149,7 +149,10 @@
                 time_granularity = #{timeGranularity,jdbcType=INTEGER},
             </if>
             <if test="updateBy != null">
-                update_by = #{updateBy,jdbcType=INTEGER}
+                update_by = #{updateBy,jdbcType=INTEGER},
+            </if>
+            <if test="transferProgress != null">
+                transfer_progress = #{transferProgress,jdbcType=DECIMAL}
             </if>
         </set>
         where batch_code = #{batchCode,jdbcType=VARCHAR}