增加电站字段

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -29,5 +30,9 @@ public class JpPersonStationDto  extends BaseDto {
 
     @ApiModelProperty(value = "场站名称")
     private String stationName;
+    /**
+     * 业主名称
+     */
 
+    private String owner;
 }

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

@@ -120,4 +120,13 @@ public class JpStationDto  extends BaseDto {
     private String area;
 
     List<JpPersonStation> statioId;
+
+    //累计收益
+    private Double cumulativeIncome;
+
+
+    private Double dayPowerUse;	//	日用电量
+    private Double month_power_use;	//	月用电量
+    private Double yearPowerUse;	//	年用电量
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/JpPersonStation.java

@@ -40,4 +40,11 @@ public class JpPersonStation extends BaseEntity {
 	@TableField("station_name")
     private String stationName;
 
+    /**
+     * 业主名称
+     */
+    @TableField("owner")
+    private String owner;
+
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/JpStation.java

@@ -188,5 +188,23 @@ public class JpStation extends BaseEntity {
     //地区
     @TableField("area")
     private String area;
+    //累计收益
+    @TableField("cumulative_income")
+    private Double cumulativeIncome;
+
+
+
+    @TableField("day_power_use")
+    private Double dayPowerUse;	//	日用电量
+    @TableField("monthPowerUse")
+    private Double month_power_use;	//	月用电量
+    @TableField("yearPowerUse")
+    private Double yearPowerUse;	//	年用电量
+
+
+
+
+
+
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml

@@ -6,7 +6,7 @@
 
 
          select * from hygf_jp_station
-
+         <where>
         <if test="dto.name!=null">
             and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
         </if>
@@ -26,7 +26,7 @@
         <if test="dto.thirdStationId!=null">
             and hygf_jp_station.third_station_id =#{dto.thirdStationId}
         </if>
-
+         </where>
 
     </select>
 

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

@@ -11,7 +11,9 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
+
+import java.util.*;
+
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.JpStationServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -105,22 +107,46 @@ public class JpStationController extends BaseController {
     public ResponseModel<Page<JpStationDto>> queryForDealerReviewPage(@RequestParam(value = "current") int current, @RequestParam
             (value = "size") int size, JpStationDto reviewDto) {
 
-
-
-        if(reviewDto.getThirdStationId()==null){
+//        if(reviewDto.getThirdStationId()==null){
             //获取当前人管理场站
             LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
             qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
             List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
-        }
-
-
+            reviewDto.setStatioId(pPersonStation.isEmpty()?null:pPersonStation);
+//        }
         Page<JpStationDto> page=jpStationServiceImpl.queryForJpStationPage(current,size,reviewDto);
         return ResponseHelper.buildResponse(page);
     }
 
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/queryListcz")
+    @ApiOperation(httpMethod = "GET",value = "登陆人管理场站列表",  notes = "登陆人管理场站列表")
+    public ResponseModel<List<JpPersonStation>> queryList( ) {
+            //获取当前人管理场站
+            LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
+            qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
+            List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
+        return ResponseHelper.buildResponse(pPersonStation);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/queryUserListyz")
+    @ApiOperation(httpMethod = "GET",value = "登陆人管理场站业主列表",  notes = "登陆人管理场站业主列表")
+    public ResponseModel<Set<String>> queryUserList( ) {
+        //获取当前人管理场站
+        LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
+        qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
+        List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
+        Set data=new HashSet();
+       if(pPersonStation!=null&& !pPersonStation.isEmpty()){
+           for (JpPersonStation jpPersonStation : pPersonStation) {
+               data.add(jpPersonStation.getOwner());
+           }
+       }
+        return ResponseHelper.buildResponse(data);
+    }
 	/**
 	 * 列表全部数据查询
      *
@@ -132,4 +158,27 @@ public class JpStationController extends BaseController {
 	public ResponseModel<List<JpStationDto>> selectForList() {
 	    return ResponseHelper.buildResponse(jpStationServiceImpl.queryForJpStationList());
 	}
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "电站监控电量收益",   notes = "电站监控电量收益")
+    @GetMapping(value = "/getIncomePower")
+    public ResponseModel<List<JpStationDto>> getIncomePower() {
+	    //获取登陆人所管理电站
+        //获取当前人管理场站
+        LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
+        qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
+        List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
+
+
+
+
+
+        return ResponseHelper.buildResponse();
+    }
+
+
+
+
+
+
 }