添加设备aname

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/ProEconWtPowerCurveFitting.java

@@ -2,8 +2,10 @@ package com.gyee.runeconomy.model.auto;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -47,5 +49,11 @@ public class ProEconWtPowerCurveFitting extends Model {
      */
     private Double optimalPower;
 
+    /**
+     * 风机名称
+     */
+    @TableField(exist = false)
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+    private String nemCode;
 
 }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/PerformanceCurvefittingService.java

@@ -54,6 +54,7 @@ public class PerformanceCurvefittingService {
                 speeds.stream().forEach(speed -> {
                     CurveVo vo = new CurveVo();
                     vo.setWtid(windturbineIds);
+                    vo.setNemCode(wtmap.get(windturbineIds).getAname());
                     vo.setSpeed(speed);
                     vo.setTheorypower(DoubleUtils.keepPrecision(zsglmap.get(speed), 2));
                     vo.setEnsurepower(DoubleUtils.keepPrecision(bzglmap.containsKey(speed) ? bzglmap.get(speed).getEnsurePower() : zsglmap.get(speed), 2));

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconWtPowerCurveFittingServiceImpl.java

@@ -3,6 +3,7 @@ package com.gyee.runeconomy.service.auto.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
+import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.mapper.auto.ProEconWtPowerCurveFittingMapper;
 import com.gyee.runeconomy.model.auto.ProEconWtPowerCurveFitting;
 import com.gyee.runeconomy.service.auto.IProEconWtPowerCurveFittingService;
@@ -49,6 +50,9 @@ public class ProEconWtPowerCurveFittingServiceImpl extends ServiceImpl<ProEconWt
 
         qw.lambda().orderByAsc(ProEconWtPowerCurveFitting::getSpeed);
         List<ProEconWtPowerCurveFitting> list = baseMapper.selectList(qw);
+        list.stream().forEach(i->{
+            i.setNemCode(CacheContext.wtmap.get(i.getWindturbineId()).getAname());
+        });
         Map<String, List<ProEconWtPowerCurveFitting>> map =  list.stream().collect(Collectors.groupingBy(ProEconWtPowerCurveFitting::getWindturbineId));
         return map;
     }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/performacompare/EquipmentPerformaCompareService.java

@@ -5,6 +5,7 @@ import com.gyee.common.util.ClassUtil;
 import com.gyee.common.vo.benchmark.DjhxdbInitVo;
 import com.gyee.common.vo.benchmark.DjhxdbtopVo;
 import com.gyee.common.vo.benchmark.FzyVo;
+import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProEconWtAlysisDay;
 import com.gyee.runeconomy.model.auto.ProEconWtPowerCurveFitting;
 import com.gyee.runeconomy.model.auto.ProEconWtwindDayInfo;
@@ -472,6 +473,7 @@ public class EquipmentPerformaCompareService {
         list.stream().forEach(i->{
             DjhxdbtopVo vo = new DjhxdbtopVo();
             vo.setWtid(i.getWindturbineId());
+            vo.setNemCode(CacheContext.wtmap.get(i.getWindturbineId()).getAname());
             Optional<ProEconWtwindDayInfo> first = fzyList.stream().filter(fzy -> fzy.getWindturbineId().equals(i.getWindturbineId())).findFirst();
             List<FzyVo> vos = getFzyVos(first,type);
             switch (type){