|
|
@@ -1,9 +1,6 @@
|
|
|
package com.zksy.screen.controller;
|
|
|
|
|
|
-import cn.hutool.core.util.BooleanUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
-import cn.hutool.json.JSONConfig;
|
|
|
-import cn.hutool.json.JSONUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
|
import com.fasterxml.jackson.databind.JsonNode;
|
|
|
@@ -11,8 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
import com.zksy.common.core.domain.Result;
|
|
|
import com.zksy.screen.domain.po.ScreenControl;
|
|
|
-import com.zksy.screen.domain.request.InvokeBuild;
|
|
|
-import com.zksy.screen.domain.request.TopWebPage;
|
|
|
+import com.zksy.screen.domain.request.TopWebPageRequest;
|
|
|
import com.zksy.screen.service.ScreenControlService;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
@@ -31,9 +27,9 @@ import java.util.Optional;
|
|
|
|
|
|
@RestController
|
|
|
@Api(tags = "灯杆大屏", description = "灯杆大屏")
|
|
|
-@RequestMapping("/test")
|
|
|
+@RequestMapping("/screenLamp")
|
|
|
@Slf4j
|
|
|
-public class TestController {
|
|
|
+public class ScreenLampController {
|
|
|
@Autowired
|
|
|
private OkHttpClient httpClient;
|
|
|
private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
|
|
|
@@ -97,7 +93,7 @@ public class TestController {
|
|
|
@ApiOperation(value = "加载顶层网页")
|
|
|
@PostMapping("/getTopWebPage")
|
|
|
public Result getTopWebPage(
|
|
|
- TopWebPage request,
|
|
|
+ TopWebPageRequest request,
|
|
|
@ApiParam(value = "设备编码", required = true) @RequestParam(value = "deviceCode", defaultValue = "") String deviceCode) {
|
|
|
if(StrUtil.isBlank(request.getUrl())){
|
|
|
return Result.error("url不能为空");
|