解决冲突

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import java.util.Date;
+import java.util.List;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
 
 /**
  * 户用光伏监盘采集器表
@@ -68,4 +71,6 @@ public class JpCollectorDto  extends BaseDto {
 
     @ApiModelProperty(value = "电站地址")
     private String addr;
+    
+    private List<String> stationIds;
 }

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 户用光伏监盘逆变器表
@@ -94,4 +95,5 @@ public class JpInverterDto  extends BaseDto {
     @ApiModelProperty(value = "所属电站")
     private String stationName;
 
+    private List<String> stationIds;
 }

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.JpCollectorMapper">
-    <select id="queryCollectorCountStatus"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
+    <select id="queryCollectorCountStatus"  resultType="Map">
 
 
         select

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.JpInverterMapper">
-    <select id="queryInverterCountStatus"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
+    <select id="queryInverterCountStatus"  resultType="Map">
 
 
         select

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

@@ -6,14 +6,22 @@ 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.stream.Collectors;
+
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.JpCollectorServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpPersonStation;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.JpPersonStationMapper;
+
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
@@ -28,89 +36,103 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 @RequestMapping(value = "/jp-collector")
 public class JpCollectorController extends BaseController {
 
-    @Autowired
-    JpCollectorServiceImpl jpCollectorServiceImpl;
+	@Autowired
+	JpCollectorServiceImpl jpCollectorServiceImpl;
 
-    /**
-     * 新增户用光伏监盘采集器表
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@Autowired
+	JpPersonStationMapper pPersonStationMapper;
+
+	/**
+	 * 新增户用光伏监盘采集器表
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增户用光伏监盘采集器表", notes = "新增户用光伏监盘采集器表")
 	public ResponseModel<JpCollectorDto> save(@RequestBody JpCollectorDto model) {
-	    model = jpCollectorServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
+		model = jpCollectorServiceImpl.createWithModel(model);
+		return ResponseHelper.buildResponse(model);
 	}
 
 	/**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
+	 * 根据sequenceNbr更新
+	 *
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新户用光伏监盘采集器表", notes = "根据sequenceNbr更新户用光伏监盘采集器表")
-	public ResponseModel<JpCollectorDto> updateBySequenceNbrJpCollector(@RequestBody JpCollectorDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(jpCollectorServiceImpl.updateWithModel(model));
+	public ResponseModel<JpCollectorDto> updateBySequenceNbrJpCollector(@RequestBody JpCollectorDto model,
+			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+		model.setSequenceNbr(sequenceNbr);
+		return ResponseHelper.buildResponse(jpCollectorServiceImpl.updateWithModel(model));
 	}
 
 	/**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除户用光伏监盘采集器表", notes = "根据sequenceNbr删除户用光伏监盘采集器表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(jpCollectorServiceImpl.removeById(sequenceNbr));
-    }
+	 * 根据sequenceNbr删除
+	 *
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@DeleteMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除户用光伏监盘采集器表", notes = "根据sequenceNbr删除户用光伏监盘采集器表")
+	public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
+			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+		return ResponseHelper.buildResponse(jpCollectorServiceImpl.removeById(sequenceNbr));
+	}
 
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
+	/**
+	 * 根据sequenceNbr查询
+	 *
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个户用光伏监盘采集器表",  notes = "根据sequenceNbr查询单个户用光伏监盘采集器表")
+	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏监盘采集器表", notes = "根据sequenceNbr查询单个户用光伏监盘采集器表")
 	public ResponseModel<JpCollectorDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(jpCollectorServiceImpl.queryBySeq(sequenceNbr));
+		return ResponseHelper.buildResponse(jpCollectorServiceImpl.queryBySeq(sequenceNbr));
 	}
 
 	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
+	 * 列表分页查询
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "户用光伏监盘采集器表分页查询",  notes = "户用光伏监盘采集器表分页查询")
-	public ResponseModel<Page<JpCollectorDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size,JpCollectorDto jpCollectorDto) {
-	    Page<JpCollectorDto> page = new Page<JpCollectorDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(jpCollectorServiceImpl.queryForJpCollectorPage(page,jpCollectorDto));
+	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘采集器表分页查询", notes = "户用光伏监盘采集器表分页查询")
+	public ResponseModel<Page<JpCollectorDto>> queryForPage(@RequestParam(value = "current") int current,
+			@RequestParam(value = "size") int size, JpCollectorDto jpCollectorDto) {
+		LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+		qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+		List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug);
+		if (!pPersonStation.isEmpty()) {
+			Page<JpCollectorDto> page = new Page<JpCollectorDto>();
+			page.setCurrent(current);
+			page.setSize(size);
+			List<String> ids = pPersonStation.stream().map(i -> i.getStationId()).collect(Collectors.toList());
+			jpCollectorDto.setStationIds(ids);
+			return ResponseHelper.buildResponse(jpCollectorServiceImpl.queryForJpCollectorPage(page, jpCollectorDto));
+		} else {
+			return ResponseHelper.buildResponse(new Page<JpCollectorDto>());
+		}
 	}
 
 	/**
 	 * 列表全部数据查询
-     *
+	 *
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "户用光伏监盘采集器表列表全部数据查询",   notes = "户用光伏监盘采集器表列表全部数据查询")
+	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘采集器表列表全部数据查询", notes = "户用光伏监盘采集器表列表全部数据查询")
 	@GetMapping(value = "/list")
 	public ResponseModel<List<JpCollectorDto>> selectForList() {
-	    return ResponseHelper.buildResponse(jpCollectorServiceImpl.queryForJpCollectorList());
+		return ResponseHelper.buildResponse(jpCollectorServiceImpl.queryForJpCollectorList());
 	}
 }

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

@@ -6,14 +6,22 @@ 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.stream.Collectors;
+
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.JpInverterServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.JpCollectorDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpPersonStation;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.JpPersonStationMapper;
+
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
@@ -30,6 +38,10 @@ public class JpInverterController extends BaseController {
 
 	@Autowired
 	JpInverterServiceImpl jpInverterServiceImpl;
+	
+	@Autowired
+	JpPersonStationMapper pPersonStationMapper;
+
 
 	/**
 	 * 新增户用光伏监盘逆变器表
@@ -98,10 +110,20 @@ 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) {
-		Page<JpInverterDto> page = new Page<JpInverterDto>();
-		page.setCurrent(current);
-		page.setSize(size);
-		return ResponseHelper.buildResponse(jpInverterServiceImpl.queryForJpInverterPage(page, jpInverterDto));
+		
+		LambdaQueryWrapper<JpPersonStation> qug = new LambdaQueryWrapper<>();
+		qug.eq(JpPersonStation::getPersonId, getUserInfo().getUserId());
+		List<JpPersonStation> pPersonStation = pPersonStationMapper.selectList(qug);
+		if (!pPersonStation.isEmpty()) {
+			Page<JpInverterDto> page = new Page<JpInverterDto>();
+			page.setCurrent(current);
+			page.setSize(size);
+			List<String> ids = pPersonStation.stream().map(i -> i.getStationId()).collect(Collectors.toList());
+			jpInverterDto.setStationIds(ids);
+			return ResponseHelper.buildResponse(jpInverterServiceImpl.queryForJpInverterPage(page, jpInverterDto));
+		} else {
+			return ResponseHelper.buildResponse(new Page<JpInverterDto>());
+		}
 	}
 
 	/**

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

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

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterElectricityDto;
 
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -24,6 +25,13 @@ import java.util.List;
 public class JpInverterElectricityServiceImpl
 		extends BaseService<JpInverterElectricityDto, JpInverterElectricity, JpInverterElectricityMapper>
 		implements IJpInverterElectricityService {
+	
+	@Autowired
+	private JpStationServiceImpl jpStationServiceImpl;
+	
+	@Autowired
+	private JpInverterServiceImpl JpInverterServiceImpl;
+	
 	/**
 	 * 分页查询
 	 */
@@ -35,8 +43,10 @@ public class JpInverterElectricityServiceImpl
 	 * 列表查询 示例
 	 */
 	public List<JpInverterElectricityDto> queryForJpInverterElectricityList(String id) {
+		JpInverter jpInverter = JpInverterServiceImpl.getById(id);
 		LambdaQueryWrapper<JpInverterElectricity> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(JpInverterElectricity::getInverterId, id);
+		wrapper.eq(JpInverterElectricity::getSnCode, jpInverter.getSnCode());
+		wrapper.eq(JpInverterElectricity::getThirdStationId, jpInverter.getThirdStationId());
 		List<JpInverterElectricity> list = this.list(wrapper);
 		return Bean.toModels(list, this.getModelClass());
 	}

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

@@ -11,6 +11,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpCollector;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpInverter;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.JpInverterMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IJpInverterService;
@@ -36,6 +37,9 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
 		if(StringUtils.isNotEmpty(jpInverterDto.getSnCode())) {
 			wrapper.likeRight(JpInverter::getSnCode, jpInverterDto.getSnCode());
 		}
+		if (!jpInverterDto.getStationIds().isEmpty()) {
+			wrapper.in(JpInverter::getThirdStationId, jpInverterDto.getStationIds());
+		}
 		wrapper.orderByDesc(JpInverter::getUpdateTime);
 		entiryPage = (Page<JpInverter>) this.page(entiryPage, wrapper);
 		if (!ValidationUtil.isEmpty(entiryPage.getRecords())) {