提交修改代码

.gitignore

@@ -42,3 +42,5 @@
 /web/backmanagerconfig/src/test
 /web/backmanagerconfig/*.iml
 /common/target
+/web/backmanagerconfig-xktj/target
+/web/backmanagerconfig-xktj/*.iml

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

@@ -94,32 +94,5 @@ public class ProBasicPowerstationController {
         }
     }
 
-    /**
-     * 行政管理区域风电场列表
-     * @param id
-     * @param regionId
-     * @param regionId
-     * @return
-     */
-    @CrossOrigin(origins = "*", maxAge = 3600)
-    @GetMapping(value = "/getAdmList")
-    @ApiOperation(value = "场站-行政管理区域风电场列表", notes = "场站-行政管理区域风电场列表")
-    public R getAdmList(
-            @RequestParam(value = "id",required = false) String id,
-            @RequestParam(value = "regionId",required = false) String regionId,
-            @RequestParam(value = "companyId",required = false) String companyId){
-        try {
-            List<WindpowerstationAdmVo> list = proBasicWindpowerstationService.getList(id,regionId,companyId);
-            if (null != list){
-                return R.ok().data(list);
-            }else {
-                return R.error().data("查询失败！");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return R.error().data("查询失败！");
-        }
-    }
-
 
 }

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

@@ -52,19 +52,84 @@ public class ProBasicPowerstation extends Model {
     private String telephone;
 
     /**
-     * 装机容量
+     * 风电装机容量
+     */
+    private BigDecimal windCapacity;
+
+    /**
+     * 风电容量单位
+     */
+    private String windCapacityUnit;
+
+    /**
+     * 风电装机数量海上
+     */
+    private Integer windQuantityHs;
+
+    /**
+     * 风电装机数量陆地
+     */
+    private Integer windQuantityLd;
+
+    /**
+     * 光伏装机容量
      */
     private BigDecimal capacity;
 
     /**
-     * 容量单位
+     * 光伏容量单位
      */
     private String capacityUnit;
 
     /**
-     * 装机数量
+     * 光伏装机数量集中
+     */
+    private Integer quantityJz;
+
+    /**
+     * 光伏装机数量组串
+     */
+    private Integer quantityZc;
+
+    /**
+     * 接入风电装机容量
+     */
+    private BigDecimal jrwindCapacity;
+
+    /**
+     * 接入风电容量单位
+     */
+    private String jrwindCapacityUnit;
+
+    /**
+     * 接入风电装机数量海上
+     */
+    private Integer jrwindQuantityHs;
+
+    /**
+     * 接入风电装机数量陆地
+     */
+    private Integer jrwindQuantityLd;
+
+    /**
+     * 接入光伏装机容量
+     */
+    private BigDecimal jrCapacity;
+
+    /**
+     * 接入光伏容量单位
+     */
+    private String jrCapacityUnit;
+
+    /**
+     * 接入光伏装机数量集中
+     */
+    private Integer jrquantityJz;
+
+    /**
+     * 接入光伏装机数量组串
      */
-    private Integer quantity;
+    private Integer jrquantityZc;
 
     /**
      * 别名
@@ -117,7 +182,7 @@ public class ProBasicPowerstation extends Model {
     private BigDecimal height;
 
     /**
-     * 场站类型
+     * 场站类型（-1：风电；-2：光伏）
      */
     private String windType;
 
@@ -137,7 +202,7 @@ public class ProBasicPowerstation extends Model {
     private String groupId;
 
     /**
-     * 是否可用
+     * 是否可用（0：待建；1：投产）（0：不参与计算；1：参与计算）
      */
     private Integer isAble;
 
@@ -162,7 +227,6 @@ public class ProBasicPowerstation extends Model {
     private String spare4;
 
 
-    @JsonInclude(value = JsonInclude.Include.NON_NULL)
     @TableField(exist = false)
     private List<ProBasicProject> Children = new ArrayList<>();
 

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

@@ -19,5 +19,4 @@ public interface IProBasicPowerstationService extends IService<ProBasicPowerstat
     IPage<ProBasicPowerstation> getList(String id, String name, String code, String companyId, String pageNum, String pageSize);
     List<ProBasicPowerstation> getList(String regionId);
 
-    List<WindpowerstationAdmVo> getList(String id,String regionId, String companyId) throws Exception;
 }

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

@@ -77,60 +77,5 @@ public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerst
         return list;
     }
 
-    @Override
-    public List<WindpowerstationAdmVo> getList(String id, String regionId, String companyId) throws Exception {
-
-        List<WindpowerstationAdmVo> admvos =  new ArrayList<>();
-        QueryWrapper<ProBasicPowerstation> qw = new QueryWrapper<>();
-
-        if (StringUtils.isNotEmpty(id)){
-            qw.eq("id",id);
-        }
-        if (StringUtils.isNotEmpty(regionId)){
-            qw.eq("region_id",regionId);
-        }
-
-        if (StringUtils.isNotEmpty(companyId)){
-            qw.eq("company_id",companyId);
-        }
-
-        List<ProBasicPowerstation> list = baseMapper.selectList(qw);
-
-        list.stream().forEach(i->{
-            List<String> codes = new ArrayList<>();
-//            RPJFS
-//            RFDL
-            String wpString = redisService.get(i.getId());
-            Map<String, ProBasicPowerstation> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, ProBasicPowerstation>>() {
-
-            });
-            if(null !=stringMapMap){
-                codes.add(stringMapMap.get("RPJFS").getNemCode());//日平局风速
-                codes.add(stringMapMap.get("RFDL").getNemCode());//日发电量
-            }
-            try {
-                List<PointData> pointList = goldenUtil.getRealData(codes);
-                WindpowerstationAdmVo vo = new WindpowerstationAdmVo();
-                vo.setId(i.getId());
-                vo.setCode(i.getNemCode());
-                vo.setName(i.getName());
-                vo.setCapacity(i.getCapacity());//装机容量
-                vo.setCapacityUnit(i.getCapacityUnit());//装机容量单位
-                vo.setQuantity(i.getQuantity());//装机台数
-                vo.setModel(i.getModel());//机型
-                vo.setSystemManufact(i.getSystemManufact());//厂家
-                vo.setAddress(i.getAddress());//地址
-                if(null != pointList && pointList.size()>=2){
-                    vo.setRfdl(MathUtil.twoBit(pointList.get(0).getPointValueInDouble()));
-                    vo.setRfdl(MathUtil.twoBit(pointList.get(1).getPointValueInDouble()));
-                }
-                admvos.add(vo);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
-        });
-
-        return admvos;
-    }
+   
 }