修改振动数据转换接口

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

@@ -17,6 +17,8 @@ import java.util.Date;
 @Accessors(chain = true)
 public class WaveDataTransferDto extends BaseDto {
 
+    private Long id;
+
     /**
      * 风场编号
      */

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

@@ -15,6 +15,8 @@ import java.util.Date;
 @Accessors(chain = true)
 public class WaveDataTransferVo {
 
+    private Long id;
+
     /**
      * 风场编号
      */

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

@@ -91,16 +91,17 @@ public class WaveDatatransferServceImpl implements WaveDatatransferServce {
     @Override
     public int dataTransfer(WaveDataTransferDto waveDatatransferDto) {
         WaveDataTransferPo po = new WaveDataTransferPo();
-        BeanUtils.copyProperties(waveDatatransferDto, po);
-        po.setTransferStatus(-1);
+        po.setId(waveDatatransferDto.getId());
         WaveDataTransferPo exsitPo = waveDataTransferMapper.selectOne(po);
-        exsitPo.setTransferStatus(0);
-        if(waveDatatransferDto.getRetransfer() == 0){
+        if(waveDatatransferDto.getRetransfer() == 1){
             WaveDataTransferHistoryPo historyPo = new WaveDataTransferHistoryPo();
             BeanUtils.copyProperties(exsitPo,historyPo);
-            waveDataTransferHistoryMapper.insertSelective(historyPo);
+           return waveDataTransferHistoryMapper.insertSelective(historyPo);
         }
-        return waveDataTransferMapper.updateByPrimaryKeySelective(exsitPo);
+        exsitPo.setTransferStatus(0);
+        exsitPo.setTransferAddr(waveDatatransferDto.getTransferAddr());
+        exsitPo.setTransferStartTime(new Date());
+        return waveDataTransferMapper.update(exsitPo);
     }
 
 }