Merge branch 'master' of http://192.168.10.18:3000/limeng/ssh_visualization

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

@@ -8,6 +8,7 @@ import com.songhua.common.utils.uuid.IdUtils;
 import com.songhua.system.domain.BasicCruiseShip;
 import com.songhua.system.mapper.BasicCruiseShipMapper;
 import org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.songhua.system.mapper.CruiseShipMappingMapper;
@@ -101,12 +102,12 @@ public class CruiseShipMappingServiceImpl implements ICruiseShipMappingService
             data.put("id", recentLocations.get(i).getId());
             data.put("polylinePath",data1);
             data.put("color", color.get(RandomUtils.nextInt(0, 9)));
-            data.put("shipName", recentLocations.get(i).getShipName());
-            data.put("shipType", recentLocations.get(i).getShipType());
+            data.put("shipName", StringUtils.isBlank(recentLocations.get(i).getShipName()) ? "" : recentLocations.get(i).getShipName());
+            data.put("shipType", StringUtils.isBlank(recentLocations.get(i).getShipType()) ? "" : recentLocations.get(i).getShipType());
             data.put("lengthOverall", recentLocations.get(i).getLengthOverall());
             data.put("registrationNumber", recentLocations.get(i).getRegistrationNumber());
             data.put("quantity", recentLocations.get(i).getQuantity());
-            data.put("propulsion", recentLocations.get(i).getPropulsion());
+            data.put("propulsion", StringUtils.isBlank(recentLocations.get(i).getPropulsion()) ? "" : recentLocations.get(i).getPropulsion());
             data.put("passengerCapacity", recentLocations.get(i).getPassengerCapacity());
             data.put("safetyEquipment", recentLocations.get(i).getSafetyEquipment());
             data.put("did", recentLocations.get(i).getDid());
@@ -139,12 +140,12 @@ public class CruiseShipMappingServiceImpl implements ICruiseShipMappingService
             data.put("id", recentLocations.get(i).getId());
             data.put("polylinePath",data1);
             data.put("color", color.get(RandomUtils.nextInt(0, 9)));
-            data.put("shipName", recentLocations.get(i).getShipName());
-            data.put("shipType", recentLocations.get(i).getShipType());
+            data.put("shipName", StringUtils.isBlank(recentLocations.get(i).getShipName()) ? "" : recentLocations.get(i).getShipName());
+            data.put("shipType", StringUtils.isBlank(recentLocations.get(i).getShipType()) ? "" : recentLocations.get(i).getShipType());
             data.put("lengthOverall", recentLocations.get(i).getLengthOverall());
             data.put("registrationNumber", recentLocations.get(i).getRegistrationNumber());
             data.put("quantity", recentLocations.get(i).getQuantity());
-            data.put("propulsion", recentLocations.get(i).getPropulsion());
+            data.put("propulsion", StringUtils.isBlank(recentLocations.get(i).getPropulsion()) ? "" : recentLocations.get(i).getPropulsion());
             data.put("passengerCapacity", recentLocations.get(i).getPassengerCapacity());
             data.put("safetyEquipment", recentLocations.get(i).getSafetyEquipment());
             data.put("did", recentLocations.get(i).getDid());

songhua-ui/src/layout/components/Navbar.vue

@@ -7,15 +7,15 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+<!--        <search id="header-search" class="right-menu-item" />-->
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
+<!--        <el-tooltip content="源码地址" effect="dark" placement="bottom">-->
+<!--          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
+<!--        </el-tooltip>-->
 
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+<!--        <el-tooltip content="文档地址" effect="dark" placement="bottom">-->
+<!--          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
+<!--        </el-tooltip>-->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 

songhua-ui/src/router/index.js

@@ -20,12 +20,12 @@ import Layout from '@/layout'
  * roles: ['admin', 'common']       // 访问路由的角色权限
  * permissions: ['a:a:a', 'b:b:b']  // 访问路由的菜单权限
  * meta : {
-    noCache: true                   // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
-    title: 'title'                  // 设置该路由在侧边栏和面包屑中展示的名字
-    icon: 'svg-name'                // 设置该路由的图标，对应路径src/assets/icons/svg
-    breadcrumb: false               // 如果设置为false，则不会在breadcrumb面包屑中显示
-    activeMenu: '/system/user'      // 当路由设置了该属性，则会高亮相对应的侧边栏。
-  }
+ noCache: true                   // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
+ title: 'title'                  // 设置该路由在侧边栏和面包屑中展示的名字
+ icon: 'svg-name'                // 设置该路由的图标，对应路径src/assets/icons/svg
+ breadcrumb: false               // 如果设置为false，则不会在breadcrumb面包屑中显示
+ activeMenu: '/system/user'      // 当路由设置了该属性，则会高亮相对应的侧边栏。
+ }
  */
 
 // 公共路由
@@ -47,6 +47,11 @@ export const constantRoutes = [
     hidden: true
   },
   {
+    path: '/songhuaIndex1',
+    component: () => import('@/views/index1/index'),
+    hidden: true
+  },
+  {
     path: '/register',
     component: () => import('@/views/register'),
     hidden: true
@@ -94,29 +99,31 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    //林业中心
-    // path: '/songhuaIndex',
-    // name: 'songhuaIndex',
-    // component: () => import('@/views/index/index'),
-    // meta: {
-    //   title: '松花湖'
-    // }
-    path: 'http://dsj.1230t.com/',
-    name: 'songhuaIndex',
-    component: () => import('@/views/index/index'),
-    meta: {
-      title: '易景通数据指数'
-    }
-  },
-  {
-    path: '/songhuaIndex1',
-    name: 'songhuaIndex1',
-    component: () => import('@/views/index1/index'),
-    meta: {
-      title: '松花湖景区通'
-    }
-  },
+  // {
+  //林业中心
+  // path: '/songhuaIndex',
+  // name: 'songhuaIndex',
+  // component: () => import('@/views/index/index'),
+  // meta: {
+  //   title: '松花湖'
+  // }
+  //   path: 'http://dsj.1230t.com/',
+  //   name: 'songhuaIndex',
+  //   component: () => import('@/views/index/index'),
+  //   meta: {
+  //     title: '易景通数据指数',
+  //     icon: ['dashboard'] // 添加图标
+  //   }
+  // },
+  // {
+  //   path: '/songhuaIndex1',
+  //   name: 'songhuaIndex1',
+  //   component: () => import('@/views/index1/index'),
+  //   meta: {
+  //     title: '松花湖景区通',
+  //     icon: ['eye-open'] // 添加图标
+  //   }
+  // },
 ]
 
 // 动态路由，基于用户权限动态去加载

songhua-ui/src/views/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="image-container">
-    <video 
-      src="../assets/video/bg.mp4" 
-      style="width: 100%; object-fit:fill;" 
+    <video
+      src="../assets/video/bg.mp4"
+      style="width: 100%; object-fit:fill;"
       autoplay
       loop
       muted
@@ -28,7 +28,7 @@ export default {
   },
   methods: {
     shipHandler() {
-      window.open("http://localhost/songhuaIndex1");
+      window.open("http://jqt.songhuahujqt.com/songhuaIndex1");
     },
     ticketHandler(){
       window.open("http://dsj.1230t.com/");

songhua-ui/src/views/login.vue

@@ -55,9 +55,7 @@
       </el-form-item>
     </el-form>
     <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
-    </div>
+<!--sssssssssssss-->
   </div>
 </template>
 
@@ -72,8 +70,8 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""
@@ -161,7 +159,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url("../assets/images/songhuahu.png");
   background-size: cover;
 }
 .title {