计划电量接口修改

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

@@ -28,12 +28,11 @@ public class BackController {
     private BackConfigService backConfigService;
 
     /**
-     * 单机自主分析
-     * 风机列表
+     * 公司列表
      *
      * @return
      */
-    @GetMapping("/wtls")
+    @GetMapping(value ="/wtls")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R wtls() {

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

@@ -1,6 +1,8 @@
 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.extension.plugins.pagination.Page;
 import com.gyee.backconfig.config.R;
@@ -12,6 +14,7 @@ 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;
 
@@ -24,7 +27,7 @@ import java.util.List;
  * @since 2022-09-23
  */
 @RestController
-@RequestMapping("//companys")
+@RequestMapping
 public class CompanysController {
     @Resource
     private ICompanysService companysService;
@@ -69,18 +72,20 @@ public class CompanysController {
     }
 
     /**
-     * 批量保存
-     * @param list
+     * 插入（批量）
+     * @param company
      * @return
      */
     @PostMapping(value = "/companys")
-    public R addAll(@RequestBody List<Companys> list){
-        boolean b = companysService.saveBatch(list);
+    public R addAll(@RequestBody Companys company){
+
+        boolean b = companysService.saveOrUpdate(company);
         if (b){
             return R.ok().data(b);
         }else {
             return R.error().data("保存失败！");
         }
+
     }
 
     /**

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

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

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

@@ -0,0 +1,63 @@
+package com.gyee.backconfig.model.auto;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.gyee.backconfig.config.ZTEnum;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wang
+ * @since 2022-09-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Projectplan extends Model {
+
+    private static final long serialVersionUID = 1L;
+    // @TableId(value="ID",type = IdType.ASSIGN_ID)//指定自增策略
+    // bigint，int8表里面是,默认 只能使用id作为主键，@tableId 将属性对应的字段作为指定主键
+    //value="ID" 这里id和数据库中指定作为主键的字段，value=可以省略;
+    @TableId(value="ID")
+    private String id;
+
+    @TableField("PROJECTID")
+    private String projectid;
+
+
+    @TableField("GENERATINGCAPACITY")
+    private String generatingcapacity;
+
+
+    @TableField("OUTAGEHOURS")
+    private Double outagehours;
+
+    @TableField("YEAR")
+    private String year;
+
+    @TableField("MONTH")
+    private String month;
+
+    @TableField("WINDPOWER")
+    private String windpower;
+
+    //删除逻辑删除
+    @TableLogic
+    private Integer isdeleted;
+
+    @Version
+    @TableField("VERSION")
+    private Integer version;
+
+    private ZTEnum zt;
+
+}

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

@@ -3,14 +3,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.config.CacheContext;
 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.backconfig.vo.*;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -18,7 +14,6 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.gyee.backconfig.config.CacheContext.wpls;
 
 /**
  * @author 50560
@@ -29,7 +24,7 @@ import static com.gyee.backconfig.config.CacheContext.wpls;
 public class BackConfigService {
 
     @Resource
-    private IXrpProjectplanService xrpProjectplanService;
+    private IProjectplanService ProjectplanService;
     @Resource
     private ICompanysService companysService;
     @Resource
@@ -44,27 +39,27 @@ public class BackConfigService {
      * @return
      */
     //返回所有
-    public List<XrpProjectplan> backConfigList() {
-        List<XrpProjectplan> xrpProjectplanList = xrpProjectplanService.list();
+    public List<Projectplan> backConfigList() {
+        List<Projectplan> ProjectplanList = ProjectplanService.list();
 
-        return xrpProjectplanList;
+        return ProjectplanList;
     }
 
     //根据id返回
-    public XrpProjectplan projectplanById(String id) {
-        QueryWrapper<XrpProjectplan> queryWrapper = new QueryWrapper<>();
-        XrpProjectplan xrpProjectplan = xrpProjectplanService.getOne(queryWrapper);
+    public Projectplan projectplanById(String id) {
+        QueryWrapper<Projectplan> queryWrapper = new QueryWrapper<>();
+        Projectplan xrpProjectplan = ProjectplanService.getOne(queryWrapper);
         queryWrapper.eq("id", id);
         return xrpProjectplan;
     }
 
-    public void updateXpp(XrpProjectplan xpp) {
-        xrpProjectplanService.updateById(xpp);
+    public void updateXpp(Projectplan xpp) {
+        ProjectplanService.updateById(xpp);
     }
 
 
-    public Boolean saveSingle(XrpProjectplan xrpProjectplan) {
-        return xrpProjectplanService.saveOrUpdate(xrpProjectplan);
+    public Boolean saveSingle(Projectplan Projectplan) {
+        return ProjectplanService.saveOrUpdate(Projectplan);
     }
 
     //更新
@@ -72,12 +67,12 @@ public class BackConfigService {
 
     //增加
 
-    //XrpProjectplan分页查询
+    //Projectplan分页查询
 
-    public Page<XrpProjectplan> listBypage(ProjectPlanQueryVo vo) {
-        Page<XrpProjectplan> page = new Page<XrpProjectplan>(vo.getCurrent(), vo.getPageSize());
+    public Page<Projectplan> listBypage(Projectplanvo vo) {
+        Page<Projectplan> page = new Page<Projectplan>(vo.getCurrent(), vo.getPageSize());
 
-        QueryWrapper<XrpProjectplan> queryWrapper = new QueryWrapper<>();
+        QueryWrapper<Projectplan> queryWrapper = new QueryWrapper<>();
         String id = vo.getId();
         String projectid = vo.getProjectid();
         String generatingcapacity = vo.getGeneratingcapacity();
@@ -109,31 +104,31 @@ public class BackConfigService {
             queryWrapper.eq("windpower", windpower);
         }
 
-        Page<XrpProjectplan> page1 = xrpProjectplanService.page(page, queryWrapper);
+        Page<Projectplan> page1 = ProjectplanService.page(page, queryWrapper);
         return page1;
     }
 
 
-    public boolean saveOrUpdate(XrpProjectplan xrpProjectplan) {
-        return xrpProjectplanService.saveOrUpdate(xrpProjectplan);
+    public boolean saveOrUpdate(Projectplan Projectplan) {
+        return ProjectplanService.saveOrUpdate(Projectplan);
     }
 
-    public boolean removeWapper(XrpProjectplan xrpProjectplan) {
+    public boolean removeWapper(Projectplan Projectplan) {
 
 
-        QueryWrapper<XrpProjectplan> queryWrapper = new QueryWrapper<XrpProjectplan>();
-        conditionJudge(xrpProjectplan, queryWrapper);
-        return xrpProjectplanService.remove(queryWrapper);
+        QueryWrapper<Projectplan> queryWrapper = new QueryWrapper<Projectplan>();
+        conditionJudge(Projectplan, queryWrapper);
+        return ProjectplanService.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();
+    private void conditionJudge(Projectplan Projectplan, QueryWrapper<Projectplan> queryWrapper) {
+        String id = Projectplan.getId();
+        String projectid = Projectplan.getProjectid();
+        String generatingcapacity = Projectplan.getGeneratingcapacity();
+        Double outagehours = Projectplan.getOutagehours();
+        String year = Projectplan.getYear();
+        String month = Projectplan.getMonth();
+        String windpower = Projectplan.getWindpower();
         if (StringUtils.isNotNull(id) && !id.equals("")) {
             queryWrapper.eq("id", id);
         }
@@ -158,9 +153,9 @@ public class BackConfigService {
     }
 
     public boolean removeWapperById(String id) {
-        QueryWrapper<XrpProjectplan> queryWrapper = new QueryWrapper<XrpProjectplan>();
+        QueryWrapper<Projectplan> queryWrapper = new QueryWrapper<Projectplan>();
         queryWrapper.eq("id", id);
-        return xrpProjectplanService.remove(queryWrapper);
+        return ProjectplanService.remove(queryWrapper);
     }
 
     //windpowerstation表

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

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

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

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

web/backmanagerconfig/src/main/resources/application-jn.yml

@@ -18,34 +18,34 @@ spring:
       username: nacos
       password: nacos
   #redis集群
-#  redis:
-#    host: 10.81.3.155
-#    port: 6379
-#    timeout: 100000
-#    #    集群环境打开下面注释，单机不需要打开
-#    #    cluster:
-#    #      集群信息
-#    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
-#    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
-#    #      maxRedirects: 3
-#    password:
-#    application:
-#      name: test
-#    jedis:
-#      pool:
-#        max-active: 8
-#        min-idle: 0
-#        max-idle: 8
-#        max-wait: -1
-#    database: 0
+  redis:
+    host: 10.81.3.155
+    port: 6379
+    timeout: 100000
+    #    集群环境打开下面注释，单机不需要打开
+    #    cluster:
+    #      集群信息
+    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
+    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+    #      maxRedirects: 3
+    password:
+    application:
+      name: test
+    jedis:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 8
+        max-wait: -1
+    database: 0
   autoconfigure:
     exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
     url: jdbc:postgresql://10.81.3.151:5432/wisdom
-    username: postgres
-    password: postgres
+    username: gdprod
+    password: gd123
     oracle-schema=:
     #    type: com.alibaba.druid.pool.DruidDataSource
     #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC