|
@@ -24,7 +24,6 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.validation.Valid;
|
|
|
|
|
|
import static com.xy.utils.PlusBeans.toIPage;
|
|
@@ -47,11 +46,9 @@ public class DeviceOpenApiService {
|
|
|
@ApiOperation(value = "获取商户设备列表", notes = "获取商户设备列表")
|
|
|
@Open(value = "device.page.get", version = "1.0", permission = true)
|
|
|
@PostMapping("/device/page/get")
|
|
|
- public PageBean<DeviceOpenApiVO.DeviceList> devicePageGet(@RequestBody @Valid DeviceOpenApiDTO.DeviceListGet dto, HttpServletRequest request) {
|
|
|
+ public PageBean<DeviceOpenApiVO.DeviceList> devicePageGet(@RequestBody @Valid DeviceOpenApiDTO.DeviceListGet dto) {
|
|
|
OpenContext oct = ServiceContext.getCurrentContext().getOpenContext();
|
|
|
String appId = oct.getAppId();
|
|
|
- String appAuthToken = oct.getAppAuthToken();
|
|
|
- log.info("DeviceOpenApiService#devicePageGet appId={}, appAuthToken={}", appId, appAuthToken);
|
|
|
boolean b = R.feignCheckData(openPlatformConfigService.checkAuthByMercCode(new OpenPlatformConfigDto.CheckAuth().setAppId(appId).setMercCodes(dto.getMercCodes())));
|
|
|
if (!b) {
|
|
|
throw new ServiceException("您传入的商户编码中包含非法编码!");
|