新增：1.测点查询接口。

     2.振动数据数据转换/重新转换接口开发。
     3.编辑振动数据转换。
     4.修改新增查重接口（增加初始化状态查重）
     5.修改新增数据转换接口（判断初始化状态查重）

energy-manage-common/src/main/java/com/energy/manage/common/po/detectionpointdic/DetectionPointDicPo.java

@@ -0,0 +1,34 @@
+package com.energy.manage.common.po.detectionpointdic;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+
+@Table(name = "detection_point_dic")
+@Data
+@Accessors(chain = true)
+public class DetectionPointDicPo {
+
+    /**
+     * 唯一标识
+     */
+    private Integer id;
+
+    /**
+     * 测点中文名称
+     */
+    private String detectionPointCn;
+
+    /**
+     * 测点英文名称
+     */
+    private String detectionPointEn;
+
+    /**
+     * 驱动模式 1.双馈  2.直驱  3.半直驱（格式：1,2 或 1,2,3 多个用英文逗号隔开）
+     */
+    private String driveMode;
+
+
+}

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

@@ -34,7 +34,7 @@ public class WaveDataTransferPo {
      * 转换状态 -1：未转换（默认状态）0：转换中 1转换完成 2：转换异常
      */
     @ApiModelProperty("转换地址")
-    private Byte trasferStatus;
+    private Integer transferStatus;
 
     /**
      * 错误编码

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

@@ -0,0 +1,53 @@
+package com.energy.manage.common.po.wavetransferhistory;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Table;
+import java.util.Date;
+
+@Table(name = "data_transfer_history")
+@Data
+@Accessors(chain = true)
+public class WaveDataTransferHistoryPo {
+
+    /**
+     * 唯一标识
+     */
+    private Long id;
+
+    /**
+     * 转换地址
+     */
+    private String transferAddr;
+
+    /**
+     * 转换开始时间
+     */
+    private Date transferStartTime;
+
+    /**
+     * 转换结束时间
+     */
+    private Date transferFinishTime;
+
+    /**
+     * 操作人
+     */
+    private Integer optionBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 异常编码
+     */
+    private String errCode;
+
+    /**
+     * 异常信息
+     */
+    private String errInfo;
+}

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

@@ -4,8 +4,8 @@ import com.energy.manage.common.base.Page;
 import com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo;
 import com.energy.manage.common.reponse.ResultResp;
 import com.energy.manage.service.controller.base.BaseServiceController;
-import com.energy.manage.service.domain.dto.wavedatatransfer.WaveDatatransferDto;
-import com.energy.manage.service.domain.vo.wavedatatransfer.WaveDatatransferVo;
+import com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto;
+import com.energy.manage.service.domain.vo.wavedatatransfer.WaveDataTransferVo;
 import com.energy.manage.service.service.wavedatatransfer.WaveDatatransferServce;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,25 +28,33 @@ public class WaveDatatransferController extends BaseServiceController {
 
     @ApiOperation(value = "振动数据转换查询列表")
     @GetMapping("/queryDataTransfer")
-    public ResultResp<Page<WaveDatatransferVo>> queryDataTransfer(WaveDatatransferDto waveDatatransferDto) {
+    public ResultResp<Page<WaveDataTransferVo>> queryDataTransfer(WaveDataTransferDto waveDatatransferDto) {
         return pageResult(waveDatatransferServce.queryDataTransfer(waveDatatransferDto), waveDatatransferDto);
     }
 
+    @Deprecated
     @ApiOperation(value = "新增振动数据转换查重")
     @GetMapping("/beforAddDataTransferQuery")
-    public ResultResp beforAddDataTransferQuery(WaveDatatransferDto waveDatatransferDto) {
+    public ResultResp beforAddDataTransferQuery(WaveDataTransferDto waveDatatransferDto) {
         return success(waveDatatransferServce.beforAddDataTransferQuery(waveDatatransferDto));
     }
 
     @ApiOperation(value = "新增振动数据转换")
     @PostMapping("/addDataTransfer")
     public ResultResp addDataTransfer(@RequestBody WaveDataTransferPo waveDatatransferPo) {
-        return success(waveDatatransferServce.addDataTransfer(waveDatatransferPo));
+        return success(waveDatatransferServce.addDataTransfer(waveDatatransferPo, getUserId()));
     }
 
-//    @ApiOperation(value = "重新转换")
+    @Deprecated
+    @ApiOperation(value = "编辑振动数据转换")
+    @PostMapping("/editDataTransfer")
+    public ResultResp editDataTransfer(@RequestBody WaveDataTransferPo waveDatatransferPo) {
+        return success(waveDatatransferServce.editDataTransfer(waveDatatransferPo, getUserId()));
+    }
+
+    @ApiOperation(value = "转换/重新转换")
     @PostMapping("/dataTransfer")
-    public ResultResp dataTransfer(@RequestBody WaveDatatransferDto waveDatatransferDto) {
+    public ResultResp dataTransfer(@RequestBody WaveDataTransferDto waveDatatransferDto) {
         return success(waveDatatransferServce.dataTransfer(waveDatatransferDto));
     }
 }

energy-manage-service/src/main/java/com/energy/manage/service/controller/wavedic/WaveDicController.java

@@ -0,0 +1,35 @@
+package com.energy.manage.service.controller.wavedic;
+
+import com.energy.manage.common.reponse.ResultResp;
+import com.energy.manage.service.controller.base.BaseServiceController;
+import com.energy.manage.service.service.wavedic.WaveDicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author chy
+ * @date 2024/11/21 09:24
+ * @desc
+ */
+@RestController
+@RequestMapping("/waveDic")
+public class WaveDicController extends BaseServiceController {
+
+    @Autowired
+    private WaveDicService waveDicService;
+
+    /**
+     * 查询测点字典
+     * @param engineCodes
+     * @return
+     */
+    @GetMapping("/queryDetectionDic")
+    public ResultResp queryWaveDic(@RequestParam List<String> engineCodes){
+        return success(waveDicService.queryWaveDic(engineCodes));
+    }
+}

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

@@ -15,7 +15,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-public class WaveDatatransferDto extends BaseDto {
+public class WaveDataTransferDto extends BaseDto {
 
     /**
      * 风场编号
@@ -39,7 +39,7 @@ public class WaveDatatransferDto extends BaseDto {
      * 转换状态 -1：未转换（默认状态）0：转换中 1转换完成 2：转换异常
      */
     @ApiModelProperty("转换状态")
-    private Byte trasferStatus;
+    private Integer transferStatus;
 
     /**
      * 转换开始时间
@@ -53,4 +53,9 @@ public class WaveDatatransferDto extends BaseDto {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date transferFinishTime;
 
+    /**
+     * 转换标识  0：转换 1：重新转换
+     */
+    private Integer retransfer;
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/detectionpointdic/DetectionPointDicVo.java

@@ -0,0 +1,26 @@
+package com.energy.manage.service.domain.vo.detectionpointdic;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author chy
+ * @date 2024/11/21 09:52
+ * @desc
+ */
+@EqualsAndHashCode
+@Data
+@Accessors(chain = true)
+public class DetectionPointDicVo {
+    /**
+     * 测点中文名称
+     */
+    private String detectionPointCn;
+
+    /**
+     * 测点英文名称
+     */
+    private String detectionPointEn;
+
+}

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

@@ -13,7 +13,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-public class WaveDatatransferVo {
+public class WaveDataTransferVo {
 
     /**
      * 风场编号
@@ -28,7 +28,7 @@ public class WaveDatatransferVo {
     /**
      * 转换状态 -1：未转换（默认状态）0：转换中 1转换完成 2：转换异常
      */
-    private Byte trasferStatus;
+    private Integer trasferStatus;
 
     /**
      * 错误编码

energy-manage-service/src/main/java/com/energy/manage/service/mappers/detectionpointdic/DetectionPointDicMapper.java

@@ -0,0 +1,21 @@
+package com.energy.manage.service.mappers.detectionpointdic;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.detectionpointdic.DetectionPointDicPo;
+import com.energy.manage.service.domain.vo.detectionpointdic.DetectionPointDicVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Set;
+
+@Repository
+public interface DetectionPointDicMapper extends MyMapper<DetectionPointDicPo> {
+
+    /**
+     * 根据驱动模式查询测点
+     * @param driveMode
+     * @return
+     */
+    Set<DetectionPointDicVo> selectByCondition(@Param("driveMode") String driveMode);
+
+}

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

@@ -2,8 +2,8 @@ package com.energy.manage.service.mappers.wavedatatransfer;
 
 import com.energy.manage.common.mapper.MyMapper;
 import com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo;
-import com.energy.manage.service.domain.dto.wavedatatransfer.WaveDatatransferDto;
-import com.energy.manage.service.domain.vo.wavedatatransfer.WaveDatatransferVo;
+import com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto;
+import com.energy.manage.service.domain.vo.wavedatatransfer.WaveDataTransferVo;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -12,11 +12,11 @@ import java.util.List;
 public interface WaveDataTransferMapper extends MyMapper<WaveDataTransferPo> {
 
 
-    List<WaveDatatransferVo> selectByCondition(WaveDatatransferDto waveDataTransferDto);
+    List<WaveDataTransferVo> selectByCondition(WaveDataTransferDto waveDataTransferDto);
+
+    Integer selectCountByCondition(WaveDataTransferDto datatransferDto);
 
     @Override
     int updateByPrimaryKeySelective(WaveDataTransferPo record);
 
-    @Override
-    int updateByPrimaryKey(WaveDataTransferPo record);
 }

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

@@ -0,0 +1,11 @@
+package com.energy.manage.service.mappers.wavedatatransferhistory;
+
+import com.energy.manage.common.mapper.MyMapper;
+import com.energy.manage.common.po.wavetransferhistory.WaveDataTransferHistoryPo;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WaveDataTransferHistoryMapper extends MyMapper<WaveDataTransferHistoryPo> {
+
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/mappers/windenginemill/WindEngineMillMapper.java

@@ -14,6 +14,13 @@ public interface WindEngineMillMapper extends MyMapper<WindEngineMillPO> {
 
     Integer selectWindEngineMillCount(@Param("list") List<String> list);
 
+    /**
+     * 根据风机编号查询驱动模式
+     * @param engineCodes
+     * @return
+     */
+    List<Integer> selectCurvedMotionTypeByEngineCode(@Param("engineCodes") List<String> engineCodes);
+
 
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/wavedatatransfer/WaveDatatransferServce.java

@@ -1,8 +1,8 @@
 package com.energy.manage.service.service.wavedatatransfer;
 
 import com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo;
-import com.energy.manage.service.domain.dto.wavedatatransfer.WaveDatatransferDto;
-import com.energy.manage.service.domain.vo.wavedatatransfer.WaveDatatransferVo;
+import com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto;
+import com.energy.manage.service.domain.vo.wavedatatransfer.WaveDataTransferVo;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -20,28 +20,36 @@ public interface WaveDatatransferServce {
      * @param waveDatatransferDto
      * @return
      */
-    List<WaveDatatransferVo> queryDataTransfer(WaveDatatransferDto waveDatatransferDto);
+    List<WaveDataTransferVo> queryDataTransfer(WaveDataTransferDto waveDatatransferDto);
 
     /**
      * 新增之前查重
      * @param waveDatatransferDto
      * @return
      */
-    Boolean beforAddDataTransferQuery(WaveDatatransferDto waveDatatransferDto);
+    Boolean beforAddDataTransferQuery(WaveDataTransferDto waveDatatransferDto);
 
     /**
      * 新增数据转换
      * @param waveDatatransferPo
      * @return
      */
-    int addDataTransfer(WaveDataTransferPo waveDatatransferPo);
+    int addDataTransfer(WaveDataTransferPo waveDatatransferPo, Integer loginUserId);
+
+
+    /**
+     * 编辑数据转换
+     * @param waveDatatransferPo
+     * @return
+     */
+    int editDataTransfer(WaveDataTransferPo waveDatatransferPo,Integer loginUserId);
 
 
     /**
      * 数据转换、重新转换
-     * @param waveDatatransferDto
+     * @param waveDataTransferDto
      * @return
      */
-    int dataTransfer(@RequestBody WaveDatatransferDto waveDatatransferDto);
+    int dataTransfer(@RequestBody WaveDataTransferDto waveDataTransferDto);
 
 }

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

@@ -1,11 +1,14 @@
 package com.energy.manage.service.service.wavedatatransfer.impl;
 
 import com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo;
-import com.energy.manage.service.domain.dto.wavedatatransfer.WaveDatatransferDto;
-import com.energy.manage.service.domain.vo.wavedatatransfer.WaveDatatransferVo;
+import com.energy.manage.common.po.wavetransferhistory.WaveDataTransferHistoryPo;
+import com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto;
+import com.energy.manage.service.domain.vo.wavedatatransfer.WaveDataTransferVo;
 import com.energy.manage.service.mappers.wavedatatransfer.WaveDataTransferMapper;
+import com.energy.manage.service.mappers.wavedatatransferhistory.WaveDataTransferHistoryMapper;
 import com.energy.manage.service.service.wavedatatransfer.WaveDatatransferServce;
 import com.github.pagehelper.PageHelper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,25 +25,28 @@ public class WaveDatatransferServceImpl implements WaveDatatransferServce {
     @Autowired
     private WaveDataTransferMapper waveDataTransferMapper;
 
+    @Autowired
+    private WaveDataTransferHistoryMapper waveDataTransferHistoryMapper;
+
     /**
      * 查询数据转换列表
      * @param waveDatatransferDto
      * @return
      */
     @Override
-    public List<WaveDatatransferVo> queryDataTransfer( WaveDatatransferDto waveDatatransferDto) {
+    public List<WaveDataTransferVo> queryDataTransfer(WaveDataTransferDto waveDatatransferDto) {
         PageHelper.startPage(waveDatatransferDto.getPageNum(), waveDatatransferDto.getPageSize());
         return waveDataTransferMapper.selectByCondition(waveDatatransferDto);
     }
 
     /**
      * 新增之前查重
-     * @param waveDatatransferPo
+     * @param waveDatatransferDto
      * @return
      */
     @Override
-    public Boolean beforAddDataTransferQuery(WaveDatatransferDto waveDatatransferDto) {
-        return false;
+    public Boolean beforAddDataTransferQuery(WaveDataTransferDto waveDatatransferDto) {
+        return waveDataTransferMapper.selectCountByCondition(waveDatatransferDto) > 0;
     }
 
     /**
@@ -49,18 +55,50 @@ public class WaveDatatransferServceImpl implements WaveDatatransferServce {
      * @return
      */
     @Override
-    public int addDataTransfer(WaveDataTransferPo waveDatatransferPo){
+    public int addDataTransfer(WaveDataTransferPo waveDatatransferPo, Integer loginUserId){
+        WaveDataTransferPo exsitPo = waveDataTransferMapper.selectOne(waveDatatransferPo.setTransferStatus(-1));
+        //设置更新人
+        waveDatatransferPo.setUpdateBy(loginUserId);
+        if(exsitPo != null){
+            return waveDataTransferMapper.updateByPrimaryKeySelective(waveDatatransferPo.setId(exsitPo.getId()));
+        }
+        //设置创建人
+        waveDatatransferPo.setCreateBy(loginUserId);
         return waveDataTransferMapper.insertSelective(waveDatatransferPo);
     }
 
     /**
+     * 编辑数据转换
+     *
+     * @param waveDatatransferPo
+     * @param loginUserId
+     * @return
+     */
+    @Override
+    public int editDataTransfer(WaveDataTransferPo waveDatatransferPo, Integer loginUserId) {
+//        waveDatatransferPo.setUpdateBy(loginUserId);
+//        return waveDataTransferMapper.updateByPrimaryKeySelective(waveDatatransferPo);
+        return 0;
+    }
+
+    /**
      * 数据转换、重新转换
      * @param waveDatatransferDto
      * @return
      */
     @Override
-    public int dataTransfer(WaveDatatransferDto waveDatatransferDto) {
-        return 0;
+    public int dataTransfer(WaveDataTransferDto waveDatatransferDto) {
+        WaveDataTransferPo po = new WaveDataTransferPo();
+        BeanUtils.copyProperties(waveDatatransferDto, po);
+        po.setTransferStatus(-1);
+        WaveDataTransferPo exsitPo = waveDataTransferMapper.selectOne(po);
+        exsitPo.setTransferStatus(0);
+        if(waveDatatransferDto.getRetransfer() == 0){
+            WaveDataTransferHistoryPo historyPo = new WaveDataTransferHistoryPo();
+            BeanUtils.copyProperties(exsitPo,historyPo);
+            waveDataTransferHistoryMapper.insertSelective(historyPo);
+        }
+        return waveDataTransferMapper.updateByPrimaryKeySelective(exsitPo);
     }
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/wavedic/WaveDicService.java

@@ -0,0 +1,22 @@
+package com.energy.manage.service.service.wavedic;
+
+import com.energy.manage.service.domain.vo.detectionpointdic.DetectionPointDicVo;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author chy
+ * @date 2024/11/21 09:27
+ * @desc
+ */
+public interface WaveDicService {
+
+    /**
+     * 根据风机编号查询测点
+     * @param engineCodes
+     * @return
+     */
+    Set<DetectionPointDicVo> queryWaveDic( List<String> engineCodes);
+
+}

energy-manage-service/src/main/java/com/energy/manage/service/service/wavedic/impl/WaveDicServiceImpl.java

@@ -0,0 +1,42 @@
+package com.energy.manage.service.service.wavedic.impl;
+
+import com.energy.manage.service.domain.vo.detectionpointdic.DetectionPointDicVo;
+import com.energy.manage.service.mappers.detectionpointdic.DetectionPointDicMapper;
+import com.energy.manage.service.mappers.windenginemill.WindEngineMillMapper;
+import com.energy.manage.service.service.wavedic.WaveDicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author chy
+ * @date 2024/11/21 09:28
+ * @desc
+ */
+@Service
+public class WaveDicServiceImpl implements WaveDicService {
+
+    @Autowired
+    private WindEngineMillMapper windEngineMillMapper;
+
+
+    @Autowired
+    private DetectionPointDicMapper detectionPointDicMapper;
+
+    /**
+     * 根据风机编号查询测点
+     *
+     * @param engineCodes
+     * @return
+     */
+    @Override
+    public Set<DetectionPointDicVo> queryWaveDic(List<String> engineCodes) {
+        List<Integer> driveMode = windEngineMillMapper.selectCurvedMotionTypeByEngineCode(engineCodes);
+        Set<DetectionPointDicVo> detectionPointDicVos = new HashSet<>();
+        driveMode.stream().forEach(item-> detectionPointDicVos.addAll(detectionPointDicMapper.selectByCondition(item.toString())));
+        return detectionPointDicVos;
+    }
+}

energy-manage-service/src/main/resources/mybatis/detectionpointdic/DetectionPointDicMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.energy.manage.service.mappers.detectionpointdic.DetectionPointDicMapper">
+  <resultMap id="BaseResultMap" type="com.energy.manage.common.po.detectionpointdic.DetectionPointDicPo">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="detection_point_cn" jdbcType="VARCHAR" property="detectionPointCn" />
+    <result column="detection_point_en" jdbcType="VARCHAR" property="detectionPointEn" />
+    <result column="drive_mode" jdbcType="VARCHAR" property="driveMode" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    detection_point_cn, detection_point_en, drive_mode
+  </sql>
+
+  <select id="selectByCondition" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+        <include refid="Base_Column_List" />
+    from detection_point_dic
+    where find_in_set(#{driveMode},drive_mode)
+  </select>
+</mapper>

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

@@ -5,7 +5,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="field_code" jdbcType="VARCHAR" property="fieldCode" />
     <result column="transfer_addr" jdbcType="VARCHAR" property="transferAddr" />
-    <result column="trasfer_status" jdbcType="TINYINT" property="trasferStatus" />
+    <result column="transfer_status" jdbcType="TINYINT" property="transferStatus" />
     <result column="err_code" jdbcType="VARCHAR" property="errCode" />
     <result column="err_info" jdbcType="VARCHAR" property="errInfo" />
     <result column="transfer_start_time" jdbcType="TIMESTAMP" property="transferStartTime" />
@@ -17,11 +17,11 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    field_code, transfer_addr, trasfer_status, err_code, err_info, transfer_start_time,
+    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" resultMap="BaseResultMap">
     select
         <include refid="Base_Column_List" />
     from wave_data_transfer transfer
@@ -29,15 +29,28 @@
     on transfer.field_code = field.field_code
     <where>
       <if test="fieldName != null and fieldName != ''">
-        field.field_name like concat ('%', #{fieldCode}, '%')
+        field.field_name like concat ('%', #{fieldName}, '%')
       </if>
       <if test="transferStatus != null">
-        and transfer.trasfer_status = #{transferStatus}
+        and transfer.transfer_status = #{transferStatus}
       </if>
     </where>
     order by update_time desc
   </select>
 
+  <select id="selectCountByCondition" parameterType="com.energy.manage.service.domain.dto.wavedatatransfer.WaveDataTransferDto" resultType="java.lang.Integer">
+    select
+    count(*)
+    from wave_data_transfer transfer
+    where transfer_status = -1
+    <if test="fileCode != null and fileCode != ''">
+      and field_code = #{fileCode}
+    </if>
+    <if test="transferAddr != null and transferAddr != ''">
+      and transfer_addr = #{transferAddr}
+    </if>
+  </select>
+
 
   <update id="updateByPrimaryKeySelective" parameterType="com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo">
     update wave_data_transfer
@@ -49,7 +62,7 @@
         transfer_addr = #{transferAddr,jdbcType=VARCHAR},
       </if>
       <if test="trasferStatus != null">
-        trasfer_status = #{trasferStatus,jdbcType=TINYINT},
+        transfer_status = #{trasferStatus,jdbcType=TINYINT},
       </if>
       <if test="errCode != null">
         err_code = #{errCode,jdbcType=VARCHAR},
@@ -82,21 +95,4 @@
     where id = #{id,jdbcType=BIGINT}
   </update>
 
-  <update id="updateByPrimaryKey" parameterType="com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo">
-    update wave_data_transfer
-    set field_code = #{fieldCode,jdbcType=VARCHAR},
-      transfer_addr = #{transferAddr,jdbcType=VARCHAR},
-      trasfer_status = #{trasferStatus,jdbcType=TINYINT},
-      err_code = #{errCode,jdbcType=VARCHAR},
-      err_info = #{errInfo,jdbcType=VARCHAR},
-      transfer_start_time = #{transferStartTime,jdbcType=TIMESTAMP},
-      transfer_finish_time = #{transferFinishTime,jdbcType=TIMESTAMP},
-      transfer_progress = #{transferProgress,jdbcType=INTEGER},
-      create_by = #{createBy,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_by = #{updateBy,jdbcType=INTEGER},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-
 </mapper>

energy-manage-service/src/main/resources/mybatis/wavedatatransferhistory/WaveDataTransferHistoryMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.energy.manage.service.mappers.wavedatatransferhistory.WaveDataTransferHistoryMapper">
+  <resultMap id="BaseResultMap" type="com.energy.manage.common.po.wavetransferhistory.WaveDataTransferHistoryPo">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="transfer_addr" jdbcType="VARCHAR" property="transferAddr" />
+    <result column="transfer_start_time" jdbcType="TIMESTAMP" property="transferStartTime" />
+    <result column="transfer_finish_time" jdbcType="TIMESTAMP" property="transferFinishTime" />
+    <result column="option_by" jdbcType="INTEGER" property="optionBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="err_code" jdbcType="VARCHAR" property="errCode" />
+    <result column="err_info" jdbcType="VARCHAR" property="errInfo" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, transfer_addr, transfer_start_time, transfer_finish_time, option_by, create_time,
+    err_code, err_info
+  </sql>
+</mapper>

energy-manage-service/src/main/resources/mybatis/windenginemill/WindEngineMillMapper.xml

@@ -4,17 +4,31 @@
 <mapper namespace="com.energy.manage.service.mappers.windenginemill.WindEngineMillMapper">
 
 
-<select id="selectWindEngineMillCount" resultType="java.lang.Integer">
-    select count(1)
-    from
-    wind_engine_mill wem
-    where 1=1 and
-    wem.combination IN
-    <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
-        #{item}
-    </foreach>
-</select>
-
+    <select id="selectWindEngineMillCount" resultType="java.lang.Integer">
+        select count(1)
+        from
+        wind_engine_mill wem
+        where 1=1 and
+        wem.combination IN
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 
+    <select id="selectCurvedMotionTypeByEngineCode" resultType="java.lang.Integer">
+        select
+            distinct(wem.curved_motion_type)
+        from
+            wind_engine_mill wem
+        left join
+            wind_engine_group weg
+        on
+            wem.mill_type_code  = weg.mill_type_code
+        where
+            weg.engine_code IN
+            <foreach collection="engineCodes" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+    </select>
 
 </mapper>