Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,30 @@
+package com.gyee.backconfig.controller;
+
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.service.auto.PointGenerateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("//generate")
+public class PointGenerateController {
+
+    @Autowired
+    private PointGenerateService pointGenerateService;
+
+
+    @PostMapping(value = "/add")
+    public R addGeneratePoint(@RequestParam(value = "points", required = false) String[] points) {
+
+        int code = pointGenerateService.addGeneratePoint(points);
+
+        if (code > 0) {
+            return R.ok();
+        } else {
+            return R.ok().data("插入失败" + code + "条测点");
+        }
+    }
+}

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

@@ -1,9 +1,15 @@
 package com.gyee.backconfig.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicEquipmentPoint;
+import com.gyee.backconfig.service.auto.IProBasicEquipmentPointService;
+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.List;
 
 /**
  * <p>
@@ -16,5 +22,106 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("//pro-basic-equipment-point")
 public class ProBasicEquipmentPointController {
+    @Resource
+    private IProBasicEquipmentPointService proBasicEquipmentPointService;
+
+    /**
+     * 查询
+     *
+     * @param id
+     * @param code
+     * @param name
+     * @param model
+     * @param uniformCode
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @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 = "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);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 根据id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/{id}")
+    public R findOne(@PathVariable("id") String id) {
+
+        ProBasicEquipmentPoint pointnew = proBasicEquipmentPointService.getOne(id);
+        if (StringUtils.isNotNull(pointnew)) {
+            return R.ok().data(pointnew);
+        } else {
+            return R.error().data("查询失败！");
+        }
+
+    }
+
+
+    /**
+     * 插入（批量）
+     *
+     * @param pointnew
+     * @return
+     */
+    @PostMapping(value = "/add")
+    public R addAll(@RequestBody ProBasicEquipmentPoint pointnew) {
+
+        boolean b = proBasicEquipmentPointService.addOrUpdate(pointnew);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+
+    }
+
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        boolean b = proBasicEquipmentPointService.removeByIds(ids);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+
+    /**
+     * 批量修改
+     *
+     * @param list
+     * @return
+     */
+    @PutMapping(value = "/editPointnew")
+    public R update(@RequestBody List<ProBasicEquipmentPoint> list) {
+        boolean b = proBasicEquipmentPointService.updateBatchById(list);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("更新失败！");
+        }
+    }
+
 
 }

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

@@ -1,9 +1,15 @@
 package com.gyee.backconfig.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicWppoint;
+import com.gyee.backconfig.service.auto.IProBasicWppointService;
+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.List;
 
 /**
  * <p>
@@ -16,5 +22,105 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("//pro-basic-wppoint")
 public class ProBasicWppointController {
+    @Resource
+    private IProBasicWppointService proBasicWppointService;
+
+    /**
+     * 查询
+     *
+     * @param id
+     * @param code
+     * @param name
+     * @param model
+     * @param uniformCode
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @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 = "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<ProBasicWppoint> list = proBasicWppointService.list(id, code, name, model, uniformCode, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 根据id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/{id}")
+    public R findOne(@PathVariable("id") String id) {
+
+        ProBasicWppoint pointnew = proBasicWppointService.getOne(id);
+        if (StringUtils.isNotNull(pointnew)) {
+            return R.ok().data(pointnew);
+        } else {
+            return R.error().data("查询失败！");
+        }
+
+    }
+
+
+    /**
+     * 插入（批量）
+     *
+     * @param pointnew
+     * @return
+     */
+    @PostMapping(value = "/add")
+    public R addAll(@RequestBody ProBasicWppoint pointnew) {
+
+        boolean b = proBasicWppointService.addOrUpdate(pointnew);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+
+    }
+
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        boolean b = proBasicWppointService.removeByIds(ids);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+
+    /**
+     * 批量修改
+     *
+     * @param list
+     * @return
+     */
+    @PutMapping(value = "/editPointnew")
+    public R update(@RequestBody List<ProBasicWppoint> list) {
+        boolean b = proBasicWppointService.updateBatchById(list);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("更新失败！");
+        }
+    }
 
 }

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

@@ -0,0 +1,143 @@
+package com.gyee.backconfig.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.Standardpoint;
+import com.gyee.backconfig.service.auto.IStandardpointService;
+import com.gyee.common.model.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-24
+ */
+@RestController
+@RequestMapping("//standardpoint")
+public class StandardpointController {
+    @Resource
+    private IStandardpointService standardpointService;
+
+    /**
+     * 查询
+     * @param id
+     * @param uniformcode
+     * @param name
+     * @param type
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/list")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "uniformcode", required = false) String uniformcode,
+                      @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "type", required = false) String type,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<Standardpoint> list = standardpointService.list(id, uniformcode, name, type, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+
+    /**
+     * 根据id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/{id}")
+    public R findOne(@PathVariable("id") String id) {
+
+        Standardpoint standardpoint = standardpointService.getOne(id);
+        if (StringUtils.isNotNull(standardpoint)) {
+            return R.ok().data(standardpoint);
+        } else {
+            return R.error().data("查询失败！");
+        }
+
+    }
+
+
+    /**
+     * 插入（批量）
+     *
+     * @param standardpoint
+     * @return
+     */
+    @PostMapping(value = "/add")
+    public R addAll(@RequestBody Standardpoint standardpoint) {
+
+        boolean b = standardpointService.addOrUpdate(standardpoint);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+
+    }
+
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        boolean b = standardpointService.removeByIds(ids);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+
+    /**
+     * 批量修改
+     *
+     * @param list
+     * @return
+     */
+    @PutMapping(value = "/editStandardpoint")
+    public R update(@RequestBody List<Standardpoint> list) {
+        boolean b = standardpointService.updateBatchById(list);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("更新失败！");
+        }
+
+    }
+
+
+    /**
+     * 查询
+     *
+     * @param type
+     * @return
+     */
+    @GetMapping(value = "/pointcode")
+    public R findList(
+            @RequestParam(value = "type", required = false) String type) {
+        String code = standardpointService.getPointCode(type);
+        if (null != code) {
+            return R.ok().data(code);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/StandardpointMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.gyee.backconfig.model.auto.Standardpoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-24
+ */
+public interface StandardpointMapper extends BaseMapper<Standardpoint> {
+
+}

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

@@ -1,8 +1,11 @@
 package com.gyee.backconfig.model.auto;
 
 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;
@@ -69,4 +72,7 @@ public class ProBasicLine extends Model {
     private Integer quantity;
 
     private Integer isAble;
+
+    @TableField(exist = false)
+    private List<ProBasicWindturbine> Children = new ArrayList<>();
 }

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

@@ -0,0 +1,35 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Standardpoint extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String uniformcode;
+
+    private String name;
+
+    private String type;
+
+    /**
+     * 标签点代码（类型为计算点时必填）
+     */
+    private String point;
+
+
+}

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

@@ -5,6 +5,8 @@ import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gyee.backconfig.model.auto.ProBasicRegion;
 
+import java.util.List;
+
 /**
  * <p>
  * 集团 服务类
@@ -15,4 +17,5 @@ import com.gyee.backconfig.model.auto.ProBasicRegion;
  */
 public interface IProBasicEnergyGroupService extends IService<ProBasicEnergyGroup> {
     IPage<ProBasicEnergyGroup> list(String id, String name, String aname, String pageNum, String pageSize);
+    List<ProBasicEnergyGroup> getCompanysByidAndRid(String id);
 }

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

@@ -1,8 +1,11 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicEquipmentPoint;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备测点 服务类
@@ -12,5 +15,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @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);
+
+    ProBasicEquipmentPoint getOne(String id);
+
+    boolean addOrUpdate(ProBasicEquipmentPoint pointnew);
+
+    boolean removeByIds(String ids);
 
+    List<ProBasicEquipmentPoint> list(String windpowerstationId , String uniformCode);
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicLine;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 集电线路 服务类
@@ -14,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProBasicLineService extends IService<ProBasicLine> {
     IPage<ProBasicLine> list(String id,String code, String name, String aname, String pageNum, String pageSize);
+
+    List<ProBasicLine> getList(String projectId);
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicProject;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 工程表 服务类
@@ -14,4 +16,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProBasicProjectService extends IService<ProBasicProject> {
     IPage<ProBasicProject> getList(String id, String name, String code, String windpowerstationId, String pageNum, String pageSize);
+
+    List<ProBasicProject> getList(String windpowerstationId);
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicRegion;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 区域 服务类
@@ -14,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProBasicRegionService extends IService<ProBasicRegion> {
     IPage<ProBasicRegion> list(String id, String name, String groupId, String aname, String pageNum, String pageSize);
+    List<ProBasicRegion> getReginBycode(String groupId);
 }

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

@@ -3,6 +3,9 @@ package com.gyee.backconfig.service.auto;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicWindpowerstation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.vo.WindpowerstationAdmVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +17,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProBasicWindpowerstationService extends IService<ProBasicWindpowerstation> {
     IPage<ProBasicWindpowerstation> getList(String id, String name, String code, String companyId, String pageNum, String pageSize);
+    List<ProBasicWindpowerstation> getList(String regionId);
+
+
+    List<WindpowerstationAdmVo> getList(String regionid, String companyid) throws Exception;
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicWindturbine;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 风机 服务类
@@ -15,4 +17,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IProBasicWindturbineService extends IService<ProBasicWindturbine> {
     IPage<ProBasicWindturbine> list(String id, String code, String windpowerstationId, String projectId, String lineId, String pageNum, String pageSize);
 
+    List<ProBasicWindturbine> getWindturbineGyLine(String windpowerstationId, String projectId , String lineId);
+
 }

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

@@ -1,8 +1,12 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.ProBasicEquipmentPoint;
 import com.gyee.backconfig.model.auto.ProBasicWppoint;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 场站测点 服务类
@@ -12,5 +16,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-10-15
  */
 public interface IProBasicWppointService extends IService<ProBasicWppoint> {
+    IPage<ProBasicWppoint> list(String id, String code, String name, String model, String uniformCode, String pageNum, String pageSize);
+
+    boolean addOrUpdate(ProBasicWppoint pointnew);
+
+    ProBasicWppoint getOne(String id);
+
+    boolean removeByIds(String ids);
+
 
+    List<ProBasicWppoint> getStationpointByUniformcode(String windpowerstationId, String uniformCode);
 }

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

@@ -0,0 +1,31 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.Standardpoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-24
+ */
+public interface IStandardpointService extends IService<Standardpoint> {
+    IPage<Standardpoint> list(String id, String uniformcode, String name, String type, String pageNum, String pageSize);
+
+    Standardpoint getOne(String id);
+
+    boolean addOrUpdate(Standardpoint standardpoint);
+
+    boolean  removeByIds(String ids);
+
+    List<Standardpoint> list(String[] uniformcodes);
+
+    String getPointCode(String type);
+
+    List<Standardpoint> list(String uniformcode);
+}

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

@@ -0,0 +1,312 @@
+package com.gyee.backconfig.service.auto;
+
+
+import com.gyee.backconfig.model.auto.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 生成测点服务类
+ */
+@Service
+public class PointGenerateService {
+    private static Logger logger = LoggerFactory.getLogger(PointGenerateService.class);
+
+    @Resource
+    private IProBasicEnergyGroupService proBasicEnergyGroupService;//集团
+
+    @Autowired
+    private IProBasicRegionService proBasicRegionService;//区域
+
+    @Resource
+    private IProBasicCompanyService proBasicCompanyService;//公司
+
+    @Resource
+    private IProBasicWindpowerstationService proBasicWindpowerstationService;//场站
+
+    @Resource
+    private IProBasicProjectService proBasicProjectService;//期次
+
+    @Resource
+    private IProBasicLineService proBasicLineService;//线路
+
+    @Autowired
+    private IProBasicWindturbineService proBasicWindturbineService;//风机
+
+    @Autowired
+    private IProBasicWppointService proBasicWppointService;//场站测点
+
+    @Autowired
+    private IProBasicEquipmentPointService proBasicEquipmentPointService;//设备测点
+
+    @Autowired
+    private IStandardpointService standardpointService;
+
+    public int addGeneratePoint(String[] points) {
+        int num = 0;
+
+        List<Standardpoint> pointList = standardpointService.list(points);
+        List<ProBasicEnergyGroup> companysList = proBasicEnergyGroupService.getCompanysByidAndRid("");
+
+        for (Standardpoint p : pointList) {
+
+            if ("czjs".equals(p.getType())) {
+
+                List<ProBasicWppoint> staionList = fjd(p, companysList);
+                for (ProBasicWppoint i : staionList) {
+                    boolean b = proBasicWppointService.addOrUpdate(i);
+                    if (!b) {
+                        logger.error(i.getCode() + "测点插入失败");
+                        num++;
+                    }
+                }
+
+            } else {
+                //fjjs
+                //fjjcd
+
+                for (ProBasicEnergyGroup c : companysList) {
+                    List<ProBasicRegion> regionList = proBasicRegionService.getReginBycode(c.getCapacityUnit());
+                    for (ProBasicRegion r : regionList) {
+                        List<ProBasicWindpowerstation> windpowerstationList = proBasicWindpowerstationService.getList(r.getId());
+                        List<ProBasicEquipmentPoint> testingList = czd(p, windpowerstationList, r);
+                        for (ProBasicEquipmentPoint i : testingList) {
+                            boolean b = proBasicEquipmentPointService.addOrUpdate(i);
+                            if (!b) {
+                                logger.error(i.getCode() + "测点插入失败");
+                                num++;
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
+
+        return num;
+    }
+    private List<ProBasicWppoint> fjd(Standardpoint p, List<ProBasicEnergyGroup> companysList) {
+        List<ProBasicWppoint> stationList = new ArrayList<>();
+
+        ProBasicWppoint stationpoint = null;
+
+        List<String> gflist = new ArrayList<>();
+        gflist.add("G");
+        gflist.add("F");
+
+        for (ProBasicEnergyGroup c : companysList) {
+            StringBuilder gssb = null;
+            List<ProBasicWppoint> list1 = proBasicWppointService.getStationpointByUniformcode(c.getId(), p.getUniformcode());
+            if (null == list1 || list1.size() <= 0) {
+                //"JSFW.QY_JN_XXXX_XX_XX_XX_XXX_CI0144"	"区域限电停机台数（明细）"
+                gssb = new StringBuilder();
+                gssb.append("JSFW.").append(c.getId()).append("_");
+                stationpoint = new ProBasicWppoint();
+                stationpoint.setCode(gssb.toString() + "XXXX_XX_XX_XX_XXX_" + p.getPoint());
+                stationpoint.setName(c.getName() + p.getName());
+                stationpoint.setUniformCode(p.getUniformcode());
+                stationpoint.setWindpowerstationId(c.getId());
+                stationpoint.setRealtimeId("JSFW");
+                stationList.add(stationpoint);
+            }
+
+
+            for (String gf : gflist) {
+                List<ProBasicWppoint> list1df = proBasicWppointService.getStationpointByUniformcode(c.getId() + "_" + gf, p.getUniformcode());
+                if (null == list1df || list1df.size() <= 0) {
+                    //"JSFW.QY_JN_QYG_XX_XX_XX_XXX_CI0144"	"区域光伏限电停机台数（明细）"
+                    //"JSFW.QY_JN_QYF_XX_XX_XX_XXX_CI0144"	"区域风场限电停机台数（明细）"
+                    StringBuilder gsgfsb = new StringBuilder(gssb);
+                    gsgfsb.append(c.getId()).append(gf)
+                            .append("_XX_XX_XX_XXX_")
+                            .append(p.getPoint());
+                    stationpoint = new ProBasicWppoint();
+                    stationpoint.setCode(gsgfsb.toString());
+                    stationpoint.setName(c.getName() + p.getName());
+                    stationpoint.setUniformCode(p.getUniformcode());
+                    stationpoint.setWindpowerstationId(c.getId() + "_" + gf);
+                    stationpoint.setRealtimeId("JSFW");
+                    stationList.add(stationpoint);
+                }
+            }
+
+            List<ProBasicRegion> regionList = proBasicRegionService.getReginBycode(c.getCapacityUnit());
+
+
+            for (ProBasicRegion r : regionList) {
+
+
+                StringBuilder qusb = new StringBuilder();
+                List<ProBasicWppoint> list2 = proBasicWppointService.getStationpointByUniformcode(r.getId(), p.getUniformcode());
+                if (null == list2 || list2.size() <= 0) {
+                    //"JSFW.SX_JN_XXXX_XX_XX_XX_XXX_CI0144"	"山西限电停机台数（明细）"
+
+                    qusb.append("JSFW.").append(c.getId()).append("_");
+                    qusb.append(r.getId()).append("_");
+                    stationpoint = new ProBasicWppoint();
+                    stationpoint.setCode(gssb.toString() + "XX_XX_XX_XXX_" + p.getPoint());
+                    stationpoint.setName(c.getName() + p.getName());
+                    stationpoint.setUniformCode(p.getUniformcode());
+                    stationpoint.setWindpowerstationId(r.getId());
+                    stationpoint.setRealtimeId("JSFW");
+                    stationList.add(stationpoint);
+                }
+
+                for (String gf : gflist) {
+                    List<ProBasicWppoint> list2df = proBasicWppointService.getStationpointByUniformcode(r.getId() + "_" + gf, p.getUniformcode());
+                    if (null == list2df || list2df.size() <= 0) {
+                        //"JSFW.SX_JN_SXG_XX_XX_XX_XXX_CI0144"	"山西光伏限电停机台数（明细）"
+                        //"JSFW.SX_JN_SXF_XX_XX_XX_XXX_CI0144"	"山西风场限电停机台数（明细）"
+                        StringBuilder qugfsb = new StringBuilder(qusb);
+                        qugfsb.append(gf)
+                                .append("_XX_XX_XX_XXX_")
+                                .append(p.getPoint());
+                        stationpoint = new ProBasicWppoint();
+                        stationpoint.setCode(qugfsb.toString());
+                        stationpoint.setName(c.getName() + p.getName());
+                        stationpoint.setUniformCode(p.getUniformcode());
+                        stationpoint.setWindpowerstationId(r.getId() + "_" + gf);
+                        stationpoint.setRealtimeId("JSFW");
+                        stationList.add(stationpoint);
+
+                    }
+                }
+
+
+                List<ProBasicWindpowerstation> windpowerstationList = proBasicWindpowerstationService.getList(r.getId());
+                for (ProBasicWindpowerstation station : windpowerstationList) {
+                    List<ProBasicWppoint> list3 = proBasicWppointService.getStationpointByUniformcode(station.getId(), p.getUniformcode());
+                    if (null != list3 && list3.size() > 0) {
+                        continue;
+                    }
+                    stationpoint = new ProBasicWppoint();
+                    //BHBFCJSFW.SX_JN_BHBF_JS_XX_XX_XXX_CI0079
+                    //SYGCJSFW.SX_JN_SYG_JS_XX_XX_XXX_CI0001
+                    //HSMFCJSFW.SX_JN_HSMF_JS_XX_XX_XXX_AI0002
+
+                    //场站测点
+                    StringBuilder stationsb = new StringBuilder();
+                    String substaion = station.getId().substring(0, station.getId().indexOf("_"));
+                    stationsb.append(substaion).append(station.getId().endsWith("_FDC") ? "FCJSFW." : "GCJSFW.");
+                    stationsb.append(c.getId()).append("_").append(r.getId()).append("_").append(substaion);
+                    stationsb.append(station.getId().endsWith("_FDC") ? "F" : "G").append("_");
+
+                    stationpoint.setCode(stationsb.toString() + "XX_XX_XXX_" + p.getPoint());
+                    stationpoint.setName(station.getName() + p.getName());
+                    stationpoint.setUniformCode(p.getUniformcode());
+                    stationpoint.setWindpowerstationId(station.getId());
+                    stationpoint.setRealtimeId(substaion + (station.getId().endsWith("_FDC") ? "FCJSFW" : "GCJSFW"));
+                    stationList.add(stationpoint);
+
+                    List<ProBasicProject> projectList = proBasicProjectService.getList(station.getId());
+                    for (ProBasicProject project : projectList) {
+                        List<ProBasicWppoint> list4 = proBasicWppointService.getStationpointByUniformcode(project.getId(), p.getUniformcode());
+                        if (null != list4 && list4.size() > 0) {
+                            continue;
+                        }
+                        //期次测点
+                        stationpoint = new ProBasicWppoint();
+                        StringBuilder projectsb = new StringBuilder(stationsb);
+                        Integer pnum = Integer.valueOf(project.getId().substring(substaion.length(), project.getId().indexOf("_"))) * 1;
+                        projectsb.append("P")
+                                .append(pnum);
+
+                        stationpoint.setCode(projectsb.toString() + "_XX_XXX_" + p.getPoint());
+                        stationpoint.setName(project.getName() + p.getName());
+                        stationpoint.setUniformCode(p.getUniformcode());
+                        stationpoint.setWindpowerstationId(project.getId());
+                        stationpoint.setRealtimeId(substaion + (station.getId().endsWith("_FDC") ? "FCJSFW" : "GCJSFW"));
+                        stationList.add(stationpoint);
+
+                        List<ProBasicLine> lineList = proBasicLineService.getList(project.getId());
+                        for (ProBasicLine l : lineList) {
+
+                            List<ProBasicWppoint> list5 = proBasicWppointService.getStationpointByUniformcode(l.getId(), p.getUniformcode());
+                            if (null != list5 && list5.size() > 0) {
+                                continue;
+                            }
+                            stationpoint = new ProBasicWppoint();
+                            //线路测点
+                            StringBuilder linesb = new StringBuilder(projectsb);
+
+                            Integer lnum = Integer.valueOf(l.getId().substring(substaion.length(), project.getId().indexOf("_"))) * 1;
+                            linesb.append("_L").append(lnum)
+                                    .append("_XXX_").append(p.getPoint());
+
+                            stationpoint.setCode(linesb.toString());
+                            stationpoint.setName(l.getName() + p.getName());
+                            stationpoint.setUniformCode(p.getUniformcode());
+                            stationpoint.setWindpowerstationId(l.getId());
+                            stationpoint.setRealtimeId(substaion + (station.getId().endsWith("_FDC") ? "FCJSFW" : "GCJSFW"));
+                            stationList.add(stationpoint);
+
+                        }
+                    }
+                }
+            }
+        }
+
+        return stationList;
+
+    }
+
+
+    /**
+     * @param p
+     * @param windpowerstationList
+     * @return
+     */
+    private List<ProBasicEquipmentPoint> czd(Standardpoint p, List<ProBasicWindpowerstation> windpowerstationList,ProBasicRegion region) {
+        ProBasicEquipmentPoint testing = null;
+        List<ProBasicEquipmentPoint> testingList = new ArrayList<>();
+        for (ProBasicWindpowerstation station : windpowerstationList) {
+
+
+            List<ProBasicWindturbine> windturbineList = proBasicWindturbineService.getWindturbineGyLine(station.getId(), "", "");
+            for (ProBasicWindturbine w : windturbineList) {
+                List<ProBasicEquipmentPoint> list = proBasicEquipmentPointService.list(w.getId(), p.getUniformcode());
+                if (null != list && list.size() > 0) {
+                    continue;
+                }
+                testing = new ProBasicEquipmentPoint();
+                //fjjs
+                //fjjcd
+                String substaion = station.getId().substring(0, station.getId().indexOf("_"));
+                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(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);
+                    Integer lnum = Integer.valueOf(w.getLineId().substring(substaion.length(), w.getLineId().indexOf("_"))) * 1;
+                    stationsb.append("_L").append(lnum);
+                    String wnum = w.getId().substring(w.getId().indexOf("_") + 1, w.getId().length());
+                    stationsb.append("_").append(wnum).append("_");
+
+                    //BHB3FJJSFW.SX_JN_BHB3F_JS_P1_L30_001_CI0060
+                    //SYGFJSFW.SX_JN_SYG_JS_P2_L3_NBQ0061_CI0174
+                    testing.setCode(stationsb.toString() + p.getPoint());
+                    testing.setRealtimeId(substaion + (station.getId().endsWith("_FDC") ? "FJJSFW" : "GFJSFW"));
+                } else if ("fjjcd".equals(p.getType())) {
+                    testing.setCode("INITIAL");
+                    testing.setRealtimeId(substaion + (station.getId().endsWith("_FDC") ? "FJ" : "GF"));
+                }
+
+                testing.setName(w.getName() + p.getName());
+                testing.setUniformCode(p.getUniformcode());
+                testing.setWindpowerstationId(w.getId());
+                testingList.add(testing);
+            }
+        }
+
+        return testingList;
+
+    }
+}

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

@@ -11,14 +11,15 @@ import java.util.stream.Collectors;
 
 @Service
 public class SttreeService {
-    public List<ProBasicEnergyGroup>  energytree(String tag) {
+    public List<ProBasicEnergyGroup> energytree(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<ProBasicLine> list = CacheContext.lines;//线路
+        List<ProBasicWindturbine> wbls = CacheContext.windturbines;//线路
 
 //        if (energyls.get(0).getChildren().size() > 0) return energyls;
 
@@ -28,49 +29,49 @@ public class SttreeService {
             if (null != regls.getChildren()) {
                 regls.getChildren().clear();
             }
-            collect.stream().forEach(c->{
+            collect.stream().forEach(c -> {
                 c.getChildren().clear();
             });
             regls.getChildren().addAll(collect);
         });
 
-        if("1".equals(tag)){
+        if ("1".equals(tag)) {
             return energyls;
         }
 
         //区域-公司
         regionsls.forEach(cp -> {
             List<ProBasicCompany> region = cpls.stream().filter(c -> null != c.getRegionId() && c.getRegionId().equals(cp.getId())).collect(Collectors.toList());
-            region.stream().forEach(r->{
+            region.stream().forEach(r -> {
                 r.getChildren().clear();
             });
             cp.getChildren().addAll(region);
         });
-        if("2".equals(tag)){
+        if ("2".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->{
+            co.stream().forEach(c -> {
                 c.getChildren().clear();
             });
             wp.getChildren().addAll(co);
         });
-        if("3".equals(tag)){
+        if ("3".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->{
+            cz.stream().forEach(c -> {
                 c.getChildren().clear();
             });
             pl.getChildren().addAll(cz);
         });
-        if("4".equals(tag)){
+        if ("4".equals(tag)) {
             return energyls;
         }
 
@@ -79,6 +80,14 @@ public class SttreeService {
             List<ProBasicLine> lis = list.stream().filter(l -> null != l.getProjectId() && l.getProjectId().equals(ll.getId())).collect(Collectors.toList());
             ll.getChildren().addAll(lis);
         });
+        if ("5".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;
     }

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

@@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 集团 服务实现类
@@ -43,4 +45,14 @@ public class ProBasicEnergyGroupServiceImpl extends ServiceImpl<ProBasicEnergyGr
         return pageData;
 
     }
+
+    @Override
+    public List<ProBasicEnergyGroup> getCompanysByidAndRid(String id) {
+        QueryWrapper<ProBasicEnergyGroup> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)){
+            qw.like("id",id);
+        }
+        List<ProBasicEnergyGroup> list = baseMapper.selectList(qw);
+        return list;
+    }
 }

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

@@ -1,11 +1,18 @@
 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.ProBasicEquipmentPoint;
 import com.gyee.backconfig.mapper.auto.ProBasicEquipmentPointMapper;
 import com.gyee.backconfig.service.auto.IProBasicEquipmentPointService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * <p>
  * 设备测点 服务实现类
@@ -17,4 +24,62 @@ import org.springframework.stereotype.Service;
 @Service
 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) {
+        QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)){
+            qw.like("id",id);
+        }
+        if (StringUtils.isNotEmpty(code)){
+            qw.like("code",code);
+        }
+
+        if (StringUtils.isNotEmpty(name)){
+            qw.like("name",name);
+        }
+
+        if (StringUtils.isNotEmpty(model)){
+            qw.like("model",model);
+        }
+
+        if (StringUtils.isNotEmpty(uniformCode)){
+            qw.eq("uniformCode",uniformCode);
+        }
+
+        Page<ProBasicEquipmentPoint> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<ProBasicEquipmentPoint> EquipmentPage = getBaseMapper().selectPage(page, qw);
+        return EquipmentPage;
+    }
+
+    @Override
+    public ProBasicEquipmentPoint getOne(String id) {
+        ProBasicEquipmentPoint pointnew =  this.getById(id);
+        return pointnew;
+    }
+
+    @Override
+    public boolean addOrUpdate(ProBasicEquipmentPoint pointnew) {
+        boolean b = this.saveOrUpdate(pointnew);
+        return b;
+    }
+
+    @Override
+    public boolean removeByIds(String ids) {
+        String[] strings = ids.split(",");
+        boolean b = this.removeByIds(Arrays.asList(strings));
+        return b;
+    }
+
+    @Override
+    public List<ProBasicEquipmentPoint> list(String windpowerstationId, String uniformCode) {
+        QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(uniformCode)){
+            qw.eq("uniformCode",uniformCode);
+        }
+        if (StringUtils.isNotEmpty(windpowerstationId)){
+            qw.eq("windpowerstationId",windpowerstationId);
+        }
+        List<ProBasicEquipmentPoint> list = baseMapper.selectList(qw);
+        return list;
+    }
 }

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

@@ -44,4 +44,16 @@ public class ProBasicLineServiceImpl extends ServiceImpl<ProBasicLineMapper, Pro
         return ProBasicLine;
     }
 
+    @Override
+    public List<ProBasicLine> getList(String projectId) {
+        QueryWrapper<ProBasicLine> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotEmpty(projectId)){
+            qw.eq("projectid",projectId);
+        }
+        List<ProBasicLine> list = baseMapper.selectList(qw);
+        return list;
+    }
+
 }

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

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 工程表 服务实现类
@@ -45,4 +47,16 @@ public class ProBasicProjectServiceImpl extends ServiceImpl<ProBasicProjectMappe
         IPage<ProBasicProject> ProjectPage = getBaseMapper().selectPage(page, qw);
         return ProjectPage;
     }
+
+    @Override
+    public List<ProBasicProject> getList(String windpowerstationId) {
+        QueryWrapper<ProBasicProject> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotEmpty(windpowerstationId)){
+            qw.like("windpowerstationId",windpowerstationId);
+        }
+        List<ProBasicProject> list = baseMapper.selectList(qw);
+        return list;
+    }
 }

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

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 区域 服务实现类
@@ -45,4 +47,15 @@ public class ProBasicRegionServiceImpl extends ServiceImpl<ProBasicRegionMapper,
         IPage<ProBasicRegion> pageData = baseMapper.selectPage(page, qw);
         return pageData;
     }
+
+    @Override
+    public List<ProBasicRegion> getReginBycode(String groupId) {
+        QueryWrapper<ProBasicRegion> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(groupId)){
+            qw.eq("groupId",groupId);
+        }
+
+        List<ProBasicRegion> list = baseMapper.selectList(qw);
+        return list;
+    }
 }

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

@@ -7,9 +7,12 @@ import com.gyee.backconfig.model.auto.ProBasicWindpowerstation;
 import com.gyee.backconfig.mapper.auto.ProBasicWindpowerstationMapper;
 import com.gyee.backconfig.service.auto.IProBasicWindpowerstationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.backconfig.vo.WindpowerstationAdmVo;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 场站表 服务实现类
@@ -47,4 +50,21 @@ public class ProBasicWindpowerstationServiceImpl extends ServiceImpl<ProBasicWin
         return companysPage;
 
     }
+
+    @Override
+    public List<ProBasicWindpowerstation> getList(String regionId) {
+        QueryWrapper<ProBasicWindpowerstation> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(regionId)){
+            qw.eq("regionid",regionId);
+        }
+
+        List<ProBasicWindpowerstation> list = baseMapper.selectList(qw);
+        return list;
+    }
+
+    @Override
+    public List<WindpowerstationAdmVo> getList(String regionid, String companyid) throws Exception {
+        return null;
+    }
 }

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

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 风机 服务实现类
@@ -49,4 +51,23 @@ public class ProBasicWindturbineServiceImpl extends ServiceImpl<ProBasicWindturb
         return companysPage;
 
     }
+
+    @Override
+    public List<ProBasicWindturbine> getWindturbineGyLine(String windpowerstationId, String projectId, String lineId) {
+        QueryWrapper<ProBasicWindturbine> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(windpowerstationId)){
+            qw.eq("windpowerstationId",windpowerstationId);
+        }
+        if (StringUtils.isNotEmpty(lineId)){
+            qw.eq("lineId",lineId);
+        }
+        if (StringUtils.isNotEmpty(projectId)){
+            qw.eq("projectId",projectId);
+        }
+
+        List<ProBasicWindturbine> list =  baseMapper.selectList(qw);
+
+        return list;
+    }
 }

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

@@ -1,11 +1,19 @@
 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.ProBasicEquipmentPoint;
 import com.gyee.backconfig.model.auto.ProBasicWppoint;
 import com.gyee.backconfig.mapper.auto.ProBasicWppointMapper;
 import com.gyee.backconfig.service.auto.IProBasicWppointService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * <p>
  * 场站测点 服务实现类
@@ -17,4 +25,63 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProBasicWppointServiceImpl extends ServiceImpl<ProBasicWppointMapper, ProBasicWppoint> implements IProBasicWppointService {
 
+    @Override
+    public IPage<ProBasicWppoint> list(String id, String code, String name, String model, String uniformCode, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicWppoint> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.like("id", id);
+        }
+        if (StringUtils.isNotEmpty(code)) {
+            qw.like(code, "code");
+        }
+        if (StringUtils.isNotEmpty(model)) {
+            qw.like(model, "model");
+        }
+        if (StringUtils.isNotEmpty(uniformCode)) {
+            qw.eq(uniformCode, "uniformCode");
+        }
+
+        Page<ProBasicWppoint> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProBasicWppoint> companysPage = getBaseMapper().selectPage(page, qw);
+        return companysPage;
+    }
+
+    @Override
+    public boolean addOrUpdate(ProBasicWppoint pointnew) {
+        boolean b = this.saveOrUpdate(pointnew);
+        return b;
+    }
+
+    @Override
+    public ProBasicWppoint getOne(String id) {
+        ProBasicWppoint pointnew =  this.getById(id);
+        return pointnew;
+    }
+
+    @Override
+    public boolean removeByIds(String ids) {
+        String[] strings = ids.split(",");
+        boolean b = this.removeByIds(Arrays.asList(strings));
+        return b;
+
+    }
+
+    @Override
+    public List<ProBasicWppoint> getStationpointByUniformcode(String windpowerstationId, String uniformCode) {
+        QueryWrapper<ProBasicWppoint> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotEmpty(uniformCode)){
+            qw.eq("uniformCode",uniformCode);
+        }
+
+        if (StringUtils.isNotEmpty(windpowerstationId)){
+            qw.eq("windpowerstationId",windpowerstationId);
+        }
+
+        List<ProBasicWppoint> list = baseMapper.selectList(qw);
+
+        return list;
+    }
+
 }

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

@@ -0,0 +1,118 @@
+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.Standardpoint;
+import com.gyee.backconfig.mapper.auto.StandardpointMapper;
+import com.gyee.backconfig.service.auto.IStandardpointService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-24
+ */
+@Service
+public class StandardpointServiceImpl extends ServiceImpl<StandardpointMapper, Standardpoint> implements IStandardpointService {
+
+    @Override
+    public IPage<Standardpoint> list(String id, String uniformcode, String name, String type, String pageNum, String pageSize) {
+        QueryWrapper<Standardpoint> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(id)){
+            qw.eq("id",id);
+        }
+
+        if (StringUtils.isNotEmpty(uniformcode)){
+            qw.like("uniformcode",uniformcode);
+        }
+
+        if (StringUtils.isNotEmpty(name)){
+            qw.like("name",name);
+        }
+        if (StringUtils.isNotEmpty(type)){
+            qw.eq("type",type);
+        }
+
+        Page<Standardpoint> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<Standardpoint> companysPage = getBaseMapper().selectPage(page, qw);
+        return companysPage;
+    }
+
+    @Override
+    public Standardpoint getOne(String id) {
+        Standardpoint standardpoint =  this.getById(id);
+        return standardpoint;
+    }
+
+    @Override
+    public boolean addOrUpdate(Standardpoint standardpoint) {
+        boolean b = this.saveOrUpdate(standardpoint);
+        return b;
+    }
+
+    @Override
+    public boolean removeByIds(String ids) {
+        String[] strings = ids.split(",");
+        boolean b = this.removeByIds(Arrays.asList(strings));
+        return b;
+    }
+
+    @Override
+    public List<Standardpoint> list(String[] uniformcodes) {
+        QueryWrapper<Standardpoint> qw = new QueryWrapper<>();
+
+
+
+        if (StringUtils.isNotEmpty(uniformcodes)){
+            qw.in("uniformcode",uniformcodes);
+        }
+        List<Standardpoint> list = baseMapper.selectList(qw);
+        return list;
+    }
+
+    @Override
+    public String getPointCode(String type) {
+
+        String code = "CI";
+
+        if (!type.endsWith("js")){
+            return "0000";
+        }
+        QueryWrapper<Standardpoint> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(type)){
+            qw.eq("type",type);
+        }
+        int count = baseMapper.selectCount(qw)+1;
+        if (count <= 0){
+            count = 1;
+        }
+
+        String strcount = String.valueOf(count);
+        for(int i=0;i<5-strcount.length();i++){
+
+            code = code+"0";
+        }
+        return code+strcount;
+    }
+
+    @Override
+    public List<Standardpoint> list(String uniformcode) {
+        QueryWrapper<Standardpoint> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(uniformcode)){
+            qw.eq("uniformcode",uniformcode);
+        }
+        List<Standardpoint> list = baseMapper.selectList(qw);
+        return list;
+    }
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/vo/WindpowerstationAdmVo.java

@@ -0,0 +1,75 @@
+package com.gyee.backconfig.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class WindpowerstationAdmVo {
+
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 电话
+     */
+    private String telephone;
+
+    /**
+     * 装机容量
+     */
+    private BigDecimal capacity;
+
+    /**
+     * 容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 装机数量
+     */
+    private Integer quantity;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+    /**
+     * 系统厂家
+     */
+    private String systemManufact;
+    /**
+     * 机型
+     */
+    private String model;
+    /**
+     * 场站编号
+     */
+    private String windpowerstationId;
+
+    private double rpjfs;
+
+    private double rfdl;
+
+
+}

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/RealtimedatabaseconfigurationController.java

@@ -11,6 +11,7 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 
 /**
+ * 实时库配置
  * <p>
  * 前端控制器
  * </p>
@@ -50,6 +51,7 @@ public class RealtimedatabaseconfigurationController {
 
     /**
      * 批量插入
+     *
      * @param realtimedatabaseconfiguration
      * @return
      */
@@ -65,6 +67,7 @@ public class RealtimedatabaseconfigurationController {
 
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/WindpowerstationpointnewController.java

@@ -56,7 +56,7 @@ public class WindpowerstationpointnewController {
 
 
     /**
-     * 根据id查询c
+     * 根据id查询
      *
      * @param id
      * @return