修改数据转换接口

energy-manage-common/src/main/java/com/energy/manage/common/po/wavedatatransfer/WaveDataTransferPo.java

@@ -85,4 +85,9 @@ public class WaveDataTransferPo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date updateTime;
 
+    /**
+     * 转换类型 0：振动 1：激光
+     */
+    private Integer transferType;
+
 }

energy-manage-common/src/main/java/com/energy/manage/common/po/wavetransferhistory/WaveDataTransferHistoryPo.java

@@ -6,7 +6,7 @@ import lombok.experimental.Accessors;
 import javax.persistence.Table;
 import java.util.Date;
 
-@Table(name = "data_transfer_history")
+@Table(name = "wave_data_transfer_histoty")
 @Data
 @Accessors(chain = true)
 public class WaveDataTransferHistoryPo {

energy-manage-service/src/main/java/com/energy/manage/service/controller/wavedatatransfer/WaveDatatransferController.java

@@ -26,20 +26,20 @@ public class WaveDatatransferController extends BaseServiceController {
     private WaveDatatransferServce waveDatatransferServce;
 
 
-    @ApiOperation(value = "振动数据转换查询列表")
+    @ApiOperation(value = "振动/激光数据转换查询列表")
     @GetMapping("/queryDataTransfer")
     public ResultResp<Page<WaveDataTransferVo>> queryDataTransfer(WaveDataTransferDto waveDatatransferDto) {
         return pageResult(waveDatatransferServce.queryDataTransfer(waveDatatransferDto), waveDatatransferDto);
     }
 
     @Deprecated
-    @ApiOperation(value = "新增振动数据转换查重")
+    @ApiOperation(value = "新增振动/激光数据转换查重")
     @GetMapping("/beforAddDataTransferQuery")
     public ResultResp beforAddDataTransferQuery(WaveDataTransferDto waveDatatransferDto) {
         return success(waveDatatransferServce.beforAddDataTransferQuery(waveDatatransferDto));
     }
 
-    @ApiOperation(value = "新增振动数据转换")
+    @ApiOperation(value = "新增振动/激光数据转换")
     @PostMapping("/addDataTransfer")
     public ResultResp addDataTransfer(@RequestBody WaveDataTransferPo waveDatatransferPo) {
         return success(waveDatatransferServce.addDataTransfer(waveDatatransferPo, getUserId()));

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/wavedatatransfer/WaveDataTransferDto.java

@@ -42,6 +42,12 @@ public class WaveDataTransferDto extends BaseDto {
     private Integer transferStatus;
 
     /**
+     * 转换类型 1：振动 2：激光
+     */
+    @ApiModelProperty("转换类型")
+    private Integer transferType;
+
+    /**
      * 转换开始时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/wavedatatransfer/WaveDataTransferVo.java

@@ -21,6 +21,11 @@ public class WaveDataTransferVo {
     private String fieldCode;
 
     /**
+     * 风场名称
+     */
+    private String fieldName;
+
+    /**
      * 转换地址
      */
     private String transferAddr;

energy-manage-service/src/main/java/com/energy/manage/service/mappers/wavedatatransfer/WaveDataTransferMapper.java

@@ -14,9 +14,10 @@ public interface WaveDataTransferMapper extends MyMapper<WaveDataTransferPo> {
 
     List<WaveDataTransferVo> selectByCondition(WaveDataTransferDto waveDataTransferDto);
 
+
     Integer selectCountByCondition(WaveDataTransferDto datatransferDto);
 
-    @Override
-    int updateByPrimaryKeySelective(WaveDataTransferPo record);
+
+    int update(WaveDataTransferPo record);
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/mappers/wavedatatransferhistory/WaveDataTransferHistoryMapper.java

@@ -7,5 +7,4 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface WaveDataTransferHistoryMapper extends MyMapper<WaveDataTransferHistoryPo> {
 
-
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/wavedatatransfer/impl/WaveDatatransferServceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -60,7 +61,8 @@ public class WaveDatatransferServceImpl implements WaveDatatransferServce {
         //设置更新人
         waveDatatransferPo.setUpdateBy(loginUserId);
         if(exsitPo != null){
-            return waveDataTransferMapper.updateByPrimaryKeySelective(waveDatatransferPo.setId(exsitPo.getId()));
+            waveDatatransferPo.setUpdateTime(new Date());
+            return waveDataTransferMapper.update(waveDatatransferPo.setId(exsitPo.getId()));
         }
         //设置创建人
         waveDatatransferPo.setCreateBy(loginUserId);

energy-manage-service/src/main/resources/mybatis/wavedatatransfer/WaveDataTransferMapper.xml

@@ -15,15 +15,24 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_by" jdbcType="INTEGER" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="transfer_type" jdbcType="TINYINT" property="transferType" />
   </resultMap>
   <sql id="Base_Column_List">
     field_code, transfer_addr, transfer_status, err_code, err_info, transfer_start_time,
     transfer_finish_time, transfer_progress, create_by, create_time, update_by, update_time
   </sql>
 
-  <select id="selectByCondition" parameterType="com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto" resultMap="BaseResultMap">
+  <select id="selectByCondition" parameterType="com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto" resultType="com.energy.manage.service.domain.vo.wavedatatransfer.WaveDataTransferVo">
     select
-        <include refid="Base_Column_List" />
+        field.field_name,
+        transfer.field_code,
+        transfer.transfer_addr,
+        transfer.transfer_status,
+        transfer.err_code,
+        transfer.err_info,
+        transfer.transfer_start_time,
+        transfer.transfer_finish_time,
+        transfer.transfer_progress
     from wave_data_transfer transfer
     left join wind_field field
     on transfer.field_code = field.field_code
@@ -34,8 +43,11 @@
       <if test="transferStatus != null">
         and transfer.transfer_status = #{transferStatus}
       </if>
+      <if test="transferType != null">
+        and transfer.transfer_type = #{transferType}
+      </if>
     </where>
-    order by update_time desc
+    order by transfer.update_time desc
   </select>
 
   <select id="selectCountByCondition" parameterType="com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto" resultType="java.lang.Integer">
@@ -52,7 +64,7 @@
   </select>
 
 
-  <update id="updateByPrimaryKeySelective" parameterType="com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo">
+  <update id="update" parameterType="com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo">
     update wave_data_transfer
     <set>
       <if test="fieldCode != null">
@@ -61,35 +73,14 @@
       <if test="transferAddr != null">
         transfer_addr = #{transferAddr,jdbcType=VARCHAR},
       </if>
-      <if test="trasferStatus != null">
-        transfer_status = #{trasferStatus,jdbcType=TINYINT},
-      </if>
-      <if test="errCode != null">
-        err_code = #{errCode,jdbcType=VARCHAR},
-      </if>
-      <if test="errInfo != null">
-        err_info = #{errInfo,jdbcType=VARCHAR},
-      </if>
-      <if test="transferStartTime != null">
-        transfer_start_time = #{transferStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="transferFinishTime != null">
-        transfer_finish_time = #{transferFinishTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="transferProgress != null">
-        transfer_progress = #{transferProgress,jdbcType=INTEGER},
-      </if>
-      <if test="createBy != null">
-        create_by = #{createBy,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
+      <if test="transferStatus != null">
+        transfer_status = #{transferStatus,jdbcType=TINYINT},
       </if>
       <if test="updateBy != null">
         update_by = #{updateBy,jdbcType=INTEGER},
       </if>
       <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
+        update_time = #{updateTime,jdbcType=INTEGER}
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}