提交修改代码

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

@@ -1,38 +0,0 @@
-package com.gyee.backconfig.controller;
-
-import com.gyee.backconfig.config.R;
-import com.gyee.backconfig.service.auto.PointGenerateService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-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;
-
-
-@Api(value = "测点配置" ,tags =  "测点配置")
-@RestController
-@RequestMapping("//generate")
-public class PointGenerateController {
-
-    @Autowired
-    private PointGenerateService pointGenerateService;
-
-
-    @PostMapping(value = "/add")
-    @ApiOperation(value = "生成测点", notes = "生成测点")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "points", value = "统一编码", required = true, dataType = "string[]", paramType = "query")})
-    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/ProBasicPowerstationController.java

@@ -5,14 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicPowerstation;
 import com.gyee.backconfig.service.auto.IProBasicPowerstationService;
-import com.gyee.backconfig.vo.WindpowerstationAdmVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * <p>

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

@@ -0,0 +1,136 @@
+package com.gyee.backconfig.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProEconUniformCode;
+import com.gyee.backconfig.service.auto.IProEconUniformCodeService;
+import com.gyee.common.model.StringUtils;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 统一编码表
+
+
+设备类型：风电/光伏
+测点类型：遥测/遥信/计算
+ 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-12
+ */
+@RestController
+@RequestMapping("//pro-econ-uniform-code")
+@Api(value = "统一编码表" ,tags =  "统一编码表")
+public class ProEconUniformCodeController {
+
+
+    @Autowired
+    private IProEconUniformCodeService proEconUniformCodeService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "统一编码表-列表", notes = "统一编码表-列表")
+    public R findList(@RequestParam(value = "nemCode", required = false) String nemCode,
+                      @RequestParam(value = "description", required = false) String description,
+                      @RequestParam(value = "equipmentType", required = false) String equipmentType,
+                      @RequestParam(value = "pointType", required = false) String pointType,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProEconUniformCode> list = proEconUniformCodeService.list(nemCode, description, equipmentType,pointType,pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+
+    /**
+     * 根据id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/get-by-id")
+    @ApiOperation(value = "统一编码表-根据主键查询", notes = "统一编码表-根据主键查询")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "编码id", required = false, dataType = "string", paramType = "query")})
+    public R findOne(@RequestParam("id") String id) {
+        QueryWrapper<ProEconUniformCode> qw = new QueryWrapper<>();
+        qw.eq("id", id);
+        ProEconUniformCode proEconUniformCode = proEconUniformCodeService.getOne(qw);
+        if (StringUtils.isNotNull(proEconUniformCode)) {
+            return R.ok().data(proEconUniformCode);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+
+    /**
+     * 新增统一编码
+     *
+     * @param proEconUniformCode
+     * @return
+     */
+    @PostMapping(value = "/save-uniform_code")
+    @ApiOperation(value = "统一编码-新增", notes = "统一编码-新增")
+    public R addAll(@ApiParam(name = "company", value = "公司对象", required = true)@RequestBody ProEconUniformCode proEconUniformCode) {
+
+        boolean b = proEconUniformCodeService.saveOrUpdate(proEconUniformCode);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+
+
+    /**
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-by-ids")
+    @ApiOperation(value = "统一编码-删除", notes = "统一编码-删除")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "ids", value = "统一编码id(多条逗号隔开)", required = false, dataType = "string", paramType = "query")})
+    public R deleteAll(@RequestParam("ids") String ids) {
+        String[] strings = ids.split(",");
+
+        boolean b = proEconUniformCodeService.removeByIds(Arrays.asList(strings));
+
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+
+
+    /**
+     * 批量修改
+     *
+     * @param list
+     * @return
+     */
+    @PutMapping(value = "/edit-uniform_code")
+    @ApiOperation(value = "统一编码-批量修改", notes = "统一编码-批量修改")
+    public R update(@ApiParam(name = "list", value = "统一编码集合", required = true)@RequestBody List<ProEconUniformCode> list) {
+        boolean b = proEconUniformCodeService.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

@@ -1,152 +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.Standardpoint;
-import com.gyee.backconfig.service.auto.IStandardpointService;
-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-10-24
- */
-@RestController
-@RequestMapping("//standardpoint")
-@Api(value = "标准点配置" ,tags =  "标准点配置")
-public class StandardpointController {
-    @Resource
-    private IStandardpointService standardpointService;
-
-    /**
-     * 查询
-     * @param id
-     * @param uniformcode
-     * @param name
-     * @param type
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @GetMapping(value = "/list")
-    @ApiOperation(value = "标准点配置-列表", notes = "标准点配置-列表")
-    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}")
-    @ApiOperation(value = "标准点配置-根据主键查询", notes = "标准点配置-根据主键查询")
-    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")
-    @ApiOperation(value = "标准点配置-新增or修改", notes = "标准点配置-新增or修改")
-    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}")
-    @ApiOperation(value = "标准点配置-删除", notes = "标准点配置-删除")
-    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")
-    @ApiOperation(value = "标准点配置-修改", notes = "标准点配置-修改")
-    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")
-    @ApiOperation(value = "设备厂商-列表", notes = "设备厂商-列表")
-    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/ProEconUniformCodeMapper.java

@@ -0,0 +1,21 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.gyee.backconfig.model.auto.ProEconUniformCode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 统一编码表
+
+
+设备类型：风电/光伏
+测点类型：遥测/遥信/计算
+ Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-12
+ */
+public interface ProEconUniformCodeMapper extends BaseMapper<ProEconUniformCode> {
+
+}

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

@@ -1,16 +0,0 @@
-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/ProEconTestingPoint.java

@@ -1,6 +1,7 @@
 package com.gyee.backconfig.model.auto;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,6 +16,7 @@ import java.math.BigDecimal;
  * @since 2022-11-10
  */
 @Data
+@ApiModel(value = "逻辑测点-ProEconTestingPoint", description = "逻辑测点")
 @EqualsAndHashCode(callSuper = true)
 public class ProEconTestingPoint extends Model {
 

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

@@ -0,0 +1,60 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 统一编码表
+
+
+设备类型：风电/光伏
+测点类型：遥测/遥信/计算
+
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "统一编码-ProEconUniformCode", description = "统一编码")
+public class ProEconUniformCode extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号")
+    private String id;
+
+    /**
+     * 编码
+     */
+    @ApiModelProperty(value = "编码")
+    private String nemCode;
+
+    /**
+     * 说明
+     */
+    @ApiModelProperty(value = "说明")
+    private String description;
+
+    /**
+     * 设备类型
+     */
+    @ApiModelProperty(value = "设备类型")
+    private String equipmentType;
+
+    /**
+     * 测点类型
+     */
+    @ApiModelProperty(value = "测点类型")
+    private String pointType;
+
+
+}

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

@@ -1,37 +0,0 @@
-package com.gyee.backconfig.model.auto;
-
-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-24
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "标准点-Standardpoint", description = "标准点")
-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/IProBasicPowerstationService.java

@@ -3,7 +3,6 @@ package com.gyee.backconfig.service.auto;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicPowerstation;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.backconfig.vo.WindpowerstationAdmVo;
 
 import java.util.List;
 

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

@@ -0,0 +1,24 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.ProEconUniformCode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 统一编码表
+
+
+设备类型：风电/光伏
+测点类型：遥测/遥信/计算
+ 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-12
+ */
+public interface IProEconUniformCodeService extends IService<ProEconUniformCode> {
+
+    IPage<ProEconUniformCode> list (String nemCode, String description,String equipmentType,String pointType,String pageNum, String pageSize);
+
+}

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

@@ -1,31 +0,0 @@
-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

@@ -1,316 +0,0 @@
-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 IProBasicPowerstationService proBasicWindpowerstationService;//场站
-
-    @Resource
-    private IProBasicProjectService proBasicProjectService;//期次
-
-    @Resource
-    private IProBasicLineService proBasicLineService;//线路
-
-    @Autowired
-    private IProBasicEquipmentService proBasicWindturbineService;//风机
-
-    @Autowired
-    private IProBasicPowerstationPointService 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> EnergyList = proBasicEnergyGroupService.getCompanysByidAndRid("");
-//        List<ProBasicRegion> RegionList = proBasicRegionService.getRegionByidAndRid("");
-
-        for (Standardpoint p : pointList) {
-
-            if ("czjs".equals(p.getType())) {
-
-                List<ProBasicPowerstationPoint> staionList = fjd(p, EnergyList);
-                for (ProBasicPowerstationPoint i : staionList) {
-                    boolean b = proBasicWppointService.addOrUpdate(i);
-                    if (!b) {
-                        logger.error(i.getNemCode() + "测点插入失败");
-                        num++;
-                    }
-                }
-
-            } else {
-                //fjjs
-                //fjjcd
-
-                for (ProBasicEnergyGroup c : EnergyList) {
-                    List<ProBasicCompany> CompanyList = proBasicCompanyService.getCompanycode(c.getCapacityUnit());
-                    for (ProBasicCompany r : CompanyList) {
-                        List<ProBasicPowerstation> 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.getNemCode() + "测点插入失败");
-                                num++;
-                            }
-                        }
-                    }
-                }
-            }
-
-        }
-
-        return num;
-    }
-    private List<ProBasicPowerstationPoint> fjd(Standardpoint p, List<ProBasicEnergyGroup> companysList) {
-        List<ProBasicPowerstationPoint> stationList = new ArrayList<>();
-
-        ProBasicPowerstationPoint stationpoint = null;
-
-        List<String> gflist = new ArrayList<>();
-        gflist.add("G");
-        gflist.add("F");
-
-        for (ProBasicEnergyGroup c : companysList) {
-            StringBuilder gssb = null;
-            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 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());
-                stationpoint.setRealtimeId("JSFW");
-                stationList.add(stationpoint);
-            }
-
-
-            for (String gf : gflist) {
-                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"	"区域风场限电停机台数（明细）"
-                    StringBuilder gsgfsb = new StringBuilder(gssb);
-                    gsgfsb.append(c.getId()).append(gf)
-                            .append("_XX_XX_XX_XXX_")
-                            .append(p.getPoint());
-                    stationpoint = new ProBasicPowerstationPoint();
-                    stationpoint.setNemCode(gsgfsb.toString());
-                    stationpoint.setName(c.getName() + p.getName());
-                    stationpoint.setUniformCode(p.getUniformcode());
-                    stationpoint.setWindpowerstationId(c.getId() + "_" + gf);
-                    stationpoint.setRealtimeId("JSFW");
-                    stationList.add(stationpoint);
-                }
-            }
-
-            List<ProBasicCompany> CompanyList = proBasicCompanyService.getCompanycode(c.getCapacityUnit());
-
-
-            for (ProBasicCompany r : CompanyList) {
-
-
-                StringBuilder qusb = new StringBuilder();
-                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 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());
-                    stationpoint.setRealtimeId("JSFW");
-                    stationList.add(stationpoint);
-                }
-
-                for (String gf : gflist) {
-                    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"	"山西风场限电停机台数（明细）"
-                        StringBuilder qugfsb = new StringBuilder(qusb);
-                        qugfsb.append(gf)
-                                .append("_XX_XX_XX_XXX_")
-                                .append(p.getPoint());
-                        stationpoint = new ProBasicPowerstationPoint();
-                        stationpoint.setNemCode(qugfsb.toString());
-                        stationpoint.setName(c.getName() + p.getName());
-                        stationpoint.setUniformCode(p.getUniformcode());
-                        stationpoint.setWindpowerstationId(r.getId() + "_" + gf);
-                        stationpoint.setRealtimeId("JSFW");
-                        stationList.add(stationpoint);
-
-                    }
-                }
-
-
-                List<ProBasicPowerstation> windpowerstationList = proBasicWindpowerstationService.getList(r.getId());
-                for (ProBasicPowerstation station : windpowerstationList) {
-                    List<ProBasicPowerstationPoint> list3 = proBasicWppointService.getStationpointByUniformcode(station.getId(), p.getUniformcode());
-                    if (null != list3 && list3.size() > 0) {
-                        continue;
-                    }
-                    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
-
-                    //场站测点
-                    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.setNemCode(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<ProBasicPowerstationPoint> list4 = proBasicWppointService.getStationpointByUniformcode(project.getId(), p.getUniformcode());
-                        if (null != list4 && list4.size() > 0) {
-                            continue;
-                        }
-                        //期次测点
-                        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.setNemCode(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<ProBasicPowerstationPoint> list5 = proBasicWppointService.getStationpointByUniformcode(l.getId(), p.getUniformcode());
-                            if (null != list5 && list5.size() > 0) {
-                                continue;
-                            }
-                            stationpoint = new ProBasicPowerstationPoint();
-                            //线路测点
-                            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.setNemCode(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
-     * @param company
-     * @return
-     */
-    private List<ProBasicEquipmentPoint> czd(Standardpoint p, List<ProBasicPowerstation> windpowerstationList, ProBasicCompany company) {
-        ProBasicEquipmentPoint testing = null;
-        List<ProBasicEquipmentPoint> testingList = new ArrayList<>();
-        for (ProBasicPowerstation station : windpowerstationList) {
-
-
-            List<ProBasicEquipment> windturbineList = proBasicWindturbineService.getWindturbineGyLine(station.getId(), "", "");
-            for (ProBasicEquipment 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(company.getGroupId()).append("_").append(company.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.setNemCode(stationsb.toString() + p.getPoint());
-                    testing.setRealtimeId(substaion + (station.getId().endsWith("_FDC") ? "FJJSFW" : "GFJSFW"));
-                } else if ("fjjcd".equals(p.getType())) {
-                    testing.setNemCode("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/impl/ProBasicPowerstationServiceImpl.java

@@ -1,7 +1,5 @@
 package com.gyee.backconfig.service.auto.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,17 +9,12 @@ import com.gyee.backconfig.service.auto.IProBasicPowerstationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.backconfig.service.auto.RedisService;
 import com.gyee.backconfig.until.realtimedate.EdosUtil;
-import com.gyee.backconfig.until.realtimedate.MathUtil;
-import com.gyee.backconfig.vo.WindpowerstationAdmVo;
-import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

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

@@ -0,0 +1,53 @@
+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.ProEconUniformCode;
+import com.gyee.backconfig.mapper.auto.ProEconUniformCodeMapper;
+import com.gyee.backconfig.service.auto.IProEconUniformCodeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 统一编码表
+
+
+设备类型：风电/光伏
+测点类型：遥测/遥信/计算
+ 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-12
+ */
+@Service
+public class ProEconUniformCodeServiceImpl extends ServiceImpl<ProEconUniformCodeMapper, ProEconUniformCode> implements IProEconUniformCodeService {
+
+    @Override
+    public IPage<ProEconUniformCode> list(String nemCode, String description, String equipmentType, String pointType, String pageNum, String pageSize) {
+        QueryWrapper<ProEconUniformCode> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(nemCode)) {
+            qw.eq("nem_code", nemCode);
+        }
+
+        if (StringUtils.isNotEmpty(description)) {
+            qw.like(description, "description");
+        }
+
+        if (StringUtils.isNotEmpty(equipmentType)) {
+            qw.eq("equipment_type", "equipmentType");
+        }
+
+        if (StringUtils.isNotEmpty(pointType)) {
+            qw.eq("point_type", "pointType");
+        }
+
+        Page<ProEconUniformCode> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProEconUniformCode> list = getBaseMapper().selectPage(page, qw);
+        return list;
+    }
+}

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

@@ -1,118 +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.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("uniform_code",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("uniform_code",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("uniform_code",uniformcode);
-        }
-        List<Standardpoint> list = baseMapper.selectList(qw);
-        return list;
-    }
-}

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

@@ -1,75 +0,0 @@
-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;
-
-
-}