矩阵功能修改

src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -2,6 +2,7 @@ package com.gyee.frame.common.spring;
 
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.service.*;
+import com.gyee.frame.util.StringUtils;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
@@ -94,6 +95,10 @@ public class InitialRunner implements CommandLineRunner {
         wtls= windturbineService.selectByExample(windturbineExample);
 
 
+
+
+
+
         if(wtls!=null && !wtls.isEmpty()){
 
             for(int i=0;i<wtls.size();i++){
@@ -134,6 +139,27 @@ public class InitialRunner implements CommandLineRunner {
 //                }
 
             }
+
+
+            List<Windturbine> ls=wp_wtmap.get("SBQ_FDC");
+            List<Windturbine> temp1=new ArrayList<>();
+            List<Windturbine> temp2=new ArrayList<>();
+            for(Windturbine wt:ls)
+            {
+                String str=wt.getId().substring(wt.getId().length()-3,wt.getId().length());
+                if(StringUtils.isNumeric(str))
+                {
+                    temp2.add(wt);
+                }else
+                {
+                    temp1.add(wt);
+                }
+            }
+
+            ls.clear();
+            ls.addAll(temp1);
+            ls.addAll(temp2);
+            wp_wtmap.put("SBQ_FDC",ls);
         }
 
 

src/main/java/com/gyee/frame/service/ProjectplanService.java

@@ -175,7 +175,7 @@ public class ProjectplanService implements BaseService<Projectplan, ProjectplanE
 
         if(name.equals("0"))
         {
-            example.createCriteria().andWindpowerNotLike("%_GDC").andYearEqualTo(String.valueOf(year)).andMonthIsNull();
+            example.createCriteria().andWindpowerNotLike("%MCH_GDC").andYearEqualTo(String.valueOf(year)).andMonthIsNull();
 
         }else
         {

src/main/java/com/gyee/frame/service/monitor/MonitorService.java

@@ -109,6 +109,8 @@ public class MonitorService extends SocketToolService {
 
                     if (InitialRunner.wp_wtmap.containsKey(keyid)) {
                         List<Windturbine> ls = InitialRunner.wp_wtmap.get(keyid);
+
+
                         if (null != ls && !ls.isEmpty()) {
 
                             setMatrixValue(wtpAimap, vos, ls);

src/main/resources/application-dev.yml

@@ -20,7 +20,7 @@ spring:
         driver-class-name: com.mysql.jdbc.Driver
      #两票数据源
      ticket:
-        url: jdbc:sqlserver://10.155.32.2:1433;DatabaseName=test
+        url: jdbc:sqlserver://10.155.32.2:1433;DatabaseName=fdeam
         username: sa
         password: Gyee@321#!
         driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver