提交

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/job/DownLoadServiceJob.java

@@ -6,10 +6,8 @@ import com.jiayue.ipfcst.console.service.ElectricFieldService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -23,24 +21,25 @@ import java.util.List;
 @EnableScheduling
 public class DownLoadServiceJob {
 
-    @Autowired
-    private DownLoadService downLoadService;
+  @Autowired
+  private DownLoadService downLoadService;
 
-    @Autowired
-    private ElectricFieldService electricFieldService;
-    //@Scheduled(cron = "0 0/15 * * * *")
-    public void fxglFileAnalysis() {
+  @Autowired
+  private ElectricFieldService electricFieldService;
 
-        log.debug("天气预报文件下载定时任务开始执行");
+  //@Scheduled(cron = "0 0/15 * * * *")
+  public void fxglFileAnalysis() {
 
-        List<ElectricField> electricFieldList = electricFieldService.getAll();
-        for(ElectricField electricField : electricFieldList){
-          this.downLoadService.download(electricField.getStationCode());
-        }
-
-        log.debug("天气预报文件下载定时任务执行结束");
+    log.debug("天气预报文件下载定时任务开始执行");
 
+    List<ElectricField> electricFieldList = electricFieldService.getAll();
+    for (ElectricField electricField : electricFieldList) {
+      this.downLoadService.download(electricField.getStationCode());
     }
 
+    log.debug("天气预报文件下载定时任务执行结束");
+
+  }
+
 
 }

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/job/ReceiveDataJob.java

@@ -0,0 +1,38 @@
+package com.jiayue.ipfcst.console.job;
+
+import com.jiayue.ipfcst.console.service.ReceiveDataService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 天气预报下载 停用  现已由外网下发不主动下载
+ *
+ * @author whc
+ * @version 3.0
+ */
+@Slf4j
+@Service
+@EnableScheduling
+public class ReceiveDataJob {
+
+  @Autowired
+  private ReceiveDataService receiveDataService;
+
+
+  @Scheduled(fixedDelay = 60000)
+  public void receiveData() {
+
+    log.debug("开始向绿能数据中心请求数据");
+
+    this.receiveDataService.receive();
+
+    log.debug("数据请求结束");
+
+  }
+
+
+}

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/DataPointService.java

@@ -1,24 +1,16 @@
 package com.jiayue.ipfcst.console.service;
 
 
-import com.jiayue.ipfcst.common.core.exception.BusinessException;
-import com.jiayue.ipfcst.common.core.util.CommonUtil;
-import com.jiayue.ipfcst.common.core.util.DateMomentUtil;
 import com.jiayue.ipfcst.common.data.entity.DataPoint;
-import com.jiayue.ipfcst.common.data.entity.InverterInfo;
 import com.jiayue.ipfcst.common.data.repository.DataPointRepository;
 import com.jiayue.ipfcst.common.data.service.BaseService;
-import com.sun.istack.internal.NotNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.List;
 
 @Service
 @Slf4j
@@ -26,6 +18,7 @@ public class DataPointService extends BaseService {
 
   @Autowired
   DataPointRepository dataPointRepository;
+
   /**
    * 查询设备下所有测点
    */
@@ -37,6 +30,4 @@ public class DataPointService extends BaseService {
   }
 
 
-
-
 }

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/EquipmentAttributeService.java

@@ -25,86 +25,64 @@ import java.util.List;
 @Service
 public class EquipmentAttributeService {
 
-	/**
-	 * 操作仓库
-	 */
-	@Autowired
+  /**
+   * 操作仓库
+   */
+  @Autowired
   EquipmentAttributeRepository equipmentAttributeRepository;
-	@Autowired
-	ElectricFieldService electricFieldService;
+  @Autowired
+  ElectricFieldService electricFieldService;
 
-	/**
-	 * 获取某类设备的状态数据描述属性
-	 * 查询设备属性by设备类型
-	 *
-	 * @param dataObjectTypeEnum 设备类型
-	 * @return EquipmentAttribute 设备属性
-	 */
-	public List<EquipmentAttribute> getByEquipmentType(EquipmentTypeEnum dataObjectTypeEnum) {
-		EquipmentAttribute equipmentAttribute = new EquipmentAttribute();
-		equipmentAttribute.setEquipmentType(dataObjectTypeEnum);
-		return this.equipmentAttributeRepository.findAll(Example.of(equipmentAttribute));
-	}
 
+  /**
+   * 查找符合条件的设备属性
+   *
+   * @param equipmentAttribute 设备属性
+   * @return EquipmentAttribute 设备属性列表
+   */
+  public List<EquipmentAttribute> get(EquipmentAttribute equipmentAttribute) {
+    return this.equipmentAttributeRepository.findAll(Example.of(equipmentAttribute));
+  }
 
-	/**
-	 * 查找符合条件的设备属性
-	 *
-	 * @param equipmentAttribute 设备属性
-	 * @return EquipmentAttribute 设备属性列表
-	 */
-	public List<EquipmentAttribute> get(EquipmentAttribute equipmentAttribute) {
-		return this.equipmentAttributeRepository.findAll(Example.of(equipmentAttribute));
-	}
+  /**
+   * 查所有的设备属性
+   *
+   * @return EquipmentAttribute 设备属性列表
+   */
+  public List<EquipmentAttribute> getAll() {
+    return this.equipmentAttributeRepository.findAll();
+  }
 
-	/**
-	 * 查所有的设备属性
-	 *
-	 * @return EquipmentAttribute 设备属性列表
-	 */
-	public List<EquipmentAttribute> getAll() {
-		return this.equipmentAttributeRepository.findAll();
-	}
 
-	/**
-	 *  分页查询
-	 */
-	public Page getAllByPage(Integer page, Integer size) {
-		Pageable pageable = PageRequest.of(page - 1, size);
-		Page equipmentAttributePage = equipmentAttributeRepository.findAll(pageable);
-		return equipmentAttributePage;
-	}
+  /**
+   * 获取某类设备的状态数据描述属性
+   * 查询设备属性by设备类型
+   * 分页
+   *
+   * @param equipmentType 设备类型
+   * @return EquipmentAttribute 设备属性
+   */
+  public Page<EquipmentAttribute> findByEquipmentType(String equipmentType, Integer page, Integer size) {
+    Pageable pageable = PageRequest.of(page - 1, size);
+    EquipmentTypeEnum equipmentTypeEnum = EquipmentTypeEnum.valueOf(equipmentType);
+    return equipmentAttributeRepository.findAllByEquipmentType(equipmentTypeEnum, pageable);
+  }
 
-	/**
-	 * 获取某类设备的状态数据描述属性
-	 * 查询设备属性by设备类型
-	 * 分页
-	 *
-	 * @param equipmentType 设备类型
-	 * @return EquipmentAttribute 设备属性
-	 */
-	public Page<EquipmentAttribute> findByEquipmentType(String equipmentType, Integer page, Integer size) {
-		Pageable pageable = PageRequest.of(page - 1, size);
-		EquipmentTypeEnum equipmentTypeEnum = EquipmentTypeEnum.valueOf(equipmentType);
-		Page<EquipmentAttribute> equipmentAttributePage = equipmentAttributeRepository.findAllByEquipmentType(equipmentTypeEnum, pageable);
-		return equipmentAttributePage;
-	}
 
+  /**
+   * 删除
+   */
+  public void delete(Integer id) throws BusinessException {
+    if (StringUtils.isEmpty(id)) {
+      throw new BusinessException("设备属性id不能为空!");
+    } else {
+      equipmentAttributeRepository.deleteById(id);
+    }
+  }
 
-	/**
-	 * 删除
-	 * */
-	public void delete(Integer id) throws BusinessException {
-		if (StringUtils.isEmpty(id)) {
-			throw new BusinessException("设备属性id不能为空!");
-		} else {
-			equipmentAttributeRepository.deleteById(id);
-		}
-	}
-
-	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-	public void saveCloud(List<EquipmentAttribute> beans) {
-		equipmentAttributeRepository.deleteAll();
-		equipmentAttributeRepository.saveAll(beans);
-	}
+  @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+  public void saveCloud(List<EquipmentAttribute> beans) {
+    equipmentAttributeRepository.deleteAll();
+    equipmentAttributeRepository.saveAll(beans);
+  }
 }