Merge remote-tracking branch 'origin/master'

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

@@ -1,106 +1,120 @@
-//package com.gyee.backconfig.config;
-//
-//
-//
-//import com.gyee.common.model.auto.Windturbine;
-//import com.gyee.common.service.IWindturbineService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.CommandLineRunner;
-//import org.springframework.stereotype.Component;
-//
-//import javax.annotation.Resource;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-//
-///**
-// * @ClassName : CacheContext
-// * @Author : wang
-// * @Date: 2022/9/26 9:35
-// * @Description : 缓存
-// */
-//@Component
-//public class CacheContext implements CommandLineRunner {
-//
-//
-//
-//
-//
-//    @Autowired
-//    private IRegionService regionService;//区域
-//
-//    @Resource
-//    private ICompanysService companysService;//公司
-//
-//    @Resource
-//    private IProjectService projectService;//期次
-//
-//    @Resource
-//    private ILineService lineService;//线路
-//
-//    @Resource
-//    private IWindpowerstationService windpowerstationService;//场站
-//
-//    @Autowired
-//    private IWindturbineService windturbineService;//风机
-//
-//
-//    public static   Map<String, Region> regionmap = new HashMap<>();
-//    public static List<Region> regions = new ArrayList<>();
-//
-//
-//    public static   Map<String, Line> linemap = new HashMap<>();
-//    public static List<Line> lines = new ArrayList<>();
-//
-//
-//    public static   Map<String, Windturbine> windturbinemap = new HashMap<>();
-//    public static List<Windturbine> windturbines = new ArrayList<>();
-//
-//    public static Map<String, Project> promap = new HashMap<>();
-//    public static List<Project> prols = new ArrayList<>();
-//    public static Map<String,Windpowerstation> wpmap = new HashMap<>();
-//    public static List<Windpowerstation> wpls = new ArrayList<>();
-//    public static Map<String, Companys> cpmap = new HashMap<>();
-//    public static List<Companys> cpls = new ArrayList<>();
-//
-//
-//    @Override
-//    public void run(String... args) throws Exception {
-//
-//        cpls = companysService.list();
-//        cpls.stream().forEach(Companys -> {
-//            cpmap.put(Companys.getId(),Companys);
-//        });
-//
-//        wpls = windpowerstationService.list();
-//        wpls.stream().forEach(windpowerstation -> {
-//            wpmap.put(windpowerstation.getId(),windpowerstation);
-//        });
-//
-//        prols = projectService.list();
-//        prols.stream().forEach(Project -> {
-//            promap.put(Project.getWindpowerstationid(),Project);
-//        });
-//
-//
-//        //区域
-//        regions = regionService.list();
-//        regions.stream().forEach(region -> {
-//            regionmap.put(region.getId(), region);
-//        });
-//
-//        //线路
-//        lines = lineService.list();
-//        lines.stream().forEach(line -> {
-//            linemap.put(line.getId(), line);
-//        });
-//
-//        //风机
-//        windturbines =  windturbineService.list();
-//        windturbines.stream().forEach(windturbine -> {
-//            windturbinemap.put(windturbine.getId(), windturbine);
-//        });
-//    }
-//}
+package com.gyee.backconfig.config;
+
+
+import com.gyee.backconfig.model.auto.*;
+import com.gyee.backconfig.service.auto.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @ClassName : CacheContext
+ * @Author : wang
+ * @Date: 2022/9/26 9:35
+ * @Description : 缓存
+ */
+@Component
+public class CacheContext implements CommandLineRunner {
+
+    @Resource
+    private IProBasicEnergyGroupService proBasicEnergyGroupService;//集团
+
+    @Autowired
+    private IProBasicRegionService proBasicRegionService;//区域
+
+    @Resource
+    private IProBasicCompanyService proBasicCompanyService;//公司
+
+    @Resource
+    private IProBasicWindpowerstationService proBasicWindpowerstationService;//场站
+
+    @Resource
+    private IProBasicProjectService proBasicProjectService;//期次
+
+    @Resource
+    private IProBasicLineService proBasicLineService;//线路
+
+    @Autowired
+    private IProBasicWindturbineService proBasicWindturbineService;//风机
+
+    //集团
+    public static Map<String, ProBasicEnergyGroup> energymap = new HashMap<>();
+    public static List<ProBasicEnergyGroup> energy = new ArrayList<>();
+
+    //区域
+    public static Map<String, ProBasicRegion> regionmap = new HashMap<>();
+    public static List<ProBasicRegion> regions = new ArrayList<>();
+
+    //公司
+    public static Map<String, ProBasicCompany> cpmap = new HashMap<>();
+    public static List<ProBasicCompany> cpls = new ArrayList<>();
+
+    //场站
+    public static Map<String, ProBasicWindpowerstation> wpmap = new HashMap<>();
+    public static List<ProBasicWindpowerstation> wpls = new ArrayList<>();
+
+    //期次
+    public static Map<String, ProBasicProject> promap = new HashMap<>();
+    public static List<ProBasicProject> prols = new ArrayList<>();
+
+    //线路
+    public static Map<String, ProBasicLine> linemap = new HashMap<>();
+    public static List<ProBasicLine> lines = new ArrayList<>();
+
+    //风机
+    public static Map<String, ProBasicWindturbine> windturbinemap = new HashMap<>();
+    public static List<ProBasicWindturbine> windturbines = new ArrayList<>();
+
+
+    @Override
+    public void run(String... args) throws Exception {
+
+        //集团
+        energy = proBasicEnergyGroupService.list();
+        energy.stream().forEach(energy -> {
+            energymap.put(energy.getId(), energy);
+        });
+
+        //区域
+        regions = proBasicRegionService.list();
+        regions.stream().forEach(region -> {
+            regionmap.put(region.getGroupId(), region);
+        });
+
+        //公司
+        cpls = proBasicCompanyService.list();
+        cpls.stream().forEach(Companys -> {
+            cpmap.put(Companys.getRegionId(), Companys);
+        });
+
+        //场站
+        wpls = proBasicWindpowerstationService.list();
+        wpls.stream().forEach(windpowerstation -> {
+            wpmap.put(windpowerstation.getCompanyId(), windpowerstation);
+        });
+
+        //期次
+        prols = proBasicProjectService.list();
+        prols.stream().forEach(Project -> {
+            promap.put(Project.getWindpowerstationId(), Project);
+        });
+
+        //线路
+        lines = proBasicLineService.list();
+        lines.stream().forEach(line -> {
+            linemap.put(line.getId(), line);
+        });
+
+        //风机
+        windturbines = proBasicWindturbineService.list();
+        windturbines.stream().forEach(windturbine -> {
+            windturbinemap.put(windturbine.getId(), windturbine);
+        });
+    }
+}

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

@@ -1,9 +1,15 @@
 package com.gyee.backconfig.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicWindpowerstation;
+import com.gyee.backconfig.service.auto.IProBasicWindpowerstationService;
+import com.gyee.common.model.StringUtils;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -16,5 +22,69 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("//pro-basic-windpowerstation")
 public class ProBasicWindpowerstationController {
+    @Resource
+    private IProBasicWindpowerstationService proBasicWindpowerstationService;
+
+    /**
+     * 查询
+     *
+     * @param id
+     * @param name
+     * @param code
+     * @param companyId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/List")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "companyId", required = false) String companyId,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProBasicWindpowerstation> list = proBasicWindpowerstationService.getList(id, name, code, companyId, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+
+    /**
+     * 插入（批量）
+     *
+     * @param proBasicWindpowerstation
+     * @return
+     */
+    @PostMapping(value = "/add")
+    public R addAll(@RequestBody ProBasicWindpowerstation proBasicWindpowerstation) {
+
+        boolean b = proBasicWindpowerstationService.saveOrUpdate(proBasicWindpowerstation);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proBasicWindpowerstationService.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/ProBasicWindturbineController.java

@@ -1,9 +1,16 @@
 package com.gyee.backconfig.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicWindpowerstation;
+import com.gyee.backconfig.model.auto.ProBasicWindturbine;
+import com.gyee.backconfig.service.auto.IProBasicWindturbineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -16,5 +23,69 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("//pro-basic-windturbine")
 public class ProBasicWindturbineController {
+    @Resource
+    private IProBasicWindturbineService proBasicWindturbineService;
+
+    /**
+     * 查询
+     *
+     * @param id
+     * @param code
+     * @param windpowerstationId
+     * @param projectId
+     * @param lineId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/list")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "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<ProBasicWindturbine> 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")
+    public R addAll(@RequestBody ProBasicWindturbine proBasicWindpowerstation) {
+
+        boolean b = proBasicWindturbineService.saveOrUpdate(proBasicWindpowerstation);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        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/SttreeControllel.java

@@ -0,0 +1,39 @@
+package com.gyee.backconfig.controller;
+
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicCompany;
+import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
+import com.gyee.backconfig.service.auto.SttreeService;
+import com.gyee.common.model.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 树
+ */
+@RestController
+@RequestMapping("//sttree")
+public class SttreeControllel {
+    @Resource
+    private SttreeService sttreeService;
+
+
+    /**
+     * 层级树
+     *
+     * @return
+     */
+    @GetMapping(value = "/treels")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R wtls(String tag) {
+        List<ProBasicEnergyGroup> resultList = sttreeService.energytree(tag);
+        if (StringUtils.isNotNull(resultList)) {
+            return com.gyee.backconfig.config.R.ok((int) resultList.size()).data(resultList);
+        } else {
+            return R.error().message("访问失败");
+        }
+    }
+}

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

@@ -1,8 +1,11 @@
 package com.gyee.backconfig.model.auto;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
@@ -145,5 +148,6 @@ public class ProBasicCompany extends Model {
 
     private Integer isAble;
 
-
+    @TableField(exist = false)
+    private List<ProBasicWindpowerstation> Children = new ArrayList<>();
 }

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

@@ -1,8 +1,11 @@
 package com.gyee.backconfig.model.auto;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
@@ -134,4 +137,7 @@ public class ProBasicEnergyGroup extends Model {
     private Integer jrNumber;
 
 //    private Integer isAble;
+
+    @TableField(exist = false)
+    private List<ProBasicRegion> Children = new ArrayList<>();
 }

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

@@ -3,9 +3,13 @@ package com.gyee.backconfig.model.auto;
 import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -99,5 +103,6 @@ public class ProBasicProject extends Model {
      */
     private String windsubStationId;
     private Integer isAble;
-
+    @TableField(exist = false)
+    private List<ProBasicLine> Children = new ArrayList<>();
 }

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

@@ -1,8 +1,11 @@
 package com.gyee.backconfig.model.auto;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
@@ -139,4 +142,7 @@ public class ProBasicRegion extends Model {
     private String groupId;
     private Integer isAble;
 
+    @TableField(exist = false)
+    private List<ProBasicCompany> Children = new ArrayList<>();
+
 }

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

@@ -1,8 +1,11 @@
 package com.gyee.backconfig.model.auto;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
@@ -134,4 +137,8 @@ public class ProBasicWindpowerstation extends Model {
     private String groupId;
 
     private Integer isAble;
+
+
+    @TableField(exist = false)
+    private List<ProBasicProject> Children = new ArrayList<>();
 }

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

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

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

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

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

@@ -0,0 +1,106 @@
+package com.gyee.backconfig.service.auto;
+
+import com.gyee.backconfig.config.CacheContext;
+import com.gyee.backconfig.model.auto.*;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+import java.util.stream.Collectors;
+
+@Service
+public class SttreeService {
+    public List<ProBasicEnergyGroup>  energytree(String tag) {
+
+        List<ProBasicEnergyGroup> energyls = CacheContext.energy;//集团
+        List<ProBasicRegion> regionsls = CacheContext.regions;//区域
+        List<ProBasicCompany> cpls = CacheContext.cpls;//公司
+        List<ProBasicWindpowerstation> wpls = CacheContext.wpls;//场站
+        List<ProBasicProject> prols = CacheContext.prols;//期次
+        List<ProBasicLine> list = CacheContext.lines;//期次
+
+//        if (energyls.get(0).getChildren().size() > 0) return energyls;
+
+        //集团-区域
+        energyls.forEach(regls -> {
+            List<ProBasicRegion> collect = regionsls.stream().filter(r -> r.getGroupId().equals(regls.getId())).collect(Collectors.toList());
+            if (null != regls.getChildren()) {
+                regls.getChildren().clear();
+            }
+            collect.stream().forEach(c->{
+                c.getChildren().clear();
+            });
+            regls.getChildren().addAll(collect);
+        });
+
+        if("1".equals(tag)){
+            return energyls;
+        }
+
+        //区域-公司
+        regionsls.forEach(cp -> {
+            List<ProBasicCompany> region = cpls.stream().filter(c -> null != c.getRegionId() && c.getRegionId().equals(cp.getId())).collect(Collectors.toList());
+            region.stream().forEach(r->{
+                r.getChildren().clear();
+            });
+            cp.getChildren().addAll(region);
+        });
+        if("2".equals(tag)){
+            return energyls;
+        }
+
+        //公司-场站
+        cpls.forEach(wp -> {
+            List<ProBasicWindpowerstation> co = wpls.stream().filter(w -> null != w.getCompanyId() && w.getCompanyId().equals(wp.getId())).collect(Collectors.toList());
+            co.stream().forEach(c->{
+                c.getChildren().clear();
+            });
+            wp.getChildren().addAll(co);
+        });
+        if("3".equals(tag)){
+            return energyls;
+        }
+
+        //场站-期次
+        wpls.forEach(pl -> {
+            List<ProBasicProject> cz = prols.stream().filter(p -> null != p.getWindpowerstationId() && p.getWindpowerstationId().equals(pl.getId())).collect(Collectors.toList());
+            cz.stream().forEach(c->{
+                c.getChildren().clear();
+            });
+            pl.getChildren().addAll(cz);
+        });
+        if("4".equals(tag)){
+            return energyls;
+        }
+
+        //期次-线路
+        prols.forEach(ll -> {
+            List<ProBasicLine> lis = list.stream().filter(l -> null != l.getProjectId() && l.getProjectId().equals(ll.getId())).collect(Collectors.toList());
+            ll.getChildren().addAll(lis);
+        });
+
+//        List<List> xh = new ArrayList();
+//        xh.add(energyls);
+//        xh.add(regionsls);
+//        xh.add(cpls);
+//        xh.add(wpls);
+//        xh.add(prols);
+//
+//        Scanner sc = new Scanner(System.in);
+//        int ls = sc.nextInt();
+//
+//        switch (ls) {
+//            case 1:
+//                xh.get(0);
+//                break;
+//            case 2:
+//                xh.get(1);
+//                break;
+//            case 3:
+//                xh.get(2);
+//                break;
+//        }
+        return energyls;
+    }
+}

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

@@ -1,9 +1,13 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.ProBasicWindpowerstation;
 import com.gyee.backconfig.mapper.auto.ProBasicWindpowerstationMapper;
 import com.gyee.backconfig.service.auto.IProBasicWindpowerstationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,30 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProBasicWindpowerstationServiceImpl extends ServiceImpl<ProBasicWindpowerstationMapper, ProBasicWindpowerstation> implements IProBasicWindpowerstationService {
 
+    @Override
+    public IPage<ProBasicWindpowerstation> getList(String id, String name, String code, String companyId, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicWindpowerstation> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(id)){
+            qw.eq("id",id);
+        }
+
+        if (StringUtils.isNotEmpty(code)){
+            qw.like("code",code);
+        }
+
+        if (StringUtils.isNotEmpty(name)){
+            qw.like("name",name);
+        }
+
+        if (StringUtils.isNotEmpty(companyId)){
+            qw.like("companyId",companyId);
+        }
+
+        Page<ProBasicWindpowerstation> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<ProBasicWindpowerstation> companysPage = getBaseMapper().selectPage(page, qw);
+//        List<Windpowerstation> list = companysPage.getRecords();
+        return companysPage;
+
+    }
 }

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

@@ -1,9 +1,13 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.ProBasicWindturbine;
 import com.gyee.backconfig.mapper.auto.ProBasicWindturbineMapper;
 import com.gyee.backconfig.service.auto.IProBasicWindturbineService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,32 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProBasicWindturbineServiceImpl extends ServiceImpl<ProBasicWindturbineMapper, ProBasicWindturbine> implements IProBasicWindturbineService {
 
+    @Override
+    public IPage<ProBasicWindturbine> list(String id, String code, String windpowerstationId, String projectId, String lineId, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicWindturbine> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)){
+            qw.eq("id",id);
+        }
+        if (StringUtils.isNotEmpty(code)){
+            qw.like("code",code);
+        }
+
+        if (StringUtils.isNotEmpty(windpowerstationId)){
+            qw.like("windpowerstationId",windpowerstationId);
+        }
+
+        if (StringUtils.isNotEmpty(projectId)){
+            qw.eq("projectId",projectId);
+        }
+
+        if (StringUtils.isNotEmpty(lineId)){
+            qw.eq("lineId",lineId);
+        }
+
+        Page<ProBasicWindturbine> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<ProBasicWindturbine> companysPage = getBaseMapper().selectPage(page, qw);
+//        List<Windturbine> list = companysPage.getRecords();
+        return companysPage;
+
+    }
 }

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

@@ -29,7 +29,7 @@ public class BackController {
     private BackConfigService backConfigService;
 
     /**
-     * 公司列表
+     * 计划电量树
      *
      * @return
      */

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

@@ -0,0 +1,54 @@
+package com.gyee.backconfig.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.Equipmentmodel;
+import com.gyee.backconfig.model.auto.Manufacturer;
+import com.gyee.backconfig.service.auto.IEquipmentmodelService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-19
+ */
+@RestController
+@RequestMapping("//equipmentmodel")
+public class EquipmentmodelController {
+    @Resource
+    private IEquipmentmodelService equipmentmodelService;
+
+    /**
+     * 查询
+     * @param id
+     * @param code
+     * @param name
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/listByPage")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<Equipmentmodel> list = equipmentmodelService.list(id, code, name, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+}

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

@@ -0,0 +1,105 @@
+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.Inverter;
+import com.gyee.backconfig.service.auto.IInverterService;
+import com.gyee.common.model.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-17
+ */
+@RestController
+@RequestMapping("//inverter")
+public class InverterController {
+    @Resource
+    private IInverterService iInverterService;
+
+    /**
+     * 查询
+     *
+     * @param id
+     * @param code
+     * @param windpowerstationid
+     * @param name
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/listByPage")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "windpowerstationid", required = false) String windpowerstationid,
+                      @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<Inverter> list = iInverterService.list(id, code, windpowerstationid, name, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 根据id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/Square/{id}")
+    public R findOne(@PathVariable("id") String id) {
+        QueryWrapper<Inverter> qw = new QueryWrapper<>();
+        qw.eq("id", id);
+        Inverter Inverter = iInverterService.getOne(qw);
+        if (StringUtils.isNotNull(Inverter)) {
+            return R.ok().data(Inverter);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 插入
+     *
+     * @param inverter
+     * @return
+     */
+    @PostMapping(value = "/save")
+    public R addAll(@RequestBody Inverter inverter) {
+        boolean b = iInverterService.saveOrUpdate(inverter);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-Inverter/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = iInverterService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+}

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

@@ -0,0 +1,86 @@
+package com.gyee.backconfig.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.Inverter;
+import com.gyee.backconfig.model.auto.Junctionbox;
+import com.gyee.backconfig.service.auto.IJunctionboxService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-17
+ */
+@RestController
+@RequestMapping("//junctionbox")
+public class JunctionboxController {
+    @Resource
+    private IJunctionboxService junctionboxService;
+
+    /**
+     * 查询
+     * @param id
+     * @param code
+     * @param windpowerstationid
+     * @param inverterid
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/listByPage")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "windpowerstationid", required = false) String windpowerstationid,
+                      @RequestParam(value = "inverterid", required = false) String inverterid,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<Junctionbox> list = junctionboxService.list(id, code, windpowerstationid, inverterid, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 插入
+     *
+     * @param junctionbox
+     * @return
+     */
+    @PostMapping(value = "/save")
+    public R addAll(@RequestBody Junctionbox junctionbox) {
+        boolean b = junctionboxService.saveOrUpdate(junctionbox);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-junctionbox/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = junctionboxService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+
+}

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

@@ -0,0 +1,96 @@
+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.Manufacturer;
+import com.gyee.backconfig.model.auto.Meterpoint;
+import com.gyee.backconfig.service.auto.IManufacturerService;
+import com.gyee.common.model.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+
+/**设备厂商
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-19
+ */
+@RestController
+@RequestMapping("//manufacturer")
+public class ManufacturerController {
+    @Resource
+    private IManufacturerService manufacturerService;
+
+    /**
+     * 查询
+     * @param id
+     * @param name
+     * @param country
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/listByPage")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "country", required = false) String country,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<Manufacturer> list = manufacturerService.list(id, name, country, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+    @GetMapping(value = "/meterpoint/{id}")
+    public R findOne(@PathVariable("id") String id) {
+        QueryWrapper<Manufacturer> qw = new QueryWrapper<>();
+        qw.eq("id", id);
+        Manufacturer Square = manufacturerService.getOne(qw);
+        if (StringUtils.isNotNull(Square)) {
+            return R.ok().data(Square);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 批量插入
+     *
+     * @param manufacturer
+     * @return
+     */
+    @PostMapping(value = "/save")
+    public R addAll(@RequestBody Manufacturer manufacturer) {
+        boolean b = manufacturerService.saveOrUpdate(manufacturer);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-manufacturer/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = manufacturerService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+}

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

@@ -0,0 +1,106 @@
+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.Meterpoint;
+import com.gyee.backconfig.model.auto.Square;
+import com.gyee.backconfig.service.auto.IMeterpointService;
+import com.gyee.common.model.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+
+/**
+ * <p>电计量点表
+ * 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-18
+ */
+@RestController
+@RequestMapping("//meterpoint")
+public class MeterpointController {
+    @Resource
+    private IMeterpointService meterpointService;
+
+    /**
+     * 查询
+     * @param id
+     * @param code
+     * @param windpowerstationid
+     * @param name
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/listByPage")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "windpowerstationid", required = false) String windpowerstationid,
+                      @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<Meterpoint> list = meterpointService.list(id, code, windpowerstationid, name, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+    /**
+     * 根据id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/meterpoint/{id}")
+    public R findOne(@PathVariable("id") String id) {
+        QueryWrapper<Meterpoint> qw = new QueryWrapper<>();
+        qw.eq("id", id);
+        Meterpoint Square = meterpointService.getOne(qw);
+        if (StringUtils.isNotNull(Square)) {
+            return R.ok().data(Square);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 批量插入
+     *
+     * @param meterpoint
+     * @return
+     */
+    @PostMapping(value = "/save")
+    public R addAll(@RequestBody Meterpoint meterpoint) {
+        boolean b = meterpointService.saveOrUpdate(meterpoint);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-meterpoint/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = meterpointService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+
+
+}

web/backmanagerconfig/src/main/java/com/gyee/backconfig/mapper/auto/EquipmentmodelMapper.java

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

web/backmanagerconfig/src/main/java/com/gyee/backconfig/mapper/auto/InverterMapper.java

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

web/backmanagerconfig/src/main/java/com/gyee/backconfig/mapper/auto/JunctionboxMapper.java

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

web/backmanagerconfig/src/main/java/com/gyee/backconfig/mapper/auto/ManufacturerMapper.java

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

web/backmanagerconfig/src/main/java/com/gyee/backconfig/mapper/auto/MeterpointMapper.java

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

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Companys.java

@@ -30,13 +30,13 @@ public class Companys extends Model {
 
     private String aname;
 
-    private Integer windcapacity;
+    private Double windcapacity;
 
     private String windcapacityunit;
 
     private Integer windquantity;
 
-    private Integer capacity;
+    private Double capacity;
 
     private String capacityunit;
 
@@ -50,7 +50,7 @@ public class Companys extends Model {
 
     private Integer jrwindquantity;
 
-    private Integer jrcapacity;
+    private Double jrcapacity;
 
     private String jrcapacityunit;
 
@@ -60,6 +60,13 @@ public class Companys extends Model {
 
     private Integer ordernum;
 
+    private Integer windnumber;
+
+    private Integer  number;
+
+    private Integer  jrwindnumber;
+
+    private Integer  jrnumber;
 
     @TableField(exist = false)
     private List<Windpowerstation> Children = new ArrayList<>();

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Equipmentmodel.java

@@ -0,0 +1,49 @@
+package com.gyee.backconfig.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Equipmentmodel extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String code;
+
+    private String name;
+
+    private String description;
+
+    private BigDecimal powerproduction;
+
+    private BigDecimal cutinwindspeed;
+
+    private BigDecimal ratedwindspeed;
+
+    private String cutoutwindspeed;
+
+    private String windturbinemanufacturerid;
+
+    private String photo;
+
+    private String unit;
+
+    private BigDecimal sweptarea;
+
+    private BigDecimal equipmentcategory;
+
+
+}

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Inverter.java

@@ -0,0 +1,44 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Inverter extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String code;
+
+    private String windpowerstationid;
+
+    private String projectid;
+
+    private String lineid;
+
+    private String name;
+
+    private String squareid;
+
+    private String boxchangeid;
+
+    private Integer isstandard;
+
+    private String modelid;
+
+    private Integer branchnum;
+
+
+}

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Junctionbox.java

@@ -0,0 +1,40 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Junctionbox extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String code;
+
+    private String windpowerstationid;
+
+    private String projectid;
+
+    private String lineid;
+
+    private String name;
+
+    private String squareid;
+
+    private String boxchangeid;
+
+    private String inverterid;
+
+
+}

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Line.java

@@ -32,7 +32,7 @@ public class Line extends Model {
 
     private Integer ordernum;
 
-    private Integer capacity;
+    private Double capacity;
 
     private String capacityunit;
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Manufacturer.java

@@ -0,0 +1,32 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Manufacturer extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String name;
+
+    private String country;
+
+    private String address;
+
+    private String telephone;
+
+
+}

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Meterpoint.java

@@ -0,0 +1,66 @@
+package com.gyee.backconfig.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Meterpoint extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String code;
+
+    private String name;
+
+    private String description;
+
+    private String windpowerstationid;
+
+    private String projectid;
+
+    private String lineid;
+
+    private String metertype;
+
+    private String metercode;
+
+    private String metersort;
+
+    private String displaytype;
+
+    private String uniformcode;
+
+    private BigDecimal magnification;
+
+    private String shortid;
+
+    private String longid;
+
+    private String realtimeid;
+
+    private BigDecimal initialvalue;
+
+    private BigDecimal xs;
+
+    private BigDecimal magnificationxs;
+
+    private BigDecimal othervalue;
+
+    private LocalDate otherdate;
+
+
+}

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Project.java

@@ -42,7 +42,7 @@ public class Project extends Model {
     private String windpowerstationid;
 
     @TableField("CAPACITY")
-    private Integer capacity;
+    private Double capacity;
 
     @TableField("CAPACITYUNIT")
     private String capacityunit;

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Region.java

@@ -32,7 +32,7 @@ public class Region extends Model {
 
     private Integer windquantity;
 
-    private Integer capacity;
+    private Double capacity;
 
     private String capacityunit;
 
@@ -56,6 +56,14 @@ public class Region extends Model {
 
     private Integer ordernum;
 
+    private Integer windnumber;
+
+    private Integer  number;
+
+    private Integer  jrwindnumber;
+
+    private Integer  jrnumber;
+
 
 
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Windpowerstation.java

@@ -33,7 +33,7 @@ public class Windpowerstation extends Model {
 
     private String telephone;
 
-    private Integer capacity;
+    private Double capacity;
 
     private String capacityunit;
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/BackConfigService.java

@@ -408,68 +408,6 @@ public class BackConfigService {
                 List<Project> projects = prols.stream().filter(l -> l.getWindpowerstationid().equals(wpl.getId())).collect(Collectors.toList());
                 wpl.getChildren().addAll(projects);
             });
-//        prols.forEach(wp->{
-//            wpls.stream().filter(pr ->pr.getId().equals(wp.getWindpowerstationid())).collect(Collectors.toList());
-////            Companys.get(0).getData2().add(wp);
-//        });
-//        //返回结果为期次在上面，场站在下面
-////        prols.stream().forEach(cp->{
-////            Windpowerstationvo vo = new Windpowerstationvo();
-////            vo.setId(cp.getId());
-////            vo.setCode(cp.getName());
-////
-////            List<Windpowerstation> wt = wpls.stream().filter(wt1 ->wt1.getId().equals(cp.getWindpowerstationid())).collect(Collectors.toList());
-////                vo.setData(wt);
-////                wtlist.add(vo);
-////        });
-//        //返回结果为场站在上面，期次在下面，但是公司表setdata需要为vo
-//        wpls.forEach(wp->{
-//            //Projectvo vo = new Projectvo();
-//            /*Windpowerstationvo vo = new Windpowerstationvo();
-//            vo.setId(wp.getId());
-//            List<Projectvo> Project = prols.stream().filter(wt -> wt.getWindpowerstationid().equals(wp.getId())).collect(Collectors.toList());
-//            vo.setData(Project);
-//
-//            vo.setId(wp.getId());
-//            vo.setCode(wp.getName());
-//            List<Project> Project = prols.stream().filter(wt -> wt.getWindpowerstationid().equals(wp.getId())).collect(Collectors.toList());
-//            vo.setData(Project);
-//            volist.add(vo);*/
-//            cpls.stream().filter(ct ->ct.getId().equals(wp.getCompanyid())).collect(Collectors.toList());
-//            Companysvo vo = new Companysvo();
-//            vo.setId(Companys.get(0).getId());
-//            vo.setName(Companys.get(0).getName());
-//            vo.setRid(Companys.get(0).getRid());
-//            vo.getData1().add(wp);
-//            colist.add(vo);
-//        });
-
-
-//        cpls.stream().forEach(cpl->{
-//            Projectvo vo = new Projectvo();
-//            vo.setWindpowerstationid(cpl.getId());
-//
-//         List<Projectvo> cc = volist.stream().filter((wt2 ->wt2.getWindpowerstationid().equals(cpl.getId()))).collect(Collectors.toList());
-//            vo.setData(cc);
-//            volist.add(vo);
-//        });
-//
-//        volist.stream().forEach(vol->{
-//            Companysvo vo = new Companysvo();
-//            vo.setId(vol.get());
-//            List<Companys> Companys = cpls.stream().filter(ct ->ct.getId().equals(vol.getWindpowerstationid())).collect(Collectors.toList());
-//            vo.setData(Companys);
-//            colist.add(vo);
-//        });
-//
-//        cpls.stream().forEach(wp->{
-//            Companysvo vo = new Companysvo();
-//
-////            vo.setId(wp.getCompanyid());
-//            List<Windpowerstationvo> Companys = wtlist.stream().filter(wt -> wt.getCompanyid().equals(wp.getId())).collect(Collectors.toList());
-//            vo.setData(Companys);
-//            colist.add(vo);
-//        });
         return cpls;
     }
 
@@ -479,6 +417,7 @@ public class BackConfigService {
         List<Windpowerstation> wpls = CacheContext.wpls;
         List<Project> prols= CacheContext.prols;
         List<Line> lines = CacheContext.lines;
+        if(wpls.get(0).getChildren().size()>0) return wpls;
         wpls.forEach(wpl -> {
             List<Project> projects = prols.stream().filter(l -> l.getWindpowerstationid().equals(wpl.getId())).collect(Collectors.toList());
             wpl.getChildren().addAll(projects);

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

@@ -0,0 +1,18 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.Equipmentmodel;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.model.auto.Manufacturer;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-19
+ */
+public interface IEquipmentmodelService extends IService<Equipmentmodel> {
+    IPage<Equipmentmodel> list(String id, String code, String name, String pageNum, String pageSize);
+}

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

@@ -0,0 +1,18 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.Inverter;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.model.auto.Square;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-17
+ */
+public interface IInverterService extends IService<Inverter> {
+    IPage<Inverter> list(String id, String code, String windpowerstationid, String name, String pageNum, String pageSize);
+}

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

@@ -0,0 +1,18 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.Inverter;
+import com.gyee.backconfig.model.auto.Junctionbox;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-17
+ */
+public interface IJunctionboxService extends IService<Junctionbox> {
+    IPage<Junctionbox> list(String id, String code, String windpowerstationid, String inverterid, String pageNum, String pageSize);
+}

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

@@ -0,0 +1,18 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.Manufacturer;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.model.auto.Meterpoint;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-19
+ */
+public interface IManufacturerService extends IService<Manufacturer> {
+    IPage<Manufacturer> list(String id, String name, String country, String pageNum, String pageSize);
+}

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

@@ -0,0 +1,18 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.Meterpoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.model.auto.Square;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-18
+ */
+public interface IMeterpointService extends IService<Meterpoint> {
+    IPage<Meterpoint> list(String id, String code, String windpowerstationid, String name, String pageNum, String pageSize);
+}

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

@@ -0,0 +1,41 @@
+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.Equipmentmodel;
+import com.gyee.backconfig.mapper.auto.EquipmentmodelMapper;
+import com.gyee.backconfig.model.auto.Manufacturer;
+import com.gyee.backconfig.service.auto.IEquipmentmodelService;
+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-10-19
+ */
+@Service
+public class EquipmentmodelServiceImpl extends ServiceImpl<EquipmentmodelMapper, Equipmentmodel> implements IEquipmentmodelService {
+
+    @Override
+    public IPage<Equipmentmodel> list(String id, String code, String name, String pageNum, String pageSize) {
+        QueryWrapper<Equipmentmodel> 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);
+        }
+        Page<Equipmentmodel> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<Equipmentmodel> MeterPage =getBaseMapper().selectPage(page, qw);
+        return MeterPage;
+    }
+}

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

@@ -0,0 +1,44 @@
+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.Inverter;
+import com.gyee.backconfig.mapper.auto.InverterMapper;
+import com.gyee.backconfig.model.auto.Square;
+import com.gyee.backconfig.service.auto.IInverterService;
+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-10-17
+ */
+@Service
+public class InverterServiceImpl extends ServiceImpl<InverterMapper, Inverter> implements IInverterService {
+
+    @Override
+    public IPage<Inverter> list(String id, String code, String windpowerstationid, String name, String pageNum, String pageSize) {
+        QueryWrapper<Inverter> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.like("id", id);
+        }
+        if (StringUtils.isNotEmpty(code)) {
+            qw.like("code", code);
+        }
+        if (StringUtils.isNotEmpty(windpowerstationid)) {
+            qw.like("windpowerstationid", windpowerstationid);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.like("name", name);
+        }
+        Page<Inverter> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<Inverter> Inverter =getBaseMapper().selectPage(page, qw);
+        return Inverter;
+    }
+}

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

@@ -0,0 +1,44 @@
+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.Inverter;
+import com.gyee.backconfig.model.auto.Junctionbox;
+import com.gyee.backconfig.mapper.auto.JunctionboxMapper;
+import com.gyee.backconfig.service.auto.IJunctionboxService;
+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-10-17
+ */
+@Service
+public class JunctionboxServiceImpl extends ServiceImpl<JunctionboxMapper, Junctionbox> implements IJunctionboxService {
+
+    @Override
+    public IPage<Junctionbox> list(String id, String code, String windpowerstationid, String inverterid, String pageNum, String pageSize) {
+        QueryWrapper<Junctionbox> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.like("id", id);
+        }
+        if (StringUtils.isNotEmpty(code)) {
+            qw.like("code", code);
+        }
+        if (StringUtils.isNotEmpty(windpowerstationid)) {
+            qw.like("windpowerstationid", windpowerstationid);
+        }
+        if (StringUtils.isNotEmpty(inverterid)) {
+            qw.like("inverterid", inverterid);
+        }
+        Page<Junctionbox> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<Junctionbox> Inverter =getBaseMapper().selectPage(page, qw);
+        return Inverter;
+    }
+}

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

@@ -0,0 +1,41 @@
+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.Manufacturer;
+import com.gyee.backconfig.mapper.auto.ManufacturerMapper;
+import com.gyee.backconfig.model.auto.Meterpoint;
+import com.gyee.backconfig.service.auto.IManufacturerService;
+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-10-19
+ */
+@Service
+public class ManufacturerServiceImpl extends ServiceImpl<ManufacturerMapper, Manufacturer> implements IManufacturerService {
+
+    @Override
+    public IPage<Manufacturer> list(String id, String name, String country, String pageNum, String pageSize) {
+        QueryWrapper<Manufacturer> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.like("id", id);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.like("name", name);
+        }
+        if (StringUtils.isNotEmpty(country)) {
+            qw.like("country", country);
+        }
+        Page<Manufacturer> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<Manufacturer> MeterPage =getBaseMapper().selectPage(page, qw);
+        return MeterPage;
+    }
+}

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

@@ -0,0 +1,44 @@
+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.Meterpoint;
+import com.gyee.backconfig.mapper.auto.MeterpointMapper;
+import com.gyee.backconfig.model.auto.Square;
+import com.gyee.backconfig.service.auto.IMeterpointService;
+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-10-18
+ */
+@Service
+public class MeterpointServiceImpl extends ServiceImpl<MeterpointMapper, Meterpoint> implements IMeterpointService {
+
+    @Override
+    public IPage<Meterpoint> list(String id, String code, String windpowerstationid, String name, String pageNum, String pageSize) {
+        QueryWrapper<Meterpoint> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.like("id", id);
+        }
+        if (StringUtils.isNotEmpty(code)) {
+            qw.like("code", code);
+        }
+        if (StringUtils.isNotEmpty(windpowerstationid)) {
+            qw.like("windpowerstationid", windpowerstationid);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.like("name", name);
+        }
+        Page<Meterpoint> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<Meterpoint> MeterPage =getBaseMapper().selectPage(page, qw);
+        return MeterPage;
+    }
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/mapper/auto/CompanysPGMapper.java

@@ -0,0 +1,99 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.CompanysPG;
+import com.gyee.frame.model.auto.CompanysPGExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface CompanysPGMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table companys
+     *
+     * @mbg.generated
+     */
+    long countByExample(CompanysPGExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table companys
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(CompanysPGExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table companys
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table companys
+     *
+     * @mbg.generated
+     */
+    int insert(CompanysPG record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table companys
+     *
+     * @mbg.generated
+     */
+    int insertSelective(CompanysPG record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table companys
+     *
+     * @mbg.generated
+     */
+    List<CompanysPG> selectByExample(CompanysPGExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table companys
+     *
+     * @mbg.generated
+     */
+    CompanysPG selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table companys
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") CompanysPG record, @Param("example") CompanysPGExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table companys
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") CompanysPG record, @Param("example") CompanysPGExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table companys
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(CompanysPG record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table companys
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(CompanysPG record);
+
+    List<CompanysPG> getCompanysPG();
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/auto/CompanysPG.java

@@ -0,0 +1,739 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+
+public class CompanysPG implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.aname
+     *
+     * @mbg.generated
+     */
+    private String aname;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.windcapacity
+     *
+     * @mbg.generated
+     */
+    private Double windcapacity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.windcapacityunit
+     *
+     * @mbg.generated
+     */
+    private String windcapacityunit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.windquantity
+     *
+     * @mbg.generated
+     */
+    private Integer windquantity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.capacity
+     *
+     * @mbg.generated
+     */
+    private Double capacity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.capacityunit
+     *
+     * @mbg.generated
+     */
+    private String capacityunit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.quantityjz
+     *
+     * @mbg.generated
+     */
+    private Integer quantityjz;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.quantityzc
+     *
+     * @mbg.generated
+     */
+    private Integer quantityzc;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrwindcapacity
+     *
+     * @mbg.generated
+     */
+    private Double jrwindcapacity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrwindcapacityunit
+     *
+     * @mbg.generated
+     */
+    private String jrwindcapacityunit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrwindquantity
+     *
+     * @mbg.generated
+     */
+    private Integer jrwindquantity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrcapacity
+     *
+     * @mbg.generated
+     */
+    private Double jrcapacity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrcapacityunit
+     *
+     * @mbg.generated
+     */
+    private String jrcapacityunit;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrquantityjz
+     *
+     * @mbg.generated
+     */
+    private Integer jrquantityjz;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrquantityzc
+     *
+     * @mbg.generated
+     */
+    private Integer jrquantityzc;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.ordernum
+     *
+     * @mbg.generated
+     */
+    private Integer ordernum;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.windnumber
+     *
+     * @mbg.generated
+     */
+    private Integer windnumber;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.number
+     *
+     * @mbg.generated
+     */
+    private Integer number;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrwindnumber
+     *
+     * @mbg.generated
+     */
+    private Integer jrwindnumber;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column companys.jrnumber
+     *
+     * @mbg.generated
+     */
+    private Integer jrnumber;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table companys
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.id
+     *
+     * @return the value of companys.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.id
+     *
+     * @param id the value for companys.id
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.name
+     *
+     * @return the value of companys.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.name
+     *
+     * @param name the value for companys.name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.aname
+     *
+     * @return the value of companys.aname
+     *
+     * @mbg.generated
+     */
+    public String getAname() {
+        return aname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.aname
+     *
+     * @param aname the value for companys.aname
+     *
+     * @mbg.generated
+     */
+    public void setAname(String aname) {
+        this.aname = aname == null ? null : aname.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.windcapacity
+     *
+     * @return the value of companys.windcapacity
+     *
+     * @mbg.generated
+     */
+    public Double getWindcapacity() {
+        return windcapacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.windcapacity
+     *
+     * @param windcapacity the value for companys.windcapacity
+     *
+     * @mbg.generated
+     */
+    public void setWindcapacity(Double windcapacity) {
+        this.windcapacity = windcapacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.windcapacityunit
+     *
+     * @return the value of companys.windcapacityunit
+     *
+     * @mbg.generated
+     */
+    public String getWindcapacityunit() {
+        return windcapacityunit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.windcapacityunit
+     *
+     * @param windcapacityunit the value for companys.windcapacityunit
+     *
+     * @mbg.generated
+     */
+    public void setWindcapacityunit(String windcapacityunit) {
+        this.windcapacityunit = windcapacityunit == null ? null : windcapacityunit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.windquantity
+     *
+     * @return the value of companys.windquantity
+     *
+     * @mbg.generated
+     */
+    public Integer getWindquantity() {
+        return windquantity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.windquantity
+     *
+     * @param windquantity the value for companys.windquantity
+     *
+     * @mbg.generated
+     */
+    public void setWindquantity(Integer windquantity) {
+        this.windquantity = windquantity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.capacity
+     *
+     * @return the value of companys.capacity
+     *
+     * @mbg.generated
+     */
+    public Double getCapacity() {
+        return capacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.capacity
+     *
+     * @param capacity the value for companys.capacity
+     *
+     * @mbg.generated
+     */
+    public void setCapacity(Double capacity) {
+        this.capacity = capacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.capacityunit
+     *
+     * @return the value of companys.capacityunit
+     *
+     * @mbg.generated
+     */
+    public String getCapacityunit() {
+        return capacityunit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.capacityunit
+     *
+     * @param capacityunit the value for companys.capacityunit
+     *
+     * @mbg.generated
+     */
+    public void setCapacityunit(String capacityunit) {
+        this.capacityunit = capacityunit == null ? null : capacityunit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.quantityjz
+     *
+     * @return the value of companys.quantityjz
+     *
+     * @mbg.generated
+     */
+    public Integer getQuantityjz() {
+        return quantityjz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.quantityjz
+     *
+     * @param quantityjz the value for companys.quantityjz
+     *
+     * @mbg.generated
+     */
+    public void setQuantityjz(Integer quantityjz) {
+        this.quantityjz = quantityjz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.quantityzc
+     *
+     * @return the value of companys.quantityzc
+     *
+     * @mbg.generated
+     */
+    public Integer getQuantityzc() {
+        return quantityzc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.quantityzc
+     *
+     * @param quantityzc the value for companys.quantityzc
+     *
+     * @mbg.generated
+     */
+    public void setQuantityzc(Integer quantityzc) {
+        this.quantityzc = quantityzc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrwindcapacity
+     *
+     * @return the value of companys.jrwindcapacity
+     *
+     * @mbg.generated
+     */
+    public Double getJrwindcapacity() {
+        return jrwindcapacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrwindcapacity
+     *
+     * @param jrwindcapacity the value for companys.jrwindcapacity
+     *
+     * @mbg.generated
+     */
+    public void setJrwindcapacity(Double jrwindcapacity) {
+        this.jrwindcapacity = jrwindcapacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrwindcapacityunit
+     *
+     * @return the value of companys.jrwindcapacityunit
+     *
+     * @mbg.generated
+     */
+    public String getJrwindcapacityunit() {
+        return jrwindcapacityunit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrwindcapacityunit
+     *
+     * @param jrwindcapacityunit the value for companys.jrwindcapacityunit
+     *
+     * @mbg.generated
+     */
+    public void setJrwindcapacityunit(String jrwindcapacityunit) {
+        this.jrwindcapacityunit = jrwindcapacityunit == null ? null : jrwindcapacityunit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrwindquantity
+     *
+     * @return the value of companys.jrwindquantity
+     *
+     * @mbg.generated
+     */
+    public Integer getJrwindquantity() {
+        return jrwindquantity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrwindquantity
+     *
+     * @param jrwindquantity the value for companys.jrwindquantity
+     *
+     * @mbg.generated
+     */
+    public void setJrwindquantity(Integer jrwindquantity) {
+        this.jrwindquantity = jrwindquantity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrcapacity
+     *
+     * @return the value of companys.jrcapacity
+     *
+     * @mbg.generated
+     */
+    public Double getJrcapacity() {
+        return jrcapacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrcapacity
+     *
+     * @param jrcapacity the value for companys.jrcapacity
+     *
+     * @mbg.generated
+     */
+    public void setJrcapacity(Double jrcapacity) {
+        this.jrcapacity = jrcapacity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrcapacityunit
+     *
+     * @return the value of companys.jrcapacityunit
+     *
+     * @mbg.generated
+     */
+    public String getJrcapacityunit() {
+        return jrcapacityunit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrcapacityunit
+     *
+     * @param jrcapacityunit the value for companys.jrcapacityunit
+     *
+     * @mbg.generated
+     */
+    public void setJrcapacityunit(String jrcapacityunit) {
+        this.jrcapacityunit = jrcapacityunit == null ? null : jrcapacityunit.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrquantityjz
+     *
+     * @return the value of companys.jrquantityjz
+     *
+     * @mbg.generated
+     */
+    public Integer getJrquantityjz() {
+        return jrquantityjz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrquantityjz
+     *
+     * @param jrquantityjz the value for companys.jrquantityjz
+     *
+     * @mbg.generated
+     */
+    public void setJrquantityjz(Integer jrquantityjz) {
+        this.jrquantityjz = jrquantityjz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrquantityzc
+     *
+     * @return the value of companys.jrquantityzc
+     *
+     * @mbg.generated
+     */
+    public Integer getJrquantityzc() {
+        return jrquantityzc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrquantityzc
+     *
+     * @param jrquantityzc the value for companys.jrquantityzc
+     *
+     * @mbg.generated
+     */
+    public void setJrquantityzc(Integer jrquantityzc) {
+        this.jrquantityzc = jrquantityzc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.ordernum
+     *
+     * @return the value of companys.ordernum
+     *
+     * @mbg.generated
+     */
+    public Integer getOrdernum() {
+        return ordernum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.ordernum
+     *
+     * @param ordernum the value for companys.ordernum
+     *
+     * @mbg.generated
+     */
+    public void setOrdernum(Integer ordernum) {
+        this.ordernum = ordernum;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.windnumber
+     *
+     * @return the value of companys.windnumber
+     *
+     * @mbg.generated
+     */
+    public Integer getWindnumber() {
+        return windnumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.windnumber
+     *
+     * @param windnumber the value for companys.windnumber
+     *
+     * @mbg.generated
+     */
+    public void setWindnumber(Integer windnumber) {
+        this.windnumber = windnumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.number
+     *
+     * @return the value of companys.number
+     *
+     * @mbg.generated
+     */
+    public Integer getNumber() {
+        return number;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.number
+     *
+     * @param number the value for companys.number
+     *
+     * @mbg.generated
+     */
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrwindnumber
+     *
+     * @return the value of companys.jrwindnumber
+     *
+     * @mbg.generated
+     */
+    public Integer getJrwindnumber() {
+        return jrwindnumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrwindnumber
+     *
+     * @param jrwindnumber the value for companys.jrwindnumber
+     *
+     * @mbg.generated
+     */
+    public void setJrwindnumber(Integer jrwindnumber) {
+        this.jrwindnumber = jrwindnumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column companys.jrnumber
+     *
+     * @return the value of companys.jrnumber
+     *
+     * @mbg.generated
+     */
+    public Integer getJrnumber() {
+        return jrnumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column companys.jrnumber
+     *
+     * @param jrnumber the value for companys.jrnumber
+     *
+     * @mbg.generated
+     */
+    public void setJrnumber(Integer jrnumber) {
+        this.jrnumber = jrnumber;
+    }
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/CompanysPGService.java

@@ -0,0 +1,118 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.dataSources.DataSource;
+import com.gyee.frame.common.dataSources.DataSourceType;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.CompanysPGMapper;
+import com.gyee.frame.model.auto.CompanysPG;
+import com.gyee.frame.model.auto.CompanysPGExample;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 线路 CompanysPGService
+ * @Title: CompanysPGService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2019-12-31 14:58:09  
+ **/
+@Service
+public class CompanysPGService implements BaseService<CompanysPG, CompanysPGExample> {
+	@Resource
+	private CompanysPGMapper companysPGMapper;
+	
+
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			CompanysPGExample example=new CompanysPGExample();
+			example.createCriteria().andIdIn(lista);
+			return companysPGMapper.deleteByExample(example);
+
+
+	}
+	
+	
+	@Override
+	public CompanysPG selectByPrimaryKey(String id) {
+				
+			return companysPGMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(CompanysPG record) {
+		return companysPGMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(CompanysPG record) {
+				
+
+				
+		return companysPGMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(CompanysPG record, CompanysPGExample example) {
+		
+		return companysPGMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(CompanysPG record, CompanysPGExample example) {
+		
+		return companysPGMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<CompanysPG> selectByExample(CompanysPGExample example) {
+		
+		return companysPGMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(CompanysPGExample example) {
+		
+		return companysPGMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(CompanysPGExample example) {
+		
+		return companysPGMapper.deleteByExample(example);
+	}
+	@DataSource(value = DataSourceType.SLAVE)
+	public List<CompanysPG> findCompanysPG() {
+
+		List<CompanysPG> list=new ArrayList<>();
+
+		CompanysPGExample example=new CompanysPGExample();
+		example.setOrderByClause(" id asc");
+
+		CompanysPGExample.Criteria criteria =example.createCriteria();
+		criteria.andIdEqualTo("QJNY");
+		list= companysPGMapper.selectByExample(example);
+		return list;
+
+	}
+
+
+
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -1,7 +1,6 @@
 package com.gyee.frame.service.websocket;
 
 
-import com.gyee.frame.common.conf.AccessConfig;
 import com.gyee.frame.common.conf.V2Config;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
@@ -51,6 +50,8 @@ public class GenreSetPushService {
     private PhotovoltaicTestingPointNewService photovoltaicTestingPointNewService;
     @Resource
     private RecommenmainService recommenmainService;
+    @Resource
+    private CompanysPGService companysPGService;
     private final String QY = "QY";
     private final String ZC = "ZC";
     private final String JZ = "JZ";
@@ -1748,6 +1749,10 @@ public class GenreSetPushService {
             Date beginDate = cal2.getTime();
             cal2.add(Calendar.DAY_OF_MONTH, 1);
             Date endDate = cal2.getTime();
+
+
+
+
 /*************************************************风场指标*************************************************************/
 
             Map<String, Object> fcmap = new HashMap<>();
@@ -1778,8 +1783,17 @@ public class GenreSetPushService {
                 }
 
 
-                double fd_zjrl=0;
-                double gf_zjrl=0;
+                double qjny_fd_zjrl=0;
+                double qjny_gf_zjrl=0;
+                double jr_fd_zjrl=0;
+                double jr_gf_zjrl=0;
+
+                double qjny_fcts=0;
+                double qjny_gfts=0;
+
+                double jr_fcts=0;
+                double jr_gfts=0;
+
                 double qjny_fj_ts=0;
                 double qjny_gf_zcts=0;
                 double qjny_gf_jzts=0;
@@ -1793,11 +1807,50 @@ public class GenreSetPushService {
                 double gf_r_ycdl=0;
                 double gf_y_ycdl=0;
 
-
+                double fd_r_fdl=0;
+                double fd_y_fdl=0;
+                double gf_r_fdl=0;
+                double gf_y_fdl=0;
+
+
+                List<CompanysPG> compgls= companysPGService.findCompanysPG();
+                if(!compgls.isEmpty())
+                {
+                    CompanysPG pg=compgls.get(0);
+
+                    //清洁能源风电装机容量
+                     qjny_fd_zjrl=null!=pg.getWindcapacity()?pg.getWindcapacity():0.0;
+                    //清洁能源光伏装机容量
+                     qjny_gf_zjrl=null!=pg.getCapacity()?pg.getCapacity():0.0;
+                    //接入风电装机容量
+                     jr_fd_zjrl=null!=pg.getJrwindcapacity()?pg.getJrwindcapacity():0.0;
+                    //接入光伏装机容量
+                     jr_gf_zjrl=null!=pg.getJrcapacity()?pg.getJrcapacity():0.0;
+                    //清洁能源风场数量
+                     qjny_fcts=null!=pg.getWindnumber()?pg.getWindnumber():0.0;
+                    //清洁能源光伏电站数量
+                     qjny_gfts=null!=pg.getNumber()?pg.getNumber():0.0;
+                    //接入风场数量
+                     jr_fcts=null!=pg.getJrwindnumber()?pg.getJrwindnumber():0.0;
+                    //接入光伏电站数量
+                     jr_gfts=null!=pg.getJrnumber()?pg.getJrnumber():0.0;
+                    //清洁能源风机数量
+                     qjny_fj_ts=null!=pg.getWindquantity()?pg.getWindquantity():0.0;
+                    //清洁能源光伏组串数量
+                     qjny_gf_zcts=null!=pg.getQuantityzc()?pg.getQuantityzc():0.0;
+                    //清洁能源光伏集中数量
+                     qjny_gf_jzts=null!=pg.getQuantityjz()?pg.getQuantityjz():0.0;
+                    //接入风机数量
+                     jr_fj_ts=null!=pg.getJrwindquantity()?pg.getJrwindquantity():0.0;
+                    //接入光伏组串数量
+                     jr_gf_zcts=null!=pg.getJrquantityzc()?pg.getJrquantityzc():0.0;
+                    //接入光伏集中数量
+                     jr_gf_jzts=null!=pg.getJrquantityjz()?pg.getJrquantityjz():0.0;
+                }
 
                 Calendar c = Calendar.getInstance();
 
-               c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
+                c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
                 int daynum = c.get(Calendar.DAY_OF_MONTH);
 
                 Map<String, Double> sftjmap = new HashMap<>();//省份装机容量和台数统计
@@ -1810,23 +1863,25 @@ public class GenreSetPushService {
                     PointData rfdldata = realApiUtil.getRealData(rfdlpoint);
                     PointData yfdldata = realApiUtil.getRealData(yfdlpoint);
 
-                    double rfdl=MathUtil.twoBit(rfdldata.getPointValueInDouble()/1000);
-                    double yfdl=MathUtil.twoBit(yfdldata.getPointValueInDouble()/1000);
+                    double rfdl=MathUtil.twoBit(rfdldata.getPointValueInDouble()/10000);
+                    double yfdl=MathUtil.twoBit(yfdldata.getPointValueInDouble()/10000);
 
                     if(wp.getId().endsWith("FDC"))
                     {
                         fd_r_ycdl =fd_r_ycdl+(rfdl * YCFDLXS) ;
-
+                        fd_r_fdl =fd_r_fdl+rfdl;
                         c = Calendar.getInstance();
                         double yycfdl = (yfdl + fd_r_ycdl * (daynum - c.get(Calendar.DAY_OF_MONTH))) * YCFDLXS;
                         fd_y_ycdl=fd_y_ycdl+yycfdl;
+                        fd_y_fdl=fd_y_fdl+yfdl;
                     }else
                     {
                         gf_r_ycdl =gf_r_ycdl+(rfdl * YCFDLXS) ;
-
+                        gf_r_fdl =gf_r_fdl+rfdl ;
                         c = Calendar.getInstance();
                         double yycfdl = (yfdl + gf_r_ycdl * (daynum - c.get(Calendar.DAY_OF_MONTH))) * YCFDLXS;
                         gf_y_ycdl=gf_y_ycdl+yycfdl;
+                        gf_y_fdl=gf_y_fdl+yfdl;
                     }
 
 
@@ -1843,8 +1898,15 @@ public class GenreSetPushService {
 
                     if(wp.getId().endsWith("GDC") && InitialRunner.gp_sqmap.containsKey(wp.getId()))
                     {
+//                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
+//                        {
+//                            jr_gf_zjrl=jr_gf_zjrl+wp.getCapacity();
+//                            jr_gfts=jr_gfts++;
+//                        }
+//
+//                        qjny_gf_zjrl=qjny_gf_zjrl+wp.getCapacity();
+//                        qjny_gfts=qjny_gfts++;
 
-                        gf_zjrl=gf_zjrl+wp.getCapacity();
                         List<Square> sqls=InitialRunner.gp_sqmap.get(wp.getId());
                         for(Square sq:sqls)
                         {
@@ -1858,11 +1920,14 @@ public class GenreSetPushService {
                                         List<Inverter> nbqls=InitialRunner.sq_nbqmap.get(sq.getId());
                                         temp = temp + nbqls.size();
 
-                                        qjny_gf_zcts=qjny_gf_zcts + nbqls.size();
-                                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
-                                        {
-                                            jr_gf_zcts=jr_gf_zcts + nbqls.size();
-                                        }
+//                                        qjny_gf_zcts=qjny_gf_zcts + nbqls.size();
+//
+//
+//                                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
+//                                        {
+//                                            jr_gf_zcts=jr_gf_zcts + nbqls.size();
+//
+//                                         }
                                     }
 
                                     sftjmap.put(wp.getPhoto() + "_zc_zjts", temp);
@@ -1882,11 +1947,11 @@ public class GenreSetPushService {
                                         List<Inverter> nbqls=InitialRunner.sq_nbqmap.get(sq.getId());
                                         temp = temp + nbqls.size();
 
-                                        qjny_gf_jzts=qjny_gf_jzts + nbqls.size();
-                                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
-                                        {
-                                            jr_gf_jzts=jr_gf_jzts + nbqls.size();
-                                        }
+//                                        qjny_gf_jzts=qjny_gf_jzts + nbqls.size();
+//                                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
+//                                        {
+//                                            jr_gf_jzts=jr_gf_jzts + nbqls.size();
+//                                        }
                                     }
                                     sftjmap.put(wp.getPhoto() + "_jz_zjts", temp);
                                 } else {
@@ -1911,12 +1976,19 @@ public class GenreSetPushService {
                             sftjmap.put(wp.getPhoto() + "_zjts", temp);
                         }
 
-                        fd_zjrl=fd_zjrl+wp.getCapacity();
-                        qjny_fj_ts=qjny_fj_ts + wp.getQuantity();
-                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
-                        {
-                            jr_fj_ts=jr_fj_ts + wp.getQuantity();
-                        }
+//                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
+//                        {
+//                            jr_fd_zjrl=jr_fd_zjrl+wp.getCapacity();
+//                            jr_fjts=jr_fjts++;
+//                        }
+//                        qjny_fjts=qjny_fjts++;
+//                        qjny_fd_zjrl=qjny_fd_zjrl+wp.getCapacity();
+//
+//                        qjny_fj_ts=qjny_fj_ts + wp.getQuantity();
+//                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
+//                        {
+//                            jr_fj_ts=jr_fj_ts + wp.getQuantity();
+//                        }
                     }
 
                 }
@@ -1925,8 +1997,17 @@ public class GenreSetPushService {
 
                 Map<String,Double> newpointmap=new HashMap<>();
 
-                newpointmap.put("fd_zjrl",StringUtils.round(fd_zjrl,2));
-                newpointmap.put("gf_zjrl",StringUtils.round(gf_zjrl,2));
+                newpointmap.put("jr_fd_zjrl",StringUtils.round(jr_fd_zjrl,2));
+                newpointmap.put("jr_fcts",StringUtils.round(jr_fcts,2));
+                newpointmap.put("qjny_fcts",StringUtils.round(qjny_fcts,2));
+                newpointmap.put("qjny_fd_zjrl",StringUtils.round(qjny_fd_zjrl,2));
+
+                newpointmap.put("jr_gf_zjrl",StringUtils.round(jr_gf_zjrl,2));
+                newpointmap.put("jr_gfts",StringUtils.round(jr_gfts,2));
+                newpointmap.put("qjny_gfts",StringUtils.round(qjny_gfts,2));
+                newpointmap.put("qjny_gf_zjrl",StringUtils.round(qjny_gf_zjrl,2));
+
+
                 newpointmap.put("qjny_fj_ts",StringUtils.round(qjny_fj_ts,2));
                 newpointmap.put("qjny_gf_zcts",StringUtils.round(qjny_gf_zcts,2));
                 newpointmap.put("qjny_gf_jzts",StringUtils.round(qjny_gf_jzts,2));
@@ -1937,6 +2018,13 @@ public class GenreSetPushService {
                 newpointmap.put("fd_y_ycdl",StringUtils.round(fd_y_ycdl,2));
                 newpointmap.put("gf_r_ycdl",StringUtils.round(gf_r_ycdl,2));
                 newpointmap.put("gf_y_ycdl",StringUtils.round(gf_y_ycdl,2));
+
+
+                newpointmap.put("fd_r_fdl",StringUtils.round(fd_r_fdl,2));
+                newpointmap.put("fd_y_fdl",StringUtils.round(fd_y_fdl,2));
+                newpointmap.put("gf_r_fdl",StringUtils.round(gf_r_fdl,2));
+                newpointmap.put("gf_y_fdl",StringUtils.round(gf_y_fdl,2));
+
                 map.put("newpointmap",newpointmap);
 //                for (Windpowerstation wp : wplist) {
 //

web/monitor-web-sxjn/src/main/resources/application-jn.yml

@@ -129,10 +129,10 @@ spring :
         driver-class-name: org.postgresql.Driver
       #备数据源 #关闭
       slave:
-        enabled: false
-        url: jdbc:mysql://localhost:3306/nacos_config?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
-        username: root
-        password: Gyee123
+        url: jdbc:postgresql://10.81.3.151:5432/postgres
+        username: gdprod
+        password: gd123
+        driver-class-name: org.postgresql.Driver
         #两票数据源
       ticket:
 #        url: jdbc:sqlserver://192.168.2.200:1434;DatabaseName=fdeamnew

web/monitor-web-sxjn/src/main/resources/mybatis-generator.xml

@@ -60,9 +60,9 @@
 
             <jdbcConnection
                     driverClass="org.postgresql.Driver"
-                    connectionURL="jdbc:postgresql://10.81.3.151:5432/wisdom"
-                    userId="gdprod"
-                    password="gd123">
+                    connectionURL="jdbc:postgresql://192.168.11.248:5432/postgres"
+                    userId="postgres"
+                    password="postgres">
             </jdbcConnection>
 
 <!--        <jdbcConnection-->
@@ -125,7 +125,7 @@
 <!--        <table tableName='StopAnalysismainVo' domainObjectName='StopAnalysismainVo'/>-->
 
 
-        <table tableName='wttargetconfig' domainObjectName='WtTargetConfig'/>
+        <table tableName='companys' domainObjectName='CompanysPG'/>
 
 
     </context>

web/monitor-web-sxjn/src/main/resources/mybatis/auto/CompanysPGMapper.xml

@@ -0,0 +1,551 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.frame.mapper.auto.CompanysPGMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.CompanysPG">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="aname" jdbcType="VARCHAR" property="aname" />
+    <result column="windcapacity" jdbcType="NUMERIC" property="windcapacity" />
+    <result column="windcapacityunit" jdbcType="VARCHAR" property="windcapacityunit" />
+    <result column="windquantity" jdbcType="INTEGER" property="windquantity" />
+    <result column="capacity" jdbcType="NUMERIC" property="capacity" />
+    <result column="capacityunit" jdbcType="VARCHAR" property="capacityunit" />
+    <result column="quantityjz" jdbcType="INTEGER" property="quantityjz" />
+    <result column="quantityzc" jdbcType="INTEGER" property="quantityzc" />
+    <result column="jrwindcapacity" jdbcType="NUMERIC" property="jrwindcapacity" />
+    <result column="jrwindcapacityunit" jdbcType="VARCHAR" property="jrwindcapacityunit" />
+    <result column="jrwindquantity" jdbcType="INTEGER" property="jrwindquantity" />
+    <result column="jrcapacity" jdbcType="NUMERIC" property="jrcapacity" />
+    <result column="jrcapacityunit" jdbcType="VARCHAR" property="jrcapacityunit" />
+    <result column="jrquantityjz" jdbcType="INTEGER" property="jrquantityjz" />
+    <result column="jrquantityzc" jdbcType="INTEGER" property="jrquantityzc" />
+    <result column="ordernum" jdbcType="INTEGER" property="ordernum" />
+    <result column="windnumber" jdbcType="INTEGER" property="windnumber" />
+    <result column="number" jdbcType="INTEGER" property="number" />
+    <result column="jrwindnumber" jdbcType="INTEGER" property="jrwindnumber" />
+    <result column="jrnumber" jdbcType="INTEGER" property="jrnumber" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, name, aname, windcapacity, windcapacityunit, windquantity, capacity, capacityunit, 
+    quantityjz, quantityzc, jrwindcapacity, jrwindcapacityunit, jrwindquantity, jrcapacity, 
+    jrcapacityunit, jrquantityjz, jrquantityzc, ordernum, windnumber, number, jrwindnumber, 
+    jrnumber
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.CompanysPGExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from companys
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from companys
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from companys
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.CompanysPGExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from companys
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.CompanysPG">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into companys (id, name, aname, 
+      windcapacity, windcapacityunit, windquantity, 
+      capacity, capacityunit, quantityjz, 
+      quantityzc, jrwindcapacity, jrwindcapacityunit, 
+      jrwindquantity, jrcapacity, jrcapacityunit, 
+      jrquantityjz, jrquantityzc, ordernum, 
+      windnumber, number, jrwindnumber, 
+      jrnumber)
+    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{aname,jdbcType=VARCHAR}, 
+      #{windcapacity,jdbcType=NUMERIC}, #{windcapacityunit,jdbcType=VARCHAR}, #{windquantity,jdbcType=INTEGER}, 
+      #{capacity,jdbcType=NUMERIC}, #{capacityunit,jdbcType=VARCHAR}, #{quantityjz,jdbcType=INTEGER}, 
+      #{quantityzc,jdbcType=INTEGER}, #{jrwindcapacity,jdbcType=NUMERIC}, #{jrwindcapacityunit,jdbcType=VARCHAR}, 
+      #{jrwindquantity,jdbcType=INTEGER}, #{jrcapacity,jdbcType=NUMERIC}, #{jrcapacityunit,jdbcType=VARCHAR}, 
+      #{jrquantityjz,jdbcType=INTEGER}, #{jrquantityzc,jdbcType=INTEGER}, #{ordernum,jdbcType=INTEGER}, 
+      #{windnumber,jdbcType=INTEGER}, #{number,jdbcType=INTEGER}, #{jrwindnumber,jdbcType=INTEGER}, 
+      #{jrnumber,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.CompanysPG">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into companys
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="aname != null">
+        aname,
+      </if>
+      <if test="windcapacity != null">
+        windcapacity,
+      </if>
+      <if test="windcapacityunit != null">
+        windcapacityunit,
+      </if>
+      <if test="windquantity != null">
+        windquantity,
+      </if>
+      <if test="capacity != null">
+        capacity,
+      </if>
+      <if test="capacityunit != null">
+        capacityunit,
+      </if>
+      <if test="quantityjz != null">
+        quantityjz,
+      </if>
+      <if test="quantityzc != null">
+        quantityzc,
+      </if>
+      <if test="jrwindcapacity != null">
+        jrwindcapacity,
+      </if>
+      <if test="jrwindcapacityunit != null">
+        jrwindcapacityunit,
+      </if>
+      <if test="jrwindquantity != null">
+        jrwindquantity,
+      </if>
+      <if test="jrcapacity != null">
+        jrcapacity,
+      </if>
+      <if test="jrcapacityunit != null">
+        jrcapacityunit,
+      </if>
+      <if test="jrquantityjz != null">
+        jrquantityjz,
+      </if>
+      <if test="jrquantityzc != null">
+        jrquantityzc,
+      </if>
+      <if test="ordernum != null">
+        ordernum,
+      </if>
+      <if test="windnumber != null">
+        windnumber,
+      </if>
+      <if test="number != null">
+        number,
+      </if>
+      <if test="jrwindnumber != null">
+        jrwindnumber,
+      </if>
+      <if test="jrnumber != null">
+        jrnumber,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="aname != null">
+        #{aname,jdbcType=VARCHAR},
+      </if>
+      <if test="windcapacity != null">
+        #{windcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="windcapacityunit != null">
+        #{windcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="windquantity != null">
+        #{windquantity,jdbcType=INTEGER},
+      </if>
+      <if test="capacity != null">
+        #{capacity,jdbcType=NUMERIC},
+      </if>
+      <if test="capacityunit != null">
+        #{capacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="quantityjz != null">
+        #{quantityjz,jdbcType=INTEGER},
+      </if>
+      <if test="quantityzc != null">
+        #{quantityzc,jdbcType=INTEGER},
+      </if>
+      <if test="jrwindcapacity != null">
+        #{jrwindcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="jrwindcapacityunit != null">
+        #{jrwindcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="jrwindquantity != null">
+        #{jrwindquantity,jdbcType=INTEGER},
+      </if>
+      <if test="jrcapacity != null">
+        #{jrcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="jrcapacityunit != null">
+        #{jrcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="jrquantityjz != null">
+        #{jrquantityjz,jdbcType=INTEGER},
+      </if>
+      <if test="jrquantityzc != null">
+        #{jrquantityzc,jdbcType=INTEGER},
+      </if>
+      <if test="ordernum != null">
+        #{ordernum,jdbcType=INTEGER},
+      </if>
+      <if test="windnumber != null">
+        #{windnumber,jdbcType=INTEGER},
+      </if>
+      <if test="number != null">
+        #{number,jdbcType=INTEGER},
+      </if>
+      <if test="jrwindnumber != null">
+        #{jrwindnumber,jdbcType=INTEGER},
+      </if>
+      <if test="jrnumber != null">
+        #{jrnumber,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.CompanysPGExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from companys
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update companys
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.aname != null">
+        aname = #{record.aname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windcapacity != null">
+        windcapacity = #{record.windcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="record.windcapacityunit != null">
+        windcapacityunit = #{record.windcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windquantity != null">
+        windquantity = #{record.windquantity,jdbcType=INTEGER},
+      </if>
+      <if test="record.capacity != null">
+        capacity = #{record.capacity,jdbcType=NUMERIC},
+      </if>
+      <if test="record.capacityunit != null">
+        capacityunit = #{record.capacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.quantityjz != null">
+        quantityjz = #{record.quantityjz,jdbcType=INTEGER},
+      </if>
+      <if test="record.quantityzc != null">
+        quantityzc = #{record.quantityzc,jdbcType=INTEGER},
+      </if>
+      <if test="record.jrwindcapacity != null">
+        jrwindcapacity = #{record.jrwindcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="record.jrwindcapacityunit != null">
+        jrwindcapacityunit = #{record.jrwindcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jrwindquantity != null">
+        jrwindquantity = #{record.jrwindquantity,jdbcType=INTEGER},
+      </if>
+      <if test="record.jrcapacity != null">
+        jrcapacity = #{record.jrcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="record.jrcapacityunit != null">
+        jrcapacityunit = #{record.jrcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jrquantityjz != null">
+        jrquantityjz = #{record.jrquantityjz,jdbcType=INTEGER},
+      </if>
+      <if test="record.jrquantityzc != null">
+        jrquantityzc = #{record.jrquantityzc,jdbcType=INTEGER},
+      </if>
+      <if test="record.ordernum != null">
+        ordernum = #{record.ordernum,jdbcType=INTEGER},
+      </if>
+      <if test="record.windnumber != null">
+        windnumber = #{record.windnumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.number != null">
+        number = #{record.number,jdbcType=INTEGER},
+      </if>
+      <if test="record.jrwindnumber != null">
+        jrwindnumber = #{record.jrwindnumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.jrnumber != null">
+        jrnumber = #{record.jrnumber,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update companys
+    set id = #{record.id,jdbcType=VARCHAR},
+      name = #{record.name,jdbcType=VARCHAR},
+      aname = #{record.aname,jdbcType=VARCHAR},
+      windcapacity = #{record.windcapacity,jdbcType=NUMERIC},
+      windcapacityunit = #{record.windcapacityunit,jdbcType=VARCHAR},
+      windquantity = #{record.windquantity,jdbcType=INTEGER},
+      capacity = #{record.capacity,jdbcType=NUMERIC},
+      capacityunit = #{record.capacityunit,jdbcType=VARCHAR},
+      quantityjz = #{record.quantityjz,jdbcType=INTEGER},
+      quantityzc = #{record.quantityzc,jdbcType=INTEGER},
+      jrwindcapacity = #{record.jrwindcapacity,jdbcType=NUMERIC},
+      jrwindcapacityunit = #{record.jrwindcapacityunit,jdbcType=VARCHAR},
+      jrwindquantity = #{record.jrwindquantity,jdbcType=INTEGER},
+      jrcapacity = #{record.jrcapacity,jdbcType=NUMERIC},
+      jrcapacityunit = #{record.jrcapacityunit,jdbcType=VARCHAR},
+      jrquantityjz = #{record.jrquantityjz,jdbcType=INTEGER},
+      jrquantityzc = #{record.jrquantityzc,jdbcType=INTEGER},
+      ordernum = #{record.ordernum,jdbcType=INTEGER},
+      windnumber = #{record.windnumber,jdbcType=INTEGER},
+      number = #{record.number,jdbcType=INTEGER},
+      jrwindnumber = #{record.jrwindnumber,jdbcType=INTEGER},
+      jrnumber = #{record.jrnumber,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.CompanysPG">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update companys
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="aname != null">
+        aname = #{aname,jdbcType=VARCHAR},
+      </if>
+      <if test="windcapacity != null">
+        windcapacity = #{windcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="windcapacityunit != null">
+        windcapacityunit = #{windcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="windquantity != null">
+        windquantity = #{windquantity,jdbcType=INTEGER},
+      </if>
+      <if test="capacity != null">
+        capacity = #{capacity,jdbcType=NUMERIC},
+      </if>
+      <if test="capacityunit != null">
+        capacityunit = #{capacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="quantityjz != null">
+        quantityjz = #{quantityjz,jdbcType=INTEGER},
+      </if>
+      <if test="quantityzc != null">
+        quantityzc = #{quantityzc,jdbcType=INTEGER},
+      </if>
+      <if test="jrwindcapacity != null">
+        jrwindcapacity = #{jrwindcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="jrwindcapacityunit != null">
+        jrwindcapacityunit = #{jrwindcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="jrwindquantity != null">
+        jrwindquantity = #{jrwindquantity,jdbcType=INTEGER},
+      </if>
+      <if test="jrcapacity != null">
+        jrcapacity = #{jrcapacity,jdbcType=NUMERIC},
+      </if>
+      <if test="jrcapacityunit != null">
+        jrcapacityunit = #{jrcapacityunit,jdbcType=VARCHAR},
+      </if>
+      <if test="jrquantityjz != null">
+        jrquantityjz = #{jrquantityjz,jdbcType=INTEGER},
+      </if>
+      <if test="jrquantityzc != null">
+        jrquantityzc = #{jrquantityzc,jdbcType=INTEGER},
+      </if>
+      <if test="ordernum != null">
+        ordernum = #{ordernum,jdbcType=INTEGER},
+      </if>
+      <if test="windnumber != null">
+        windnumber = #{windnumber,jdbcType=INTEGER},
+      </if>
+      <if test="number != null">
+        number = #{number,jdbcType=INTEGER},
+      </if>
+      <if test="jrwindnumber != null">
+        jrwindnumber = #{jrwindnumber,jdbcType=INTEGER},
+      </if>
+      <if test="jrnumber != null">
+        jrnumber = #{jrnumber,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.CompanysPG">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update companys
+    set name = #{name,jdbcType=VARCHAR},
+      aname = #{aname,jdbcType=VARCHAR},
+      windcapacity = #{windcapacity,jdbcType=NUMERIC},
+      windcapacityunit = #{windcapacityunit,jdbcType=VARCHAR},
+      windquantity = #{windquantity,jdbcType=INTEGER},
+      capacity = #{capacity,jdbcType=NUMERIC},
+      capacityunit = #{capacityunit,jdbcType=VARCHAR},
+      quantityjz = #{quantityjz,jdbcType=INTEGER},
+      quantityzc = #{quantityzc,jdbcType=INTEGER},
+      jrwindcapacity = #{jrwindcapacity,jdbcType=NUMERIC},
+      jrwindcapacityunit = #{jrwindcapacityunit,jdbcType=VARCHAR},
+      jrwindquantity = #{jrwindquantity,jdbcType=INTEGER},
+      jrcapacity = #{jrcapacity,jdbcType=NUMERIC},
+      jrcapacityunit = #{jrcapacityunit,jdbcType=VARCHAR},
+      jrquantityjz = #{jrquantityjz,jdbcType=INTEGER},
+      jrquantityzc = #{jrquantityzc,jdbcType=INTEGER},
+      ordernum = #{ordernum,jdbcType=INTEGER},
+      windnumber = #{windnumber,jdbcType=INTEGER},
+      number = #{number,jdbcType=INTEGER},
+      jrwindnumber = #{jrwindnumber,jdbcType=INTEGER},
+      jrnumber = #{jrnumber,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+
+
+  <select id="getCompanysPG"  resultType="com.gyee.frame.model.auto.CompanysPG">
+    select
+
+    <include refid="Base_Column_List" />
+    from companys  order by id
+
+  </select>
+
+</mapper>