src/main/java/com/dskj/znzn/transData/web/dataTransfer/outData/HistoryDataSummaryOutData.java

@@ -26,10 +26,14 @@ public class HistoryDataSummaryOutData {
     @ApiModelProperty("总天数")
     private Integer totalDays;
 
-    @ApiModelProperty("最近数据采集的时间")
+    @ApiModelProperty("最近采集到数据的时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date latestDataTime;
 
+    @ApiModelProperty("最近数据采集的时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
     @ApiModelProperty("类型名称")
     private String typeName;
 

src/main/java/com/dskj/znzn/transData/web/waveData/controller/WaveDataController.java

@@ -6,6 +6,7 @@ import com.dskj.znzn.transData.common.base.R;
 import com.dskj.znzn.transData.web.waveData.entity.WaveData;
 import com.dskj.znzn.transData.web.waveData.indata.GetMesureDataInData;
 import com.dskj.znzn.transData.web.waveData.indata.GetMesureWithSFDataInData;
+import com.dskj.znzn.transData.web.waveData.outdata.ItemOutData;
 import com.dskj.znzn.transData.web.waveData.service.IWaveDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -47,4 +48,16 @@ public class WaveDataController {
     public R<List<String>> getAllSamplingFrequency(@PathVariable String windCode) {
         return R.ok(waveDataService.getAllSamplingFrequency(windCode));
     }
+
+    @GetMapping("/getWindTurbineNumberSamplingFrequency/{windCode}/{windTurbineNumber}")
+    @ApiOperation("获取风场风机采样频率")
+    public R<List<String>> getWindTurbineNumberSamplingFrequency(@PathVariable String windCode, @PathVariable String windTurbineNumber) {
+        return R.ok(waveDataService.getWindTurbineNumberSamplingFrequency(windCode, windTurbineNumber));
+    }
+
+    @PostMapping("/getAllMesurePointName/{windCode}/{windTurbineNumber}")
+    @ApiOperation("获取风场风机已存在测点")
+    public R<List<ItemOutData>> getWindTurbineNumberMesurePointName(@PathVariable String windCode, @PathVariable String windTurbineNumber) {
+        return R.ok(waveDataService.getWindTurbineNumberMesurePointName(windCode, windTurbineNumber));
+    }
 }

src/main/java/com/dskj/znzn/transData/web/waveData/mapper/WaveDataMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dskj.znzn.transData.web.waveData.entity.WaveData;
 import com.dskj.znzn.transData.web.waveData.indata.GetMesureWithSFDataInData;
+import com.dskj.znzn.transData.web.waveData.outdata.ItemOutData;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -18,4 +19,9 @@ public interface WaveDataMapper extends BaseMapper<WaveData> {
     Page<WaveData> getMesureDataWithSF(Page<WaveData> page, GetMesureWithSFDataInData inData);
 
     List<String> getAllSamplingFrequency(String windCode);
+
+
+    List<String> getWindTurbineNumberSamplingFrequency(String windCode, String windTurbineNumber);
+
+    List<ItemOutData> getWindTurbineNumberMesurePointName(String windCode, String windTurbineNumber);
 }

src/main/java/com/dskj/znzn/transData/web/waveData/outdata/ItemOutData.java

@@ -0,0 +1,13 @@
+package com.dskj.znzn.transData.web.waveData.outdata;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class ItemOutData {
+
+    private String itemKey;
+
+    private String itemValue;
+}

src/main/java/com/dskj/znzn/transData/web/waveData/service/IWaveDataService.java

@@ -5,6 +5,7 @@ import com.dskj.znzn.transData.common.base.PageR;
 import com.dskj.znzn.transData.web.waveData.entity.WaveData;
 import com.dskj.znzn.transData.web.waveData.indata.GetMesureDataInData;
 import com.dskj.znzn.transData.web.waveData.indata.GetMesureWithSFDataInData;
+import com.dskj.znzn.transData.web.waveData.outdata.ItemOutData;
 
 import java.util.List;
 
@@ -16,4 +17,8 @@ public interface IWaveDataService extends IService<WaveData> {
     PageR<WaveData> getMesureDataWithSF(GetMesureWithSFDataInData inData);
 
     List<String> getAllSamplingFrequency(String windCode);
+
+    List<ItemOutData> getWindTurbineNumberMesurePointName(String windCode, String windTurbineNumber);
+
+    List<String> getWindTurbineNumberSamplingFrequency(String windCode, String windTurbineNumber);
 }

src/main/java/com/dskj/znzn/transData/web/waveData/service/impl/WaveDataServiceImpl.java

@@ -9,6 +9,7 @@ import com.dskj.znzn.transData.web.waveData.entity.WaveData;
 import com.dskj.znzn.transData.web.waveData.indata.GetMesureDataInData;
 import com.dskj.znzn.transData.web.waveData.indata.GetMesureWithSFDataInData;
 import com.dskj.znzn.transData.web.waveData.mapper.WaveDataMapper;
+import com.dskj.znzn.transData.web.waveData.outdata.ItemOutData;
 import com.dskj.znzn.transData.web.waveData.service.IWaveDataService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,4 +61,24 @@ public class WaveDataServiceImpl extends ServiceImpl<WaveDataMapper, WaveData> i
             return waveDataMapper.getAllSamplingFrequency(windCode);
         }
     }
+
+    @Override
+    public List<ItemOutData> getWindTurbineNumberMesurePointName(String windCode, String windTurbineNumber) {
+        if (windCode.contains(" ")) {
+            throw new BusinessException("风场参数异常");
+        } else {
+            windCode = windCode + "_wave";
+            return waveDataMapper.getWindTurbineNumberMesurePointName(windCode, windTurbineNumber);
+        }
+    }
+
+    @Override
+    public List<String> getWindTurbineNumberSamplingFrequency(String windCode, String windTurbineNumber) {
+        if (windCode.contains(" ")) {
+            throw new BusinessException("风场参数异常");
+        } else {
+            windCode = windCode + "_wave";
+            return waveDataMapper.getWindTurbineNumberSamplingFrequency(windCode, windTurbineNumber);
+        }
+    }
 }

src/main/resources/mapper/WaveDataMapper.xml

@@ -49,4 +49,21 @@
         select distinct sampling_frequency
         from ${windCode}
     </select>
+
+    <select id="getWindTurbineNumberSamplingFrequency" resultType="java.lang.String">
+        select distinct sampling_frequency
+        from ${windCode}
+        where wind_turbine_number = #{windTurbineNumber}
+    </select>
+
+
+    <select id="getWindTurbineNumberMesurePointName"
+            resultType="com.dskj.znzn.transData.web.waveData.outdata.ItemOutData">
+        SELECT DISTINCT t.mesure_point_name  AS itemKey,
+                        a.detection_point_cn AS itemValue
+        FROM ${windCode} t
+                 LEFT JOIN detection_point_dic a ON t.mesure_point_name = a.detection_point_en
+        where wind_turbine_number = #{windTurbineNumber}
+    </select>
+
 </mapper>

src/main/resources/mapper/WindFarmDayCountMapper.xml

@@ -41,6 +41,7 @@
         DATEDIFF(max(add_date),min(add_date))+1 AS 'totalDays',
         sum(t.count) AS 'totalDataCount',
         max(t.latest_data_time) AS 'latestDataTime',
+        max(t.update_time) as 'update_time',
         if(a.param_value < DATEDIFF(max(add_date),min(add_date))+1,1,0) as 'canAnalysis'
         FROM wind_farm_day_count t
         LEFT JOIN sys_conf a on t.type = a.param_key