代码优化修改2

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

@@ -3,53 +3,52 @@ package com.gyee.backconfig.controller;
 
 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 com.gyee.backconfig.model.auto.ProBasicEquipment;
+import com.gyee.backconfig.service.auto.IProBasicEquipmentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
+import java.util.Arrays;
 
 /**
  * <p>
- * 场站测点 前端控制器
+ * 风机 前端控制器
  * </p>
  *
  * @author wang
  * @since 2022-10-15
  */
 @RestController
-@RequestMapping("//pro-basic-wppoint")
-@Api(value = "场站测点配置" ,tags =  "场站测点配置")
+@RequestMapping("//pro-basic-windturbine")
+@Api(value = "风机配置" ,tags =  "风机配置")
 public class ProBasicEquipmentController {
     @Resource
-    private IProBasicWppointService proBasicWppointService;
+    private IProBasicEquipmentService proBasicWindturbineService;
 
     /**
      * 查询
      *
      * @param id
      * @param code
-     * @param name
-     * @param model
-     * @param uniformCode
+     * @param windpowerstationId
+     * @param projectId
+     * @param lineId
      * @param pageNum
      * @param pageSize
      * @return
      */
     @GetMapping(value = "/list")
-    @ApiOperation(value = "场站测点-列表", notes = "场站测点-列表")
+    @ApiOperation(value = "风机-列表", notes = "风机-列表")
     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 = "windpowerstationId", required = false) String windpowerstationId,
+                      @RequestParam(value = "projectId", required = false) String projectId,
+                      @RequestParam(value = "lineId", required = false) String lineId,
                       @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);
+        IPage<ProBasicEquipment> list = proBasicWindturbineService.list(id, code, windpowerstationId, projectId, lineId, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {
@@ -58,55 +57,34 @@ public class ProBasicEquipmentController {
     }
 
     /**
-     * 根据id查询
+     * 添加
      *
-     * @param id
-     * @return
-     */
-    @GetMapping(value = "/{id}")
-    @ApiOperation(value = "场站测点-更具主键查询", notes = "场站测点-更具主键查询")
-    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
+     * @param proBasicWindpowerstation
      * @return
      */
     @PostMapping(value = "/add")
-    @ApiOperation(value = "场站测点-新增（修改）", notes = "场站测点-新增（修改）")
-    public R addAll(@RequestBody ProBasicWppoint pointnew) {
+    @ApiOperation(value = "风机-新增or修改", notes = "风机-新增or修改")
+    public R addAll(@RequestBody ProBasicEquipment proBasicWindpowerstation) {
 
-        boolean b = proBasicWppointService.addOrUpdate(pointnew);
+        boolean b = proBasicWindturbineService.saveOrUpdate(proBasicWindpowerstation);
         if (b) {
             return R.ok().data(b);
         } else {
             return R.error().data("保存失败！");
         }
-
     }
 
-
     /**
-     * 批量删除
+     * 删除
      *
      * @param ids
      * @return
      */
     @DeleteMapping(value = "/{ids}")
-    @ApiOperation(value = "场站测点-批量删除", notes = "场站测点-批量删除")
+    @ApiOperation(value = "风机-删除", notes = "风机-删除")
     public R deleteAll(@PathVariable("ids") String ids) {
-        boolean b = proBasicWppointService.removeByIds(ids);
+        String[] strings = ids.split(",");
+        boolean b = proBasicWindturbineService.removeByIds(Arrays.asList(strings));
         if (b) {
             return R.ok().data(b);
         } else {
@@ -114,21 +92,4 @@ public class ProBasicEquipmentController {
         }
     }
 
-    /**
-     * 批量修改
-     *
-     * @param list
-     * @return
-     */
-    @PutMapping(value = "/editPointnew")
-    @ApiOperation(value = "场站测点-批量修改", notes = "场站测点-批量修改")
-    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/ProBasicPowerstationPointController.java

@@ -1,23 +1,136 @@
 package com.gyee.backconfig.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicPowerstationPoint;
+import com.gyee.backconfig.service.auto.IProBasicPowerstationPointService;
+import com.gyee.common.model.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
- * 场站测点，期次测点，线路测点，三级公司测点，区域测点
-
-
-
-+方阵测点 前端控制器
+ * 场站测点 前端控制器
  * </p>
  *
  * @author wang
- * @since 2022-11-10
+ * @since 2022-10-15
  */
 @RestController
-@RequestMapping("//pro-basic-powerstation-point")
+@RequestMapping("//pro-basic-wppoint")
+@Api(value = "场站测点配置" ,tags =  "场站测点配置")
 public class ProBasicPowerstationPointController {
 
+    @Resource
+    private IProBasicPowerstationPointService proBasicWppointService;
+
+
+    /**
+     * 查询
+     *
+     * @param id
+     * @param code
+     * @param name
+     * @param model
+     * @param uniformCode
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "场站测点-列表", notes = "场站测点-列表")
+    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<ProBasicPowerstationPoint> 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}")
+    @ApiOperation(value = "场站测点-更具主键查询", notes = "场站测点-更具主键查询")
+    public R findOne(@PathVariable("id") String id) {
+
+        ProBasicPowerstationPoint pointnew = proBasicWppointService.getOne(id);
+        if (StringUtils.isNotNull(pointnew)) {
+            return R.ok().data(pointnew);
+        } else {
+            return R.error().data("查询失败！");
+        }
+
+    }
+
+
+    /**
+     * 插入（批量）
+     *
+     * @param pointnew
+     * @return
+     */
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "场站测点-新增（修改）", notes = "场站测点-新增（修改）")
+    public R addAll(@RequestBody ProBasicPowerstationPoint pointnew) {
+
+        boolean b = proBasicWppointService.addOrUpdate(pointnew);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+
+    }
+
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "场站测点-批量删除", notes = "场站测点-批量删除")
+    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")
+    @ApiOperation(value = "场站测点-批量修改", notes = "场站测点-批量修改")
+    public R update(@RequestBody List<ProBasicPowerstationPoint> 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/ProBasicWindturbineController.java

@@ -1,95 +0,0 @@
-package com.gyee.backconfig.controller;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gyee.backconfig.config.R;
-import com.gyee.backconfig.model.auto.ProBasicEquipment;
-import com.gyee.backconfig.service.auto.IProBasicEquipmentService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Arrays;
-
-/**
- * <p>
- * 风机 前端控制器
- * </p>
- *
- * @author wang
- * @since 2022-10-15
- */
-@RestController
-@RequestMapping("//pro-basic-windturbine")
-@Api(value = "风机配置" ,tags =  "风机配置")
-public class ProBasicWindturbineController {
-    @Resource
-    private IProBasicEquipmentService proBasicWindturbineService;
-
-    /**
-     * 查询
-     *
-     * @param id
-     * @param code
-     * @param windpowerstationId
-     * @param projectId
-     * @param lineId
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @GetMapping(value = "/list")
-    @ApiOperation(value = "风机-列表", notes = "风机-列表")
-    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 = "projectId", required = false) String projectId,
-                      @RequestParam(value = "lineId", required = false) String lineId,
-                      @RequestParam(value = "pageNum", required = true) String pageNum,
-                      @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicEquipment> list = proBasicWindturbineService.list(id, code, windpowerstationId, projectId, lineId, pageNum, pageSize);
-        if (null != list) {
-            return R.ok().data(list);
-        } else {
-            return R.error().data("查询失败！");
-        }
-    }
-
-    /**
-     * 添加
-     *
-     * @param proBasicWindpowerstation
-     * @return
-     */
-    @PostMapping(value = "/add")
-    @ApiOperation(value = "风机-新增or修改", notes = "风机-新增or修改")
-    public R addAll(@RequestBody ProBasicEquipment proBasicWindpowerstation) {
-
-        boolean b = proBasicWindturbineService.saveOrUpdate(proBasicWindpowerstation);
-        if (b) {
-            return R.ok().data(b);
-        } else {
-            return R.error().data("保存失败！");
-        }
-    }
-
-    /**
-     * 删除
-     *
-     * @param ids
-     * @return
-     */
-    @DeleteMapping(value = "/{ids}")
-    @ApiOperation(value = "风机-删除", notes = "风机-删除")
-    public R deleteAll(@PathVariable("ids") String ids) {
-        String[] strings = ids.split(",");
-        boolean b = proBasicWindturbineService.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/ProEconTestingPointController.java

@@ -31,7 +31,8 @@ public class ProEconTestingPointController {
 
     @PostMapping(value = "/generatePoint")
     @ApiOperation(value = "生成测点", notes = "生成测点")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "points", value = "统一编码", required = true, dataType = "string[]", paramType = "query")})
+    @ApiImplicitParams({ @ApiImplicitParam(name = "points", value = "统一编码", required = true, dataType = "string[]", paramType = "query"),
+            @ApiImplicitParam(name = "station", value = "场站编码", required = true, dataType = "string", paramType = "query")})
     public R generatePoint(@RequestParam(value = "points", required = false) String[] points,
                               @RequestParam(value = "station", required = false) String station) {
         try {

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

@@ -1,16 +0,0 @@
-package com.gyee.backconfig.mapper.auto;
-
-import com.gyee.backconfig.model.auto.ProBasicWppoint;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 场站测点 Mapper 接口
- * </p>
- *
- * @author wang
- * @since 2022-10-15
- */
-public interface ProBasicWppointMapper extends BaseMapper<ProBasicWppoint> {
-
-}

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

@@ -1,25 +1,26 @@
 package com.gyee.backconfig.model.auto;
 
+import java.math.BigDecimal;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-
 /**
  * <p>
  * 场站测点，期次测点，线路测点，三级公司测点，区域测点
 
 
 
-+方阵测点
+ +方阵测点
  * </p>
  *
  * @author wang
- * @since 2022-11-10
+ * @since 2022-10-31
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "场站测点表-ProBasicPowerstation", description = "场站测点表")
 public class ProBasicPowerstationPoint extends Model {
 
     private static final long serialVersionUID = 1L;

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

@@ -1,134 +0,0 @@
-package com.gyee.backconfig.model.auto;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 场站测点，期次测点，线路测点，三级公司测点，区域测点
-
-
-
- +方阵测点
- * </p>
- *
- * @author wang
- * @since 2022-10-31
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "方阵测点-ProBasicWppoint", description = "方阵测点")
-public class ProBasicWppoint extends Model {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 编号
-     */
-    private String id;
-
-    /**
-     * 编码
-     */
-    private String code;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 实时库名称
-     */
-    private String aname;
-
-    /**
-     * 型号
-     */
-    private String model;
-
-    /**
-     * 单位
-     */
-    private String valueUnit;
-
-    /**
-     * 英文名称
-     */
-    private String englishName;
-
-    /**
-     * 类型编号
-     */
-    private String typeId;
-
-    /**
-     * 所属型号
-     */
-    private String modelId;
-
-    /**
-     * 最大值
-     */
-    private BigDecimal maxval;
-
-    /**
-     * 最小值
-     */
-    private BigDecimal minval;
-
-    /**
-     * 合理最大值
-     */
-    private BigDecimal reasonableMaxval;
-
-    /**
-     * 合理最小值
-     */
-    private BigDecimal reasonableMinval;
-
-    /**
-     * 统一编码
-     */
-    private String uniformCode;
-
-    /**
-     * 短ID
-     */
-    private String shortId;
-
-    /**
-     * 长ID
-     */
-    private String longId;
-
-    /**
-     * 场站编号
-     */
-    private String windpowerstationId;
-
-    /**
-     * 实时配置编号
-     */
-    private String realtimeId;
-
-    /**
-     * 集团测点编号
-     */
-    private String groupPointId;
-
-    /**
-     * 具体名称
-     */
-    private String specificName;
-
-    /**
-     * 系数
-     */
-    private BigDecimal coefficient;
-
-
-}

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

@@ -1,24 +1,30 @@
 package com.gyee.backconfig.service.auto;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicPowerstationPoint;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
 /**
  * <p>
- * 场站测点，期次测点，线路测点，三级公司测点，区域测点
-
-
-
-+方阵测点 服务类
+ * 场站测点 服务类
  * </p>
  *
  * @author wang
- * @since 2022-11-10
+ * @since 2022-10-15
  */
 public interface IProBasicPowerstationPointService extends IService<ProBasicPowerstationPoint> {
+    IPage<ProBasicPowerstationPoint> list(String id, String code, String name, String model, String uniformCode, String pageNum, String pageSize);
 
-    boolean batchAddPowerstationPoints(List<ProBasicPowerstationPoint> proBasicPowerstationPoints);
+    boolean addOrUpdate(ProBasicPowerstationPoint pointnew);
 
+    ProBasicPowerstationPoint getOne(String id);
+
+    boolean removeByIds(String ids);
+
+
+    List<ProBasicPowerstationPoint> getStationpointByUniformcode(String windpowerstationId, String uniformCode);
+
+    boolean batchAddPowerstationPoints(List<ProBasicPowerstationPoint> proBasicPowerstationPoints);
 }

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

@@ -1,29 +0,0 @@
-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>
- * 场站测点 服务类
- * </p>
- *
- * @author wang
- * @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/IProEconEquipmentmodelService.java

@@ -1,7 +1,6 @@
 package com.gyee.backconfig.service.auto;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gyee.backconfig.model.auto.ProBasicWppoint;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.baomidou.mybatisplus.extension.service.IService;
 

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

@@ -42,7 +42,7 @@ public class PointGenerateService {
     private IProBasicEquipmentService proBasicWindturbineService;//风机
 
     @Autowired
-    private IProBasicWppointService proBasicWppointService;//场站测点
+    private IProBasicPowerstationPointService proBasicWppointService;//场站测点
 
     @Autowired
     private IProBasicEquipmentPointService proBasicEquipmentPointService;//设备测点
@@ -61,11 +61,11 @@ public class PointGenerateService {
 
             if ("czjs".equals(p.getType())) {
 
-                List<ProBasicWppoint> staionList = fjd(p, EnergyList);
-                for (ProBasicWppoint i : staionList) {
+                List<ProBasicPowerstationPoint> staionList = fjd(p, EnergyList);
+                for (ProBasicPowerstationPoint i : staionList) {
                     boolean b = proBasicWppointService.addOrUpdate(i);
                     if (!b) {
-                        logger.error(i.getCode() + "测点插入失败");
+                        logger.error(i.getNemCode() + "测点插入失败");
                         num++;
                     }
                 }
@@ -94,10 +94,10 @@ public class PointGenerateService {
 
         return num;
     }
-    private List<ProBasicWppoint> fjd(Standardpoint p, List<ProBasicEnergyGroup> companysList) {
-        List<ProBasicWppoint> stationList = new ArrayList<>();
+    private List<ProBasicPowerstationPoint> fjd(Standardpoint p, List<ProBasicEnergyGroup> companysList) {
+        List<ProBasicPowerstationPoint> stationList = new ArrayList<>();
 
-        ProBasicWppoint stationpoint = null;
+        ProBasicPowerstationPoint stationpoint = null;
 
         List<String> gflist = new ArrayList<>();
         gflist.add("G");
@@ -105,13 +105,13 @@ public class PointGenerateService {
 
         for (ProBasicEnergyGroup c : companysList) {
             StringBuilder gssb = null;
-            List<ProBasicWppoint> list1 = proBasicWppointService.getStationpointByUniformcode(c.getId(), p.getUniformcode());
+            List<ProBasicPowerstationPoint> 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 = new ProBasicPowerstationPoint();
+                stationpoint.setNemCode(gssb.toString() + "XXXX_XX_XX_XX_XXX_" + p.getPoint());
                 stationpoint.setName(c.getName() + p.getName());
                 stationpoint.setUniformCode(p.getUniformcode());
                 stationpoint.setWindpowerstationId(c.getId());
@@ -121,7 +121,7 @@ public class PointGenerateService {
 
 
             for (String gf : gflist) {
-                List<ProBasicWppoint> list1df = proBasicWppointService.getStationpointByUniformcode(c.getId() + "_" + gf, p.getUniformcode());
+                List<ProBasicPowerstationPoint> 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"	"区域风场限电停机台数（明细）"
@@ -129,8 +129,8 @@ public class PointGenerateService {
                     gsgfsb.append(c.getId()).append(gf)
                             .append("_XX_XX_XX_XXX_")
                             .append(p.getPoint());
-                    stationpoint = new ProBasicWppoint();
-                    stationpoint.setCode(gsgfsb.toString());
+                    stationpoint = new ProBasicPowerstationPoint();
+                    stationpoint.setNemCode(gsgfsb.toString());
                     stationpoint.setName(c.getName() + p.getName());
                     stationpoint.setUniformCode(p.getUniformcode());
                     stationpoint.setWindpowerstationId(c.getId() + "_" + gf);
@@ -146,14 +146,14 @@ public class PointGenerateService {
 
 
                 StringBuilder qusb = new StringBuilder();
-                List<ProBasicWppoint> list2 = proBasicWppointService.getStationpointByUniformcode(r.getId(), p.getUniformcode());
+                List<ProBasicPowerstationPoint> 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 = new ProBasicPowerstationPoint();
+                    stationpoint.setNemCode(gssb.toString() + "XX_XX_XX_XXX_" + p.getPoint());
                     stationpoint.setName(c.getName() + p.getName());
                     stationpoint.setUniformCode(p.getUniformcode());
                     stationpoint.setWindpowerstationId(r.getId());
@@ -162,7 +162,7 @@ public class PointGenerateService {
                 }
 
                 for (String gf : gflist) {
-                    List<ProBasicWppoint> list2df = proBasicWppointService.getStationpointByUniformcode(r.getId() + "_" + gf, p.getUniformcode());
+                    List<ProBasicPowerstationPoint> 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"	"山西风场限电停机台数（明细）"
@@ -170,8 +170,8 @@ public class PointGenerateService {
                         qugfsb.append(gf)
                                 .append("_XX_XX_XX_XXX_")
                                 .append(p.getPoint());
-                        stationpoint = new ProBasicWppoint();
-                        stationpoint.setCode(qugfsb.toString());
+                        stationpoint = new ProBasicPowerstationPoint();
+                        stationpoint.setNemCode(qugfsb.toString());
                         stationpoint.setName(c.getName() + p.getName());
                         stationpoint.setUniformCode(p.getUniformcode());
                         stationpoint.setWindpowerstationId(r.getId() + "_" + gf);
@@ -184,11 +184,11 @@ public class PointGenerateService {
 
                 List<ProBasicPowerstation> windpowerstationList = proBasicWindpowerstationService.getList(r.getId());
                 for (ProBasicPowerstation station : windpowerstationList) {
-                    List<ProBasicWppoint> list3 = proBasicWppointService.getStationpointByUniformcode(station.getId(), p.getUniformcode());
+                    List<ProBasicPowerstationPoint> list3 = proBasicWppointService.getStationpointByUniformcode(station.getId(), p.getUniformcode());
                     if (null != list3 && list3.size() > 0) {
                         continue;
                     }
-                    stationpoint = new ProBasicWppoint();
+                    stationpoint = new ProBasicPowerstationPoint();
                     //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
@@ -200,7 +200,7 @@ public class PointGenerateService {
                     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.setNemCode(stationsb.toString() + "XX_XX_XXX_" + p.getPoint());
                     stationpoint.setName(station.getName() + p.getName());
                     stationpoint.setUniformCode(p.getUniformcode());
                     stationpoint.setWindpowerstationId(station.getId());
@@ -209,18 +209,18 @@ public class PointGenerateService {
 
                     List<ProBasicProject> projectList = proBasicProjectService.getList(station.getId());
                     for (ProBasicProject project : projectList) {
-                        List<ProBasicWppoint> list4 = proBasicWppointService.getStationpointByUniformcode(project.getId(), p.getUniformcode());
+                        List<ProBasicPowerstationPoint> list4 = proBasicWppointService.getStationpointByUniformcode(project.getId(), p.getUniformcode());
                         if (null != list4 && list4.size() > 0) {
                             continue;
                         }
                         //期次测点
-                        stationpoint = new ProBasicWppoint();
+                        stationpoint = new ProBasicPowerstationPoint();
                         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.setNemCode(projectsb.toString() + "_XX_XXX_" + p.getPoint());
                         stationpoint.setName(project.getName() + p.getName());
                         stationpoint.setUniformCode(p.getUniformcode());
                         stationpoint.setWindpowerstationId(project.getId());
@@ -230,11 +230,11 @@ public class PointGenerateService {
                         List<ProBasicLine> lineList = proBasicLineService.getList(project.getId());
                         for (ProBasicLine l : lineList) {
 
-                            List<ProBasicWppoint> list5 = proBasicWppointService.getStationpointByUniformcode(l.getId(), p.getUniformcode());
+                            List<ProBasicPowerstationPoint> list5 = proBasicWppointService.getStationpointByUniformcode(l.getId(), p.getUniformcode());
                             if (null != list5 && list5.size() > 0) {
                                 continue;
                             }
-                            stationpoint = new ProBasicWppoint();
+                            stationpoint = new ProBasicPowerstationPoint();
                             //线路测点
                             StringBuilder linesb = new StringBuilder(projectsb);
 
@@ -242,7 +242,7 @@ public class PointGenerateService {
                             linesb.append("_L").append(lnum)
                                     .append("_XXX_").append(p.getPoint());
 
-                            stationpoint.setCode(linesb.toString());
+                            stationpoint.setNemCode(linesb.toString());
                             stationpoint.setName(l.getName() + p.getName());
                             stationpoint.setUniformCode(p.getUniformcode());
                             stationpoint.setWindpowerstationId(l.getId());

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

@@ -32,7 +32,7 @@ public class ProBasicEnergyGroupServiceImpl extends ServiceImpl<ProBasicEnergyGr
         }
 
         if (StringUtils.isNotEmpty(name)){
-            qw.eq("name",name);
+            qw.like("name",name);
         }
         if (StringUtils.isNotEmpty(aname)){
             qw.like("aname",aname);

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

@@ -1,29 +1,91 @@
 package com.gyee.backconfig.service.auto.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.mapper.auto.ProBasicPowerstationPointMapper;
 import com.gyee.backconfig.model.auto.ProBasicPowerstationPoint;
 import com.gyee.backconfig.service.auto.IProBasicPowerstationPointService;
+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>
- * <p>
- * <p>
- * +方阵测点 服务实现类
+ * 场站测点 服务实现类
  * </p>
  *
  * @author wang
- * @since 2022-11-10
+ * @since 2022-10-15
  */
 @Service
 public class ProBasicPowerstationPointServiceImpl extends ServiceImpl<ProBasicPowerstationPointMapper, ProBasicPowerstationPoint> implements IProBasicPowerstationPointService {
 
+    @Override
+    public IPage<ProBasicPowerstationPoint> list(String id, String code, String name, String model, String uniformCode, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicPowerstationPoint> 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, "uniform_code");
+        }
+
+        Page<ProBasicPowerstationPoint> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProBasicPowerstationPoint> companysPage = getBaseMapper().selectPage(page, qw);
+        return companysPage;
+    }
+
+    @Override
+    public boolean addOrUpdate(ProBasicPowerstationPoint pointnew) {
+        boolean b = this.saveOrUpdate(pointnew);
+        return b;
+    }
+
+    @Override
+    public ProBasicPowerstationPoint getOne(String id) {
+        ProBasicPowerstationPoint 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<ProBasicPowerstationPoint> getStationpointByUniformcode(String windpowerstationId, String uniformCode) {
+        QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotEmpty(uniformCode)){
+            qw.eq("uniformCode",uniformCode);
+        }
+
+        if (StringUtils.isNotEmpty(windpowerstationId)){
+            qw.eq("windpowerstationId",windpowerstationId);
+        }
+
+        List<ProBasicPowerstationPoint> list = baseMapper.selectList(qw);
+
+        return list;
+    }
+
 
     @Override
     public boolean batchAddPowerstationPoints(List<ProBasicPowerstationPoint> proBasicPowerstationPoints) {
@@ -46,5 +108,4 @@ public class ProBasicPowerstationPointServiceImpl extends ServiceImpl<ProBasicPo
         return true;
     }
 
-
 }

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

@@ -1,90 +0,0 @@
-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>
- * 场站测点 服务实现类
- * </p>
- *
- * @author wang
- * @since 2022-10-15
- */
-@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(name)) {
-            qw.like(name, "name");
-        }
-        if (StringUtils.isNotEmpty(model)) {
-            qw.like(model, "model");
-        }
-        if (StringUtils.isNotEmpty(uniformCode)) {
-            qw.eq(uniformCode, "uniform_code");
-        }
-
-        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/ProEconEquipmentmodelServiceImpl.java

@@ -3,7 +3,6 @@ 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.ProBasicWppoint;
 import com.gyee.backconfig.model.auto.ProEconEquipmentmodel;
 import com.gyee.backconfig.mapper.auto.ProEconEquipmentmodelMapper;
 import com.gyee.backconfig.service.auto.IProEconEquipmentmodelService;

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

@@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -45,9 +44,9 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
     private IProBasicPowerstationPointService proBasicPowerstationPointService;
 
     @Override
-    public void generatePoint(String station, String[] points) {
+    public void generatePoint(String station, String[] setpoints) {
 
-            List<ProBasicEquipmentPoint> equipmentPoints =  initalFj();
+            List<ProBasicEquipmentPoint> equipmentPoints =  initalFj(station,setpoints);
             List<ProBasicPowerstationPoint> powerstationPoints = initalFc();
 
             proBasicEquipmentPointService.batchAddEquipmentPoint(equipmentPoints);
@@ -57,7 +56,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
     }
 
 
-    public List<ProBasicEquipmentPoint> initalFj() {
+    public List<ProBasicEquipmentPoint> initalFj(String station,String[] setpoints) {
 
         List<ProBasicEquipmentPoint> allpoints = new ArrayList<>();
 
@@ -67,6 +66,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
         for (ProBasicPowerstation wp : CacheContext.wpls) {
 
+            if (null != station && !"".equals(station) && !station.equals(wp.getId())) {
+                continue;
+            }
+
             List<ProEconTestingPoint> ls = null;
             if (wp.getId().indexOf("FDC") >= 0) {
                 ls = fdls;
@@ -75,6 +78,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                 ls = gfls;
 
             }
+
             List<ProBasicEquipment> wtls = CacheContext.poequipmentmap.get(wp.getId());
 
 
@@ -86,6 +90,14 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
 
                         ProEconTestingPoint stp = ls.get(i);
+                        if(!stp.getTypeId().endsWith("fw") && !stp.getModel().equals(wt.getModelId()))
+                        {
+                            continue;
+                        }
+
+                        if (null != setpoints && setpoints.length > 0 && StringUtils.join(setpoints, "|").indexOf(stp.getUniformCode()) < 0) {
+                            continue;
+                        }
                         StringBuilder sb = new StringBuilder();
                         String temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
                         temp = temp.substring(0, temp.lastIndexOf("_"));

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/until/realtimedate/EdosUtil.java

@@ -3,7 +3,7 @@ package com.gyee.backconfig.until.realtimedate;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gyee.backconfig.model.auto.ProBasicEquipmentPoint;
-import com.gyee.backconfig.model.auto.ProBasicWppoint;
+import com.gyee.backconfig.model.auto.ProBasicPowerstationPoint;
 import com.gyee.common.model.DNAStatVal;
 import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
@@ -22,9 +22,9 @@ public class EdosUtil  implements IEdosUtil {
     private RestTemplate restTemplate =new RestTemplate();
     private static String baseURL = "http://10.81.3.155:8011/ts";
     @Override
-    public PointData getRealData(ProBasicWppoint point) throws Exception {
+    public PointData getRealData(ProBasicPowerstationPoint point) throws Exception {
         try {
-            Optional<String> keys = Optional.ofNullable(point.getCode());
+            Optional<String> keys = Optional.ofNullable(point.getNemCode());
             Optional<String> thingType = Optional.ofNullable("station");
             Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
             Optional<String> uniformCodes = Optional.ofNullable(point.getUniformCode());
@@ -46,14 +46,14 @@ public class EdosUtil  implements IEdosUtil {
                 if (list.size() > 0)
                     return list.get(0);
                 else
-                    return ErrorRequest.RequestError(point.getCode());
+                    return ErrorRequest.RequestError(point.getNemCode());
             } else {
-                return ErrorRequest.RequestError(point.getCode());
+                return ErrorRequest.RequestError(point.getNemCode());
             }
         } catch (HttpClientErrorException exception) {
             if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
                 System.out.println("404请求错误");
-                return ErrorRequest.RequestError(point.getCode());
+                return ErrorRequest.RequestError(point.getNemCode());
             } else {
                 throw exception;
             }
@@ -62,8 +62,8 @@ public class EdosUtil  implements IEdosUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasSnap(ProBasicWppoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
-        Optional<String> tagName = Optional.ofNullable(point.getCode());
+    public List<PointData> getHistoryDatasSnap(ProBasicPowerstationPoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+        Optional<String> tagName = Optional.ofNullable(point.getNemCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
         Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformCode());
@@ -76,7 +76,7 @@ public class EdosUtil  implements IEdosUtil {
         else if (count != null)
             finalInterval = (endDate - beginDate) / count;
         else
-            return ErrorRequest.RequestListError(point.getCode());
+            return ErrorRequest.RequestListError(point.getNemCode());
         Optional<Integer> interval = Optional.ofNullable(Integer.parseInt(finalInterval.toString()));
 
         try {
@@ -102,13 +102,13 @@ public class EdosUtil  implements IEdosUtil {
             ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
             JSONArray jsonArray = resp.getBody();
             if (jsonArray != null) {
-                List<PointData> snapList = JsonObjectHelper.phrasePointData(jsonArray, point.getCode());
+                List<PointData> snapList = JsonObjectHelper.phrasePointData(jsonArray, point.getNemCode());
                 List<PointData> resultList = new ArrayList<>();
 
                 if(snapList.isEmpty())
                 {
 
-                    getHistsnapSameTiem(point.getCode(), beginDate, pried, resultList);
+                    getHistsnapSameTiem(point.getNemCode(), beginDate, pried, resultList);
                 }else
                 {
                     for (PointData snapItem : snapList) {
@@ -117,7 +117,7 @@ public class EdosUtil  implements IEdosUtil {
                         //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
                         // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
                         // 则代表该时间节点快照有效，否则为0
-                        String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getCode() + "&ts=" + snapItem.getPointTime() + "000";
+                        String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + snapItem.getPointTime() + "000";
                         ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
                         JSONObject jsonObjectSection = sectionResp.getBody();
 
@@ -129,7 +129,7 @@ public class EdosUtil  implements IEdosUtil {
                                 }
                                 else{
                                     PointData data = new PointData();
-                                    data.setEdnaId(point.getCode());
+                                    data.setEdnaId(point.getNemCode());
                                     data.setPointTime(snapItem.getPointTime());
                                     data.setPointValue("0");
                                     data.setPointName("1");
@@ -138,7 +138,7 @@ public class EdosUtil  implements IEdosUtil {
                                 }
                             } else {
                                 PointData data = new PointData();
-                                data.setEdnaId(point.getCode());
+                                data.setEdnaId(point.getNemCode());
                                 data.setPointTime(snapItem.getPointTime());
                                 data.setPointValue("0");
                                 data.setPointName("1");
@@ -147,7 +147,7 @@ public class EdosUtil  implements IEdosUtil {
                             }
                         } else {
                             PointData data = new PointData();
-                            data.setEdnaId(point.getCode());
+                            data.setEdnaId(point.getNemCode());
                             data.setPointTime(snapItem.getPointTime());
                             data.setPointValue("0");
                             data.setPointName("1");
@@ -162,13 +162,13 @@ public class EdosUtil  implements IEdosUtil {
 
 
             } else {
-                return ErrorRequest.RequestListError(point.getCode());
+                return ErrorRequest.RequestListError(point.getNemCode());
             }
 
         } catch (HttpClientErrorException exception) {
             if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
                 System.out.println("404请求错误");
-                return ErrorRequest.RequestListError(point.getCode());
+                return ErrorRequest.RequestListError(point.getNemCode());
             } else {
                 throw exception;
             }
@@ -222,8 +222,8 @@ public class EdosUtil  implements IEdosUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasRaw(ProBasicWppoint point, Long beginDate, Long endDate) throws Exception {
-        Optional<String> tagName = Optional.ofNullable(point.getCode());
+    public List<PointData> getHistoryDatasRaw(ProBasicPowerstationPoint point, Long beginDate, Long endDate) throws Exception {
+        Optional<String> tagName = Optional.ofNullable(point.getNemCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
         Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformCode());
@@ -252,15 +252,15 @@ public class EdosUtil  implements IEdosUtil {
             ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
             JSONArray jsonArray = resp.getBody();
             if (jsonArray != null)
-                return JsonObjectHelper.phrasePointData(jsonArray, point.getCode());
+                return JsonObjectHelper.phrasePointData(jsonArray, point.getNemCode());
             else {
-                return ErrorRequest.RequestListError(point.getCode());
+                return ErrorRequest.RequestListError(point.getNemCode());
             }
 
         } catch (HttpClientErrorException exception) {
             if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
                 System.out.println("404请求错误");
-                return ErrorRequest.RequestListError(point.getCode());
+                return ErrorRequest.RequestListError(point.getNemCode());
             } else {
                 throw exception;
             }
@@ -901,8 +901,8 @@ public class EdosUtil  implements IEdosUtil {
     }
 
     @Override
-    public List<PointData> getHistStat(ProBasicWppoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
-        Optional<String> tagName = Optional.ofNullable(point.getCode());
+    public List<PointData> getHistStat(ProBasicPowerstationPoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+        Optional<String> tagName = Optional.ofNullable(point.getNemCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
         Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformCode());
@@ -915,7 +915,7 @@ public class EdosUtil  implements IEdosUtil {
         else if (count != null)
             finalInterval = (endDate - beginDate) / count;
         else
-            return ErrorRequest.RequestListError(point.getCode());
+            return ErrorRequest.RequestListError(point.getNemCode());
         Optional<Integer> interval = Optional.ofNullable(Integer.parseInt(finalInterval.toString()));
 
         try {
@@ -941,14 +941,14 @@ public class EdosUtil  implements IEdosUtil {
             ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
             JSONArray jsonArray = resp.getBody();
             if (jsonArray != null)
-                return JsonObjectHelper.GeneralTsDataToPointDataByStat(jsonArray, point.getCode(), type);
+                return JsonObjectHelper.GeneralTsDataToPointDataByStat(jsonArray, point.getNemCode(), type);
             else {
-                return ErrorRequest.RequestListError(point.getCode());
+                return ErrorRequest.RequestListError(point.getNemCode());
             }
         } catch (HttpClientErrorException exception) {
             if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
                 System.out.println("404请求错误");
-                return ErrorRequest.RequestListError(point.getCode());
+                return ErrorRequest.RequestListError(point.getNemCode());
             } else {
                 throw exception;
             }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/until/realtimedate/IEdosUtil.java

@@ -1,7 +1,7 @@
 package com.gyee.backconfig.until.realtimedate;
 
 import com.gyee.backconfig.model.auto.ProBasicEquipmentPoint;
-import com.gyee.backconfig.model.auto.ProBasicWppoint;
+import com.gyee.backconfig.model.auto.ProBasicPowerstationPoint;
 import com.gyee.common.model.DNAStatVal;
 import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
@@ -18,7 +18,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public PointData getRealData(ProBasicWppoint point) throws Exception;
+    public PointData getRealData(ProBasicPowerstationPoint point) throws Exception;
 
 
     /**
@@ -31,7 +31,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasSnap(ProBasicWppoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
+    public List<PointData> getHistoryDatasSnap(ProBasicPowerstationPoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
 
     /**
      * 通过风场测点获得测点历史存储数据，存多少取多少
@@ -41,7 +41,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasRaw(ProBasicWppoint point, Long beginDate, Long endDate) throws Exception;
+    public List<PointData> getHistoryDatasRaw(ProBasicPowerstationPoint point, Long beginDate, Long endDate) throws Exception;
 
     /**
      * 通过风机测点获得测点实时数据
@@ -151,7 +151,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistStat(ProBasicWppoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
+    public List<PointData> getHistStat(ProBasicPowerstationPoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
 
     /**
      * 通过全局点名获得测点指定时间周期的统计数据