equipment_model、powerCache

universal-computing-platform/src/main/java/com/ruoyi/ucp/entity/EquipmentModel.java

@@ -3,7 +3,6 @@ package com.ruoyi.ucp.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * <p>
@@ -36,7 +35,7 @@ public class EquipmentModel implements Serializable {
     /**
      * 容量
      */
-    private BigDecimal powerProduction;
+    private Double powerProduction;
 
     /**
      * 厂商编号
@@ -46,17 +45,17 @@ public class EquipmentModel implements Serializable {
     /**
      * 切入风速
      */
-    private BigDecimal cutinwindSpeed;
+    private Double cutinwindSpeed;
 
     /**
      * 额定风速
      */
-    private BigDecimal ratedwindSpeed;
+    private Double ratedwindSpeed;
 
     /**
      * 切出风速
      */
-    private BigDecimal cutoutwindSpeed;
+    private Double cutoutwindSpeed;
 
     public String getId() {
         return id;
@@ -82,11 +81,11 @@ public class EquipmentModel implements Serializable {
         this.description = description;
     }
 
-    public BigDecimal getPowerProduction() {
+    public Double getPowerProduction() {
         return powerProduction;
     }
 
-    public void setPowerProduction(BigDecimal powerProduction) {
+    public void setPowerProduction(Double powerProduction) {
         this.powerProduction = powerProduction;
     }
 
@@ -98,27 +97,27 @@ public class EquipmentModel implements Serializable {
         this.manufacturer = manufacturer;
     }
 
-    public BigDecimal getCutinwindSpeed() {
+    public Double getCutinwindSpeed() {
         return cutinwindSpeed;
     }
 
-    public void setCutinwindSpeed(BigDecimal cutinwindSpeed) {
+    public void setCutinwindSpeed(Double cutinwindSpeed) {
         this.cutinwindSpeed = cutinwindSpeed;
     }
 
-    public BigDecimal getRatedwindSpeed() {
+    public Double getRatedwindSpeed() {
         return ratedwindSpeed;
     }
 
-    public void setRatedwindSpeed(BigDecimal ratedwindSpeed) {
+    public void setRatedwindSpeed(Double ratedwindSpeed) {
         this.ratedwindSpeed = ratedwindSpeed;
     }
 
-    public BigDecimal getCutoutwindSpeed() {
+    public Double getCutoutwindSpeed() {
         return cutoutwindSpeed;
     }
 
-    public void setCutoutwindSpeed(BigDecimal cutoutwindSpeed) {
+    public void setCutoutwindSpeed(Double cutoutwindSpeed) {
         this.cutoutwindSpeed = cutoutwindSpeed;
     }
 

universal-computing-platform/src/main/java/com/ruoyi/ucp/feign/AdapterApi.java

@@ -28,8 +28,7 @@ public interface AdapterApi {
     @GetMapping("/history/raw")
     List<PointData> getHistoryRaw(URI baseUri, @RequestParam("tagName") String tagName,
                                   @RequestParam("startTs") long startTs,
-                                  @RequestParam("endTs") long endTs,
-                                  @RequestParam("interval") int interval);
+                                  @RequestParam("endTs") long endTs);
 
     @GetMapping("/history/stat2")
     DoubleStatData getHistoryStat(URI baseUri, @RequestParam("tagName") String tagName,

universal-computing-platform/src/main/java/com/ruoyi/ucp/service/IEquipmentModelService.java

@@ -3,6 +3,9 @@ package com.ruoyi.ucp.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.ucp.entity.EquipmentModel;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -12,5 +15,5 @@ import com.ruoyi.ucp.entity.EquipmentModel;
  * @since 2024-05-20
  */
 public interface IEquipmentModelService extends IService<EquipmentModel> {
-
+    Map<String,EquipmentModel> map();
 }

universal-computing-platform/src/main/java/com/ruoyi/ucp/service/impl/EquipmentModelServiceImpl.java

@@ -1,11 +1,19 @@
 package com.ruoyi.ucp.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.ucp.entity.EquipmentModel;
 import com.ruoyi.ucp.mapper.EquipmentModelMapper;
 import com.ruoyi.ucp.service.IEquipmentModelService;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +25,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class EquipmentModelServiceImpl extends ServiceImpl<EquipmentModelMapper, EquipmentModel> implements IEquipmentModelService {
 
+    @Cacheable("equipment_model_map")
+    public Map<String,EquipmentModel> map() {
+        List<EquipmentModel> models = baseMapper.selectList(Wrappers.emptyWrapper());
+        return models.stream().collect(Collectors.toMap(EquipmentModel::getId, Function.identity()));
+    }
 }

universal-computing-platform/src/main/java/com/ruoyi/ucp/service/impl/StateAiServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.List;
  * @since 2024-05-16
  */
 @Service
-@DataSource(DataSourceType.TAOS)
+//@DataSource(DataSourceType.SLAVE)
 public class StateAiServiceImpl extends ServiceImpl<StateAiMapper, StateAi> implements IStateAiService {
     @Override
     @Cacheable("stateailist")

universal-computing-platform/src/main/java/com/ruoyi/ucp/util/CalcCache.java

@@ -2,6 +2,7 @@ package com.ruoyi.ucp.util;
 
 import com.ruoyi.ucp.entity.ProEconWtCurveFittingMonth;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -10,4 +11,5 @@ public class CalcCache {
      * 场站月拟合功率曲线,风机-风速-功率
      */
     public static Map<String, Map<Double, Double>> wtMcfMap= new ConcurrentHashMap<>();
+    public static Map<String, Double> powerCache = new HashMap<>();
 }