Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhuxinyu
2023-04-25 09:49:55 +08:00
parent 7ba970bc56 d87d95eae4
commit 21cd4033d9
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/SubstationFeignClient.java
View File

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

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java
View File

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

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
View File

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