Skip to content

A
amos-boot-zx-biz
Commit bed542c8 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

修改光伏权重

parent c34fc921
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvWeightController.java
View file @ bed542c8
...@@ -211,11 +211,11 @@ public class IdxBizPvWeightController extends BaseController { ...@@ -211,11 +211,11 @@ public class IdxBizPvWeightController extends BaseController {
break; break;
case "3": case "3":
flagtype = idxBizFanWeight.getArae() + idxBizFanWeight.getStation()+ idxBizFanWeight.getSubarray(); flagtype = idxBizFanWeight.getArae() + idxBizFanWeight.getStation() ;
break; break;
case "4": case "4":
flagtype = idxBizFanWeight.getArae() + idxBizFanWeight.getStation() ; flagtype = idxBizFanWeight.getArae() + idxBizFanWeight.getStation()+ idxBizFanWeight.getSubarray();
break; break;
case "5": case "5":
...@@ -235,12 +235,12 @@ public class IdxBizPvWeightController extends BaseController { ...@@ -235,12 +235,12 @@ public class IdxBizPvWeightController extends BaseController {
} }
break; break;
case "3": case "3":
if (!flagtype.equals(idxBizFanWeight.getArae() + idxBizFanWeight.getStation()+ idxBizFanWeight.getSubarray())) { if (!flagtype.equals(idxBizFanWeight.getArae() + idxBizFanWeight.getStation() )) {
throw new BadRequest( "配置权重必须是同一个层级的数据"); throw new BadRequest( "配置权重必须是同一个层级的数据");
} }
break; break;
case "4": case "4":
if (!flagtype.equals(idxBizFanWeight.getArae() + idxBizFanWeight.getStation() )) { if (!flagtype.equals(idxBizFanWeight.getArae() + idxBizFanWeight.getStation()+ idxBizFanWeight.getSubarray())) {
throw new BadRequest( "配置权重必须是同一个层级的数据"); throw new BadRequest( "配置权重必须是同一个层级的数据");
} }
break; break;
...@@ -270,13 +270,13 @@ public class IdxBizPvWeightController extends BaseController { ...@@ -270,13 +270,13 @@ public class IdxBizPvWeightController extends BaseController {
qu.eq(!StringUtils.isEmpty(reviewDto.getType()), IdxBizPvWeight::getType, reviewDto.getType()); qu.eq(!StringUtils.isEmpty(reviewDto.getType()), IdxBizPvWeight::getType, reviewDto.getType());
qu.eq(!StringUtils.isEmpty(reviewDto.getArae()), IdxBizPvWeight::getArae, reviewDto.getArae()); qu.eq(!StringUtils.isEmpty(reviewDto.getArae()), IdxBizPvWeight::getArae, reviewDto.getArae());
qu.eq(!StringUtils.isEmpty(reviewDto.getStation()), IdxBizPvWeight::getStation, reviewDto.getStation()); qu.eq(!StringUtils.isEmpty(reviewDto.getStation()), IdxBizPvWeight::getStation, reviewDto.getStation());
qu.eq(!StringUtils.isEmpty(reviewDto.getSubarray()), IdxBizPvWeight::getSubarray, reviewDto.getSubarray());
break; break;
case "4": case "4":
qu.eq(!StringUtils.isEmpty(reviewDto.getType()), IdxBizPvWeight::getType, reviewDto.getType()); qu.eq(!StringUtils.isEmpty(reviewDto.getType()), IdxBizPvWeight::getType, reviewDto.getType());
qu.eq(!StringUtils.isEmpty(reviewDto.getArae()), IdxBizPvWeight::getArae, reviewDto.getArae()); qu.eq(!StringUtils.isEmpty(reviewDto.getArae()), IdxBizPvWeight::getArae, reviewDto.getArae());
qu.eq(!StringUtils.isEmpty(reviewDto.getStation()), IdxBizPvWeight::getStation, reviewDto.getStation()); qu.eq(!StringUtils.isEmpty(reviewDto.getStation()), IdxBizPvWeight::getStation, reviewDto.getStation());
qu.eq(!StringUtils.isEmpty(reviewDto.getSubarray()), IdxBizPvWeight::getSubarray, reviewDto.getSubarray());
break; break;
case "5": case "5":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment