Merge remote-tracking branch 'origin/master'

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

realtime/computing-services7001/pom.xml

@@ -42,6 +42,10 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-redis</artifactId>
         </dependency>

realtime/computing-services7001/src/main/resources/application-jn.yml

@@ -100,7 +100,7 @@ AI178: 17.4    #转矩给定
 #计算电量直接取，如果不是1就是相减算
 typeOfElectric:
   #直接取
-  direct: GJY02_GC,YF01_GC,YF02_GC
+  direct:
 
 
 

realtime/computing-services7002/pom.xml

@@ -42,6 +42,10 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-redis</artifactId>
         </dependency>

realtime/computing-services7002/src/main/resources/application-jn.yml

@@ -100,7 +100,7 @@ AI178: 17.4    #转矩给定
 #计算电量直接取，如果不是1就是相减算
 typeOfElectric:
   #直接取
-  direct: HSM01_GC,PTZ01_GC,ZK01_GC
+  direct:
 
 
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/common/requst/vo/ProjectPlanQueryVo.java

@@ -1,38 +0,0 @@
-package com.gyee.backconfig.common.requst.vo;/**
- * @author 50560
- * @create 2022-09-19 15:55
- */
-
-import lombok.Data;
-
-/**
- * @BelongsProject: workpathnew
- * @BelongsPackage: com.gyee.backconfig.common.requst.vo
- * @Author: xiruipeng
- * @CreateTime: 2022-09-19  15:55
- * @Description: TODO
- * @Version: 1.0
- */
-@Data
-public class ProjectPlanQueryVo {
-    private String id;
-
-    private String projectid;
-
-    private String generatingcapacity;
-
-    private Double outagehours;
-
-    private String year;
-
-    private String month;
-
-    private String windpower;
-
-    private Integer version;
-    //分页
-    private Integer current;
-    private Integer pageSize;
-
-
-}

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

@@ -5,9 +5,6 @@ import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Companys;
 import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.gyee.backconfig.service.BackConfigService;
-import com.gyee.backconfig.vo.Companysvo;
-import com.gyee.backconfig.vo.Projectvo;
-import com.gyee.backconfig.vo.Windpowerstationvo;
 import com.gyee.common.model.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,7 +30,7 @@ public class BackController {
      *
      * @return
      */
-    @GetMapping(value ="/wtls")
+    @GetMapping(value = "/wtls")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R wtls() {
@@ -51,7 +48,7 @@ public class BackController {
      *
      * @return
      */
-    @GetMapping(value ="/sttree")
+    @GetMapping(value = "/sttree")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R stationtree() {
@@ -64,6 +61,4 @@ public class BackController {
     }
 
 
-
-
 }

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

@@ -5,7 +5,6 @@ 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.Boxchange;
-import com.gyee.backconfig.model.auto.ProBasicBoxchange;
 import com.gyee.backconfig.service.auto.IBoxchangeService;
 import com.gyee.common.model.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -14,7 +13,9 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 
 /**
- * <p>
+ * 箱变
+ *
+ * <p>箱变
  * 前端控制器
  * </p>
  *

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

@@ -1,23 +1,16 @@
 package com.gyee.backconfig.controller;
 
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 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.config.R;
 import com.gyee.backconfig.model.auto.Companys;
-import com.gyee.backconfig.model.auto.Projectplan;
 import com.gyee.backconfig.service.BackConfigService;
 import com.gyee.backconfig.service.auto.ICompanysService;
-import com.gyee.backconfig.vo.Companysvo;
-import com.gyee.backconfig.vo.Projectplanvo;
 import com.gyee.common.model.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 

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

@@ -5,7 +5,6 @@ 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.Equipmentmodel;
-import com.gyee.backconfig.model.auto.Manufacturer;
 import com.gyee.backconfig.service.auto.IEquipmentmodelService;
 import com.gyee.common.model.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -13,9 +12,10 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.Arrays;
 
-/** 设备型号
+/**
+ * 设备型号
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wang
@@ -29,6 +29,7 @@ public class EquipmentmodelController {
 
     /**
      * 查询
+     *
      * @param id
      * @param code
      * @param name
@@ -52,6 +53,7 @@ public class EquipmentmodelController {
 
     /**
      * 根据id查询
+     *
      * @param id
      * @return
      */

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Indicators;
 import com.gyee.backconfig.service.auto.IIndicatorsService;
-import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -15,7 +14,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wang
@@ -30,6 +29,7 @@ public class IndicatorsController {
 
     /**
      * 查询
+     *
      * @param id
      * @param stationid
      * @param stationname
@@ -39,59 +39,59 @@ public class IndicatorsController {
      * @return
      */
     @GetMapping(value = "/List")
-    public R findList(@RequestParam(value = "id",required = false) String id,
-                      @RequestParam(value = "stationid",required = false) String stationid,
-                      @RequestParam(value = "stationname",required = false) String stationname,
-                      @RequestParam(value = "kay",required = false) String kay,
-                      @RequestParam(value = "createtime",required = false) Data createtime,
-                      @RequestParam(value = "pageNum",required = true) String pageNum,
-                      @RequestParam(value = "pageSize",required = true) String pageSize){
-        IPage<Indicators> list = iIndicatorsService.getList( id,  stationid,  stationname,  kay, createtime, pageNum,  pageSize) ;
-        if (null != list){
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "stationid", required = false) String stationid,
+                      @RequestParam(value = "stationname", required = false) String stationname,
+                      @RequestParam(value = "kay", required = false) String kay,
+                      @RequestParam(value = "createtime", required = false) Data createtime,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<Indicators> list = iIndicatorsService.getList(id, stationid, stationname, kay, createtime, pageNum, pageSize);
+        if (null != list) {
             return R.ok().data(list);
-        }else {
+        } else {
             return R.error().data("查询失败！");
         }
     }
 
 
-
     /**
      * 根据id查询
+     *
      * @param id
      * @return
      */
     @GetMapping(value = "/{id}")
-    public R findOne(@PathVariable("id") String id){
+    public R findOne(@PathVariable("id") String id) {
 
         Indicators indicators = iIndicatorsService.getOne(id);
-        if (StringUtils.isNotNull(indicators)){
+        if (StringUtils.isNotNull(indicators)) {
             return R.ok().data(indicators);
-        }else {
+        } else {
             return R.error().data("查询失败！");
         }
 
 
-
     }
 
 
     /**
      * 插入（批量）
+     *
      * @param indicators
      * @return
      */
     @PostMapping(value = "/add")
-    public R addAll(@RequestBody Indicators indicators){
+    public R addAll(@RequestBody Indicators indicators) {
 
         try {
             boolean b = iIndicatorsService.addOrUpdate(indicators);
-            if (b){
+            if (b) {
                 return R.ok().data(b);
-            }else {
+            } else {
                 return R.error().data("保存失败！");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             return R.error().data("保存失败！");
         }
 
@@ -99,33 +99,34 @@ public class IndicatorsController {
     }
 
 
-
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */
     @DeleteMapping(value = "/{ids}")
-    public  R deleteAll(@PathVariable("ids") String ids){
+    public R deleteAll(@PathVariable("ids") String ids) {
         boolean b = iIndicatorsService.removeByIds(ids);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("删除失败！");
         }
     }
 
     /**
      * 批量修改
+     *
      * @param list
      * @return
      */
     @PutMapping(value = "/editIndicators")
-    public R update(@RequestBody List<Indicators> list){
+    public R update(@RequestBody List<Indicators> list) {
         boolean b = iIndicatorsService.updateBatchById(list);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("更新失败！");
         }
     }

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

@@ -13,6 +13,7 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 
 /**
+ * 逆变器
  * <p>
  * 前端控制器
  * </p>

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

@@ -3,7 +3,6 @@ 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.*;
@@ -11,9 +10,10 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.Arrays;
 
-/**汇流箱
+/**
+ * 汇流箱
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wang
@@ -27,6 +27,7 @@ public class JunctionboxController {
 
     /**
      * 查询
+     *
      * @param id
      * @param code
      * @param windpowerstationid

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

@@ -8,8 +8,8 @@ import com.gyee.backconfig.service.BackConfigService;
 import com.gyee.backconfig.service.auto.ILineService;
 import com.gyee.backconfig.vo.Linevo;
 import com.gyee.common.model.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.util.Arrays;
 
@@ -46,7 +46,7 @@ public class LineController {
             @RequestParam(value = "ordernum", required = false) Integer ordernum,
             @RequestParam(value = "version", required = false) Integer version) {
         Linevo vo = new Linevo();
-        setVOTemplate(pageNum,pageSize,id,code,name,aname,projectid,capacity,capacityunit,quantity,ordernum,version,vo);
+        setVOTemplate(pageNum, pageSize, id, code, name, aname, projectid, capacity, capacityunit, quantity, ordernum, version, vo);
         Page<Line> LinePage = backConfigService.lineBypage(vo);
         if (StringUtils.isNotNull(LinePage)) {
             return R.ok().data(LinePage);
@@ -54,6 +54,7 @@ public class LineController {
             return R.error().message("访问失败");
         }
     }
+
     private void setVOTemplate(
             @RequestParam(value = "pagenum", required = true) Integer pageNum,
             @RequestParam(value = "pagesize", required = true) Integer pageSize,
@@ -66,7 +67,7 @@ public class LineController {
             @RequestParam(value = "capacityunit", required = false) String capacityunit,
             @RequestParam(value = "quantity", required = false) Integer quantity,
             @RequestParam(value = "ordernum", required = false) Integer ordernum,
-            @RequestParam(value = "version", required = false) Integer version,Linevo vo){
+            @RequestParam(value = "version", required = false) Integer version, Linevo vo) {
         vo.setAname(aname);
         vo.setCapacity(capacity);
         vo.setCode(code);
@@ -86,17 +87,18 @@ public class LineController {
     //新增或者更新
     @PostMapping("/add-Line")
     @CrossOrigin(origins = "*", maxAge = 3600)
-    public R addModifyProjectPlan(@RequestBody Line Line){
+    public R addModifyProjectPlan(@RequestBody Line Line) {
         boolean saveOrUpdate = backConfigService.saveOrUpdate(Line);
         if (saveOrUpdate) {
             return R.ok().data("保存或更新成功");
-        }else{
+        } else {
             return R.error().message("保存失败");
         }
     }
 
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */
@@ -109,12 +111,11 @@ public class LineController {
 //            return R.error().data("删除失败！");
 //        }
 //    }
-
     @DeleteMapping(value = "/remove-lines/{ids}")
-    public  R deleteAll(@PathVariable("ids") String ids) {
+    public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
 
-        boolean  b = lineService.removeByIds(Arrays.asList(strings));
+        boolean b = lineService.removeByIds(Arrays.asList(strings));
 
         if (b) {
             return R.ok().data(b);

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

@@ -5,7 +5,6 @@ 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.*;
@@ -13,9 +12,10 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.Arrays;
 
-/**设备厂商
+/**
+ * 设备厂商
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wang
@@ -29,6 +29,7 @@ public class ManufacturerController {
 
     /**
      * 查询
+     *
      * @param id
      * @param name
      * @param country
@@ -52,6 +53,7 @@ public class ManufacturerController {
 
     /**
      * 根据id查询
+     *
      * @param id
      * @return
      */

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

@@ -5,7 +5,6 @@ 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.*;
@@ -14,7 +13,9 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 
 /**
- * <p>电计量点表
+ * 电计量点表
+ *
+ * <p>
  * 前端控制器
  * </p>
  *
@@ -29,6 +30,7 @@ public class MeterpointController {
 
     /**
      * 查询
+     *
      * @param id
      * @param code
      * @param windpowerstationid
@@ -51,6 +53,7 @@ public class MeterpointController {
             return R.error().data("查询失败！");
         }
     }
+
     /**
      * 根据id查询
      *

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

@@ -0,0 +1,77 @@
+package com.gyee.backconfig.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.Modelpower;
+import com.gyee.backconfig.service.auto.IModelpowerService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+
+/**
+ * 设备类型对应功率表
+ *
+ * <p>设备类型对应功率表
+ * 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-20
+ */
+@RestController
+@RequestMapping("//modelpower")
+public class ModelpowerController {
+    @Resource
+    private IModelpowerService modelpowerService;
+
+    /**
+     * 查询
+     *
+     * @param id
+     * @param modelid
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/listByPage")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "modelid", required = false) String modelid,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<Modelpower> list = modelpowerService.list(id, modelid, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 保存
+     *
+     * @param modelpower
+     * @return
+     */
+    @PostMapping(value = "/save")
+    public R addAll(@RequestBody Modelpower modelpower) {
+        boolean b = modelpowerService.saveOrUpdate(modelpower);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    @DeleteMapping(value = "/remove-modelpower/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = modelpowerService.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/NewtreeController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+
 @RestController
 @RequestMapping("//newtree")
 public class NewtreeController {

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

@@ -23,14 +23,14 @@ public class PointGenerateController {
 
 
     @PostMapping(value = "/add")
-    public R addGeneratePoint( @RequestParam(value = "points", required = false) String[] points){
+    public R addGeneratePoint(@RequestParam(value = "points", required = false) String[] points) {
 
-       int code =  pointGenerateService.addGeneratePoint(points);
+        int code = pointGenerateService.addGeneratePoint(points);
 
         if (code > 0) {
             return R.ok();
         } else {
-            return R.ok().data("插入失败"+code+"条测点");
+            return R.ok().data("插入失败" + code + "条测点");
         }
 
 

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

@@ -15,7 +15,7 @@ import java.util.Arrays;
 /**
  * <p>
  * （箱变）
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wang
@@ -29,6 +29,7 @@ public class ProBasicBoxchangeController {
 
     /**
      * 查询
+     *
      * @param id
      * @param code
      * @param windpowerstationId
@@ -45,7 +46,7 @@ public class ProBasicBoxchangeController {
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "name", required = true) String name,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicBoxchange> list = proBasicBoxchangeService.list(id, code, windpowerstationId, projectId,name, pageNum, pageSize);
+        IPage<ProBasicBoxchange> list = proBasicBoxchangeService.list(id, code, windpowerstationId, projectId, name, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {
@@ -55,6 +56,7 @@ public class ProBasicBoxchangeController {
 
     /**
      * 根据id查询
+     *
      * @param id
      * @return
      */
@@ -62,7 +64,7 @@ public class ProBasicBoxchangeController {
     public R findOne(@PathVariable("id") String id) {
         QueryWrapper<ProBasicBoxchange> qw = new QueryWrapper<>();
         qw.eq("id", id);
-        ProBasicBoxchange proBasicBoxchange= proBasicBoxchangeService.getOne(qw);
+        ProBasicBoxchange proBasicBoxchange = proBasicBoxchangeService.getOne(qw);
         if (StringUtils.isNotNull(proBasicBoxchange)) {
             return R.ok().data(proBasicBoxchange);
         } else {
@@ -72,6 +74,7 @@ public class ProBasicBoxchangeController {
 
     /**
      * 批量插入
+     *
      * @param proBasicBoxchange
      * @return
      */
@@ -87,6 +90,7 @@ public class ProBasicBoxchangeController {
 
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */

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

@@ -73,6 +73,7 @@ public class ProBasicSquareController {
 
     /**
      * 批量插入
+     *
      * @param proBasicSquare
      * @return
      */
@@ -88,6 +89,7 @@ public class ProBasicSquareController {
 
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */
@@ -104,6 +106,7 @@ public class ProBasicSquareController {
 
     /**
      * 批量修改
+     *
      * @param list
      * @return
      */

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

@@ -55,7 +55,7 @@ public class ProjectController {
             @RequestParam(value = "ordernum", required = false) Integer ordernum,
             @RequestParam(value = "version", required = false) Integer version) {
         Projectvo vo = new Projectvo();
-        setVOTemplate(pageNum,pageNum,id,code,name,aname,windpowerstationid,capacity,capacityunit,quantity,model,commissiondate,masterphone,shiftforeman,shiftforemanphone,ordernum,version,vo);
+        setVOTemplate(pageNum, pageNum, id, code, name, aname, windpowerstationid, capacity, capacityunit, quantity, model, commissiondate, masterphone, shiftforeman, shiftforemanphone, ordernum, version, vo);
         Page<Project> ProjectPage = backConfigService.ProjectBypage(vo);
         if (StringUtils.isNotNull(ProjectPage)) {
             return R.ok().data(ProjectPage);
@@ -102,14 +102,9 @@ public class ProjectController {
     }
 
 
-
-
-
-
-
-
     /**
      * 查询
+     *
      * @param id
      * @param name
      * @param pageNum
@@ -117,34 +112,34 @@ public class ProjectController {
      * @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 = "windpowerstationid",required = false) String windpowerstationid,
-                      @RequestParam(value = "pageNum",required = true) String pageNum,
-                      @RequestParam(value = "pageSize",required = true) String pageSize){
-        IPage<Project> list = projectService.getList(id,name,code,windpowerstationid,pageNum,pageSize);
-        if (null != 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 = "windpowerstationid", required = false) String windpowerstationid,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<Project> list = projectService.getList(id, name, code, windpowerstationid, pageNum, pageSize);
+        if (null != list) {
             return R.ok().data(list);
-        }else {
+        } else {
             return R.error().data("查询失败！");
         }
     }
 
 
-
     /**
      * 根据id查询
+     *
      * @param id
      * @return
      */
     @GetMapping(value = "/{id}")
-    public R findOne(@PathVariable("id") String id){
+    public R findOne(@PathVariable("id") String id) {
 
         Project project = projectService.getOne(id);
-        if (StringUtils.isNotNull(project)){
+        if (StringUtils.isNotNull(project)) {
             return R.ok().data(project);
-        }else {
+        } else {
             return R.error().data("查询失败！");
         }
 
@@ -153,49 +148,51 @@ public class ProjectController {
 
     /**
      * 插入（批量）
+     *
      * @param project
      * @return
      */
     @PostMapping(value = "/add")
-    public R addAll(@RequestBody Project project){
+    public R addAll(@RequestBody Project project) {
 
         boolean b = projectService.addOrUpdate(project);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("保存失败！");
         }
 
     }
 
 
-
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */
     @DeleteMapping(value = "/{ids}")
-    public  R deleteAll(@PathVariable("ids") String ids){
+    public R deleteAll(@PathVariable("ids") String ids) {
         boolean b = projectService.removeByIds(ids);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("删除失败！");
         }
     }
 
     /**
      * 批量修改
+     *
      * @param list
      * @return
      */
     @PutMapping(value = "/editRegions")
-    public R update(@RequestBody List<Project> list){
+    public R update(@RequestBody List<Project> list) {
         boolean b = projectService.updateBatchById(list);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("更新失败！");
         }
     }

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

@@ -2,24 +2,20 @@ package com.gyee.backconfig.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gyee.backconfig.common.requst.vo.ProjectPlanQueryVo;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Projectplan;
-import com.gyee.backconfig.model.auto.XrpProjectplan;
 import com.gyee.backconfig.service.BackConfigService;
-import com.gyee.backconfig.service.auto.IProjectService;
 import com.gyee.backconfig.service.auto.IProjectplanService;
 import com.gyee.backconfig.vo.Projectplanvo;
 import com.gyee.common.model.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.nio.file.FileAlreadyExistsException;
 import java.util.Arrays;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wang
@@ -32,12 +28,13 @@ public class ProjectplanController {
     private BackConfigService backConfigService;
     @Resource
     private IProjectplanService projectplanService;
+
     @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 = "pagenum", required = true) Integer pageNum,
+            @RequestParam(value = "pagesize", required = true) Integer pageSize,
             @RequestParam(value = "id", required = false) String id,
             @RequestParam(value = "projectid", required = false) String projectid,
             @RequestParam(value = "generatingcapacity", required = false) String generatingcapacity,
@@ -45,15 +42,15 @@ public class ProjectplanController {
             @RequestParam(value = "year", required = false) String year,
             @RequestParam(value = "month", required = false) String month,
             @RequestParam(value = "windpower", required = false) String windpower,
-            @RequestParam(value = "version", required = false) Integer version){
+            @RequestParam(value = "version", required = false) Integer version) {
 
-        Projectplanvo vo=new Projectplanvo();
+        Projectplanvo vo = new Projectplanvo();
         setVOTemplate(pageNum, pageSize, id, projectid, generatingcapacity, outagehours, year, month, windpower, version, vo);
 
         Page<Projectplan> ProjectplanPage = backConfigService.listBypage(vo);
         if (StringUtils.isNotNull(ProjectplanPage)) {
             return R.ok().data(ProjectplanPage);
-        }else{
+        } else {
             return R.error().message("访问失败");
         }
     }
@@ -70,14 +67,15 @@ public class ProjectplanController {
         vo.setCurrent(pageNum);
         vo.setPageSize(pageSize);
     }
+
     //新增或者更新
     @PostMapping("/add-modify-projectplan")
     @CrossOrigin(origins = "*", maxAge = 3600)
-    public R addModifyProjectPlan(@RequestBody Projectplan Projectplan){
+    public R addModifyProjectPlan(@RequestBody Projectplan Projectplan) {
         boolean saveOrUpdate = backConfigService.saveOrUpdate(Projectplan);
         if (saveOrUpdate) {
             return R.ok().data("保存或更新成功");
-        }else{
+        } else {
             return R.error().message("保存失败");
         }
     }
@@ -97,10 +95,10 @@ public class ProjectplanController {
 
 
     @DeleteMapping(value = "/remove-projectplans/{ids}")
-    public  R deleteAll(@PathVariable("ids") String ids) {
+    public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
 
-        boolean  b = projectplanService.removeByIds(Arrays.asList(strings));
+        boolean b = projectplanService.removeByIds(Arrays.asList(strings));
 
         if (b) {
             return R.ok().data(b);

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

@@ -4,7 +4,6 @@ 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.Line;
 import com.gyee.backconfig.model.auto.Region;
 import com.gyee.backconfig.service.auto.IRegionService;
 import com.gyee.common.model.StringUtils;
@@ -16,7 +15,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器（区域）
+ * 前端控制器（区域）
  * </p>
  *
  * @author wang
@@ -32,6 +31,7 @@ public class RegionController {
 
     /**
      * 查询
+     *
      * @param id
      * @param name
      * @param pageNum
@@ -39,35 +39,35 @@ public class RegionController {
      * @return
      */
     @GetMapping(value = "/List")
-    public R findList(@RequestParam(value = "id",required = false) String id,
-                      @RequestParam(value = "companyid",required = false) String companyid,
-                      @RequestParam(value = "name",required = false) String name,
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "companyid", required = false) String companyid,
+                      @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "aname", required = false) String aname,
-                      @RequestParam(value = "pageNum",required = true) String pageNum,
-                      @RequestParam(value = "pageSize",required = true) String pageSize){
-        IPage<Region> list = regionService.list(id,name,companyid,aname, pageNum, pageSize);
-        if (null != list){
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<Region> list = regionService.list(id, name, companyid, aname, pageNum, pageSize);
+        if (null != list) {
             return R.ok().data(list);
-        }else {
+        } else {
             return R.error().data("查询失败！");
         }
     }
 
 
-
     /**
      * 根据id查询
+     *
      * @param id
      * @return
      */
     @GetMapping(value = "/{id}")
-    public R findOne(@PathVariable("id") String id){
+    public R findOne(@PathVariable("id") String id) {
         QueryWrapper<Region> qw = new QueryWrapper<>();
-        qw.eq("id",id);
+        qw.eq("id", id);
         Region region = regionService.getOne(qw);
-        if (StringUtils.isNotNull(region)){
+        if (StringUtils.isNotNull(region)) {
             return R.ok().data(region);
-        }else {
+        } else {
             return R.error().data("查询失败！");
         }
 
@@ -76,17 +76,18 @@ public class RegionController {
 
     /**
      * 插入（批量）
+     *
      * @param region
      * @return
      */
     @PostMapping(value = "/save")
     @CrossOrigin(origins = "*", maxAge = 3600)
-    public R addAll(@RequestBody Region region){
+    public R addAll(@RequestBody Region region) {
 
         boolean b = regionService.saveOrUpdate(region);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("保存失败！");
         }
 
@@ -95,33 +96,34 @@ public class RegionController {
 
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */
     @DeleteMapping(value = "/{ids}")
-    public  R deleteAll(@PathVariable("ids") String ids){
+    public R deleteAll(@PathVariable("ids") String ids) {
         String[] strings = ids.split(",");
         boolean b = regionService.removeByIds(Arrays.asList(strings));
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("删除失败！");
         }
     }
 
 
-
     /**
      * 批量修改
+     *
      * @param list
      * @return
      */
     @PutMapping(value = "/editRegions")
-    public R update(@RequestBody List<Region> list){
+    public R update(@RequestBody List<Region> list) {
         boolean b = regionService.updateBatchById(list);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("更新失败！");
         }
 

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

@@ -4,7 +4,6 @@ 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.ProBasicSquare;
 import com.gyee.backconfig.model.auto.Square;
 import com.gyee.backconfig.service.auto.ISquareService;
 import com.gyee.common.model.StringUtils;

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

@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wang
@@ -24,12 +24,12 @@ import java.util.List;
 public class StandardpointController {
 
 
-
     @Autowired
     private IStandardpointService standardpointService;
 
     /**
      * 查询
+     *
      * @param id
      * @param uniformcode
      * @param name
@@ -44,7 +44,7 @@ public class StandardpointController {
                       @RequestParam(value = "type", required = false) String type,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<Standardpoint> list = standardpointService.list(id, uniformcode, name,type,pageNum, pageSize);
+        IPage<Standardpoint> list = standardpointService.list(id, uniformcode, name, type, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {
@@ -55,16 +55,17 @@ public class StandardpointController {
 
     /**
      * 根据id查询
+     *
      * @param id
      * @return
      */
     @GetMapping(value = "/{id}")
-    public R findOne(@PathVariable("id") String id){
+    public R findOne(@PathVariable("id") String id) {
 
         Standardpoint standardpoint = standardpointService.getOne(id);
-        if (StringUtils.isNotNull(standardpoint)){
+        if (StringUtils.isNotNull(standardpoint)) {
             return R.ok().data(standardpoint);
-        }else {
+        } else {
             return R.error().data("查询失败！");
         }
 
@@ -73,49 +74,51 @@ public class StandardpointController {
 
     /**
      * 插入（批量）
+     *
      * @param standardpoint
      * @return
      */
     @PostMapping(value = "/add")
-    public R addAll(@RequestBody Standardpoint standardpoint){
+    public R addAll(@RequestBody Standardpoint standardpoint) {
 
         boolean b = standardpointService.addOrUpdate(standardpoint);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("保存失败！");
         }
 
     }
 
 
-
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */
     @DeleteMapping(value = "/{ids}")
-    public  R deleteAll(@PathVariable("ids") String ids){
+    public R deleteAll(@PathVariable("ids") String ids) {
         boolean b = standardpointService.removeByIds(ids);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("删除失败！");
         }
     }
 
     /**
      * 批量修改
+     *
      * @param list
      * @return
      */
     @PutMapping(value = "/editStandardpoint")
-    public R update(@RequestBody List<Standardpoint> list){
+    public R update(@RequestBody List<Standardpoint> list) {
         boolean b = standardpointService.updateBatchById(list);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("更新失败！");
         }
 
@@ -124,13 +127,14 @@ public class StandardpointController {
 
     /**
      * 查询
+     *
      * @param type
      * @return
      */
     @GetMapping(value = "/pointcode")
     public R findList(
-                      @RequestParam(value = "type", required = false) String type) {
-        String code  = standardpointService.getPointCode(type);
+            @RequestParam(value = "type", required = false) String type) {
+        String code = standardpointService.getPointCode(type);
         if (null != code) {
             return R.ok().data(code);
         } else {
@@ -139,5 +143,4 @@ public class StandardpointController {
     }
 
 
-
 }

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

@@ -7,14 +7,12 @@ import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.gyee.backconfig.service.BackConfigService;
 import com.gyee.backconfig.service.auto.IWindpowerstationService;
-import com.gyee.backconfig.vo.PersisVo;
 import com.gyee.backconfig.vo.WindpowerstationAdmVo;
 import com.gyee.backconfig.vo.Windpowerstationvo;
 import com.gyee.common.model.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -219,13 +217,13 @@ public class WindpowerstationController {
 
 
     /**
-     * 行政管理区域风电场列表
+     * 查询
      * @param regionid
      * @param companyid
      * @return
      */
-    @GetMapping(value = "/getadmList")
-    public R getadmList(
+    @GetMapping(value = "/getList")
+    public R getList(
                       @RequestParam(value = "regionid",required = false) String regionid,
                       @RequestParam(value = "companyid",required = false) String companyid){
         try {
@@ -243,31 +241,4 @@ public class WindpowerstationController {
 
 
 
-    /**
-     * 场站性能分析
-     * @param station
-     * @return
-     */
-    @GetMapping(value = "/getPersis")
-    public R getPersis(
-            @RequestParam(value = "station",required = false) String station,
-            @RequestParam(value = "startdate",required = false) Date startdate,
-            @RequestParam(value = "enddate",required = false) Date enddate
-            ){
-        try {
-            List<PersisVo> list = windpowerstationService.getPersis(station, startdate,enddate);
-            if (null != list){
-                return R.ok().data(list);
-            }else {
-                return R.error().data("查询失败！");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return R.error().data("查询失败！");
-        }
-    }
-
-
-
-
 }

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

@@ -8,11 +8,12 @@ import com.gyee.backconfig.service.auto.IWindpowerstationpointnewService;
 import com.gyee.common.model.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wang
@@ -28,6 +29,7 @@ public class WindpowerstationpointnewController {
 
     /**
      * 查询
+     *
      * @param id
      * @param code
      * @param model
@@ -44,7 +46,7 @@ public class WindpowerstationpointnewController {
                       @RequestParam(value = "windpowerstationid", required = false) String windpowerstationid,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<Windpowerstationpointnew> list = windpowerstationpointnewService.list(id, code, name,model, uniformcode, windpowerstationid,pageNum, pageSize);
+        IPage<Windpowerstationpointnew> list = windpowerstationpointnewService.list(id, code, name, model, uniformcode, windpowerstationid, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {
@@ -55,16 +57,17 @@ public class WindpowerstationpointnewController {
 
     /**
      * 根据id查询c
+     *
      * @param id
      * @return
      */
     @GetMapping(value = "/{id}")
-    public R findOne(@PathVariable("id") String id){
+    public R findOne(@PathVariable("id") String id) {
 
         Windpowerstationpointnew pointnew = windpowerstationpointnewService.getOne(id);
-        if (StringUtils.isNotNull(pointnew)){
+        if (StringUtils.isNotNull(pointnew)) {
             return R.ok().data(pointnew);
-        }else {
+        } else {
             return R.error().data("查询失败！");
         }
 
@@ -73,49 +76,51 @@ public class WindpowerstationpointnewController {
 
     /**
      * 插入（批量）
+     *
      * @param pointnew
      * @return
      */
     @PostMapping(value = "/add")
-    public R addAll(@RequestBody Windpowerstationpointnew pointnew){
+    public R addAll(@RequestBody Windpowerstationpointnew pointnew) {
 
         boolean b = windpowerstationpointnewService.addOrUpdate(pointnew);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("保存失败！");
         }
 
     }
 
 
-
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */
     @DeleteMapping(value = "/{ids}")
-    public  R deleteAll(@PathVariable("ids") String ids){
+    public R deleteAll(@PathVariable("ids") String ids) {
         boolean b = windpowerstationpointnewService.removeByIds(ids);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("删除失败！");
         }
     }
 
     /**
      * 批量修改
+     *
      * @param list
      * @return
      */
     @PutMapping(value = "/editPointnew")
-    public R update(@RequestBody List<Windpowerstationpointnew> list){
+    public R update(@RequestBody List<Windpowerstationpointnew> list) {
         boolean b = windpowerstationpointnewService.updateBatchById(list);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("更新失败！");
         }
     }

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

@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wang
@@ -29,6 +29,7 @@ public class WindturbineController {
 
     /**
      * 查询
+     *
      * @param id
      * @param code
      * @param windpowerstationid
@@ -47,7 +48,7 @@ public class WindturbineController {
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<Windturbine> list = windturbineService.list(id, code, windpowerstationid,name,projectid, lineid, pageNum, pageSize);
+        IPage<Windturbine> list = windturbineService.list(id, code, windpowerstationid, name, projectid, lineid, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {
@@ -58,16 +59,17 @@ public class WindturbineController {
 
     /**
      * 根据id查询
+     *
      * @param id
      * @return
      */
     @GetMapping(value = "/{id}")
-    public R findOne(@PathVariable("id") String id){
+    public R findOne(@PathVariable("id") String id) {
 
         Windturbine windturbine = windturbineService.getOne(id);
-        if (StringUtils.isNotNull(windturbine)){
+        if (StringUtils.isNotNull(windturbine)) {
             return R.ok().data(windturbine);
-        }else {
+        } else {
             return R.error().data("查询失败！");
         }
 
@@ -76,49 +78,51 @@ public class WindturbineController {
 
     /**
      * 插入（批量）
+     *
      * @param windturbine
      * @return
      */
     @PostMapping(value = "/add")
-    public R addAll(@RequestBody Windturbine windturbine){
+    public R addAll(@RequestBody Windturbine windturbine) {
 
         boolean b = windturbineService.addOrUpdate(windturbine);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("保存失败！");
         }
 
     }
 
 
-
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */
     @DeleteMapping(value = "/{ids}")
-    public  R deleteAll(@PathVariable("ids") String ids){
+    public R deleteAll(@PathVariable("ids") String ids) {
         boolean b = windturbineService.removeByIds(ids);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("删除失败！");
         }
     }
 
     /**
      * 批量修改
+     *
      * @param list
      * @return
      */
     @PutMapping(value = "/editRegions")
-    public R update(@RequestBody List<Windturbine> list){
+    public R update(@RequestBody List<Windturbine> list) {
         boolean b = windturbineService.updateBatchById(list);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("更新失败！");
         }
 

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

@@ -8,11 +8,12 @@ import com.gyee.backconfig.service.auto.IWindturbinetestingpointnewService;
 import com.gyee.common.model.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wang
@@ -28,6 +29,7 @@ public class WindturbinetestingpointnewController {
 
     /**
      * 查询
+     *
      * @param id
      * @param code
      * @param name
@@ -44,7 +46,7 @@ public class WindturbinetestingpointnewController {
                       @RequestParam(value = "windpowerstationid", required = false) String windpowerstationid,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<Windturbinetestingpointnew> list = windturbinetestingpointnewService.list(id, code, name,model, uniformcode, windpowerstationid,pageNum, pageSize);
+        IPage<Windturbinetestingpointnew> list = windturbinetestingpointnewService.list(id, code, name, model, uniformcode, windpowerstationid, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {
@@ -55,16 +57,17 @@ public class WindturbinetestingpointnewController {
 
     /**
      * 根据id查询
+     *
      * @param id
      * @return
      */
     @GetMapping(value = "/{id}")
-    public R findOne(@PathVariable("id") String id){
+    public R findOne(@PathVariable("id") String id) {
 
         Windturbinetestingpointnew pointnew = windturbinetestingpointnewService.getOne(id);
-        if (StringUtils.isNotNull(pointnew)){
+        if (StringUtils.isNotNull(pointnew)) {
             return R.ok().data(pointnew);
-        }else {
+        } else {
             return R.error().data("查询失败！");
         }
 
@@ -73,49 +76,51 @@ public class WindturbinetestingpointnewController {
 
     /**
      * 插入（批量）
+     *
      * @param pointnew
      * @return
      */
     @PostMapping(value = "/add")
-    public R addAll(@RequestBody Windturbinetestingpointnew pointnew){
+    public R addAll(@RequestBody Windturbinetestingpointnew pointnew) {
 
         boolean b = windturbinetestingpointnewService.addOrUpdate(pointnew);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("保存失败！");
         }
 
     }
 
 
-
     /**
      * 批量删除
+     *
      * @param ids
      * @return
      */
     @DeleteMapping(value = "/{ids}")
-    public  R deleteAll(@PathVariable("ids") String ids){
+    public R deleteAll(@PathVariable("ids") String ids) {
         boolean b = windturbinetestingpointnewService.removeByIds(ids);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("删除失败！");
         }
     }
 
     /**
      * 批量修改
+     *
      * @param list
      * @return
      */
     @PutMapping(value = "/editPointnew")
-    public R update(@RequestBody List<Windturbinetestingpointnew> list){
+    public R update(@RequestBody List<Windturbinetestingpointnew> list) {
         boolean b = windturbinetestingpointnewService.updateBatchById(list);
-        if (b){
+        if (b) {
             return R.ok().data(b);
-        }else {
+        } else {
             return R.error().data("更新失败！");
         }
 

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/test/XrpProjectplanController.java

@@ -1,51 +0,0 @@
-package com.gyee.backconfig.controller.test;
-
-
-import com.gyee.backconfig.config.R;
-import com.gyee.backconfig.model.auto.XrpProjectplan;
-import com.gyee.backconfig.service.auto.IXrpProjectplanService;
-import com.gyee.backconfig.service.auto.impl.XrpProjectplanServiceImpl;
-import com.gyee.common.model.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 郗瑞鹏
- * @since 2022-09-14
- */
-@RestController
-@RequestMapping("//xrp-projectplan")
-public class XrpProjectplanController {
-
-    @Autowired
-    private XrpProjectplanServiceImpl xrpProjectplanService;
-
-
-
-    @GetMapping("/xpp")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
-    public R xppList(){
-
-        List<XrpProjectplan> xrpProjectplans = xrpProjectplanService.queryAll();
-        if (StringUtils.isNotNull(xrpProjectplans)) {
-            return R.ok(xrpProjectplans.size()).data(xrpProjectplans);
-        }else{
-            return R.error().message("访问失败");
-        }
-    }
-
-    @GetMapping("/test")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
-    public R test(){
-        return R.ok().data("hello backconfig xrp");
-    }
-}

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

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

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

@@ -0,0 +1,33 @@
+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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Modelpower extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String modelid;
+
+    private BigDecimal speed;
+
+    private BigDecimal theorypower;
+
+    private BigDecimal ensurepower;
+
+
+}

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IModelpowerService.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.gyee.backconfig.model.auto.Modelpower;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-20
+ */
+public interface IModelpowerService extends IService<Modelpower> {
+    IPage<Modelpower> list(String id, String modelid, String pageNum, String pageSize);
+}

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

@@ -0,0 +1,38 @@
+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.model.auto.Modelpower;
+import com.gyee.backconfig.mapper.auto.ModelpowerMapper;
+import com.gyee.backconfig.service.auto.IModelpowerService;
+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-20
+ */
+@Service
+public class ModelpowerServiceImpl extends ServiceImpl<ModelpowerMapper, Modelpower> implements IModelpowerService {
+
+    @Override
+    public IPage<Modelpower> list(String id, String modelid, String pageNum, String pageSize) {
+        QueryWrapper<Modelpower> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.like("id", id);
+        }
+        if (StringUtils.isNotEmpty(modelid)) {
+            qw.like("modelid", modelid);
+        }
+        Page<Modelpower> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<Modelpower> ModelpowerPage =getBaseMapper().selectPage(page, qw);
+        return ModelpowerPage;
+    }
+}

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

@@ -1,53 +0,0 @@
-package com.gyee.backconfig.service.auto.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gyee.backconfig.model.auto.XrpProjectplan;
-import com.gyee.backconfig.mapper.auto.XrpProjectplanMapper;
-import com.gyee.backconfig.service.auto.IXrpProjectplanService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 郗瑞鹏
- * @since 2022-09-14
- */
-@Service
-public class XrpProjectplanServiceImpl extends ServiceImpl<XrpProjectplanMapper, XrpProjectplan> implements IXrpProjectplanService {
-
-    @Resource
-    private XrpProjectplanMapper xrpProjectplanMapper;
-
-    //查询所有
-    public List<XrpProjectplan> queryAll(){
-        return xrpProjectplanMapper.selectList(null);
-    }
-
-    //不加条件的分页
-    /*public Page<XrpProjectplan> queryByPage(int current,int pagesize){
-        Page<XrpProjectplan> page=new Page<XrpProjectplan>(1,3);
-        Page<XrpProjectplan> xrpProjectplanPage = xrpProjectplanMapper.selectPage(page, null);
-        return xrpProjectplanPage;
-    }
-*/
-    //根据条件查询
-
-    //新增
-
-    //更新
-
-    //删除
-
-    //分页
-    public void Page() {
-        Page<XrpProjectplan> page = new Page<XrpProjectplan>(1, 3);
-        xrpProjectplanMapper.selectPage(page, null);
-    }
-}