字段增加后修改

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/CommonController.java

@@ -3,13 +3,13 @@ package com.gyee.runeconomy.controller;/*
 @date   2023/3/28-15:47
 */
 
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicEquipmentPoint;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
 import com.gyee.runeconomy.util.DateUtils;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/OutputSpeedController.java

@@ -2,10 +2,10 @@ package com.gyee.runeconomy.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProEconInOrOutSpeedTotal;
 import com.gyee.runeconomy.service.outputspeed.OutputSpeedService;
 import io.swagger.annotations.Api;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/ProBasicEquipmentController.java

@@ -1,9 +1,9 @@
 package com.gyee.runeconomy.controller;
 
 
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.service.auto.IProBasicEquipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/SingleAnalysisController.java

@@ -1,10 +1,10 @@
 package com.gyee.runeconomy.controller;
 
 
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.vo.SingleAnalysisVo;
 import com.gyee.runeconomy.service.singleanalysis.SingleAnalysisService;
 import com.gyee.runeconomy.util.DateUtils;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/bmk/BenchmarkingController.java

@@ -3,6 +3,7 @@ package com.gyee.runeconomy.controller.bmk;/*
 @date   2022/11/23-13:16
 */
 
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.SortUtils;
@@ -11,7 +12,6 @@ import com.gyee.common.vo.benchmark.FjjxbmxVo;
 import com.gyee.common.vo.benchmark.WxsslVo;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
-import com.gyee.runeconomy.model.auto.*;
 import com.gyee.runeconomy.service.bmk.BenchmarkingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/goodness/WindturbineGoodnessDetailController.java

@@ -1,6 +1,7 @@
 package com.gyee.runeconomy.controller.goodness;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.vo.benchmark.ValueVo;
 import com.gyee.runeconomy.dto.DataVo;
@@ -8,7 +9,10 @@ import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
 import com.gyee.runeconomy.dto.SawVo;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.model.auto.ProBasicModelPowerRd;
+import com.gyee.runeconomy.model.auto.ProEconWtAlysisDay;
+import com.gyee.runeconomy.model.auto.ProEconWtCurveFittingMonth;
+import com.gyee.runeconomy.model.auto.ProEconWtwindDayInfo;
 import com.gyee.runeconomy.service.auto.IProEconWindturbineGoodnessService;
 import com.gyee.runeconomy.service.auto.IProEconWtAlysisDayService;
 import com.gyee.runeconomy.service.auto.IProEconWtCurveFittingMonthService;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/goodness/WindturbinegoodnessController.java

@@ -1,12 +1,12 @@
 package com.gyee.runeconomy.controller.goodness;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.vo.threerate.PvVo;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProEconWindturbineGoodness;
 import com.gyee.runeconomy.model.auto.ProEconWtAlysisDay;
 import com.gyee.runeconomy.service.WtAlysisDayService;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/monitor/LandformsController.java

@@ -3,10 +3,10 @@ package com.gyee.runeconomy.controller.monitor;/*
 @date   2023/5/10-16:06
 */
 
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.vo.LandformsVo;
 import com.gyee.runeconomy.service.monitor.LandformsService;
 import io.swagger.annotations.Api;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/update/TargetEnterController.java

@@ -3,10 +3,10 @@ package com.gyee.runeconomy.controller.update;/*
 @date   2023/5/16-9:54
 */
 
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProBasicUser;
 import com.gyee.runeconomy.model.auto.ProEconTargetdata;
 import com.gyee.runeconomy.service.update.TargetEnterService;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/init/CacheContext.java

@@ -3,6 +3,7 @@ package com.gyee.runeconomy.init;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.model.auto.*;
 import com.gyee.runeconomy.service.auto.*;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/mapper/auto/ProBasicOrganizeTreeMapper.java

@@ -1,7 +1,7 @@
 package com.gyee.runeconomy.mapper.auto;
 
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 
 /**
  * <p>

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/model/auto/ProBasicOrganizeTree.java

@@ -1,18 +1,18 @@
-package com.gyee.runeconomy.model.auto;
+package com.gyee.backconfig.model.auto;
 
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDate;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author wang
- * @since 2023-06-08
+ * @since 2023-06-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -63,37 +63,37 @@ public class ProBasicOrganizeTree extends Model {
     /**
      * 接入容量 mwp
      */
-    private BigDecimal jrCapacity;
+    private Double jrCapacity;
 
     /**
      * 接入容量-直流 mwp
      */
-    private BigDecimal jrCapacityZl;
+    private Double jrCapacityZl;
 
     /**
      * 接入容量-交流 mw
      */
-    private BigDecimal jrCapacityJl;
+    private Double jrCapacityJl;
 
     /**
      * 组串式-接入容量-直流
      */
-    private BigDecimal jrCapacityZcZl;
+    private Double jrCapacityZcZl;
 
     /**
      * 集中式-接入容量-直流
      */
-    private BigDecimal jrCapacityJzZl;
+    private Double jrCapacityJzZl;
 
     /**
      * 组串式-接入容量-交流
      */
-    private BigDecimal jrCapacityZcJl;
+    private Double jrCapacityZcJl;
 
     /**
      * 集中式-接入容量-交流
      */
-    private BigDecimal jrCapacityJzJl;
+    private Double jrCapacityJzJl;
 
     /**
      * 接入台数
@@ -163,7 +163,7 @@ public class ProBasicOrganizeTree extends Model {
     /**
      * 海拔
      */
-    private BigDecimal altitude;
+    private Double altitude;
 
     /**
      * 首次并网时间
@@ -193,17 +193,17 @@ public class ProBasicOrganizeTree extends Model {
     /**
      * 核准容量
      */
-    private BigDecimal appCapacity;
+    private Double appCapacity;
 
     /**
      * 在建容量
      */
-    private BigDecimal conCapacity;
+    private Double conCapacity;
 
     /**
      * 并网容量
      */
-    private BigDecimal gridCapacity;
+    private Double gridCapacity;
 
     /**
      * 设备类型：IN：逆变器，WT：风机，CB：箱变
@@ -248,7 +248,7 @@ public class ProBasicOrganizeTree extends Model {
     /**
      * 装机容量 mwp
      */
-    private BigDecimal zjCapacity;
+    private Double zjCapacity;
 
     /**
      * 装机数量
@@ -263,12 +263,12 @@ public class ProBasicOrganizeTree extends Model {
     /**
      * 安装角度
      */
-    private BigDecimal installAngle;
+    private Double installAngle;
 
     /**
      * 占地面积
      */
-    private BigDecimal installArea;
+    private Double installArea;
 
     /**
      * 并网方式
@@ -283,12 +283,72 @@ public class ProBasicOrganizeTree extends Model {
     /**
      * 装机容量-直流 mwp
      */
-    private BigDecimal zjCapacityZl;
+    private Double zjCapacityZl;
 
     /**
      * 装机容量-交流
      */
-    private BigDecimal zjCapacityJl;
+    private Double zjCapacityJl;
+
+    /**
+     * 风电接入容量
+     */
+    private Double jrWindCapacity;
+
+    /**
+     * 风电装机容量
+     */
+    private Double zjWindCapacity;
+
+    /**
+     * 风电接入台数
+     */
+    private Integer jrWindQuantity;
+
+    /**
+     * 风电装机台数
+     */
+    private Integer zjWindQuantity;
+
+    /**
+     * 风电接入容量陆地
+     */
+    private Double jrWindCapacityLd;
+
+    /**
+     * 风电接入容量海上
+     */
+    private Double jrWindCapacityHs;
+
+    /**
+     * 风电装机容量陆地
+     */
+    private Double zjWindCapacityLd;
+
+    /**
+     * 风电装机容量海上
+     */
+    private Double zjWindCapacityHs;
+
+    /**
+     * 风电接入台数陆地
+     */
+    private Integer jrWindQuantityLd;
+
+    /**
+     * 风电接入台数海上
+     */
+    private Integer jrWindQuantityHs;
+
+    /**
+     * 风电装机台数陆地
+     */
+    private Integer zjWindQuantityLd;
+
+    /**
+     * 风电装机台数海上
+     */
+    private Integer zjWindQuantityHs;
 
 
 }

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

@@ -2,13 +2,16 @@ package com.gyee.runeconomy.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.DoubleUtils;
 import com.gyee.common.util.SortUtils;
 import com.gyee.common.vo.curve.CurveVo;
 import com.gyee.runeconomy.dto.ZllglDTO;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.model.auto.ProEconWtCurveFitting;
+import com.gyee.runeconomy.model.auto.ProEconWtCurveFittingMonth;
+import com.gyee.runeconomy.model.auto.ProEconWtCurveFittingYear;
 import com.gyee.runeconomy.service.auto.IProEconWtCurveFittingMonthService;
 import com.gyee.runeconomy.service.auto.IProEconWtCurveFittingService;
 import com.gyee.runeconomy.service.auto.IProEconWtCurveFittingYearService;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/IProBasicEquipmentService.java

@@ -1,8 +1,8 @@
 package com.gyee.runeconomy.service.auto;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProBasicEquipment;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 
 import java.util.List;
 
@@ -24,7 +24,7 @@ public interface IProBasicEquipmentService extends IService<ProBasicEquipment> {
      * @param lineIds
      * @return
      */
-    List<ProBasicOrganizeTree> getProBasicEquipmentList(String companyIds, String windpowerstationIds, String projectIds, String lineIds,String  type);
+    List<ProBasicOrganizeTree> getProBasicEquipmentList(String companyIds, String windpowerstationIds, String projectIds, String lineIds, String  type);
 
 
     List<ProBasicOrganizeTree> getProBasicEquipmentList(String wpid);

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/IProBasicOrganizeTreeService.java

@@ -1,7 +1,7 @@
 package com.gyee.runeconomy.service.auto;
 
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 
 /**
  * <p>

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/impl/ProBasicEquipmentServiceImpl.java

@@ -1,12 +1,12 @@
 package com.gyee.runeconomy.service.auto.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.SortUtils;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.mapper.auto.ProBasicEquipmentMapper;
 import com.gyee.runeconomy.model.auto.ProBasicEquipment;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.service.auto.IProBasicEquipmentService;
 import org.springframework.stereotype.Service;
 
@@ -26,7 +26,7 @@ public class ProBasicEquipmentServiceImpl extends ServiceImpl<ProBasicEquipmentM
 
 
     @Override
-    public List<ProBasicOrganizeTree> getProBasicEquipmentList(String companyId, String windpowerstationIds, String projectIds, String lineIds,String  type) {
+    public List<ProBasicOrganizeTree> getProBasicEquipmentList(String companyId, String windpowerstationIds, String projectIds, String lineIds, String  type) {
 
 
         List<ProBasicOrganizeTree> list = CacheContext.wtls;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/impl/ProBasicOrganizeTreeServiceImpl.java

@@ -1,9 +1,9 @@
 package com.gyee.runeconomy.service.auto.impl;
 
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.mapper.auto.ProBasicOrganizeTreeMapper;
 import com.gyee.runeconomy.service.auto.IProBasicOrganizeTreeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconBenchmarkingBetweenServiceImpl.java

@@ -1,13 +1,13 @@
 package com.gyee.runeconomy.service.auto.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.contant.Contant;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.DateUtils;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.mapper.auto.ProEconBenchmarkingBetweenMapper;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
 import com.gyee.runeconomy.model.auto.ProEconBenchmarkingBetween;
 import com.gyee.runeconomy.model.auto.ProEconDutySchedule;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconEquipmentInfoDayTopServiceImpl.java

@@ -2,12 +2,12 @@ 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.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.vo.healthmanager.CompareVo;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.mapper.auto.ProEconEquipmentInfoDayTopMapper;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDayTop;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDayTopService;
 import org.springframework.stereotype.Service;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -5,19 +5,26 @@ package com.gyee.runeconomy.service.bmk;
 */
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.model.StringUtils;
-import com.gyee.common.util.*;
+import com.gyee.common.util.BigDecimalUtils;
+import com.gyee.common.util.DateUtils;
+import com.gyee.common.util.DoubleUtils;
+import com.gyee.common.util.SortUtils;
 import com.gyee.common.vo.benchmark.FjjxbVo;
 import com.gyee.common.vo.benchmark.FjjxbmxVo;
 import com.gyee.common.vo.benchmark.WxsslVo;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDay1;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDay1Service;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/goodness/WindturbinegoodnessService.java

@@ -2,6 +2,7 @@ package com.gyee.runeconomy.service.goodness;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.common.util.DoubleUtils;
@@ -10,7 +11,10 @@ import com.gyee.common.vo.benchmark.DataVo;
 import com.gyee.common.vo.threerate.PvVo;
 import com.gyee.runeconomy.dto.EchartDataVo;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.model.auto.ProBasicEquipmentPoint;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDay6;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentmodel;
+import com.gyee.runeconomy.model.auto.ProEconWindturbineGoodness;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDay6Service;
 import com.gyee.runeconomy.service.auto.IProEconWindturbineGoodnessService;
 import com.gyee.runeconomy.util.DateUtils;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/monitor/AgcService.java

@@ -3,11 +3,11 @@ package com.gyee.runeconomy.service.monitor;/*
 @date   2023/4/3-17:16
 */
 
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.common.vo.monitor.AgcVo;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/monitor/ComprehensiveService.java

@@ -3,12 +3,14 @@ package com.gyee.runeconomy.service.monitor;/*
 @date   2023/4/3-14:39
 */
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.model.PointData;
 import com.gyee.common.vo.monitor.CompreVo;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.model.auto.ProBasicEquipmentPoint;
+import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
+import com.gyee.runeconomy.model.auto.ProEconTestingPoint;
 import com.gyee.runeconomy.service.auto.IProEconTestingPointService;
 import com.gyee.runeconomy.util.StringUtils;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
@@ -80,7 +82,7 @@ public class ComprehensiveService {
         wpls.stream().forEach(wp->{
             CompreVo vo = new CompreVo();
             vo.setWpname(wp.getAname());
-            vo.setCapacity(wp.getJrCapacity()+wp.getJrwindCapacity());
+            vo.setCapacity(wp.getJrCapacity() + wp.getJrWindCapacity());
             List<String> targetList = new ArrayList<>();
             Map<String, ProBasicPowerstationPoint> powerstationPointMap = wppointmap.get(wp.getId());
             Arrays.stream(targetArray).forEach(t->{

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/monitor/DeviceDetailsService.java

@@ -4,10 +4,12 @@ package com.gyee.runeconomy.service.monitor;/*
 */
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.model.auto.ProBasicEquipmentPoint;
+import com.gyee.runeconomy.model.auto.ProEconTestingPoint;
 import com.gyee.runeconomy.model.vo.LineTreeVo;
 import com.gyee.runeconomy.model.vo.ProTreeVo;
 import com.gyee.runeconomy.model.vo.TreeVo;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/monitor/LandformsService.java

@@ -5,12 +5,14 @@ package com.gyee.runeconomy.service.monitor;
 @date   2023/5/10-16:09
 */
 
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.common.util.ClassUtil;
 import com.gyee.common.util.DoubleUtils;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.model.auto.ProBasicBranch;
+import com.gyee.runeconomy.model.auto.ProBasicEquipmentPoint;
 import com.gyee.runeconomy.model.vo.InverVo;
 import com.gyee.runeconomy.model.vo.LandformsVo;
 import com.gyee.runeconomy.util.StringUtils;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/monitor/MatrixService.java

@@ -4,6 +4,7 @@ package com.gyee.runeconomy.service.monitor;
 @date   2023/3/28-8:49
 */
 
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.common.util.DoubleUtils;
@@ -13,13 +14,17 @@ import com.gyee.common.vo.monitor.MatrixPowerVo;
 import com.gyee.common.vo.monitor.MatrixProVo;
 import com.gyee.common.vo.monitor.MatrixVo;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.model.auto.ProBasicEquipmentPoint;
+import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
 import com.gyee.runeconomy.util.StringUtils;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -133,7 +138,7 @@ public class MatrixService {
                 }else if(wp.getEleType().equals("F")){
                     powerVo.setCzlx("-2");
                 }
-                powerVo.setJrts(wp.getJrwindQuantityHs() + wp.getJrwindQuantityLd() + wp.getJrQuantityJz() + wp.getJrQuantityZc());
+                powerVo.setJrts(wp.getJrWindQuantityHs() + wp.getJrWindQuantityLd() + wp.getJrQuantityJz() + wp.getJrQuantityZc());
                 powerVo.setDjts(wpRealdatas.get(0).getPointValueInDouble() + wpRealdatas.get(1).getPointValueInDouble());
                 powerVo.setBwts(wpRealdatas.get(2).getPointValueInDouble() + wpRealdatas.get(3).getPointValueInDouble());
                 powerVo.setGzts(wpRealdatas.get(4).getPointValueInDouble() + wpRealdatas.get(5).getPointValueInDouble());
@@ -338,7 +343,7 @@ public class MatrixService {
                 }else if(wp.getEleType().equals("G")){
                     powerVo.setCzlx("-2");
                 }
-                powerVo.setJrts(wp.getJrwindQuantityHs() + wp.getJrwindQuantityLd() + wp.getJrQuantityJz() + wp.getJrQuantityZc());
+                powerVo.setJrts(wp.getJrWindQuantityHs() + wp.getJrWindQuantityLd() + wp.getJrQuantityJz() + wp.getJrQuantityZc());
                 powerVo.setDjts(wpRealdatas.get(0).getPointValueInDouble());
                 powerVo.setBwts(wpRealdatas.get(1).getPointValueInDouble());
                 powerVo.setGzts(wpRealdatas.get(2).getPointValueInDouble());
@@ -475,7 +480,7 @@ public class MatrixService {
         List<PointData> realData = edosUtil.getRealData(wpPoints);
         resultMap.put("wpid",powerstation.getId());
         resultMap.put("wpname",powerstation.getAname());
-        resultMap.put("jrts",powerstation.getJrQuantityJz()+powerstation.getJrQuantityZc()+powerstation.getJrwindQuantityLd()+powerstation.getJrwindQuantityHs());
+        resultMap.put("jrts",powerstation.getJrQuantityJz()+powerstation.getJrQuantityZc()+powerstation.getJrWindQuantityLd()+powerstation.getJrWindQuantityHs());
         resultMap.put("dfts",realData.get(0).getPointValueInDouble());
         resultMap.put("sdtjts",realData.get(1).getPointValueInDouble());
         resultMap.put("djts",realData.get(0).getPointValueInDouble()+realData.get(1).getPointValueInDouble());

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -1,6 +1,7 @@
 package com.gyee.runeconomy.service.monitor;
 
 
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.common.util.DateUtils;
@@ -10,7 +11,9 @@ import com.gyee.runeconomy.dto.DataVo;
 import com.gyee.runeconomy.dto.PowercurveVo;
 import com.gyee.runeconomy.dto.ProjectplanVo;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.model.auto.ProBasicCompany;
+import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
+import com.gyee.runeconomy.model.auto.ProBasicProjectPlan;
 import com.gyee.runeconomy.service.auto.IProBasicEquipmentPointService;
 import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
 import com.gyee.runeconomy.service.auto.IProBasicProjectPlanService;
@@ -116,17 +119,17 @@ public class MonitorService {
                     String id = wp.getId();
                     if (CacheContext.wpmap.containsKey(id) && id.endsWith("FDC_STA")) {
                         xx.put("name", wp.getAname());
-                        xx.put("companyid", wp.getCompanyId());
-                        xx.put("zjts", Double.valueOf(wp.getJrwindQuantityLd()));
-                        xx.put("zjrl", wp.getJrwindCapacity());
-                        xx.put("hszjts", wp.getJrwindQuantityHs());
+                        xx.put("companyid", wp.getParentCode());
+                        xx.put("zjts", Double.valueOf(wp.getJrWindQuantityLd()));
+                        xx.put("zjrl", wp.getJrWindCapacity());
+                        xx.put("hszjts", wp.getJrWindQuantityHs());
                         double gl = 0.0;
                         ProBasicPowerstationPoint glvalue = proBasicPowerstationPointService.getPowerstationPoint(id, ContantXk.SSZGL);
                         gl = edosUtil.getRealData(glvalue).getPointValueInDouble();
                         xx.put("gl", MathUtil.twoBit(gl));
                     } else if (CacheContext.wpmap.containsKey(id) && id.endsWith("GDC_STA")) {
                         xx.put("name", wp.getAname());
-                        xx.put("companyid", wp.getCompanyId());
+                        xx.put("companyid", wp.getParentCode());
                         xx.put("zczjts", Double.valueOf(wp.getJrQuantityZc()));
                         xx.put("jzzjts", Double.valueOf(wp.getJrQuantityJz()));
                         xx.put("zjrl", wp.getJrCapacity());
@@ -471,22 +474,22 @@ public class MonitorService {
 
             if (wpId.contains(QS) || wpId.contains(FD) || wpId.contains(GF)) {
                 for (ProBasicOrganizeTree wp : wplist) {
-                    zjrl += wp.getJrCapacity() + wp.getJrwindCapacity();
+                    zjrl += wp.getJrCapacity() + wp.getJrWindCapacity();
                 }
             } else {
                 for (ProBasicOrganizeTree wp : CacheContext.wpls) {
                     if (wpId.equals(wp.getId())) {
-                        zjrl += wp.getJrCapacity() + wp.getJrwindCapacity();
+                        zjrl += wp.getJrCapacity() + wp.getJrWindCapacity();
                     }
                 }
                 for (ProBasicOrganizeTree pj : CacheContext.pjls) {
                     if (wpId.equals(pj.getId())) {
-                        zjrl += pj.getCapacity();
+                        zjrl += pj.getJrCapacity();
                     }
                 }
                 for (ProBasicOrganizeTree ln : CacheContext.lnls) {
                     if (wpId.equals(ln.getId())) {
-                        zjrl += ln.getCapacity();
+                        zjrl += ln.getJrCapacity();
                     }
                 }
 
@@ -637,35 +640,35 @@ public class MonitorService {
 
             for (ProBasicOrganizeTree gp : gpls) {
                 if (wpId.contains(gp.getId())) {
-                    qt.put("fdzzjrl", gp.getWindCapacity() / 1000);
-                    qt.put("gfzzjrl", gp.getCapacity() / 1000);
-                    qt.put("zzjrl", (gp.getWindCapacity() + gp.getCapacity()) / 1000);
+                    qt.put("fdzzjrl", gp.getJrWindCapacity() / 1000);
+                    qt.put("gfzzjrl", gp.getJrCapacity() / 1000);
+                    qt.put("zzjrl", (gp.getJrWindCapacity() + gp.getJrCapacity()) / 1000);
                 }
             }
             for (ProBasicOrganizeTree rg : rgls) {
                 if (wpId.contains(rg.getId())) {
-                    qt.put("fdzzjrl", rg.getJrwindCapacity() / 1000);
+                    qt.put("fdzzjrl", rg.getJrWindCapacity() / 1000);
                     qt.put("gfzzjrl", rg.getJrCapacity() / 1000);
-                    qt.put("zzjrl", (rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000);
-                    qt.put("ylyxs", MathUtil.twoBit(yfdl / 1000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
-                    qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((rg.getJrwindCapacity() + rg.getJrCapacity()) / 1000));
+                    qt.put("zzjrl", (rg.getJrWindCapacity() + rg.getJrCapacity()) / 1000);
+                    qt.put("ylyxs", MathUtil.twoBit(yfdl / 1000) / ((rg.getJrWindCapacity() + rg.getJrCapacity()) / 1000));
+                    qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((rg.getJrWindCapacity() + rg.getJrCapacity()) / 1000));
                 }
             }
 
             for (ProBasicOrganizeTree cp : cpls) {
                 if (wpId.contains(cp.getId())) {
-                    qt.put("fdzzjrl", cp.getJrwindCapacity() / 1000);
+                    qt.put("fdzzjrl", cp.getJrWindCapacity() / 1000);
                     qt.put("gfzzjrl", cp.getJrCapacity() / 1000);
-                    qt.put("zzjrl", (cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000);
-                    qt.put("ylyxs", MathUtil.twoBit(yfdl / 1000) / ((cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000));
-                    qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((cp.getJrwindCapacity() + cp.getJrCapacity()) / 1000));
+                    qt.put("zzjrl", (cp.getJrWindCapacity() + cp.getJrCapacity()) / 1000);
+                    qt.put("ylyxs", MathUtil.twoBit(yfdl / 1000) / ((cp.getJrWindCapacity() + cp.getJrCapacity()) / 1000));
+                    qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((cp.getJrWindCapacity() + cp.getJrCapacity()) / 1000));
                 }
             }
             for (ProBasicOrganizeTree wp : wplist) {
                 if (wpId.contains(wp.getId())) {
 
-                    qt.put("ylyxs", MathUtil.twoBit(yfdl / 1000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 1000));
-                    qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((wp.getJrwindCapacity() + wp.getJrCapacity()) / 1000));
+                    qt.put("ylyxs", MathUtil.twoBit(yfdl / 1000) / ((wp.getJrWindCapacity() + wp.getJrCapacity()) / 1000));
+                    qt.put("nlyxs", MathUtil.twoBit(nfdl / 1000) / ((wp.getJrWindCapacity() + wp.getJrCapacity()) / 1000));
                 }
             }
             qt.put("aqts", MathUtil.twoBit(aqts));
@@ -767,7 +770,7 @@ public class MonitorService {
                     sxcygfzjrl = reg.getCapacity();
 
                     sxgsfdcsl = reg.getJrWindNumber();
-                    sxgsfdzjrl = reg.getJrwindCapacity();
+                    sxgsfdzjrl = reg.getJrWindCapacity();
                     sxgsgfcsl = reg.getJrNumber();
                     sxgsgfzjrl = reg.getJrCapacity();
                 }
@@ -802,7 +805,7 @@ public class MonitorService {
                     nmcygfzjrl = reg.getCapacity();
 
                     nmgsfdcsl = reg.getJrWindNumber();
-                    nmgsfdzjrl = reg.getJrwindCapacity();
+                    nmgsfdzjrl = reg.getJrWindCapacity();
                     nmgsgfcsl = reg.getJrNumber();
                     nmgsgfzjrl = reg.getJrCapacity();
                 }
@@ -1356,29 +1359,29 @@ public class MonitorService {
             if (wpId.contains(QS) || wpId.contains(FD) || wpId.contains(GF)) {
                 for (ProBasicOrganizeTree rg : CacheContext.rgls) {
                     if (wpId.contains(rg.getId())) {
-                        zjrl += rg.getJrCapacity() + rg.getJrwindCapacity();
+                        zjrl += rg.getJrCapacity() + rg.getJrWindCapacity();
                     }
                 }
                 for (ProBasicOrganizeTree cp : CacheContext.cpls){
                     if (wpId.contains(cp.getId())) {
-                        zjrl += cp.getJrCapacity() + cp.getJrwindCapacity();
+                        zjrl += cp.getJrCapacity() + cp.getJrWindCapacity();
                     }
                 }
             }
 
             for (ProBasicOrganizeTree wp : CacheContext.wpls) {
                 if (wpId.equals(wp.getId())) {
-                    zjrl += wp.getJrCapacity() + wp.getJrwindCapacity();
+                    zjrl += wp.getJrCapacity() + wp.getJrWindCapacity();
                 }
             }
             for (ProBasicOrganizeTree pj : CacheContext.pjls) {
                 if (wpId.equals(pj.getId())) {
-                    zjrl += pj.getCapacity();
+                    zjrl += pj.getJrCapacity();
                 }
             }
             for (ProBasicOrganizeTree ln : CacheContext.lnls) {
                 if (wpId.equals(ln.getId())) {
-                    zjrl += ln.getCapacity();
+                    zjrl += ln.getJrCapacity();
                 }
             }
 

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/monitor/StationMonitorService.java

@@ -4,12 +4,11 @@ package com.gyee.runeconomy.service.monitor;/*
 */
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
 import com.gyee.common.util.DateUtils;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
-import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
 import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
@@ -34,7 +33,7 @@ public class StationMonitorService {
         Map<String, ProBasicOrganizeTree> wpmap = CacheContext.wpmap;
         Map<String, ProBasicPowerstationPoint> powerstationPointMap = CacheContext.wppointmap.get(wpid);
         ProBasicOrganizeTree proBasicPowerstation = wpmap.get(wpid);
-        resultMap.put("jrts",proBasicPowerstation.getJrquantityJz()+proBasicPowerstation.getJrquantityZc()+proBasicPowerstation.getJrwindQuantityHs()+proBasicPowerstation.getJrwindQuantityLd());
+        resultMap.put("jrts",proBasicPowerstation.getJrQuantityJz()+proBasicPowerstation.getJrQuantityZc()+proBasicPowerstation.getJrWindQuantityHs()+proBasicPowerstation.getJrWindQuantityLd());
         List<String> points = new ArrayList<>();
         points.add(powerstationPointMap.get(ContantXk.DJTS).getNemCode());
         points.add(powerstationPointMap.get(ContantXk.DJTSMX).getNemCode());
@@ -63,7 +62,7 @@ public class StationMonitorService {
         if (proBasicPowerstation.getEleType().equals("F")){
             points.add(powerstationPointMap.get(ContantXk.SSPJFS).getNemCode());
             resultMap.put("czlx","风电场");
-            resultMap.put("jrrl",proBasicPowerstation.getJrwindCapacity());
+            resultMap.put("jrrl",proBasicPowerstation.getJrWindCapacity());
             resultMap.put("zzjrl",proBasicPowerstation.getWindCapacity());
         }else {
             points.add(powerstationPointMap.get(ContantXk.SSPJGZD).getNemCode());
@@ -145,7 +144,7 @@ public class StationMonitorService {
         resultMap.put("nfdl",realData.get(23).getPointValueInDouble());
         resultMap.put("sspjfsgzd",realData.get(24).getPointValueInDouble());
         resultMap.put("yggl",realData.get(25).getPointValueInDouble());
-        resultMap.put("fhl",(proBasicPowerstation.getJrwindCapacity()+proBasicPowerstation.getJrCapacity())!=0?realData.get(25).getPointValueInDouble()/(proBasicPowerstation.getJrwindCapacity()+proBasicPowerstation.getJrCapacity())*100:0);
+        resultMap.put("fhl",(proBasicPowerstation.getJrWindCapacity()+proBasicPowerstation.getJrCapacity())!=0?realData.get(25).getPointValueInDouble()/(proBasicPowerstation.getJrwindCapacity()+proBasicPowerstation.getJrCapacity())*100:0);
         resultMap.put("ylyxs",realData.get(26).getPointValueInDouble());
         resultMap.put("nlyxs",realData.get(27).getPointValueInDouble());
         resultMap.put("yfgnlyl",realData.get(28).getPointValueInDouble());

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/monitor/StatusService.java

@@ -3,13 +3,12 @@ package com.gyee.runeconomy.service.monitor;/*
 @date   2023/4/4-9:53
 */
 
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.util.SortUtils;
 import com.gyee.common.vo.monitor.StatusVo;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
-import com.gyee.runeconomy.model.auto.ProBasicSubStation;
 import com.gyee.runeconomy.model.auto.ProBasicWeatherStation;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
@@ -49,7 +48,7 @@ public class StatusService {
             StatusVo vo = new StatusVo();
             vo.setWpname(wp.getAname());
             vo.setType(wp.getEleType());
-            vo.setJrts(wp.getJrwindQuantityHs() + wp.getJrwindQuantityLd() + wp.getJrQuantityJz() + wp.getJrQuantityZc());
+            vo.setJrts(wp.getJrWindQuantityHs() + wp.getJrWindQuantityLd() + wp.getJrQuantityJz() + wp.getJrQuantityZc());
             Map<String, ProBasicPowerstationPoint> powerstationPointMap = wppointmap.get(wp.getId());
             ProBasicPowerstationPoint yxtsPoint = powerstationPointMap.get(ContantXk.YXTS);
             ProBasicPowerstationPoint djtsPoint = powerstationPointMap.get(ContantXk.DJTS);

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/singleanalysis/SingleAnalysisService.java

@@ -1,6 +1,7 @@
 package com.gyee.runeconomy.service.singleanalysis;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -1,6 +1,7 @@
 package com.gyee.runeconomy.service.specific;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.DoubleUtils;
@@ -10,7 +11,10 @@ import com.gyee.common.vo.specific.SpecificTarget;
 import com.gyee.common.vo.specific.SpecificTargetVo;
 import com.gyee.common.vo.specific.SpecificTopVo;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay4;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay5;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay7;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay4Service;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay5Service;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/threerate/ThreeRateService.java

@@ -1,6 +1,7 @@
 package com.gyee.runeconomy.service.threerate;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.DoubleUtils;
@@ -8,7 +9,6 @@ import com.gyee.common.util.SortUtils;
 import com.gyee.runeconomy.dto.response.FwjslDTO;
 import com.gyee.runeconomy.dto.response.QxjslDTO;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
 import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDay5;
 import com.gyee.runeconomy.model.auto.ProEconFaultLiminatedefects;

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/update/TargetEnterService.java

@@ -4,10 +4,10 @@ package com.gyee.runeconomy.service.update;/*
 */
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.util.CommonUtils;
 import com.gyee.common.util.MD5Utils;
 import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProBasicUser;
 import com.gyee.runeconomy.model.auto.ProEconTargetdata;
 import com.gyee.runeconomy.service.auto.IProBasicUserService;