Browse Source

添加实时数据接口

魏志亮 4 tháng trước cách đây
mục cha
commit
d588f41839
20 tập tin đã thay đổi với 493 bổ sung28 xóa
  1. 1 0
      .gitignore
  2. 2 0
      src/main/java/com/dskj/znzn/transData/Application.java
  3. 30 0
      src/main/java/com/dskj/znzn/transData/crontab/UpdadePlatformData.java
  4. 2 2
      src/main/java/com/dskj/znzn/transData/generate/CodeGenerateMain.java
  5. 2 5
      src/main/java/com/dskj/znzn/transData/web/common/mapper/SysConfMapper.java
  6. 8 0
      src/main/java/com/dskj/znzn/transData/web/dataTransfer/controller/DataTransferController.java
  7. 46 0
      src/main/java/com/dskj/znzn/transData/web/dataTransfer/controller/WindFarmDayCountController.java
  8. 63 0
      src/main/java/com/dskj/znzn/transData/web/dataTransfer/entity/WindFarmDayCount.java
  9. 20 0
      src/main/java/com/dskj/znzn/transData/web/dataTransfer/inData/GetOnlineTimeRangeInData.java
  10. 7 2
      src/main/java/com/dskj/znzn/transData/web/dataTransfer/inData/GetTimeRangeInData.java
  11. 22 0
      src/main/java/com/dskj/znzn/transData/web/dataTransfer/inData/HistoryDataSummaryInData.java
  12. 30 0
      src/main/java/com/dskj/znzn/transData/web/dataTransfer/mapper/WindFarmDayCountMapper.java
  13. 22 0
      src/main/java/com/dskj/znzn/transData/web/dataTransfer/outData/AsyncPlatformTimeOutData.java
  14. 32 0
      src/main/java/com/dskj/znzn/transData/web/dataTransfer/outData/HistoryDataSummaryOutData.java
  15. 27 0
      src/main/java/com/dskj/znzn/transData/web/dataTransfer/service/IWindFarmDayCountService.java
  16. 28 16
      src/main/java/com/dskj/znzn/transData/web/dataTransfer/service/impl/DataTransferServiceImpl.java
  17. 55 0
      src/main/java/com/dskj/znzn/transData/web/dataTransfer/service/impl/WindFarmDayCountServiceImpl.java
  18. 32 0
      src/main/resources/application-zhongguanghe.yml
  19. 0 3
      src/main/resources/mapper/SysConfMapper.xml
  20. 64 0
      src/main/resources/mapper/WindFarmDayCountMapper.xml

+ 1 - 0
.gitignore

@@ -2,3 +2,4 @@
 target\
 target/
 /WindDataTrans.iml
+.vscode

+ 2 - 0
src/main/java/com/dskj/znzn/transData/Application.java

@@ -2,8 +2,10 @@ package com.dskj.znzn.transData;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableScheduling
 public class Application {
 
     public static void main(String[] args) {

+ 30 - 0
src/main/java/com/dskj/znzn/transData/crontab/UpdadePlatformData.java

@@ -0,0 +1,30 @@
+package com.dskj.znzn.transData.crontab;
+
+import com.alibaba.fastjson.JSON;
+import com.dskj.znzn.transData.web.dataTransfer.mapper.WindFarmDayCountMapper;
+import com.dskj.znzn.transData.web.dataTransfer.outData.AsyncPlatformTimeOutData;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor(onConstructor = @__({@Autowired}))
+@Slf4j
+public class UpdadePlatformData {
+
+    private final WindFarmDayCountMapper windFarmDayCountMapper;
+
+    @Scheduled(cron = "0 0 1 * * ?")
+    public void updateTime() {
+
+        List<AsyncPlatformTimeOutData> datas = windFarmDayCountMapper.asyncPlatformTime();
+
+        System.out.println(JSON.toJSON(datas));
+        if (!datas.isEmpty()) {
+        }
+    }
+}

+ 2 - 2
src/main/java/com/dskj/znzn/transData/generate/CodeGenerateMain.java

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

+ 2 - 5
src/main/java/com/dskj/znzn/transData/web/common/mapper/SysConfMapper.java

@@ -1,14 +1,12 @@
 package com.dskj.znzn.transData.web.common.mapper;
 
-import com.dskj.znzn.transData.web.common.entity.SysConf;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dskj.znzn.transData.web.common.entity.SysConf;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author 魏志亮
@@ -17,5 +15,4 @@ import java.util.List;
 @Mapper
 public interface SysConfMapper extends BaseMapper<SysConf> {
 
-    List<SysConf> getTypeName();
 }

+ 8 - 0
src/main/java/com/dskj/znzn/transData/web/dataTransfer/controller/DataTransferController.java

@@ -84,6 +84,13 @@ public class DataTransferController {
         return R.ok(dataTransferService.getTimeRange(data));
     }
 
+//    @ApiOperation("获取时间范围-在线数据")
+//    @PostMapping("/getOnlineTimeRange")
+//    public R<GetTimeRangeOutData> getOnlineTimeRange(@Valid @RequestBody GetOnlineTimeRangeInData data) {
+//        return R.ok(dataTransferService.getOnlineTimeRange(data));
+//    }
+
+
     @ApiOperation("获取统计信息")
     @PostMapping("/getStatisticalData")
     public R<GetStatisticalOutData> getStatisticalData() {
@@ -128,4 +135,5 @@ public class DataTransferController {
     public R<Long> highPriorityCount() {
         return R.ok(dataTransferService.highPriorityCount());
     }
+
 }

+ 46 - 0
src/main/java/com/dskj/znzn/transData/web/dataTransfer/controller/WindFarmDayCountController.java

@@ -0,0 +1,46 @@
+package com.dskj.znzn.transData.web.dataTransfer.controller;
+
+import com.dskj.znzn.transData.common.base.R;
+import com.dskj.znzn.transData.web.dataTransfer.entity.WindFarmDayCount;
+import com.dskj.znzn.transData.web.dataTransfer.inData.HistoryDataSummaryInData;
+import com.dskj.znzn.transData.web.dataTransfer.outData.HistoryDataSummaryOutData;
+import com.dskj.znzn.transData.web.dataTransfer.service.IWindFarmDayCountService;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 每日采集数据表 前端控制器
+ * </p>
+ *
+ * @author 魏志亮
+ * @since 2025-03-24
+ */
+@RestController
+@RequestMapping("/windFarmDayCount")
+@RequiredArgsConstructor(onConstructor = @__({@Autowired}))
+@Api(tags = {"每日采集数据表"})
+public class WindFarmDayCountController {
+
+    private final IWindFarmDayCountService windFarmDayCountService;
+
+    @ApiOperation("获取今天数据")
+    @PostMapping("getTodayData")
+    public R<List<WindFarmDayCount>> getTodayData() {
+        return R.ok(windFarmDayCountService.getTodayData());
+    }
+
+    @ApiOperation("获取历史数据汇总")
+    @PostMapping("getHistoryDataSummary")
+    public R<List<HistoryDataSummaryOutData>> Summary(@RequestBody HistoryDataSummaryInData inData) {
+        return R.ok(windFarmDayCountService.getHistoryDataSummary(inData));
+    }
+}

+ 63 - 0
src/main/java/com/dskj/znzn/transData/web/dataTransfer/entity/WindFarmDayCount.java

@@ -0,0 +1,63 @@
+package com.dskj.znzn.transData.web.dataTransfer.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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 2025-03-24
+ */
+@Getter
+@Setter
+@TableName("wind_farm_day_count")
+@ApiModel(value = "WindFarmDayCount对象", description = "每日采集数据表")
+public class WindFarmDayCount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("风场编号")
+    private String windFarmCode;
+
+    @ApiModelProperty("风场名称")
+    private String windFarmName;
+
+    @ApiModelProperty("统计时间")
+    private Date addDate;
+
+    @ApiModelProperty("类型:minute,second")
+    private String type;
+
+    @ApiModelProperty("数量")
+    private Integer count;
+
+    @ApiModelProperty("同步状态 0 : 未同步 1:已同步")
+    private Integer syncStatus;
+
+    @ApiModelProperty("0:未删除 1:已删除")
+    private Integer delStatus;
+
+    @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;
+
+}

+ 20 - 0
src/main/java/com/dskj/znzn/transData/web/dataTransfer/inData/GetOnlineTimeRangeInData.java

@@ -0,0 +1,20 @@
+package com.dskj.znzn.transData.web.dataTransfer.inData;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@ApiModel
+@Data
+public class GetOnlineTimeRangeInData {
+
+    @ApiModelProperty(value = "风场编号", required = true)
+    @NotBlank(message = "风场编号不能为空")
+    private String windFarmCode;
+
+    @ApiModelProperty(value = "转化类型", required = true)
+    @NotBlank(message = "转化类型不能为空")
+    private String transferType;
+}

+ 7 - 2
src/main/java/com/dskj/znzn/transData/web/dataTransfer/inData/GetTimeRangeInData.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 @ApiModel
 @Data
@@ -15,6 +17,9 @@ public class GetTimeRangeInData {
     private String windFarmCode;
 
     @ApiModelProperty(value = "转化类型", required = true)
-    @NotBlank(message = "转化类型不能为空")
-    private String transferType;
+    @NotEmpty(message = "转化类型不能为空")
+    private List<String> transferType;
+
+    @ApiModelProperty(value = "是否在线数据 0:否 1:是,默认1")
+    private Integer isOnlineData = 1;
 }

+ 22 - 0
src/main/java/com/dskj/znzn/transData/web/dataTransfer/inData/HistoryDataSummaryInData.java

@@ -0,0 +1,22 @@
+package com.dskj.znzn.transData.web.dataTransfer.inData;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class HistoryDataSummaryInData {
+
+    @ApiModelProperty("风场编号")
+    private String windFarmCode;
+
+    @ApiModelProperty("类型")
+    private String type;
+
+    @ApiModelProperty("开始时间")
+    private String beginDate;
+
+    @ApiModelProperty("结束时间")
+    private String endDate;
+}

+ 30 - 0
src/main/java/com/dskj/znzn/transData/web/dataTransfer/mapper/WindFarmDayCountMapper.java

@@ -0,0 +1,30 @@
+package com.dskj.znzn.transData.web.dataTransfer.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dskj.znzn.transData.web.dataTransfer.entity.WindFarmDayCount;
+import com.dskj.znzn.transData.web.dataTransfer.inData.GetTimeRangeInData;
+import com.dskj.znzn.transData.web.dataTransfer.inData.HistoryDataSummaryInData;
+import com.dskj.znzn.transData.web.dataTransfer.outData.AsyncPlatformTimeOutData;
+import com.dskj.znzn.transData.web.dataTransfer.outData.GetTimeRangeOutData;
+import com.dskj.znzn.transData.web.dataTransfer.outData.HistoryDataSummaryOutData;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 每日采集数据表 Mapper 接口
+ * </p>
+ *
+ * @author 魏志亮
+ * @since 2025-02-28
+ */
+@Mapper
+public interface WindFarmDayCountMapper extends BaseMapper<WindFarmDayCount> {
+
+    List<GetTimeRangeOutData> getTimeRange(GetTimeRangeInData data);
+
+    List<AsyncPlatformTimeOutData> asyncPlatformTime();
+
+    List<HistoryDataSummaryOutData> getHistoryDataSummary(HistoryDataSummaryInData inData);
+}

+ 22 - 0
src/main/java/com/dskj/znzn/transData/web/dataTransfer/outData/AsyncPlatformTimeOutData.java

@@ -0,0 +1,22 @@
+package com.dskj.znzn.transData.web.dataTransfer.outData;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class AsyncPlatformTimeOutData {
+
+    @ApiModelProperty("风场编号")
+    private String windFarmCode;
+
+    @ApiModelProperty("类型 eg:minute,second")
+    private String type;
+
+    @ApiModelProperty("开始时间")
+    private String startTime;
+
+//    @ApiModelProperty("结束时间")
+//    private String endTime;
+}

+ 32 - 0
src/main/java/com/dskj/znzn/transData/web/dataTransfer/outData/HistoryDataSummaryOutData.java

@@ -0,0 +1,32 @@
+package com.dskj.znzn.transData.web.dataTransfer.outData;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel
+@Data
+public class HistoryDataSummaryOutData {
+
+    @ApiModelProperty("风场编号")
+    private String windFarmCode;
+
+    @ApiModelProperty("风场名称")
+    private String windFarmName;
+
+    @ApiModelProperty("类型:minute,second")
+    private String type;
+
+    @ApiModelProperty("总数量")
+    private Long totalDataCount;
+
+    @ApiModelProperty("总天数")
+    private Integer totalDays;
+
+    @ApiModelProperty("最近数据采集的时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date latestDataTime;
+}

+ 27 - 0
src/main/java/com/dskj/znzn/transData/web/dataTransfer/service/IWindFarmDayCountService.java

@@ -0,0 +1,27 @@
+package com.dskj.znzn.transData.web.dataTransfer.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dskj.znzn.transData.web.dataTransfer.entity.WindFarmDayCount;
+import com.dskj.znzn.transData.web.dataTransfer.inData.GetTimeRangeInData;
+import com.dskj.znzn.transData.web.dataTransfer.inData.HistoryDataSummaryInData;
+import com.dskj.znzn.transData.web.dataTransfer.outData.GetTimeRangeOutData;
+import com.dskj.znzn.transData.web.dataTransfer.outData.HistoryDataSummaryOutData;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 每日采集数据表 服务类
+ * </p>
+ *
+ * @author 魏志亮
+ * @since 2025-02-28
+ */
+public interface IWindFarmDayCountService extends IService<WindFarmDayCount> {
+
+    List<GetTimeRangeOutData> getTimeRange(GetTimeRangeInData data);
+
+    List<WindFarmDayCount> getTodayData();
+
+    List<HistoryDataSummaryOutData> getHistoryDataSummary(HistoryDataSummaryInData inData);
+}

+ 28 - 16
src/main/java/com/dskj/znzn/transData/web/dataTransfer/service/impl/DataTransferServiceImpl.java

@@ -17,6 +17,7 @@ import com.dskj.znzn.transData.web.dataTransfer.inData.GetTimeRangeInData;
 import com.dskj.znzn.transData.web.dataTransfer.mapper.DataTransferMapper;
 import com.dskj.znzn.transData.web.dataTransfer.outData.*;
 import com.dskj.znzn.transData.web.dataTransfer.service.IDataTransferService;
+import com.dskj.znzn.transData.web.dataTransfer.service.IWindFarmDayCountService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -45,6 +46,8 @@ public class DataTransferServiceImpl extends ServiceImpl<DataTransferMapper, Dat
 
     private final ISysConfService sysConfService;
 
+    private final IWindFarmDayCountService windFarmDayCountService;
+
     @Override
     public PageR<DataTransfer> getDataTransfer(GetDataTransferInData data) {
         IPage<DataTransfer> queryPage = Page.of(data.getPageNo(), data.getPageSize());
@@ -120,25 +123,33 @@ public class DataTransferServiceImpl extends ServiceImpl<DataTransferMapper, Dat
 
     @Override
     public List<GetTimeRangeOutData> getTimeRange(GetTimeRangeInData data) {
-        LambdaQueryWrapper<DataTransfer> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(DataTransfer::getWindFarmCode, data.getWindFarmCode())
-                .eq(DataTransfer::getTransferType, data.getTransferType())
-                .eq(DataTransfer::getTransferStatus, 1)
-                .eq(DataTransfer::getStatus, 1)
-                .isNotNull(DataTransfer::getDataMinTime)
-                .isNotNull(DataTransfer::getDataMaxTime);
+        List<GetTimeRangeOutData> results = new ArrayList<>();
+        if (data.getIsOnlineData() == 0) {
+            LambdaQueryWrapper<DataTransfer> wrapper = Wrappers.lambdaQuery();
+            wrapper.eq(DataTransfer::getWindFarmCode, data.getWindFarmCode())
+                    .in(DataTransfer::getTransferType, data.getTransferType())
+                    .eq(DataTransfer::getTransferStatus, 1)
+                    .eq(DataTransfer::getStatus, 1)
+                    .isNotNull(DataTransfer::getDataMinTime)
+                    .isNotNull(DataTransfer::getDataMaxTime);
+
+            List<DataTransfer> datas = list(wrapper);
+            if (datas.isEmpty()) {
+                throw new BusinessException("未查询到已导入完成的数据");
+            }
 
-        List<DataTransfer> datas = list(wrapper);
-        if (datas.isEmpty()) {
-            throw new BusinessException("未查询到已导入完成的数据");
-        }
 
-        List<GetTimeRangeOutData> results = new ArrayList<>(datas.size());
-        for (DataTransfer dataTransfer : datas) {
-            results.add(new GetTimeRangeOutData(dataTransfer.getDataMinTime(), dataTransfer.getDataMaxTime()));
+            for (DataTransfer dataTransfer : datas) {
+                results.add(new GetTimeRangeOutData(dataTransfer.getDataMinTime(), dataTransfer.getDataMaxTime()));
+            }
+            return mergePeriods(results);
+        } else {
+            List<GetTimeRangeOutData> datas = windFarmDayCountService.getTimeRange(data);
+            if (null == datas.get(0)) {
+                return Collections.emptyList();
+            }
+            return datas;
         }
-
-        return mergePeriods(results);
     }
 
     public static List<GetTimeRangeOutData> mergePeriods(List<GetTimeRangeOutData> periods) {
@@ -342,6 +353,7 @@ public class DataTransferServiceImpl extends ServiceImpl<DataTransferMapper, Dat
         return count(wrapper);
     }
 
+
     private List<String> converAreaStrToList(boolean contains, ClassificationImportDataDetailsQuery query) {
         if (null == query) {
             return Collections.emptyList();

+ 55 - 0
src/main/java/com/dskj/znzn/transData/web/dataTransfer/service/impl/WindFarmDayCountServiceImpl.java

@@ -0,0 +1,55 @@
+package com.dskj.znzn.transData.web.dataTransfer.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dskj.znzn.transData.web.dataTransfer.entity.WindFarmDayCount;
+import com.dskj.znzn.transData.web.dataTransfer.inData.GetTimeRangeInData;
+import com.dskj.znzn.transData.web.dataTransfer.inData.HistoryDataSummaryInData;
+import com.dskj.znzn.transData.web.dataTransfer.mapper.WindFarmDayCountMapper;
+import com.dskj.znzn.transData.web.dataTransfer.outData.GetTimeRangeOutData;
+import com.dskj.znzn.transData.web.dataTransfer.outData.HistoryDataSummaryOutData;
+import com.dskj.znzn.transData.web.dataTransfer.service.IWindFarmDayCountService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 每日采集数据表 服务实现类
+ * </p>
+ *
+ * @author 魏志亮
+ * @since 2025-02-28
+ */
+@Service
+@RequiredArgsConstructor(onConstructor = @__({@Autowired}))
+public class WindFarmDayCountServiceImpl extends ServiceImpl<WindFarmDayCountMapper, WindFarmDayCount> implements IWindFarmDayCountService {
+
+    private final WindFarmDayCountMapper windFarmDayCountMapper;
+
+    private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+    @Override
+    public List<GetTimeRangeOutData> getTimeRange(GetTimeRangeInData data) {
+        return windFarmDayCountMapper.getTimeRange(data);
+    }
+
+    @Override
+    public List<WindFarmDayCount> getTodayData() {
+        LambdaQueryWrapper<WindFarmDayCount> queryWrapper = Wrappers.lambdaQuery(WindFarmDayCount.class);
+        queryWrapper.eq(WindFarmDayCount::getAddDate, dateFormat.format(new Date()));
+        queryWrapper.eq(WindFarmDayCount::getDelStatus, 0);
+        queryWrapper.eq(WindFarmDayCount::getSyncStatus, 0);
+        return list(queryWrapper);
+    }
+
+    @Override
+    public List<HistoryDataSummaryOutData> getHistoryDataSummary(HistoryDataSummaryInData inData) {
+        return windFarmDayCountMapper.getHistoryDataSummary(inData);
+    }
+}

+ 32 - 0
src/main/resources/application-zhongguanghe.yml

@@ -0,0 +1,32 @@
+server:
+  port: 9002
+
+knife4j:
+  enable: true
+  setting:
+    language: zh-CN
+    swagger-model-name: 模型
+  basic:
+    enable: true
+    username: znzn
+    password: znzn_prod
+
+
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/energy_data?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false
+    username: root
+    password: VzHXkVrKSEm5pCcXBQpA
+
+  redis:
+    host: 192.168.50.235
+    port: 6379
+    password: 123456
+    jedis:
+      pool:
+        max-active: 8
+        max-wait: -1
+    database: 10
+
+logging:
+  config: classpath:logback-prod.xml

+ 0 - 3
src/main/resources/mapper/SysConfMapper.xml

@@ -2,8 +2,5 @@
 <!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.common.mapper.SysConfMapper">
 
-    <select id="getTypeName">
-        select distinct
 
-    </select>
 </mapper>

+ 64 - 0
src/main/resources/mapper/WindFarmDayCountMapper.xml

@@ -0,0 +1,64 @@
+<?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.dataTransfer.mapper.WindFarmDayCountMapper">
+
+    <select id="getTimeRange" resultType="com.dskj.znzn.transData.web.dataTransfer.outData.GetTimeRangeOutData">
+
+        select min(add_date) as 'startTime',
+        max(latest_data_time)as 'endTime'
+        from wind_farm_day_count t
+        where t.wind_farm_code = #{windFarmCode}
+        and t.type in
+        <foreach collection="transferType" item="value" separator="," open="(" close=")">
+            #{value}
+        </foreach>
+        and t.sync_status = 1
+        and t.del_status = 0
+    </select>
+
+    <select id="asyncPlatformTime"
+            resultType="com.dskj.znzn.transData.web.dataTransfer.outData.AsyncPlatformTimeOutData">
+
+        select t.wind_farm_code,
+               t.type,
+               min(add_date) as 'startTime'
+        from wind_farm_day_count t
+        where t.type in ('minute', 'second')
+          and t.sync_status = 1
+          and t.del_status = 0
+        group by t.wind_farm_code, t.type
+    </select>
+
+    <select id="getHistoryDataSummary"
+            resultType="com.dskj.znzn.transData.web.dataTransfer.outData.HistoryDataSummaryOutData">
+
+        SELECT t.wind_farm_code,
+        t.wind_farm_name,
+        t.type,
+        count(t.id) AS 'totalDays',
+        sum(t.count) AS 'totalDataCount',
+        max(t.latest_data_time) AS 'latestDataTime'
+        FROM wind_farm_day_count t
+        WHERE 1 = 1
+        AND t.type IN ('minute', 'second')
+        AND t.sync_status = 1
+        AND t.del_status = 0
+        <if test="windFarmCode != null and windFarmCode != ''">
+            AND t.wind_farm_code = #{windFarmCode}
+        </if>
+        <if test="type != null and type != ''">
+            AND t.type = #{type}
+        </if>
+        <if test="beginDate != null and beginDate != ''">
+            AND t.add_date &gt;= #{beginDate}
+        </if>
+        <if test="endDate != null and endDate != ''">
+            AND t.latest_data_time &lt;= #{endDate}
+        </if>
+        GROUP BY t.wind_farm_code,
+        t.wind_farm_name,
+        t.type
+
+    </select>
+
+</mapper>