代码修改

power-fitting-JN/src/main/java/com.gyee.power.fitting/common/spring/CacheContext.java

@@ -59,6 +59,7 @@ public class CacheContext implements CommandLineRunner {
     public static List<ProBasicPowerstation> wplsG = new ArrayList<>(); //光电集合
     public static List<ProBasicPowerstation> zwpls = new ArrayList<>();
 
+    public static Map<String, List<ProBasicPowerstation>> rgwpmap = new HashMap<>();
     public static Map<String, List<ProBasicPowerstation>> cpwpmap = new HashMap<>();
     public static Map<String, List<ProBasicPowerstation>> wpmapls = new HashMap<>();
     public static Map<String, ProBasicPowerstation> wpmap = new HashMap<>();
@@ -129,6 +130,17 @@ public class CacheContext implements CommandLineRunner {
             }
         }
 
+
+        for (ProBasicPowerstation wp : wpls) {
+            if (rgwpmap.containsKey(wp.getRegionId())) {
+                rgwpmap.get(wp.getRegionId()).add(wp);
+            } else {
+                List<ProBasicPowerstation> wps = new ArrayList<>();
+                wps.add(wp);
+                rgwpmap.put(wp.getRegionId(), wps);
+            }
+        }
+
         QueryWrapper<ProBasicEquipment> queryWtWrapper = new QueryWrapper<>();
         queryWtWrapper.orderByAsc("order_num");
         wtls = proBasicEquipmentService.list(queryWtWrapper).stream().filter(i -> i.getIsable() == 1).collect(Collectors.toList());

power-fitting-JN/src/main/java/com.gyee.power.fitting/common/spring/InitialRunner.java

@@ -31,22 +31,10 @@ public class InitialRunner implements CommandLineRunner {
 
     @Resource
     GyeeConfig config;
-    @Resource
-    private WindturbineService windturbineService;
 
-    @Resource
-    private WindpowerstationService windpowerstationService;
-    @Resource
-    private Windturbinetestingpointai2Service pointService;
 
     @Resource
     private ProBasicEquipmentPointService pointService1;
-    @Resource
-    private EquipmentmodelService equipmentmodelService;
-    @Resource
-    private ModelpowerdetailsService modelpowerdetailsService;
-    @Resource
-    private PowermodelService powermodelService;
 
     @Resource
     private ProEconPowerModelService proEconPowerModelService;
@@ -54,75 +42,9 @@ public class InitialRunner implements CommandLineRunner {
     @Resource
     private NewIvPvCurveFittingService ipcfService;
 
-
-    /**
-     * 场站所有信息
-     **/
-    public static List<Windpowerstation> wpList = new ArrayList<>();
-
-
-    /**
-     * <MHS_FDC, 麻黄山风电场>
-     **/
-    public static Map<String, String> stationMap = new HashMap<>();
-
-    /**
-     * 所有的风机
-     **/
-    public static List<Windturbine> wtList = new ArrayList<>();
-    /**
-     * key：wtId NG01_01
-     **/
-    public static Map<String, Windturbine> wtMap = new HashMap<>();
-
-
-    /**场站的风机  key：NSS_FDC**/
-    public static Map<String, List<Windturbine>> wpMap = new HashMap<>();
-
-    /**
-     * 光伏
-     */
-    public static List<Windpowerstation> gfwpList = new ArrayList<>();
-    public static Map<String, String> gfstationMap = new HashMap<>();
-    public static List<Windturbine> gfwtList = new ArrayList<>();
-    public static Map<String, Windturbine> gfwtMap = new HashMap<>();
-    public static Map<String, List<Windturbine>> gfwpMap = new HashMap<>();
-    /**
-     * 光照强度-场站
-     */
-    public static Map<String, Windpowerstationtestingpoint2> zfsMap = new HashMap<>();
-    /**
-     * 组件温度-场站
-     */
-    public static Map<String, Windpowerstationtestingpoint2> zjwdMap = new HashMap<>();
-    /**
-     * 功率-场站
-     */
-    public static Map<String, List<Windturbinetestingpointai2>> zglMap = new HashMap<>();
-    /**
-     * 所有设备型号
-     **/
-    public static List<Equipmentmodel> equipmentList = new ArrayList<>();
-
-    /**
-     * key: NG01_01
-     **/
-    public static Map<String, List<Windturbinetestingpointai2>> pointMap = new HashMap<>();
-    @Resource
-    private IWindpowerstationtestingpoint2Service windpowerstationtestingpoint2Service;
-    public static Map<String, Equipmentmodel> equipmentMap = new HashMap<>();
-    /**
-     * key: model  UP82
-     **/
-    public static Map<String, List<Modelpowerdetails>> modelPowerDetailMap = new HashMap<>();
-    /** key: NG01_01, speed, power**/
-    public static Map<String, Map<Double, Double>> zsllglMap = new HashMap<>();
-
     public static Map<String, AgcDeviateConfig> powerPreMap = new HashMap<>();
 
 
-
-
     //--------------------------------------new-------------------------------------------
 
 
@@ -176,18 +98,6 @@ public class InitialRunner implements CommandLineRunner {
     public static Map<String, ProBasicEquipment> gfwtNewMap = new HashMap<>();
     public static Map<String, List<ProBasicEquipment>> gfwpNewMap = new HashMap<>();
     /**
-     * 光照强度-场站
-     */
-    public static Map<String, ProBasicPowerstationPoint> zfsNewMap = new HashMap<>();
-    /**
-     * 组件温度-场站
-     */
-    public static Map<String, ProBasicPowerstationPoint> zjwdNewMap = new HashMap<>();
-    /**
-     * 功率-场站
-     */
-    public static Map<String, List<ProBasicEquipmentPoint>> zglNewMap = new HashMap<>();
-    /**
      * 所有设备型号
      **/
     public static List<ProEconEquipmentmodel> equipmentNewList = new ArrayList<>();
@@ -304,29 +214,6 @@ public class InitialRunner implements CommandLineRunner {
         log.info("场站数据缓存完成");
     }
 
-    public void cacheStation() {
-        List<Windpowerstation> stations = windpowerstationService.selectList();
-        wpList = stations.stream().filter(f -> f.getId().contains("FDC")).collect(Collectors.toList());
-        gfwpList = stations.stream().filter(f -> f.getId().contains("GDC")).collect(Collectors.toList());
-        wpList.forEach(obj -> {
-            List<Windturbine> wts = windturbineService.selectList(obj.getId());
-            stationMap.put(obj.getId(), obj.getName());
-            wpMap.put(obj.getId(), wts);
-            wtList.addAll(wts);
-
-            wts.forEach(u -> wtMap.put(u.getId(), u));
-        });
-        gfwpList.stream().forEach(obj -> {
-            List<Windturbine> wts = windturbineService.selectList(obj.getId());
-            gfstationMap.put(obj.getId(), obj.getName());
-            gfwpMap.put(obj.getId(), wts);
-            gfwtList.addAll(wts);
-
-            wts.stream().forEach(u -> gfwtMap.put(u.getId(), u));
-        });
-        log.info("场站数据缓存完成");
-    }
-
 
     /**
      * 缓存场站、风机数据
@@ -371,19 +258,6 @@ public class InitialRunner implements CommandLineRunner {
         newllglMap = llglPoints.stream().collect(Collectors.groupingBy(ProBasicEquipmentPoint::getWindpowerstationId));
     }
 
-    /**
-     * 缓存测点数据
-     */
-    private void cachePoints() {
-        List<Windturbinetestingpointai2> list = new ArrayList<>();
-        wpList.stream().forEach(d -> list.addAll(pointService.selectList(d.getId(), config.getPoints())));
-        pointMap.putAll(list.stream().collect(Collectors.groupingBy(u -> u.getWindturbineid())));
-        log.info("cachePoints: " + pointMap.size());
-        if (pointMap.size() == 0)
-            log.error("cachePoints", "测点数据缓存失败");
-    }
-
-
 
     /**
      * 缓存测点数据
@@ -397,15 +271,6 @@ public class InitialRunner implements CommandLineRunner {
             log.error("cachePoints", "测点数据缓存失败");
     }
 
-    /**
-     * 缓存设备型号
-     */
-    private void cacheEquipment() {
-        equipmentList.addAll(equipmentmodelService.selectList());
-        for (Equipmentmodel eq : equipmentList)
-            equipmentMap.put(eq.getId(), eq);
-        log.info("设备型号数据缓存完成");
-    }
 
     /**
      * 缓存设备型号
@@ -418,12 +283,6 @@ public class InitialRunner implements CommandLineRunner {
     }
 
 
-    private void cacheModelPower() {
-        List<Modelpowerdetails> lsMPD = modelpowerdetailsService.selectList();
-        modelPowerDetailMap.putAll(lsMPD.stream().collect(Collectors.groupingBy(u -> u.getModelid())));
-        log.info("保证功率数据缓存完成");
-    }
-
     private void cacheNewModelPower() {
         List<ProBasicModelPower> lsMPD = proBasicModelPowerService.list();
         modelPowerDetailNewMap.putAll(lsMPD.stream().collect(Collectors.groupingBy(u -> u.getModelId())));

power-fitting-JN/src/main/java/com.gyee.power.fitting/controller/base/CurveFittingController.java

@@ -1,7 +1,6 @@
 package com.gyee.power.fitting.controller.base;
 
 import com.gyee.power.fitting.common.feign.IAdapterService;
-import com.gyee.power.fitting.service.Windturbinetestingpointai2Service;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -10,14 +9,14 @@ import javax.annotation.Resource;
 
 @RestController("curvefitting")
 public class CurveFittingController {
-    @Resource
-    private Windturbinetestingpointai2Service windturbinetestingpointai2Service;
-    @Resource
-    private IAdapterService iAdapterService;
-
-    @GetMapping("/")
-    private void get(@RequestParam("wtid") String wtid){
-        wtid = "HZJ01_01";
-        windturbinetestingpointai2Service.getZlTag(wtid);
-    }
+//    @Resource
+//    private Windturbinetestingpointai2Service windturbinetestingpointai2Service;
+//    @Resource
+//    private IAdapterService iAdapterService;
+//
+//    @GetMapping("/")
+//    private void get(@RequestParam("wtid") String wtid){
+//        wtid = "HZJ01_01";
+//        windturbinetestingpointai2Service.getZlTag(wtid);
+//    }
 }

power-fitting-JN/src/main/java/com.gyee.power.fitting/controller/base/WindInfoController.java

@@ -6,15 +6,19 @@ import com.gyee.power.fitting.common.result.ResultCode;
 import com.gyee.power.fitting.common.spring.InitialRunner;
 import com.gyee.power.fitting.model.*;
 import com.gyee.power.fitting.service.ProEconPowerFittingAnalySisService;
+import com.gyee.power.fitting.service.auth.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 场站风机等基础数据
@@ -28,9 +32,18 @@ public class WindInfoController {
     @Autowired
     private ProEconPowerFittingAnalySisService powerService;
 
+    @Resource
+    private TokenService tokenService;
+
+    @Autowired
+    private HttpServletRequest request;
+
+
     @GetMapping("station")
     public JSONObject getStation() {
-        List<ProBasicPowerstation> list = InitialRunner.wpNewList;
+//        List<ProBasicPowerstation> list = InitialRunner.wpNewList;
+        List<ProBasicPowerstation> list = tokenService.getWpls(request);
+        list = list.stream().filter(f -> f.getId().contains("FDC")).collect(Collectors.toList());
         return JsonResult.successData(ResultCode.SUCCESS, list);
     }
 
@@ -42,7 +55,10 @@ public class WindInfoController {
 
     @GetMapping("/gfstation")
     public JSONObject getGFStation() {
-        List<ProBasicPowerstation> list = InitialRunner.gfwpNewList;
+
+        List<ProBasicPowerstation> list = tokenService.getWpls(request);
+        list = list.stream().filter(f -> f.getId().contains("GDC")).collect(Collectors.toList());
+//        List<ProBasicPowerstation> list = InitialRunner.gfwpNewList;
         return JsonResult.successData(ResultCode.SUCCESS, list);
     }
 

power-fitting-JN/src/main/java/com.gyee.power.fitting/mapper/WindpowerstationMapper.java

@@ -1,19 +0,0 @@
-package com.gyee.power.fitting.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.power.fitting.model.Windpowerstation;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author chenmh
- * @since 2022-11-01
- */
-@Mapper
-public interface WindpowerstationMapper extends BaseMapper<Windpowerstation> {
-
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/mapper/Windpowerstationtestingpoint2Mapper.java

@@ -1,18 +0,0 @@
-package com.gyee.power.fitting.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.power.fitting.model.Windpowerstationtestingpoint2;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author gfhd
- * @since 2022-12-13
- */
-@Mapper
-public interface Windpowerstationtestingpoint2Mapper extends BaseMapper<Windpowerstationtestingpoint2> {
-
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/mapper/WindturbineMapper.java

@@ -1,19 +0,0 @@
-package com.gyee.power.fitting.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.power.fitting.model.Windturbine;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author chenmh
- * @since 2022-11-01
- */
-@Mapper
-public interface WindturbineMapper extends BaseMapper<Windturbine> {
-
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/mapper/Windturbinetestingpointai2Mapper.java

@@ -1,18 +0,0 @@
-package com.gyee.power.fitting.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.power.fitting.model.Windturbinetestingpointai2;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author chenmh
- * @since 2022-11-01
- */
-@Mapper
-public interface Windturbinetestingpointai2Mapper extends BaseMapper<Windturbinetestingpointai2> {
-
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/model/Windpowerstation.java

@@ -1,97 +0,0 @@
-package com.gyee.power.fitting.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author chenmh
- * @since 2022-11-01
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("WINDPOWERSTATION")
-public class Windpowerstation extends Model<Windpowerstation> {
-
-    private static final long serialVersionUID=1L;
-
-      @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("ADDRESS")
-    private String address;
-
-    @TableField("TELEPHONE")
-    private String telephone;
-
-    @TableField("CAPACITY")
-    private String capacity;
-
-    @TableField("CAPACITYUNIT")
-    private String capacityunit;
-
-    @TableField("QUANTITY")
-    private String quantity;
-
-    @TableField("ANAME")
-    private String aname;
-
-    @TableField("LONGITUDE")
-    private String longitude;
-
-    @TableField("LATITUDE")
-    private String latitude;
-
-    @TableField("PHOTO")
-    private String photo;
-
-    @TableField("COMPANYID")
-    private String companyid;
-
-    @TableField("SYSTEMMANUFACT")
-    private String systemmanufact;
-
-    @TableField("HEADFARM")
-    private String headfarm;
-
-    @TableField("HEADFARMPHONE")
-    private String headfarmphone;
-
-    @TableField("MODEL")
-    private String model;
-
-    @TableField("ORDERNUM")
-    private String ordernum;
-
-    @TableField("ALTITUDE")
-    private String altitude;
-
-    @TableField("HEIGHT")
-    private String height;
-
-//    @TableField("AQTS")
-//    private Date aqts;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/model/Windpowerstationtestingpoint2.java

@@ -1,199 +0,0 @@
-package com.gyee.power.fitting.model;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author gfhd
- * @since 2022-12-13
- */
-public class Windpowerstationtestingpoint2 implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String code;
-
-    private String name;
-
-    private String model;
-
-    private String valueunit;
-
-    private String englishname;
-
-    private String typeid;
-
-    private String modelid;
-
-    private BigDecimal maxval;
-
-    private BigDecimal minval;
-
-    private BigDecimal reasonablemaxval;
-
-    private BigDecimal reasonableminval;
-
-    private String uniformcode;
-
-    private String shortid;
-
-    private String longid;
-
-    private String windpowerstationid;
-
-    private String realtimeid;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getModel() {
-        return model;
-    }
-
-    public void setModel(String model) {
-        this.model = model;
-    }
-
-    public String getValueunit() {
-        return valueunit;
-    }
-
-    public void setValueunit(String valueunit) {
-        this.valueunit = valueunit;
-    }
-
-    public String getEnglishname() {
-        return englishname;
-    }
-
-    public void setEnglishname(String englishname) {
-        this.englishname = englishname;
-    }
-
-    public String getTypeid() {
-        return typeid;
-    }
-
-    public void setTypeid(String typeid) {
-        this.typeid = typeid;
-    }
-
-    public String getModelid() {
-        return modelid;
-    }
-
-    public void setModelid(String modelid) {
-        this.modelid = modelid;
-    }
-
-    public BigDecimal getMaxval() {
-        return maxval;
-    }
-
-    public void setMaxval(BigDecimal maxval) {
-        this.maxval = maxval;
-    }
-
-    public BigDecimal getMinval() {
-        return minval;
-    }
-
-    public void setMinval(BigDecimal minval) {
-        this.minval = minval;
-    }
-
-    public BigDecimal getReasonablemaxval() {
-        return reasonablemaxval;
-    }
-
-    public void setReasonablemaxval(BigDecimal reasonablemaxval) {
-        this.reasonablemaxval = reasonablemaxval;
-    }
-
-    public BigDecimal getReasonableminval() {
-        return reasonableminval;
-    }
-
-    public void setReasonableminval(BigDecimal reasonableminval) {
-        this.reasonableminval = reasonableminval;
-    }
-
-    public String getUniformcode() {
-        return uniformcode;
-    }
-
-    public void setUniformcode(String uniformcode) {
-        this.uniformcode = uniformcode;
-    }
-
-    public String getShortid() {
-        return shortid;
-    }
-
-    public void setShortid(String shortid) {
-        this.shortid = shortid;
-    }
-
-    public String getLongid() {
-        return longid;
-    }
-
-    public void setLongid(String longid) {
-        this.longid = longid;
-    }
-
-    public String getWindpowerstationid() {
-        return windpowerstationid;
-    }
-
-    public void setWindpowerstationid(String windpowerstationid) {
-        this.windpowerstationid = windpowerstationid;
-    }
-
-    public String getRealtimeid() {
-        return realtimeid;
-    }
-
-    public void setRealtimeid(String realtimeid) {
-        this.realtimeid = realtimeid;
-    }
-
-    @Override
-    public String toString() {
-        return "Windpowerstationtestingpoint2{" +
-            "code = " + code +
-            ", name = " + name +
-            ", model = " + model +
-            ", valueunit = " + valueunit +
-            ", englishname = " + englishname +
-            ", typeid = " + typeid +
-            ", modelid = " + modelid +
-            ", maxval = " + maxval +
-            ", minval = " + minval +
-            ", reasonablemaxval = " + reasonablemaxval +
-            ", reasonableminval = " + reasonableminval +
-            ", uniformcode = " + uniformcode +
-            ", shortid = " + shortid +
-            ", longid = " + longid +
-            ", windpowerstationid = " + windpowerstationid +
-            ", realtimeid = " + realtimeid +
-        "}";
-    }
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/model/Windturbine.java

@@ -1,73 +0,0 @@
-package com.gyee.power.fitting.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author chenmh
- * @since 2022-11-01
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("WINDTURBINE")
-public class Windturbine extends Model<Windturbine> {
-
-    private static final long serialVersionUID=1L;
-
-      @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("LONGITUDE")
-    private String longitude;
-
-    @TableField("LATITUDE")
-    private String latitude;
-
-    @TableField("MODELID")
-    private String modelid;
-
-    @TableField("STATUS")
-    private String status;
-
-    @TableField("PROJECTID")
-    private String projectid;
-
-    @TableField("LINEID")
-    private String lineid;
-
-    @TableField("FIRSTINTEGRATEDTIME")
-    private String firstintegratedtime;
-
-    @TableField("PHOTO")
-    private String photo;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("STANDARDID")
-    private String standardid;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/model/Windturbinetestingpointai2.java

@@ -1,86 +0,0 @@
-package com.gyee.power.fitting.model;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author chenmh
- * @since 2022-11-01
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("WINDTURBINETESTINGPOINTAI")
-public class Windturbinetestingpointai2 extends Model<Windturbinetestingpointai2> {
-
-    private static final long serialVersionUID=1L;
-
-      @TableId("ID")
-    private String id;
-
-    @TableField("CODE")
-    private String code;
-
-    @TableField("NAME")
-    private String name;
-
-    @TableField("MODEL")
-    private String model;
-
-    @TableField("VALUEUNIT")
-    private String valueunit;
-
-    @TableField("ENGLISHNAME")
-    private String englishname;
-
-    @TableField("TYPEID")
-    private String typeid;
-
-    @TableField("MODELID")
-    private String modelid;
-
-    @TableField("MAXVAL")
-    private String maxval;
-
-    @TableField("MINVAL")
-    private String minval;
-
-    @TableField("REASONABLEMAXVAL")
-    private String reasonablemaxval;
-
-    @TableField("REASONABLEMINVAL")
-    private String reasonableminval;
-
-    @TableField("WINDTURBINEID")
-    private String windturbineid;
-
-    @TableField("UNIFORMCODE")
-    private String uniformcode;
-
-    @TableField("SHORTID")
-    private String shortid;
-
-    @TableField("LONGID")
-    private String longid;
-
-    @TableField("WINDPOWERSTATIONID")
-    private String windpowerstationid;
-
-    @TableField("REALTIMEID")
-    private String realtimeid;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/IWindpowerstationtestingpoint2Service.java

@@ -1,21 +0,0 @@
-package com.gyee.power.fitting.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.power.fitting.model.Windpowerstationtestingpoint2;
-
-import java.util.List;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author gfhd
- * @since 2022-12-13
- */
-public interface IWindpowerstationtestingpoint2Service extends IService<Windpowerstationtestingpoint2> {
-
-    Windpowerstationtestingpoint2 getStationIllumination(String gdc);
-
-    List<Windpowerstationtestingpoint2> getPoints(String station, String uniformcode);
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/ProBasicEquipmentPointService.java

@@ -2,8 +2,6 @@ package com.gyee.power.fitting.service;
 
 import com.gyee.power.fitting.model.ProBasicEquipmentPoint;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.power.fitting.model.Windpowerstationtestingpoint2;
-import com.gyee.power.fitting.model.Windturbinetestingpointai2;
 
 import java.util.List;
 

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/ProBasicPowerstationPointService.java

@@ -23,4 +23,12 @@ public interface ProBasicPowerstationPointService extends IService<ProBasicPower
     List<ProBasicPowerstationPoint> getzjwdPoints(String station, String uniformcode);
     List<ProBasicPowerstationPoint> getzfsPoints(String station, String uniformcode);
 
+
+    List<ProBasicPowerstationPoint> selectList(String station, List<String> points);
+
+
+    List<ProBasicPowerstationPoint> getPoints(String station, String uniformcode);
+
+    List<ProBasicPowerstationPoint> getPoints(String station, String windturbineId, String uniformcode);
+
 }

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/ProBasicPowerstationService.java

@@ -2,7 +2,6 @@ package com.gyee.power.fitting.service;
 
 import com.gyee.power.fitting.model.ProBasicPowerstation;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.power.fitting.model.Windpowerstation;
 
 import java.util.List;
 

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/WindpowerstationService.java

@@ -1,25 +0,0 @@
-package com.gyee.power.fitting.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.power.fitting.model.Windpowerstation;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author chenmh
- * @since 2022-11-01
- */
-public interface WindpowerstationService extends IService<Windpowerstation> {
-
-
-    /**
-     * 查询所有的场站
-     * @return
-     */
-    List<Windpowerstation> selectList();
-
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/WindturbineService.java

@@ -1,24 +0,0 @@
-package com.gyee.power.fitting.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.power.fitting.model.Windturbine;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author chenmh
- * @since 2022-11-01
- */
-public interface WindturbineService extends IService<Windturbine> {
-
-    /**
-     * 查询所有的风机ID
-     * @return
-     */
-    List<Windturbine> selectList(String station);
-
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/Windturbinetestingpointai2Service.java

@@ -1,25 +0,0 @@
-package com.gyee.power.fitting.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.power.fitting.model.Windturbinetestingpointai2;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author chenmh
- * @since 2022-11-01
- */
-public interface Windturbinetestingpointai2Service extends IService<Windturbinetestingpointai2> {
-
-    List<Windturbinetestingpointai2> selectList(String station, List<String> points);
-
-    void getZlTag(String wtid);
-
-    List<Windturbinetestingpointai2> getFaultCodes();
-
-    List<Windturbinetestingpointai2> getPoints(String station, String windturbine, String uniformcode);
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/auth/TokenService.java

@@ -121,6 +121,16 @@ public class TokenService {
                             wplist.add(newWp);
                         }
 
+                    }else if (CacheContext.rgwpmap.containsKey(depId)) {
+                        List<ProBasicPowerstation> rgcpls = CacheContext.rgwpmap.get(depId);
+                        for (ProBasicPowerstation cp : rgcpls) {
+                            List<ProBasicPowerstation> wpls = CacheContext.rgwpmap.get(cp.getId());
+                            for (ProBasicPowerstation wp : wpls) {
+                                ProBasicPowerstation newWp = new ProBasicPowerstation();
+                                BeanUtil.copyProperties(wp, newWp);
+                                wplist.add(newWp);
+                            }
+                        }
                     }  else if (depId.equals("0")) {
                         List<ProBasicPowerstation> wpls = CacheContext.wpls;
                         for (ProBasicPowerstation wp : wpls) {

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/IvPvCurveFittingService.java

@@ -16,9 +16,8 @@ import com.gyee.power.fitting.model.custom.FjjxbVo;
 import com.gyee.power.fitting.model.custom.PhotovoltaicInfo;
 import com.gyee.power.fitting.model.custom.TableTitle;
 import com.gyee.power.fitting.model.custom.TsDoubleData;
-import com.gyee.power.fitting.service.IWindpowerstationtestingpoint2Service;
 import com.gyee.power.fitting.service.ProBasicEquipmentPointService;
-import com.gyee.power.fitting.service.Windturbinetestingpointai2Service;
+import com.gyee.power.fitting.service.ProBasicPowerstationPointService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.math3.fitting.WeightedObservedPoints;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,9 +36,8 @@ import java.util.stream.Collectors;
 public class IvPvCurveFittingService {
 
     @Resource
-    private IWindpowerstationtestingpoint2Service stationPointService;
-    @Resource
-    private Windturbinetestingpointai2Service windPointService;
+    private ProBasicPowerstationPointService stationPointService;
+
 //    @Resource
 //    private IAdapterService adpClient;
 
@@ -59,6 +57,7 @@ public class IvPvCurveFittingService {
     @Resource
     private ProBasicEquipmentPointService proBasicEquipmentPointService;
 
+
     @Resource
     private ProBasicWeatherStationServiceImpl weatherStationService;
 
@@ -435,21 +434,21 @@ public class IvPvCurveFittingService {
         Map<String, PhotovoltaicInfo> bzcldMap = bzclds.stream().collect(Collectors.toMap(PhotovoltaicInfo::getInverter, Function.identity()));
 
         //获取实际发电量
-        List<Windpowerstationtestingpoint2> rfdl = stationPointService.getPoints(null, "RFDL");
+        List<ProBasicPowerstationPoint> rfdl = stationPointService.getPoints(null, "RFDL");
         List<FjjxbVo> infos = new ArrayList<>();
         //遍历逆变器
-        for (Windpowerstationtestingpoint2 wstp : rfdl) {
+        for (ProBasicPowerstationPoint wstp : rfdl) {
             //场站
-            String stationid = wstp.getWindpowerstationid();
+            String stationid = wstp.getWindpowerstationId();
 
-            List<TsDoubleData> history = remoteService.adaptergf().getHistorySnap(wstp.getCode(), startdate + oneday * 1000, enddate, oneday);
+            List<TsDoubleData> history = remoteService.adaptergf().getHistorySnap(wstp.getNemCode(), startdate + oneday * 1000, enddate, oneday);
 
             double d = 0;
             for (TsDoubleData data : history) {
                 d += data.getDoubleValue();
             }
             FjjxbVo vo = new FjjxbVo();
-            vo.setName(InitialRunner.gfstationMap.get(stationid));
+            vo.setName(InitialRunner.newgfstationMap.get(stationid));
             vo.setSjfdl(d);
 
             //理论发电量

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/IvPvCurveFittingService2.java

@@ -17,10 +17,8 @@ import com.gyee.power.fitting.model.custom.FjjxbVo;
 import com.gyee.power.fitting.model.custom.PhotovoltaicInfo;
 import com.gyee.power.fitting.model.custom.TableTitle;
 import com.gyee.power.fitting.model.custom.TsDoubleData;
-import com.gyee.power.fitting.service.IWindpowerstationtestingpoint2Service;
 import com.gyee.power.fitting.service.ProBasicEquipmentPointService;
 import com.gyee.power.fitting.service.ProBasicPowerstationPointService;
-import com.gyee.power.fitting.service.Windturbinetestingpointai2Service;
 import com.gyee.power.fitting.service.custom.curve.DataScangfService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.math3.fitting.WeightedObservedPoints;
@@ -38,10 +36,6 @@ import java.util.stream.Collectors;
 @Service
 public class IvPvCurveFittingService2 {
 
-    @Resource
-    private IWindpowerstationtestingpoint2Service windpowerstationtestingpoint2Service;
-    @Resource
-    private Windturbinetestingpointai2Service windturbinetestingpointai2Service;
 
     @Resource
     private ProBasicWeatherStationServiceImpl weatherStationService;

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/NewIvPvCurveFittingService.java

@@ -17,10 +17,8 @@ import com.gyee.power.fitting.model.custom.FjjxbVo;
 import com.gyee.power.fitting.model.custom.PhotovoltaicInfo;
 import com.gyee.power.fitting.model.custom.TableTitle;
 import com.gyee.power.fitting.model.custom.TsDoubleData;
-import com.gyee.power.fitting.service.IWindpowerstationtestingpoint2Service;
 import com.gyee.power.fitting.service.ProBasicEquipmentPointService;
 import com.gyee.power.fitting.service.ProBasicPowerstationPointService;
-import com.gyee.power.fitting.service.Windturbinetestingpointai2Service;
 import com.gyee.power.fitting.service.custom.curve.DataScangfService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.math3.fitting.WeightedObservedPoints;
@@ -39,11 +37,6 @@ import java.util.stream.Collectors;
 public class NewIvPvCurveFittingService {
 
     @Resource
-    private IWindpowerstationtestingpoint2Service windpowerstationtestingpoint2Service;
-    @Resource
-    private Windturbinetestingpointai2Service windturbinetestingpointai2Service;
-
-    @Resource
     private ProBasicWeatherStationServiceImpl weatherStationService;
 
     @Resource

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/ProBasicEquipmentPointServiceImpl.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.power.fitting.common.base.ExcludeQueryWrapper;
 import com.gyee.power.fitting.model.ProBasicEquipmentPoint;
 import com.gyee.power.fitting.mapper.ProBasicEquipmentPointMapper;
-import com.gyee.power.fitting.model.Windpowerstationtestingpoint2;
-import com.gyee.power.fitting.model.Windturbinetestingpointai2;
 import com.gyee.power.fitting.service.ProBasicEquipmentPointService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/ProBasicPowerstationPointServiceImpl.java

@@ -1,6 +1,7 @@
 package com.gyee.power.fitting.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.power.fitting.common.base.ExcludeQueryWrapper;
 import com.gyee.power.fitting.model.ProBasicEquipmentPoint;
 import com.gyee.power.fitting.model.ProBasicPowerstationPoint;
 import com.gyee.power.fitting.mapper.ProBasicPowerstationPointMapper;
@@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -53,4 +55,32 @@ public class ProBasicPowerstationPointServiceImpl extends ServiceImpl<ProBasicPo
         wrapper.eq("uniform_code", uniformcode);
         return baseMapper.selectList(wrapper);
     }
+
+    @Override
+    public List<ProBasicPowerstationPoint> selectList(String station, List<String> points) {
+        List<ProBasicPowerstationPoint> list = new ArrayList();
+
+        ExcludeQueryWrapper wrapper = new ExcludeQueryWrapper();
+        wrapper.eq("windpowerstation_id", station);
+        wrapper.in("UNIFORM_CODE", points);
+
+        try{
+            list = baseMapper.selectList(wrapper);
+        }catch (Exception e){
+            log.error("WindturbineServiceImpl--selectList", e);
+        }
+
+        return list;
+    }
+
+    @Override
+    public List<ProBasicPowerstationPoint> getPoints(String station, String uniformcode) {
+        return null;
+    }
+
+
+    @Override
+    public List<ProBasicPowerstationPoint> getPoints(String station, String windturbineId, String uniformcode) {
+        return null;
+    }
 }

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/ProBasicPowerstationServiceImpl.java

@@ -3,7 +3,6 @@ package com.gyee.power.fitting.service.impl;
 import com.gyee.power.fitting.common.base.ExcludeQueryWrapper;
 import com.gyee.power.fitting.model.ProBasicPowerstation;
 import com.gyee.power.fitting.mapper.ProBasicPowerstationMapper;
-import com.gyee.power.fitting.model.Windpowerstation;
 import com.gyee.power.fitting.service.ProBasicPowerstationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/WindpowerstationServiceImpl.java

@@ -1,40 +0,0 @@
-package com.gyee.power.fitting.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.power.fitting.common.base.ExcludeQueryWrapper;
-import com.gyee.power.fitting.mapper.WindpowerstationMapper;
-import com.gyee.power.fitting.model.Windpowerstation;
-import com.gyee.power.fitting.service.WindpowerstationService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author chenmh
- * @since 2022-11-01
- */
-@Slf4j
-@Service
-public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMapper, Windpowerstation> implements WindpowerstationService {
-
-    @Override
-    public List<Windpowerstation> selectList() {
-        List<Windpowerstation> list = new ArrayList();
-
-        ExcludeQueryWrapper wrapper = new ExcludeQueryWrapper();
-
-        try{
-            list = baseMapper.selectList(wrapper);
-        }catch (Exception e){
-            log.error("WindpowerstationServiceImpl--selectList", e);
-        }
-
-        return list;
-    }
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/Windpowerstationtestingpoint2ServiceImpl.java

@@ -1,45 +0,0 @@
-package com.gyee.power.fitting.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.power.fitting.mapper.Windpowerstationtestingpoint2Mapper;
-import com.gyee.power.fitting.model.Windpowerstationtestingpoint2;
-import com.gyee.power.fitting.service.IWindpowerstationtestingpoint2Service;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author gfhd
- * @since 2022-12-13
- */
-@Service
-public class Windpowerstationtestingpoint2ServiceImpl extends ServiceImpl<Windpowerstationtestingpoint2Mapper, Windpowerstationtestingpoint2> implements IWindpowerstationtestingpoint2Service {
-
-    @Override
-    public Windpowerstationtestingpoint2 getStationIllumination(String gdc) {
-        QueryWrapper<Windpowerstationtestingpoint2> wrapper = new QueryWrapper<>();
-        wrapper.eq("UNIFORMCODE", "SSFS").eq("WINDPOWERSTATIONID", gdc);
-        return baseMapper.selectList(wrapper).get(0);
-    }
-
-    @Override
-    public List<Windpowerstationtestingpoint2> getPoints(String station, String uniformcode) {
-        QueryWrapper<Windpowerstationtestingpoint2> wrapper = new QueryWrapper<>();
-        if ("GDC".equals(station)) {
-            wrapper.like("WINDPOWERSTATIONID", "_GDC");
-        } else if ("FDC".equals(station)) {
-            wrapper.like("WINDPOWERSTATIONID", "_FDC");
-        } else {
-            wrapper.eq(StringUtils.isNotEmpty(station), "WINDPOWERSTATIONID", station);
-        }
-
-        wrapper.eq("UNIFORMCODE", uniformcode);
-        return baseMapper.selectList(wrapper);
-    }
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/WindturbineServiceImpl.java

@@ -1,41 +0,0 @@
-package com.gyee.power.fitting.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.power.fitting.common.base.ExcludeQueryWrapper;
-import com.gyee.power.fitting.mapper.WindturbineMapper;
-import com.gyee.power.fitting.model.Windturbine;
-import com.gyee.power.fitting.service.WindturbineService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author chenmh
- * @since 2022-11-01
- */
-@Slf4j
-@Service
-public class WindturbineServiceImpl extends ServiceImpl<WindturbineMapper, Windturbine> implements WindturbineService {
-
-    @Override
-    public List<Windturbine> selectList(String station) {
-        List<Windturbine> list = new ArrayList();
-
-        ExcludeQueryWrapper wrapper = new ExcludeQueryWrapper();
-        wrapper.eq("WINDPOWERSTATIONID", station);
-
-        try{
-            list = baseMapper.selectList(wrapper);
-        }catch (Exception e){
-            log.error("WindturbineServiceImpl--selectList", e);
-        }
-
-        return list;
-    }
-}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/Windturbinetestingpointai2ServiceImpl.java

@@ -1,76 +0,0 @@
-package com.gyee.power.fitting.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gyee.power.fitting.common.base.ExcludeQueryWrapper;
-import com.gyee.power.fitting.mapper.Windturbinetestingpointai2Mapper;
-import com.gyee.power.fitting.model.Windturbinetestingpointai2;
-import com.gyee.power.fitting.service.Windturbinetestingpointai2Service;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author chenmh
- * @since 2022-11-01
- */
-@Service
-public class Windturbinetestingpointai2ServiceImpl extends ServiceImpl<Windturbinetestingpointai2Mapper, Windturbinetestingpointai2> implements Windturbinetestingpointai2Service {
-
-    private List<Windturbinetestingpointai2> faultCodes;
-
-    @Override
-    public List<Windturbinetestingpointai2> selectList(String station, List<String> points) {
-        List<Windturbinetestingpointai2> list = new ArrayList();
-
-        ExcludeQueryWrapper wrapper = new ExcludeQueryWrapper();
-        wrapper.eq("windpowerstationid", station);
-        wrapper.in("UNIFORMCODE", points);
-
-        try{
-            list = baseMapper.selectList(wrapper);
-        }catch (Exception e){
-            log.error("WindturbineServiceImpl--selectList", e);
-        }
-
-        return list;
-    }
-
-    @Override
-    public void getZlTag(String wtid) {
-        QueryWrapper<Windturbinetestingpointai2> wrapper = new QueryWrapper<>();
-    }
-
-    @Override
-    public List<Windturbinetestingpointai2> getFaultCodes() {
-        if (faultCodes == null) {
-            QueryWrapper<Windturbinetestingpointai2> wrapper = new QueryWrapper<>();
-            wrapper.eq("UNIFORMCODE", "AI0001").eq("WINDTURBINEID", "HZJ01_01");
-            faultCodes = baseMapper.selectList(wrapper);
-        }
-        return faultCodes;
-    }
-
-    @Override
-    @Cacheable("wtpoint")
-    public List<Windturbinetestingpointai2> getPoints(String station, String windturbine, String uniformcode) {
-        QueryWrapper<Windturbinetestingpointai2> wrapper = new QueryWrapper<>();
-        if ("GDC".equals(station)) {
-            wrapper.like("WINDPOWERSTATIONID", "_GDC");
-        } else if ("FDC".equals(station)) {
-            wrapper.like("WINDPOWERSTATIONID", "_FDC");
-        } else {
-            wrapper.eq(StringUtils.isNotEmpty(station), "WINDPOWERSTATIONID", station);
-        }
-        wrapper.eq(StringUtils.isNotEmpty(windturbine), "WINDTURBINEID", windturbine);
-        wrapper.eq("UNIFORMCODE", uniformcode).orderByAsc("WINDTURBINEID");
-        return baseMapper.selectList(wrapper);
-    }
-}