Merge remote-tracking branch 'origin/master'

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

@@ -44,7 +44,7 @@ public class BasicCruiseShipController extends BaseController
      * 导出游船列表
      */
     @PreAuthorize("@ss.hasPermi('system:ship:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @Log(title = "导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BasicCruiseShip basicCruiseShip)
     {
@@ -67,7 +67,7 @@ public class BasicCruiseShipController extends BaseController
      * 新增游船
      */
     @PreAuthorize("@ss.hasPermi('system:ship:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @Log(title = "新增", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BasicCruiseShip basicCruiseShip)
     {
@@ -78,7 +78,7 @@ public class BasicCruiseShipController extends BaseController
      * 修改游船
      */
     @PreAuthorize("@ss.hasPermi('system:ship:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @Log(title = "修改", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BasicCruiseShip basicCruiseShip)
     {
@@ -89,7 +89,7 @@ public class BasicCruiseShipController extends BaseController
      * 删除游船
      */
     @PreAuthorize("@ss.hasPermi('system:ship:remove')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @Log(title = "删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

songhua-system/src/main/java/com/songhua/system/domain/CruiseShipMappingDao.java

@@ -0,0 +1,28 @@
+package com.songhua.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.songhua.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public  class CruiseShipMappingDao extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+    /** 游船id */
+    private String shipId;
+    /** 船名 */
+    private String shipName;
+
+    /** 经度 */
+    private String longitude;
+    /** 纬度 */
+    private String latitude;
+    /** 游船时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date shipTime;
+}

songhua-ui/src/views/ship/index.vue

@@ -1,27 +1,5 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="经度" prop="longitude">
-        <el-input
-          v-model="queryParams.longitude"
-          placeholder="请输入经度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="纬度" prop="latitude">
-        <el-input
-          v-model="queryParams.latitude"
-          placeholder="请输入纬度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">