|
@@ -72,10 +72,16 @@ public class InitialRunner implements CommandLineRunner {
|
|
private JunctionboxService junctionboxService;
|
|
private JunctionboxService junctionboxService;
|
|
@Resource
|
|
@Resource
|
|
private PhotovoltaicTestingPointNewService photovoltaicTestingPointNewService;
|
|
private PhotovoltaicTestingPointNewService photovoltaicTestingPointNewService;
|
|
|
|
+
|
|
|
|
+ @Resource
|
|
|
|
+ private CompanysService companysService;
|
|
private final String QS = "0";
|
|
private final String QS = "0";
|
|
private final String FD = "-1";
|
|
private final String FD = "-1";
|
|
private final String GF = "-2";
|
|
private final String GF = "-2";
|
|
|
|
|
|
|
|
+ public static List<Companys> cmls = new ArrayList<>();
|
|
|
|
+ public static Map<String, List<Windpowerstation>> cm_wpmap = new HashMap<String, List<Windpowerstation>>();
|
|
|
|
+
|
|
public static List<Windpowerstation> wpallls = new ArrayList<Windpowerstation>();
|
|
public static List<Windpowerstation> wpallls = new ArrayList<Windpowerstation>();
|
|
public static List<Project> pjallls = new ArrayList<Project>();
|
|
public static List<Project> pjallls = new ArrayList<Project>();
|
|
public static List<Line> lineallls = new ArrayList<Line>();
|
|
public static List<Line> lineallls = new ArrayList<Line>();
|
|
@@ -157,6 +163,9 @@ public class InitialRunner implements CommandLineRunner {
|
|
public void run(String... args) throws Exception {
|
|
public void run(String... args) throws Exception {
|
|
System.out.println(">>>>>>>>>>>>>>>服务启动执行,换成测点关联数据 <<<<<<<<<<<<<");
|
|
System.out.println(">>>>>>>>>>>>>>>服务启动执行,换成测点关联数据 <<<<<<<<<<<<<");
|
|
|
|
|
|
|
|
+
|
|
|
|
+ cmls=companysService.selectAll();
|
|
|
|
+
|
|
List<Square> sqqls=squareService.selectAll();
|
|
List<Square> sqqls=squareService.selectAll();
|
|
if(!sqqls.isEmpty())
|
|
if(!sqqls.isEmpty())
|
|
{
|
|
{
|
|
@@ -441,6 +450,18 @@ public class InitialRunner implements CommandLineRunner {
|
|
spls.add(wp);
|
|
spls.add(wp);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if(cm_wpmap.containsKey(wp.getCompanyid()))
|
|
|
|
+ {
|
|
|
|
+ List<Windpowerstation> ls=cm_wpmap.get(wp.getCompanyid());
|
|
|
|
+ ls.add(wp);
|
|
|
|
+ cm_wpmap.put(wp.getCompanyid(),ls);
|
|
|
|
+ }else {
|
|
|
|
+ List<Windpowerstation> ls=new ArrayList<>();
|
|
|
|
+ ls.add(wp);
|
|
|
|
+ cm_wpmap.put(wp.getCompanyid(),ls);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
if(re_wpmap.containsKey(wp.getCompanyid()+QS))
|
|
if(re_wpmap.containsKey(wp.getCompanyid()+QS))
|
|
{
|
|
{
|
|
List<Windpowerstation> ls=re_wpmap.get(wp.getCompanyid()+QS);
|
|
List<Windpowerstation> ls=re_wpmap.get(wp.getCompanyid()+QS);
|