zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并 mes 代码

Browse Source
This commit is contained in:
Administrator
2025-09-04 00:51:13 +00:00
committed by chenbowen
parent d1d5b2c0c5
commit 81f651388f
138 changed files with 5675 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes-server/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM openjdk:17-jre-slim FROM 172.16.46.66:10043/base-service/eclipse-temurin:21-jre
# 设置应用目录 # 设置应用目录
WORKDIR /app WORKDIR /app

4
mes-server/pom.xml
View File

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>cn.iocoder.cloud</groupId> <groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao</artifactId> <artifactId>dsc-mes</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.iocoder.cloud</groupId> <groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-module-indicator</artifactId> <artifactId>yudao-module-indicator-server</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>

2
mes-server/src/main/java/cn/iocoder/yudao/mes/MesServerApplication.java
View File

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.mes;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients;
/** /**
* Mes 服务器的启动类 * Mes 服务器的启动类
@@ -9,6 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* @author ZT * @author ZT
*/ */
@SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${yudao.info.base-package} @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${yudao.info.base-package}
@EnableFeignClients(basePackages = {"${yudao.info.base-package}.mes", "${yudao.info.base-package}.module"})
@SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.mes", "${yudao.info.base-package}.module"}, @SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.mes", "${yudao.info.base-package}.module"},
excludeName = {}) excludeName = {})
public class MesServerApplication { public class MesServerApplication {

3
mes-server/src/main/java/cn/iocoder/yudao/mes/controller/mes/MesController.java
View File

@@ -1,12 +1,13 @@
package cn.iocoder.yudao.mes.controller.mes; package cn.iocoder.yudao.mes.controller.mes;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
/** /**

2
mes-server/src/main/resources/application.yml
View File

@@ -104,7 +104,7 @@ xxl:
yudao: yudao:
info: info:
version: 1.0.0 version: 1.0.0
base-package: cn.iocoder.yudao.module base-package: cn.iocoder.yudao
web: web:
admin-ui: admin-ui:
url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址 url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址

2
yudao-module-energy/pom.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>yudao</artifactId> <artifactId>dsc-mes</artifactId>
<groupId>cn.iocoder.cloud</groupId> <groupId>cn.iocoder.cloud</groupId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>

2
yudao-module-energy/yudao-module-energy-api/src/main/java/cn/iocoder/yudao/module/energy/enums/ErrorCodeConstants.java
View File

@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
/** /**
* energy 错误码枚举类 * energy 错误码枚举类
* *
* energy 系统，使用 1-xxx-xxx-xxx 段 * 1-030-000-000 ~ 1-030-199-999
* *
* @author ZT * @author ZT
*/ */

30
yudao-module-energy/yudao-module-energy-server/pom.xml
View File

@@ -131,21 +131,21 @@
<build> <build>
<!-- 设置构建的 jar 包名 --> <!-- 设置构建的 jar 包名 -->
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
<plugins> <!-- <plugins>-->
<!-- 打包 --> <!-- &lt;!&ndash; 打包 &ndash;&gt;-->
<plugin> <!-- <plugin>-->
<groupId>org.springframework.boot</groupId> <!-- <groupId>org.springframework.boot</groupId>-->
<artifactId>spring-boot-maven-plugin</artifactId> <!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
<version>${spring.boot.version}</version> <!-- <version>${spring.boot.version}</version>-->
<executions> <!-- <executions>-->
<execution> <!-- <execution>-->
<goals> <!-- <goals>-->
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 --> <!-- <goal>repackage</goal> &lt;!&ndash; 将引入的 jar 打入其中 &ndash;&gt;-->
</goals> <!-- </goals>-->
</execution> <!-- </execution>-->
</executions> <!-- </executions>-->
</plugin> <!-- </plugin>-->
</plugins> <!-- </plugins>-->
</build> </build>
</project> </project>

2
yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/EnergyServerApplication.java
View File

@@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* *
* @author ZT * @author ZT
*/ */
@SpringBootApplication //@SpringBootApplication
public class EnergyServerApplication { public class EnergyServerApplication {
public static void main(String[] args) { public static void main(String[] args) {

3
yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/energy/EnergyController.java
View File

@@ -1,12 +1,13 @@
package cn.iocoder.yudao.module.energy.controller.admin.energy; package cn.iocoder.yudao.module.energy.controller.admin.energy;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
/** /**

Some files were not shown because too many files have changed in this diff Show More