From 8ead99d42d0a59dd2eb4489a98f171f434988b06 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 23 十月 2024 13:02:34 +0800
Subject: [PATCH] #

---
 /dev/null                                                                             |   15 -------
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/websocket/MapWebSocket.java   |   17 +++++---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/NavMap.java            |    6 +-
 zy-acs-manager/src/main/resources/mapper/manager/NavMapMapper.xml                     |    6 +-
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java |   40 ++++++++++----------
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/NavMapMapper.java      |   15 +++++++
 6 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
index d47ab68..c0137c7 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -21,11 +21,11 @@
 import com.zy.acs.manager.manager.controller.result.MapAgvVo;
 import com.zy.acs.manager.manager.controller.result.MapPointVo;
 import com.zy.acs.manager.manager.controller.result.MapRouteVo;
-import com.zy.acs.manager.manager.entity.Map;
+import com.zy.acs.manager.manager.entity.NavMap;
 import com.zy.acs.manager.manager.entity.*;
 import com.zy.acs.manager.manager.enums.AgvStsType;
 import com.zy.acs.manager.manager.enums.TaskStsType;
-import com.zy.acs.manager.manager.mapper.MapMapper;
+import com.zy.acs.manager.manager.mapper.NavMapMapper;
 import com.zy.acs.manager.manager.service.*;
 import com.zy.acs.manager.system.controller.BaseController;
 import com.zy.acs.manager.system.service.ConfigService;
@@ -61,7 +61,7 @@
     @Autowired
     private TaskService taskService;
     @Autowired
-    private MapMapper mapMapper;
+    private NavMapMapper navMapMapper;
     @Autowired
     private SnowflakeIdWorker snowflakeIdWorker;
     @Autowired
@@ -92,11 +92,11 @@
             mapCodeItems.add(mapItem);
         });
         // common
-        Map activeMap = mapMapper.selectActive(zoneId, floor);
+        NavMap activeNavMap = navMapMapper.selectActive(zoneId, floor);
         return R.ok().add(Cools
                 .add("rcsStatus", configService.getVal("TaskAssignMode", Boolean.class))
                 .add("point", GsonUtils.toJson(mapCodeItems))
-                .add("common", activeMap.getData())
+                .add("common", activeNavMap.getData())
         );
     }
 
@@ -107,25 +107,25 @@
         Date now = new Date();
         Long userId = getLoginUserId();
         // previous
-        Map previousMap = mapMapper.selectActive(param.getZoneId(), param.getFloor());
-        if (null != previousMap) {
-            previousMap.setActive(0);
-            previousMap.setUpdateTime(now);
-            previousMap.setUpdateBy(userId);
-            if (0 == mapMapper.updateById(previousMap)) {
+        NavMap previousNavMap = navMapMapper.selectActive(param.getZoneId(), param.getFloor());
+        if (null != previousNavMap) {
+            previousNavMap.setActive(0);
+            previousNavMap.setUpdateTime(now);
+            previousNavMap.setUpdateBy(userId);
+            if (0 == navMapMapper.updateById(previousNavMap)) {
                 throw new CoolException("Save Fail");
             }
         }
         // current
-        Map map = new Map();
-        map.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
-        map.setZoneId(param.getZoneId());
-        map.setFloor(param.getFloor());
-        map.setData(GsonUtils.toJson(param.getItemList()));
-        map.setActive(1);
-        map.setUpdateBy(userId);
-        map.setCreateBy(userId);
-        if (0 == mapMapper.insert(map)) {
+        NavMap navMap = new NavMap();
+        navMap.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
+        navMap.setZoneId(param.getZoneId());
+        navMap.setFloor(param.getFloor());
+        navMap.setData(GsonUtils.toJson(param.getItemList()));
+        navMap.setActive(1);
+        navMap.setUpdateBy(userId);
+        navMap.setCreateBy(userId);
+        if (0 == navMapMapper.insert(navMap)) {
             throw new CoolException("Save Fail");
         }
         return R.ok("Save Success");
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Map.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/NavMap.java
similarity index 96%
rename from zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Map.java
rename to zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/NavMap.java
index 984c0b7..b6e0782 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Map.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/NavMap.java
@@ -12,8 +12,8 @@
 import java.util.Date;
 
 @Data
-@TableName("man_map")
-public class Map implements Serializable {
+@TableName("man_nav_map")
+public class NavMap implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -111,7 +111,7 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
-    public Map() {}
+    public NavMap() {}
 
     public Boolean getActiveBool(){
         if (null == this.active){ return null; }
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/MapMapper.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/MapMapper.java
deleted file mode 100644
index ee226d5..0000000
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/MapMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.zy.acs.manager.manager.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zy.acs.manager.manager.entity.Map;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface MapMapper extends BaseMapper<Map> {
-
-    Map selectActive(@Param("zoneId") Long zoneId, @Param("floor") Integer floor);
-
-}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/NavMapMapper.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/NavMapMapper.java
new file mode 100644
index 0000000..403a375
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/NavMapMapper.java
@@ -0,0 +1,15 @@
+package com.zy.acs.manager.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zy.acs.manager.manager.entity.NavMap;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface NavMapMapper extends BaseMapper<NavMap> {
+
+    NavMap selectActive(@Param("zoneId") Long zoneId, @Param("floor") Integer floor);
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/websocket/MapWebSocket.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/websocket/MapWebSocket.java
index cdc9dbe..7d0b25d 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/websocket/MapWebSocket.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/websocket/MapWebSocket.java
@@ -1,5 +1,6 @@
 package com.zy.acs.manager.manager.websocket;
 
+import com.zy.acs.framework.common.Cools;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -60,13 +61,15 @@
     }
 
     public static void broadcast(String message) {
-        sessions.forEach((id, session) -> {
-            try {
-                session.getBasicRemote().sendText(message);
-            } catch (Exception e) {
-                log.error("Failed to send message to session: {}", id, e);
-            }
-        });
+        if (null != message && !message.trim().equals("")) {
+            sessions.forEach((id, session) -> {
+                try {
+                    session.getBasicRemote().sendText(message);
+                } catch (Exception e) {
+                    log.error("Failed to send message to session: {}", id, e);
+                }
+            });
+        }
     }
 
 }
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/MapMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/NavMapMapper.xml
similarity index 86%
rename from zy-acs-manager/src/main/resources/mapper/manager/MapMapper.xml
rename to zy-acs-manager/src/main/resources/mapper/manager/NavMapMapper.xml
index 9136982..d2fd1ce 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/MapMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/NavMapMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.acs.manager.manager.mapper.MapMapper">
+<mapper namespace="com.zy.acs.manager.manager.mapper.NavMapMapper">
 
-    <select id="selectActive" resultType="com.zy.acs.manager.manager.entity.Map">
-        select * from man_map
+    <select id="selectActive" resultType="com.zy.acs.manager.manager.entity.NavMap">
+        select * from man_nav_map
         where 1=1
         and active = 1
         <choose>

--
Gitblit v1.9.1