#

luxiaotao1123

2024-10-23 8ead99d42d0a59dd2eb4489a98f171f434988b06

#

 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");

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/NavMap.java

File was renamed from zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Map.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; }

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/MapMapper.java

File was deleted

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/NavMapMapper.java

New file
@@ -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);

}

 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);
                }
            });
        }
    }

}

 zy-acs-manager/src/main/resources/mapper/manager/NavMapMapper.xml

File was renamed from zy-acs-manager/src/main/resources/mapper/manager/MapMapper.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>