方案列表接口

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/controller/FhzgReconController.java

@@ -38,7 +38,7 @@ public class FhzgReconController {
     @PostMapping("/list")
     @ApiOperation(value = "查询重构方案列表")
     public ApiResponse<ReconListVO> getSchemeList(@RequestBody ReconListReqDTO reqDTO) {
-        return ApiResponse.success(reconQueryService.getSchemeList(reqDTO));
+        return reconQueryService.getSchemeList(reqDTO);
     }
 
     /**

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/ReconQueryService.java

@@ -1,6 +1,7 @@
 package com.hdkj.lt.bf.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hdkj.hussar.ApiResponse;
 import com.hdkj.lt.base.model.response.PageVO;
 import com.hdkj.lt.bf.entity.dto.ReconDetailReqDTO;
 import com.hdkj.lt.bf.entity.dto.ReconListReqDTO;
@@ -17,7 +18,7 @@ public interface ReconQueryService {
     /**
      * 查询方案列表
      */
-    ReconListVO getSchemeList(ReconListReqDTO reqDTO);
+    ApiResponse<ReconListVO> getSchemeList(ReconListReqDTO reqDTO);
 
     /**
      * 查询方案详情

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/ReconQueryServiceImpl.java

@@ -2,6 +2,7 @@ package com.hdkj.lt.bf.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hdkj.hussar.ApiResponse;
 import com.hdkj.lt.base.constants.DictConstants;
 import com.hdkj.lt.base.exception.BusinessException;
 import com.hdkj.lt.base.model.response.PageVO;
@@ -47,7 +48,7 @@ public class ReconQueryServiceImpl implements ReconQueryService {
 
 
     @Override
-    public ReconListVO getSchemeList(ReconListReqDTO reqDTO) {
+    public ApiResponse<ReconListVO> getSchemeList(ReconListReqDTO reqDTO) {
         if (Objects.isNull(reqDTO.getEventId())) {
             throw new BusinessException("事件ID为空");
         }
@@ -57,6 +58,9 @@ public class ReconQueryServiceImpl implements ReconQueryService {
                 new LambdaQueryWrapper<FhzgReconResult>()
                         .eq(FhzgReconResult::getEventId, reqDTO.getEventId())
         );
+        if(resultList.isEmpty()){
+            return ApiResponse.success(new ReconListVO(),"无调优方案");
+        }
 
         // 构建方案VO列表
         List<ReconSchemeVO> schemeList = resultList.stream()
@@ -76,7 +80,7 @@ public class ReconQueryServiceImpl implements ReconQueryService {
         eventInfo.setEventId(reqDTO.getEventId());
         vo.setEventInfo(eventInfo);
         vo.setSchemeList(schemeList);
-        return vo;
+        return ApiResponse.success(vo);
     }
 
     @Override

services/load-transfer-mq/src/main/resources/config/local/bootstrap-local.yml

@@ -2,7 +2,7 @@
 NACOS_HOST: 27.54.100.176
 NACOS_PORT: 18848
 NACOS_PWD: FHZG@nacos2025
-NAMESPACE: 88b0baca-b7b1-496c-8ebd-bbfea7959c49
+NAMESPACE: pwfhzg-local
 
 server:
   servlet:
@@ -20,19 +20,19 @@ spring:
     name: load-transfer-mq
   cloud:
     nacos:
+      username: nacos
+      password: ${NACOS_PWD}
       discovery:
-        username: nacos
-        password: ${NACOS_PWD}
         server-addr: ${NACOS_HOST}:${NACOS_PORT}
         namespace: ${NAMESPACE}
-        metadata:
-          formdesign: true
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
-        username: ${spring.cloud.nacos.discovery.username}
-        password: ${spring.cloud.nacos.discovery.password}
         namespace: ${spring.cloud.nacos.discovery.namespace}
         file-extension: yaml
         shared-configs:
-          - application-local.${spring.cloud.nacos.config.file-extension} #公共配置
-          - datasource.${spring.cloud.nacos.config.file-extension}  #数据源配置
+          - data-id: application.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: common-core.yaml
+            group: DEFAULT_GROUP
+            refresh: true

services/ruoyi-job/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-job</artifactId>
+    <artifactId>pwfhzg-job</artifactId>
 
     <description>
         ruoyi-modules-job定时任务

services/ruoyi-job/src/main/resources/bootstrap.yml

@@ -1,12 +1,10 @@
 # Tomcat
 server:
-  port: 19203
+  port: 17700
 
 # Spring
 spring:
   application:
-    # 应用名称
-    name: ruoyi-job
+    name: pwfhzg-job
   profiles:
-    # 环境配置
-    active: local
+    active: @environment@

services/ruoyi-job/src/main/resources/config/local/bootstrap-local.yml

@@ -1,9 +1,8 @@
 # 研发网开发环境
 NACOS_HOST: 27.54.100.176
 NACOS_PORT: 18848
-NACOS_PASSWORD: FHZG@nacos2025
-NACOS_NAMESPACE: zhangtj-pwfhzg-local
-CONFIG_FILE: application-local.yaml
+NACOS_PWD: FHZG@nacos2025
+NAMESPACE: pwfhzg-local
 
 caAuth:
   open: false
@@ -12,21 +11,18 @@ spring:
   cloud:
     nacos:
       username: nacos
-      password: ${NACOS_PASSWORD}
+      password: ${NACOS_PWD}
       discovery:
-        server-addr: http://${NACOS_HOST:127.0.0.1}:${NACOS_PORT:18848}
-        namespace: ${NACOS_NAMESPACE:public}
+        server-addr: ${NACOS_HOST}:${NACOS_PORT}
+        namespace: ${NAMESPACE}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         namespace: ${spring.cloud.nacos.discovery.namespace}
         file-extension: yaml
         shared-configs:
-          - data-id: ${CONFIG_FILE}
+          - data-id: application.yaml
             group: DEFAULT_GROUP
             refresh: true
           - data-id: common-core.yaml
             group: DEFAULT_GROUP
-            refresh: true
-          - data-id: datasource.yaml
-            group: DEFAULT_GROUP
-            refresh: true
+            refresh: true

services/ruoyi-job/src/main/resources/config/uat/bootstrap-uat.yaml

@@ -5,28 +5,23 @@ NAMESPACE: 74226456-1d37-4a89-bbb3-08d24fb54126
 server:
   servlet:
     context-path: /
-  port: 19001
+  port: 17700
 
 spring:
-  main:
-    allow-bean-definition-overriding: true
-  mvc:
-    static-path-pattern: /static/**         # 静态资源路径
-    view:
-      prefix: /WEB-INF/view
-  application:
-    name: load-transfer-bf
   cloud:
     nacos:
       discovery:
         server-addr: ${NACOS_HOST}:${NACOS_PORT}
         namespace: ${NAMESPACE}
+        metadata:
+          formdesign: true
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
+        username: ${spring.cloud.nacos.discovery.username}
+        password: ${spring.cloud.nacos.discovery.password}
         namespace: ${spring.cloud.nacos.discovery.namespace}
-        file-extension: yml
+        file-extension: yaml
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #公共配置
-          - datasource-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}  #数据源配置
-          - hussar-common-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #轻骑兵框架配置
-          - load-transfer-custom-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #负荷转供系统自定义配置
+          - pwfhzg-application.${spring.cloud.nacos.config.file-extension} #公共配置
+          - pwfhzg-datasource.${spring.cloud.nacos.config.file-extension}  #数据源配置
+          - pwfhzg-job.${spring.cloud.nacos.config.file-extension}