新增小五台场站，新增公司、线路表查询

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

@@ -85,11 +85,11 @@ logging:
 db:
   url: http://10.81.3.152:8011/ts
 #参与计算的场站
-runWindpowerstation: NJL_FDC,YTY_FDC,BHB_FDC #,MLJ_FDC,BHB_FDC,BHB3_FDC,XWT_FDC,
+runWindpowerstation: NJL_FDC,YTY_FDC,BHB_FDC,XWT_FDC #,MLJ_FDC,BHB_FDC,BHB3_FDC,XWT_FDC,
 #计算状态用ai或者di
 clauStatus:
   ai:    #配置期次
-  di: NJL01_GC,NJL02_GC,YTY01_GC,BHB01_GC
+  di: NJL01_GC,NJL02_GC,YTY01_GC,BHB01_GC,XWT01_GC
 #判断数据终端
 second: 1800
 #判断降出力

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

@@ -0,0 +1,58 @@
+package com.gyee.backconfig.controller;
+
+
+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.service.BackConfigService;
+import com.gyee.backconfig.vo.Companysvo;
+import com.gyee.common.model.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-09-23
+ */
+@RestController
+@RequestMapping("//companys")
+public class CompanysController {
+    @Resource
+    private BackConfigService backConfigService;
+
+    @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 = "name", required = false) String name,
+            @RequestParam(value = "rid", required = false) String rid) {
+        Companysvo vo = new Companysvo();
+        setVOTemplate(pageSize, pageNum, id,name,rid,vo);
+        Page<Companys> CompanysPage = backConfigService.CompanysBypage(vo);
+        if (StringUtils.isNotNull(CompanysPage)) {
+            return R.ok().data(CompanysPage);
+        } 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 = "rid", required = false) String rid,
+                               @RequestParam(value = "name", required = false) String name,Companysvo vo){
+        vo.setId(id);
+        vo.setName(name);
+        vo.setPageSize(pageSize);
+        vo.setRid(rid);
+        vo.setCurrent(pageNum);
+
+    }
+}

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

@@ -0,0 +1,80 @@
+package com.gyee.backconfig.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.Line;
+import com.gyee.backconfig.service.BackConfigService;
+import com.gyee.backconfig.vo.Linevo;
+import com.gyee.common.model.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-09-23
+ */
+@RestController
+@RequestMapping("//line")
+public class LineController {
+    @Resource
+    private BackConfigService backConfigService;
+
+    @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 = "aname", required = false) String aname,
+            @RequestParam(value = "projectid", required = false) String projectid,
+            @RequestParam(value = "capacity", required = false) Integer capacity,
+            @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 = new Linevo();
+        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);
+        } 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 = "aname", required = false) String aname,
+            @RequestParam(value = "projectid", required = false) String projectid,
+            @RequestParam(value = "capacity", required = false) Integer capacity,
+            @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){
+        vo.setAname(aname);
+        vo.setCapacity(capacity);
+        vo.setCode(code);
+        vo.setPageSize(pageSize);
+        vo.setCurrent(pageNum);
+        vo.setId(id);
+        vo.setName(name);
+        vo.setProjectid(projectid);
+        vo.setCapacity(capacity);
+        vo.setCapacityunit(capacityunit);
+        vo.setQuantity(quantity);
+        vo.setOrdernum(ordernum);
+        vo.setVersion(version);
+
+    }
+}

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

@@ -4,10 +4,8 @@ package com.gyee.backconfig.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Project;
-import com.gyee.backconfig.model.auto.Windpowerstation;
 import com.gyee.backconfig.service.BackConfigService;
 import com.gyee.backconfig.vo.Projectvo;
-import com.gyee.backconfig.vo.Windpowerstationvo;
 import com.gyee.common.model.StringUtils;
 import org.springframework.web.bind.annotation.*;
 

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

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

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

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

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

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

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

@@ -0,0 +1,42 @@
+package com.gyee.backconfig.model.auto;
+
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wang
+ * @since 2022-09-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Line extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String code;
+
+    private String name;
+
+    private String aname;
+
+    private String projectid;
+
+    private Integer ordernum;
+
+    private Integer capacity;
+
+    private String capacityunit;
+
+    private Integer quantity;
+
+
+}

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

@@ -18,45 +18,45 @@ import lombok.EqualsAndHashCode;
 public class Windpowerstation extends Model {
 
     private static final long serialVersionUID = 1L;
-    @TableId("ID")
+
     private String id;
-    @TableId("CODE")
+
     private String code;
-    @TableId("NAME")
+
     private String name;
-    @TableId("ADDRESS")
+
     private String address;
-    @TableId("TELEPHONE")
+
     private String telephone;
-    @TableId("CAPACITY")
+
     private Integer capacity;
-    @TableId("CAPACITYUNIT")
+
     private String capacityunit;
-    @TableId("QUANTITY")
+
     private Integer quantity;
-    @TableId("ANAME")
+
     private String aname;
-    @TableId("LONGITUDE")
+
     private Integer longitude;
-    @TableId("LATITUDE")
+
     private Integer latitude;
-    @TableId("PHOTO")
+
     private String photo;
-    @TableId("COMPANYID")
+
     private String companyid;
-    @TableId("SYSTEMMANUFACT")
+
     private String systemmanufact;
-    @TableId("HEADFARM")
+
     private String headfarm;
-    @TableId("HEADFARMPHONE")
+
     private String headfarmphone;
-    @TableId("MODEL")
+
     private String model;
-    @TableId("ORDERNUM")
+
     private Integer ordernum;
-    @TableId("ALTITUDE")
+
     private Integer altitude;
-    @TableId("HEIGHT")
+
     private Integer height;
 
 

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

@@ -4,12 +4,10 @@ package com.gyee.backconfig.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.common.requst.vo.ProjectPlanQueryVo;
-import com.gyee.backconfig.model.auto.Project;
-import com.gyee.backconfig.model.auto.Windpowerstation;
-import com.gyee.backconfig.model.auto.XrpProjectplan;
-import com.gyee.backconfig.service.auto.IProjectService;
-import com.gyee.backconfig.service.auto.IWindpowerstationService;
-import com.gyee.backconfig.service.auto.IXrpProjectplanService;
+import com.gyee.backconfig.model.auto.*;
+import com.gyee.backconfig.service.auto.*;
+import com.gyee.backconfig.vo.Companysvo;
+import com.gyee.backconfig.vo.Linevo;
 import com.gyee.backconfig.vo.Projectvo;
 import com.gyee.backconfig.vo.Windpowerstationvo;
 import com.gyee.common.model.StringUtils;
@@ -31,25 +29,29 @@ public class BackConfigService {
     @Resource
     private IXrpProjectplanService xrpProjectplanService;
     @Resource
+    private ICompanysService companysService;
+    @Resource
     private IWindpowerstationService windpowerstationService;
     @Resource
     private IProjectService projectService;
+    @Resource
+    private ILineService lineService;
 
     /**
      * @param
      * @return
      */
-    public List<XrpProjectplan> backConfigList(){
+    public List<XrpProjectplan> backConfigList() {
         List<XrpProjectplan> xrpProjectplanList = xrpProjectplanService.list();
 
         return xrpProjectplanList;
     }
 
     //根据id返回
-    public XrpProjectplan projectplanById(String id){
+    public XrpProjectplan projectplanById(String id) {
         QueryWrapper<XrpProjectplan> queryWrapper = new QueryWrapper<>();
         XrpProjectplan xrpProjectplan = xrpProjectplanService.getOne(queryWrapper);
-        queryWrapper.eq("id",id);
+        queryWrapper.eq("id", id);
         return xrpProjectplan;
     }
 
@@ -58,7 +60,6 @@ public class BackConfigService {
     }
 
 
-
     public Boolean saveSingle(XrpProjectplan xrpProjectplan) {
         return xrpProjectplanService.saveOrUpdate(xrpProjectplan);
     }
@@ -70,39 +71,39 @@ public class BackConfigService {
 
     //分页查询
 
-    public Page<XrpProjectplan> listBypage(ProjectPlanQueryVo vo){
-        Page<XrpProjectplan> page=new Page<XrpProjectplan>(vo.getCurrent(),vo.getPageSize());
+    public Page<XrpProjectplan> listBypage(ProjectPlanQueryVo vo) {
+        Page<XrpProjectplan> page = new Page<XrpProjectplan>(vo.getCurrent(), vo.getPageSize());
 
-        QueryWrapper<XrpProjectplan> queryWrapper=new QueryWrapper<>();
-         String id=vo.getId();
-         String projectid=vo.getProjectid();
-         String generatingcapacity=vo.getGeneratingcapacity();
-         Double outagehours=vo.getOutagehours();
-         String year=vo.getYear();
-         String month=vo.getMonth();
-         String windpower=vo.getWindpower();
+        QueryWrapper<XrpProjectplan> queryWrapper = new QueryWrapper<>();
+        String id = vo.getId();
+        String projectid = vo.getProjectid();
+        String generatingcapacity = vo.getGeneratingcapacity();
+        Double outagehours = vo.getOutagehours();
+        String year = vo.getYear();
+        String month = vo.getMonth();
+        String windpower = vo.getWindpower();
 
 
-        if(StringUtils.isNotNull(id)&&!id.equals("")){
-            queryWrapper.eq("id",id);
+        if (StringUtils.isNotNull(id) && !id.equals("")) {
+            queryWrapper.eq("id", id);
         }
-        if (StringUtils.isNotNull(projectid)&&!projectid.equals("")){
-            queryWrapper.eq("projectid",projectid);
+        if (StringUtils.isNotNull(projectid) && !projectid.equals("")) {
+            queryWrapper.eq("projectid", projectid);
         }
-        if (StringUtils.isNotNull(generatingcapacity)&&!generatingcapacity.equals("")){
-            queryWrapper.eq("generatingcapacity",generatingcapacity);
+        if (StringUtils.isNotNull(generatingcapacity) && !generatingcapacity.equals("")) {
+            queryWrapper.eq("generatingcapacity", generatingcapacity);
         }
-        if (StringUtils.isNotNull(outagehours)&&outagehours!=0.0){
-            queryWrapper.eq("outagehours",outagehours);
+        if (StringUtils.isNotNull(outagehours) && outagehours != 0.0) {
+            queryWrapper.eq("outagehours", outagehours);
         }
-        if (StringUtils.isNotNull(year)&&!year.equals("")){
-            queryWrapper.eq("year",year);
+        if (StringUtils.isNotNull(year) && !year.equals("")) {
+            queryWrapper.eq("year", year);
         }
-        if (StringUtils.isNotNull(month)&&!month.equals("")){
-            queryWrapper.eq("month",month);
+        if (StringUtils.isNotNull(month) && !month.equals("")) {
+            queryWrapper.eq("month", month);
         }
-        if (StringUtils.isNotNull(windpower)&&!windpower.equals("")){
-            queryWrapper.eq("windpower",windpower);
+        if (StringUtils.isNotNull(windpower) && !windpower.equals("")) {
+            queryWrapper.eq("windpower", windpower);
         }
 
         Page<XrpProjectplan> page1 = xrpProjectplanService.page(page, queryWrapper);
@@ -117,136 +118,137 @@ public class BackConfigService {
     public boolean removeWapper(XrpProjectplan xrpProjectplan) {
 
 
-        QueryWrapper<XrpProjectplan> queryWrapper=new QueryWrapper<XrpProjectplan>();
+        QueryWrapper<XrpProjectplan> queryWrapper = new QueryWrapper<XrpProjectplan>();
         conditionJudge(xrpProjectplan, queryWrapper);
         return xrpProjectplanService.remove(queryWrapper);
     }
 
     private void conditionJudge(XrpProjectplan xrpProjectplan, QueryWrapper<XrpProjectplan> queryWrapper) {
-        String id=xrpProjectplan.getId();
-        String projectid=xrpProjectplan.getProjectid();
-        String generatingcapacity=xrpProjectplan.getGeneratingcapacity();
-        Double outagehours=xrpProjectplan.getOutagehours();
-        String year=xrpProjectplan.getYear();
-        String month=xrpProjectplan.getMonth();
-        String windpower=xrpProjectplan.getWindpower();
-        if(StringUtils.isNotNull(id)&&!id.equals("")){
-            queryWrapper.eq("id",id);
+        String id = xrpProjectplan.getId();
+        String projectid = xrpProjectplan.getProjectid();
+        String generatingcapacity = xrpProjectplan.getGeneratingcapacity();
+        Double outagehours = xrpProjectplan.getOutagehours();
+        String year = xrpProjectplan.getYear();
+        String month = xrpProjectplan.getMonth();
+        String windpower = xrpProjectplan.getWindpower();
+        if (StringUtils.isNotNull(id) && !id.equals("")) {
+            queryWrapper.eq("id", id);
         }
-        if (StringUtils.isNotNull(projectid)&&!projectid.equals("")){
-            queryWrapper.eq("projectid",projectid);
+        if (StringUtils.isNotNull(projectid) && !projectid.equals("")) {
+            queryWrapper.eq("projectid", projectid);
         }
-        if (StringUtils.isNotNull(generatingcapacity)&&!generatingcapacity.equals("")){
-            queryWrapper.eq("generatingcapacity",generatingcapacity);
+        if (StringUtils.isNotNull(generatingcapacity) && !generatingcapacity.equals("")) {
+            queryWrapper.eq("generatingcapacity", generatingcapacity);
         }
-        if (StringUtils.isNotNull(outagehours)&&outagehours!=0.0){
-            queryWrapper.eq("outagehours",outagehours);
+        if (StringUtils.isNotNull(outagehours) && outagehours != 0.0) {
+            queryWrapper.eq("outagehours", outagehours);
         }
-        if (StringUtils.isNotNull(year)&&!year.equals("")){
-            queryWrapper.eq("year",year);
+        if (StringUtils.isNotNull(year) && !year.equals("")) {
+            queryWrapper.eq("year", year);
         }
-        if (StringUtils.isNotNull(month)&&!month.equals("")){
-            queryWrapper.eq("month",month);
+        if (StringUtils.isNotNull(month) && !month.equals("")) {
+            queryWrapper.eq("month", month);
         }
-        if (StringUtils.isNotNull(windpower)&&!windpower.equals("")){
-            queryWrapper.eq("windpower",windpower);
+        if (StringUtils.isNotNull(windpower) && !windpower.equals("")) {
+            queryWrapper.eq("windpower", windpower);
         }
     }
 
     public boolean removeWapperById(String id) {
-        QueryWrapper<XrpProjectplan> queryWrapper=new QueryWrapper<XrpProjectplan>();
-        queryWrapper.eq("id",id);
+        QueryWrapper<XrpProjectplan> queryWrapper = new QueryWrapper<XrpProjectplan>();
+        queryWrapper.eq("id", id);
         return xrpProjectplanService.remove(queryWrapper);
     }
 
     //windpowerstation表
-    public Page<Windpowerstation> Bypage(Windpowerstationvo vo){
-        Page<Windpowerstation> page=new Page<Windpowerstation>(vo.getCurrent(),vo.getPagesize());
+    public Page<Windpowerstation> Bypage(Windpowerstationvo vo) {
+        Page<Windpowerstation> page = new Page<Windpowerstation>(vo.getCurrent(), vo.getPagesize());
 
-        QueryWrapper<Windpowerstation> queryWrapper=new QueryWrapper<>();
-        String id=vo.getId();;
-        String code=vo.getCode();
-        String name=vo.getName();
-        String address=vo.getAddress();
-        String telephone=vo.getTelephone();
-        Integer capacity=vo.getCapacity();
-        String capacityunit=vo.getCapacityunit();
-        Integer quantity=vo.getQuantity();
-        String aname=vo.getAname();
-        Integer longitude=vo.getLongitude();
-        Integer latitude=vo.getLatitude();
-        String photo=vo.getPhoto();
-        String companyid=vo.getCompanyid();
-        String systemmanufact=vo.getSystemmanufact();
-        String headfarm=vo.getHeadfarm();
-        String headfarmphone=vo.getHeadfarmphone();
-        String model=vo.getModel();
-        Integer ordernum=vo.getOrdernum();
-        Integer altitudevo=vo.getAltitude();
-        Integer height=vo.getHeight();
+        QueryWrapper<Windpowerstation> queryWrapper = new QueryWrapper<>();
+        String id = vo.getId();
+        ;
+        String code = vo.getCode();
+        String name = vo.getName();
+        String address = vo.getAddress();
+        String telephone = vo.getTelephone();
+        Integer capacity = vo.getCapacity();
+        String capacityunit = vo.getCapacityunit();
+        Integer quantity = vo.getQuantity();
+        String aname = vo.getAname();
+        Integer longitude = vo.getLongitude();
+        Integer latitude = vo.getLatitude();
+        String photo = vo.getPhoto();
+        String companyid = vo.getCompanyid();
+        String systemmanufact = vo.getSystemmanufact();
+        String headfarm = vo.getHeadfarm();
+        String headfarmphone = vo.getHeadfarmphone();
+        String model = vo.getModel();
+        Integer ordernum = vo.getOrdernum();
+        Integer altitudevo = vo.getAltitude();
+        Integer height = vo.getHeight();
 
-        if(StringUtils.isNotNull(id)&&!id.equals("")){
-            queryWrapper.eq("id",id);
+        if (StringUtils.isNotNull(id) && !id.equals("")) {
+            queryWrapper.eq("id", id);
         }
-        if(StringUtils.isNotNull(code)&&!id.equals("")){
-            queryWrapper.eq("code",code);
+        if (StringUtils.isNotNull(code) && !code.equals("")) {
+            queryWrapper.eq("code", code);
         }
-        if(StringUtils.isNotNull(name)&&!id.equals("")){
-            queryWrapper.eq("name",name);
+        if (StringUtils.isNotNull(name) && !name.equals("")) {
+            queryWrapper.eq("name", name);
         }
-        if(StringUtils.isNotNull(address)&&!id.equals("")){
-            queryWrapper.eq("address",address);
+        if (StringUtils.isNotNull(address) && !address.equals("")) {
+            queryWrapper.eq("address", address);
         }
-        if(StringUtils.isNotNull(telephone)&&!id.equals("")){
-            queryWrapper.eq("telephone",telephone);
+        if (StringUtils.isNotNull(telephone) && !telephone.equals("")) {
+            queryWrapper.eq("telephone", telephone);
         }
-        if(StringUtils.isNotNull(capacity)&&!id.equals("")){
-            queryWrapper.eq("capacity",capacity);
+        if (StringUtils.isNotNull(capacity) && !capacity.equals("")) {
+            queryWrapper.eq("capacity", capacity);
         }
-        if(StringUtils.isNotNull(capacityunit)&&!id.equals("")){
-            queryWrapper.eq("capacityunit",capacityunit);
+        if (StringUtils.isNotNull(capacityunit) && !capacityunit.equals("")) {
+            queryWrapper.eq("capacityunit", capacityunit);
         }
-        if(StringUtils.isNotNull(aname)&&!id.equals("")){
-            queryWrapper.eq("aname",aname);
+        if (StringUtils.isNotNull(aname) && !aname.equals("")) {
+            queryWrapper.eq("aname", aname);
         }
-        if(StringUtils.isNotNull(longitude)&&!id.equals("")){
-            queryWrapper.eq("longitude",longitude);
+        if (StringUtils.isNotNull(longitude) && !longitude.equals("")) {
+            queryWrapper.eq("longitude", longitude);
         }
-        if(StringUtils.isNotNull(photo)&&!id.equals("")){
-            queryWrapper.eq("photo",photo);
+        if (StringUtils.isNotNull(photo) && !photo.equals("")) {
+            queryWrapper.eq("photo", photo);
         }
-        if(StringUtils.isNotNull(quantity)&&!id.equals("")){
-            queryWrapper.eq("quantity",quantity);
+        if (StringUtils.isNotNull(quantity) && !quantity.equals("")) {
+            queryWrapper.eq("quantity", quantity);
         }
-        if(StringUtils.isNotNull(latitude)&&!id.equals("")){
-            queryWrapper.eq("latitude",latitude);
+        if (StringUtils.isNotNull(latitude) && !latitude.equals("")) {
+            queryWrapper.eq("latitude", latitude);
         }
-        if(StringUtils.isNotNull(companyid)&&!id.equals("")){
-            queryWrapper.eq("companyid",companyid);
+        if (StringUtils.isNotNull(companyid) && !companyid.equals("")) {
+            queryWrapper.eq("companyid", companyid);
         }
-        if(StringUtils.isNotNull(systemmanufact)&&!id.equals("")){
-            queryWrapper.eq("systemmanufact",systemmanufact);
+        if (StringUtils.isNotNull(systemmanufact) && !systemmanufact.equals("")) {
+            queryWrapper.eq("systemmanufact", systemmanufact);
         }
-        if(StringUtils.isNotNull(headfarm)&&!id.equals("")){
-            queryWrapper.eq("headfarm",headfarm);
+        if (StringUtils.isNotNull(headfarm) && !headfarm.equals("")) {
+            queryWrapper.eq("headfarm", headfarm);
         }
-        if(StringUtils.isNotNull(headfarmphone)&&!id.equals("")){
-            queryWrapper.eq("headfarmphone",headfarmphone);
+        if (StringUtils.isNotNull(headfarmphone) && !headfarmphone.equals("")) {
+            queryWrapper.eq("headfarmphone", headfarmphone);
         }
-        if(StringUtils.isNotNull(model)&&!id.equals("")){
-            queryWrapper.eq("model",model);
+        if (StringUtils.isNotNull(model) && !model.equals("")) {
+            queryWrapper.eq("model", model);
         }
-        if(StringUtils.isNotNull(ordernum)&&!id.equals("")){
-            queryWrapper.eq("ordernum",ordernum);
+        if (StringUtils.isNotNull(ordernum) && !ordernum.equals("")) {
+            queryWrapper.eq("ordernum", ordernum);
         }
-        if(StringUtils.isNotNull(altitudevo)&&!id.equals("")){
-            queryWrapper.eq("altitudevo",altitudevo);
+        if (StringUtils.isNotNull(altitudevo) && !altitudevo.equals("")) {
+            queryWrapper.eq("altitudevo", altitudevo);
         }
-        if(StringUtils.isNotNull(height)&&!id.equals("")){
-            queryWrapper.eq("height",height);
+        if (StringUtils.isNotNull(height) && !height.equals("")) {
+            queryWrapper.eq("height", height);
         }
 
-        Page<Windpowerstation> page1 = windpowerstationService.page(page,queryWrapper);
+        Page<Windpowerstation> page1 = windpowerstationService.page(page, queryWrapper);
         return page1;
     }
 
@@ -269,51 +271,119 @@ public class BackConfigService {
         String shiftforemanphone = vo.getShiftforemanphone();
         Integer ordernum = vo.getOrdernum();
 
-        if(StringUtils.isNotNull(id)&&!id.equals("")){
-            queryWrapper.eq("id",id);
+        if (StringUtils.isNotNull(id) && !id.equals("")) {
+            queryWrapper.eq("id", id);
         }
-        if (StringUtils.isNotNull(code)&&!code.equals("")){
-            queryWrapper.eq("code",code);
+        if (StringUtils.isNotNull(code) && !code.equals("")) {
+            queryWrapper.eq("code", code);
         }
-        if (StringUtils.isNotNull(aname)&&!code.equals("")){
-            queryWrapper.eq("aname",aname);
+        if (StringUtils.isNotNull(aname) && !aname.equals("")) {
+            queryWrapper.eq("aname", aname);
         }
-        if (StringUtils.isNotNull(name)&&!code.equals("")){
-            queryWrapper.eq("name",name);
+        if (StringUtils.isNotNull(name) && !name.equals("")) {
+            queryWrapper.eq("name", name);
         }
-        if (StringUtils.isNotNull(capacityunit)&&!code.equals("")){
-            queryWrapper.eq("capacityunit",capacityunit);
+        if (StringUtils.isNotNull(capacityunit) && !capacityunit.equals("")) {
+            queryWrapper.eq("capacityunit", capacityunit);
         }
-        if (StringUtils.isNotNull(capacity)&&!code.equals("")){
-            queryWrapper.eq("capacity",capacity);
+        if (StringUtils.isNotNull(capacity) && !capacity.equals("")) {
+            queryWrapper.eq("capacity", capacity);
         }
-        if (StringUtils.isNotNull(windpowerstationid)&&!code.equals("")){
-            queryWrapper.eq("windpowerstationid",windpowerstationid);
+        if (StringUtils.isNotNull(windpowerstationid) && !windpowerstationid.equals("")) {
+            queryWrapper.eq("windpowerstationid", windpowerstationid);
         }
-        if (StringUtils.isNotNull(quantity)&&!code.equals("")){
-            queryWrapper.eq("quantity",quantity);
+        if (StringUtils.isNotNull(quantity) && !quantity.equals("")) {
+            queryWrapper.eq("quantity", quantity);
         }
-        if (StringUtils.isNotNull(model)&&!code.equals("")){
-            queryWrapper.eq("model",model);
+        if (StringUtils.isNotNull(model) && !model.equals("")) {
+            queryWrapper.eq("model", model);
         }
-        if (StringUtils.isNotNull(commissiondate)&&!code.equals("")){
-            queryWrapper.eq("commissiondate",commissiondate);
+        if (StringUtils.isNotNull(commissiondate) && !commissiondate.equals("")) {
+            queryWrapper.eq("commissiondate", commissiondate);
         }
-        if (StringUtils.isNotNull(masterphone)&&!code.equals("")){
-            queryWrapper.eq("masterphone",masterphone);
+        if (StringUtils.isNotNull(masterphone) && !masterphone.equals("")) {
+            queryWrapper.eq("masterphone", masterphone);
         }
-        if (StringUtils.isNotNull(shiftforeman)&&!code.equals("")){
-            queryWrapper.eq("shiftforeman",shiftforeman);
+        if (StringUtils.isNotNull(shiftforeman) && !shiftforeman.equals("")) {
+            queryWrapper.eq("shiftforeman", shiftforeman);
         }
-        if (StringUtils.isNotNull(shiftforemanphone)&&!code.equals("")){
-            queryWrapper.eq("shiftforemanphone",shiftforemanphone);
+        if (StringUtils.isNotNull(shiftforemanphone) && !shiftforemanphone.equals("")) {
+            queryWrapper.eq("shiftforemanphone", shiftforemanphone);
         }
-        if (StringUtils.isNotNull(ordernum)&&!code.equals("")){
-            queryWrapper.eq("ordernum",ordernum);
+        if (StringUtils.isNotNull(ordernum) && !ordernum.equals("")) {
+            queryWrapper.eq("ordernum", ordernum);
         }
 
-        Page<Project> page1 = projectService.page(page,queryWrapper);
+        Page<Project> page1 = projectService.page(page, queryWrapper);
+        return page1;
+    }
+
+    //line分页
+    public Page<Line> lineBypage(Linevo vo) {
+        Page<Line> page = new Page<Line>(vo.getCurrent(), vo.getPageSize());
+
+        QueryWrapper<Line> queryWrapper = new QueryWrapper<>();
+        String id = vo.getId();
+        String code = vo.getCode();
+        String aname = vo.getAname();
+        String name = vo.getName();
+        String projectid = vo.getProjectid();
+        Integer ordernum = vo.getOrdernum();
+        String capacityunit = vo.getCapacityunit();
+        Integer capacity = vo.getCapacity();
+        Integer quantity = vo.getQuantity();
+
+        if (StringUtils.isNotNull(id) && !id.equals("")) {
+            queryWrapper.eq("id", id);
+        }
+        if (StringUtils.isNotNull(code) && !code.equals("")) {
+            queryWrapper.eq("code", code);
+        }
+        if (StringUtils.isNotNull(aname) && !aname.equals("")) {
+            queryWrapper.eq("aname", aname);
+        }
+        if (StringUtils.isNotNull(name) && !name.equals("")) {
+            queryWrapper.eq("name", name);
+        }
+        if (StringUtils.isNotNull(capacityunit) && !capacityunit.equals("")) {
+            queryWrapper.eq("capacityunit", capacityunit);
+        }
+        if (StringUtils.isNotNull(capacity) && !capacity.equals("")) {
+            queryWrapper.eq("capacity", capacity);
+        }
+        if (StringUtils.isNotNull(projectid) && !projectid.equals("")) {
+            queryWrapper.eq("projectid", projectid);
+        }
+        if (StringUtils.isNotNull(ordernum) && !ordernum.equals("")) {
+            queryWrapper.eq("ordernum", ordernum);
+        }
+        if (StringUtils.isNotNull(quantity) && !quantity.equals("")) {
+            queryWrapper.eq("quantity", quantity);
+        }
+        Page<Line> page1 = lineService.page(page, queryWrapper);
         return page1;
     }
 
+    //Companys
+    public Page<Companys> CompanysBypage(Companysvo vo) {
+        Page<Companys> page = new Page<Companys>(vo.getCurrent(), vo.getPageSize());
+
+        QueryWrapper<Companys> queryWrapper = new QueryWrapper<>();
+        String id = vo.getId();
+        String rid = vo.getRid();
+        String name = vo.getName();
+
+        if (StringUtils.isNotNull(id) && !id.equals("")) {
+            queryWrapper.eq("id", id);
+        }
+        if (StringUtils.isNotNull(rid) && !rid.equals("")) {
+            queryWrapper.eq("code", rid);
+        }
+        if (StringUtils.isNotNull(name) && !name.equals("")) {
+            queryWrapper.eq("aname", name);
+        }
+
+        Page<Companys> page1 = companysService.page(page, queryWrapper);
+        return page1;
+    }
 }

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

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.service.auto;
+
+import com.gyee.backconfig.model.auto.Companys;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-09-23
+ */
+public interface ICompanysService extends IService<Companys> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.service.auto;
+
+import com.gyee.backconfig.model.auto.Line;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-09-23
+ */
+public interface ILineService extends IService<Line> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.backconfig.service.auto.impl;
+
+import com.gyee.backconfig.model.auto.Companys;
+import com.gyee.backconfig.mapper.auto.CompanysMapper;
+import com.gyee.backconfig.service.auto.ICompanysService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-09-23
+ */
+@Service
+public class CompanysServiceImpl extends ServiceImpl<CompanysMapper, Companys> implements ICompanysService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.backconfig.service.auto.impl;
+
+import com.gyee.backconfig.model.auto.Line;
+import com.gyee.backconfig.mapper.auto.LineMapper;
+import com.gyee.backconfig.service.auto.ILineService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-09-23
+ */
+@Service
+public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements ILineService {
+
+}

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

@@ -0,0 +1,25 @@
+package com.gyee.backconfig.vo;
+import lombok.Data;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wang
+ * @since 2022-09-23
+ */
+@Data
+public class Companysvo {
+
+    private String id;
+
+    private String rid;
+
+    private String name;
+    //分页
+    private Integer current;
+
+    private Integer pageSize;
+
+}

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

@@ -0,0 +1,42 @@
+package com.gyee.backconfig.vo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author wang
+ * @since 2022-09-23
+ */
+@Data
+public class Linevo {
+
+    private String id;
+
+    private String code;
+
+    private String name;
+
+    private String aname;
+
+    private String projectid;
+
+    private Integer ordernum;
+
+    private Integer capacity;
+
+    private String capacityunit;
+
+    private Integer quantity;
+
+    private Integer version;
+    //分页
+    private Integer current;
+
+    private Integer pageSize;
+
+}