222

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,7 +3,6 @@ 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;
@@ -12,6 +11,7 @@ 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.ProBasicOrganizeTree;
 import com.gyee.runeconomy.service.bmk.BenchmarkingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -68,7 +68,7 @@ public class BenchmarkingController {
 
     @GetMapping(value = "/alllist")
     @ApiOperation(value = "场站之后列表", notes = "场站之后列表")
-    public R alllist(@RequestParam(value = " ", required = true) String ids,
+    public R alllist(@RequestParam(value = "ids", required = true) String ids,
                         @RequestParam(value = "type", required = false) String type) {
 
         List<ProBasicOrganizeTree> resultList = benchmarkingService.allList(ids,type);
@@ -79,6 +79,18 @@ public class BenchmarkingController {
         }
     }
 
+    @GetMapping(value = "/treeList")
+    @ApiOperation(value = "场站之后列表", notes = "场站之后列表")
+    public R treeList(@RequestParam(value = "type", required = false) String type) {
+
+        List<ProBasicOrganizeTree> resultList = benchmarkingService.treeList(type);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.data(ResultMsg.ok(resultList));
+        } else {
+            return R.error(ResultMsg.error());
+        }
+    }
+
     @GetMapping(value = "/pjByWplist")
     @ApiOperation(value = "项目列表", notes = "项目列表")
     public R pjByWplist(@RequestParam(value = "wpids", required = true) String wpids)  {

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

@@ -1,7 +1,6 @@
 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;
@@ -9,10 +8,7 @@ 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.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.model.auto.*;
 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/performacompare/EquipmentPerformaCompareController.java

@@ -1,9 +1,9 @@
 package com.gyee.runeconomy.controller.performacompare;
 
 
-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.model.auto.ProEconWtPowerCurveFitting;
 import com.gyee.runeconomy.service.bmk.BenchmarkingService;
 import com.gyee.runeconomy.service.performacompare.EquipmentPerformaCompareService;

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,7 +3,6 @@ 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.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
+import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 
 /**
  * <p>

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

@@ -1,10 +1,15 @@
-package com.gyee.backconfig.model.auto;
+package com.gyee.runeconomy.model.auto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.gyee.runeconomy.util.StringUtils;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -20,6 +25,35 @@ public class ProBasicOrganizeTree extends Model {
 
     private static final long serialVersionUID = 1L;
 
+    @TableField(exist = false)
+    private List<ProBasicOrganizeTree> children;
+
+    public static ProBasicOrganizeTree buildTree(List<ProBasicOrganizeTree> nodes) {
+        // 用一个 map 存储所有 nodes，方便快速查找某个 node
+        Map<String, ProBasicOrganizeTree> nodeMap = new HashMap<>();
+        for (ProBasicOrganizeTree node : nodes) {
+            nodeMap.put(node.getId(), node);
+        }
+
+        // 构建树形结构
+        ProBasicOrganizeTree root = null;
+        for (ProBasicOrganizeTree node : nodes) {
+            if (StringUtils.isEmpty(node.getParentCode())) {  // 判断是否为根节点
+                root = node;
+            } else {
+                ProBasicOrganizeTree parent = nodeMap.get(node.getParentCode());
+                if (parent != null) {
+                    parent.addChild(node);
+                }
+            }
+        }
+        return root;
+    }
+
+    public void addChild(ProBasicOrganizeTree child) {
+        this.children.add(child);
+    }
+
     /**
      * 唯一ID
      */

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

@@ -1,9 +1,9 @@
 package com.gyee.runeconomy.service.Economic;
 
-import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.dto.EconomicVo;
 import com.gyee.runeconomy.dto.WxssVo;
 import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay4Service;

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

@@ -2,13 +2,13 @@ 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.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProEconWtCurveFitting;
 import com.gyee.runeconomy.model.auto.ProEconWtCurveFittingMonth;
 import com.gyee.runeconomy.model.auto.ProEconWtCurveFittingYear;

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;
 

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.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
+import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 
 import java.util.List;
 

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;
 

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

@@ -2,9 +2,9 @@ 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.runeconomy.mapper.auto.ProBasicOrganizeTreeMapper;
+import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.service.auto.IProBasicOrganizeTreeService;
 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/auto/impl/ProEconPointCodeServiceImpl.java

@@ -2,11 +2,11 @@ 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.runeconomy.dto.response.ProEconPointCodeDTO;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.mapper.auto.ProEconPointCodeMapper;
+import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProEconPointCode;
 import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
 import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay4;

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

@@ -5,7 +5,6 @@ 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.BigDecimalUtils;
 import com.gyee.common.util.DateUtils;
@@ -15,6 +14,7 @@ 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.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDay1;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDay1Service;
 import org.springframework.stereotype.Service;
@@ -1013,4 +1013,8 @@ public class BenchmarkingService {
         SortUtils.sort(list, "orderNum", SortUtils.ASC);
         return list;
     }
+
+    public List<ProBasicOrganizeTree> treeList(String type) {
+        return null;
+    }
 }

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

@@ -2,7 +2,6 @@ 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;
@@ -11,10 +10,7 @@ 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.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.model.auto.*;
 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/homepage/EconomyPointHomePageService.java

@@ -1,7 +1,6 @@
 package com.gyee.runeconomy.service.homepage;
 
 
-import com.gyee.backconfig.model.auto.ProBasicOrganizeTree;
 import com.gyee.common.util.DateUtils;
 import com.gyee.runeconomy.dto.response.EconHomePagePointRateDTO;
 import com.gyee.runeconomy.dto.response.ProEconPointCodeDTO;

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

@@ -4,11 +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.model.PointData;
 import com.gyee.common.vo.monitor.CompreVo;
 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.model.auto.ProEconTestingPoint;
 import com.gyee.runeconomy.service.auto.IProEconTestingPointService;

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

@@ -4,11 +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.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicEquipmentPoint;
+import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProEconTestingPoint;
 import com.gyee.runeconomy.model.vo.LineTreeVo;
 import com.gyee.runeconomy.model.vo.ProTreeVo;

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

@@ -5,7 +5,6 @@ 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;
@@ -13,6 +12,7 @@ import com.gyee.common.util.DoubleUtils;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicBranch;
 import com.gyee.runeconomy.model.auto.ProBasicEquipmentPoint;
+import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 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,7 +4,6 @@ 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;
@@ -15,6 +14,7 @@ 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.ProBasicEquipmentPoint;
+import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
 import com.gyee.runeconomy.util.StringUtils;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;

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

@@ -1,7 +1,6 @@
 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;
@@ -12,6 +11,7 @@ import com.gyee.runeconomy.dto.PowercurveVo;
 import com.gyee.runeconomy.dto.ProjectplanVo;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicCompany;
+import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
 import com.gyee.runeconomy.model.auto.ProBasicProjectPlan;
 import com.gyee.runeconomy.service.auto.IProBasicEquipmentPointService;

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

@@ -4,11 +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.ProBasicPowerstationPoint;
 import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
 import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;

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

@@ -2,12 +2,11 @@ package com.gyee.runeconomy.service.monitor;/*
 @author   谢生杰
 @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.ProBasicWeatherStation;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;

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

@@ -1,7 +1,6 @@
 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,7 +1,6 @@
 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;
@@ -11,10 +10,7 @@ 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.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.model.auto.*;
 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,7 +1,6 @@
 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;
@@ -9,6 +8,7 @@ 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.ProEconEquipmentInfoDay5;
 import com.gyee.runeconomy.model.auto.ProEconFaultLiminatedefects;
 import com.gyee.runeconomy.service.auto.IProBasicOrganizeTreeService;

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;