init

.idea/jarRepositories.xml

@@ -26,6 +26,11 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://47.111.78.178:8013/repository/maven-public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="snapshots" />
       <option name="name" value="snapshots" />

.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/nladmin-system" vcs="Git" />
   </component>
 </project>

nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/speech/SysSpeechController.java

@@ -1,62 +0,0 @@
-package org.nl.wms.system_manage.controller.speech;
-
-import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.system_manage.service.speech.SysSpeechService;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * @author Zhao Ya Fei
- * @date 2026-04-14
- * 根据语音输入执行任务
- */
-@Slf4j
-@RestController
-@RequestMapping("/speech")
-public class SysSpeechController {
-
-    @Resource
-    private SysSpeechService sysSpeechService;
-
-    /**
-     * 健康检查
-     * @return
-     */
-    @GetMapping("/health")
-    public ResponseEntity<Object> health(){
-
-        return ResponseEntity.noContent().build();
-    }
-
-    /**
-     * 语音转文字
-     * @return
-     */
-    @PostMapping("/asr")
-    public ResponseEntity<Object> asr(){
-        return ResponseEntity.noContent().build();
-    }
-
-    /**
-     * 文字转语音
-     * @return
-     */
-    @PostMapping("/tts")
-    public ResponseEntity<Object> tts(){
-        return ResponseEntity.noContent().build();
-    }
-
-    /**
-     * 用户确认文字
-     * @return
-     */
-    @PostMapping("/confirm")
-    public ResponseEntity<Object> confirm(@RequestBody Map<String, Object> body){
-        sysSpeechService.confirm(body.getOrDefault("text","").toString());
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/speech/SysSpeechWebSocketEndpoint.java

@@ -1,171 +0,0 @@
-package org.nl.wms.system_manage.controller.speech;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.utils.MapOf;
-import org.nl.wms.system_manage.service.speech.api.AsrTtsClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.websocket.*;
-import javax.websocket.server.ServerEndpoint;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Component
-@Slf4j
-@ServerEndpoint("/ws/speech")
-public class SysSpeechWebSocketEndpoint {
-
-
-    private static AsrTtsClient asrTtsClient;
-    private final ObjectMapper objectMapper = new ObjectMapper();
-
-    // 存储每个会话的上下文
-    private static final Map<String, SessionContext> sessionContexts = new ConcurrentHashMap<>();
-    private Session session;
-
-    //注入静态属性
-    @Autowired
-    public void setAsrTtsClient(AsrTtsClient asrTtsClient) {
-        SysSpeechWebSocketEndpoint.asrTtsClient = asrTtsClient;
-    }
-
-    @OnOpen
-    public void onOpen(Session session) {
-        sessionContexts.put(session.getId(), new SessionContext());
-        this.session = session;
-        log.info("WebSocket 监听: {}", session.getId());
-    }
-
-    @OnMessage
-    public void onTextMessage(String message, Session session) throws IOException {
-        SessionContext ctx = sessionContexts.get(session.getId());
-        if (ctx == null) return;
-
-        JsonNode json = objectMapper.readTree(message);
-        String type = json.get("type").asText();
-
-        if ("start".equals(type)) {
-            //TODO 健康检查
-            asrTtsClient.health().thenAccept(result -> {
-                Integer resCode = JSON.parseObject(result.toString()).getInteger("code");
-                if (resCode != 0) {
-                    sendError("语音控制服务异常");
-                }
-            }).exceptionally(ex -> {
-                log.error("健康检查异常: {}", session.getId(), ex);
-                sendError("语音控制服务异常");
-                return null;
-            });
-        } else if ("end".equals(type)) {
-            // 录音结束，将 PCM 数据发送给第三方 ASR
-            byte[] pcmData = ctx.audioBuffer.toByteArray();
-            //测试
-//            String resp = JSONObject.toJSONString(MapOf.of("type", "transcription", "text", "识别结果"));
-//            String resp1 = JSONObject.toJSONString(MapOf.of("type", "response", "text", "系统回复消息"));
-//            session.getBasicRemote().sendText(resp);
-//            session.getBasicRemote().sendText(resp1);
-            //测试结束
-
-            // 异步调用第三方服务，避免阻塞 WebSocket 线程
-            asrTtsClient.recognizeAsync(pcmData, ctx.sampleRate, ctx.channels, ctx.bitDepth)
-                    .thenAccept(result -> {
-                        JSONObject jsonObject = JSON.parseObject(result.toString(), JSONObject.class);
-                        Integer code = jsonObject.getInteger("code");
-                        if (code == null || code != 0) {
-                            String msg = jsonObject.getString("msg");
-                            sendError(msg != null ? msg : "未知错误");
-                            return;
-                        }
-                        JSONObject data = jsonObject.getJSONObject("data");
-                        if (data != null) {
-                            String text = data.getString("text");
-                            sendText(text);
-                        } else {
-                            sendError("语音转文字发生错误");
-                        }
-                    })
-                    .exceptionally(ex -> {
-                        log.error("ASR 异常: {}", session.getId(), ex);
-                        sendError("ASR 异常");
-                        return null;
-                    });
-            ctx.audioBuffer.reset();
-            // 清理上下文
-//            sessionContexts.remove(session.getId());
-        }
-    }
-
-    @OnMessage
-    public void onBinaryMessage(ByteBuffer byteBuffer, Session session) {
-        SessionContext ctx = sessionContexts.get(session.getId());
-        if (ctx != null) {
-            byte[] bytes = new byte[byteBuffer.remaining()];
-            byteBuffer.get(bytes);
-            try {
-                ctx.audioBuffer.write(bytes);
-                System.out.println("已接收音频数据：" + ctx.audioBuffer.size());
-            } catch (IOException e) {
-                log.error("写入音频数据异常: {}", session.getId(), e);
-            }
-        }
-    }
-
-    @OnClose
-    public void onClose(Session session) {
-        sessionContexts.remove(session.getId());
-        log.info("连接关闭: {}", session.getId());
-    }
-
-    @OnError
-    public void onError(Session session, Throwable error) {
-        log.error("语音控制：ws连接错误", error);
-        sessionContexts.remove(session.getId());
-    }
-
-    // 会话上下文内部类
-    private static class SessionContext {
-        ByteArrayOutputStream audioBuffer = new ByteArrayOutputStream();
-        int sampleRate;
-        int channels;
-        int bitDepth;
-
-        @Override
-        public String toString() {
-            return "sampleRate=" + sampleRate + ", channels=" + channels + ", bitDepth=" + bitDepth;
-        }
-    }
-
-    private void sendText(String message) {
-        try {
-            Map<String, Object> map = new HashMap<>();
-            map.put("type", "result");
-            map.put("text", message);
-            // 结果通过 WebSocket 返回给前端
-            String response = objectMapper.writeValueAsString(map);
-            session.getBasicRemote().sendText(response);
-        } catch (IOException e) {
-            log.error("发送文本消息异常: {}", session.getId(), e);
-        }
-    }
-
-    private void sendError(String message) {
-        try {
-            Map<String, String> map = new HashMap<>();
-            map.put("type", "error");
-            map.put("message", message);
-            session.getBasicRemote().sendText(
-                    objectMapper.writeValueAsString(map));
-        } catch (IOException e) {
-            log.error("语音控制：发送错误消息异常: {}", session.getId(), e);
-        }
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/speech/SysSpeechService.java

@@ -1,34 +0,0 @@
-package org.nl.wms.system_manage.service.speech;
-
-import java.util.Map;
-
-public interface SysSpeechService {
-
-    /**
-     * 语音识别服务健康检查
-     *
-     * @return  Boolean
-     */
-    Boolean health();
-
-    /**
-     * 语音转文字
-     *
-     * @return  Map<String, Object>
-     */
-    Map<String, Object> asr();
-
-    /**
-     * 文字转语音
-     *
-     * @return  Map<String, Object>
-     */
-    Map<String, Object> tts();
-
-    /**
-     * 语音识别结果确认
-     *
-     * @return  Map<String, Object>
-     */
-    Map<String, Object> confirm(String text);
-}

nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/speech/api/AsrTtsClient.java

@@ -1,85 +0,0 @@
-package org.nl.wms.system_manage.service.speech.api;
-
-import cn.hutool.http.HttpRequest;
-import com.alibaba.fastjson.JSONObject;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
-/**
- * 语音识别服务接口
- */
-@Component
-public class AsrTtsClient {
-
-    @Value("${vc.base-url:http://127.0.0.1:5000}")
-    private String vcBaseUrl;
-    /**
-     * 健康检查
-     */
-    public CompletableFuture<Object> health() {
-        return CompletableFuture.supplyAsync(() -> {
-            return HttpRequest.get(vcBaseUrl + "/health")
-                    .execute()
-                    .body();
-        });
-
-    }
-    /**
-     * 语音转文字
-     */
-    public static void asr() {
-
-    }
-    /**
-     * 文字转语音
-     */
-    public CompletableFuture<byte[]> tts(String text) {
-        return CompletableFuture.supplyAsync(() -> {
-
-            Map<String, Object> params = new HashMap<>();
-            params.put("text", text);
-            params.put("vcn", "xiaoyan");
-            params.put("speed", 50);
-            params.put("volume", 50);
-            params.put("pitch", 50);
-            return HttpRequest.post(vcBaseUrl + "/api/speech/tts")
-                    .body(JSONObject.toJSONString(params))
-                    .contentType("application/json")
-                    .execute()
-                    .bodyBytes();
-        });
-
-    }
-    /**
-     * 用户确认文字
-     */
-    public CompletableFuture<Object> confirm(String  text, boolean confirmed) {
-        return CompletableFuture.supplyAsync(() -> {
-            Map<String, Object> params = new HashMap<>();
-            params.put("text", text);
-            params.put("confirmed", confirmed);
-            return HttpRequest.post(vcBaseUrl + "/api/speech/confirm")
-                    .body(JSONObject.toJSONString(params))
-                    .contentType("application/json")
-                    .execute()
-                    .body();
-        });
-
-    }
-
-    public CompletionStage<Object> recognizeAsync(byte[] pcmData, int sampleRate, int channels, int bitDepth) {
-
-        return CompletableFuture.supplyAsync(() -> {
-            return HttpRequest.post(vcBaseUrl + "/api/speech/asr")
-                    .form("audio", pcmData)
-                    .contentType("multipart/form-data")
-                    .execute()
-                    .body();
-        });
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/speech/enums/SpeechUrlConstant.java

@@ -1,11 +0,0 @@
-package org.nl.wms.system_manage.service.speech.enums;
-
-/**
- * @author Zhao Ya Fei
- * @date 2026-04-14
- * @desc 语音识别URL
- */
-public class SpeechUrlConstant {
-
-
-}

nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/speech/impl/SysSpeechServiceImpl.java

@@ -1,56 +0,0 @@
-package org.nl.wms.system_manage.service.speech.impl;
-
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.utils.MapOf;
-import org.nl.wms.system_manage.service.speech.SysSpeechService;
-import org.nl.wms.system_manage.service.speech.api.AsrTtsClient;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.Map;
-
-/**
- * @author Zhao Ya Fei
- * @date 2026-04-14
- * 语音识别服务实现类
- */
-@Slf4j
-@Service
-public class SysSpeechServiceImpl implements SysSpeechService {
-
-    @Resource
-    private AsrTtsClient asrTtsClient;
-
-    @Override
-    public Boolean health() {
-        return null;
-    }
-
-    @Override
-    public Map<String, Object> asr() {
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public Map<String, Object> tts() {
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public Map<String, Object> confirm(String text) {
-        if ("".equals( text)){
-            throw new RuntimeException("确认文本为空");
-        }
-        asrTtsClient.confirm(text, true)
-                .thenAccept(result -> {
-                    log.info("语音控制：用户确认结果: {}", result);
-                }).exceptionally(ex -> {
-                    log.error("语音控制：用户确认异常: {}", ex);
-                    return null;
-                });
-        byte[] audio = asrTtsClient.tts(text).join();
-        //TODO 音频返回前端播放处理
-        return Collections.emptyMap();
-    }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/speech/session/SessionManager.java

@@ -1,98 +0,0 @@
-package org.nl.wms.system_manage.service.speech.session;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.websocket.Session;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * 暂时先不用
- * 后续如果需要实时展示任务结果可能用到
- */
-@Slf4j
-//@Component
-public class SessionManager {
-
-    // userId -> WebSocket Session
-    private final Map<String, Session> sessionMap = new ConcurrentHashMap<>();
-    private final AtomicInteger onlineCount = new AtomicInteger(0);
-
-    /**
-     * 注册会话（支持单端登录策略：新连接踢掉旧连接）
-     */
-    public void register(String userId, Session session) {
-        Session oldSession = sessionMap.put(userId, session);
-        if (oldSession != null && oldSession.isOpen()) {
-            try { oldSession.close(); } catch (IOException ignored) {}
-            log.info("语音控制：🔄 用户 {} 旧连接已被踢出", userId);
-        }
-        onlineCount.incrementAndGet();
-        log.info("语音控制：✅ 用户 {} 已上线 | 当前在线: {}", userId, onlineCount.get());
-    }
-
-    /**
-     * 注销会话
-     */
-    public void unregister(String userId) {
-        sessionMap.remove(userId);
-        onlineCount.decrementAndGet();
-        log.info("语音控制：❌ 用户 {} 已下线 | 当前在线: {}", userId, onlineCount.get());
-    }
-
-    /**
-     * 主动推送文本消息
-     */
-    public boolean pushText(String userId, String message) {
-        Session session = sessionMap.get(userId);
-        if (session == null || !session.isOpen()) {
-            log.warn("⚠️ 推送失败: 用户 {} 不在线", userId);
-            return false;
-        }
-        try {
-            session.getBasicRemote().sendText(message);
-            return true;
-        } catch (IOException e) {
-            log.error("📤 推送文本异常: {}", userId, e);
-            // 连接已失效，自动清理
-            unregister(userId);
-            return false;
-        }
-    }
-
-    /**
-     * 主动推送二进制数据（TTS音频、文件流等）
-     */
-    public boolean pushBinary(String userId, byte[] data) {
-        Session session = sessionMap.get(userId);
-        if (session == null || !session.isOpen()) {
-            log.warn("⚠️ 推送失败: 用户 {} 不在线", userId);
-            return false;
-        }
-        try {
-            session.getBasicRemote().sendBinary(ByteBuffer.wrap(data));
-            return true;
-        } catch (IOException e) {
-            log.error("📤 推送二进制异常: {}", userId, e);
-            unregister(userId);
-            return false;
-        }
-    }
-
-    /**
-     * 广播文本（如系统公告、全局状态）
-     */
-    public void broadcastText(String message) {
-        sessionMap.values().forEach(session -> {
-            if (session.isOpen()) {
-                try { session.getBasicRemote().sendText(message); } catch (IOException ignored) {}
-            }
-        });
-    }
-
-    public int getOnlineCount() { return onlineCount.get(); }
-}

nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/dao/mapper/IOStorInvMapper.xml

@@ -95,7 +95,7 @@
         FROM
             st_ivt_iostorinvdtl dtl
                 LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
-                LEFT JOIN ST_IVT_IOStorInv mst ON mst.iostorinv_id = dtl.iostorinv_id
+                LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id
         where
             1=1
         <if test="params.bill_code != null and params.bill_code != ''">

nladmin-ui/src/api/voice.js

@@ -1,9 +0,0 @@
-import request from "@/utils/request";
-
-export function confirm(data) {
-  return request({
-    url: '/api/speech/confirm',
-    method: 'post',
-    data
-  })
-}

nladmin-ui/src/i18n/langs/en.js

@@ -79,7 +79,6 @@ export default {
     'moreMenu': 'MoreMenu',
     'browses': 'browse',
     'fz': 'Full screen zoom',
-    'speech': 'Voice Control',
     'submit': 'Submit Success',
     'add': 'Add Success',
     'edit': 'Edit Success',

nladmin-ui/src/i18n/langs/zh-CN.js

@@ -79,7 +79,6 @@ export default {
     'moreMenu': '更多菜单',
     'browses': '浏览',
     'fz': '全屏缩放',
-    'speech': '语音控制',
     'submit': '提交成功',
     'add': '新增成功',
     'edit': '编辑成功',

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

@@ -6,13 +6,6 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <!-- 语音输入按钮 -->
-        <el-tooltip :content="$t('common.speech')" effect="dark" placement="bottom">
-          <div class="right-menu-item hover-effect voice-btn" @click="openVoiceInput">
-            <i class="el-icon-microphone" />
-          </div>
-        </el-tooltip>
-
         <search id="header-search" class="right-menu-item" />
 
         <!--        <el-tooltip content="项目文档" effect="dark" placement="bottom">
@@ -22,13 +15,10 @@
         <el-tooltip :content="$t('common.fz')" effect="dark" placement="bottom">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
         </el-tooltip>
-      <notice-icon class="right-menu-item" />
+        <notice-icon class="right-menu-item" />
-      <notice-icon-reader ref="noticeIconReader" />
+        <notice-icon-reader ref="noticeIconReader" />
-      <voice-input-dialog ref="voiceInputDialog" />
 
-
+        <!--        <el-tooltip content="布局设置" effect="dark" placement="bottom">
-
-      <!-- <el-tooltip content="布局设置" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>-->
 
@@ -83,7 +73,6 @@ import Search from '@/components/HeaderSearch'
 import Avatar from '@/assets/images/avatar.png'
 import NoticeIcon from '@/views/system/notice/NoticeIcon.vue'
 import NoticeIconReader from '@/views/system/notice/NoticeIconReader.vue'
-import VoiceInputDialog from '@/components/VoiceInputDialog'
 
 export default {
   components: {
@@ -95,8 +84,7 @@ export default {
     SizeSelect,
     Search,
     Doc,
-    TopNav,
+    TopNav
-    VoiceInputDialog
   },
   data() {
     return {
@@ -174,9 +162,6 @@ export default {
       this.$store.dispatch('LogOut').then(() => {
         location.reload()
       })
-    },
-    openVoiceInput() {
-      this.$refs.voiceInputDialog && this.$refs.voiceInputDialog.show()
     }
   }
 }