层级结构调整

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/config/CacheContext.java

@@ -84,7 +84,7 @@ public class CacheContext implements CommandLineRunner {
         //区域
         regions = proBasicRegionService.list();
         regions.stream().forEach(region -> {
-            regionmap.put(region.getGroupId(), region);
+            regionmap.put(region.getId(), region);
         });
 
         //公司

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicEquipmentPointController.java

@@ -41,11 +41,12 @@ public class ProBasicEquipmentPointController {
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "code", required = false) String code,
                       @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "aname", required = false) String aname,
                       @RequestParam(value = "model", required = false) String model,
                       @RequestParam(value = "uniformCode", required = false) String uniformCode,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicEquipmentPoint> list = proBasicEquipmentPointService.list(id, code, name, model, uniformCode, pageNum, pageSize);
+        IPage<ProBasicEquipmentPoint> list = proBasicEquipmentPointService.list(id, code, name,aname, model, uniformCode, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicMeterPointController.java

@@ -1,9 +1,16 @@
 package com.gyee.backconfig.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicMeterPoint;
+import com.gyee.backconfig.service.auto.IProBasicMeterPointService;
+import com.gyee.common.model.StringUtils;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -16,5 +23,84 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("//pro-basic-meter-point")
 public class ProBasicMeterPointController {
+    @Resource
+    private IProBasicMeterPointService proBasicMeterPointService;
+
+    /**
+     * 查询
+     *
+     * @param id
+     * @param code
+     * @param windpowerstationId
+     * @param name
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/listByPage")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "windpowerstationId", required = false) String windpowerstationId,
+                      @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProBasicMeterPoint> list = proBasicMeterPointService.list(id, code, windpowerstationId, name, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 根据id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/meterpoint/{id}")
+    public R findOne(@PathVariable("id") String id) {
+        QueryWrapper<ProBasicMeterPoint> qw = new QueryWrapper<>();
+        qw.eq("id", id);
+        ProBasicMeterPoint Square = proBasicMeterPointService.getOne(qw);
+        if (StringUtils.isNotNull(Square)) {
+            return R.ok().data(Square);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 批量插入
+     *
+     * @param meterpoint
+     * @return
+     */
+    @PostMapping(value = "/save")
+    public R addAll(@RequestBody ProBasicMeterPoint meterpoint) {
+        boolean b = proBasicMeterPointService.saveOrUpdate(meterpoint);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-meterpoint/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proBasicMeterPointService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
 
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicRegionController.java

@@ -28,7 +28,7 @@ public class ProBasicRegionController {
      * 查询
      *
      * @param id
-     * @param groupId
+     * @param
      * @param name
      * @param aname
      * @param pageNum
@@ -37,12 +37,12 @@ public class ProBasicRegionController {
      */
     @GetMapping(value = "/List")
     public R findList(@RequestParam(value = "id", required = false) String id,
-                      @RequestParam(value = "groupId", required = false) String groupId,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "aname", required = false) String aname,
+                      @RequestParam(value = "code", required = false) String code,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicRegion> list = proBasicRegionService.list(id, name, groupId, aname, pageNum, pageSize);
+        IPage<ProBasicRegion> list = proBasicRegionService.list(id, name, aname, code, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicWindsubStationController.java

@@ -1,9 +1,18 @@
 package com.gyee.backconfig.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicMeterPoint;
+import com.gyee.backconfig.model.auto.ProBasicRegion;
+import com.gyee.backconfig.model.auto.ProBasicWindsubStation;
+import com.gyee.backconfig.service.auto.IProBasicWindsubStationService;
+import com.gyee.common.model.StringUtils;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -16,5 +25,71 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("//pro-basic-windsub-station")
 public class ProBasicWindsubStationController {
+    @Resource
+    private IProBasicWindsubStationService proBasicWindsubStationService;
 
+    @GetMapping(value = "/List")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProBasicWindsubStation> list = proBasicWindsubStationService.list(id, name, code, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 根据id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/meterpoint/{id}")
+    public R findOne(@PathVariable("id") String id) {
+        QueryWrapper<ProBasicWindsubStation> qw = new QueryWrapper<>();
+        qw.eq("id", id);
+        ProBasicWindsubStation Square = proBasicWindsubStationService.getOne(qw);
+        if (StringUtils.isNotNull(Square)) {
+            return R.ok().data(Square);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 批量插入
+     *
+     * @param meterpoint
+     * @return
+     */
+    @PostMapping(value = "/save")
+    public R addAll(@RequestBody ProBasicWindsubStation meterpoint) {
+        boolean b = proBasicWindsubStationService.saveOrUpdate(meterpoint);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-WindsubStation/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proBasicWindsubStationService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/SttreeControllel.java

@@ -3,6 +3,7 @@ package com.gyee.backconfig.controller;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicCompany;
 import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
+import com.gyee.backconfig.model.auto.ProBasicRegion;
 import com.gyee.backconfig.service.auto.SttreeService;
 import com.gyee.common.model.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -21,11 +22,11 @@ public class SttreeControllel {
 
 
     /**
-     * 层级树
+     * 集团层级树
      *
      * @return
      */
-    @GetMapping(value = "/treels")
+    @GetMapping(value = "/energytreels")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R wtls(String tag) {
@@ -36,4 +37,21 @@ public class SttreeControllel {
             return R.error().message("访问失败");
         }
     }
+
+    /**
+     * 集团层级树
+     *
+     * @return
+     */
+    @GetMapping(value = "/regiontreels")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R rels(String tag) {
+        List<ProBasicRegion> resultList = sttreeService.Regiontree(tag);
+        if (StringUtils.isNotNull(resultList)) {
+            return com.gyee.backconfig.config.R.ok((int) resultList.size()).data(resultList);
+        } else {
+            return R.error().message("访问失败");
+        }
+    }
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicCompany.java

@@ -28,10 +28,14 @@ public class ProBasicCompany extends Model {
     /**
      * 编号
      */
-    @TableId(value = "ID", type = IdType.INPUT)
     private String id;
 
     /**
+     * 编码
+     */
+    private String code;
+
+    /**
      * 名称
      */
     private String name;
@@ -52,9 +56,14 @@ public class ProBasicCompany extends Model {
     private String windCapacityUnit;
 
     /**
-     * 风电装机数量
+     * 风电装机数量海上
+     */
+    private Integer windQuantityHs;
+
+    /**
+     * 风电装机数量陆地
      */
-    private Integer windQuantity;
+    private Integer windQuantityLd;
 
     /**
      * 光伏装机容量
@@ -87,9 +96,14 @@ public class ProBasicCompany extends Model {
     private String jrwindCapacityUnit;
 
     /**
-     * 接入风电装机数量
+     * 接入风电装机数量海上
      */
-    private Integer jrwindQuantity;
+    private Integer jrwindQuantityHs;
+
+    /**
+     * 接入风电装机数量陆地
+     */
+    private Integer jrwindQuantityLd;
 
     /**
      * 接入光伏装机容量
@@ -146,8 +160,32 @@ public class ProBasicCompany extends Model {
      */
     private String groupId;
 
+    /**
+     * 是否可用
+     */
     private Integer isAble;
 
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
     @TableField(exist = false)
     private List<ProBasicWindpowerstation> Children = new ArrayList<>();
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicEnergyGroup.java

@@ -24,14 +24,22 @@ import lombok.EqualsAndHashCode;
 public class ProBasicEnergyGroup extends Model {
 
     private static final long serialVersionUID = 1L;
-
     /**
      * 编号
      */
-    @TableId(value = "ID", type = IdType.INPUT)
     private String id;
 
     /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 父编号
+     */
+    private String parentid;
+
+    /**
      * 名称
      */
     private String name;
@@ -52,9 +60,14 @@ public class ProBasicEnergyGroup extends Model {
     private String windCapacityUnit;
 
     /**
-     * 风电装机数量
+     * 风电装机数量海上
      */
-    private Integer windQuantity;
+    private Integer windQuantityHs;
+
+    /**
+     * 风电装机数量陆地
+     */
+    private Integer windQuantityLd;
 
     /**
      * 光伏装机容量
@@ -87,9 +100,14 @@ public class ProBasicEnergyGroup extends Model {
     private String jrwindCapacityUnit;
 
     /**
-     * 接入风电装机数量
+     * 接入风电装机数量海上
      */
-    private Integer jrwindQuantity;
+    private Integer jrwindQuantityHs;
+
+    /**
+     * 接入风电装机数量陆地
+     */
+    private Integer jrwindQuantityLd;
 
     /**
      * 接入光伏装机容量
@@ -136,8 +154,31 @@ public class ProBasicEnergyGroup extends Model {
      */
     private Integer jrNumber;
 
-//    private Integer isAble;
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
 
     @TableField(exist = false)
-    private List<ProBasicRegion> Children = new ArrayList<>();
+    private List<ProBasicCompany> Children = new ArrayList<>();
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicEquipmentPoint.java

@@ -1,9 +1,6 @@
 package com.gyee.backconfig.model.auto;
 
 import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,7 +11,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wang
- * @since 2022-10-15
+ * @since 2022-10-31
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -25,7 +22,6 @@ public class ProBasicEquipmentPoint extends Model {
     /**
      * 编号
      */
-    @TableId(value = "ID", type = IdType.INPUT)
     private String id;
 
     /**
@@ -39,6 +35,11 @@ public class ProBasicEquipmentPoint extends Model {
     private String name;
 
     /**
+     * 实时库名称
+     */
+    private String aname;
+
+    /**
      * 型号
      */
     private String model;
@@ -113,5 +114,25 @@ public class ProBasicEquipmentPoint extends Model {
      */
     private String realtimeId;
 
+    /**
+     * 部件编号
+     */
+    private String logicalUnitId;
+
+    /**
+     * 集团测点编号
+     */
+    private String groupPointId;
+
+    /**
+     * 具体名称
+     */
+    private String specificName;
+
+    /**
+     * 系数
+     */
+    private BigDecimal coefficient;
+
 
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicLine.java

@@ -4,9 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wang
- * @since 2022-10-15
+ * @since 2022-10-31
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +26,6 @@ public class ProBasicLine extends Model {
     /**
      * 编号
      */
-    @TableId(value = "ID", type = IdType.INPUT)
     private String id;
 
     /**
@@ -71,8 +68,31 @@ public class ProBasicLine extends Model {
      */
     private Integer quantity;
 
+    /**
+     * 是否可用
+     */
     private Integer isAble;
 
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
     @TableField(exist = false)
     private List<ProBasicWindturbine> Children = new ArrayList<>();
+
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicMeterPoint.java

@@ -1,9 +1,6 @@
 package com.gyee.backconfig.model.auto;
 
 import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,7 +11,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wang
- * @since 2022-10-15
+ * @since 2022-10-31
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -25,7 +22,6 @@ public class ProBasicMeterPoint extends Model {
     /**
      * 编号
      */
-    @TableId(value = "ID", type = IdType.INPUT)
     private String id;
 
     /**
@@ -34,11 +30,21 @@ public class ProBasicMeterPoint extends Model {
     private String code;
 
     /**
+     * 使用/排序
+     */
+    private Integer orderNum;
+
+    /**
      * 名称
      */
     private String name;
 
     /**
+     * 用到名称
+     */
+    private String aname;
+
+    /**
      * 描述
      */
     private String description;
@@ -118,5 +124,20 @@ public class ProBasicMeterPoint extends Model {
      */
     private BigDecimal initialValue;
 
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 集团测点编号
+     */
+    private String groupPointId;
+
+    /**
+     * 具体名称
+     */
+    private String specificName;
+
 
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicProject.java

@@ -103,6 +103,14 @@ public class ProBasicProject extends Model {
      */
     private String windsubStationId;
     private Integer isAble;
+
+    private String spare1;
+
+    private String spare2;
+
+    private String spare3;
+
+    private String spare4;
     @TableField(exist = false)
     private List<ProBasicLine> Children = new ArrayList<>();
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicProjectPlan.java

@@ -1,9 +1,6 @@
 package com.gyee.backconfig.model.auto;
 
 import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,7 +11,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wang
- * @since 2022-10-15
+ * @since 2022-10-31
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -25,7 +22,6 @@ public class ProBasicProjectPlan extends Model {
     /**
      * 编号
      */
-    @TableId(value = "ID", type = IdType.INPUT)
     private String id;
 
     /**

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicRegion.java

@@ -24,14 +24,17 @@ import lombok.EqualsAndHashCode;
 public class ProBasicRegion extends Model {
 
     private static final long serialVersionUID = 1L;
-
     /**
      * 编号
      */
-    @TableId(value = "ID", type = IdType.INPUT)
     private String id;
 
     /**
+     * 编码
+     */
+    private String code;
+
+    /**
      * 名称
      */
     private String name;
@@ -52,9 +55,14 @@ public class ProBasicRegion extends Model {
     private String windCapacityUnit;
 
     /**
-     * 风电装机数量
+     * 风电装机数量海上
      */
-    private Integer windQuantity;
+    private Integer windQuantityHs;
+
+    /**
+     * 风电装机数量陆地
+     */
+    private Integer windQuantityLd;
 
     /**
      * 光伏装机容量
@@ -87,9 +95,14 @@ public class ProBasicRegion extends Model {
     private String jrwindCapacityUnit;
 
     /**
-     * 接入风电装机数量
+     * 接入风电装机数量海上
      */
-    private Integer jrwindQuantity;
+    private Integer jrwindQuantityHs;
+
+    /**
+     * 接入风电装机数量陆地
+     */
+    private Integer jrwindQuantityLd;
 
     /**
      * 接入光伏装机容量
@@ -137,11 +150,30 @@ public class ProBasicRegion extends Model {
     private Integer jrNumber;
 
     /**
-     * 集团编号
+     * 是否可用
      */
-    private String groupId;
     private Integer isAble;
 
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
     @TableField(exist = false)
     private List<ProBasicCompany> Children = new ArrayList<>();
 

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicWindpowerstation.java

@@ -138,6 +138,14 @@ public class ProBasicWindpowerstation extends Model {
 
     private Integer isAble;
 
+    private String spare1;
+
+    private String spare2;
+
+    private String spare3;
+
+    private String spare4;
+
 
     @TableField(exist = false)
     private List<ProBasicProject> Children = new ArrayList<>();

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicWindsubStation.java

@@ -50,6 +50,28 @@ public class ProBasicWindsubStation extends Model {
      * 顺序
      */
     private Integer orderNum;
+    /**
+     * 是否可用
+     */
     private Integer isAble;
 
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicWindturbine.java

@@ -99,5 +99,19 @@ public class ProBasicWindturbine extends Model {
      */
     private String companyId;
 
-    private Integer isAble;
+    private Integer is_Able;
+
+    private Integer equipment_category;
+
+    private String parent_id;
+
+    private String square_id;
+
+    private String spare1;
+
+    private String spare2;
+
+    private String spare3;
+
+    private String spare4;
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicWppoint.java

@@ -1,20 +1,21 @@
 package com.gyee.backconfig.model.auto;
 
 import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 场站测点
+ * 场站测点，期次测点，线路测点，三级公司测点，区域测点
+
+
+
+ +方阵测点
  * </p>
  *
  * @author wang
- * @since 2022-10-15
+ * @since 2022-10-31
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -25,7 +26,6 @@ public class ProBasicWppoint extends Model {
     /**
      * 编号
      */
-    @TableId(value = "ID", type = IdType.INPUT)
     private String id;
 
     /**
@@ -39,6 +39,11 @@ public class ProBasicWppoint extends Model {
     private String name;
 
     /**
+     * 实时库名称
+     */
+    private String aname;
+
+    /**
      * 型号
      */
     private String model;
@@ -108,5 +113,20 @@ public class ProBasicWppoint extends Model {
      */
     private String realtimeId;
 
+    /**
+     * 集团测点编号
+     */
+    private String groupPointId;
+
+    /**
+     * 具体名称
+     */
+    private String specificName;
+
+    /**
+     * 系数
+     */
+    private BigDecimal coefficient;
+
 
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicEquipmentPointService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @since 2022-10-15
  */
 public interface IProBasicEquipmentPointService extends IService<ProBasicEquipmentPoint> {
-    IPage<ProBasicEquipmentPoint> list(String id, String code, String name, String model, String uniformCode, String pageNum, String pageSize);
+    IPage<ProBasicEquipmentPoint> list(String id, String code, String name, String aname,String model, String uniformCode, String pageNum, String pageSize);
 
     ProBasicEquipmentPoint getOne(String id);
 

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicMeterPointService.java

@@ -1,5 +1,6 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicMeterPoint;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-10-15
  */
 public interface IProBasicMeterPointService extends IService<ProBasicMeterPoint> {
-
+    IPage<ProBasicMeterPoint> list(String id, String code, String windpowerstationId, String name, String pageNum, String pageSize);
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicRegionService.java

@@ -15,6 +15,6 @@ import java.util.List;
  * @since 2022-10-15
  */
 public interface IProBasicRegionService extends IService<ProBasicRegion> {
-    IPage<ProBasicRegion> list(String id, String name, String groupId, String aname, String pageNum, String pageSize);
+    IPage<ProBasicRegion> list(String id, String name, String aname, String code,String pageNum, String pageSize);
     List<ProBasicRegion> getReginBycode(String groupId);
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicWindsubStationService.java

@@ -1,5 +1,7 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.ProBasicRegion;
 import com.gyee.backconfig.model.auto.ProBasicWindsubStation;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,5 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-10-15
  */
 public interface IProBasicWindsubStationService extends IService<ProBasicWindsubStation> {
+    IPage<ProBasicWindsubStation> list(String id, String name, String code,String pageNum, String pageSize);
+
 
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/PointGenerateService.java

@@ -24,6 +24,8 @@ public class PointGenerateService {
     @Autowired
     private IProBasicRegionService proBasicRegionService;//区域
 
+
+
     @Resource
     private IProBasicCompanyService proBasicCompanyService;//公司
 
@@ -281,7 +283,7 @@ public class PointGenerateService {
                 if ("fjjs".equals(p.getType())) {
                     StringBuilder stationsb = new StringBuilder();
                     stationsb.append(substaion).append(station.getId().endsWith("_FDC") ? "FJJSFW." : "GFJSFW.");
-                    stationsb.append(region.getGroupId()).append("_").append(region.getId()).append("_").append(substaion);
+//                    stationsb.append(region.getGroupId()).append("_").append(region.getId()).append("_").append(substaion);
                     stationsb.append(station.getId().endsWith("_FDC") ? "F" : "G").append("_JS_");
                     Integer pnum = Integer.valueOf(w.getProjectId().substring(substaion.length(), w.getProjectId().indexOf("_"))) * 1;
                     stationsb.append("P").append(pnum);

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/SttreeService.java

@@ -19,36 +19,96 @@ public class SttreeService {
         List<ProBasicWindpowerstation> wpls = CacheContext.wpls;//场站
         List<ProBasicProject> prols = CacheContext.prols;//期次
         List<ProBasicLine> list = CacheContext.lines;//线路
-        List<ProBasicWindturbine> wbls = CacheContext.windturbines;//线路
+        List<ProBasicWindturbine> wbls = CacheContext.windturbines;//风机
 
 //        if (energyls.get(0).getChildren().size() > 0) return energyls;
 
-        //集团-区域
-        energyls.forEach(regls -> {
-            List<ProBasicRegion> collect = regionsls.stream().filter(r -> r.getGroupId().equals(regls.getId())).collect(Collectors.toList());
-            if (null != regls.getChildren()) {
-                regls.getChildren().clear();
+        //集团-公司
+        energyls.forEach(cps -> {
+            List<ProBasicCompany> collect = cpls.stream().filter(r -> r.getGroupId().equals(cps.getId())).collect(Collectors.toList());
+            if (null != cps.getChildren()) {
+                cps.getChildren().clear();
             }
             collect.stream().forEach(c -> {
                 c.getChildren().clear();
             });
-            regls.getChildren().addAll(collect);
+            cps.getChildren().addAll(collect);
         });
 
         if ("1".equals(tag)) {
             return energyls;
         }
 
+        //公司-场站
+        cpls.forEach(wp -> {
+            List<ProBasicWindpowerstation> co = wpls.stream().filter(w -> null != w.getCompanyId() && w.getCompanyId().equals(wp.getId())).collect(Collectors.toList());
+            co.stream().forEach(c -> {
+                c.getChildren().clear();
+            });
+            wp.getChildren().addAll(co);
+        });
+        if ("2".equals(tag)) {
+            return energyls;
+        }
+
+        //场站-期次
+        wpls.forEach(pl -> {
+            List<ProBasicProject> cz = prols.stream().filter(p -> null != p.getWindpowerstationId() && p.getWindpowerstationId().equals(pl.getId())).collect(Collectors.toList());
+            cz.stream().forEach(c -> {
+                c.getChildren().clear();
+            });
+            pl.getChildren().addAll(cz);
+        });
+        if ("3".equals(tag)) {
+            return energyls;
+        }
+
+        //期次-线路
+        prols.forEach(ll -> {
+            List<ProBasicLine> lis = list.stream().filter(l -> null != l.getProjectId() && l.getProjectId().equals(ll.getId())).collect(Collectors.toList());
+            lis.stream().forEach(c -> {
+                c.getChildren().clear();
+            });
+            ll.getChildren().addAll(lis);
+        });
+        if ("4".equals(tag)) {
+            return energyls;
+        }
+        //线路-风机
+        list.forEach(fj -> {
+            List<ProBasicWindturbine> fjls = wbls.stream().filter(f -> null != f.getLineId() && f.getLineId().equals(fj.getId())).collect(Collectors.toList());
+            fj.getChildren().addAll(fjls);
+        });
+
+        return energyls;
+    }
+
+    //区域树
+    public List<ProBasicRegion> Regiontree(String tag) {
+
+        List<ProBasicEnergyGroup> energyls = CacheContext.energy;//集团
+        List<ProBasicRegion> regionsls = CacheContext.regions;//区域
+        List<ProBasicCompany> cpls = CacheContext.cpls;//公司
+        List<ProBasicWindpowerstation> wpls = CacheContext.wpls;//场站
+        List<ProBasicProject> prols = CacheContext.prols;//期次
+        List<ProBasicLine> list = CacheContext.lines;//线路
+        List<ProBasicWindturbine> wbls = CacheContext.windturbines;//线路
+
+//        if (energyls.get(0).getChildren().size() > 0) return energyls;
+
         //区域-公司
         regionsls.forEach(cp -> {
             List<ProBasicCompany> region = cpls.stream().filter(c -> null != c.getRegionId() && c.getRegionId().equals(cp.getId())).collect(Collectors.toList());
+            if (null != cp.getChildren()) {
+                cp.getChildren().clear();
+            }
             region.stream().forEach(r -> {
                 r.getChildren().clear();
             });
             cp.getChildren().addAll(region);
         });
-        if ("2".equals(tag)) {
-            return energyls;
+        if ("1".equals(tag)) {
+            return regionsls;
         }
 
         //公司-场站
@@ -59,8 +119,8 @@ public class SttreeService {
             });
             wp.getChildren().addAll(co);
         });
-        if ("3".equals(tag)) {
-            return energyls;
+        if ("2".equals(tag)) {
+            return regionsls;
         }
 
         //场站-期次
@@ -71,17 +131,20 @@ public class SttreeService {
             });
             pl.getChildren().addAll(cz);
         });
-        if ("4".equals(tag)) {
-            return energyls;
+        if ("3".equals(tag)) {
+            return regionsls;
         }
 
         //期次-线路
         prols.forEach(ll -> {
             List<ProBasicLine> lis = list.stream().filter(l -> null != l.getProjectId() && l.getProjectId().equals(ll.getId())).collect(Collectors.toList());
+            lis.stream().forEach(c -> {
+                c.getChildren().clear();
+            });
             ll.getChildren().addAll(lis);
         });
-        if ("5".equals(tag)) {
-            return energyls;
+        if ("4".equals(tag)) {
+            return regionsls;
         }
         //线路-风机
         list.forEach(fj -> {
@@ -89,6 +152,6 @@ public class SttreeService {
             fj.getChildren().addAll(fjls);
         });
 
-        return energyls;
+        return regionsls;
     }
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicEquipmentPointServiceImpl.java

@@ -25,7 +25,7 @@ import java.util.List;
 public class ProBasicEquipmentPointServiceImpl extends ServiceImpl<ProBasicEquipmentPointMapper, ProBasicEquipmentPoint> implements IProBasicEquipmentPointService {
 
     @Override
-    public IPage<ProBasicEquipmentPoint> list(String id, String code, String name, String model, String uniformCode, String pageNum, String pageSize) {
+    public IPage<ProBasicEquipmentPoint> list(String id, String code, String name, String aname,String model, String uniformCode, String pageNum, String pageSize) {
         QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)){
             qw.like("id",id);
@@ -37,6 +37,9 @@ public class ProBasicEquipmentPointServiceImpl extends ServiceImpl<ProBasicEquip
         if (StringUtils.isNotEmpty(name)){
             qw.like("name",name);
         }
+        if (StringUtils.isNotEmpty(aname)){
+            qw.like("aname",aname);
+        }
 
         if (StringUtils.isNotEmpty(model)){
             qw.like("model",model);

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicMeterPointServiceImpl.java

@@ -1,9 +1,13 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.ProBasicMeterPoint;
 import com.gyee.backconfig.mapper.auto.ProBasicMeterPointMapper;
 import com.gyee.backconfig.service.auto.IProBasicMeterPointService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProBasicMeterPointServiceImpl extends ServiceImpl<ProBasicMeterPointMapper, ProBasicMeterPoint> implements IProBasicMeterPointService {
 
+    @Override
+    public IPage<ProBasicMeterPoint> list(String id, String code, String windpowerstationId, String name, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicMeterPoint> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.like("id", id);
+        }
+        if (StringUtils.isNotEmpty(code)) {
+            qw.like("code", code);
+        }
+        if (StringUtils.isNotEmpty(windpowerstationId)) {
+            qw.like("windpowerstationId", windpowerstationId);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.like("name", name);
+        }
+        Page<ProBasicMeterPoint> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProBasicMeterPoint> MeterPage =getBaseMapper().selectPage(page, qw);
+        return MeterPage;
+    }
+
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicRegionServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.List;
 public class ProBasicRegionServiceImpl extends ServiceImpl<ProBasicRegionMapper, ProBasicRegion> implements IProBasicRegionService {
 
     @Override
-    public IPage<ProBasicRegion> list(String id, String name, String groupId, String aname, String pageNum, String pageSize) {
+    public IPage<ProBasicRegion> list(String id, String name, String aname, String code,String pageNum, String pageSize) {
         QueryWrapper<ProBasicRegion> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
@@ -32,16 +32,15 @@ public class ProBasicRegionServiceImpl extends ServiceImpl<ProBasicRegionMapper,
         }
 
         if (StringUtils.isNotEmpty(name)){
-            qw.eq("name",name);
+            qw.like("name",name);
         }
 
-        if (StringUtils.isNotEmpty(groupId)){
-            qw.like("groupId",groupId);
-        }
         if (StringUtils.isNotEmpty(aname)){
             qw.like("aname",aname);
         }
-
+        if (StringUtils.isNotEmpty(code)){
+            qw.like("code",code);
+        }
 
         Page<ProBasicRegion> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         IPage<ProBasicRegion> pageData = baseMapper.selectPage(page, qw);

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicWindsubStationServiceImpl.java

@@ -1,9 +1,14 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.backconfig.model.auto.ProBasicRegion;
 import com.gyee.backconfig.model.auto.ProBasicWindsubStation;
 import com.gyee.backconfig.mapper.auto.ProBasicWindsubStationMapper;
 import com.gyee.backconfig.service.auto.IProBasicWindsubStationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +22,25 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProBasicWindsubStationServiceImpl extends ServiceImpl<ProBasicWindsubStationMapper, ProBasicWindsubStation> implements IProBasicWindsubStationService {
 
+    @Override
+    public IPage<ProBasicWindsubStation> list(String id, String name, String code, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicWindsubStation> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(id)){
+            qw.eq("id",id);
+        }
+
+        if (StringUtils.isNotEmpty(name)){
+            qw.eq("name",name);
+        }
+
+        if (StringUtils.isNotEmpty(code)){
+            qw.like("code",code);
+        }
+
+
+        Page<ProBasicWindsubStation> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<ProBasicWindsubStation> pageData = baseMapper.selectPage(page, qw);
+        return pageData;
+    }
 }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/RegionServiceImpl.java

@@ -37,7 +37,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         }
 
         if (StringUtils.isNotEmpty(companyid)){
-            qw.eq("companyid",companyid);
+            qw.like("companyid",companyid);
         }
         if (StringUtils.isNotEmpty(aname)){
             qw.like("aname",aname);