|
@@ -4,6 +4,7 @@ package com.gyee.backconfig.service;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.gyee.backconfig.common.requst.vo.ProjectPlanQueryVo;
|
|
import com.gyee.backconfig.common.requst.vo.ProjectPlanQueryVo;
|
|
|
|
+import com.gyee.backconfig.config.CacheContext;
|
|
import com.gyee.backconfig.model.auto.*;
|
|
import com.gyee.backconfig.model.auto.*;
|
|
import com.gyee.backconfig.service.auto.*;
|
|
import com.gyee.backconfig.service.auto.*;
|
|
import com.gyee.backconfig.vo.Companysvo;
|
|
import com.gyee.backconfig.vo.Companysvo;
|
|
@@ -14,9 +15,10 @@ import com.gyee.common.model.StringUtils;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
-import java.util.Currency;
|
|
|
|
-import java.util.Date;
|
|
|
|
-import java.util.List;
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
+
|
|
|
|
+import static com.gyee.backconfig.config.CacheContext.wpls;
|
|
|
|
|
|
/**
|
|
/**
|
|
* @author 50560
|
|
* @author 50560
|
|
@@ -41,6 +43,7 @@ public class BackConfigService {
|
|
* @param
|
|
* @param
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ //返回所有
|
|
public List<XrpProjectplan> backConfigList() {
|
|
public List<XrpProjectplan> backConfigList() {
|
|
List<XrpProjectplan> xrpProjectplanList = xrpProjectplanService.list();
|
|
List<XrpProjectplan> xrpProjectplanList = xrpProjectplanService.list();
|
|
|
|
|
|
@@ -69,7 +72,7 @@ public class BackConfigService {
|
|
|
|
|
|
//增加
|
|
//增加
|
|
|
|
|
|
- //分页查询
|
|
|
|
|
|
+ //XrpProjectplan分页查询
|
|
|
|
|
|
public Page<XrpProjectplan> listBypage(ProjectPlanQueryVo vo) {
|
|
public Page<XrpProjectplan> listBypage(ProjectPlanQueryVo vo) {
|
|
Page<XrpProjectplan> page = new Page<XrpProjectplan>(vo.getCurrent(), vo.getPageSize());
|
|
Page<XrpProjectplan> page = new Page<XrpProjectplan>(vo.getCurrent(), vo.getPageSize());
|
|
@@ -386,4 +389,86 @@ public class BackConfigService {
|
|
Page<Companys> page1 = companysService.page(page, queryWrapper);
|
|
Page<Companys> page1 = companysService.page(page, queryWrapper);
|
|
return page1;
|
|
return page1;
|
|
}
|
|
}
|
|
|
|
+ public List<Companys> wtls() {
|
|
|
|
+
|
|
|
|
+ List<Companys> cpls = CacheContext.cpls;
|
|
|
|
+
|
|
|
|
+ if(cpls.get(0).getChildren().size()>0) return cpls;
|
|
|
|
+
|
|
|
|
+ List<Windpowerstation> wpls = CacheContext.wpls;
|
|
|
|
+ List<Project> prols= CacheContext.prols;
|
|
|
|
+
|
|
|
|
+ cpls.forEach(cpl -> {
|
|
|
|
+ List<Windpowerstation> collect = wpls.stream().filter(w -> w.getCompanyid().equals(cpl.getId())).collect(Collectors.toList());
|
|
|
|
+ cpl.getChildren().addAll(collect);
|
|
|
|
+ });
|
|
|
|
+
|
|
|
|
+ wpls.forEach(wpl -> {
|
|
|
|
+ List<Project> projects = prols.stream().filter(l -> l.getWindpowerstationid().equals(wpl.getId())).collect(Collectors.toList());
|
|
|
|
+ wpl.getChildren().addAll(projects);
|
|
|
|
+ });
|
|
|
|
+// prols.forEach(wp->{
|
|
|
|
+// wpls.stream().filter(pr ->pr.getId().equals(wp.getWindpowerstationid())).collect(Collectors.toList());
|
|
|
|
+//// Companys.get(0).getData2().add(wp);
|
|
|
|
+// });
|
|
|
|
+// //返回结果为期次在上面,场站在下面
|
|
|
|
+//// prols.stream().forEach(cp->{
|
|
|
|
+//// Windpowerstationvo vo = new Windpowerstationvo();
|
|
|
|
+//// vo.setId(cp.getId());
|
|
|
|
+//// vo.setCode(cp.getName());
|
|
|
|
+////
|
|
|
|
+//// List<Windpowerstation> wt = wpls.stream().filter(wt1 ->wt1.getId().equals(cp.getWindpowerstationid())).collect(Collectors.toList());
|
|
|
|
+//// vo.setData(wt);
|
|
|
|
+//// wtlist.add(vo);
|
|
|
|
+//// });
|
|
|
|
+// //返回结果为场站在上面,期次在下面,但是公司表setdata需要为vo
|
|
|
|
+// wpls.forEach(wp->{
|
|
|
|
+// //Projectvo vo = new Projectvo();
|
|
|
|
+// /*Windpowerstationvo vo = new Windpowerstationvo();
|
|
|
|
+// vo.setId(wp.getId());
|
|
|
|
+// List<Projectvo> Project = prols.stream().filter(wt -> wt.getWindpowerstationid().equals(wp.getId())).collect(Collectors.toList());
|
|
|
|
+// vo.setData(Project);
|
|
|
|
+//
|
|
|
|
+// vo.setId(wp.getId());
|
|
|
|
+// vo.setCode(wp.getName());
|
|
|
|
+// List<Project> Project = prols.stream().filter(wt -> wt.getWindpowerstationid().equals(wp.getId())).collect(Collectors.toList());
|
|
|
|
+// vo.setData(Project);
|
|
|
|
+// volist.add(vo);*/
|
|
|
|
+// cpls.stream().filter(ct ->ct.getId().equals(wp.getCompanyid())).collect(Collectors.toList());
|
|
|
|
+// Companysvo vo = new Companysvo();
|
|
|
|
+// vo.setId(Companys.get(0).getId());
|
|
|
|
+// vo.setName(Companys.get(0).getName());
|
|
|
|
+// vo.setRid(Companys.get(0).getRid());
|
|
|
|
+// vo.getData1().add(wp);
|
|
|
|
+// colist.add(vo);
|
|
|
|
+// });
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+// cpls.stream().forEach(cpl->{
|
|
|
|
+// Projectvo vo = new Projectvo();
|
|
|
|
+// vo.setWindpowerstationid(cpl.getId());
|
|
|
|
+//
|
|
|
|
+// List<Projectvo> cc = volist.stream().filter((wt2 ->wt2.getWindpowerstationid().equals(cpl.getId()))).collect(Collectors.toList());
|
|
|
|
+// vo.setData(cc);
|
|
|
|
+// volist.add(vo);
|
|
|
|
+// });
|
|
|
|
+//
|
|
|
|
+// volist.stream().forEach(vol->{
|
|
|
|
+// Companysvo vo = new Companysvo();
|
|
|
|
+// vo.setId(vol.get());
|
|
|
|
+// List<Companys> Companys = cpls.stream().filter(ct ->ct.getId().equals(vol.getWindpowerstationid())).collect(Collectors.toList());
|
|
|
|
+// vo.setData(Companys);
|
|
|
|
+// colist.add(vo);
|
|
|
|
+// });
|
|
|
|
+//
|
|
|
|
+// cpls.stream().forEach(wp->{
|
|
|
|
+// Companysvo vo = new Companysvo();
|
|
|
|
+//
|
|
|
|
+//// vo.setId(wp.getCompanyid());
|
|
|
|
+// List<Windpowerstationvo> Companys = wtlist.stream().filter(wt -> wt.getCompanyid().equals(wp.getId())).collect(Collectors.toList());
|
|
|
|
+// vo.setData(Companys);
|
|
|
|
+// colist.add(vo);
|
|
|
|
+// });
|
|
|
|
+ return cpls;
|
|
|
|
+ }
|
|
}
|
|
}
|