增小程序监盘条件

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpInverterDto.java

@@ -96,4 +96,7 @@ public class JpInverterDto  extends BaseDto {
     private String stationName;
 
     private List<String> stationIds;
+
+    @ApiModelProperty(value = "所属电站名称")
+    private String name;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpInverterWarnDto.java

@@ -78,5 +78,5 @@ public class TdHygfJpInverterWarnDto {
 	private List<String> stationIds;
 	
 	private List<String> states;
-
+    private String name;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpInverterController.java

@@ -115,10 +115,19 @@ public class JpInverterController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器表分页查询", notes = "户用光伏监盘逆变器表分页查询")
 	public ResponseModel<Page<JpInverterDto>> queryForPage(@RequestParam(value = "current") int current,
 			@RequestParam(value = "size") int size, JpInverterDto jpInverterDto) {
-		
-		LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
-		qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
-		List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug);
+
+        List<JpPersonStation> pPersonStation =null;
+        if(jpInverterDto.getName()!=null){
+            LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
+            qug1.like(JpPersonStation::getStationName,jpInverterDto.getName());
+            pPersonStation=pPersonStationMapper.selectList(qug1);
+
+        }else{
+            LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+            qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+             pPersonStation = pPersonStationMapper.selectList(qug);
+        }
+
 		if (!pPersonStation.isEmpty()) {
 			Page<JpInverterDto> page = new Page<JpInverterDto>();
 			page.setCurrent(current);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -148,11 +148,19 @@ public class JpStationController extends BaseController {
     @ApiOperation(httpMethod = "GET",value = "场站列表",  notes = "场站列表")
     public ResponseModel< Map<String,Object> > countState(JpStationDto reviewDto) {
 
+        Set<String> se=new HashSet<>();
+        List<JpPersonStation> pPersonStation=null;
+        if(reviewDto.getName()!=null){
+            LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
+            qug1.like(JpPersonStation::getStationName,reviewDto.getName());
+             pPersonStation=pPersonStationMapper.selectList(qug1);
+        }else{
             //获取当前人管理场站
             LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
             qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
-            List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
-            reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
+             pPersonStation=pPersonStationMapper.selectList(qug);
+        }
+        reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
         List<Map<String,Object>> list= jpStationMapper.countState(reviewDto);
         Map<String,Object>  collector =new HashMap<>();
         collector.put("zx",0);
@@ -177,10 +185,19 @@ public class JpStationController extends BaseController {
     @ApiOperation(httpMethod = "GET",value = "设备监控",  notes = "设备监控")
     public ResponseModel<Map<String,Object>> getpStation(JpStationDto reviewDto) {
 
-        //获取当前人管理场站
-        LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
-        qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
-        List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
+        List<JpPersonStation> pPersonStation=null;
+        if(reviewDto.getName()!=null){
+            LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
+            qug1.like(JpPersonStation::getStationName,reviewDto.getName());
+            pPersonStation=pPersonStationMapper.selectList(qug1);
+        }else{
+            //获取当前人管理场站
+            LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
+            qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
+            pPersonStation=pPersonStationMapper.selectList(qug);
+        }
+
+
 
         if(pPersonStation!=null&&!pPersonStation.isEmpty()){
             reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java

@@ -133,9 +133,20 @@ public class TdHygfJpInverterWarnController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器报警表分页查询", notes = "户用光伏监盘逆变器报警表分页查询")
 	public ResponseModel<Page<TdHygfJpInverterWarnDto>> queryForPage(@RequestParam(value = "current") int current,
 			@RequestParam(value = "size") int size, TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto) {
-		LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
-		qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
-		List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug);
+        List<JpPersonStation> pPersonStation =null;
+        if(tdHygfJpInverterWarnDto.getName()!=null){
+            LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
+            qug1.like(JpPersonStation::getStationName,tdHygfJpInverterWarnDto.getName());
+            pPersonStation=pPersonStationMapper.selectList(qug1);
+        }else{
+            LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+            qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+             pPersonStation = pPersonStationMapper.selectList(qug);
+
+
+        }
+
+
 
 		if (!pPersonStation.isEmpty()) {
 			Page<TdHygfJpInverterWarnDto> page = new Page<TdHygfJpInverterWarnDto>();
@@ -171,6 +182,12 @@ public class TdHygfJpInverterWarnController extends BaseController {
     @GetMapping(value = "/selectcount")
     public ResponseModel<  Map<String,Object>  > selectcount(JpStationDto reviewDto) {
         LambdaQueryWrapper<JpStation> qugda=new LambdaQueryWrapper<>();
+
+
+
+
+
+
         //获取当前人管理场站
         if(reviewDto.getThirdStationId()==null){
             //获取当前人管理场站
@@ -194,7 +211,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
         }else{
             qugda.eq(JpStation::getThirdStationId,reviewDto.getThirdStationId());
         }
-        qugda.like(reviewDto.getUserName()!=null,JpStation::getUserName,reviewDto.getUserName());
+        qugda.like(reviewDto.getName()!=null,JpStation::getName,reviewDto.getName());
         qugda.like(reviewDto.getArea()!=null,JpStation::getArea,reviewDto.getArea());
         List<JpStation> pPersonStation=jpStationMapper.selectList(qugda);
         List<Map<String,Object>>   datalist=    tdHygfJpInverterWarnMapper.getCountTdHygfJpInverterWarn(pPersonStation!=null&&!pPersonStation.isEmpty()?pPersonStation:null);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpCollectorServiceImpl.java

@@ -42,6 +42,11 @@ public class JpCollectorServiceImpl extends BaseService<JpCollectorDto, JpCollec
 		if (!jpCollectorDto.getStationIds().isEmpty()) {
 			wrapper.in(JpCollector::getThirdStationId, jpCollectorDto.getStationIds());
 		}
+
+        if (!jpCollectorDto.getSnCode().isEmpty()) {
+            wrapper.like(JpCollector::getSnCode, jpCollectorDto.getSnCode());
+        }
+
 		entiryPage = (Page<JpCollector>) this.page(entiryPage, wrapper);
 		if (!ValidationUtil.isEmpty(entiryPage.getRecords())) {
 			page.setTotal(entiryPage.getTotal());