添加激光数据

src/main/java/com/dskj/znzn/transData/generate/CodeGenerateMain.java

@@ -29,11 +29,11 @@ public class CodeGenerateMain {
 
     public static void main(String[] args) throws IOException {
         //逗号分隔 ,all：查询全部  前缀_：匹配
-        String includTables = "trans_conf";
+        String includTables = "JGCS001_laser";
 
         boolean isFirst = true;
         //去掉表前缀
-        String replaceTablePrefix = "";
+        String replaceTablePrefix = "JGCS001_";
 
         File directory = new File("");
         //项目路径-mgb
@@ -56,7 +56,7 @@ public class CodeGenerateMain {
                     return typeRegistry.getColumnType(metaInfo);
                 })).
                 packageConfig(builder -> {
-                    builder.parent("com.dskj.znzn.transData.web").pathInfo(Collections.singletonMap(OutputFile.xml, xmlPahth)); // 设置mapperXml生成路径
+                    builder.parent("com.dskj.znzn.transData.web.laserData").pathInfo(Collections.singletonMap(OutputFile.xml, xmlPahth)); // 设置mapperXml生成路径
                 })
                 .strategyConfig(builder -> {
                     builder.enableSkipView();

src/main/java/com/dskj/znzn/transData/web/laserData/controller/LaserDataController.java

@@ -0,0 +1,38 @@
+package com.dskj.znzn.transData.web.laserData.controller;
+
+import com.dskj.znzn.transData.common.base.R;
+import com.dskj.znzn.transData.web.laserData.entity.LaserData;
+import com.dskj.znzn.transData.web.laserData.indata.GetLaserDataInData;
+import com.dskj.znzn.transData.web.laserData.service.ILaserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 激光数据 前端控制器
+ * </p>
+ *
+ * @author 魏志亮
+ * @since 2024-12-12
+ */
+@RestController
+@RequestMapping("/laserData")
+@Api(tags = {"激光数据接口"})
+@RequiredArgsConstructor(onConstructor = @__({@Autowired}))
+public class LaserDataController {
+
+    public final ILaserService iLaserService;
+
+    @PostMapping({"getLaserData"})
+    @ApiOperation("获取激光数据")
+    public R<List<LaserData>> getLaserData(@RequestBody @Valid GetLaserDataInData inData) {
+        return R.ok(iLaserService.getLaserData(inData));
+    }
+
+}

src/main/java/com/dskj/znzn/transData/web/laserData/entity/LaserData.java

@@ -0,0 +1,119 @@
+package com.dskj.znzn.transData.web.laserData.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 激光数据
+ * </p>
+ *
+ * @author 魏志亮
+ * @since 2024-12-12
+ */
+@Getter
+@Setter
+@ApiModel(value = "Laser对象", description = "激光数据")
+public class LaserData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("风机编号")
+    private String windTurbineNumber;
+
+    @ApiModelProperty("采样时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date acquisitionTime;
+
+    @ApiModelProperty("采样率")
+    private Integer samplingFrequency;
+
+//    @ApiModelProperty("数据包号")
+//    private Integer pkNo;
+//
+//    @ApiModelProperty("回波数，值为0 或者1或者2，0表示0回波，1表示1回波，2表示2回波")
+//    private Integer echoType;
+//
+//    @ApiModelProperty("第1回波测距值，保留小数点后3位")
+//    private String echo1Dist;
+//
+//    @ApiModelProperty("第1回波灰度值（光强度）")
+//    private String echo1Grey;
+//
+//    @ApiModelProperty("第2回波测距值，保留小数点后3位")
+//    private String echo2Dist;
+//
+//    @ApiModelProperty("第2回波灰度值（光强度）")
+//    private String echo2Grey;
+//
+//    @ApiModelProperty("第3回波测距值，保留小数点后3位")
+//    private String echo3Dist;
+//
+//    @ApiModelProperty("第3回波灰度值（光强度）")
+//    private String echo3Grey;
+
+    @ApiModelProperty("叶片1角度偏差")
+    private Double blade1AngleDeviation;
+
+    @ApiModelProperty("叶片2角度偏差")
+    private Double blade2AngleDeviation;
+
+    @ApiModelProperty("叶片3角度偏差")
+    private Double blade3AngleDeviation;
+
+    @ApiModelProperty("叶片角度偏差-相对偏差")
+    private Double bladeRelativeAngleDeviation;
+
+    @ApiModelProperty("叶片1净空值")
+    private Double blade1ClearanceValue;
+
+    @ApiModelProperty("叶片2净空值")
+    private Double blade2ClearanceValue;
+
+    @ApiModelProperty("叶片3净空值")
+    private Double blade3ClearanceValue;
+
+    @ApiModelProperty("叶片净空值-平均")
+    private Double bladeRelativeClearanceValue;
+
+    @ApiModelProperty("叶片1扭转变形")
+    private Double blade1TorsionalDeformation;
+
+    @ApiModelProperty("叶片2扭转变形")
+    private Double blade2TorsionalDeformation;
+
+    @ApiModelProperty("叶片3扭转变形")
+    private Double blade3TorsionalDeformation;
+
+    @ApiModelProperty("叶片扭转变形-平均")
+    private Double bladeRelativeTorsionalDeformation;
+
+    @ApiModelProperty("塔筒晃动-晃动幅值")
+    private Integer towerSwayAmplitude;
+
+    @ApiModelProperty("塔筒晃动-晃动主频")
+    private Double towerSwayMainFrequency;
+
+    @ApiModelProperty("叶片采集频率(HZ)")
+    private String bladeCollectionFrequency;
+
+    @ApiModelProperty("塔筒采集频率(HZ)")
+    private String towerCollectionFrequency;
+
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    private Date createTime;
+//
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    private Date updateTime;
+}

src/main/java/com/dskj/znzn/transData/web/laserData/indata/GetLaserDataInData.java

@@ -0,0 +1,30 @@
+
+package com.dskj.znzn.transData.web.laserData.indata;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@ApiModel("激光数据")
+@Data
+public class GetLaserDataInData {
+
+    @ApiModelProperty("风场编号")
+    @NotBlank(message = "风场编号不能为空")
+    private String windCode;
+
+    @ApiModelProperty("风机编号")
+    @NotBlank(message = "必须选择风机")
+    private String windTurbineNumber;
+
+    @ApiModelProperty("开始时间,yyyy-MM-dd HH:mm:ss")
+    @NotBlank(message = "开始时间不能为空")
+    private String startTime;
+
+    @ApiModelProperty("结束时间,yyyy-MM-dd hh:mm:ss")
+    @NotBlank(message = "结束时间不能为空")
+    private String endTime;
+
+}

src/main/java/com/dskj/znzn/transData/web/laserData/mapper/LaserDataMapper.java

@@ -0,0 +1,22 @@
+package com.dskj.znzn.transData.web.laserData.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dskj.znzn.transData.web.laserData.entity.LaserData;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 激光数据 Mapper 接口
+ * </p>
+ *
+ * @author 魏志亮
+ * @since 2024-12-12
+ */
+@Mapper
+public interface LaserDataMapper extends BaseMapper<LaserData> {
+
+    List<LaserData> getLaserData(String windCode, String windTurbineNumber, String startTime, String endTime);
+
+}

src/main/java/com/dskj/znzn/transData/web/laserData/service/ILaserService.java

@@ -0,0 +1,20 @@
+package com.dskj.znzn.transData.web.laserData.service;
+
+import com.dskj.znzn.transData.web.laserData.entity.LaserData;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dskj.znzn.transData.web.laserData.indata.GetLaserDataInData;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 激光数据 服务类
+ * </p>
+ *
+ * @author 魏志亮
+ * @since 2024-12-12
+ */
+public interface ILaserService extends IService<LaserData> {
+
+    List<LaserData> getLaserData(GetLaserDataInData inData);
+}

src/main/java/com/dskj/znzn/transData/web/laserData/service/impl/LaserServiceImpl.java

@@ -0,0 +1,39 @@
+package com.dskj.znzn.transData.web.laserData.service.impl;
+
+import com.dskj.znzn.transData.common.exception.BusinessException;
+import com.dskj.znzn.transData.web.laserData.entity.LaserData;
+import com.dskj.znzn.transData.web.laserData.indata.GetLaserDataInData;
+import com.dskj.znzn.transData.web.laserData.mapper.LaserDataMapper;
+import com.dskj.znzn.transData.web.laserData.service.ILaserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 激光数据 服务实现类
+ * </p>
+ *
+ * @author 魏志亮
+ * @since 2024-12-12
+ */
+@Service
+@RequiredArgsConstructor(onConstructor = @__({@Autowired}))
+public class LaserServiceImpl extends ServiceImpl<LaserDataMapper, LaserData> implements ILaserService {
+
+    private final LaserDataMapper laserDataMapper;
+
+    @Override
+    public List<LaserData> getLaserData(GetLaserDataInData inData) {
+        if (inData.getWindCode().contains(" ")) {
+            throw new BusinessException("风场参数异常");
+        } else {
+            return laserDataMapper.getLaserData(inData.getWindCode() + "_laser", inData.getWindTurbineNumber(),
+                    inData.getStartTime(), inData.getEndTime());
+        }
+
+    }
+}

src/main/java/com/dskj/znzn/transData/web/waveData/entity/WaveData.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 @TableName("wave_data")
-@ApiModel
+@ApiModel("震动数据")
 @Data
 public class WaveData implements Serializable {
 

src/main/resources/mapper/LaserDataMapper.xml

@@ -0,0 +1,25 @@
+<?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.dskj.znzn.transData.web.laserData.mapper.LaserDataMapper">
+
+    <select id="getLaserData" resultType="com.dskj.znzn.transData.web.laserData.entity.LaserData">
+
+        select
+        id,wind_turbine_number,wind_turbine_name,
+        acquisition_time,sampling_frequency,
+        pk_no,echo_type,
+        blade_1_angle_deviation,blade_2_angle_deviation,blade_3_angle_deviation,blade_relative_angle_deviation,
+        blade_1_clearance_value,blade_2_clearance_value,blade_3_clearance_value,blade_relative_clearance_value,
+        blade_1_torsional_deformation,blade_2_torsional_deformation,blade_3_torsional_deformation,blade_relative_torsional_deformation,
+        tower_sway_amplitude,tower_sway_main_frequency,
+        blade_collection_frequency,tower_collection_frequency
+        from
+        ${windCode}
+        where
+            wind_turbine_number = #{windTurbineNumber}
+            and acquisition_time between #{startTime} and #{endTime}
+        order by acquisition_time asc
+
+    </select>
+
+</mapper>