补充提交

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/ProBasicEquipmentController.java

@@ -3,13 +3,12 @@ package com.gyee.runeconomy.controller;
 
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
-import com.gyee.runeconomy.model.auto.ProBasicEquipment;
+import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.service.auto.IProBasicEquipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -48,7 +47,7 @@ public class ProBasicEquipmentController {
             @RequestParam(value = "lineIds", required = false) String lineIds,
             @RequestParam(value = "type", required = false) String type) {
 
-        List<ProBasicEquipment> list = proBasicEquipmentService.getProBasicEquipmentList(companyId, windpowerstationIds, projectIds, lineIds, type);
+        List<ProBasicOrganizeTree> list = proBasicEquipmentService.getProBasicEquipmentList(companyId, windpowerstationIds, projectIds, lineIds, type);
 
         if (null != list) {
             return R.data(ResultMsg.ok(list));
@@ -69,7 +68,7 @@ public class ProBasicEquipmentController {
     public R getWtPowerCurveFittingList(
             @RequestParam(value = "wpid", required = false) String wpid) {
 
-        List<ProBasicEquipment> list = proBasicEquipmentService.getProBasicEquipmentList(wpid);
+        List<ProBasicOrganizeTree> list = proBasicEquipmentService.getProBasicEquipmentList(wpid);
 
         if (null != list) {
             return R.data(ResultMsg.ok(list));

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/bmk/BenchmarkingController.java

@@ -11,10 +11,7 @@ import com.gyee.common.vo.benchmark.FjjxbmxVo;
 import com.gyee.common.vo.benchmark.WxsslVo;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
-import com.gyee.runeconomy.model.auto.ProBasicCompany;
-import com.gyee.runeconomy.model.auto.ProBasicLine;
-import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
-import com.gyee.runeconomy.model.auto.ProBasicProject;
+import com.gyee.runeconomy.model.auto.*;
 import com.gyee.runeconomy.service.bmk.BenchmarkingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -38,7 +35,7 @@ public class BenchmarkingController {
     @GetMapping(value = "/companys")
     @ApiOperation(value = "公司列表", notes = "公司列表")
     public R companys()  {
-        List<ProBasicCompany> resultList = benchmarkingService.companys();
+        List<ProBasicOrganizeTree> resultList = benchmarkingService.companys();
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
         } else {
@@ -48,7 +45,7 @@ public class BenchmarkingController {
     @GetMapping(value = "/companysByRg")
     @ApiOperation(value = "根据区域查询公司列表", notes = "根据区域查询公司列表")
     public R companysByRg(@RequestParam(value = "regionid", required = true) String regionid)  {
-        List<ProBasicCompany> resultList = benchmarkingService.companys().stream().filter(i->i.getRegionId().equals(regionid)).collect(Collectors.toList());
+        List<ProBasicOrganizeTree> resultList = benchmarkingService.companys().stream().filter(i->i.getParentCode().equals(regionid)).collect(Collectors.toList());
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
         } else {
@@ -60,7 +57,7 @@ public class BenchmarkingController {
     public R wpByCplist(@RequestParam(value = "companyids", required = true) String companyids,
                         @RequestParam(value = "type", required = false) String type) {
 
-        List<ProBasicPowerstation> resultList = benchmarkingService.wpByCplist(companyids,type);
+        List<ProBasicOrganizeTree> resultList = benchmarkingService.wpByCplist(companyids,type);
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
         } else {
@@ -71,7 +68,7 @@ public class BenchmarkingController {
     @ApiOperation(value = "项目列表", notes = "项目列表")
     public R pjByWplist(@RequestParam(value = "wpids", required = true) String wpids)  {
 
-        List<ProBasicProject> resultList = benchmarkingService.pjByWplist(wpids);
+        List<ProBasicOrganizeTree> resultList = benchmarkingService.pjByWplist(wpids);
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
         } else {
@@ -83,7 +80,7 @@ public class BenchmarkingController {
     @ApiOperation(value = "线路列表", notes = "线路列表")
     public R lnByPjlist(@RequestParam(value = "pjids", required = true) String pjids)  {
 
-        List<ProBasicLine> resultList = benchmarkingService.lnByPjlist(pjids);
+        List<ProBasicOrganizeTree> resultList = benchmarkingService.lnByPjlist(pjids);
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
         } else {

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/update/TargetEnterController.java

@@ -6,7 +6,7 @@ package com.gyee.runeconomy.controller.update;/*
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
-import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
+import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
 import com.gyee.runeconomy.model.auto.ProBasicUser;
 import com.gyee.runeconomy.model.auto.ProEconTargetdata;
 import com.gyee.runeconomy.service.update.TargetEnterService;
@@ -85,7 +85,7 @@ public class TargetEnterController {
     @GetMapping(value = "/wpls")
     @ApiOperation(value = "查场站", notes = "查场站")
     public R wpls(@RequestParam(value = "wpid", required = true) String wpid) {
-        List<ProBasicPowerstation> resultList  = targetEnterService.wpls(wpid);
+        List<ProBasicOrganizeTree> resultList  = targetEnterService.wpls(wpid);
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
         } else {