Merge remote-tracking branch 'origin/master'

 ansteel-api/src/main/java/com/iailab/module/api/mcs/AnSteelApi.java

@@ -4,7 +4,6 @@
import com.iailab.module.api.mcs.dto.PreDataChartRespVO;
import com.iailab.module.enums.ApiConstants;
import com.iailab.module.model.api.mcs.dto.PreDataSingleChartReqVO;
import com.iailab.module.model.api.mcs.dto.PreDataSingleChartRespVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.cloud.openfeign.FeignClient;

 ansteel-biz/pom.xml

@@ -118,34 +118,27 @@

        <dependency>
            <groupId>com.iailab</groupId>
            <artifactId>iailab-common-mq</artifactId>
        </dependency>
        <dependency>
            <groupId>com.iailab</groupId>
            <artifactId>ansteel-api</artifactId>
            <version>1.0.0</version>
        </dependency>

    </dependencies>

    <build>
        <!-- 设置构建的 jar 包名 -->
        <finalName>${project.artifactId}</finalName>
        <plugins>
            <!-- 打包 -->
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
                        </goals>
                    </execution>
                </executions>
            </plugin>
        </plugins>
        <pluginManagement>
            <plugins>
                <!-- maven-surefire-plugin 插件，用于运行单元测试。 -->
                <!-- 注意，需要使用 3.0.X+，因为要支持 Junit 5 版本 -->
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-surefire-plugin</artifactId>
                    <version>${maven-surefire-plugin.version}</version>
                    <configuration>
                        <skip>true</skip>
                    </configuration>
                </plugin>
                <!-- maven-compiler-plugin 插件，解决 Lombok + MapStruct 组合 -->
            </plugins>
        </pluginManagement>
    </build>

</project>

 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/McsServiceImpl.java

@@ -99,9 +99,7 @@
            return null;
        }
        String resultIndex = tMap.get(CommonConstant.RESULT_INDEX);
        if (resultIndex == null) {
            return null;
        }

        PredictItemVO predictItem = mcsApi.getPredictItemByItemNo(itemCode);
        if (predictItem == null || predictItem.getLastTime() == null) {
            return null;

 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/McsController.java

@@ -1,21 +1,14 @@
package com.iailab.module.ansteel.api.controller;

import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.module.ansteel.util.ApiSecurityUtils;
import com.iailab.module.api.mcs.AnSteelApi;
import com.iailab.module.api.mcs.dto.PowerRunStateDTO;
import com.iailab.module.api.mcs.dto.PreDataChartRespVO;
import com.iailab.module.model.api.mcs.dto.PreDataItemChartReqVO;
import com.iailab.module.model.api.mcs.dto.PreDataItemChartRespVO;
import com.iailab.module.model.api.mcs.dto.PreDataSingleChartReqVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

@@ -25,7 +18,6 @@
 * @author: lirm
 * @date: 2025/03/17
 **/
@Tag(name = "发电厂机组运行情况")
@RestController
@RequestMapping("/ansteel/api/mcs")
public class McsController {
@@ -33,19 +25,16 @@
    @Autowired
    private AnSteelApi anSteelApi;

    @Resource
    private ApiSecurityUtils apiSecurityUtils;

    @GetMapping("/power-run-state/list")
    public CommonResult<List<PowerRunStateDTO>> list(@RequestParam Map<String, Object> params) {
    @Operation(summary = "发电厂机组运行情况")
    public CommonResult<List<PowerRunStateDTO>> getPowerRunState(@RequestParam Map<String, Object> params) {
        List<PowerRunStateDTO> list = anSteelApi.getPowerRunState();
        return success(list);
    }

    @PostMapping("/predict-data/charts")
    @Operation(summary = "预测数据图表")
    public CommonResult<PreDataChartRespVO> getPreDataChart(HttpServletResponse response, HttpServletRequest request, @RequestBody PreDataSingleChartReqVO reqVO) throws Exception {
        apiSecurityUtils.validate(request);
    public CommonResult<PreDataChartRespVO> getPreDataChart(@RequestBody PreDataSingleChartReqVO reqVO) {
        PreDataChartRespVO respVO = anSteelApi.getPreDataChart(reqVO);
        return CommonResult.success(respVO);
    }

 ansteel-biz/src/main/java/com/iailab/module/ansteel/util/ApiSecurityUtils.java

文件已删除

 ansteel-biz/src/main/resources/application-dev.yaml

@@ -44,13 +44,6 @@
          username: root
          password: 123456

  # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
  redis:
    host: 172.16.8.100 # 地址
    port: 6379 # 端口
    database: 10 # 数据库索引
    password: 123456 # 密码，建议生产环境开启

--- #################### 平台相关配置 ####################

# 平台配置项，设置当前项目所有自定义的配置
@@ -65,9 +58,9 @@
    enable: false
  token:
    base-url: http://127.0.0.1:48080/admin-api/system
    tenant-id: 172
    client-id: shasteel
    client-secret: shasteel111111111111111
    username: shasteel
    tenant-id: 176
    client-id: ansteel
    client-secret: ansteel111111111111111
    username: ansteel
    password: 123456


 ansteel-biz/src/main/resources/application.yaml

@@ -4,7 +4,7 @@
    name: ansteel-server

  profiles:
    active: prod
    active: dev

  cloud:
    nacos:
@@ -150,10 +150,11 @@
      - qrtz_triggers
      - schedule_job
      - schedule_job_log
      - t_power_run_state
  swagger:
    title: 选煤厂安全管理平台
    description: 选煤厂安全管理平台
    version: ${iailab.info.version}
  log-path: D:\DLUT\ansteel

debug: true
debug: false

 pom.xml

@@ -154,12 +154,6 @@
                <version>${revision}</version>
            </dependency>

            <!-- 消息队列相关 -->
            <dependency>
                <groupId>com.iailab</groupId>
                <artifactId>iailab-common-mq</artifactId>
                <version>${revision}</version>
            </dependency>

            <!-- Web 相关 -->
            <dependency>
@@ -374,23 +368,21 @@
    </dependencyManagement>

    <build>
        <!-- 设置构建的 jar 包名 -->
        <finalName>${project.artifactId}</finalName>
        <plugins>
            <!-- 打包 -->
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
                        </goals>
                    </execution>
                </executions>
            </plugin>
        </plugins>
        <pluginManagement>
            <plugins>
                <!-- maven-surefire-plugin 插件，用于运行单元测试。 -->
                <!-- 注意，需要使用 3.0.X+，因为要支持 Junit 5 版本 -->
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-surefire-plugin</artifactId>
                    <version>${maven-surefire-plugin.version}</version>
                    <configuration>
                        <skip>true</skip>
                    </configuration>
                </plugin>
                <!-- maven-compiler-plugin 插件，解决 Lombok + MapStruct 组合 -->
            </plugins>
        </pluginManagement>
    </build>