部分表删除功能调整

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

@@ -6,6 +6,8 @@ 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.cache.Cache;
+import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;

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

@@ -91,8 +91,10 @@ public class EquipmentmodelController {
      * @param ids
      * @return
      */
-    @DeleteMapping(value = "/remove-manufacturer/{ids}")
-    public R deleteAll(@PathVariable("ids") String ids) {
+    @DeleteMapping(value = "/remove-manufacturer")
+    public R deleteAll(@RequestParam("ids") String ids) {
+//        ids.replaceAll("/","\\/");
+        ids.replaceAll("(^|\\.)(\\d)(\\.|$)","$100$2$3");
         String[] strings = ids.split(",");
         boolean b = equipmentmodelService.removeByIds(Arrays.asList(strings));
         if (b) {

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

@@ -91,8 +91,9 @@ public class ManufacturerController {
      * @param ids
      * @return
      */
-    @DeleteMapping(value = "/remove-manufacturer/{ids}")
-    public R deleteAll(@PathVariable("ids") String ids) {
+    @DeleteMapping(value = "/remove-manufacturer")
+    public R deleteAll(@RequestParam("ids") String ids) {
+        ids.replaceAll("(^|\\.)(\\d)(\\.|$)","$100$2$3");
         String[] strings = ids.split(",");
         boolean b = manufacturerService.removeByIds(Arrays.asList(strings));
         if (b) {

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

@@ -64,8 +64,9 @@ public class ModelpowerController {
         }
     }
 
-    @DeleteMapping(value = "/remove-modelpower/{ids}")
-    public R deleteAll(@PathVariable("ids") String ids) {
+    @DeleteMapping(value = "/remove-modelpower")
+    public R deleteAll(@RequestParam("ids") String ids) {
+        ids.replaceAll("(^|\\.)(\\d)(\\.|$)","$100$2$3");
         String[] strings = ids.split(",");
         boolean b = modelpowerService.removeByIds(Arrays.asList(strings));
         if (b) {

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

@@ -4,6 +4,7 @@ package com.gyee.backconfig.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.Region;
 import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.gyee.backconfig.service.BackConfigService;
 import com.gyee.backconfig.service.auto.IWindpowerstationService;
@@ -17,6 +18,7 @@ import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -38,93 +40,6 @@ public class WindpowerstationController {
 
 
 
-    @GetMapping("/listByPage")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
-    public R ListByPage(
-            @RequestParam(value = "pagenum", required = true) Integer pageNum,
-            @RequestParam(value = "pagesize", required = true) Integer pageSize,
-            @RequestParam(value = "id", required = false) String id,
-            @RequestParam(value = "code", required = false) String code,
-            @RequestParam(value = "name", required = false) String name,
-            @RequestParam(value = "address", required = false) String address,
-            @RequestParam(value = "telephone", required = false) String telephone,
-            @RequestParam(value = "capacity", required = false) Integer capacity,
-            @RequestParam(value = "capacityunit", required = false) String capacityunit,
-            @RequestParam(value = "quantity", required = false) Integer quantity,
-            @RequestParam(value = "aname", required = false) String aname,
-            @RequestParam(value = "longitude", required = false) Integer longitude,
-            @RequestParam(value = "latitude", required = false) Integer latitude,
-            @RequestParam(value = "photo", required = false) String photo,
-            @RequestParam(value = "companyid", required = false) String companyid,
-            @RequestParam(value = "systemmanufact", required = false) String systemmanufact,
-            @RequestParam(value = "headfarm", required = false) String headfarm,
-            @RequestParam(value = "headfarmphone", required = false) String headfarmphone,
-            @RequestParam(value = "model", required = false) String model,
-            @RequestParam(value = "ordernum", required = false) Integer ordernum,
-            @RequestParam(value = "altitude", required = false) Integer altitude,
-            @RequestParam(value = "height", required = false) Integer height,
-            @RequestParam(value = "version,", required = false) Integer version) {
-        Windpowerstationvo vo = new Windpowerstationvo();
-        setVOTemplate(pageNum, pageSize, id, code, name, address, telephone, capacity, capacityunit, quantity, aname, longitude, latitude, photo, companyid, systemmanufact, headfarm, headfarmphone, model, ordernum, altitude, height, version, vo);
-        Page<Windpowerstation> WindpowerstationPage = backConfigService.Bypage(vo);
-        if (StringUtils.isNotNull(WindpowerstationPage)) {
-            return R.ok().data(WindpowerstationPage);
-        } else {
-            return R.error().message("访问失败");
-        }
-    }
-
-    private void setVOTemplate(@RequestParam(value = "pagenum", required = true) Integer pageNum,
-                               @RequestParam(value = "pagesize", required = true) Integer pageSize,
-                               @RequestParam(value = "id", required = false) String id,
-                               @RequestParam(value = "code", required = false) String code,
-                               @RequestParam(value = "name", required = false) String name,
-                               @RequestParam(value = "address", required = false) String address,
-                               @RequestParam(value = "telephone", required = false) String telephone,
-                               @RequestParam(value = "capacity", required = false) Integer capacity,
-                               @RequestParam(value = "capacityunit", required = false) String capacityunit,
-                               @RequestParam(value = "quantity", required = false) Integer quantity,
-                               @RequestParam(value = "aname", required = false) String aname,
-                               @RequestParam(value = "longitude", required = false) Integer longitude,
-                               @RequestParam(value = "latitude", required = false) Integer latitude,
-                               @RequestParam(value = "photo", required = false) String photo,
-                               @RequestParam(value = "companyid", required = false) String companyid,
-                               @RequestParam(value = "systemmanufact", required = false) String systemmanufact,
-                               @RequestParam(value = "headfarm", required = false) String headfarm,
-                               @RequestParam(value = "headfarmphone", required = false) String headfarmphone,
-                               @RequestParam(value = "model", required = false) String model,
-                               @RequestParam(value = "ordernum", required = false) Integer ordernum,
-                               @RequestParam(value = "altitude", required = false) Integer altitude,
-                               @RequestParam(value = "height", required = false) Integer height,
-                               @RequestParam(value = "version", required = false) Integer version, Windpowerstationvo vo) {
-        vo.setId(id);
-        vo.setCode(code);
-        vo.setAddress(address);
-        vo.setName(name);
-        vo.setAltitude(altitude);
-        vo.setCapacity(capacity);
-        vo.setHeadfarm(headfarm);
-        vo.setCapacityunit(capacityunit);
-        vo.setHeadfarmphone(headfarmphone);
-        vo.setHeight(height);
-        vo.setOrdernum(ordernum);
-        vo.setModel(model);
-        vo.setSystemmanufact(systemmanufact);
-        vo.setCompanyid(companyid);
-        vo.setPhoto(photo);
-        vo.setLatitude(latitude);
-        vo.setLongitude(longitude);
-        vo.setAname(aname);
-        vo.setQuantity(quantity);
-        vo.setTelephone(telephone);
-        vo.setPagesize(pageSize);
-        vo.setCurrent(pageNum);
-        vo.setVersion(version);
-    }
-
-
-
     /**
      * 查询
      * @param id
@@ -277,7 +192,17 @@ public class WindpowerstationController {
         }
     }
 
-
+    @GetMapping(value = "/treels")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R wtls() {
+        Map<String, Object> resultList = windpowerstationService.cpls();
+        if (StringUtils.isNotNull(resultList)) {
+            return com.gyee.backconfig.config.R.ok((int) resultList.size()).data(resultList);
+        } else {
+            return R.error().message("访问失败");
+        }
+    }
 
 
 }

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

@@ -171,7 +171,7 @@ public class BackConfigService {
         String name = vo.getName();
         String address = vo.getAddress();
         String telephone = vo.getTelephone();
-        Integer capacity = vo.getCapacity();
+        Double capacity = vo.getCapacity();
         String capacityunit = vo.getCapacityunit();
         Integer quantity = vo.getQuantity();
         String aname = vo.getAname();

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

@@ -1,13 +1,16 @@
 package com.gyee.backconfig.service.auto;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.Region;
 import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gyee.backconfig.vo.PersisVo;
 import com.gyee.backconfig.vo.WindpowerstationAdmVo;
+import com.gyee.backconfig.vo.Windpowerstationvo;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -37,7 +40,7 @@ public interface IWindpowerstationService extends IService<Windpowerstation> {
 
     List<PersisVo> getPersis(String stationDate, Date startdate, Date enddate) throws Exception;
 
-
+    Map<String, Object> cpls ();
 
 
 

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

@@ -15,6 +15,7 @@ import com.gyee.backconfig.util.realtimedate.EdosUtil;
 import com.gyee.backconfig.util.realtimedate.MathUtil;
 import com.gyee.backconfig.vo.PersisVo;
 import com.gyee.backconfig.vo.WindpowerstationAdmVo;
+import com.gyee.backconfig.vo.Windpowerstationvo;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,10 +23,11 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author wang
@@ -41,30 +43,30 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
     private EdosUtil goldenUtil;
 
     @Override
-    public IPage<Windpowerstation> getList(String id, String name, String code, String companyid, String regionid,String pageNum, String pageSize) {
+    public IPage<Windpowerstation> getList(String id, String name, String code, String companyid, String regionid, String pageNum, String pageSize) {
 
         QueryWrapper<Windpowerstation> qw = new QueryWrapper<>();
 
-        if (StringUtils.isNotEmpty(id)){
-            qw.like("id",id);
+        if (StringUtils.isNotEmpty(id)) {
+            qw.like("id", id);
         }
 
-        if (StringUtils.isNotEmpty(code)){
-            qw.like("code",code);
+        if (StringUtils.isNotEmpty(code)) {
+            qw.like("code", code);
         }
 
-        if (StringUtils.isNotEmpty(name)){
-            qw.like("name",name);
+        if (StringUtils.isNotEmpty(name)) {
+            qw.like("name", name);
         }
 
-        if (StringUtils.isNotEmpty(companyid)){
-            qw.eq("companyid",companyid);
+        if (StringUtils.isNotEmpty(companyid)) {
+            qw.eq("companyid", companyid);
         }
 
-        if (StringUtils.isNotEmpty(regionid)){
-            qw.eq("regionid",regionid);
+        if (StringUtils.isNotEmpty(regionid)) {
+            qw.eq("regionid", regionid);
         }
-        Page<Windpowerstation> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        Page<Windpowerstation> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         IPage<Windpowerstation> companysPage = getBaseMapper().selectPage(page, qw);
 //        List<Windpowerstation> list = companysPage.getRecords();
         return companysPage;
@@ -74,7 +76,7 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
     @Override
     public Windpowerstation getOne(String id) {
 
-        Windpowerstation windpowerstation =  this.getById(id);
+        Windpowerstation windpowerstation = this.getById(id);
 
         return windpowerstation;
     }
@@ -98,34 +100,35 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
     public List<Windpowerstation> getList(String regionid) {
         QueryWrapper<Windpowerstation> qw = new QueryWrapper<>();
 
-        if (StringUtils.isNotEmpty(regionid)){
-            qw.eq("regionid",regionid);
+        if (StringUtils.isNotEmpty(regionid)) {
+            qw.eq("regionid", regionid);
         }
 
         List<Windpowerstation> list = baseMapper.selectList(qw);
         return list;
     }
+
     //行政管理区域风电场列表
     @Override
-    public List<WindpowerstationAdmVo> getList(String id,String regionid, String companyid) throws Exception {
+    public List<WindpowerstationAdmVo> getList(String id, String regionid, String companyid) throws Exception {
 
-        List<WindpowerstationAdmVo> admvos =  new ArrayList<>();
+        List<WindpowerstationAdmVo> admvos = new ArrayList<>();
         QueryWrapper<Windpowerstation> qw = new QueryWrapper<>();
 
-        if (StringUtils.isNotEmpty(id)){
-            qw.eq("id",id);
+        if (StringUtils.isNotEmpty(id)) {
+            qw.eq("id", id);
         }
-        if (StringUtils.isNotEmpty(regionid)){
-            qw.eq("regionid",regionid);
+        if (StringUtils.isNotEmpty(regionid)) {
+            qw.eq("regionid", regionid);
         }
 
-        if (StringUtils.isNotEmpty(companyid)){
-            qw.eq("companyid",companyid);
+        if (StringUtils.isNotEmpty(companyid)) {
+            qw.eq("companyid", companyid);
         }
 
         List<Windpowerstation> list = baseMapper.selectList(qw);
 
-        list.stream().forEach(i->{
+        list.stream().forEach(i -> {
             List<String> codes = new ArrayList<>();
 //            RPJFS
 //            RFDL
@@ -133,7 +136,7 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
             Map<String, Windpowerstationpointnew> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Windpowerstationpointnew>>() {
 
             });
-            if(null !=stringMapMap){
+            if (null != stringMapMap) {
                 codes.add(stringMapMap.get("RPJFS").getCode());//日平局风速
                 codes.add(stringMapMap.get("RFDL").getCode());//日发电量
             }
@@ -149,7 +152,7 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
                 vo.setModel(i.getModel());//机型
                 vo.setSystemmanufact(i.getSystemmanufact());//厂家
                 vo.setAddress(i.getAddress());//地址
-                if(null != pointList && pointList.size()>=2){
+                if (null != pointList && pointList.size() >= 2) {
                     vo.setRfdl(MathUtil.twoBit(pointList.get(0).getPointValueInDouble()));
                     vo.setRfdl(MathUtil.twoBit(pointList.get(1).getPointValueInDouble()));
                 }
@@ -179,7 +182,7 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
             List<PointData> gls = goldenUtil.getHistoryDatasSnap(gl, startdate.getTime(), enddate.getTime(), null, 60000L);
             if (!fss.isEmpty() && !gls.isEmpty()) {
 
-                for (int i =0; i <= fss.size()-1; i++) {
+                for (int i = 0; i <= fss.size() - 1; i++) {
                     PersisVo vo = new PersisVo();
                     vo.setDatatime(fss.get(i).getPointTime());
                     vo.setRpjfs(fss.get(i).getPointValueInDouble());
@@ -192,5 +195,205 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
         return list;
     }
 
+    @Override
+    public Map<String, Object> cpls() {
+        QueryWrapper<Windpowerstation> qw = new QueryWrapper<>();
+        List<Windpowerstation> list = baseMapper.selectList(qw);
+        Map<String, Object> jh = new HashMap<>();
+        //产业光伏
+        List<Windpowerstation> sxgf = new ArrayList<>();
+        List<Windpowerstation> sxgfzjrl = new ArrayList<>();
+        List<Windpowerstation> xjgf = new ArrayList<>();
+        List<Windpowerstation> sdgf = new ArrayList<>();
+        List<Windpowerstation> xzgf = new ArrayList<>();
+        List<Windpowerstation> nmgf = new ArrayList<>();
+        List<Windpowerstation> xsgf = new ArrayList<>();
+        List<Windpowerstation> hbgf = new ArrayList<>();
+        //清洁能源公司
+        List<Windpowerstation> sxqjnygf = new ArrayList<>();
+        List<Windpowerstation> xjqjnygf = new ArrayList<>();
+        List<Windpowerstation> sdqjnygf = new ArrayList<>();
+        List<Windpowerstation> xzqjnygf = new ArrayList<>();
+        List<Windpowerstation> nmqjnygf = new ArrayList<>();
+        List<Windpowerstation> xsqjnygf = new ArrayList<>();
+        List<Windpowerstation> hbqjnygf = new ArrayList<>();
+        if (!list.isEmpty()) {
+            for (Windpowerstation w1 : list) {
+                if (StringUtils.notEmp(w1.getRegionid())) {
+                    //产业
+                    if (w1.getRegionid().endsWith("XJ") & w1.getId().endsWith("GDC")) {
+                        Windpowerstation vo = new Windpowerstation();
+                        vo.setId(w1.getId());
+                        vo.setAname(w1.getAname());
+                        vo.setCapacity(w1.getCapacity());
+                        vo.setCapacityunit(w1.getCapacityunit());
+                        vo.setCompanyid(w1.getCompanyid());
+                        vo.setRegionid(w1.getRegionid());
+                        xjgf.add(vo);
+                    }
+                    if (w1.getRegionid().endsWith("SX") & w1.getId().endsWith("GDC")) {
+                        Windpowerstation vo1 = new Windpowerstation();
+                        vo1.setId(w1.getId());
+                        vo1.setAname(w1.getAname());
+                        vo1.setCapacity(w1.getCapacity());
+                        vo1.setCapacityunit(w1.getCapacityunit());
+                        vo1.setCompanyid(w1.getCompanyid());
+                        vo1.setRegionid(w1.getRegionid());
+                        sxgf.add(vo1);          //45条数据
+                    }
+                    if (w1.getRegionid().endsWith("XS") & w1.getId().endsWith("GDC")) {
+                        Windpowerstation vo1 = new Windpowerstation();
+                        vo1.setId(w1.getId());
+                        vo1.setAname(w1.getAname());
+                        vo1.setCapacity(w1.getCapacity());
+                        vo1.setCapacityunit(w1.getCapacityunit());
+                        vo1.setCompanyid(w1.getCompanyid());
+                        vo1.setRegionid(w1.getRegionid());
+                        xsgf.add(vo1);
+                    }
+                    if (w1.getRegionid().endsWith("NM") & w1.getId().endsWith("GDC")) {
+                        Windpowerstation vo1 = new Windpowerstation();
+                        vo1.setId(w1.getId());
+                        vo1.setAname(w1.getAname());
+                        vo1.setCapacity(w1.getCapacity());
+                        vo1.setCapacityunit(w1.getCapacityunit());
+                        vo1.setCompanyid(w1.getCompanyid());
+                        vo1.setRegionid(w1.getRegionid());
+                        nmgf.add(vo1);
+                    }
+                    if (w1.getRegionid().endsWith("HB") & w1.getId().endsWith("GDC")) {
+                        Windpowerstation vo1 = new Windpowerstation();
+                        vo1.setId(w1.getId());
+                        vo1.setAname(w1.getAname());
+                        vo1.setCapacity(w1.getCapacity());
+                        vo1.setCapacityunit(w1.getCapacityunit());
+                        vo1.setCompanyid(w1.getCompanyid());
+                        vo1.setRegionid(w1.getRegionid());
+                        hbgf.add(vo1);
+                    }
+                    if (w1.getRegionid().endsWith("SD") & w1.getId().endsWith("GDC")) {
+                        Windpowerstation vo1 = new Windpowerstation();
+                        vo1.setId(w1.getId());
+                        vo1.setAname(w1.getAname());
+                        vo1.setCapacity(w1.getCapacity());
+                        vo1.setCapacityunit(w1.getCapacityunit());
+                        vo1.setCompanyid(w1.getCompanyid());
+                        vo1.setRegionid(w1.getRegionid());
+                        sdgf.add(vo1);
+                    }
+                    if (w1.getRegionid().endsWith("XZ") & w1.getId().endsWith("GDC")) {
+                        Windpowerstation vo1 = new Windpowerstation();
+                        vo1.setId(w1.getId());
+                        vo1.setAname(w1.getAname());
+                        vo1.setCapacity(w1.getCapacity());
+                        vo1.setCapacityunit(w1.getCapacityunit());
+                        vo1.setCompanyid(w1.getCompanyid());
+                        vo1.setRegionid(w1.getRegionid());
+                        xzgf.add(vo1);
+                    }
+
+                    //清洁能源公司
+                    if (w1.getRegionid().endsWith("XJ") & w1.getId().endsWith("GDC") & w1.getCompanyid().endsWith("QJNY")) {
+                        Windpowerstation vo = new Windpowerstation();
+                        vo.setId(w1.getId());
+                        vo.setAname(w1.getAname());
+                        vo.setCapacity(w1.getCapacity());
+                        vo.setCapacityunit(w1.getCapacityunit());
+                        vo.setCompanyid(w1.getCompanyid());
+                        vo.setRegionid(w1.getRegionid());
+                        xjqjnygf.add(vo);
+                    }
+                    if (w1.getRegionid().endsWith("SX") & w1.getId().endsWith("GDC") & w1.getCompanyid().endsWith("QJNY")) {
+                        Windpowerstation vo1 = new Windpowerstation();
+                        vo1.setId(w1.getId());
+                        vo1.setAname(w1.getAname());
+                        vo1.setCapacity(w1.getCapacity());
+                        vo1.setCapacityunit(w1.getCapacityunit());
+                        vo1.setCompanyid(w1.getCompanyid());
+                        vo1.setRegionid(w1.getRegionid());
+                        sxqjnygf.add(vo1);
+                    }
+                    if (w1.getRegionid().endsWith("XS") & w1.getId().endsWith("GDC") & w1.getCompanyid().endsWith("QJNY")) {
+                        Windpowerstation vo1 = new Windpowerstation();
+                        vo1.setId(w1.getId());
+                        vo1.setAname(w1.getAname());
+                        vo1.setCapacity(w1.getCapacity());
+                        vo1.setCapacityunit(w1.getCapacityunit());
+                        vo1.setCompanyid(w1.getCompanyid());
+                        vo1.setRegionid(w1.getRegionid());
+                        xsqjnygf.add(vo1);
+                    }
+                    if (w1.getRegionid().endsWith("NM") & w1.getId().endsWith("GDC") & w1.getCompanyid().endsWith("QJNY")) {
+                        Windpowerstation vo1 = new Windpowerstation();
+                        vo1.setId(w1.getId());
+                        vo1.setAname(w1.getAname());
+                        vo1.setCapacity(w1.getCapacity());
+                        vo1.setCapacityunit(w1.getCapacityunit());
+                        vo1.setCompanyid(w1.getCompanyid());
+                        vo1.setRegionid(w1.getRegionid());
+                        nmqjnygf.add(vo1);
+                    }
+                    if (w1.getRegionid().endsWith("HB") & w1.getId().endsWith("GDC") & w1.getCompanyid().endsWith("QJNY")) {
+                        Windpowerstation vo1 = new Windpowerstation();
+                        vo1.setId(w1.getId());
+                        vo1.setAname(w1.getAname());
+                        vo1.setCapacity(w1.getCapacity());
+                        vo1.setCapacityunit(w1.getCapacityunit());
+                        vo1.setCompanyid(w1.getCompanyid());
+                        vo1.setRegionid(w1.getRegionid());
+                        hbqjnygf.add(vo1);
+                    }
+                    if (w1.getRegionid().endsWith("SD") & w1.getId().endsWith("GDC") & w1.getCompanyid().endsWith("QJNY")) {
+                        Windpowerstation vo1 = new Windpowerstation();
+                        vo1.setId(w1.getId());
+                        vo1.setAname(w1.getAname());
+                        vo1.setCapacity(w1.getCapacity());
+                        vo1.setCapacityunit(w1.getCapacityunit());
+                        vo1.setCompanyid(w1.getCompanyid());
+                        vo1.setRegionid(w1.getRegionid());
+                        sdqjnygf.add(vo1);
+                    }
+                    if (w1.getRegionid().endsWith("XZ") & w1.getId().endsWith("GDC") & w1.getCompanyid().endsWith("QJNY")) {
+                        Windpowerstation vo1 = new Windpowerstation();
+                        vo1.setId(w1.getId());
+                        vo1.setAname(w1.getAname());
+                        vo1.setCapacity(w1.getCapacity());
+                        vo1.setCapacityunit(w1.getCapacityunit());
+                        vo1.setCompanyid(w1.getCompanyid());
+                        vo1.setRegionid(w1.getRegionid());
+                        xzqjnygf.add(vo1);
+                    }
+                    //装机容量-qjny
+                    if (w1.getRegionid().endsWith("XZ") & w1.getId().endsWith("GDC") & w1.getCompanyid().endsWith("QJNY")) {
+                        Windpowerstation vo1 = new Windpowerstation();
+                        vo1.setId(w1.getId());
+                        vo1.setAname(w1.getAname());
+                        vo1.setCapacity(w1.getCapacity());
+                        vo1.setCapacityunit(w1.getCapacityunit());
+                        vo1.setCompanyid(w1.getCompanyid());
+                        vo1.setRegionid(w1.getRegionid());
+                        xzqjnygf.add(vo1);
+                    }
+                }
 
+            }
+        }
+        jh.put("山西区域光伏场站数量", sxgf.size()); //45
+        jh.put("新疆区域光伏场站数量", xjgf.size());  //3
+        jh.put("陕西区域光伏场站数量", xsgf.size());
+        jh.put("内蒙区域光伏场站数量", nmgf.size());
+        jh.put("河北区域光伏场站数量", hbgf.size());
+        jh.put("西藏区域光伏场站数量", xzgf.size());
+        jh.put("山东区域光伏场站数量", sdgf.size());
+        jh.put("山西区域光伏清洁能源场站数量", sxqjnygf.size());
+        jh.put("新疆区域光伏清洁能源场站数量", xjqjnygf.size());
+        jh.put("陕西区域光伏清洁能源场站数量", xsqjnygf.size());
+        jh.put("内蒙区域光伏清洁能源场站数量", nmqjnygf.size());
+        jh.put("河北区域光伏清洁能源场站数量", hbqjnygf.size());
+        jh.put("西藏区域光伏清洁能源场站数量", xzqjnygf.size());
+        jh.put("山东区域光伏清洁能源场站数量", sdqjnygf.size());
+
+        return jh;
+    }
 }
+

web/backmanagerconfig/src/main/java/com/gyee/backconfig/vo/Windpowerstationvo.java

@@ -1,6 +1,5 @@
 package com.gyee.backconfig.vo;
 
-import com.gyee.backconfig.model.auto.Windpowerstation;
 import lombok.Data;
 
 import java.util.List;
@@ -25,7 +24,7 @@ public class Windpowerstationvo {
 
     private String telephone;
 
-    private Integer capacity;
+    private Double capacity;
 
     private String capacityunit;
 
@@ -41,6 +40,8 @@ public class Windpowerstationvo {
 
     private String companyid;
 
+    private String Regionid;
+
     private String systemmanufact;
 
     private String headfarm;