数据转换：数据转换查询列表，新增查重，增加数据转换

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

@@ -1,6 +1,7 @@
 package com.energy.manage.common.po.wavedatatransfer;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -10,7 +11,7 @@ import java.util.Date;
 @Table(name = "wave_data_transfer")
 @Data
 @Accessors(chain = true)
-public class WaveDataTransfer {
+public class WaveDataTransferPo {
 
     /**
      * 主键id
@@ -20,16 +21,19 @@ public class WaveDataTransfer {
     /**
      * 风场编号
      */
+    @ApiModelProperty("风场名称")
     private String fieldCode;
 
     /**
      * 转换地址
      */
+    @ApiModelProperty("转换地址")
     private String transferAddr;
 
     /**
      * 转换状态 -1：未转换（默认状态）0：转换中 1转换完成 2：转换异常
      */
+    @ApiModelProperty("转换地址")
     private Byte trasferStatus;
 
     /**

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

@@ -1,138 +0,0 @@
-package com.energy.manage.common.po.wavedatatransfer;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class WaveDataTransfer implements Serializable {
-    private Long id;
-
-    private String fieldCode;
-
-    private String transferAddr;
-
-    private Byte trasferStatus;
-
-    private String errCode;
-
-    private String errInfo;
-
-    private Date transferStartTime;
-
-    private Date transferFinishTime;
-
-    private Integer transferProgress;
-
-    private Integer createBy;
-
-    private Date createTime;
-
-    private Integer updateBy;
-
-    private Date updateTime;
-
-    private static final long serialVersionUID = 1L;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getFieldCode() {
-        return fieldCode;
-    }
-
-    public void setFieldCode(String fieldCode) {
-        this.fieldCode = fieldCode == null ? null : fieldCode.trim();
-    }
-
-    public String getTransferAddr() {
-        return transferAddr;
-    }
-
-    public void setTransferAddr(String transferAddr) {
-        this.transferAddr = transferAddr == null ? null : transferAddr.trim();
-    }
-
-    public Byte getTrasferStatus() {
-        return trasferStatus;
-    }
-
-    public void setTrasferStatus(Byte trasferStatus) {
-        this.trasferStatus = trasferStatus;
-    }
-
-    public String getErrCode() {
-        return errCode;
-    }
-
-    public void setErrCode(String errCode) {
-        this.errCode = errCode == null ? null : errCode.trim();
-    }
-
-    public String getErrInfo() {
-        return errInfo;
-    }
-
-    public void setErrInfo(String errInfo) {
-        this.errInfo = errInfo == null ? null : errInfo.trim();
-    }
-
-    public Date getTransferStartTime() {
-        return transferStartTime;
-    }
-
-    public void setTransferStartTime(Date transferStartTime) {
-        this.transferStartTime = transferStartTime;
-    }
-
-    public Date getTransferFinishTime() {
-        return transferFinishTime;
-    }
-
-    public void setTransferFinishTime(Date transferFinishTime) {
-        this.transferFinishTime = transferFinishTime;
-    }
-
-    public Integer getTransferProgress() {
-        return transferProgress;
-    }
-
-    public void setTransferProgress(Integer transferProgress) {
-        this.transferProgress = transferProgress;
-    }
-
-    public Integer getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(Integer createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Integer getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(Integer updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-}

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

@@ -1,11 +1,14 @@
 package com.energy.manage.service.controller.wavedatatransfer;
 
 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.service.wavedatatransfer.WaveDatatransferServce;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -14,16 +17,36 @@ import org.springframework.web.bind.annotation.*;
  * @date 2024/11/7 16:08
  * @desc
  */
+@Api(value = "WaveDatatransferController", tags = "振动数据转换")
 @RestController
-@RequestMapping("//waveDataTransfer")
+@RequestMapping("/waveDataTransfer")
 public class WaveDatatransferController extends BaseServiceController {
 
     @Autowired
     private WaveDatatransferServce waveDatatransferServce;
 
 
+    @ApiOperation(value = "振动数据转换查询列表")
     @GetMapping("/queryDataTransfer")
-    public ResultResp<Page<WaveDatatransferVo>> queryDataTransfer(@ModelAttribute WaveDatatransferDto waveDatatransferDto) {
+    public ResultResp<Page<WaveDatatransferVo>> queryDataTransfer(WaveDatatransferDto waveDatatransferDto) {
         return pageResult(waveDatatransferServce.queryDataTransfer(waveDatatransferDto), waveDatatransferDto);
     }
+
+    @ApiOperation(value = "新增振动数据转换查重")
+    @GetMapping("/beforAddDataTransferQuery")
+    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));
+    }
+
+//    @ApiOperation(value = "重新转换")
+    @PostMapping("/dataTransfer")
+    public ResultResp dataTransfer(@RequestBody WaveDatatransferDto waveDatatransferDto) {
+        return success(waveDatatransferServce.dataTransfer(waveDatatransferDto));
+    }
 }

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

@@ -2,6 +2,7 @@ package com.energy.manage.service.domain.dto.wavedatatransfer;
 
 import com.energy.manage.service.domain.dto.BaseDto;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -19,16 +20,25 @@ public class WaveDatatransferDto extends BaseDto {
     /**
      * 风场编号
      */
+    @ApiModelProperty("风场编号")
     private String fieldCode;
 
     /**
+     * 风场名称
+     */
+    @ApiModelProperty("风场名称")
+    private String fieldName;
+
+    /**
      * 转换地址
      */
+    @ApiModelProperty("转换地址")
     private String transferAddr;
 
     /**
      * 转换状态 -1：未转换（默认状态）0：转换中 1转换完成 2：转换异常
      */
+    @ApiModelProperty("转换状态")
     private Byte trasferStatus;
 
     /**

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

@@ -1,25 +1,22 @@
 package com.energy.manage.service.mappers.wavedatatransfer;
 
 import com.energy.manage.common.mapper.MyMapper;
-import com.energy.manage.common.po.wavedatatransfer.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 org.springframework.stereotype.Repository;
 
-@Repository
-public interface WaveDataTransferMapper extends MyMapper<WaveDataTransfer> {
-
-    int deleteByPrimaryKey(Long id);
+import java.util.List;
 
-    @Override
-    int insert(WaveDataTransfer record);
+@Repository
+public interface WaveDataTransferMapper extends MyMapper<WaveDataTransferPo> {
 
-    @Override
-    int insertSelective(WaveDataTransfer record);
 
-    WaveDataTransfer selectByPrimaryKey(Long id);
+    List<WaveDatatransferVo> selectByCondition(WaveDatatransferDto waveDataTransferDto);
 
     @Override
-    int updateByPrimaryKeySelective(WaveDataTransfer record);
+    int updateByPrimaryKeySelective(WaveDataTransferPo record);
 
     @Override
-    int updateByPrimaryKey(WaveDataTransfer record);
+    int updateByPrimaryKey(WaveDataTransferPo record);
 }

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

@@ -1,7 +1,9 @@
 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 org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -13,6 +15,33 @@ import java.util.List;
 public interface WaveDatatransferServce {
 
 
+    /**
+     * 转换查询列表
+     * @param waveDatatransferDto
+     * @return
+     */
     List<WaveDatatransferVo> queryDataTransfer(WaveDatatransferDto waveDatatransferDto);
 
+    /**
+     * 新增之前查重
+     * @param waveDatatransferDto
+     * @return
+     */
+    Boolean beforAddDataTransferQuery(WaveDatatransferDto waveDatatransferDto);
+
+    /**
+     * 新增数据转换
+     * @param waveDatatransferPo
+     * @return
+     */
+    int addDataTransfer(WaveDataTransferPo waveDatatransferPo);
+
+
+    /**
+     * 数据转换、重新转换
+     * @param waveDatatransferDto
+     * @return
+     */
+    int dataTransfer(@RequestBody WaveDatatransferDto waveDatatransferDto);
+
 }

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

@@ -1,5 +1,6 @@
 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.service.mappers.wavedatatransfer.WaveDataTransferMapper;
@@ -21,11 +22,45 @@ public class WaveDatatransferServceImpl implements WaveDatatransferServce {
     @Autowired
     private WaveDataTransferMapper waveDataTransferMapper;
 
+    /**
+     * 查询数据转换列表
+     * @param waveDatatransferDto
+     * @return
+     */
     @Override
     public List<WaveDatatransferVo> queryDataTransfer( WaveDatatransferDto waveDatatransferDto) {
         PageHelper.startPage(waveDatatransferDto.getPageNum(), waveDatatransferDto.getPageSize());
-//        return waveDataTransferMapper.selectByCondition(waveDatatransferDto);
-        return null;
+        return waveDataTransferMapper.selectByCondition(waveDatatransferDto);
+    }
+
+    /**
+     * 新增之前查重
+     * @param waveDatatransferPo
+     * @return
+     */
+    @Override
+    public Boolean beforAddDataTransferQuery(WaveDatatransferDto waveDatatransferDto) {
+        return false;
+    }
+
+    /**
+     * 新增/覆盖数据转换
+     * @param waveDatatransferPo
+     * @return
+     */
+    @Override
+    public int addDataTransfer(WaveDataTransferPo waveDatatransferPo){
+        return waveDataTransferMapper.insertSelective(waveDatatransferPo);
+    }
+
+    /**
+     * 数据转换、重新转换
+     * @param waveDatatransferDto
+     * @return
+     */
+    @Override
+    public int dataTransfer(WaveDatatransferDto waveDatatransferDto) {
+        return 0;
     }
 
 }

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

@@ -1,7 +1,7 @@
 <?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.wavedatatransfer.WaveDataTransferMapper">
-  <resultMap id="BaseResultMap" type="com.energy.manage.common.po.wavedatatransfer.WaveDataTransfer">
+  <resultMap id="BaseResultMap" type="com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="field_code" jdbcType="VARCHAR" property="fieldCode" />
     <result column="transfer_addr" jdbcType="VARCHAR" property="transferAddr" />
@@ -17,122 +17,29 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, field_code, transfer_addr, trasfer_status, err_code, err_info, transfer_start_time,
+    field_code, transfer_addr, trasfer_status, err_code, err_info, transfer_start_time,
     transfer_finish_time, transfer_progress, create_by, create_time, update_by, update_time
   </sql>
 
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" 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
-    where id = #{id,jdbcType=BIGINT}
+        <include refid="Base_Column_List" />
+    from wave_data_transfer transfer
+    left join wind_field field
+    on transfer.field_code = field.field_code
+    <where>
+      <if test="fieldName != null and fieldName != ''">
+        field.field_name like concat ('%', #{fieldCode}, '%')
+      </if>
+      <if test="transferStatus != null">
+        and transfer.trasfer_status = #{transferStatus}
+      </if>
+    </where>
+    order by update_time desc
   </select>
 
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from wave_data_transfer
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-
-  <insert id="insert" parameterType="com.energy.manage.common.po.wavedatatransfer.WaveDataTransfer">
-    insert into wave_data_transfer (id, field_code, transfer_addr,
-      trasfer_status, err_code, err_info,
-      transfer_start_time, transfer_finish_time,
-      transfer_progress, create_by, create_time,
-      update_by, update_time)
-    values (#{id,jdbcType=BIGINT}, #{fieldCode,jdbcType=VARCHAR}, #{transferAddr,jdbcType=VARCHAR},
-      #{trasferStatus,jdbcType=TINYINT}, #{errCode,jdbcType=VARCHAR}, #{errInfo,jdbcType=VARCHAR},
-      #{transferStartTime,jdbcType=TIMESTAMP}, #{transferFinishTime,jdbcType=TIMESTAMP},
-      #{transferProgress,jdbcType=INTEGER}, #{createBy,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
-      #{updateBy,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP})
-  </insert>
-
-  <insert id="insertSelective" parameterType="com.energy.manage.common.po.wavedatatransfer.WaveDataTransfer">
-    insert into wave_data_transfer
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="fieldCode != null">
-        field_code,
-      </if>
-      <if test="transferAddr != null">
-        transfer_addr,
-      </if>
-      <if test="trasferStatus != null">
-        trasfer_status,
-      </if>
-      <if test="errCode != null">
-        err_code,
-      </if>
-      <if test="errInfo != null">
-        err_info,
-      </if>
-      <if test="transferStartTime != null">
-        transfer_start_time,
-      </if>
-      <if test="transferFinishTime != null">
-        transfer_finish_time,
-      </if>
-      <if test="transferProgress != null">
-        transfer_progress,
-      </if>
-      <if test="createBy != null">
-        create_by,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateBy != null">
-        update_by,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="fieldCode != null">
-        #{fieldCode,jdbcType=VARCHAR},
-      </if>
-      <if test="transferAddr != null">
-        #{transferAddr,jdbcType=VARCHAR},
-      </if>
-      <if test="trasferStatus != null">
-        #{trasferStatus,jdbcType=TINYINT},
-      </if>
-      <if test="errCode != null">
-        #{errCode,jdbcType=VARCHAR},
-      </if>
-      <if test="errInfo != null">
-        #{errInfo,jdbcType=VARCHAR},
-      </if>
-      <if test="transferStartTime != null">
-        #{transferStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="transferFinishTime != null">
-        #{transferFinishTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="transferProgress != null">
-        #{transferProgress,jdbcType=INTEGER},
-      </if>
-      <if test="createBy != null">
-        #{createBy,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateBy != null">
-        #{updateBy,jdbcType=INTEGER},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
 
-  <update id="updateByPrimaryKeySelective" parameterType="com.energy.manage.common.po.wavedatatransfer.WaveDataTransfer">
+  <update id="updateByPrimaryKeySelective" parameterType="com.energy.manage.common.po.wavedatatransfer.WaveDataTransferPo">
     update wave_data_transfer
     <set>
       <if test="fieldCode != null">
@@ -175,7 +82,7 @@
     where id = #{id,jdbcType=BIGINT}
   </update>
 
-  <update id="updateByPrimaryKey" parameterType="com.energy.manage.common.po.wavedatatransfer.WaveDataTransfer">
+  <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},