xiaochan 4 mesi fa
parent
commit
c974b56740

+ 2 - 5
thyy-socket/src/main/java/org/thyy/socket/config/SocketService.java

@@ -1,5 +1,6 @@
 package org.thyy.socket.config;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.web.socket.CloseStatus;
@@ -12,14 +13,10 @@ import java.util.Map;
 
 @Slf4j
 @Component
+@RequiredArgsConstructor
 public class SocketService implements WebSocketHandler {
-
     private final Map<String, Business> businessMap;
 
-    public SocketService(Map<String, Business> businessMap) {
-        this.businessMap = businessMap;
-    }
-
     @Override
     public void afterConnectionEstablished(WebSocketSession session) {
         String businessStr = (String) session.getAttributes().get("business");

+ 2 - 4
thyy-socket/src/main/java/org/thyy/socket/config/WebSocketConfig.java

@@ -5,6 +5,7 @@ import io.micrometer.common.util.StringUtils;
 import jakarta.annotation.Nonnull;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.server.ServerHttpRequest;
@@ -23,13 +24,10 @@ import java.util.Map;
 @Slf4j
 @Configuration
 @EnableWebSocket
+@RequiredArgsConstructor
 public class WebSocketConfig implements WebSocketConfigurer {
     private final SocketService socketService;
 
-    public WebSocketConfig(SocketService socketService) {
-        this.socketService = socketService;
-    }
-
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
         registry.addHandler(socketService, "/websocket/{business}/{sid}")

+ 0 - 1
thyy-socket/src/main/java/org/thyy/socket/service/emr/EmrRefresh.java

@@ -20,7 +20,6 @@ public class EmrRefresh implements Business {
 
     Map<String, Consumer<FunctionParams>> function = new HashMap<>();
 
-
     public EmrRefresh(EmrMapCenter mapCenter) {
         this.mapCenter = mapCenter;
         function.put("kickItOut", (value) -> {

+ 0 - 14
thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/InspectionController.java

@@ -23,20 +23,6 @@ public class InspectionController {
         this.service = service;
     }
 
-    @Service
-    @ConditionalOnProperty(prefix = "thyy.inspection", name = "service", havingValue = "default", matchIfMissing = true)
-    static class Default implements InspectionInterface {
-        @Override
-        public List<JyIndexResponse> queryExamIndex(JSONObject request) {
-            return List.of();
-        }
-
-        @Override
-        public JyDetailResponse queryExamDetail(JSONObject request) {
-            return null;
-        }
-    }
-
     @PostMapping("/queryExamIndex")
     public ResultVo<List<JyIndexResponse>> queryExamIndex(@RequestBody JSONObject request) {
         List<JyIndexResponse> list = service.queryExamIndex(request);

+ 11 - 2
thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/inspectionImpl/ThyyInspectionImpl.java

@@ -1,5 +1,6 @@
 package org.thyy.thirdpartapi.inspection.inspectionImpl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import lombok.extern.slf4j.Slf4j;
@@ -13,11 +14,12 @@ import org.thyy.thirdpartapi.inspection.response.jy.*;
 import org.thyy.utils.exception.BizException;
 import org.thyy.utils.exception.ExceptionEnum;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
 @Service
-@ConditionalOnProperty(prefix = "thyy.inspection", name = "service", havingValue = "shanghaihaotai")
+@ConditionalOnProperty(prefix = "thyy.inspection", name = "service", havingValue = "shanghaihaotai", matchIfMissing = true)
 public class ThyyInspectionImpl implements InspectionInterface {
     private String api;
     private final RestTemplate restTemplate;
@@ -30,13 +32,17 @@ public class ThyyInspectionImpl implements InspectionInterface {
         init();
     }
 
-    public void init( ) {
+    public void init() {
         this.api = inspectionApiConfig.getJy();
         log.info("检验检查模块初始化完成");
     }
 
     @Override
     public List<JyIndexResponse> queryExamIndex(JSONObject request) {
+        if (StrUtil.isBlank(api)) {
+            return new ArrayList<>();
+        }
+
         JSONObject response = restTemplate.postForObject(api + "/self", request, JSONObject.class);
         if (null == response) {
             throw new BizException(ExceptionEnum.NETWORK_ERROR);
@@ -52,6 +58,9 @@ public class ThyyInspectionImpl implements InspectionInterface {
 
     @Override
     public JyDetailResponse queryExamDetail(JSONObject request) {
+        if (StrUtil.isBlank(api)) {
+            return null;
+        }
         JSONObject response = new RestTemplate().postForObject(
                 api + "/detail", request, JSONObject.class);
         if (null == response) {

+ 0 - 21
thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/tts/ttsService/TtsTest.java

@@ -1,21 +0,0 @@
-package org.thyy.thirdpartapi.tts.ttsService;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
-import org.thyy.thirdpartapi.tts.Tts;
-import org.thyy.thirdpartapi.tts.TtsRequest;
-import org.thyy.utils.exception.ExceptionEnum;
-import org.thyy.utils.result.R;
-import org.thyy.utils.result.ResultVo;
-
-@Slf4j
-@Service(value = "ttstext")
-@ConditionalOnProperty(prefix = "thyy.tts", name = "service", havingValue = "default", matchIfMissing = true)
-public class TtsTest implements Tts {
-
-    @Override
-    public ResultVo<String> textToSpeech(TtsRequest request) {
-        return R.fail(ExceptionEnum.NOT_SERVICE);
-    }
-}

+ 5 - 1
thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/tts/ttsService/XfTtsApi.java

@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 @Slf4j
 @Configuration
-@ConditionalOnProperty(prefix = "thyy.tts", name = "service", havingValue = "xfyun")
+@ConditionalOnProperty(prefix = "thyy.tts", name = "service", havingValue = "xfyun", matchIfMissing = true)
 public class XfTtsApi implements Tts {
     private TtsClient ttsClient;
     private final TtsConfig cfg;
@@ -50,6 +50,10 @@ public class XfTtsApi implements Tts {
 
 
     public ResultVo<String> textToSpeech(TtsRequest request) {
+        if (StrUtil.isBlank(cfg.getApiKey())) {
+            return R.fail(ExceptionEnum.API_ERROR, "没有有效的Key。");
+        }
+
         String filePath = cfg.getDirectory() + File.separator + request.getId() + ".mp3";
         FileUtil.del(filePath);