添加接口

songhua-admin/src/main/java/com/songhua/web/controller/ship/CruiseShipMappingController.java

@@ -1,7 +1,14 @@
 package com.songhua.web.controller.ship;
 
-import java.util.List;
+import java.time.Instant;
+import java.util.*;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.songhua.system.domain.GPSEquipment;
+import com.songhua.system.domain.dto.ShipSaveDTO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -96,4 +103,11 @@ public class CruiseShipMappingController extends BaseController
         return success(cruiseShipMappingService.getGpsByDid(did));
     }
 
+
+    @PostMapping("/remote/saveCruiseShipMapping")
+    public AjaxResult saveCruiseShipMapping(@RequestBody JSONObject json) {
+        List<ShipSaveDTO> saveList = JSON.parseArray(json.getString("list"), ShipSaveDTO.class);
+        return toAjax(cruiseShipMappingService.saveCruiseShipMapping(saveList));
+    }
+
 }

songhua-admin/src/main/java/com/songhua/web/controller/system/SysConfigController.java

@@ -1,18 +1,14 @@
 package com.songhua.web.controller.system;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson2.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.songhua.common.annotation.Log;
 import com.songhua.common.core.controller.BaseController;
 import com.songhua.common.core.domain.AjaxResult;
@@ -130,4 +126,17 @@ public class SysConfigController extends BaseController
         configService.resetConfigCache();
         return success();
     }
+
+
+    /**
+     * 远程根据参数键名查询参数值
+     */
+    @PostMapping(value = "/remote/configKey")
+    public AjaxResult getConfigMap(@RequestBody JSONObject json){
+        List<String> keysList = new ArrayList<>();
+        for(Object key : json.getJSONArray("keys")){
+            keysList.add(key.toString());
+        }
+        return success(configService.getConfigMap(keysList));
+    }
 }

songhua-system/src/main/java/com/songhua/system/mapper/CruiseShipMappingMapper.java

@@ -44,7 +44,7 @@ public interface CruiseShipMappingMapper {
 
     List<CruiseShipMapping> getShipRouteData(Long did);
 
-    void saveCruiseShipMapping(@Param("list") List list);
+    int saveCruiseShipMapping(@Param("list") List list);
 
     void saveEquipmentHistoryLocation(@Param("list") List list);
 }

songhua-system/src/main/java/com/songhua/system/service/ICruiseShipMappingService.java

@@ -47,7 +47,7 @@ public interface ICruiseShipMappingService
 
     List<Map<String, Object>> getShipRouteData();
 
-    void saveCruiseShipMapping(List objectList);
+    int saveCruiseShipMapping(List objectList);
 
     void saveEquipmentHistoryLocation(List objectList);
 

songhua-system/src/main/java/com/songhua/system/service/impl/CruiseShipMappingServiceImpl.java

@@ -116,8 +116,8 @@ public class CruiseShipMappingServiceImpl implements ICruiseShipMappingService
     }
 
     @Override
-    public void saveCruiseShipMapping(List objectList) {
-        cruiseShipMappingMapper.saveCruiseShipMapping(objectList);
+    public int saveCruiseShipMapping(List objectList) {
+        return cruiseShipMappingMapper.saveCruiseShipMapping(objectList);
     }
 
     @Override