Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhuxinyu
2023-04-25 09:49:55 +08:00
3 changed files with 4 additions and 3 deletions

View File

@@ -6,6 +6,7 @@ import com.njcn.device.pq.api.fallback.SubstationFeignClientFallbackFactory;
import com.njcn.device.pq.pojo.dto.SubstationDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -26,5 +27,5 @@ public interface SubstationFeignClient {
* @return 变电站信息
*/
@PostMapping("getSubstationById")
HttpResult<List<SubstationDTO>> getSubstationById(@RequestParam("subId") List<String> subId);
HttpResult<List<SubstationDTO>> getSubstationById(@RequestBody List<String> subId);
}

View File

@@ -31,7 +31,7 @@ public interface TerminalBaseClient {
* @date 2022/2/21 18:53
*/
@PostMapping("/getSubstationById")
HttpResult<List<Line>> getSubstationById(@RequestParam("list") List<String> list);
HttpResult<List<Line>> getSubstationById(@RequestBody List<String> list);

View File

@@ -209,7 +209,7 @@ public class TerminalBaseController extends BaseController {
@OperateInfo
@PostMapping("/getSubstationById")
@ApiIgnore
public HttpResult<List<Line>> getSubstationById(@RequestParam("list") List<String> list) {
public HttpResult<List<Line>> getSubstationById(@RequestBody List<String> list) {
String methodDescribe = getMethodDescribe("getSubstationById");
LogUtil.njcnDebug(log, "{},变电站集合为:{}", methodDescribe, list);
List<Line> subList = terminalBaseService.getSubstationById(list);