增加可研电量配置

web/backmanagerconfig/pom.xml

@@ -63,6 +63,10 @@
             <artifactId>jedis</artifactId>
             <version>3.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

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

@@ -0,0 +1,126 @@
+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.Projectstudy;
+import com.gyee.backconfig.service.auto.IProjectstudyService;
+import com.gyee.common.model.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 可研电量
+ *
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-25
+ */
+@RestController
+@RequestMapping("//projectstudy")
+public class ProjectstudyController {
+    @Resource
+    private IProjectstudyService projectstudyService;
+
+    /**
+     * 查询
+     *
+     * @param id
+     * @param projectid
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/List")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "projectid", required = false) String projectid,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<Projectstudy> list = projectstudyService.getList(id, projectid, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+
+    /**
+     * 根据id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/study/{id}")
+    public R findOne(@PathVariable("id") String id) {
+        QueryWrapper<Projectstudy> qw = new QueryWrapper<>();
+        qw.eq("id", id);
+        Projectstudy Inverter = projectstudyService.getOne(qw);
+        if (StringUtils.isNotNull(Inverter)) {
+            return R.ok().data(Inverter);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+
+    /**
+     * 插入（批量）
+     *
+     * @param project
+     * @return
+     */
+    @PostMapping(value = "/add")
+    public R addAll(@RequestBody Projectstudy project) {
+
+        boolean b = projectstudyService.saveOrUpdate(project);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+
+    }
+
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-study/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = projectstudyService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+
+    /**
+     * 批量修改
+     *
+     * @param list
+     * @return
+     */
+    @PutMapping(value = "/editRegions")
+    public R update(@RequestBody List<Projectstudy> list) {
+        boolean b = projectstudyService.updateBatchById(list);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("更新失败！");
+        }
+    }
+
+}

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

@@ -5,6 +5,7 @@ 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.Region;
+import com.gyee.backconfig.model.auto.Square;
 import com.gyee.backconfig.service.auto.IRegionService;
 import com.gyee.common.model.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,17 +81,33 @@ public class RegionController {
      * @param region
      * @return
      */
-    @PostMapping(value = "/save")
+    @PostMapping(value = "/save2")
+    @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
-    public R addAll(@RequestBody Region region) {
+    public R addAll(@RequestBody List<Region> region) {
+
+        boolean b = regionService.saveBatch(region);
+        if (b) {
+            return R.ok().data("保存成功");
+        } else {
+            return R.error().data("保存失败！");
+        }
+
+    }
 
+    /**
+     * 更新保存
+     * @param region
+     * @return
+     */
+    @PostMapping(value = "/save")
+    public R addAll(@RequestBody Region region) {
         boolean b = regionService.saveOrUpdate(region);
         if (b) {
             return R.ok().data(b);
         } else {
             return R.error().data("保存失败！");
         }
-
     }
 
 

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

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

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

@@ -0,0 +1,37 @@
+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-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Projectstudy extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String projectid;
+
+    private String generatingcapacity;
+
+    private BigDecimal outagehours;
+
+    private String year;
+
+    private String month;
+
+    private String windpower;
+
+
+}

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

@@ -26,6 +26,8 @@ public class Realtimedatabaseconfiguration extends Model {
 
     private String namecmcfg;
 
+    private String namerts;
+
     private String label;
 
     private String windpowerstationid;
@@ -34,6 +36,8 @@ public class Realtimedatabaseconfiguration extends Model {
 
     private String portrts;
 
+    private String porthist;
+
     private String iphist;
 
     private String ipcmcfg;

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

@@ -1,6 +1,7 @@
 package com.gyee.backconfig.model.auto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -22,50 +23,73 @@ public class Region extends Model {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId("ID")
     private String id;
 
+    @TableField("COMPANYID")
     private String companyid;
 
+    @TableField("NAME")
     private String name;
 
+    @TableField("ANAME")
     private String aname;
 
+    @TableField("WINDCAPACITY")
     private Integer windcapacity;
 
+    @TableField("WINDCAPACITYUNIT")
     private String windcapacityunit;
 
+    @TableField("WINDQUANTITY")
     private Integer windquantity;
 
+    @TableField("CAPACITY")
     private Double capacity;
 
+    @TableField("CAPACITYUNIT")
     private String capacityunit;
 
+    @TableField("QUANTITYJZ")
     private Integer quantityjz;
 
+    @TableField("QUANTITYZC")
     private Integer quantityzc;
 
+    @TableField("JRWINDCAPACITY")
     private Integer jrwindcapacity;
 
+    @TableField("JRWINDCAPACITYUNIT")
     private String jrwindcapacityunit;
 
+    @TableField("JRWINDQUANTITY")
     private Integer jrwindquantity;
 
+    @TableField("JRCAPACITY")
     private Integer jrcapacity;
 
+    @TableField("JRCAPACITYUNIT")
     private String jrcapacityunit;
 
+    @TableField("JRQUANTITYJZ")
     private Integer jrquantityjz;
 
+    @TableField("JRQUANTITYZC")
     private Integer jrquantityzc;
 
+    @TableField("ORDERNUM")
     private Integer ordernum;
 
+    @TableField("WINDNUMBER")
     private Integer windnumber;
 
+    @TableField("NUMBER")
     private Integer  number;
 
+    @TableField("JRWINDNUMBER")
     private Integer  jrwindnumber;
 
+    @TableField("JRNUMBER")
     private Integer  jrnumber;
 
     @TableField(exist = false)

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

@@ -0,0 +1,18 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.Project;
+import com.gyee.backconfig.model.auto.Projectstudy;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-25
+ */
+public interface IProjectstudyService extends IService<Projectstudy> {
+    IPage<Projectstudy> getList(String id, String projectid, String pageNum, String pageSize);
+}

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

@@ -0,0 +1,43 @@
+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.Project;
+import com.gyee.backconfig.model.auto.Projectstudy;
+import com.gyee.backconfig.mapper.auto.ProjectstudyMapper;
+import com.gyee.backconfig.service.auto.IProjectstudyService;
+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-25
+ */
+@Service
+public class ProjectstudyServiceImpl extends ServiceImpl<ProjectstudyMapper, Projectstudy> implements IProjectstudyService {
+
+    @Override
+    public IPage<Projectstudy> getList(String id, String projectid, String pageNum, String pageSize) {
+        QueryWrapper<Projectstudy> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(id)){
+            qw.eq("id",id);
+        }
+
+        if (StringUtils.isNotEmpty(projectid)){
+            qw.like("projectid",projectid);
+        }
+
+        Page<Projectstudy> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<Projectstudy> companysPage = getBaseMapper().selectPage(page, qw);
+//        List<Project> list = companysPage.getRecords();
+
+        return companysPage;
+    }
+}