From 5242d687d4edcd6c0f7e10fb82b0e5505dbb3da3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 08:24:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-manage/src/main/java/com/moral/api/controller/CruiserController.java |   80 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 80 insertions(+), 0 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/controller/CruiserController.java b/screen-manage/src/main/java/com/moral/api/controller/CruiserController.java
new file mode 100644
index 0000000..651b23f
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/controller/CruiserController.java
@@ -0,0 +1,80 @@
+package com.moral.api.controller;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.moral.api.entity.ManageCoordinate;
+import com.moral.api.entity.SpecialDevice;
+import com.moral.api.pojo.dto.cruiser.CruiserDTO;
+import com.moral.api.service.HistorySecondCruiserService;
+import com.moral.api.service.ManageCoordinateService;
+import com.moral.constant.ResponseCodeEnum;
+import com.moral.constant.ResultMessage;
+import com.moral.util.WebUtils;
+
+@Slf4j
+@Api(tags = {"���������������������"})
+@RestController
+@RequestMapping("cruiserInfo")
+public class CruiserController {
+
+
+    @Autowired
+    private HistorySecondCruiserService historySecondCruiserService;
+
+
+
+
+    /**
+     *
+     * @return
+     */
+    @GetMapping("selectCruisers")
+    @ApiOperation(value = "���������������������")
+    public ResultMessage selectCruisers() {
+        List<SpecialDevice> specialDevices = historySecondCruiserService.selectCruisers();
+        if (ObjectUtils.isEmpty(specialDevices)){
+            return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(),
+                    ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+        }
+        return ResultMessage.ok(specialDevices);
+    }
+
+    @GetMapping("getCruiserInFo")
+    @ApiOperation(value = "���������������", notes = "���������������")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+            @ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time1", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "time2", value = "���������2021-08-18", required = true, paramType = "query", dataType = "String")
+    })
+    public ResultMessage getCruiserInFo(HttpServletRequest request){
+        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+        if (!params.containsKey("mac") || !params.containsKey("time1")|| !params.containsKey("time2")) {
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+        }
+        Map<String, Object> cruiserInFo = historySecondCruiserService.getCruiserInFo(params);
+
+        return ObjectUtils.isEmpty(cruiserInFo)? ResultMessage.ok() : ResultMessage.ok(cruiserInFo);
+    }
+
+
+
+
+}

--
Gitblit v1.8.0