Merge remote-tracking branch 'origin/master'

web/backmanagerconfig/backmanagerconfig.iml

@@ -26,8 +26,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="common" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.2.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.2.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.2.2.RELEASE" level="project" />
@@ -102,22 +100,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
     <orderEntry type="module" module-name="common" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.2.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.2.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.2.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.2.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.43.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
@@ -126,6 +108,7 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.2.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.3.2" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.3.2" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.3.2" level="project" />

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

@@ -122,4 +122,22 @@ public class StandardpointController {
     }
 
 
+    /**
+     * 查询
+     * @param type
+     * @return
+     */
+    @GetMapping(value = "/pointcode")
+    public R findList(
+                      @RequestParam(value = "type", required = false) String type) {
+        String code  = standardpointService.getPointCode(type);
+        if (null != code) {
+            return R.ok().data(code);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+
+
 }

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

@@ -26,5 +26,10 @@ public class Standardpoint extends Model {
 
     private String type;
 
+    /**
+     * 标签点代码（类型为计算点时必填）
+     */
+    private String point;
+
 
 }

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

@@ -388,6 +388,8 @@ public class BackConfigService {
         Page<Companys> page1 = companysService.page(page, queryWrapper);
         return page1;
     }
+
+    //计划电量树
     public List<Companys> wtls() {
 
         List<Companys> cpls = CacheContext.cpls;

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

@@ -180,7 +180,7 @@ public class PointGenerateService {
                         stationpoint.setCode(qugfsb.toString());
                         stationpoint.setName(c.getName() + p.getName());
                         stationpoint.setUniformcode(p.getUniformcode());
-                        stationpoint.setWindpowerstationid(r.getId());
+                        stationpoint.setWindpowerstationid(r.getId() + "_" + gf);
                         stationpoint.setRealtimeid("JSFW");
                         stationList.add(stationpoint);
 
@@ -208,6 +208,7 @@ public class PointGenerateService {
                     stationpoint.setCode(stationsb.toString() + "XX_XX_XXX_" + p.getUniformcode());
                     stationpoint.setName(station.getName() + p.getName());
                     stationpoint.setUniformcode(p.getUniformcode());
+                    stationpoint.setWindpowerstationid(station.getId());
                     stationpoint.setRealtimeid(substaion + (station.getId().endsWith("_FDC") ? "FCJSFW" : "GCJSFW"));
                     stationList.add(stationpoint);
 
@@ -230,6 +231,7 @@ public class PointGenerateService {
                         stationpoint.setCode(projectsb.toString()+"_XX_XXX_"+p.getUniformcode());
                         stationpoint.setName(project.getName() + p.getName());
                         stationpoint.setUniformcode(p.getUniformcode());
+                        stationpoint.setWindpowerstationid(project.getId());
                         stationpoint.setRealtimeid(substaion + (station.getId().endsWith("_FDC") ? "FCJSFW" : "GCJSFW"));
                         stationList.add(stationpoint);
 
@@ -252,6 +254,7 @@ public class PointGenerateService {
                             stationpoint.setCode(linesb.toString());
                             stationpoint.setName(l.getName() + p.getName());
                             stationpoint.setUniformcode(p.getUniformcode());
+                            stationpoint.setWindpowerstationid(l.getId());
                             stationpoint.setRealtimeid(substaion + (station.getId().endsWith("_FDC") ? "FCJSFW" : "GCJSFW"));
                             stationList.add(stationpoint);
 
@@ -310,7 +313,7 @@ public class PointGenerateService {
 
                 testing.setName(w.getName() + p.getName());
                 testing.setUniformcode(p.getUniformcode());
-                testing.setWindpowerstationid(w.getWindpowerstationid());
+                testing.setWindpowerstationid(w.getId());
                 testingList.add(testing);
             }
         }

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

@@ -27,6 +27,8 @@ public interface IStandardpointService extends IService<Standardpoint> {
 
     List<Standardpoint> list(String[] points);
 
+    String getPointCode(String type);
+
 
 
 

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

@@ -24,6 +24,6 @@ public interface IWindturbinetestingpointnewService extends IService<Windturbine
 
     boolean  removeByIds(String ids);
 
-    List<Windturbinetestingpointnew> list(String uniformcode, String windpowerstationid);
+    List<Windturbinetestingpointnew> list(String windpowerstationid , String uniformcode);
 
 }

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.awt.event.FocusEvent;
 import java.util.Arrays;
 import java.util.List;
 
@@ -82,5 +83,30 @@ public class StandardpointServiceImpl extends ServiceImpl<StandardpointMapper, S
         return list;
     }
 
+    @Override
+    public String getPointCode(String type) {
+
+        String code = "CI";
+
+        if (!type.endsWith("js")){
+            return "0000";
+        }
+        QueryWrapper<Standardpoint> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(type)){
+            qw.eq("type",type);
+        }
+        int count = baseMapper.selectCount(qw)+1;
+        if (count <= 0){
+            count = 1;
+        }
+
+        String strcount = String.valueOf(count);
+        for(int i=0;i<5-strcount.length();i++){
+
+            code = code+"0";
+        }
+        return code+strcount;
+    }
+
 
 }

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

@@ -84,7 +84,7 @@ public class WindpowerstationpointnewServiceImpl extends ServiceImpl<Windpowerst
         }
 
         if (StringUtils.isNotEmpty(windpowerstationid)){
-            qw.like("windpowerstationid",windpowerstationid);
+            qw.eq("windpowerstationid",windpowerstationid);
         }
 
         List<Windpowerstationpointnew> list = baseMapper.selectList(qw);

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

@@ -75,14 +75,14 @@ public class WindturbinetestingpointnewServiceImpl extends ServiceImpl<Windturbi
     }
 
     @Override
-    public List<Windturbinetestingpointnew> list(String uniformcode, String windpowerstationid) {
+    public List<Windturbinetestingpointnew> list(String windpowerstationid , String uniformcode) {
 
         QueryWrapper<Windturbinetestingpointnew> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(uniformcode)){
             qw.eq("uniformcode",uniformcode);
         }
         if (StringUtils.isNotEmpty(windpowerstationid)){
-            qw.like("windpowerstationid",windpowerstationid);
+            qw.eq("windpowerstationid",windpowerstationid);
         }
         List<Windturbinetestingpointnew> list = baseMapper.selectList(qw);
         return list;

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

@@ -43,7 +43,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://10.81.3.151:5432/wisdom
+    url: jdbc:postgresql://10.81.3.151:5432/postgres
     username: gdprod
     password: gd123
     oracle-schema=: